From 311c41383b64c65ddb19660a2e313496122aa7b7 Mon Sep 17 00:00:00 2001 From: jojo Date: Sun, 14 Feb 2021 14:45:30 +0100 Subject: [PATCH] Fix GuiTraceShow --- .../src/de/steamwar/bausystem/tracer/TNTTracer_12.java | 4 ++++ .../src/de/steamwar/bausystem/tracer/TNTTracer_15.java | 4 ++++ .../src/de/steamwar/bausystem/gui/GuiTraceShow.java | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/BauSystem_12/src/de/steamwar/bausystem/tracer/TNTTracer_12.java b/BauSystem_12/src/de/steamwar/bausystem/tracer/TNTTracer_12.java index bfed2bb..4f1ed78 100644 --- a/BauSystem_12/src/de/steamwar/bausystem/tracer/TNTTracer_12.java +++ b/BauSystem_12/src/de/steamwar/bausystem/tracer/TNTTracer_12.java @@ -42,4 +42,8 @@ public class TNTTracer_12 { return Material.CONCRETE; } + public static Material getTraceXZMaterial() { + return Material.STEP; + } + } diff --git a/BauSystem_15/src/de/steamwar/bausystem/tracer/TNTTracer_15.java b/BauSystem_15/src/de/steamwar/bausystem/tracer/TNTTracer_15.java index ace2691..20ef07f 100644 --- a/BauSystem_15/src/de/steamwar/bausystem/tracer/TNTTracer_15.java +++ b/BauSystem_15/src/de/steamwar/bausystem/tracer/TNTTracer_15.java @@ -52,4 +52,8 @@ public class TNTTracer_15 { return Material.RED_CONCRETE; } + public static Material getTraceXZMaterial() { + return Material.QUARTZ_SLAB; + } + } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/gui/GuiTraceShow.java b/BauSystem_Main/src/de/steamwar/bausystem/gui/GuiTraceShow.java index 56b0fa3..c3625f7 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/gui/GuiTraceShow.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/gui/GuiTraceShow.java @@ -60,7 +60,8 @@ public class GuiTraceShow { swInventory.setItem(5, water); swInventory.setCallback(5, clickType -> toggleHideTNTinWaterExploded(player, swInventory, water)); - SWItem interpolateY = new SWItem(Material.QUARTZ_STAIRS, "§eInterpolation §7Y-Achse", Arrays.asList("§7Zeigt die Interpolation", "§7auf der Y-Achse."), false, clickType -> {}); + Material xzMaterial = VersionedCallable.call(new VersionedCallable<>(TNTTracer_12::getTraceXZMaterial, 8), new VersionedCallable<>(TNTTracer_15::getTraceXZMaterial, 14)); + SWItem interpolateY = new SWItem(xzMaterial, (byte) 7, "§eInterpolation §7Y-Achse", Arrays.asList("§7Zeigt die Interpolation", "§7auf der Y-Achse."), false, clickType -> {}); swInventory.setItem(6, interpolateY); swInventory.setCallback(6, clickType -> toggleInterpolateYPosition(player, swInventory, interpolateY));