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

Fix some stuff
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details

Quellcode durchsuchen 
Signed-off-by: yoyosource <yoyosource@nidido.de>
Dieser Commit ist enthalten in:
yoyosource 2022-08-07 16:48:17 +02:00
Ursprung a21e652ac9
Commit 17fdb08060
4 geänderte Dateien mit 18 neuen und 23 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

5
BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulatorListener.java
Datei anzeigen

@ -27,10 +27,7 @@ import de.steamwar.bausystem.linkage.Linked;
import de.steamwar.bausystem.utils.ItemUtils; import de.steamwar.bausystem.utils.ItemUtils;
import de.steamwar.bausystem.utils.RayTraceUtils; import de.steamwar.bausystem.utils.RayTraceUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.FluidCollisionMode;
import org.bukkit.GameMode;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@ -39,9 +36,7 @@ import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.player.*; import org.bukkit.event.player.*;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.PlayerInventory;
import org.bukkit.util.BoundingBox;
import org.bukkit.util.RayTraceResult; import org.bukkit.util.RayTraceResult;
import org.bukkit.util.Vector;
import java.util.function.Function; import java.util.function.Function;

22
BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/TNTElementGUI.java
Datei anzeigen

@ -133,7 +133,7 @@ public class TNTElementGUI {
ChangePosition.show(inv, player, recalculate, tntSimulator, tntElement, tntElement::getOwnPosition, x -> x - tntElement.getParentPosition().getX(), y -> y - tntElement.getParentPosition().getY(), z -> z - tntElement.getParentPosition().getZ(), () -> editLocation(player, tntElement, back)); ChangePosition.show(inv, player, recalculate, tntSimulator, tntElement, tntElement::getOwnPosition, x -> x - tntElement.getParentPosition().getX(), y -> y - tntElement.getParentPosition().getY(), z -> z - tntElement.getParentPosition().getZ(), () -> editLocation(player, tntElement, back));
// Alignment // Alignment
inv.setItem(23, new SWItem(Material.OAK_BUTTON, "§a" + BauSystem.MESSAGE.parse("SIMULATOR_ALIGNMENT_NEGATIVE_Z", player), clickType -> { // Z negative inv.setItem(23, new SWItem(Material.OAK_BUTTON, BauSystem.MESSAGE.parse("SIMULATOR_ALIGNMENT_NEGATIVE_Z", player), clickType -> { // Z negative
recalculate.set(true); recalculate.set(true);
tntSimulator.hide(tntElement); tntSimulator.hide(tntElement);
Vector position = tntElement.getPosition(); Vector position = tntElement.getPosition();
@ -142,7 +142,7 @@ public class TNTElementGUI {
tntSimulator.show(tntElement); tntSimulator.show(tntElement);
tntElement.change(); tntElement.change();
})); }));
inv.setItem(25, new SWItem(Material.OAK_BUTTON, "§b" + BauSystem.MESSAGE.parse("SIMULATOR_ALIGNMENT_POSITIVE_Z", player), clickType -> { // Z positive inv.setItem(25, new SWItem(Material.OAK_BUTTON, BauSystem.MESSAGE.parse("SIMULATOR_ALIGNMENT_POSITIVE_Z", player), clickType -> { // Z positive
recalculate.set(true); recalculate.set(true);
tntSimulator.hide(tntElement); tntSimulator.hide(tntElement);
Vector position = tntElement.getPosition(); Vector position = tntElement.getPosition();
@ -151,7 +151,7 @@ public class TNTElementGUI {
tntSimulator.show(tntElement); tntSimulator.show(tntElement);
tntElement.change(); tntElement.change();
})); }));
inv.setItem(15, new SWItem(Material.OAK_BUTTON, "§c" + BauSystem.MESSAGE.parse("SIMULATOR_ALIGNMENT_POSITIVE_X", player), clickType -> { // X positive inv.setItem(15, new SWItem(Material.OAK_BUTTON, BauSystem.MESSAGE.parse("SIMULATOR_ALIGNMENT_POSITIVE_X", player), clickType -> { // X positive
recalculate.set(true); recalculate.set(true);
tntSimulator.hide(tntElement); tntSimulator.hide(tntElement);
Vector position = tntElement.getPosition(); Vector position = tntElement.getPosition();
@ -160,7 +160,7 @@ public class TNTElementGUI {
tntSimulator.show(tntElement); tntSimulator.show(tntElement);
tntElement.change(); tntElement.change();
})); }));
inv.setItem(33, new SWItem(Material.OAK_BUTTON, "§e" + BauSystem.MESSAGE.parse("SIMULATOR_ALIGNMENT_NEGATIVE_X", player), clickType -> { // X negative inv.setItem(33, new SWItem(Material.OAK_BUTTON, BauSystem.MESSAGE.parse("SIMULATOR_ALIGNMENT_NEGATIVE_X", player), clickType -> { // X negative
recalculate.set(true); recalculate.set(true);
tntSimulator.hide(tntElement); tntSimulator.hide(tntElement);
Vector position = tntElement.getPosition(); Vector position = tntElement.getPosition();
@ -169,7 +169,7 @@ public class TNTElementGUI {
tntSimulator.show(tntElement); tntSimulator.show(tntElement);
tntElement.change(); tntElement.change();
})); }));
inv.setItem(24, new SWItem(Material.SUNFLOWER, "§f" + BauSystem.MESSAGE.parse("SIMULATOR_ALIGNMENT_CENTER", player), clickType -> { // CENTER inv.setItem(24, new SWItem(Material.SUNFLOWER, BauSystem.MESSAGE.parse("SIMULATOR_ALIGNMENT_CENTER", player), clickType -> { // CENTER
recalculate.set(true); recalculate.set(true);
tntSimulator.hide(tntElement); tntSimulator.hide(tntElement);
Vector position = tntElement.getPosition(); Vector position = tntElement.getPosition();
@ -227,7 +227,7 @@ public class TNTElementGUI {
AtomicBoolean recalculate = new AtomicBoolean(false); AtomicBoolean recalculate = new AtomicBoolean(false);
Runnable editObserver = () -> { Runnable editObserver = () -> {
// Change Count of spawned TNT // Change Count of spawned TNT
inv.setItem(10, new SWItem(SWItem.getDye(10), "§a" + plusOneName, plusOneFiveShiftLore, false, clickType -> { inv.setItem(10, new SWItem(SWItem.getDye(10), plusOneName, plusOneFiveShiftLore, false, clickType -> {
recalculate.set(true); recalculate.set(true);
tntElement.setCount(tntElement.getCount() + ((clickType.isShiftClick()) ? 5 : 1)); tntElement.setCount(tntElement.getCount() + ((clickType.isShiftClick()) ? 5 : 1));
tntElement.change(); tntElement.change();
@ -240,14 +240,14 @@ public class TNTElementGUI {
}, () -> editProperties(player, tntElement, back))); }, () -> editProperties(player, tntElement, back)));
countItem.getItemStack().setAmount(tntElement.getCount()); countItem.getItemStack().setAmount(tntElement.getCount());
inv.setItem(19, countItem); inv.setItem(19, countItem);
inv.setItem(28, new SWItem(SWItem.getDye(1), "§a" + minusOneName, minusOneFiveShiftLore, false, clickType -> { inv.setItem(28, new SWItem(SWItem.getDye(1), minusOneName, minusOneFiveShiftLore, false, clickType -> {
recalculate.set(true); recalculate.set(true);
tntElement.setCount(tntElement.getCount() - ((clickType.isShiftClick()) ? 5 : 1)); tntElement.setCount(tntElement.getCount() - ((clickType.isShiftClick()) ? 5 : 1));
tntElement.change(); tntElement.change();
})); }));
// Change TickOffset // Change TickOffset
inv.setItem(11, new SWItem(SWItem.getDye(10), "§b" + plusOneName, plusOneFiveShiftLore, false, clickType -> { inv.setItem(11, new SWItem(SWItem.getDye(10), plusOneName, plusOneFiveShiftLore, false, clickType -> {
recalculate.set(true); recalculate.set(true);
tntElement.setTickOffset(tntElement.getOwnTickOffset() + (clickType.isShiftClick() ? 5 : 1)); tntElement.setTickOffset(tntElement.getOwnTickOffset() + (clickType.isShiftClick() ? 5 : 1));
tntElement.change(); tntElement.change();
@ -260,14 +260,14 @@ public class TNTElementGUI {
}, () -> editProperties(player, tntElement, back))); }, () -> editProperties(player, tntElement, back)));
tickItem.getItemStack().setAmount(Math.max(tntElement.getTickOffset(), 1)); tickItem.getItemStack().setAmount(Math.max(tntElement.getTickOffset(), 1));
inv.setItem(20, tickItem); inv.setItem(20, tickItem);
inv.setItem(29, new SWItem(SWItem.getDye(1), "§b" + minusOneName, minusOneFiveShiftLore, false, clickType -> { inv.setItem(29, new SWItem(SWItem.getDye(1), minusOneName, minusOneFiveShiftLore, false, clickType -> {
recalculate.set(true); recalculate.set(true);
tntElement.setTickOffset(tntElement.getOwnTickOffset() - (clickType.isShiftClick() ? 5 : 1)); tntElement.setTickOffset(tntElement.getOwnTickOffset() - (clickType.isShiftClick() ? 5 : 1));
tntElement.change(); tntElement.change();
})); }));
// Change FuseTicks // Change FuseTicks
inv.setItem(12, new SWItem(SWItem.getDye(10), "§c" + plusOneName, plusOneFiveShiftLore, false, clickType -> { inv.setItem(12, new SWItem(SWItem.getDye(10), plusOneName, plusOneFiveShiftLore, false, clickType -> {
recalculate.set(true); recalculate.set(true);
tntElement.setFuseTicks(tntElement.getFuseTicks() + (clickType.isShiftClick() ? 5 : 1)); tntElement.setFuseTicks(tntElement.getFuseTicks() + (clickType.isShiftClick() ? 5 : 1));
tntElement.change(); tntElement.change();
@ -280,7 +280,7 @@ public class TNTElementGUI {
}, () -> editProperties(player, tntElement, back))); }, () -> editProperties(player, tntElement, back)));
fuseTickItem.getItemStack().setAmount(Math.max(tntElement.getFuseTicks(), 1)); fuseTickItem.getItemStack().setAmount(Math.max(tntElement.getFuseTicks(), 1));
inv.setItem(21, fuseTickItem); inv.setItem(21, fuseTickItem);
inv.setItem(30, new SWItem(SWItem.getDye(1), "§c" + minusOneName, minusOneFiveShiftLore, false, clickType -> { inv.setItem(30, new SWItem(SWItem.getDye(1), minusOneName, minusOneFiveShiftLore, false, clickType -> {
recalculate.set(true); recalculate.set(true);
tntElement.setFuseTicks(tntElement.getFuseTicks() - (clickType.isShiftClick() ? 5 : 1)); tntElement.setFuseTicks(tntElement.getFuseTicks() - (clickType.isShiftClick() ? 5 : 1));
tntElement.change(); tntElement.change();

12
BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/components/ChangePosition.java
Datei anzeigen

@ -56,7 +56,7 @@ public class ChangePosition {
List<String> lore = Arrays.asList(BauSystem.MESSAGE.parse("SIMULATOR_TNT_SPAWN_LORE", player)); List<String> lore = Arrays.asList(BauSystem.MESSAGE.parse("SIMULATOR_TNT_SPAWN_LORE", player));
// X Position // X Position
inv.setItem(10, new SWItem(SWItem.getDye(10), "§a" + plusOneName, plusOnePixelShiftLore, false, clickType -> { inv.setItem(10, new SWItem(SWItem.getDye(10), plusOneName, plusOnePixelShiftLore, false, clickType -> {
recalculate.set(true); recalculate.set(true);
if (tntSimulator != null) tntSimulator.hide(simulatorElement); if (tntSimulator != null) tntSimulator.hide(simulatorElement);
toChangeVector.get().add(clickType.isShiftClick() ? X_VECTOR : FX_VECTOR); toChangeVector.get().add(clickType.isShiftClick() ? X_VECTOR : FX_VECTOR);
@ -73,7 +73,7 @@ public class ChangePosition {
back.run(); back.run();
}, back); }, back);
})); }));
inv.setItem(28, new SWItem(SWItem.getDye(1), "§a" + minusOneName, minusOnePixelShiftLore, false, clickType -> { inv.setItem(28, new SWItem(SWItem.getDye(1), minusOneName, minusOnePixelShiftLore, false, clickType -> {
recalculate.set(true); recalculate.set(true);
if (tntSimulator != null) tntSimulator.hide(simulatorElement); if (tntSimulator != null) tntSimulator.hide(simulatorElement);
toChangeVector.get().subtract(clickType.isShiftClick() ? X_VECTOR : FX_VECTOR); toChangeVector.get().subtract(clickType.isShiftClick() ? X_VECTOR : FX_VECTOR);
@ -82,7 +82,7 @@ public class ChangePosition {
})); }));
// Y Position // Y Position
inv.setItem(11, new SWItem(SWItem.getDye(10), "§b" + plusOneName, plusOnePixelShiftLore, false, clickType -> { inv.setItem(11, new SWItem(SWItem.getDye(10), plusOneName, plusOnePixelShiftLore, false, clickType -> {
recalculate.set(true); recalculate.set(true);
if (tntSimulator != null) tntSimulator.hide(simulatorElement); if (tntSimulator != null) tntSimulator.hide(simulatorElement);
toChangeVector.get().add(clickType.isShiftClick() ? Y_VECTOR : FY_VECTOR); toChangeVector.get().add(clickType.isShiftClick() ? Y_VECTOR : FY_VECTOR);
@ -99,7 +99,7 @@ public class ChangePosition {
back.run(); back.run();
}, back); }, back);
})); }));
inv.setItem(29, new SWItem(SWItem.getDye(1), "§b" + minusOneName, minusOnePixelShiftLore, false, clickType -> { inv.setItem(29, new SWItem(SWItem.getDye(1), minusOneName, minusOnePixelShiftLore, false, clickType -> {
recalculate.set(true); recalculate.set(true);
if (tntSimulator != null) tntSimulator.hide(simulatorElement); if (tntSimulator != null) tntSimulator.hide(simulatorElement);
toChangeVector.get().subtract(clickType.isShiftClick() ? Y_VECTOR : FY_VECTOR); toChangeVector.get().subtract(clickType.isShiftClick() ? Y_VECTOR : FY_VECTOR);
@ -108,7 +108,7 @@ public class ChangePosition {
})); }));
// Z Position // Z Position
inv.setItem(12, new SWItem(SWItem.getDye(10), "§c" + plusOneName, plusOnePixelShiftLore, false, clickType -> { inv.setItem(12, new SWItem(SWItem.getDye(10), plusOneName, plusOnePixelShiftLore, false, clickType -> {
recalculate.set(true); recalculate.set(true);
if (tntSimulator != null) tntSimulator.hide(simulatorElement); if (tntSimulator != null) tntSimulator.hide(simulatorElement);
toChangeVector.get().add(clickType.isShiftClick() ? Z_VECTOR : FZ_VECTOR); toChangeVector.get().add(clickType.isShiftClick() ? Z_VECTOR : FZ_VECTOR);
@ -125,7 +125,7 @@ public class ChangePosition {
back.run(); back.run();
}, back); }, back);
})); }));
inv.setItem(30, new SWItem(SWItem.getDye(1), "§c" + minusOneName, minusOnePixelShiftLore, false, clickType -> { inv.setItem(30, new SWItem(SWItem.getDye(1), minusOneName, minusOnePixelShiftLore, false, clickType -> {
recalculate.set(true); recalculate.set(true);
if (tntSimulator != null) tntSimulator.hide(simulatorElement); if (tntSimulator != null) tntSimulator.hide(simulatorElement);
toChangeVector.get().subtract(clickType.isShiftClick() ? Z_VECTOR : FZ_VECTOR); toChangeVector.get().subtract(clickType.isShiftClick() ? Z_VECTOR : FZ_VECTOR);

2
BauSystem_Main/src/de/steamwar/bausystem/features/simulator/tnt/TNTElement.java
Datei anzeigen

@ -221,7 +221,7 @@ public class TNTElement implements SimulatorElement {
} }
public void setCount(int count) { public void setCount(int count) {
if (count < 0) count = 1; if (count < 0) count = 0;
if (count > 400) count = 400; if (count > 400) count = 400;
this.count = count; this.count = count;
} }