tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Removed some unused textures

Browse source
This commit is contained in:
Calclavia 2013-12-22 13:31:04 +08:00
parent 8c63bbb457
commit 3bdcceddf1
5 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
resources/assets/resonantinduction/textures/items/models/lainWire.png → resources/assets/resonantinduction/textures/items/models/flatWire.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
resources/assets/resonantinduction/textures/items/models/insulationtiny.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
resources/assets/resonantinduction/textures/items/models/wire.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 702 B

4
src/resonantinduction/wire/ItemPartWire.java
View file

@ -14,7 +14,6 @@ import resonantinduction.ResonantInduction;
import resonantinduction.TabRI; import resonantinduction.TabRI;
import resonantinduction.Utility; import resonantinduction.Utility;
import resonantinduction.wire.part.FlatWire; import resonantinduction.wire.part.FlatWire;
import resonantinduction.wire.render.RenderPartWire;
import universalelectricity.api.energy.UnitDisplay; import universalelectricity.api.energy.UnitDisplay;
import universalelectricity.api.energy.UnitDisplay.Unit; import universalelectricity.api.energy.UnitDisplay.Unit;
import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.BlockCoord;
@ -27,6 +26,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class ItemPartWire extends JItemMultiPart public class ItemPartWire extends JItemMultiPart
{ {
public static Icon flatWireTexture;
private Icon[] icons = new Icon[EnumWireMaterial.values().length]; private Icon[] icons = new Icon[EnumWireMaterial.values().length];
public ItemPartWire(int id) public ItemPartWire(int id)
@ -86,7 +86,7 @@ public class ItemPartWire extends JItemMultiPart
icons[material.ordinal()] = register.registerIcon(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); flatWireTexture = register.registerIcon(ResonantInduction.PREFIX + "models/flatWire");
} }
@Override @Override

20
src/resonantinduction/wire/part/FlatWire.java
View file

@ -14,8 +14,8 @@ import org.lwjgl.opengl.GL11;
import resonantinduction.Utility; import resonantinduction.Utility;
import resonantinduction.wire.EnumWireMaterial; import resonantinduction.wire.EnumWireMaterial;
import resonantinduction.wire.IAdvancedConductor; import resonantinduction.wire.IAdvancedConductor;
import resonantinduction.wire.ItemPartWire;
import resonantinduction.wire.render.RenderFlatWire; import resonantinduction.wire.render.RenderFlatWire;
import resonantinduction.wire.render.RenderPartWire;
import codechicken.lib.colour.Colour; import codechicken.lib.colour.Colour;
import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataInput;
import codechicken.lib.data.MCDataOutput; import codechicken.lib.data.MCDataOutput;
@ -198,7 +198,7 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
connMap = 0; connMap = 0;
updateInternalConnections(); updateInternalConnections();
if (updateOpenConnections()) if (updateOpenConnections())
{ {
updateExternalConnections(); updateExternalConnections();
@ -212,14 +212,14 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
public void onAdded() public void onAdded()
{ {
super.onAdded(); super.onAdded();
if (!world().isRemote) if (!world().isRemote)
{ {
updateOpenConnections(); updateOpenConnections();
boolean changed = updateInternalConnections(); boolean changed = updateInternalConnections();
// don't use || because it's fail fast // don't use || because it's fail fast
changed |= updateExternalConnections(); changed |= updateExternalConnections();
if (changed) if (changed)
{ {
sendConnUpdate(); sendConnUpdate();
@ -279,10 +279,12 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
for (int r = 0; r < 4; r++) for (int r = 0; r < 4; r++)
{ {
/*if (!maskOpen(r)) /*
{ * if (!maskOpen(r))
continue; * {
}*/ * continue;
* }
*/
if (connectStraight(r)) if (connectStraight(r))
{ {
@ -621,7 +623,7 @@ public class FlatWire extends PartWireBase implements TFacePart, JNormalOcclusio
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public Icon getIcon() public Icon getIcon()
{ {
return RenderPartWire.lainWireIcon; return ItemPartWire.flatWireTexture;
} }
public Colour getColour() public Colour getColour()