SteamWar/BauSystem2.0
SteamWar/BauSystem2.0
Archiviert
12
0
Fork 0
Code Issues 39 Pull-Requests Projekte Releases Wiki Aktivität

LoaderRework #175

Zusammengeführt
YoyoNow hat 20 Commits von LoaderRework nach master 2023-05-09 18:31:42 +02:00 zusammengeführt
Diskussion 0 Commits 20 Geänderte Dateien 24 +17 -16
7 geänderte Dateien mit 17 neuen und 16 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen
Nur Änderungen aus Commit 35f882c123 werden angezeigt - Alle Commits anzeigen

2
BauSystem_Main/src/de/steamwar/bausystem/features/loadern/LoaderRecorder.java
Datei anzeigen

@ -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);

10
BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderComparator.java
Datei anzeigen

@ -82,15 +82,15 @@ public class LoaderComparator extends LoaderInteractionElement<LoaderComparator.
swInventory.setItem(9, new SWItem(Material.ARROW, "§8Back").getItemStack(), clickType -> 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;

2
BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderLectern.java
Datei anzeigen

@ -94,7 +94,7 @@ public class LoaderLectern extends LoaderInteractionElement<LoaderLectern.Lecter
swInventory.setItem(27, new SWItem(Material.ARROW, "§8Back").getItemStack(), clickType -> 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);
});

3
BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderMovement.java
Datei anzeigen

@ -50,6 +50,7 @@ public class LoaderMovement extends LoaderInteractionElement<LoaderMovement.Move
}
public void setInitialTicks(long ticks) {
if (ticks < 1) ticks = 1;
elements.get(currentShot).ticks = ticks;
}
@ -134,7 +135,7 @@ public class LoaderMovement extends LoaderInteractionElement<LoaderMovement.Move
swInventory.setItem(analogue ? 36 : 18, new SWItem(Material.ARROW, "§8Back").getItemStack(), clickType -> 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);
});

4
BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderNoteBlock.java
Datei anzeigen

@ -79,11 +79,11 @@ public class LoaderNoteBlock extends LoaderInteractionElement<LoaderNoteBlock.No
swInventory.setItem(9, new SWItem(Material.ARROW, "§8Back").getItemStack(), clickType -> 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);
});

10
BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderRepeater.java
Datei anzeigen

@ -86,15 +86,15 @@ public class LoaderRepeater extends LoaderInteractionElement<LoaderRepeater.Repe
swInventory.setItem(9, new SWItem(Material.ARROW, "§8Back").getItemStack(), clickType -> 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;

2
BauSystem_Main/src/de/steamwar/bausystem/features/loadern/elements/impl/LoaderTicks.java
Datei anzeigen

@ -128,7 +128,7 @@ public class LoaderTicks extends LoaderInteractionElement<LoaderTicks.TicksSetti
swInventory.setItem(analogue ? 27 : 9, new SWItem(Material.ARROW, "§8Back").getItemStack(), clickType -> 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);
});