Changed insulation back to wool until i can implement an insulation handler
This commit is contained in:
parent
e34ef8e294
commit
81ee8e26cf
2 changed files with 8 additions and 7 deletions
|
@ -184,8 +184,8 @@ public class Electrical
|
|||
GameRegistry.addRecipe(new ShapedOreRecipe(tierThreeBattery, "RRR", "RIR", "RRR", 'R', tierTwoBattery, 'I', Block.blockDiamond));
|
||||
|
||||
/** Wires **/
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(itemInsulation, Item.slimeBall, new ItemStack(Block.cloth, 2, OreDictionary.WILDCARD_VALUE)));
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(itemInsulation, "slimeball", new ItemStack(Block.cloth, 2, OreDictionary.WILDCARD_VALUE)));
|
||||
//GameRegistry.addRecipe(new ShapelessOreRecipe(itemInsulation, Item.slimeBall, new ItemStack(Block.cloth, 2, OreDictionary.WILDCARD_VALUE)));
|
||||
//GameRegistry.addRecipe(new ShapelessOreRecipe(itemInsulation, "slimeball", new ItemStack(Block.cloth, 2, OreDictionary.WILDCARD_VALUE)));
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(EnumWireMaterial.COPPER.getWire(3), "MMM", 'M', "ingotCopper"));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(EnumWireMaterial.TIN.getWire(3), "MMM", 'M', "ingotTin"));
|
||||
|
|
|
@ -4,6 +4,7 @@ import java.util.ArrayList;
|
|||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockColored;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
@ -34,7 +35,7 @@ public abstract class PartAdvancedWire extends PartConductor
|
|||
|
||||
public EnumWireMaterial material = EnumWireMaterial.COPPER;
|
||||
public boolean isInsulated = false;
|
||||
protected Item insulationType = Electrical.itemInsulation;
|
||||
protected ItemStack insulationType = new ItemStack(Block.cloth);
|
||||
|
||||
/** INTERNAL USE. Can this conductor connect with an external object? */
|
||||
@Override
|
||||
|
@ -205,13 +206,13 @@ public abstract class PartAdvancedWire extends PartConductor
|
|||
this.setColor(dyeColor);
|
||||
return true;
|
||||
}
|
||||
else if (itemStack.getItem() == insulationType)
|
||||
else if (itemStack.itemID == insulationType.itemID)
|
||||
{
|
||||
if (this.isInsulated())
|
||||
{
|
||||
if (!world().isRemote && player.capabilities.isCreativeMode)
|
||||
{
|
||||
tile().dropItems(Collections.singletonList(new ItemStack(insulationType, 1, BlockColored.getBlockFromDye(color))));
|
||||
tile().dropItems(Collections.singletonList(insulationType));
|
||||
}
|
||||
|
||||
this.setInsulated(false);
|
||||
|
@ -232,7 +233,7 @@ public abstract class PartAdvancedWire extends PartConductor
|
|||
{
|
||||
if (!world().isRemote && !player.capabilities.isCreativeMode)
|
||||
{
|
||||
tile().dropItems(Collections.singletonList(new ItemStack(insulationType, 1, BlockColored.getBlockFromDye(color))));
|
||||
tile().dropItems(Collections.singletonList(insulationType));
|
||||
}
|
||||
|
||||
this.setInsulated(false);
|
||||
|
@ -257,7 +258,7 @@ public abstract class PartAdvancedWire extends PartConductor
|
|||
|
||||
if (this.isInsulated)
|
||||
{
|
||||
drops.add(new ItemStack(insulationType, 1, BlockColored.getBlockFromDye(color)));
|
||||
drops.add(insulationType.copy());
|
||||
}
|
||||
|
||||
return drops;
|
||||
|
|
Loading…
Reference in a new issue