diff --git a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml index f21d79fb..ab3359e0 100644 --- a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml +++ b/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml @@ -93,6 +93,17 @@ sand/cobble/wood=0.1 + + + + + + + + + + + diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 380d206d..46d26f80 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -36,6 +36,7 @@ enderio.itemMeConduit.name=ME Conduit //Materials enderio.itemMaterial.name=Materials enderio.silicon.name=Silicon +enderio.darkSteel.name=Dark Steel enderio.conduitBinder.name=Conduit Binder enderio.binderComposite.name=Binder Composite enderio.phasedIronNugget.name=Pulsating Iron Nugget @@ -118,6 +119,11 @@ enderio.itemEnderface.tooFar=EnderIO block is too distant. enderio.itemEnderface.destroyed=EnderIO block has been destroyed. enderio.itemEnderface.noSync=Enderface not synchronized with EnderIO. +item.darkSteel_helmet.name=Dark Helm +item.darkSteel_chestplate.name=Dark Plate +item.darkSteel_leggings.name=Dark Leggings +item.darkSteel_boots.name=Dark Boots + //------GUI diff --git a/resources/assets/enderio/textures/items/darkSteel.png b/resources/assets/enderio/textures/items/darkSteel.png new file mode 100644 index 00000000..2934c638 Binary files /dev/null and b/resources/assets/enderio/textures/items/darkSteel.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_axe.png b/resources/assets/enderio/textures/items/darkSteel_axe.png new file mode 100644 index 00000000..6f0014cc Binary files /dev/null and b/resources/assets/enderio/textures/items/darkSteel_axe.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_boots.png b/resources/assets/enderio/textures/items/darkSteel_boots.png new file mode 100644 index 00000000..d314d206 Binary files /dev/null and b/resources/assets/enderio/textures/items/darkSteel_boots.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_chestplate.png b/resources/assets/enderio/textures/items/darkSteel_chestplate.png new file mode 100644 index 00000000..2a5e2682 Binary files /dev/null and b/resources/assets/enderio/textures/items/darkSteel_chestplate.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_helmet.png b/resources/assets/enderio/textures/items/darkSteel_helmet.png new file mode 100644 index 00000000..def672f5 Binary files /dev/null and b/resources/assets/enderio/textures/items/darkSteel_helmet.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_hoe.png b/resources/assets/enderio/textures/items/darkSteel_hoe.png new file mode 100644 index 00000000..2c54c646 Binary files /dev/null and b/resources/assets/enderio/textures/items/darkSteel_hoe.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_leggings.png b/resources/assets/enderio/textures/items/darkSteel_leggings.png new file mode 100644 index 00000000..e11c0236 Binary files /dev/null and b/resources/assets/enderio/textures/items/darkSteel_leggings.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_pickaxe.png b/resources/assets/enderio/textures/items/darkSteel_pickaxe.png new file mode 100644 index 00000000..a00fdac1 Binary files /dev/null and b/resources/assets/enderio/textures/items/darkSteel_pickaxe.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_shovel.png b/resources/assets/enderio/textures/items/darkSteel_shovel.png new file mode 100644 index 00000000..ab07642a Binary files /dev/null and b/resources/assets/enderio/textures/items/darkSteel_shovel.png differ diff --git a/resources/assets/enderio/textures/items/darkSteel_sword.png b/resources/assets/enderio/textures/items/darkSteel_sword.png new file mode 100644 index 00000000..e86ce901 Binary files /dev/null and b/resources/assets/enderio/textures/items/darkSteel_sword.png differ diff --git a/resources/assets/enderio/textures/models/armor/darkSteel_layer_1.png b/resources/assets/enderio/textures/models/armor/darkSteel_layer_1.png new file mode 100644 index 00000000..93c12d33 Binary files /dev/null and b/resources/assets/enderio/textures/models/armor/darkSteel_layer_1.png differ diff --git a/resources/assets/enderio/textures/models/armor/darkSteel_layer_2.png b/resources/assets/enderio/textures/models/armor/darkSteel_layer_2.png new file mode 100644 index 00000000..91af0359 Binary files /dev/null and b/resources/assets/enderio/textures/models/armor/darkSteel_layer_2.png differ diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index bf308260..3bfdef35 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -27,6 +27,7 @@ import crazypants.enderio.conduit.redstone.ItemRedstoneConduit; import crazypants.enderio.enderface.BlockEnderIO; import crazypants.enderio.enderface.EnderfaceRecipes; import crazypants.enderio.enderface.ItemEnderface; +import crazypants.enderio.item.ItemDarkSteelArmor; import crazypants.enderio.item.ItemRecipes; import crazypants.enderio.item.ItemYetaWrench; import crazypants.enderio.machine.MachineRecipes; @@ -127,9 +128,15 @@ public class EnderIO { public static BlockElectricLight blockElectricLight; public static BlockLightNode blockLightNode; + // // Items public static ItemYetaWrench itemYetaWench; public static ItemConduitProbe itemConduitProbe; + public static ItemDarkSteelArmor itemDarkSteelHelmet; + public static ItemDarkSteelArmor itemDarkSteelChestplate; + public static ItemDarkSteelArmor itemDarkSteelLeggings; + public static ItemDarkSteelArmor itemDarkSteelBoots; + // public static ITrigger triggerNoEnergy; // public static ITrigger triggerHasEnergy; // public static ITrigger triggerFullEnergy; @@ -193,6 +200,11 @@ public class EnderIO { itemTravelStaff = ItemTravelStaff.create(); itemConduitProbe = ItemConduitProbe.create(); + itemDarkSteelHelmet = ItemDarkSteelArmor.create(0); + itemDarkSteelChestplate = ItemDarkSteelArmor.create(1); + itemDarkSteelLeggings = ItemDarkSteelArmor.create(2); + itemDarkSteelBoots = ItemDarkSteelArmor.create(3); + MaterialRecipes.registerOresInDictionary(); } diff --git a/src/main/java/crazypants/enderio/item/DarkSteelController.java b/src/main/java/crazypants/enderio/item/DarkSteelController.java new file mode 100644 index 00000000..07914a66 --- /dev/null +++ b/src/main/java/crazypants/enderio/item/DarkSteelController.java @@ -0,0 +1,55 @@ +package crazypants.enderio.item; + +import java.util.UUID; + +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.ai.attributes.IAttributeInstance; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; +import crazypants.enderio.EnderIO; + +public class DarkSteelController { + + public static final DarkSteelController instance = new DarkSteelController(); + + private AttributeModifier walkModifier = new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", 0.3, 1); + private AttributeModifier sprintModifier = new AttributeModifier(new UUID(6, 320981923), "generic.movementSpeed", 0.6, 1); + + private DarkSteelController() { + } + + @SubscribeEvent + public void onPlayerTick(TickEvent.PlayerTickEvent event) { + EntityPlayer player = event.player; + + //boots + ItemStack boots = player.getEquipmentInSlot(1); + if(boots != null && boots.getItem() == EnderIO.itemDarkSteelBoots) { + player.stepHeight = 1.001F; + } else if(player.stepHeight == 1.001F) { + player.stepHeight = 0.5001F; + } + + //leggings + IAttributeInstance moveInst = player.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.movementSpeed); + moveInst.removeModifier(walkModifier); + moveInst.removeModifier(sprintModifier); + + walkModifier = new AttributeModifier(new UUID(12879874982l, 320981923), "generic.movementSpeed", 0.3, 1); + sprintModifier = new AttributeModifier(new UUID(6, 320981923), "generic.movementSpeed", 0.5, 1); + + ItemStack leggings = player.getEquipmentInSlot(2); + if(leggings != null && leggings.getItem() == EnderIO.itemDarkSteelLeggings) { + if(player.isSprinting()) { + moveInst.applyModifier(sprintModifier); + } else { + moveInst.applyModifier(walkModifier); + } + } + + } + +} diff --git a/src/main/java/crazypants/enderio/item/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/ItemDarkSteelArmor.java new file mode 100644 index 00000000..c83434d1 --- /dev/null +++ b/src/main/java/crazypants/enderio/item/ItemDarkSteelArmor.java @@ -0,0 +1,117 @@ +package crazypants.enderio.item; + +import java.util.List; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.EnumHelper; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.EnderIOTab; + +public class ItemDarkSteelArmor extends ItemArmor { + + public static final ArmorMaterial MATERIAL = EnumHelper.addArmorMaterial("darkSteel", 45, new int[] { 3, 8, 6, 3 }, 25); + + public static final String[] NAMES = new String[] { "helmet", "chestplate", "leggings", "boots" }; + + static { + FMLCommonHandler.instance().bus().register(DarkSteelController.instance); + } + + public static ItemDarkSteelArmor create(int armorType) { + ItemDarkSteelArmor res = new ItemDarkSteelArmor(armorType); + res.init(); + return res; + } + + protected ItemDarkSteelArmor(int armorType) { + super(MATERIAL, 0, armorType); + setCreativeTab(EnderIOTab.tabEnderIO); + + String str = "darkSteel_" + NAMES[armorType]; + setUnlocalizedName(str); + setTextureName("enderIO:" + str); + } + + protected void init() { + GameRegistry.registerItem(this, getUnlocalizedName()); + } + + @Override + public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { + list.add("Durability: " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); + } + + @Override + public String getArmorTexture(ItemStack itemStack, Entity entity, int slot, String layer) { + if(armorType == 2) { + return "enderio:textures/models/armor/darkSteel_layer_2.png"; + } + return "enderio:textures/models/armor/darkSteel_layer_1.png"; + } + + //Idea from Mekanism + // @ForgeSubscribe + // public void onLivingSpecialSpawn(LivingSpawnEvent event) + // { + // int chance = event.world.rand.nextInt(100); + // int armorType = event.world.rand.nextInt(4); + // + // if(chance < 3) + // { + // if(event.entityLiving instanceof EntityZombie || event.entityLiving instanceof EntitySkeleton) + // { + // int sword = event.world.rand.nextInt(100); + // int helmet = event.world.rand.nextInt(100); + // int chestplate = event.world.rand.nextInt(100); + // int leggings = event.world.rand.nextInt(100); + // int boots = event.world.rand.nextInt(100); + // + // if(armorType == 0) + // { + // if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(GlowstoneSword)); + // if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(GlowstoneHelmet)); + // if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(GlowstoneChestplate)); + // if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(GlowstoneLeggings)); + // if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(GlowstoneBoots)); + // } + // else if(armorType == 1) + // { + // if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(LazuliSword)); + // if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(LazuliHelmet)); + // if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(LazuliChestplate)); + // if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(LazuliLeggings)); + // if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(LazuliBoots)); + // } + // else if(armorType == 2) + // { + // if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(OsmiumSword)); + // if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(OsmiumHelmet)); + // if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(OsmiumChestplate)); + // if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(OsmiumLeggings)); + // if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(OsmiumBoots)); + // } + // else if(armorType == 3) + // { + // if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(SteelSword)); + // if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(SteelHelmet)); + // if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(SteelChestplate)); + // if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(SteelLeggings)); + // if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(SteelBoots)); + // } + // else if(armorType == 4) + // { + // if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(BronzeSword)); + // if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(BronzeHelmet)); + // if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(BronzeChestplate)); + // if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(BronzeLeggings)); + // if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(BronzeBoots)); + // } + // } + // } + // } + +} diff --git a/src/main/java/crazypants/enderio/material/Alloy.java b/src/main/java/crazypants/enderio/material/Alloy.java index 170fd368..973d07f1 100644 --- a/src/main/java/crazypants/enderio/material/Alloy.java +++ b/src/main/java/crazypants/enderio/material/Alloy.java @@ -7,7 +7,8 @@ public enum Alloy { PHASED_GOLD("phasedGold"), REDSTONE_ALLOY("redstoneAlloy"), CONDUCTIVE_IRON("conductiveIron"), - PHASED_IRON("phasedIron"); + PHASED_IRON("phasedIron"), + DARK_STEEL("darkSteel"); public final String unlocalisedName; public final String iconKey; diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 15f0fd43..34e5f170 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -26,11 +26,8 @@ public class MaterialRecipes { OreDictionary.registerOre("itemSilicon", new ItemStack(EnderIO.itemMaterial, 1, Material.SILICON.ordinal())); OreDictionary.registerOre("gearStone", new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal())); - int oreId = OreDictionary.getOreID("glass"); - ArrayList ingots = OreDictionary.getOres(oreId); - if(ingots.isEmpty()) { - OreDictionary.registerOre("glass", Blocks.glass); - } + OreDictionary.registerOre("glass", Blocks.glass); + ItemStack pureGlass = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.GLASS.ordinal()); OreDictionary.registerOre("glass", pureGlass); OreDictionary.registerOre("glassHardened", new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.FUSED_QUARTZ.ordinal())); @@ -40,8 +37,6 @@ public class MaterialRecipes { GameRegistry.addShapelessRecipe(new ItemStack(Blocks.glass), pureGlass); GameRegistry.addShapedRecipe(new ItemStack(Items.glass_bottle), " ", "g g", " g ", 'g', pureGlass); - OreDictionary.registerOre("glass", Blocks.glass); - } public static void addRecipes() {