SteamWar/BauSystem2.0
Archiviert
12
0

Update Loader
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Signed-off-by: yoyosource <yoyosource@nidido.de>
Dieser Commit ist enthalten in:
yoyosource 2023-05-01 16:39:00 +02:00
Ursprung e997243887
Commit 35f882c123
7 geänderte Dateien mit 17 neuen und 16 gelöschten Zeilen

Datei anzeigen

@ -138,7 +138,7 @@ public class LoaderRecorder implements Listener {
public void onPlayerMove(PlayerMoveEvent event) { public void onPlayerMove(PlayerMoveEvent event) {
if (event.getPlayer() != player) return; if (event.getPlayer() != player) return;
Block fromBlock = event.getTo().getBlock(); Block fromBlock = event.getFrom().getBlock();
Block toBlock = event.getTo().getBlock(); Block toBlock = event.getTo().getBlock();
calcMovementBlocks(fromBlock, toBlock); calcMovementBlocks(fromBlock, toBlock);

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(9, new SWItem(Material.ARROW, "§8Back").getItemStack(), clickType -> backAction.run());
swInventory.setItem(17, new SWItem(Material.BARRIER, "§cDelete").getItemStack(), clickType -> deleteAction.run()); swInventory.setItem(17, new SWItem(Material.BARRIER, "§cDelete").getItemStack(), clickType -> deleteAction.run());
swInventory.setItem(2, item(player, true, null).getItemStack(), clickType -> { swInventory.setItem(2, item(player, false, null).getItemStack(), clickType -> {
interact = true;
click(player, backAction, deleteAction);
});
swInventory.setItem(3, item(player, false, null).getItemStack(), clickType -> {
interact = false; interact = false;
mode = null; mode = null;
click(player, backAction, deleteAction); 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 -> { swInventory.setItem(5, item(player, false, Comparator.Mode.COMPARE).getItemStack(), clickType -> {
interact = false; interact = false;
mode = Comparator.Mode.COMPARE; mode = Comparator.Mode.COMPARE;

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(27, new SWItem(Material.ARROW, "§8Back").getItemStack(), clickType -> backAction.run());
swInventory.setItem(35, new SWItem(Material.BARRIER, "§cDelete").getItemStack(), clickType -> deleteAction.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; noop = true;
click(player, backAction, deleteAction); click(player, backAction, deleteAction);
}); });

Datei anzeigen

@ -50,6 +50,7 @@ public class LoaderMovement extends LoaderInteractionElement<LoaderMovement.Move
} }
public void setInitialTicks(long ticks) { public void setInitialTicks(long ticks) {
if (ticks < 1) ticks = 1;
elements.get(currentShot).ticks = ticks; 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 ? 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(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; noop = true;
click(player, backAction, deleteAction); click(player, backAction, deleteAction);
}); });

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(9, new SWItem(Material.ARROW, "§8Back").getItemStack(), clickType -> backAction.run());
swInventory.setItem(17, new SWItem(Material.BARRIER, "§cDelete").getItemStack(), clickType -> deleteAction.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; interact = false;
click(player, backAction, deleteAction); click(player, backAction, deleteAction);
}); });
swInventory.setItem(5, item(player, true).getItemStack(), clickType -> { swInventory.setItem(3, item(player, true).getItemStack(), clickType -> {
interact = true; interact = true;
click(player, backAction, deleteAction); click(player, backAction, deleteAction);
}); });

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(9, new SWItem(Material.ARROW, "§8Back").getItemStack(), clickType -> backAction.run());
swInventory.setItem(17, new SWItem(Material.BARRIER, "§cDelete").getItemStack(), clickType -> deleteAction.run()); swInventory.setItem(17, new SWItem(Material.BARRIER, "§cDelete").getItemStack(), clickType -> deleteAction.run());
swInventory.setItem(1, item(player, true, -1).getItemStack(), clickType -> { swInventory.setItem(1, item(player, false, 0).getItemStack(), clickType -> {
interact = true;
click(player, backAction, deleteAction);
});
swInventory.setItem(2, item(player, false, 0).getItemStack(), clickType -> {
interact = false; interact = false;
delay = 0; delay = 0;
click(player, backAction, deleteAction); 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 -> { swInventory.setItem(4, item(player, false, 1).getItemStack(), clickType -> {
interact = false; interact = false;
delay = 1; delay = 1;

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 ? 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(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; noop = true;
click(player, backAction, deleteAction); click(player, backAction, deleteAction);
}); });