From d95a1429b3c373f9db45e8051ff32f73c2350f0f Mon Sep 17 00:00:00 2001 From: Calclavia Date: Sat, 3 Aug 2013 12:16:24 -0400 Subject: [PATCH] Simplified some entangler code --- .../resonantinduction/languages/en_US.properties | 4 +++- ...quantum_entangler.png => quantumEntangler.png} | Bin src/resonantinduction/base/ItemBase.java | 1 + .../entangler/ItemQuantumEntangler.java | 14 +++----------- 4 files changed, 7 insertions(+), 12 deletions(-) rename resources/assets/resonantinduction/textures/items/{quantum_entangler.png => quantumEntangler.png} (100%) diff --git a/resources/assets/resonantinduction/languages/en_US.properties b/resources/assets/resonantinduction/languages/en_US.properties index bf351249..30ef50b8 100755 --- a/resources/assets/resonantinduction/languages/en_US.properties +++ b/resources/assets/resonantinduction/languages/en_US.properties @@ -2,7 +2,9 @@ itemGroup.resonantinduction=Resonant Induction +## Blocks tile.resonantinduction\:tesla.name=Tesla Coil tile.resonantinduction\:contractor.name=Electromagnetic Contractor -item.resonantinduction\:entangler.name=Quantum Entangler \ No newline at end of file +## Items +item.resonantinduction\:quantumEntangler.name=Quantum Entangler \ No newline at end of file diff --git a/resources/assets/resonantinduction/textures/items/quantum_entangler.png b/resources/assets/resonantinduction/textures/items/quantumEntangler.png similarity index 100% rename from resources/assets/resonantinduction/textures/items/quantum_entangler.png rename to resources/assets/resonantinduction/textures/items/quantumEntangler.png diff --git a/src/resonantinduction/base/ItemBase.java b/src/resonantinduction/base/ItemBase.java index 774eba29..db6f540b 100644 --- a/src/resonantinduction/base/ItemBase.java +++ b/src/resonantinduction/base/ItemBase.java @@ -17,5 +17,6 @@ public class ItemBase extends Item super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, name, id).getInt(id)); this.setCreativeTab(TabRI.INSTANCE); this.setUnlocalizedName(ResonantInduction.PREFIX + name); + this.func_111206_d(ResonantInduction.PREFIX + name); } } diff --git a/src/resonantinduction/entangler/ItemQuantumEntangler.java b/src/resonantinduction/entangler/ItemQuantumEntangler.java index ceba7d35..9875c255 100644 --- a/src/resonantinduction/entangler/ItemQuantumEntangler.java +++ b/src/resonantinduction/entangler/ItemQuantumEntangler.java @@ -21,22 +21,14 @@ import cpw.mods.fml.relauncher.SideOnly; */ public class ItemQuantumEntangler extends ItemBase { - public static int WILDCARD = 1337; /* :) */ - private static boolean didBindThisTick = false; public ItemQuantumEntangler(int id) { - super("entangler", id); + super("quantumEntangler", id); setMaxStackSize(1); // TODO Handheld model, render animation, energy usage (should be easy?) } - - @Override - public void registerIcons(IconRegister register) - { - itemIcon = register.registerIcon(ResonantInduction.PREFIX + "quantum_entangler"); - } @Override @SideOnly(Side.CLIENT) @@ -106,7 +98,7 @@ public class ItemQuantumEntangler extends ItemBase world.playSoundAtEntity(entityplayer, "mob.endermen.portal", 1.0F, 1.0F); } - + didBindThisTick = false; return itemstack; @@ -149,7 +141,7 @@ public class ItemQuantumEntangler extends ItemBase { if (itemStack.stackTagCompound == null) { - return WILDCARD; + return 0; } return itemStack.stackTagCompound.getInteger("dimID");