GameRadio/BloodMoon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replaced deprecated CreatureType with EntityType and removed the spider-jump feature

Browse Source
This commit is contained in:
Jacek 2012-03-31 00:50:38 +01:00
parent 1dccd1deb5
commit 62079ec6cc
6 changed files with 9 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
uk/co/jacekk/bukkit/bloodmoon/BloodMoon.java
View File

@ -109,8 +109,6 @@ public class BloodMoon extends JavaPlugin {
this.manager.registerEvents(new FireArrowsListener(), this); this.manager.registerEvents(new FireArrowsListener(), this);
} }
// spider-jump is handled in BloodMoonEntitySpider
if (BloodMoon.config.getBoolean("features.double-health.enabled")){ if (BloodMoon.config.getBoolean("features.double-health.enabled")){
this.manager.registerEvents(new DoubleHealthListener(), this); this.manager.registerEvents(new DoubleHealthListener(), this);
} }

3
uk/co/jacekk/bukkit/bloodmoon/BloodMoonConfig.java
View File

@ -30,9 +30,6 @@ public class BloodMoonConfig {
this.configDefaults.put("features.fire-arrows.enabled", true); this.configDefaults.put("features.fire-arrows.enabled", true);
this.configDefaults.put("features.fire-arrows.ignight-target", true); this.configDefaults.put("features.fire-arrows.ignight-target", true);
this.configDefaults.put("features.spider-jump.enabled", true);
this.configDefaults.put("features.spider-jump.multiplier", 2.0D);
this.configDefaults.put("features.break-blocks.enabled", true); this.configDefaults.put("features.break-blocks.enabled", true);
this.configDefaults.put("features.break-blocks.realistic-drop", false); this.configDefaults.put("features.break-blocks.realistic-drop", false);
this.configDefaults.put("features.break-blocks.mobs", Arrays.asList("ZOMBIE", "SKELETON", "SPIDER", "CREEPER", "ENDERMAN")); this.configDefaults.put("features.break-blocks.mobs", Arrays.asList("ZOMBIE", "SKELETON", "SPIDER", "CREEPER", "ENDERMAN"));

37
uk/co/jacekk/bukkit/bloodmoon/entities/BloodMoonEntitySpider.java
View File

@ -3,53 +3,16 @@ package uk.co.jacekk.bukkit.bloodmoon.entities;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Spider; import org.bukkit.entity.Spider;
import uk.co.jacekk.bukkit.bloodmoon.BloodMoon;
import uk.co.jacekk.bukkit.bloodmoon.events.SpiderMoveEvent; import uk.co.jacekk.bukkit.bloodmoon.events.SpiderMoveEvent;
import net.minecraft.server.Entity;
import net.minecraft.server.MathHelper;
import net.minecraft.server.World; import net.minecraft.server.World;
public class BloodMoonEntitySpider extends net.minecraft.server.EntitySpider { public class BloodMoonEntitySpider extends net.minecraft.server.EntitySpider {
private boolean bloodMoonState;
public BloodMoonEntitySpider(World world){ public BloodMoonEntitySpider(World world){
super(world); super(world);
this.bloodMoonState = BloodMoon.bloodMoonWorlds.contains(world.worldData.name);
} }
/*
protected void a(Entity entity, float f){
float f1 = this.a(1.0F);
if (f1 > 0.5F && this.random.nextInt(100) == 0){
this.target = null;
}else{
double multiplier = BloodMoon.config.getDouble("features.spider-jump.multiplier");
if (f > 2.0F * multiplier && f < 6.0D * multiplier && this.random.nextInt(10) == 0){
if (this.onGround){
double d0 = entity.locX - this.locX;
double d1 = entity.locZ - this.locZ;
float f2 = MathHelper.sqrt(d0 * d0 + d1 * d1);
if (this.bloodMoonState && BloodMoon.config.getBoolean("features.spider-jump.enabled")){
this.motX = multiplier * (d0 / (double) f2 * 0.5D * 0.800000011920929D + this.motX * 0.20000000298023224D);
this.motZ = multiplier * (d1 / (double) f2 * 0.5D * 0.800000011920929D + this.motZ * 0.20000000298023224D);
this.motY = multiplier * 0.5 * 0.4000000059604645D;
}else{
this.motX = d0 / (double) f2 * 0.5D * 0.800000011920929D + this.motX * 0.20000000298023224D;
this.motZ = d1 / (double) f2 * 0.5D * 0.800000011920929D + this.motZ * 0.20000000298023224D;
this.motY = 0.4000000059604645D;
}
}
}else{
super.a(entity, f);
}
}
}
*/
@Override @Override
public void d_(){ public void d_(){
Spider spider = (Spider) this.getBukkitEntity(); Spider spider = (Spider) this.getBukkitEntity();

8
uk/co/jacekk/bukkit/bloodmoon/featurelisteners/MoreSpawningListener.java
View File

@ -5,7 +5,7 @@ import java.util.List;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.CreatureType; import org.bukkit.entity.EntityType;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@ -26,15 +26,15 @@ public class MoreSpawningListener implements Listener {
} }
} }
@EventHandler(priority = EventPriority.NORMAL) @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
public void onCreatureSpawn(CreatureSpawnEvent event){ public void onCreatureSpawn(CreatureSpawnEvent event){
if (event.isCancelled() || event.getSpawnReason() != SpawnReason.NATURAL) return; if (event.isCancelled() || event.getSpawnReason() != SpawnReason.NATURAL) return;
CreatureType type = event.getCreatureType(); EntityType type = event.getEntityType();
Location location = event.getLocation(); Location location = event.getLocation();
World world = location.getWorld(); World world = location.getWorld();
List<CreatureType> types = Arrays.asList(CreatureType.CREEPER, CreatureType.ENDERMAN, CreatureType.SKELETON, CreatureType.ZOMBIE, CreatureType.SPIDER); List<EntityType> types = Arrays.asList(EntityType.CREEPER, EntityType.ENDERMAN, EntityType.SKELETON, EntityType.ZOMBIE, EntityType.SPIDER);
if (BloodMoon.bloodMoonWorlds.contains(world.getName()) && types.contains(type)){ if (BloodMoon.bloodMoonWorlds.contains(world.getName()) && types.contains(type)){
for (int i = 0; i < this.multiplier; ++i){ for (int i = 0; i < this.multiplier; ++i){

4
uk/co/jacekk/bukkit/bloodmoon/featurelisteners/SpawnOnKillListener.java
View File

@ -5,8 +5,8 @@ import java.util.List;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Creature; import org.bukkit.entity.Creature;
import org.bukkit.entity.CreatureType;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -45,7 +45,7 @@ public class SpawnOnKillListener implements Listener {
if (target instanceof Player && causes.contains(entity.getLastDamageCause().getCause()) && BloodMoon.config.isCreatureOnMobList("features.spawn-on-kill.mobs", creature)){ if (target instanceof Player && causes.contains(entity.getLastDamageCause().getCause()) && BloodMoon.config.isCreatureOnMobList("features.spawn-on-kill.mobs", creature)){
if (plugin.rand.nextInt(100) <= BloodMoon.config.getInt("features.spawn-on-kill.chance")){ if (plugin.rand.nextInt(100) <= BloodMoon.config.getInt("features.spawn-on-kill.chance")){
String mobName = BloodMoon.config.getRandomStringFromList("features.spawn-on-kill.spawn"); String mobName = BloodMoon.config.getRandomStringFromList("features.spawn-on-kill.spawn");
CreatureType creatureType = CreatureType.fromName(Character.toUpperCase(mobName.charAt(0)) + mobName.toLowerCase().substring(1)); EntityType creatureType = EntityType.fromName(Character.toUpperCase(mobName.charAt(0)) + mobName.toLowerCase().substring(1));
if (creatureType != null){ if (creatureType != null){
world.spawnCreature(creature.getLocation(), creatureType); world.spawnCreature(creature.getLocation(), creatureType);

4
uk/co/jacekk/bukkit/bloodmoon/featurelisteners/SpawnOnSleepListener.java
View File

@ -2,7 +2,7 @@ package uk.co.jacekk.bukkit.bloodmoon.featurelisteners;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.CreatureType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -23,7 +23,7 @@ public class SpawnOnSleepListener implements Listener {
if (BloodMoon.bloodMoonWorlds.contains(world.getName())){ if (BloodMoon.bloodMoonWorlds.contains(world.getName())){
String mobName = BloodMoon.config.getRandomStringFromList("features.spawn-on-sleep.spawn"); String mobName = BloodMoon.config.getRandomStringFromList("features.spawn-on-sleep.spawn");
CreatureType creatureType = CreatureType.fromName(Character.toUpperCase(mobName.charAt(0)) + mobName.toLowerCase().substring(1)); EntityType creatureType = EntityType.fromName(Character.toUpperCase(mobName.charAt(0)) + mobName.toLowerCase().substring(1));
if (creatureType != null){ if (creatureType != null){
world.spawnCreature(location, creatureType); world.spawnCreature(location, creatureType);