diff --git a/resources/assets/resonantinduction/textures/items/models/flatWire.png b/resources/assets/resonantinduction/textures/blocks/models/flatWire.png similarity index 66% rename from resources/assets/resonantinduction/textures/items/models/flatWire.png rename to resources/assets/resonantinduction/textures/blocks/models/flatWire.png index 2e22b656..85831eab 100644 Binary files a/resources/assets/resonantinduction/textures/items/models/flatWire.png and b/resources/assets/resonantinduction/textures/blocks/models/flatWire.png differ diff --git a/resources/assets/resonantinduction/textures/items/models/insulation.png b/resources/assets/resonantinduction/textures/blocks/models/insulation.png similarity index 100% rename from resources/assets/resonantinduction/textures/items/models/insulation.png rename to resources/assets/resonantinduction/textures/blocks/models/insulation.png diff --git a/resources/assets/resonantinduction/textures/items/wire.aluminum.png b/resources/assets/resonantinduction/textures/blocks/wire.aluminum.png similarity index 100% rename from resources/assets/resonantinduction/textures/items/wire.aluminum.png rename to resources/assets/resonantinduction/textures/blocks/wire.aluminum.png diff --git a/resources/assets/resonantinduction/textures/items/wire.copper.png b/resources/assets/resonantinduction/textures/blocks/wire.copper.png similarity index 100% rename from resources/assets/resonantinduction/textures/items/wire.copper.png rename to resources/assets/resonantinduction/textures/blocks/wire.copper.png diff --git a/resources/assets/resonantinduction/textures/items/wire.iron.png b/resources/assets/resonantinduction/textures/blocks/wire.iron.png similarity index 100% rename from resources/assets/resonantinduction/textures/items/wire.iron.png rename to resources/assets/resonantinduction/textures/blocks/wire.iron.png diff --git a/resources/assets/resonantinduction/textures/items/wire.png b/resources/assets/resonantinduction/textures/blocks/wire.png similarity index 100% rename from resources/assets/resonantinduction/textures/items/wire.png rename to resources/assets/resonantinduction/textures/blocks/wire.png diff --git a/resources/assets/resonantinduction/textures/items/wire.silver.png b/resources/assets/resonantinduction/textures/blocks/wire.silver.png similarity index 100% rename from resources/assets/resonantinduction/textures/items/wire.silver.png rename to resources/assets/resonantinduction/textures/blocks/wire.silver.png diff --git a/resources/assets/resonantinduction/textures/items/wire.superconductor.png b/resources/assets/resonantinduction/textures/blocks/wire.superconductor.png similarity index 100% rename from resources/assets/resonantinduction/textures/items/wire.superconductor.png rename to resources/assets/resonantinduction/textures/blocks/wire.superconductor.png diff --git a/resources/assets/resonantinduction/textures/items/wire.tin.png b/resources/assets/resonantinduction/textures/blocks/wire.tin.png similarity index 100% rename from resources/assets/resonantinduction/textures/items/wire.tin.png rename to resources/assets/resonantinduction/textures/blocks/wire.tin.png diff --git a/src/resonantinduction/ResonantInduction.java b/src/resonantinduction/ResonantInduction.java index 7ac9d34a..5206684d 100644 --- a/src/resonantinduction/ResonantInduction.java +++ b/src/resonantinduction/ResonantInduction.java @@ -34,7 +34,7 @@ import resonantinduction.multimeter.TileEntityMultimeter; import resonantinduction.tesla.BlockTesla; import resonantinduction.tesla.TileEntityTesla; import resonantinduction.wire.EnumWireMaterial; -import resonantinduction.wire.ItemPartWire; +import resonantinduction.wire.ItemWire; import universalelectricity.api.item.IElectricalItem; import universalelectricity.api.vector.Vector3; import basiccomponents.api.BasicRegistry; @@ -180,7 +180,7 @@ public class ResonantInduction // Items itemQuantumEntangler = new ItemQuantumEntangler(getNextItemID()); itemLinker = new ItemLinker(getNextItemID()); - itemPartWire = new ItemPartWire(getNextItemID()); + itemPartWire = new ItemWire(getNextItemID()); // Blocks blockTesla = new BlockTesla(getNextBlockID()); diff --git a/src/resonantinduction/wire/ItemPartWire.java b/src/resonantinduction/wire/ItemWire.java similarity index 91% rename from src/resonantinduction/wire/ItemPartWire.java rename to src/resonantinduction/wire/ItemWire.java index bbcd5d5a..20e1237e 100644 --- a/src/resonantinduction/wire/ItemPartWire.java +++ b/src/resonantinduction/wire/ItemWire.java @@ -14,6 +14,7 @@ import resonantinduction.ResonantInduction; import resonantinduction.TabRI; import resonantinduction.Utility; import resonantinduction.wire.part.FlatWire; +import resonantinduction.wire.render.RenderFlatWire; import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay.Unit; import codechicken.lib.vec.BlockCoord; @@ -24,12 +25,11 @@ import codechicken.multipart.TMultiPart; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class ItemPartWire extends JItemMultiPart +public class ItemWire extends JItemMultiPart { - public static Icon flatWireTexture; private Icon[] icons = new Icon[EnumWireMaterial.values().length]; - public ItemPartWire(int id) + public ItemWire(int id) { super(ResonantInduction.CONFIGURATION.get(Configuration.CATEGORY_ITEM, "wire", id).getInt(id)); this.setUnlocalizedName(ResonantInduction.PREFIX + "wire"); @@ -77,6 +77,12 @@ public class ItemPartWire extends JItemMultiPart list.add("Max Amperage: " + UnitDisplay.getDisplay(EnumWireMaterial.values()[itemstack.getItemDamage()].maxAmps, Unit.AMPERE)); } + @SideOnly(Side.CLIENT) + public int getSpriteNumber() + { + return 0; + } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IconRegister register) @@ -86,7 +92,7 @@ public class ItemPartWire extends JItemMultiPart icons[material.ordinal()] = register.registerIcon(ResonantInduction.PREFIX + "wire." + EnumWireMaterial.values()[material.ordinal()].getName().toLowerCase()); } - flatWireTexture = register.registerIcon(ResonantInduction.PREFIX + "models/flatWire"); + RenderFlatWire.flatWireTexture = register.registerIcon(ResonantInduction.PREFIX + "models/flatWire"); } @Override diff --git a/src/resonantinduction/wire/part/FlatWire.java b/src/resonantinduction/wire/part/FlatWire.java index 368cf725..5d54005b 100644 --- a/src/resonantinduction/wire/part/FlatWire.java +++ b/src/resonantinduction/wire/part/FlatWire.java @@ -14,7 +14,6 @@ import org.lwjgl.opengl.GL11; import resonantinduction.Utility; import resonantinduction.wire.EnumWireMaterial; import resonantinduction.wire.IAdvancedConductor; -import resonantinduction.wire.ItemPartWire; import resonantinduction.wire.render.RenderFlatWire; import codechicken.lib.colour.Colour; import codechicken.lib.data.MCDataInput; @@ -623,7 +622,7 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio @SideOnly(Side.CLIENT) public Icon getIcon() { - return ItemPartWire.flatWireTexture; + return RenderFlatWire.flatWireTexture; } public Colour getColour() diff --git a/src/resonantinduction/wire/render/RenderFlatWire.java b/src/resonantinduction/wire/render/RenderFlatWire.java index bc81228c..2489d404 100644 --- a/src/resonantinduction/wire/render/RenderFlatWire.java +++ b/src/resonantinduction/wire/render/RenderFlatWire.java @@ -3,6 +3,7 @@ package resonantinduction.wire.render; import java.util.Arrays; import java.util.LinkedList; +import net.minecraft.block.Block; import net.minecraft.util.Icon; import resonantinduction.wire.part.FlatWire; import codechicken.lib.lighting.LightModel; @@ -26,6 +27,8 @@ import codechicken.lib.vec.Vector3; public class RenderFlatWire { + public static Icon flatWireTexture; + public static class UVT implements IUVTransformation { public Transformation t;