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

1.7.10 error correction done, Loads in MC, but we still have a long list of bugs to fix

Browse source
This commit is contained in:
Robert S 2014-08-13 10:24:35 -04:00
parent 5cd22a8dd0
commit 0eab566d8d
2 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/scala/resonantinduction/core/ResonantTab.scala
View file

@ -4,6 +4,7 @@
package resonantinduction.core package resonantinduction.core
import net.minecraft.creativetab.CreativeTabs import net.minecraft.creativetab.CreativeTabs
import net.minecraft.init.Items
import net.minecraft.item.{ItemStack, Item} import net.minecraft.item.{ItemStack, Item}
/** /**
@ -14,7 +15,13 @@ object ResonantTab extends CreativeTabs(CreativeTabs.getNextID, "ResonantInducti
{ {
var itemStack: ItemStack = null var itemStack: ItemStack = null
override def getTabIconItem: Item = itemStack.getItem override def getTabIconItem: Item =
{
if(itemStack != null )
return itemStack.getItem
else
return Items.iron_ingot
}
def itemStack(item: ItemStack) { itemStack = item} def itemStack(item: ItemStack) { itemStack = item}

20
src/main/scala/resonantinduction/electrical/wire/ItemWire.java
View file

@ -20,8 +20,6 @@ import resonantinduction.core.Reference;
import resonantinduction.core.ResonantTab; import resonantinduction.core.ResonantTab;
import resonantinduction.electrical.wire.flat.PartFlatWire; import resonantinduction.electrical.wire.flat.PartFlatWire;
import resonantinduction.electrical.wire.flat.RenderFlatWire; import resonantinduction.electrical.wire.flat.RenderFlatWire;
import resonantinduction.electrical.wire.framed.PartFramedWire;
import resonantinduction.electrical.wire.framed.RenderFramedWire;
import codechicken.lib.vec.BlockCoord; import codechicken.lib.vec.BlockCoord;
import codechicken.lib.vec.Vector3; import codechicken.lib.vec.Vector3;
import codechicken.multipart.ControlKeyModifer; import codechicken.multipart.ControlKeyModifer;
@ -49,19 +47,6 @@ public class ItemWire extends JItemMultiPart
{ {
BlockCoord onPos = pos.copy().offset(side ^ 1); BlockCoord onPos = pos.copy().offset(side ^ 1);
if (player.isSneaking() && !ControlKeyModifer.isControlDown(player))
{
PartFramedWire wire = (PartFramedWire) MultiPartRegistry.createPart("resonant_induction_wire", false);
if (wire != null)
{
wire.preparePlacement(itemStack.getItemDamage());
}
return wire;
}
else
{
if (!MultipartUtility.canPlaceWireOnSide(world, onPos.x, onPos.y, onPos.z, ForgeDirection.getOrientation(side), false)) if (!MultipartUtility.canPlaceWireOnSide(world, onPos.x, onPos.y, onPos.z, ForgeDirection.getOrientation(side), false))
{ {
return null; return null;
@ -75,7 +60,6 @@ public class ItemWire extends JItemMultiPart
} }
return wire; return wire;
}
} }
@Override @Override
@ -119,8 +103,8 @@ public class ItemWire extends JItemMultiPart
public void registerIcons(IIconRegister register) public void registerIcons(IIconRegister register)
{ {
RenderFlatWire.flatWireTexture = register.registerIcon(Reference.prefix() + "models/flatWire"); RenderFlatWire.flatWireTexture = register.registerIcon(Reference.prefix() + "models/flatWire");
RenderFramedWire.wireIcon = register.registerIcon(Reference.prefix() + "models/wire"); //RenderFramedWire.wireIcon = register.registerIcon(Reference.prefix() + "models/wire");
RenderFramedWire.insulationIcon = register.registerIcon(Reference.prefix() + "models/insulation"); //RenderFramedWire.insulationIcon = register.registerIcon(Reference.prefix() + "models/insulation");
super.registerIcons(register); super.registerIcons(register);
} }