From 8a9ad49d61c3cf7df209a1c26097c9544ae6005f Mon Sep 17 00:00:00 2001 From: Calclavia Date: Tue, 28 Jan 2014 11:52:19 +0800 Subject: [PATCH] Fixed gear not sending packets and disabled encoder --- .../java/resonantinduction/electrical/Electrical.java | 2 +- .../java/resonantinduction/mechanical/gear/PartGear.java | 9 +++++++-- .../resonantinduction/mechanical/gear/RenderGear.java | 3 +-- .../mechanical/network/PartMechanical.java | 3 ++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/resonantinduction/electrical/Electrical.java b/src/main/java/resonantinduction/electrical/Electrical.java index 2b9709fc..62329abf 100644 --- a/src/main/java/resonantinduction/electrical/Electrical.java +++ b/src/main/java/resonantinduction/electrical/Electrical.java @@ -116,7 +116,7 @@ public class Electrical // Transport blockEMLevitator = contentRegistry.createTile(BlockLevitator.class, TileLevitator.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); // Generator diff --git a/src/main/java/resonantinduction/mechanical/gear/PartGear.java b/src/main/java/resonantinduction/mechanical/gear/PartGear.java index 36402380..df988a1a 100644 --- a/src/main/java/resonantinduction/mechanical/gear/PartGear.java +++ b/src/main/java/resonantinduction/mechanical/gear/PartGear.java @@ -82,8 +82,13 @@ public class PartGear extends PartMechanical implements IMechanical, IMultiBlock @Override public boolean activate(EntityPlayer player, MovingObjectPosition hit, ItemStack item) { - if(!world().isRemote) - System.out.println(getNetwork()); + if (!world().isRemote) + { + System.out.println(getNetwork()); + // for(Object obj : connections) + // System.out.println(obj); + } + if (BlockAdvanced.isUsableWrench(player, player.getCurrentEquippedItem(), x(), y(), z())) { if (player.isSneaking()) diff --git a/src/main/java/resonantinduction/mechanical/gear/RenderGear.java b/src/main/java/resonantinduction/mechanical/gear/RenderGear.java index dd10156f..2dbc6fed 100644 --- a/src/main/java/resonantinduction/mechanical/gear/RenderGear.java +++ b/src/main/java/resonantinduction/mechanical/gear/RenderGear.java @@ -23,9 +23,8 @@ public class RenderGear public void renderInventory(Block block, int metadata, int modelID, RenderBlocks renderer) { GL11.glRotatef(90, 1, 0, 0); - GL11.glScalef(0.5f, 0.5f, 0.5f); 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) diff --git a/src/main/java/resonantinduction/mechanical/network/PartMechanical.java b/src/main/java/resonantinduction/mechanical/network/PartMechanical.java index 1c5aa076..6e2860da 100644 --- a/src/main/java/resonantinduction/mechanical/network/PartMechanical.java +++ b/src/main/java/resonantinduction/mechanical/network/PartMechanical.java @@ -78,7 +78,8 @@ public abstract class PartMechanical extends JCuboidPart implements JNormalOcclu ticks++; angle += angularVelocity / 20; - + + checkClientUpdate(); super.update(); }