From 35f882c1239fbbd8d773b91f5046b6ce14441ec7 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 1 May 2023 16:39:00 +0200 Subject: [PATCH] Update Loader Signed-off-by: yoyosource --- .../bausystem/features/loadern/LoaderRecorder.java | 2 +- .../loadern/elements/impl/LoaderComparator.java | 10 +++++----- .../features/loadern/elements/impl/LoaderLectern.java | 2 +- .../features/loadern/elements/impl/LoaderMovement.java | 3 ++- .../loadern/elements/impl/LoaderNoteBlock.java | 4 ++-- .../features/loadern/elements/impl/LoaderRepeater.java | 10 +++++----- .../features/loadern/elements/impl/LoaderTicks.java | 2 +- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/LoaderRecorder.java b/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/LoaderRecorder.java index 329cfd55..04eb1c11 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/LoaderRecorder.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/LoaderRecorder.java @@ -138,7 +138,7 @@ public class LoaderRecorder implements Listener { public void onPlayerMove(PlayerMoveEvent event) { if (event.getPlayer() != player) return; - Block fromBlock = event.getTo().getBlock(); + Block fromBlock = event.getFrom().getBlock(); Block toBlock = event.getTo().getBlock(); calcMovementBlocks(fromBlock, toBlock); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderComparator.java b/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderComparator.java index d92ea4ad..1205e4bf 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderComparator.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderComparator.java @@ -82,15 +82,15 @@ public class LoaderComparator extends LoaderInteractionElement backAction.run()); swInventory.setItem(17, new SWItem(Material.BARRIER, "§cDelete").getItemStack(), clickType -> deleteAction.run()); - swInventory.setItem(2, item(player, true, null).getItemStack(), clickType -> { - interact = true; - click(player, backAction, deleteAction); - }); - swInventory.setItem(3, item(player, false, null).getItemStack(), clickType -> { + swInventory.setItem(2, item(player, false, null).getItemStack(), clickType -> { interact = false; mode = null; click(player, backAction, deleteAction); }); + swInventory.setItem(3, item(player, true, null).getItemStack(), clickType -> { + interact = true; + click(player, backAction, deleteAction); + }); swInventory.setItem(5, item(player, false, Comparator.Mode.COMPARE).getItemStack(), clickType -> { interact = false; mode = Comparator.Mode.COMPARE; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderLectern.java b/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderLectern.java index 033d936a..5df1594d 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderLectern.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderLectern.java @@ -94,7 +94,7 @@ public class LoaderLectern extends LoaderInteractionElement backAction.run()); swInventory.setItem(35, new SWItem(Material.BARRIER, "§cDelete").getItemStack(), clickType -> deleteAction.run()); - swInventory.setItem(3, item(player, true, LecternAction.PAGE_SET, 0).getItemStack(), clickType -> { + swInventory.setItem(2, item(player, true, LecternAction.PAGE_SET, 0).getItemStack(), clickType -> { noop = true; click(player, backAction, deleteAction); }); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderMovement.java b/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderMovement.java index ee1f11ac..176ffd19 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderMovement.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderMovement.java @@ -50,6 +50,7 @@ public class LoaderMovement extends LoaderInteractionElement backAction.run()); swInventory.setItem(analogue ? 44 : 26, new SWItem(Material.BARRIER, "§cDelete").getItemStack(), clickType -> deleteAction.run()); - swInventory.setItem(3, item(player, true, false).getItemStack(), clickType -> { + swInventory.setItem(2, item(player, true, false).getItemStack(), clickType -> { noop = true; click(player, backAction, deleteAction); }); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderNoteBlock.java b/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderNoteBlock.java index 5f062f87..53811035 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderNoteBlock.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderNoteBlock.java @@ -79,11 +79,11 @@ public class LoaderNoteBlock extends LoaderInteractionElement backAction.run()); swInventory.setItem(17, new SWItem(Material.BARRIER, "§cDelete").getItemStack(), clickType -> deleteAction.run()); - swInventory.setItem(3, item(player, false).getItemStack(), clickType -> { + swInventory.setItem(2, item(player, false).getItemStack(), clickType -> { interact = false; click(player, backAction, deleteAction); }); - swInventory.setItem(5, item(player, true).getItemStack(), clickType -> { + swInventory.setItem(3, item(player, true).getItemStack(), clickType -> { interact = true; click(player, backAction, deleteAction); }); diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderRepeater.java b/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderRepeater.java index a0e50e48..102ee35c 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderRepeater.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderRepeater.java @@ -86,15 +86,15 @@ public class LoaderRepeater extends LoaderInteractionElement backAction.run()); swInventory.setItem(17, new SWItem(Material.BARRIER, "§cDelete").getItemStack(), clickType -> deleteAction.run()); - swInventory.setItem(1, item(player, true, -1).getItemStack(), clickType -> { - interact = true; - click(player, backAction, deleteAction); - }); - swInventory.setItem(2, item(player, false, 0).getItemStack(), clickType -> { + swInventory.setItem(1, item(player, false, 0).getItemStack(), clickType -> { interact = false; delay = 0; click(player, backAction, deleteAction); }); + swInventory.setItem(2, item(player, true, -1).getItemStack(), clickType -> { + interact = true; + click(player, backAction, deleteAction); + }); swInventory.setItem(4, item(player, false, 1).getItemStack(), clickType -> { interact = false; delay = 1; diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderTicks.java b/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderTicks.java index 8e203d7d..5b615f20 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderTicks.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderTicks.java @@ -128,7 +128,7 @@ public class LoaderTicks extends LoaderInteractionElement backAction.run()); swInventory.setItem(analogue ? 35 : 17, new SWItem(Material.BARRIER, "§cDelete").getItemStack(), clickType -> deleteAction.run()); - swInventory.setItem(3, item(player, true, false).getItemStack(), clickType -> { + swInventory.setItem(2, item(player, true, false).getItemStack(), clickType -> { noop = true; click(player, backAction, deleteAction); });