diff --git a/src/main/java/com/hbm/blocks/BlockDummyable.java b/src/main/java/com/hbm/blocks/BlockDummyable.java index 5597cf783..1cca3e365 100644 --- a/src/main/java/com/hbm/blocks/BlockDummyable.java +++ b/src/main/java/com/hbm/blocks/BlockDummyable.java @@ -631,13 +631,14 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl if(i == 2) facing = ForgeDirection.getOrientation(3); if(i == 3) facing = ForgeDirection.getOrientation(4); + ForgeDirection sideHit = ForgeDirection.getOrientation(mop.sideHit); facing = getDirModified(facing); - double originX = mop.blockX + facing.offsetX * o; - double originY = pY + (mop.sideHit == 1 ? 1 : 0); - double originZ = mop.blockZ + facing.offsetZ * o; + double originX = mop.blockX + facing.offsetX * o + sideHit.offsetX; + double originY = pY + sideHit.offsetY; + double originZ = mop.blockZ + facing.offsetZ * o + sideHit.offsetZ; - boolean canPlace = checkRequirement(player.worldObj, mop.blockX, pY + 1, mop.blockZ, facing, o); + boolean canPlace = checkRequirement(player.worldObj, mop.blockX + sideHit.offsetX, pY + sideHit.offsetY, mop.blockZ + sideHit.offsetZ, facing, o); Tessellator tess = Tessellator.instance; GL11.glPushMatrix(); diff --git a/src/main/java/com/hbm/render/tileentity/RenderLPW2.java b/src/main/java/com/hbm/render/tileentity/RenderLPW2.java index 4e4eacf41..34989045e 100644 --- a/src/main/java/com/hbm/render/tileentity/RenderLPW2.java +++ b/src/main/java/com/hbm/render/tileentity/RenderLPW2.java @@ -29,7 +29,7 @@ public class RenderLPW2 extends TileEntitySpecialRenderer { case 5: GL11.glRotatef(0, 0F, 1F, 0F); break; } - long time = te.getWorldObj().getTotalWorldTime(); + long time = te.getWorldObj().getTotalWorldTime() % 1000000; double swayTimer = ((time + interp) / 3D) % (Math.PI * 4); double sway = (Math.sin(swayTimer) + Math.sin(swayTimer * 2) + Math.sin(swayTimer * 4) + 2.23255D) * 0.5; diff --git a/src/main/resources/assets/hbm/textures/blocks/brick_forgotten_bw_lock.png b/src/main/resources/assets/hbm/textures/blocks/brick_forgotten_bw_lock.png new file mode 100644 index 000000000..cccb643a2 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/brick_forgotten_bw_lock.png differ diff --git a/src/main/resources/assets/hbm/textures/models/machines/lpw2.png b/src/main/resources/assets/hbm/textures/models/machines/lpw2.png index 4b0ec544c..1753c8643 100644 Binary files a/src/main/resources/assets/hbm/textures/models/machines/lpw2.png and b/src/main/resources/assets/hbm/textures/models/machines/lpw2.png differ