From c6c923dcdee7384fd65794b4d2b6076bcf054451 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sun, 9 Oct 2016 13:40:12 +0200 Subject: [PATCH] Fix meta not being considered for book structures --- .../client/gui/book/element/ElementStructure.java | 11 ++++------- .../books/TestBook/structures/stonesmeltery.json | 14 +++++++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementStructure.java b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementStructure.java index cdc3697..1e8115a 100644 --- a/src/main/java/slimeknights/mantle/client/gui/book/element/ElementStructure.java +++ b/src/main/java/slimeknights/mantle/client/gui/book/element/ElementStructure.java @@ -54,7 +54,6 @@ public class ElementStructure extends SizedBookElement { } boolean canTick = true; - boolean showCompleted = false; int tick = 0; float rotX = 0; @@ -62,7 +61,6 @@ public class ElementStructure extends SizedBookElement { float rotZ = 0; List componentTooltip; - //ItemStack[][][] structureData; StructureInfo structureData; StructureBlockAccess blockAccess; @@ -88,7 +86,7 @@ public class ElementStructure extends SizedBookElement { for(int sz = 0; sz < size[2]; sz++) { for(BlockData blockData : data) { if(inside(sx, sy, sz, blockData.pos, blockData.endPos)) { - structure[sy][sx][sz] = new ItemStack(Block.getBlockFromName(blockData.block)); + structure[sy][sx][sz] = new ItemStack(Block.getBlockFromName(blockData.block), 1, blockData.meta); } } } @@ -101,8 +99,8 @@ public class ElementStructure extends SizedBookElement { rotX = 25; rotY = -45; - - /*boolean canRenderFormed = multiblock.canRenderFormedStructure(); +/* + boolean canRenderFormed = multiblock.canRenderFormedStructure(); // yOff = (structureHeight-1)*12+structureWidth*5+structureLength*5+16; // yOff = Math.max(48, yOff); float f = (float)Math.sqrt(structureHeight*structureHeight + structureWidth*structureWidth + structureLength*structureLength); @@ -117,7 +115,7 @@ public class ElementStructure extends SizedBookElement { { pageButtons.add(new GuiButtonManualNavigation(gui, 101, x+4,y+yOff/2-(canRenderFormed?14:8)-16, 10,16, 3)); pageButtons.add(new GuiButtonManualNavigation(gui, 102, x+4,y+yOff/2+(canRenderFormed?14:8), 10,16, 2)); - }*/ + } /* IngredientStack[] totalMaterials = this.multiblock.getTotalMaterials(); if(false && false) @@ -189,7 +187,6 @@ public class ElementStructure extends SizedBookElement { } } - canTick = false; if(canTick) { if(++tick % 20 == 0) { structureData.step(); diff --git a/src/main/resources/assets/mantle/books/TestBook/structures/stonesmeltery.json b/src/main/resources/assets/mantle/books/TestBook/structures/stonesmeltery.json index 1106831..e2d146a 100644 --- a/src/main/resources/assets/mantle/books/TestBook/structures/stonesmeltery.json +++ b/src/main/resources/assets/mantle/books/TestBook/structures/stonesmeltery.json @@ -4,27 +4,31 @@ { "pos": [1, 0, 1], "endPos": [3, 0, 3], - "block": "minecraft:stone" + "block": "minecraft:stonebrick" }, { "pos": [0, 1, 1], "endPos": [0, 2, 3], - "block": "minecraft:stone" + "block": "minecraft:stonebrick", + "meta": 0 }, { "pos": [4, 1, 1], "endPos": [4, 2, 3], - "block": "minecraft:stone" + "block": "minecraft:stonebrick", + "meta": 1 }, { "pos": [1, 1, 0], "endPos": [3, 2, 0], - "block": "minecraft:stone" + "block": "minecraft:stonebrick", + "meta": 2 }, { "pos": [1, 1, 4], "endPos": [3, 2, 4], - "block": "minecraft:stone" + "block": "minecraft:stonebrick", + "meta": 3 }, { "pos": [2, 2, 2],