From 1843def19d8bfad2d871cc9521526fdeb9e35ab2 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sun, 16 Oct 2016 17:04:57 +0200 Subject: [PATCH] We don't implement the layer stuff for now. Should be fine as is. --- .../client/book/data/content/ContentStructure.java | 10 +++++----- .../client/gui/book/element/ElementStructure.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/slimeknights/mantle/client/book/data/content/ContentStructure.java b/src/main/java/slimeknights/mantle/client/book/data/content/ContentStructure.java index 205ba8c..0c3c8be 100644 --- a/src/main/java/slimeknights/mantle/client/book/data/content/ContentStructure.java +++ b/src/main/java/slimeknights/mantle/client/book/data/content/ContentStructure.java @@ -71,7 +71,7 @@ public class ContentStructure extends PageContent { if(size != null && size.length == 3 && structure != null && structure.length > 0) { boolean showButtons = size[1] > 1; if(showButtons) { - structureSizeX -= GuiArrow.ArrowType.REFRESH.w; + //structureSizeX -= GuiArrow.ArrowType.REFRESH.w; } ElementStructure elementStructure = new ElementStructure(offset, y, structureSizeX, structureSizeY, size, structure); list.add(elementStructure); @@ -85,11 +85,11 @@ public class ContentStructure extends PageContent { int dx = (GuiArrow.ArrowType.REFRESH.w - GuiArrow.ArrowType.UP.w) / 2; - list.add(new ElementArrow(ElementStructure.BUTTON_ID_LAYER_UP, elementStructure, structureSizeX + offset + dx, midY, GuiArrow.ArrowType.UP, col, colHover)); - midY += GuiArrow.ArrowType.UP.h + 2; - list.add(new ElementArrow(ElementStructure.BUTTON_ID_LAYER_DOWN, elementStructure, structureSizeX + offset + dx, midY, GuiArrow.ArrowType.DOWN, col, colHover)); + //list.add(new ElementArrow(ElementStructure.BUTTON_ID_LAYER_UP, elementStructure, structureSizeX + offset + dx, midY, GuiArrow.ArrowType.UP, col, colHover)); + //midY += GuiArrow.ArrowType.UP.h + 2; + //list.add(new ElementArrow(ElementStructure.BUTTON_ID_LAYER_DOWN, elementStructure, structureSizeX + offset + dx, midY, GuiArrow.ArrowType.DOWN, col, colHover)); - list.add(new ElementAnimationToggle(ElementStructure.BUTTON_ID_ANIMATE, elementStructure, structureSizeX + offset, 0, GuiArrow.ArrowType.REFRESH, col, colHover, colToggled)); + list.add(new ElementAnimationToggle(ElementStructure.BUTTON_ID_ANIMATE, elementStructure, GuiBook.PAGE_WIDTH - GuiArrow.ArrowType.REFRESH.w, 0, GuiArrow.ArrowType.REFRESH, col, colHover, colToggled)); } } } 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 69d4155..f46d03b 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 @@ -331,8 +331,8 @@ public class ElementStructure extends SizedBookElement implements IButtonClickHa } */ - public boolean isAnimating() { - return canTick; + public void changeActiveLayer(int direction) { + } @Override