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

Update TNTSimulator

Quellcode durchsuchen
Dieser Commit ist enthalten in:
yoyosource 2021-04-19 12:45:34 +02:00
Ursprung 2fb682c7c7
Commit 011711841b
5 geänderte Dateien mit 91 neuen und 57 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
BauSystem_15/src/de/steamwar/bausystem/features/simulator/SimulatorEntity_15.java
Datei anzeigen

@ -31,7 +31,7 @@ class SimulatorEntity_15 extends BaseEntity_15 implements AbstractSimulatorEntit
private ReferenceCounter referenceCounter = new ReferenceCounter(); private ReferenceCounter referenceCounter = new ReferenceCounter();
public SimulatorEntity_15(World world, Vector position, boolean highlight) { public SimulatorEntity_15(World world, Vector position, boolean highlight) {
super(world, position, highlight ? Material.TNT : Material.WHITE_STAINED_GLASS); super(world, position, highlight ? Material.WHITE_STAINED_GLASS : Material.TNT);
this.setNoGravity(true); this.setNoGravity(true);
this.ticksLived = -12000; this.ticksLived = -12000;

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

@ -69,6 +69,8 @@ public class SimulatorCommand extends SWCommand {
} }
private boolean cannotUse(Player player) { private boolean cannotUse(Player player) {
// TODO: remove this
if (true) return false;
if (!Permission.hasPermission(player, Permission.WORLD)) { if (!Permission.hasPermission(player, Permission.WORLD)) {
player.sendMessage(BauSystem.PREFIX + "§cDu darfst hier nicht den Simulator nutzen"); player.sendMessage(BauSystem.PREFIX + "§cDu darfst hier nicht den Simulator nutzen");
return true; return true;

88
BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulator.java
Datei anzeigen

@ -91,18 +91,18 @@ public class TNTSimulator {
return; return;
if (result.getHitEntity() != null) { if (result.getHitEntity() != null) {
TNTSpawn entity = getEntity(result.getHitEntity()); List<TNTSpawn> tntSpawns = getEntity(result.getHitEntity());
entity.hide(); tntSpawns.forEach(TNTSpawn::hide);
cursor = SimulatorEntityShowMode.createEntity(player, entity.position, false); cursor = SimulatorEntityShowMode.createEntity(player, tntSpawns.isEmpty() ? getPos(result) : tntSpawns.get(0).position, true);
cursor.display(player); cursor.display(player);
SWUtils.sendToActionbar(player, ColorConfig.HIGHLIGHT + "Position bearbeiten"); SWUtils.sendToActionbar(player, ColorConfig.HIGHLIGHT + "Position bearbeiten");
return; return;
} }
cursor = SimulatorEntityShowMode.createEntity(player, getPos(result), true); cursor = SimulatorEntityShowMode.createEntity(player, getPos(result), false);
cursor.display(player); cursor.display(player);
player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText("§ePosition setzen")); SWUtils.sendToActionbar(player, ColorConfig.HIGHLIGHT + "Position setzen");
} }
public void edit(RayTraceResult result) { public void edit(RayTraceResult result) {
@ -114,8 +114,15 @@ public class TNTSimulator {
show(result); show(result);
if (result.getHitEntity() != null) { if (result.getHitEntity() != null) {
TNTSpawn entity = getEntity(result.getHitEntity()); List<TNTSpawn> tntSpawns = getEntity(result.getHitEntity());
entity.editTNT(); if (tntSpawns.isEmpty()) {
return;
}
if (tntSpawns.size() == 1) {
tntSpawns.get(0).editTNT();
} else {
showGUI(new HashSet<>(tntSpawns));
}
return; return;
} }
@ -160,7 +167,11 @@ public class TNTSimulator {
} }
public void showGUI() { public void showGUI() {
List<SWListInv.SWListEntry<TNTSpawn>> swListEntryList = spawns.stream().map(spawn -> { showGUI(spawns);
}
public void showGUI(Set<TNTSpawn> tntSpawns) {
List<SWListInv.SWListEntry<TNTSpawn>> swListEntryList = tntSpawns.stream().map(spawn -> {
List<String> lore = new ArrayList<>(); List<String> lore = new ArrayList<>();
lore.add("§7TNT-Anzahl§8: §e" + spawn.count); lore.add("§7TNT-Anzahl§8: §e" + spawn.count);
lore.add("§7Tick§8: §e" + spawn.tickOffset); lore.add("§7Tick§8: §e" + spawn.tickOffset);
@ -186,12 +197,14 @@ public class TNTSimulator {
swListInv.open(); swListInv.open();
} }
private TNTSpawn getEntity(Entity entity){ private List<TNTSpawn> getEntity(Entity entity) {
List<TNTSpawn> tntSpawns = new ArrayList<>();
for (TNTSpawn spawn : spawns) { for (TNTSpawn spawn : spawns) {
if(spawn.entity.getId() == entity.getEntityId()) if (spawn.entity.getId() == entity.getEntityId() || spawn.position.equals(entity.getLocation().toVector())) {
return spawn; tntSpawns.add(spawn);
} }
throw new IllegalStateException(); }
return tntSpawns;
} }
private void spawnRandomList(List<TNTSpawn> tntSpawns) { private void spawnRandomList(List<TNTSpawn> tntSpawns) {
@ -320,10 +333,10 @@ public class TNTSimulator {
} }
private void editTNT() { private void editTNT() {
SWInventory swInventory = new SWInventory(player, 27, "TNT konfigurieren"); SWInventory swInventory = new SWInventory(player, 54, "TNT konfigurieren");
// Change Count of spawned TNT // Change Count of spawned TNT
swInventory.setItem(0, new SWItem(SWItem.getDye(10), "§7+1", clickType -> { swInventory.setItem(29, new SWItem(SWItem.getDye(10), "§7+1", clickType -> {
setCount(count + 1); setCount(count + 1);
editTNT(); editTNT();
})); }));
@ -332,14 +345,14 @@ public class TNTSimulator {
editTNT(); editTNT();
}, this::editTNT)); }, this::editTNT));
countItem.getItemStack().setAmount(count); countItem.getItemStack().setAmount(count);
swInventory.setItem(9, countItem); swInventory.setItem(37, countItem);
swInventory.setItem(18, new SWItem(SWItem.getDye(1), "§7-1", clickType -> { swInventory.setItem(46, new SWItem(SWItem.getDye(1), "§7-1", clickType -> {
setCount(count - 1); setCount(count - 1);
editTNT(); editTNT();
})); }));
// Change TickOffset // Change TickOffset
swInventory.setItem(1, new SWItem(SWItem.getDye(10), "§7+1", clickType -> { swInventory.setItem(30, new SWItem(SWItem.getDye(10), "§7+1", clickType -> {
setTickOffset(tickOffset + 1); setTickOffset(tickOffset + 1);
editTNT(); editTNT();
})); }));
@ -348,14 +361,14 @@ public class TNTSimulator {
editTNT(); editTNT();
}, this::editTNT)); }, this::editTNT));
tickItem.getItemStack().setAmount(Math.max(tickOffset, 1)); tickItem.getItemStack().setAmount(Math.max(tickOffset, 1));
swInventory.setItem(10, tickItem); swInventory.setItem(38, tickItem);
swInventory.setItem(19, new SWItem(SWItem.getDye(1), "§7-1", clickType -> { swInventory.setItem(47, new SWItem(SWItem.getDye(1), "§7-1", clickType -> {
setTickOffset(tickOffset - 1); setTickOffset(tickOffset - 1);
editTNT(); editTNT();
})); }));
// Change FuseTicks // Change FuseTicks
swInventory.setItem(2, new SWItem(SWItem.getDye(10), "§7+1", clickType -> { swInventory.setItem(31, new SWItem(SWItem.getDye(10), "§7+1", clickType -> {
setFuseTicks(fuseTicks + 1); setFuseTicks(fuseTicks + 1);
editTNT(); editTNT();
})); }));
@ -364,39 +377,56 @@ public class TNTSimulator {
editTNT(); editTNT();
}, this::editTNT)); }, this::editTNT));
fuseTickItem.getItemStack().setAmount(Math.max(fuseTicks, 1)); fuseTickItem.getItemStack().setAmount(Math.max(fuseTicks, 1));
swInventory.setItem(11, fuseTickItem); swInventory.setItem(39, fuseTickItem);
swInventory.setItem(20, new SWItem(SWItem.getDye(1), "§7-1", clickType -> { swInventory.setItem(48, new SWItem(SWItem.getDye(1), "§7-1", clickType -> {
setFuseTicks(fuseTicks - 1); setFuseTicks(fuseTicks - 1);
editTNT(); editTNT();
})); }));
// Velocity Settings // Velocity Settings
swInventory.setItem(14, Material.TNT, "TNT", clickType -> {}); swInventory.setItem(11, Material.TNT, "TNT", clickType -> {
swInventory.setItem(22, new SWItem(getDye(xVelocity), getColor(xVelocity), "§7TNT §eSprung X §8- " + active(xVelocity), clickType -> { });
swInventory.setItem(19, new SWItem(getDye(xVelocity), getColor(xVelocity), "§7TNT §eSprung X §8- " + active(xVelocity), clickType -> {
xVelocity = !xVelocity; xVelocity = !xVelocity;
editTNT(); editTNT();
})); }));
swInventory.setItem(5, new SWItem(getDye(yVelocity), getColor(yVelocity), "§7TNT §eSprung Y §8- " + active(yVelocity), clickType -> { swInventory.setItem(2, new SWItem(getDye(yVelocity), getColor(yVelocity), "§7TNT §eSprung Y §8- " + active(yVelocity), clickType -> {
yVelocity = !yVelocity; yVelocity = !yVelocity;
editTNT(); editTNT();
})); }));
swInventory.setItem(24, new SWItem(getDye(zVelocity), getColor(zVelocity), "§7TNT §eSprung Z §8- " + active(zVelocity), clickType -> { swInventory.setItem(21, new SWItem(getDye(zVelocity), getColor(zVelocity), "§7TNT §eSprung Z §8- " + active(zVelocity), clickType -> {
zVelocity = !zVelocity;
editTNT();
}));
// Position Settings
swInventory.setItem(15, Material.TNT, "TNT", clickType -> {
});
swInventory.setItem(23, new SWItem(getDye(xVelocity), getColor(xVelocity), "§7TNT §eSprung X §8- " + active(xVelocity), clickType -> {
xVelocity = !xVelocity;
editTNT();
}));
swInventory.setItem(6, new SWItem(getDye(yVelocity), getColor(yVelocity), "§7TNT §eSprung Y §8- " + active(yVelocity), clickType -> {
yVelocity = !yVelocity;
editTNT();
}));
swInventory.setItem(25, new SWItem(getDye(zVelocity), getColor(zVelocity), "§7TNT §eSprung Z §8- " + active(zVelocity), clickType -> {
zVelocity = !zVelocity; zVelocity = !zVelocity;
editTNT(); editTNT();
})); }));
// Repeater before Comparator // Repeater before Comparator
swInventory.setItem(8, new SWItem(comparator ? SWItem.getMaterial("REDSTONE_COMPARATOR_OFF") : SWItem.getMaterial("DIODE"), "§7Gezündet durch §8- §e" + (comparator ? "Comparator" : "Repeater"), clickType -> { swInventory.setItem(41, new SWItem(comparator ? SWItem.getMaterial("REDSTONE_COMPARATOR_OFF") : SWItem.getMaterial("DIODE"), "§7Gezündet durch §8- §e" + (comparator ? "Comparator" : "Repeater"), clickType -> {
comparator = !comparator; comparator = !comparator;
editTNT(); editTNT();
})); }));
swInventory.setItem(17, new SWItem(Material.TNT, "§eZündphase hinzufügen", clickType -> { swInventory.setItem(42, new SWItem(Material.TNT, "§eZündphase hinzufügen", clickType -> {
spawns.add(new TNTSpawn(position, entity)); spawns.add(new TNTSpawn(position, entity));
})); }));
// Delete tnt // Delete tnt
swInventory.setItem(26, new SWItem(Material.BARRIER, "§cEntfernen", clickType -> { swInventory.setItem(43, new SWItem(Material.BARRIER, "§cEntfernen", clickType -> {
hide(); hide();
spawns.remove(this); spawns.remove(this);
player.closeInventory(); player.closeInventory();

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

@ -45,6 +45,8 @@ import static de.steamwar.bausystem.features.simulator.TNTSimulator.get;
public class TNTSimulatorListener implements Listener { public class TNTSimulatorListener implements Listener {
private boolean permissionCheck(Player player) { private boolean permissionCheck(Player player) {
// TODO: remove this
if (true) return true;
if (!Permission.hasPermission(player, Permission.WORLD)) { if (!Permission.hasPermission(player, Permission.WORLD)) {
player.sendMessage(BauSystem.PREFIX + "§cDu darfst hier nicht den Simulator nutzen"); player.sendMessage(BauSystem.PREFIX + "§cDu darfst hier nicht den Simulator nutzen");
return false; return false;

2
BauSystem_Main/src/de/steamwar/bausystem/features/simulator/show/SimulatorEntityShowMode.java
Datei anzeigen

@ -44,7 +44,7 @@ public class SimulatorEntityShowMode implements ShowMode<Position> {
@Override @Override
public void show(Position position) { public void show(Position position) {
RoundedPosition roundedPosition = new RoundedPosition(position); RoundedPosition roundedPosition = new RoundedPosition(position);
AbstractSimulatorEntity entity = entityMap.computeIfAbsent(roundedPosition, pos -> createEntity(player, position.getLocation(), true)); AbstractSimulatorEntity entity = entityMap.computeIfAbsent(roundedPosition, pos -> createEntity(player, position.getLocation(), false));
entity.display(player); entity.display(player);
} }