Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Insulation cleaning

Browse source
This commit is contained in:
Ben Spiers 2013-09-27 00:40:39 +01:00
parent a70bf89aac
commit f51a371559
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/resonantinduction/wire/multipart/PartWire.java
View file

@ -408,19 +408,22 @@ public class PartWire extends PartUniversalConductor implements TSlottedPart, JN
setDye(item.getItemDamage()); setDye(item.getItemDamage());
return true; return true;
} }
else if (item.itemID == Block.cloth.blockID && !isInsulated()) else if (item.itemID == Block.cloth.blockID)
{ {
setInsulated(); if (isInsulated() && !world().isRemote)
setDye(BlockColored.getDyeFromBlock(item.getItemDamage())); {
tile().dropItems(Collections.singletonList(new ItemStack(Block.cloth, 1, BlockColored.getBlockFromDye(dyeID))));
}
setInsulated(BlockColored.getDyeFromBlock(item.getItemDamage()));
player.inventory.decrStackSize(player.inventory.currentItem, 1); player.inventory.decrStackSize(player.inventory.currentItem, 1);
return true; return true;
} }
else if (item.itemID == Item.shears.itemID || item.getItem() instanceof ItemShears) else if ((item.itemID == Item.shears.itemID || item.getItem() instanceof ItemShears) && this.isInsulated())
{ {
if (!world().isRemote && this.isInsulated()) if (!world().isRemote)
tile().dropItems(Collections.singletonList(new ItemStack(Block.cloth, 1, BlockColored.getBlockFromDye(dyeID)))); tile().dropItems(Collections.singletonList(new ItemStack(Block.cloth, 1, BlockColored.getBlockFromDye(dyeID))));
setInsulated(false); setInsulated(false);
setDye(DEFAULT_COLOR); return true;
} }
} }
if (!world().isRemote)player.addChatMessage(getNetwork().toString()); if (!world().isRemote)player.addChatMessage(getNetwork().toString());
@ -469,6 +472,16 @@ public class PartWire extends PartUniversalConductor implements TSlottedPart, JN
public void setInsulated(boolean insulated) public void setInsulated(boolean insulated)
{ {
this.isInsulated = insulated; this.isInsulated = insulated;
this.dyeID = DEFAULT_COLOR;
this.refresh();
this.world().markBlockForUpdate(this.x(), this.y(), this.z());
((TileMultipart)this.tile()).notifyPartChange(this);
}
public void setInsulated(int dyeColour)
{
this.isInsulated = true;
this.dyeID = dyeColour;
this.refresh(); this.refresh();
this.world().markBlockForUpdate(this.x(), this.y(), this.z()); this.world().markBlockForUpdate(this.x(), this.y(), this.z());
((TileMultipart)this.tile()).notifyPartChange(this); ((TileMultipart)this.tile()).notifyPartChange(this);