From de82ff94a15dfe5592977a7aa5737d616156022b Mon Sep 17 00:00:00 2001 From: Robert S Date: Wed, 16 Apr 2014 09:01:05 -0400 Subject: [PATCH] Re-enabled item lev, instead disabled recipe && part updating --- .../main/scala/resonantinduction/electrical/Electrical.java | 4 ++-- .../resonantinduction/electrical/levitator/PartLevitator.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/electrical/src/main/scala/resonantinduction/electrical/Electrical.java b/electrical/src/main/scala/resonantinduction/electrical/Electrical.java index c8aee3aa3..5a8606a11 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/Electrical.java +++ b/electrical/src/main/scala/resonantinduction/electrical/Electrical.java @@ -109,7 +109,7 @@ public class Electrical blockBattery = contentRegistry.createBlock(BlockBattery.class, ItemBlockBattery.class, TileBattery.class); // Transport - //itemLevitator = contentRegistry.createItem(ItemLevitator.class); + itemLevitator = contentRegistry.createItem(ItemLevitator.class); // blockArmbot = contentRegistry.createTile(BlockArmbot.lass, TileEncoder.clclass, // TileArmbot.class); // blockEncoder = contentRegistry.createTile(BlockEncoder.cass); @@ -189,7 +189,7 @@ public class Electrical GameRegistry.addRecipe(new ShapedOreRecipe(itemCharger, "WWW", "ICI", 'W', "wire", 'I', UniversalRecipe.PRIMARY_METAL.get(), 'C', UniversalRecipe.CIRCUIT_T1.get())); GameRegistry.addRecipe(new ShapedOreRecipe(itemTransformer, "WWW", "WWW", "III", 'W', "wire", 'I', UniversalRecipe.PRIMARY_METAL.get())); - GameRegistry.addRecipe(new ShapedOreRecipe(itemLevitator, " G ", "SDS", "SWS", 'W', "wire", 'G', Block.glass, 'D', Block.blockDiamond, 'S', UniversalRecipe.PRIMARY_METAL.get())); + //GameRegistry.addRecipe(new ShapedOreRecipe(itemLevitator, " G ", "SDS", "SWS", 'W', "wire", 'G', Block.glass, 'D', Block.blockDiamond, 'S', UniversalRecipe.PRIMARY_METAL.get())); /** Quantum Gates */ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(itemQuantumGlyph, 1, 0), " CT", "LBL", "TCT", 'B', Block.blockDiamond, 'L', itemLevitator, 'C', itemCharger, 'T', blockTesla)); diff --git a/electrical/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java b/electrical/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java index d5ef4f020..1b051873b 100644 --- a/electrical/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java +++ b/electrical/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java @@ -514,7 +514,8 @@ public class PartLevitator extends PartFace public boolean canFunction() { - return isLatched() && !world().isBlockIndirectlyGettingPowered(x(), y(), z()); + //TODO remove (false) when working on + return false && isLatched() && !world().isBlockIndirectlyGettingPowered(x(), y(), z()); } public boolean isLatched()