From cd4a95878436cb79723aed40556bde173b524bed Mon Sep 17 00:00:00 2001 From: hilburn Date: Tue, 6 Jan 2015 01:40:16 +0000 Subject: [PATCH 1/2] Unique Wither Skeleton Entity --- .../config/PoweredSpawnerConfig_Core.json | 4 +- resources/assets/enderio/lang/en_US.lang | 4 ++ src/main/java/crazypants/enderio/EnderIO.java | 3 + .../enderio/entity/EntityWitherSkeleton.java | 55 +++++++++++++++++++ .../enderio/entity/SkeletonHandler.java | 30 ++++++++++ 5 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java create mode 100644 src/main/java/crazypants/enderio/entity/SkeletonHandler.java diff --git a/resources/assets/enderio/config/PoweredSpawnerConfig_Core.json b/resources/assets/enderio/config/PoweredSpawnerConfig_Core.json index c81047c0..e24347aa 100644 --- a/resources/assets/enderio/config/PoweredSpawnerConfig_Core.json +++ b/resources/assets/enderio/config/PoweredSpawnerConfig_Core.json @@ -38,7 +38,9 @@ "enderzoo.Enderminy" : "10", "enderzoo.ConcussionCreeper" : "1.5", "enderzoo.enderzoo.FallenKnight" : "1", - "enderzoo.WitherWitch" : "3" + "enderzoo.WitherWitch" : "3", + + "enderio.witherSkeleton" : "20" }, "blackList": [ diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 71d50c75..d79c0294 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -83,6 +83,10 @@ enderio.itemGasConduit.tooltip.detailed.line1=Transfers Mekanism-compatible gase enderio.itemMEConduit.name=ME Conduit enderio.itemMEConduitDense.name=Dense ME Conduit +//Entity +entity.witherSkeleton.name=Wither Skeleton + + //Materials enderio.itemMaterial.name=Materials enderio.silicon.name=Silicon diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 2e8d1283..53352a28 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -6,6 +6,7 @@ import java.io.FileWriter; import java.lang.reflect.Field; import java.util.List; +import crazypants.enderio.entity.SkeletonHandler; import net.minecraft.block.material.Material; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -561,6 +562,8 @@ public class EnderIO { ConduitBundledRedstoneProvider.register(); } + SkeletonHandler.registerSkeleton(this); + EnderfaceRecipes.addRecipes(); MaterialRecipes.addRecipes(); ConduitRecipes.addRecipes(); diff --git a/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java b/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java new file mode 100644 index 00000000..6f9a1e57 --- /dev/null +++ b/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java @@ -0,0 +1,55 @@ +package crazypants.enderio.entity; + +import net.minecraft.entity.IEntityLivingData; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +import java.util.Calendar; + +public class EntityWitherSkeleton extends EntitySkeleton +{ + public EntityWitherSkeleton(World world) + { + super(world); + } + + public EntityWitherSkeleton(EntitySkeleton entity) + { + this(entity.worldObj); + this.copyLocationAndAnglesFrom(entity); + } + + @Override + public void setFire(int p_70015_1_) + { + } + + @Override + public IEntityLivingData onSpawnWithEgg(IEntityLivingData entityData) + { + this.getEntityAttribute(SharedMonsterAttributes.followRange).applyModifier(new AttributeModifier("Random spawn bonus", this.rand.nextGaussian() * 0.05D, 1)); + this.setSkeletonType(1); + this.setCurrentItemOrArmor(0, new ItemStack(Items.stone_sword)); + this.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(4.0D); + this.setCombatTask(); + this.setCanPickUpLoot(this.rand.nextFloat() < 0.55F * this.worldObj.func_147462_b(this.posX, this.posY, this.posZ)); + + if (this.getEquipmentInSlot(4) == null) + { + Calendar calendar = this.worldObj.getCurrentDate(); + + if (calendar.get(2) + 1 == 10 && calendar.get(5) == 31 && this.rand.nextFloat() < 0.25F) + { + this.setCurrentItemOrArmor(4, new ItemStack(this.rand.nextFloat() < 0.1F ? Blocks.lit_pumpkin : Blocks.pumpkin)); + this.equipmentDropChances[4] = 0.0F; + } + } + + return entityData; + } +} diff --git a/src/main/java/crazypants/enderio/entity/SkeletonHandler.java b/src/main/java/crazypants/enderio/entity/SkeletonHandler.java new file mode 100644 index 00000000..426593d3 --- /dev/null +++ b/src/main/java/crazypants/enderio/entity/SkeletonHandler.java @@ -0,0 +1,30 @@ +package crazypants.enderio.entity; + +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.EntityRegistry; +import crazypants.enderio.EnderIO; +import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.EntityJoinWorldEvent; + +public class SkeletonHandler +{ + @SubscribeEvent(priority = EventPriority.HIGHEST) + public void skeletonJoinWorld(EntityJoinWorldEvent event) + { + if (event.entity.getClass() == EntitySkeleton.class && ((EntitySkeleton)event.entity).getSkeletonType()==1) + { + event.setCanceled(true); + event.world.spawnEntityInWorld(new EntityWitherSkeleton((EntitySkeleton)event.entity)); + } + } + + public static void registerSkeleton(EnderIO mod) + { + int entityID = EntityRegistry.findGlobalUniqueEntityId(); + EntityRegistry.registerGlobalEntityID(EntityWitherSkeleton.class,"witherSkeleton", entityID, 0x00003D, 0x751947); + EntityRegistry.registerModEntity(EntityWitherSkeleton.class,"witherSkeleton",entityID,mod,64,3,true); + MinecraftForge.EVENT_BUS.register(new SkeletonHandler()); + } +} From 77a9c0f42ac7162738155269ad6dfb9b7840ca92 Mon Sep 17 00:00:00 2001 From: hilburn Date: Wed, 7 Jan 2015 00:57:22 +0000 Subject: [PATCH 2/2] Adds config for Wither --- src/main/java/crazypants/enderio/EnderIO.java | 5 ++++- src/main/java/crazypants/enderio/config/Config.java | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 53352a28..1d14bd8b 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -562,7 +562,10 @@ public class EnderIO { ConduitBundledRedstoneProvider.register(); } - SkeletonHandler.registerSkeleton(this); + if(Config.replaceWitherSkeletons) + { + SkeletonHandler.registerSkeleton(this); + } EnderfaceRecipes.addRecipes(); MaterialRecipes.addRecipes(); diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index c1395f60..3d91d598 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -420,6 +420,8 @@ public final class Config { public static int enchantmentSoulBoundWeight = 1; public static boolean enchantmentSoulBoundEnabled = true; + public static boolean replaceWitherSkeletons = true; + public static void load(FMLPreInitializationEvent event) { @@ -1130,6 +1132,9 @@ public final class Config { enchantmentSoulBoundWeight = config.get("enchantmentSoulBoundWeight", sectionEnchantments.name, enchantmentSoulBoundWeight, "The chance of getting this enchantment in the enchantment table").getInt(enchantmentSoulBoundWeight); + + replaceWitherSkeletons = config.get("replaceWitherSkeletons", sectionMisc.name, replaceWitherSkeletons, + "Separates wither and normal skeletons into different entities, enables the powered spawner to treat them differently [EXPERIMENTAL - MAY CAUSE ISSUES WITH OTHER MODS]").getBoolean(); } public static void postInit() {