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

Fixed gear not sending packets and disabled encoder

Browse source
This commit is contained in:
Calclavia 2014-01-28 11:52:19 +08:00
parent 7d468cb614
commit 8a9ad49d61
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/resonantinduction/electrical/Electrical.java
View file

@ -116,7 +116,7 @@ public class Electrical
// Transport // Transport
blockEMLevitator = contentRegistry.createTile(BlockLevitator.class, TileLevitator.class); blockEMLevitator = contentRegistry.createTile(BlockLevitator.class, TileLevitator.class);
// blockArmbot = contentRegistry.createTile(BlockArmbot.class, TileArmbot.class); // blockArmbot = contentRegistry.createTile(BlockArmbot.class, TileArmbot.class);
blockEncoder = contentRegistry.createTile(BlockEncoder.class, TileEncoder.class); //blockEncoder = contentRegistry.createTile(BlockEncoder.class, TileEncoder.class);
itemDisk = contentRegistry.createItem(ItemDisk.class); itemDisk = contentRegistry.createItem(ItemDisk.class);
// Generator // Generator

9
src/main/java/resonantinduction/mechanical/gear/PartGear.java
View file

@ -82,8 +82,13 @@ public class PartGear extends PartMechanical implements IMechanical, IMultiBlock
@Override @Override
public boolean activate(EntityPlayer player, MovingObjectPosition hit, ItemStack item) public boolean activate(EntityPlayer player, MovingObjectPosition hit, ItemStack item)
{ {
if(!world().isRemote) if (!world().isRemote)
System.out.println(getNetwork()); {
System.out.println(getNetwork());
// for(Object obj : connections)
// System.out.println(obj);
}
if (BlockAdvanced.isUsableWrench(player, player.getCurrentEquippedItem(), x(), y(), z())) if (BlockAdvanced.isUsableWrench(player, player.getCurrentEquippedItem(), x(), y(), z()))
{ {
if (player.isSneaking()) if (player.isSneaking())

3
src/main/java/resonantinduction/mechanical/gear/RenderGear.java
View file

@ -23,9 +23,8 @@ public class RenderGear
public void renderInventory(Block block, int metadata, int modelID, RenderBlocks renderer) public void renderInventory(Block block, int metadata, int modelID, RenderBlocks renderer)
{ {
GL11.glRotatef(90, 1, 0, 0); GL11.glRotatef(90, 1, 0, 0);
GL11.glScalef(0.5f, 0.5f, 0.5f);
RenderUtility.bind(Reference.BLOCK_TEXTURE_DIRECTORY + "planks_oak.png"); RenderUtility.bind(Reference.BLOCK_TEXTURE_DIRECTORY + "planks_oak.png");
MODEL.renderAll(); MODEL.renderOnly("SmallGear");
} }
public void renderDynamic(PartGear part, double x, double y, double z, float frame) public void renderDynamic(PartGear part, double x, double y, double z, float frame)

3
src/main/java/resonantinduction/mechanical/network/PartMechanical.java
View file

@ -78,7 +78,8 @@ public abstract class PartMechanical extends JCuboidPart implements JNormalOcclu
ticks++; ticks++;
angle += angularVelocity / 20; angle += angularVelocity / 20;
checkClientUpdate();
super.update(); super.update();
} }