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

Merge branch 'development' of https://bitbucket.org/calclavia/resonant-induction into development

Browse source
This commit is contained in:
tgame14 2014-04-16 16:44:30 +03:00
commit 817e4fd9cf
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
electrical/src/main/scala/resonantinduction/electrical/Electrical.java
View file

@ -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));

3
electrical/src/main/scala/resonantinduction/electrical/levitator/PartLevitator.java
View file

@ -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()