SteamWar/BauSystem2.0
SteamWar/BauSystem2.0
11
0
Fork 0
Code Issues 32 Pull-Requests Projekte Releases Wiki Aktivität

Refactored PhaseGuis

Quellcode durchsuchen
Dieser Commit ist enthalten in:
D4rkr34lm 2023-10-10 00:37:19 +02:00 committet von yoyosource
Ursprung 273fba879e
Commit f067e55d1f
3 geänderte Dateien mit 20 neuen und 59 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

12
BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/data/SimulatorSetting.java
Datei anzeigen

@ -29,16 +29,4 @@ public abstract class SimulatorSetting {
protected int tickOffset;
protected int lifetime = 80;
protected int order = 1;
public void changeOffset(int tick){
tickOffset += tick;
}
public void changeLifetime(int tick){
lifetime += tick;
}
public void changeOrder(int tick){
order += tick;
}
}

29
BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/gui/SimulatorRedstonePhaseGui.java
Datei anzeigen

@ -66,6 +66,7 @@ public class SimulatorRedstonePhaseGui extends SimulatorBaseGui {
new SimulatorMaterialGui(player, simulator, redstoneElement::getMaterial, redstoneElement::setMaterial, this).open();
}));
// Delete
inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
redstoneElement.getSettings().remove(redstone);
back.open();
@ -75,40 +76,32 @@ public class SimulatorRedstonePhaseGui extends SimulatorBaseGui {
//Tick Offset
int offset = redstone.getTickOffset();
inventory.setItem(11, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
redstone.changeOffset(clickType.isShiftClick() ? 5 : 1);
redstone.setTickOffset(offset + (clickType.isShiftClick() ? 5 : 1));
SimulatorWatcher.update(simulator);
});
SWItem offsetItem = new SWItem(Material.REPEATER, "§eTicks§8:§7 " + offset, clickType -> {});
offsetItem.getItemStack().setAmount(Math.max(1, Math.min(offset, 64)));
inventory.setItem(20, offsetItem);
inventory.setItem(29, SWItem.getDye(offset > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
if (offset - (clickType.isShiftClick() ? 5 : 1) < 0) {
redstone.changeOffset(-offset);
} else {
redstone.changeOffset(clickType.isShiftClick() ? -5 : -1);
}
redstone.setTickOffset(Math.max(1, offset - (clickType.isShiftClick() ? -5 : -1)));
SimulatorWatcher.update(simulator);
});
//Lifetime
int lifetime = redstone.getLifetime();
inventory.setItem(12, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
redstone.changeLifetime(clickType.isShiftClick() ? 5 : 1);
redstone.setLifetime(lifetime + (clickType.isShiftClick() ? 5 : 1));
SimulatorWatcher.update(simulator);
});
SWItem lifetimeItem = new SWItem(Material.CLOCK, "§eLifetime§8:§7 " + lifetime, clickType -> {});
lifetimeItem.getItemStack().setAmount(Math.max(1, Math.min(lifetime, 64)));
inventory.setItem(21, lifetimeItem);
inventory.setItem(30, SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
if (lifetime - (clickType.isShiftClick() ? 5 : 1) < 0) {
redstone.changeLifetime(-lifetime);
} else {
redstone.changeLifetime(clickType.isShiftClick() ? -5 : -1);
}
redstone.setLifetime(Math.max(1, lifetime - (clickType.isShiftClick() ? -5 : -1)));
SimulatorWatcher.update(simulator);
});
@ -120,15 +113,11 @@ public class SimulatorRedstonePhaseGui extends SimulatorBaseGui {
});
SWItem orderItem = new SWItem(Material.COMPASS, "§eOrder§8:§7 " + order, clickType -> {});
orderItem.getItemStack().setAmount(Math.max(1, Math.min(order, 64)));
inventory.setItem(23, orderItem);
inventory.setItem(32, SWItem.getDye(order > 1 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
if (order - (clickType.isShiftClick() ? 5 : 1) < 1) {
redstone.changeOrder(-order);
} else {
redstone.changeOrder(clickType.isShiftClick() ? -5 : -1);
}
redstone.setOrder(Math.max(1, order - (clickType.isShiftClick() ? -5 : -1)));
SimulatorWatcher.update(simulator);
});
}

38
BauSystem_Main/src/de/steamwar/bausystem/features/simulator2/gui/SimulatorTntPhaseGui.java
Datei anzeigen

@ -68,6 +68,7 @@ public class SimulatorTntPhaseGui extends SimulatorBaseGui{
new SimulatorMaterialGui(player, simulator, tntElement::getMaterial, tntElement::setMaterial, this).open();
}));
//Delete
inventory.setItem(8, new SWItem(Material.BARRIER, "§eDelete", clickType -> {
tntElement.getSettings().remove(tnt);
back.open();
@ -82,55 +83,43 @@ public class SimulatorTntPhaseGui extends SimulatorBaseGui{
});
SWItem countItem = new SWItem(Material.REPEATER, "§eTicks§8:§7 " + count, clickType -> {});
countItem.getItemStack().setAmount(Math.max(1, Math.min(count, 64)));
inventory.setItem(19, countItem);
inventory.setItem(28, SWItem.getDye(count > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
if (count - (clickType.isShiftClick() ? 5 : 1) < 1) {
tnt.setCount(1);
} else {
tnt.setCount(count + (clickType.isShiftClick() ? -5 : -1));
}
tnt.setCount(Math.max(1, count - (clickType.isShiftClick() ? -5 : -1)));
SimulatorWatcher.update(simulator);
});
//Tick Offset
int offset = tnt.getTickOffset();
inventory.setItem(10, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
tnt.changeOffset(clickType.isShiftClick() ? 5 : 1);
tnt.setTickOffset(offset + (clickType.isShiftClick() ? 5 : 1));
SimulatorWatcher.update(simulator);
});
SWItem offsetItem = new SWItem(Material.REPEATER, "§eTicks§8:§7 " + offset, clickType -> {});
offsetItem.getItemStack().setAmount(Math.max(1, Math.min(offset, 64)));
inventory.setItem(19, offsetItem);
inventory.setItem(28, SWItem.getDye(offset > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
if (offset - (clickType.isShiftClick() ? 5 : 1) < 0) {
tnt.changeOffset(-offset);
} else {
tnt.changeOffset(clickType.isShiftClick() ? -5 : -1);
}
tnt.setTickOffset(Math.max(1, offset - (clickType.isShiftClick() ? -5 : -1)));
SimulatorWatcher.update(simulator);
});
//Lifetime
int lifetime = tnt.getLifetime();
inventory.setItem(11, SWItem.getDye(10), "§e+1", Arrays.asList("§7Shift§8: §e+5"), false, clickType -> {
tnt.changeLifetime(clickType.isShiftClick() ? 5 : 1);
tnt.setLifetime(lifetime + (clickType.isShiftClick() ? 5 : 1));
SimulatorWatcher.update(simulator);
});
SWItem lifetimeItem = new SWItem(Material.CLOCK, "§eLifetime§8:§7 " + lifetime, clickType -> {});
lifetimeItem.getItemStack().setAmount(Math.max(1, Math.min(lifetime, 64)));
inventory.setItem(20, lifetimeItem);
inventory.setItem(29, SWItem.getDye(lifetime > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
if (lifetime - (clickType.isShiftClick() ? 5 : 1) < 0) {
tnt.changeLifetime(-lifetime);
} else {
tnt.changeLifetime(clickType.isShiftClick() ? -5 : -1);
}
tnt.setLifetime(Math.max(1, lifetime - (clickType.isShiftClick() ? -5 : -1)));
SimulatorWatcher.update(simulator);
});
@ -146,11 +135,7 @@ public class SimulatorTntPhaseGui extends SimulatorBaseGui{
orderItem.getItemStack().setAmount(Math.max(1, Math.min(order, 64)));
inventory.setItem(22, orderItem);
inventory.setItem(31, SWItem.getDye(order > 0 ? 1 : 8), "§e-1", Arrays.asList("§7Shift§8: §e-5"), false, clickType -> {
if (order - (clickType.isShiftClick() ? 5 : 1) < 1) {
tnt.changeOrder(-order);
} else {
tnt.changeOrder(clickType.isShiftClick() ? -5 : -1);
}
tnt.setOrder(Math.max(1, order - (clickType.isShiftClick() ? -5 : -1)));
SimulatorWatcher.update(simulator);
});
@ -177,7 +162,6 @@ public class SimulatorTntPhaseGui extends SimulatorBaseGui{
tnt.setJump(!tnt.hasJump());
SimulatorWatcher.update(simulator);
});
//inventory.setItem();
inventory.setItem(25, jumpAll);
}
}