mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 04:09:43 +00:00
Started work on some items.
This commit is contained in:
1 parent
15a723bcec
commit
b71931b661
19 files changed
+205
-8
No files matched your search
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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));
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -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<ItemStack> 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() {
|
||||
|
||||
Reference in new issue
Block a user