From e8513f4dca9fd2928ead555e0a5725e90f9fd083 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 20 Jul 2016 14:42:21 -0400 Subject: [PATCH] Fixed bounding block placement, fixed texture registration --- src/main/java/mekanism/common/item/ItemBlockMachine.java | 2 +- .../mekanism/generators/common/item/ItemBlockGenerator.java | 2 +- .../resources/assets/mekanism/blockstates/structural_glass.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 3b5b6bc34..8012052cb 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -297,7 +297,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec BlockPos pos1 = pos.add(xPos, yPos, zPos); Block b = world.getBlockState(pos1).getBlock(); - if(yPos > 255 || !b.isReplaceable(world, pos1)) + if(pos1.getY() > 255 || !b.isReplaceable(world, pos1)) { place = false; } diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 6338d3e04..81e3c5688 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -197,7 +197,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp outer: for(int yPos = 1; yPos <= 4; yPos++) { - if(!world.isAirBlock(pos.add(0, yPos, 0)) || yPos > 255) + if(!world.isAirBlock(pos.add(0, yPos, 0)) || pos.getY()+yPos > 255) { place = false; break outer; diff --git a/src/main/resources/assets/mekanism/blockstates/structural_glass.json b/src/main/resources/assets/mekanism/blockstates/structural_glass.json index f32198076..00bae141e 100644 --- a/src/main/resources/assets/mekanism/blockstates/structural_glass.json +++ b/src/main/resources/assets/mekanism/blockstates/structural_glass.json @@ -3,7 +3,7 @@ "defaults": { "model": "mekanism:basic_cube", "textures": { - "all": "mekanism:blocks/ctm/dynamic_glass" + "all": "mekanism:blocks/ctm/structural_glass" } }, "variants": {