Fixed wire item textures

resources/assets/resonantinduction/languages/en_US.properties

@@ -8,15 +8,15 @@ tile.resonantinduction\:multimeter.name=Multimeter
 tile.resonantinduction\:contractor.name=Electromagnetic Contractor
 tile.resonantinduction\:battery.name=Modular Battery
 
-tile.resonantinduction\:wire.copper.name=Copper Wire
-tile.resonantinduction\:wire.tin.name=Tin Wire
-tile.resonantinduction\:wire.iron.name=Iron Wire
-tile.resonantinduction\:wire.aluminum.name=Aluminum Wire
-tile.resonantinduction\:wire.silver.name=Silver Wire
-tile.resonantinduction\:wire.superconductor.name=Superconductor Wire
-
 ## Items
 item.resonantinduction\:quantumEntangler.name=Quantum Entangler
 item.resonantinduction\:capacitor.name=Capacitor Cell
 item.resonantinduction\:infiniteCapacitor.name=Infinite Capacitor Cell
 item.resonantinduction\:linker.name=Electrostatic Linker
+
+item.resonantinduction\:wire.copper.name=Copper Wire
+item.resonantinduction\:wire.tin.name=Tin Wire
+item.resonantinduction\:wire.iron.name=Iron Wire
+item.resonantinduction\:wire.aluminum.name=Aluminum Wire
+item.resonantinduction\:wire.silver.name=Silver Wire
+item.resonantinduction\:wire.superconductor.name=Superconductor Wire

src/resonantinduction/entangler/ItemQuantumEntangler.java

@@ -18,7 +18,7 @@ public class ItemQuantumEntangler extends ItemCoordLink
 	public ItemQuantumEntangler(int id)
 	{
 		super("quantumEntangler", id);
-		setMaxStackSize(1);
+		this.setMaxStackSize(1);
 		// TODO Handheld model, render animation, energy usage (should be easy?)
 	}
 

src/resonantinduction/render/RenderPartWire.java

@@ -133,9 +133,9 @@ public class RenderPartWire
 
 	public static void registerIcons(IconRegister iconReg)
 	{
-		wireIcon = iconReg.registerIcon("resonantinduction:models/wire");
-		insulationIcon = iconReg.registerIcon("resonantinduction:models/insulation" + (ResonantInduction.LO_FI_INSULATION ? "tiny" : ""));
-		breakIcon = iconReg.registerIcon("resonantinduction:wire");
+		wireIcon = iconReg.registerIcon(ResonantInduction.PREFIX + "models/wire");
+		insulationIcon = iconReg.registerIcon(ResonantInduction.PREFIX + "models/insulation" + (ResonantInduction.LO_FI_INSULATION ? "tiny" : ""));
+		breakIcon = iconReg.registerIcon(ResonantInduction.PREFIX + "wire");
 	}
 
 	public void renderStatic(PartWire wire)

src/resonantinduction/wire/ItemPartWire.java

@@ -27,10 +27,11 @@ public class ItemPartWire extends JItemMultiPart
 
 	public ItemPartWire(int id)
 	{
-		super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, "wireMultipart", id).getInt(id));
-		setCreativeTab(TabRI.INSTANCE);
-		setHasSubtypes(true);
-		setMaxDamage(0);
+		super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, "wire", id).getInt(id));
+		this.setUnlocalizedName(ResonantInduction.PREFIX + "wire");
+		this.setCreativeTab(TabRI.INSTANCE);
+		this.setHasSubtypes(true);
+		this.setMaxDamage(0);
 	}
 
 	@Override
@@ -48,7 +49,7 @@ public class ItemPartWire extends JItemMultiPart
 	@Override
 	public String getUnlocalizedName(ItemStack itemStack)
 	{
-		return "tile.Wire." + EnumWireMaterial.values()[itemStack.getItemDamage()].getName() + "Wire";
+		return super.getUnlocalizedName(itemStack) + "." + EnumWireMaterial.values()[itemStack.getItemDamage()].getName().toLowerCase();
 	}
 
 	@Override
@@ -61,10 +62,10 @@ public class ItemPartWire extends JItemMultiPart
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerIcons(IconRegister register)
-	{	
-		for(EnumWireMaterial material : EnumWireMaterial.values())
-		{
-			icons[material.ordinal()] = register.registerIcon("mekanism:" + material.getName() + "Wire");
+	{
+		for (EnumWireMaterial material : EnumWireMaterial.values())
+		{System.out.println(ResonantInduction.PREFIX + "wire." + EnumWireMaterial.values()[material.ordinal()].getName().toLowerCase());
+			icons[material.ordinal()] = register.registerIcon(ResonantInduction.PREFIX + "wire." + EnumWireMaterial.values()[material.ordinal()].getName().toLowerCase());
 		}
 
 		RenderPartWire.registerIcons(register);
@@ -80,16 +81,9 @@ public class ItemPartWire extends JItemMultiPart
 	@Override
 	public void getSubItems(int itemID, CreativeTabs tab, List listToAddTo)
 	{
-		for(EnumWireMaterial mat : EnumWireMaterial.values())
+		for (EnumWireMaterial mat : EnumWireMaterial.values())
 		{
 			listToAddTo.add(new ItemStack(itemID, 1, mat.ordinal()));
 		}
 	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public int getSpriteNumber()
-	{
-		return 0;
-	}
 }

src/resonantinduction/wire/PartConductor.java

@@ -54,7 +54,7 @@ public abstract class PartConductor extends PartAdvanced implements IConductor
 			}
 		}
 
-		this.onExtractEnergy(null, energyUsed, true);
+		this.buffer.extractEnergy(energyUsed, true);
 	}
 
 	@Override