Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0b689c90eb | |||
| da4aa0aef5 |
@@ -109,7 +109,7 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setSelection(Player p, Point minPoint, Point maxPoint) {
|
public void setSelection(Player p, Point minPoint, Point maxPoint) {
|
||||||
WORLDEDIT_PLUGIN.getSession(p).setRegionSelector(BUKKITWORLD, new CuboidRegionSelector(BUKKITWORLD, minPoint.toBlockVector3(), maxPoint.toBlockVector3()));
|
WORLDEDIT_PLUGIN.getSession(p).setRegionSelector(BUKKITWORLD, new CuboidRegionSelector(BUKKITWORLD, toBlockVector3(minPoint), toBlockVector3(maxPoint)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -178,9 +178,9 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
|
|||||||
pastePoint.set(v);
|
pastePoint.set(v);
|
||||||
|
|
||||||
if (pasteBuilder.isReset()) {
|
if (pasteBuilder.isReset()) {
|
||||||
e.setBlocks(new CuboidRegion(pasteBuilder.getMinPoint().toBlockVector3(), pasteBuilder.getMaxPoint().toBlockVector3()), Objects.requireNonNull(BlockTypes.AIR).getDefaultState().toBaseBlock());
|
e.setBlocks(new CuboidRegion(toBlockVector3(pasteBuilder.getMinPoint()), toBlockVector3(pasteBuilder.getMaxPoint())), Objects.requireNonNull(BlockTypes.AIR).getDefaultState().toBaseBlock());
|
||||||
if (pasteBuilder.getWaterLevel() != 0) {
|
if (pasteBuilder.getWaterLevel() != 0) {
|
||||||
e.setBlocks(new CuboidRegion(pasteBuilder.getMinPoint().toBlockVector3(), pasteBuilder.getMaxPoint().toBlockVector3().withY(pasteBuilder.getWaterLevel())), Objects.requireNonNull(BlockTypes.WATER).getDefaultState().toBaseBlock());
|
e.setBlocks(new CuboidRegion(toBlockVector3(pasteBuilder.getMinPoint()), toBlockVector3(pasteBuilder.getMaxPoint()).withY(pasteBuilder.getWaterLevel())), Objects.requireNonNull(BlockTypes.WATER).getDefaultState().toBaseBlock());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Operations.completeBlindly(ch.createPaste(e).to(v).ignoreAirBlocks(pasteBuilder.isIgnoreAir()).build());
|
Operations.completeBlindly(ch.createPaste(e).to(v).ignoreAirBlocks(pasteBuilder.isIgnoreAir()).build());
|
||||||
@@ -193,7 +193,7 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
|
|||||||
@Override
|
@Override
|
||||||
public Clipboard copy(Point minPoint, Point maxPoint, Point copyPoint) {
|
public Clipboard copy(Point minPoint, Point maxPoint, Point copyPoint) {
|
||||||
BukkitWorld bukkitWorld = new BukkitWorld(Bukkit.getWorlds().get(0));
|
BukkitWorld bukkitWorld = new BukkitWorld(Bukkit.getWorlds().get(0));
|
||||||
CuboidRegion region = new CuboidRegion(bukkitWorld, minPoint.toBlockVector3(), maxPoint.toBlockVector3());
|
CuboidRegion region = new CuboidRegion(bukkitWorld, toBlockVector3(minPoint), toBlockVector3(maxPoint));
|
||||||
BlockArrayClipboard clipboard = new BlockArrayClipboard(region);
|
BlockArrayClipboard clipboard = new BlockArrayClipboard(region);
|
||||||
try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(bukkitWorld, -1)) {
|
try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(bukkitWorld, -1)) {
|
||||||
ForwardExtentCopy copy = new ForwardExtentCopy(
|
ForwardExtentCopy copy = new ForwardExtentCopy(
|
||||||
@@ -204,7 +204,7 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
|
|||||||
copy.setCopyingBiomes(false);
|
copy.setCopyingBiomes(false);
|
||||||
|
|
||||||
Operations.complete(copy);
|
Operations.complete(copy);
|
||||||
clipboard.setOrigin(copyPoint.toBlockVector3());
|
clipboard.setOrigin(toBlockVector3(copyPoint));
|
||||||
return clipboard;
|
return clipboard;
|
||||||
} catch (WorldEditException e) {
|
} catch (WorldEditException e) {
|
||||||
Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
|
Bukkit.getLogger().log(Level.SEVERE, e.getMessage(), e);
|
||||||
@@ -224,6 +224,10 @@ public class FlatteningWrapper15 implements FlatteningWrapper {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private BlockVector3 toBlockVector3(Point point) {
|
||||||
|
return BlockVector3.at(point.getX(), point.getY(), point.getZ());
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean inWater(org.bukkit.World world, Vector tntPosition) {
|
public boolean inWater(org.bukkit.World world, Vector tntPosition) {
|
||||||
Block block = world.getBlockAt(tntPosition.getBlockX(), tntPosition.getBlockY(), tntPosition.getBlockZ());
|
Block block = world.getBlockAt(tntPosition.getBlockX(), tntPosition.getBlockY(), tntPosition.getBlockZ());
|
||||||
|
|||||||
@@ -406,8 +406,6 @@ BLOCK_COUNTER_MESSAGE_SECOND=§7Damage §8> §e{0} §7Blocks §e{1} §7TNT §e
|
|||||||
BLOCK_COUNTER_ENABLE=§7BlockCounter activated
|
BLOCK_COUNTER_ENABLE=§7BlockCounter activated
|
||||||
BLOCK_COUNTER_DISABLE=§7BlockCounter deactivated
|
BLOCK_COUNTER_DISABLE=§7BlockCounter deactivated
|
||||||
# DepthCounter
|
# DepthCounter
|
||||||
DEPTH_COUNTER_DISABLE=§7Depth Counter disabled
|
|
||||||
DEPTH_COUNTER_ENABLE=§7Depth Counter enabled
|
|
||||||
DEPTH_COUNTER_MESSAGE=§7Depth §8> §7
|
DEPTH_COUNTER_MESSAGE=§7Depth §8> §7
|
||||||
DEPTH_COUNTER_COUNT={0}{1}§8×{2}{3}§8×{4}{5}
|
DEPTH_COUNTER_COUNT={0}{1}§8×{2}{3}§8×{4}{5}
|
||||||
DEPTH_COUNTER_HOVER=§7X§8×§7Y§8×§7Z
|
DEPTH_COUNTER_HOVER=§7X§8×§7Y§8×§7Z
|
||||||
@@ -947,9 +945,6 @@ SPEED_TAB_NAME=Input speed
|
|||||||
WORLDEDIT_WAND=WorldEdit Wand
|
WORLDEDIT_WAND=WorldEdit Wand
|
||||||
WORLDEDIT_LEFTCLICK=Left click: select pos #1
|
WORLDEDIT_LEFTCLICK=Left click: select pos #1
|
||||||
WORLDEDIT_RIGHTCLICK=Right click: select pos #2
|
WORLDEDIT_RIGHTCLICK=Right click: select pos #2
|
||||||
TNT_DETAILS_COMMAND=§8/§etntdetails §8-§7 Toggle information printed after clicking on a TNT
|
|
||||||
TNT_DETAILS_ON = §eTNTDetails §aactivated
|
|
||||||
TNT_DETAILS_OFF = §eTNTDetails §cdeactivated
|
|
||||||
TNT_CLICK_HEADER=§8---=== §eTNT §8===---
|
TNT_CLICK_HEADER=§8---=== §eTNT §8===---
|
||||||
TNT_CLICK_ORDER=§eEntity Order§8: §e{0}
|
TNT_CLICK_ORDER=§eEntity Order§8: §e{0}
|
||||||
TNT_CLICK_FUSE_TIME=§eFuseTime§8: §e{0}
|
TNT_CLICK_FUSE_TIME=§eFuseTime§8: §e{0}
|
||||||
|
|||||||
@@ -369,8 +369,6 @@ BLOCK_COUNTER_MESSAGE_SECOND=§7Schaden §8> §e{0} §7Blöcke §e{1} §7TNT
|
|||||||
BLOCK_COUNTER_ENABLE=§7BlockCounter angemacht
|
BLOCK_COUNTER_ENABLE=§7BlockCounter angemacht
|
||||||
BLOCK_COUNTER_DISABLE=§7BlockCounter ausgemacht
|
BLOCK_COUNTER_DISABLE=§7BlockCounter ausgemacht
|
||||||
# DepthCounter
|
# DepthCounter
|
||||||
DEPTH_COUNTER_DISABLE=§7Depth Counter deaktiviert
|
|
||||||
DEPTH_COUNTER_ENABLE=§7Depth Counter aktiviert
|
|
||||||
DEPTH_COUNTER_MESSAGE=§7Tiefe §8> §7
|
DEPTH_COUNTER_MESSAGE=§7Tiefe §8> §7
|
||||||
# TPSLimit
|
# TPSLimit
|
||||||
TPSLIMIT_FREEZE_HELP=§8/§etpslimit 0 §8-§7 Friere TPS ein
|
TPSLIMIT_FREEZE_HELP=§8/§etpslimit 0 §8-§7 Friere TPS ein
|
||||||
@@ -889,9 +887,6 @@ SPEED_TAB_NAME=Geschwindigkeit eingeben
|
|||||||
WORLDEDIT_WAND=WorldEdit Wand
|
WORLDEDIT_WAND=WorldEdit Wand
|
||||||
WORLDEDIT_LEFTCLICK=Left click: select pos #1
|
WORLDEDIT_LEFTCLICK=Left click: select pos #1
|
||||||
WORLDEDIT_RIGHTCLICK=Right click: select pos #2
|
WORLDEDIT_RIGHTCLICK=Right click: select pos #2
|
||||||
TNT_DETAILS_COMMAND=§8/§etntdetails §8-§7 Aktiviert/Deaktiviert das senden von Details beim Klick auf TNT
|
|
||||||
TNT_DETAILS_ON = §eTNTDetails §aaktiviert
|
|
||||||
TNT_DETAILS_OFF = §eTNTDetails §cdeaktiviert
|
|
||||||
TNT_CLICK_HEADER=§8---=== §eTNT §8===---
|
TNT_CLICK_HEADER=§8---=== §eTNT §8===---
|
||||||
TNT_CLICK_ORDER=§eEntity Order§8: §e{0}
|
TNT_CLICK_ORDER=§eEntity Order§8: §e{0}
|
||||||
TNT_CLICK_FUSE_TIME=§eFuseTime§8: §e{0}
|
TNT_CLICK_FUSE_TIME=§eFuseTime§8: §e{0}
|
||||||
|
|||||||
@@ -20,7 +20,6 @@
|
|||||||
package de.steamwar.bausystem.features.cannon.depth;
|
package de.steamwar.bausystem.features.cannon.depth;
|
||||||
|
|
||||||
import de.steamwar.bausystem.BauSystem;
|
import de.steamwar.bausystem.BauSystem;
|
||||||
import de.steamwar.bausystem.configplayer.Config;
|
|
||||||
import de.steamwar.bausystem.region.Region;
|
import de.steamwar.bausystem.region.Region;
|
||||||
import de.steamwar.bausystem.region.RegionUtils;
|
import de.steamwar.bausystem.region.RegionUtils;
|
||||||
import de.steamwar.bausystem.region.utils.RegionExtensionType;
|
import de.steamwar.bausystem.region.utils.RegionExtensionType;
|
||||||
@@ -66,9 +65,7 @@ public class Depth {
|
|||||||
dimensions.setZ(Math.abs(dimensions.getZ()));
|
dimensions.setZ(Math.abs(dimensions.getZ()));
|
||||||
|
|
||||||
RegionUtils.message(region, player -> {
|
RegionUtils.message(region, player -> {
|
||||||
if (Config.getInstance().get(player).getPlainValueOrDefault("depth_message", true)) {
|
player.spigot().sendMessage(getMessage(player, dimensions.getBlockX() + 1, dimensions.getBlockY() + 1, dimensions.getBlockZ() + 1, tntCount));
|
||||||
player.spigot().sendMessage(getMessage(player, dimensions.getBlockX() + 1, dimensions.getBlockY() + 1, dimensions.getBlockZ() + 1, tntCount));
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
-45
@@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.features.cannon.depth;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.BauSystem;
|
|
||||||
import de.steamwar.bausystem.configplayer.Config;
|
|
||||||
import de.steamwar.command.SWCommand;
|
|
||||||
import de.steamwar.linkage.Linked;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
@Linked
|
|
||||||
public class DepthCommand extends SWCommand {
|
|
||||||
|
|
||||||
public DepthCommand() {
|
|
||||||
super("depth");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register
|
|
||||||
public void toggle(Player player) {
|
|
||||||
if (Config.getInstance().get(player).getPlainValueOrDefault("depth_message", true)) {
|
|
||||||
Config.getInstance().get(player).put("depth_message", false);
|
|
||||||
BauSystem.MESSAGE.send("DEPTH_COUNTER_DISABLE", player);
|
|
||||||
} else {
|
|
||||||
Config.getInstance().get(player).put("depth_message", true);
|
|
||||||
BauSystem.MESSAGE.send("DEPTH_COUNTER_ENABLE", player);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-37
@@ -1,37 +0,0 @@
|
|||||||
package de.steamwar.bausystem.features.printerTool;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.utils.ItemUtils;
|
|
||||||
import de.steamwar.inventory.SWItem;
|
|
||||||
import de.steamwar.linkage.Linked;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.EventHandler;
|
|
||||||
import org.bukkit.event.Listener;
|
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
|
||||||
import org.bukkit.inventory.ItemStack;
|
|
||||||
import org.bukkit.inventory.meta.ItemMeta;
|
|
||||||
|
|
||||||
@Linked
|
|
||||||
public class PrinterToolItem implements Listener {
|
|
||||||
public static ItemStack getItem(Player p) {
|
|
||||||
ItemStack itemStack = new SWItem(Material.WOODEN_PICKAXE, "Printer Tool").getItemStack();
|
|
||||||
ItemMeta itemMeta = itemStack.getItemMeta();
|
|
||||||
itemMeta.setCustomModelData(1);
|
|
||||||
itemStack.setItemMeta(itemMeta);
|
|
||||||
ItemUtils.setItem(itemStack, "printer_tool");
|
|
||||||
return itemStack;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isItem(ItemStack itemStack) {
|
|
||||||
return itemStack != null && ItemUtils.isItem(itemStack, "printer_tool");
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onPlayerInteract(PlayerInteractEvent event) {
|
|
||||||
ItemStack item = event.getItem();
|
|
||||||
|
|
||||||
if(PrinterToolItem.isItem(item)) {
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+3
-121
@@ -11,9 +11,8 @@ import de.steamwar.linkage.Linked;
|
|||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.block.Block;
|
import org.bukkit.block.Block;
|
||||||
import org.bukkit.block.BlockState;
|
|
||||||
import org.bukkit.block.data.type.NoteBlock;
|
|
||||||
import org.bukkit.block.data.type.Switch;
|
import org.bukkit.block.data.type.Switch;
|
||||||
|
import org.bukkit.entity.EntityType;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
@@ -61,24 +60,6 @@ public class FreezeListener implements Listener, ScoreboardElement {
|
|||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPhysicsEvent(BlockPhysicsEvent e) {
|
public void onPhysicsEvent(BlockPhysicsEvent e) {
|
||||||
if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
|
if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
|
||||||
if (e.getSourceBlock().getType() == Material.NOTE_BLOCK) {
|
|
||||||
BlockState state = e.getSourceBlock().getState();
|
|
||||||
NoteBlock noteBlock = (NoteBlock) state.getBlockData();
|
|
||||||
if (noteBlock.isPowered()) {
|
|
||||||
Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
|
|
||||||
state.update(true, false);
|
|
||||||
}, 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (e.getBlock().getType() == Material.NOTE_BLOCK) {
|
|
||||||
BlockState state = e.getBlock().getState();
|
|
||||||
NoteBlock noteBlock = (NoteBlock) state.getBlockData();
|
|
||||||
if (noteBlock.isPowered()) {
|
|
||||||
Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
|
|
||||||
state.update(true, false);
|
|
||||||
}, 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -90,105 +71,6 @@ public class FreezeListener implements Listener, ScoreboardElement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onNotePlay(NotePlayEvent event) {
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=45, z=98},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=44, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=45, z=97},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=45, z=99},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=custom_head,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=45, z=97},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=96},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=45, z=99},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-108, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=45, z=98},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-104, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=45, z=98},type=CYAN_TERRACOTTA,data=Block{minecraft:cyan_terracotta},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=BARRIER,data=Block{minecraft:barrier},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=harp,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@78078831}
|
|
||||||
|
|
||||||
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=45, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=46, z=100},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=49, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=99},type=SMOOTH_STONE,data=Block{minecraft:smooth_stone},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
////[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=true],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=102},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-108, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=46, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-107, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=100},type=STONE_SLAB,data=Block{minecraft:stone_slab}[type=bottom,waterlogged=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-104, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=46, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=48, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-105, y=47, z=100},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=101},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-107, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-105, y=47, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=46, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=48, z=98},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=97},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=99},type=AIR,data=Block{minecraft:air},fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
//[STDOUT] CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b} -> CraftBlock{pos=BlockPosition{x=-106, y=47, z=98},type=NOTE_BLOCK,data=Block{minecraft:note_block}[instrument=basedrum,note=9,powered=false],fluid=net.minecraft.world.level.material.FluidTypeEmpty@1531ed7b}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPistonRetract(BlockPistonRetractEvent e) {
|
public void onPistonRetract(BlockPistonRetractEvent e) {
|
||||||
if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
|
if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
|
||||||
@@ -226,13 +108,13 @@ public class FreezeListener implements Listener, ScoreboardElement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.MONITOR)
|
||||||
public void onBlockBreak(BlockBreakEvent e) {
|
public void onBlockBreak(BlockBreakEvent e) {
|
||||||
if (Core.getVersion() < 19) return;
|
if (Core.getVersion() < 19) return;
|
||||||
if (e.getPlayer().getInventory().getItemInMainHand().getType() == Material.DEBUG_STICK) return;
|
if (e.getPlayer().getInventory().getItemInMainHand().getType() == Material.DEBUG_STICK) return;
|
||||||
if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
|
if (Region.getRegion(e.getBlock().getLocation()).get(Flag.FREEZE) == FreezeMode.ACTIVE) {
|
||||||
|
if (e.isCancelled()) return;
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
e.getBlock().setType(Material.BARRIER, false);
|
|
||||||
e.getBlock().setType(Material.AIR, false);
|
e.getBlock().setType(Material.AIR, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -51,7 +51,7 @@ public class TpsLib implements LuaLib {
|
|||||||
tpsLib.set("fiveMinute", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.FIVE_MINUTES)));
|
tpsLib.set("fiveMinute", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.FIVE_MINUTES)));
|
||||||
tpsLib.set("tenMinute", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.TEN_MINUTES)));
|
tpsLib.set("tenMinute", getter(() -> TPSWatcher.getTPS(TPSWatcher.TPSType.TEN_MINUTES)));
|
||||||
tpsLib.set("current", getter(TPSWatcher::getTPS));
|
tpsLib.set("current", getter(TPSWatcher::getTPS));
|
||||||
tpsLib.set("limit", getter(TPSSystem::getCurrentTPSLimit));
|
tpsLib.set("limit", getter(tpsSystem::getCurrentTPSLimit));
|
||||||
return tpsLib;
|
return tpsLib;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-113
@@ -1,113 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2023 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.features.script.lua.libs;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.features.tracer.TNTPoint;
|
|
||||||
import de.steamwar.bausystem.features.tracer.Trace;
|
|
||||||
import de.steamwar.bausystem.features.tracer.TraceManager;
|
|
||||||
import de.steamwar.linkage.Linked;
|
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.util.Vector;
|
|
||||||
import org.luaj.vm2.LuaTable;
|
|
||||||
import org.luaj.vm2.LuaValue;
|
|
||||||
import org.luaj.vm2.lib.ZeroArgFunction;
|
|
||||||
|
|
||||||
@Linked
|
|
||||||
public class TracerLib implements LuaLib {
|
|
||||||
@Override
|
|
||||||
public String name() {
|
|
||||||
return "tracer";
|
|
||||||
}
|
|
||||||
|
|
||||||
private static LuaTable convertTrace(Trace trace) {
|
|
||||||
LuaTable luaTrace = new LuaTable();
|
|
||||||
|
|
||||||
luaTrace.set("getRecords", new ZeroArgFunction() {
|
|
||||||
@Override
|
|
||||||
public LuaValue call() {
|
|
||||||
return LuaValue.listOf(
|
|
||||||
trace.getHistories()
|
|
||||||
.stream()
|
|
||||||
.map((history) -> LuaValue.listOf(history
|
|
||||||
.stream()
|
|
||||||
.map(TracerLib::convertTntPoint)
|
|
||||||
.toArray(LuaValue[]::new)))
|
|
||||||
.toArray(LuaValue[]::new));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
luaTrace.set("getId", new ZeroArgFunction() {
|
|
||||||
@Override
|
|
||||||
public LuaValue call() {
|
|
||||||
return LuaValue.valueOf(trace.getUuid().toString());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
return luaTrace;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static LuaTable convertTntPoint(TNTPoint tntPoint) {
|
|
||||||
Location pointPos = tntPoint.getLocation();
|
|
||||||
LuaTable luaPos = LuaValue.tableOf(new LuaValue[]{
|
|
||||||
LuaValue.valueOf("x"), LuaValue.valueOf(pointPos.getX()),
|
|
||||||
LuaValue.valueOf("y"), LuaValue.valueOf(pointPos.getY()),
|
|
||||||
LuaValue.valueOf("z"), LuaValue.valueOf(pointPos.getZ()),
|
|
||||||
});
|
|
||||||
|
|
||||||
Vector pointVel = tntPoint.getVelocity();
|
|
||||||
LuaTable luaVel = LuaValue.tableOf(new LuaValue[]{
|
|
||||||
LuaValue.valueOf("x"), LuaValue.valueOf(pointVel.getX()),
|
|
||||||
LuaValue.valueOf("y"), LuaValue.valueOf(pointVel.getY()),
|
|
||||||
LuaValue.valueOf("z"), LuaValue.valueOf(pointVel.getZ()),
|
|
||||||
});
|
|
||||||
|
|
||||||
return LuaValue.tableOf(new LuaValue[]{
|
|
||||||
LuaValue.valueOf("pos"), luaPos,
|
|
||||||
LuaValue.valueOf("vel"), luaVel,
|
|
||||||
LuaValue.valueOf("ticksSinceStart"), LuaValue.valueOf(tntPoint.getTicksSinceStart()),
|
|
||||||
LuaValue.valueOf("fuse"), LuaValue.valueOf(tntPoint.getFuse()),
|
|
||||||
LuaValue.valueOf("isExplosion"), LuaValue.valueOf(tntPoint.isExplosion()),
|
|
||||||
LuaValue.valueOf("isInWater"), LuaValue.valueOf(tntPoint.isInWater()),
|
|
||||||
LuaValue.valueOf("hasDestroyedBuild"), LuaValue.valueOf(tntPoint.isDestroyedBuildArea()),
|
|
||||||
LuaValue.valueOf("hasDestroyedTestblock"), LuaValue.valueOf(tntPoint.isDestroyedTestBlock())
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public LuaTable get(Player player) {
|
|
||||||
LuaTable rootTable = LuaValue.tableOf();
|
|
||||||
|
|
||||||
rootTable.set("getTraces", new ZeroArgFunction() {
|
|
||||||
@Override
|
|
||||||
public LuaValue call() {
|
|
||||||
return LuaValue.listOf(TraceManager.instance.getAll()
|
|
||||||
.stream()
|
|
||||||
.map(TracerLib::convertTrace)
|
|
||||||
.toArray(LuaValue[]::new));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
);
|
|
||||||
|
|
||||||
return rootTable;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+2
-6
@@ -160,11 +160,6 @@ public class ShieldPrinting implements Listener {
|
|||||||
|
|
||||||
private void paste(Map<Material, BlockDataConfiguration<?>[]> stateConfiguration) {
|
private void paste(Map<Material, BlockDataConfiguration<?>[]> stateConfiguration) {
|
||||||
for (Map.Entry<Vector, BlockData> entry : shieldData.entrySet()) {
|
for (Map.Entry<Vector, BlockData> entry : shieldData.entrySet()) {
|
||||||
BlockData copied = entry.getValue();
|
|
||||||
if (copied.getMaterial().isAir()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
Block block = entry.getKey().toLocation(WORLD).getBlock();
|
Block block = entry.getKey().toLocation(WORLD).getBlock();
|
||||||
if (entry.getValue().getMaterial() != block.getType()) {
|
if (entry.getValue().getMaterial() != block.getType()) {
|
||||||
block.setBlockData(entry.getValue(), false);
|
block.setBlockData(entry.getValue(), false);
|
||||||
@@ -176,11 +171,12 @@ public class ShieldPrinting implements Listener {
|
|||||||
|
|
||||||
BlockDataConfiguration[] stateConfigurations = stateConfiguration.get(entry.getValue().getMaterial());
|
BlockDataConfiguration[] stateConfigurations = stateConfiguration.get(entry.getValue().getMaterial());
|
||||||
if (stateConfigurations == null) {
|
if (stateConfigurations == null) {
|
||||||
|
block.setBlockData(entry.getValue(), false);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
BlockData worldOriginal = block.getBlockData();
|
BlockData worldOriginal = block.getBlockData();
|
||||||
copied = copied.clone();
|
BlockData copied = entry.getValue().clone();
|
||||||
for (BlockDataConfiguration blockDataConfiguration : stateConfigurations) {
|
for (BlockDataConfiguration blockDataConfiguration : stateConfigurations) {
|
||||||
if (blockDataConfiguration == null) continue;
|
if (blockDataConfiguration == null) continue;
|
||||||
blockDataConfiguration.apply(copied, worldOriginal);
|
blockDataConfiguration.apply(copied, worldOriginal);
|
||||||
|
|||||||
+1
-1
@@ -76,7 +76,7 @@ public class SimulatorCommand extends SWCommand {
|
|||||||
|
|
||||||
@Register(value = "start", description = "SIMULATOR_START_HELP")
|
@Register(value = "start", description = "SIMULATOR_START_HELP")
|
||||||
public void start(@Validator Player p, @ErrorMessage("SIMULATOR_NOT_EXISTS") Simulator simulator) {
|
public void start(@Validator Player p, @ErrorMessage("SIMULATOR_NOT_EXISTS") Simulator simulator) {
|
||||||
SimulatorExecutor.run(simulator, () -> {});
|
SimulatorExecutor.run(simulator);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Register(value = "rename", description = "SIMULATOR_RENAME_HELP")
|
@Register(value = "rename", description = "SIMULATOR_RENAME_HELP")
|
||||||
|
|||||||
+2
-12
@@ -168,19 +168,9 @@ public class SimulatorCursor implements Listener {
|
|||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Simulator simulator = SimulatorStorage.getSimulator(player);
|
Simulator simulator = SimulatorStorage.getSimulator(player);
|
||||||
if (simulator != null && simulator.getStabGenerator() != null) {
|
|
||||||
removeCursor(player);
|
|
||||||
SimulatorWatcher.show(null, player);
|
|
||||||
SWUtils.sendToActionbar(player, "§cGenerating Stab");
|
|
||||||
synchronized (calculating) {
|
|
||||||
calculating.remove(player);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
SimulatorWatcher.show(simulator, player);
|
SimulatorWatcher.show(simulator, player);
|
||||||
|
|
||||||
List<REntity> entities = SimulatorWatcher.getEntitiesOfSimulator(simulator);
|
List<REntity> entities = SimulatorWatcher.getEntitiesOfSimulator(simulator);
|
||||||
RayTraceUtils.RRayTraceResult rayTraceResult = RayTraceUtils.traceREntity(player, player.getLocation(), entities);
|
RayTraceUtils.RRayTraceResult rayTraceResult = RayTraceUtils.traceREntity(player, player.getLocation(), entities);
|
||||||
if (rayTraceResult == null) {
|
if (rayTraceResult == null) {
|
||||||
@@ -367,7 +357,7 @@ public class SimulatorCursor implements Listener {
|
|||||||
if (simulator == null) {
|
if (simulator == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
SimulatorExecutor.run(simulator, () -> {});
|
SimulatorExecutor.run(simulator);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-2
@@ -20,7 +20,6 @@
|
|||||||
package de.steamwar.bausystem.features.simulator.data;
|
package de.steamwar.bausystem.features.simulator.data;
|
||||||
|
|
||||||
import de.steamwar.bausystem.features.simulator.execute.SimulatorAction;
|
import de.steamwar.bausystem.features.simulator.execute.SimulatorAction;
|
||||||
import de.steamwar.bausystem.features.simulator.execute.SimulatorStabGenerator;
|
|
||||||
import de.steamwar.inventory.InvCallback;
|
import de.steamwar.inventory.InvCallback;
|
||||||
import de.steamwar.inventory.SWItem;
|
import de.steamwar.inventory.SWItem;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
@@ -31,13 +30,13 @@ import org.bukkit.entity.Player;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.function.BiConsumer;
|
import java.util.function.BiConsumer;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public final class Simulator {
|
public final class Simulator {
|
||||||
private SimulatorStabGenerator stabGenerator = null;
|
|
||||||
private Material material = Material.BARREL;
|
private Material material = Material.BARREL;
|
||||||
private final String name;
|
private final String name;
|
||||||
private boolean autoTrace = false;
|
private boolean autoTrace = false;
|
||||||
|
|||||||
-1
@@ -60,7 +60,6 @@ public final class TNTPhase extends SimulatorPhase {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void toSimulatorActions(Vector position, BiConsumer<Integer, SimulatorAction> tickStart, BiConsumer<Integer, SimulatorAction> tickEnd) {
|
public void toSimulatorActions(Vector position, BiConsumer<Integer, SimulatorAction> tickStart, BiConsumer<Integer, SimulatorAction> tickEnd) {
|
||||||
if (count <= 0) return;
|
|
||||||
tickStart.accept(tickOffset, new SimulatorAction(order, count) {
|
tickStart.accept(tickOffset, new SimulatorAction(order, count) {
|
||||||
@Override
|
@Override
|
||||||
public void accept(World world) {
|
public void accept(World world) {
|
||||||
|
|||||||
-34
@@ -1,34 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.features.simulator.execute;
|
|
||||||
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import org.bukkit.util.Vector;
|
|
||||||
|
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
@AllArgsConstructor
|
|
||||||
public enum Direction {
|
|
||||||
X(Vector::getBlockX),
|
|
||||||
Y(Vector::getBlockY),
|
|
||||||
Z(Vector::getBlockZ);
|
|
||||||
|
|
||||||
public final Function<Vector, Integer> component;
|
|
||||||
}
|
|
||||||
+3
-5
@@ -46,7 +46,7 @@ public class SimulatorExecutor implements Listener {
|
|||||||
private static Map<Long, Map<Integer, List<SimulatorAction>>> tickStartActions = new HashMap<>();
|
private static Map<Long, Map<Integer, List<SimulatorAction>>> tickStartActions = new HashMap<>();
|
||||||
private static Map<Long, List<SimulatorAction>> tickEndActions = new HashMap<>();
|
private static Map<Long, List<SimulatorAction>> tickEndActions = new HashMap<>();
|
||||||
|
|
||||||
public static boolean run(Simulator simulator, Runnable onEnd) {
|
public static boolean run(Simulator simulator) {
|
||||||
if (currentlyRunning.contains(simulator)) return false;
|
if (currentlyRunning.contains(simulator)) return false;
|
||||||
currentlyRunning.add(simulator);
|
currentlyRunning.add(simulator);
|
||||||
|
|
||||||
@@ -69,7 +69,7 @@ public class SimulatorExecutor implements Listener {
|
|||||||
public void accept(World world) {
|
public void accept(World world) {
|
||||||
currentlyRunning.remove(simulator);
|
currentlyRunning.remove(simulator);
|
||||||
|
|
||||||
if (simulator.isAutoTrace() && onEnd == null) {
|
if (simulator.isAutoTrace()) {
|
||||||
simulator.getGroups()
|
simulator.getGroups()
|
||||||
.stream()
|
.stream()
|
||||||
.map(SimulatorGroup::getElements)
|
.map(SimulatorGroup::getElements)
|
||||||
@@ -82,12 +82,10 @@ public class SimulatorExecutor implements Listener {
|
|||||||
TraceRecorder.instance.stopRecording(region);
|
TraceRecorder.instance.stopRecording(region);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
onEnd.run();
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if (simulator.isAutoTrace() && onEnd == null) {
|
if (simulator.isAutoTrace()) {
|
||||||
simulator.getGroups()
|
simulator.getGroups()
|
||||||
.stream()
|
.stream()
|
||||||
.map(SimulatorGroup::getElements)
|
.map(SimulatorGroup::getElements)
|
||||||
|
|||||||
-45
@@ -1,45 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.features.simulator.execute;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.features.simulator.data.Simulator;
|
|
||||||
import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
|
|
||||||
import de.steamwar.bausystem.region.Region;
|
|
||||||
import de.steamwar.bausystem.utils.bossbar.BossBarService;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
public class SimulatorStabGenerator {
|
|
||||||
|
|
||||||
private final StabData stabData;
|
|
||||||
|
|
||||||
public SimulatorStabGenerator(Region region, Simulator simulator, TNTElement tntElement, int depthLimit) {
|
|
||||||
stabData = new StabData(region, simulator, tntElement, tntElement.getPhases(), depthLimit);
|
|
||||||
new StabSetup(stabData);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void cancel() {
|
|
||||||
stabData.cancel = true;
|
|
||||||
stabData.simulator.setStabGenerator(null);
|
|
||||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
|
||||||
BossBarService.instance.remove(player, stabData.region, "simulator_stab_generator");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-52
@@ -1,52 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.features.simulator.execute;
|
|
||||||
|
|
||||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
|
||||||
import de.steamwar.bausystem.features.simulator.data.Simulator;
|
|
||||||
import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
|
|
||||||
import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
|
|
||||||
import de.steamwar.bausystem.region.Region;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.logging.Level;
|
|
||||||
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
public class StabData {
|
|
||||||
|
|
||||||
protected static final int MAX_RECORDINGS = 5;
|
|
||||||
protected static final int MAX_TICK_DIFFERENCE = 3;
|
|
||||||
protected static final Level LEVEL = Level.INFO;
|
|
||||||
protected static final int TNT_INCREASE = 10;
|
|
||||||
protected static final int MIN_BLOCK_TO_COUNT_AS_DEPTH = 20;
|
|
||||||
|
|
||||||
protected final Region region;
|
|
||||||
protected final Simulator simulator;
|
|
||||||
protected final TNTElement tntElement;
|
|
||||||
protected final List<TNTPhase> phases;
|
|
||||||
protected final int depthLimit;
|
|
||||||
|
|
||||||
protected Clipboard clipboard;
|
|
||||||
protected boolean cancel = false;
|
|
||||||
|
|
||||||
protected Direction direction = null;
|
|
||||||
protected int currentDepth = 0;
|
|
||||||
}
|
|
||||||
-103
@@ -1,103 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.features.simulator.execute;
|
|
||||||
|
|
||||||
import com.sk89q.worldedit.EditSession;
|
|
||||||
import com.sk89q.worldedit.WorldEdit;
|
|
||||||
import com.sk89q.worldedit.bukkit.BukkitWorld;
|
|
||||||
import com.sk89q.worldedit.regions.CuboidRegion;
|
|
||||||
import com.sk89q.worldedit.world.block.BlockTypes;
|
|
||||||
import de.steamwar.bausystem.features.simulator.data.SimulatorPhase;
|
|
||||||
import de.steamwar.bausystem.features.tracer.TNTPoint;
|
|
||||||
import de.steamwar.bausystem.features.tracer.Trace;
|
|
||||||
import de.steamwar.bausystem.features.tracer.TraceManager;
|
|
||||||
import de.steamwar.bausystem.features.tracer.TraceRecorder;
|
|
||||||
import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.util.Vector;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
public class StabDirection extends StabStep {
|
|
||||||
|
|
||||||
public StabDirection(StabData data) {
|
|
||||||
super(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void start() {
|
|
||||||
try (EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(new BukkitWorld(Bukkit.getWorlds().get(0)), -1)) {
|
|
||||||
e.setBlocks((com.sk89q.worldedit.regions.Region) new CuboidRegion(data.region.getMinPointTestblockExtension().toBlockVector3(), data.region.getMaxPointTestblockExtension().toBlockVector3()), Objects.requireNonNull(BlockTypes.AIR).getDefaultState().toBaseBlock());
|
|
||||||
}
|
|
||||||
|
|
||||||
Trace trace = TraceRecorder.instance.startRecording(data.region);
|
|
||||||
runSimulator(() -> {
|
|
||||||
TraceRecorder.instance.stopRecording(data.region);
|
|
||||||
calculateDirection(trace);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private void calculateDirection(Trace trace) {
|
|
||||||
long tickSinceStart = -1;
|
|
||||||
List<TNTPoint> points = null;
|
|
||||||
for (List<TNTPoint> current : trace.getHistories()) {
|
|
||||||
long ticks = current.get(0).getTicksSinceStart();
|
|
||||||
if (points == null || ticks > tickSinceStart) {
|
|
||||||
tickSinceStart = ticks;
|
|
||||||
points = current;
|
|
||||||
} else if (ticks == tickSinceStart && points.get(0).getTntId() < current.get(0).getTntId()) {
|
|
||||||
points = current;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
TraceManager.instance.remove(trace);
|
|
||||||
if (points == null) {
|
|
||||||
stop();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
TNTPoint current = points.getLast();
|
|
||||||
Vector velocity = current.getVelocity();
|
|
||||||
if (velocity.getX() < 0) velocity.setX(-velocity.getX());
|
|
||||||
if (velocity.getY() < 0) velocity.setY(-velocity.getY());
|
|
||||||
if (velocity.getZ() < 0) velocity.setZ(-velocity.getZ());
|
|
||||||
if (velocity.getX() > velocity.getY() && velocity.getX() > velocity.getZ()) {
|
|
||||||
data.direction = Direction.X;
|
|
||||||
} else if (velocity.getY() > velocity.getX() && velocity.getY() > velocity.getZ()) {
|
|
||||||
data.direction = Direction.Y;
|
|
||||||
} else if (velocity.getZ() > velocity.getX() && velocity.getZ() > velocity.getY()) {
|
|
||||||
data.direction = Direction.Z;
|
|
||||||
} else {
|
|
||||||
stop();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Bukkit.getLogger().log(StabData.LEVEL, "Direction: {0}", data.direction);
|
|
||||||
data.phases.getFirst().setOrder(SimulatorPhase.ORDER_LIMIT);
|
|
||||||
data.phases.getFirst().setCount(StabData.TNT_INCREASE);
|
|
||||||
new StabGenerator(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void bossbar(BauSystemBossbar bossbar, boolean finished) {
|
|
||||||
bossbar.setProgress(0);
|
|
||||||
bossbar.setTitle("§eCalculating Stab Direction");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-61
@@ -1,61 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.features.simulator.execute;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.features.tracer.Trace;
|
|
||||||
import de.steamwar.bausystem.features.tracer.TraceRecorder;
|
|
||||||
import de.steamwar.bausystem.region.flags.Flag;
|
|
||||||
import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
|
|
||||||
import de.steamwar.bausystem.region.utils.RegionExtensionType;
|
|
||||||
import de.steamwar.bausystem.region.utils.RegionType;
|
|
||||||
import de.steamwar.bausystem.utils.PasteBuilder;
|
|
||||||
import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
|
|
||||||
|
|
||||||
public class StabFinalizer extends StabStep {
|
|
||||||
|
|
||||||
public StabFinalizer(StabData data) {
|
|
||||||
super(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void start() {
|
|
||||||
try {
|
|
||||||
PasteBuilder.ClipboardProvider clipboardProvider = new PasteBuilder.ClipboardProviderImpl(data.clipboard);
|
|
||||||
PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider)
|
|
||||||
.color(data.region.getPlain(Flag.COLOR, ColorMode.class).getColor());
|
|
||||||
data.region.reset(pasteBuilder, RegionType.TESTBLOCK, RegionExtensionType.EXTENSION);
|
|
||||||
} catch (SecurityException e) {
|
|
||||||
stop();
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
|
|
||||||
TraceRecorder.instance.startRecording(data.region);
|
|
||||||
runSimulator(() -> {
|
|
||||||
TraceRecorder.instance.stopRecording(data.region);
|
|
||||||
stop();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void bossbar(BauSystemBossbar bossbar, boolean stopped) {
|
|
||||||
bossbar.setProgress(Math.min(data.currentDepth / (double) data.depthLimit, 1.0));
|
|
||||||
bossbar.setTitle("§e" + data.currentDepth + "§8/§7" + data.depthLimit);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-250
@@ -1,250 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.features.simulator.execute;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
|
|
||||||
import de.steamwar.bausystem.region.Region;
|
|
||||||
import de.steamwar.bausystem.region.flags.Flag;
|
|
||||||
import de.steamwar.bausystem.region.flags.flagvalues.ColorMode;
|
|
||||||
import de.steamwar.bausystem.region.utils.RegionExtensionType;
|
|
||||||
import de.steamwar.bausystem.region.utils.RegionType;
|
|
||||||
import de.steamwar.bausystem.utils.PasteBuilder;
|
|
||||||
import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.event.EventHandler;
|
|
||||||
import org.bukkit.event.HandlerList;
|
|
||||||
import org.bukkit.event.Listener;
|
|
||||||
import org.bukkit.event.entity.EntityExplodeEvent;
|
|
||||||
|
|
||||||
import java.util.*;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import static de.steamwar.bausystem.features.simulator.execute.Direction.Y;
|
|
||||||
|
|
||||||
public class StabGenerator extends StabStep implements Listener {
|
|
||||||
|
|
||||||
private int recordings = 0;
|
|
||||||
private List<Integer> currentDepths = new ArrayList<>();
|
|
||||||
private int lastDepth = 0;
|
|
||||||
|
|
||||||
private int retries = 0;
|
|
||||||
|
|
||||||
private final Map<Integer, Set<Location>> destroyedBlocksPerSlice = new HashMap<>();
|
|
||||||
|
|
||||||
private Set<Integer> gabStart = new HashSet<>();
|
|
||||||
private Set<TNTPhase> failedAtLeastOnce = new HashSet<>();
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onEntityExplode(EntityExplodeEvent event) {
|
|
||||||
if (Region.getRegion(event.getEntity().getLocation()) == data.region) {
|
|
||||||
event.blockList().forEach(block -> {
|
|
||||||
if (!data.region.inRegion(block.getLocation(), RegionType.TESTBLOCK, RegionExtensionType.EXTENSION)) return;
|
|
||||||
int component = data.direction.component.apply(block.getLocation().toVector());
|
|
||||||
destroyedBlocksPerSlice.computeIfAbsent(component, __ -> new HashSet<>())
|
|
||||||
.add(block.getLocation());
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public StabGenerator(StabData data) {
|
|
||||||
super(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void start() {
|
|
||||||
try {
|
|
||||||
PasteBuilder.ClipboardProvider clipboardProvider = new PasteBuilder.ClipboardProviderImpl(data.clipboard);
|
|
||||||
PasteBuilder pasteBuilder = new PasteBuilder(clipboardProvider)
|
|
||||||
.color(data.region.getPlain(Flag.COLOR, ColorMode.class).getColor());
|
|
||||||
data.region.reset(pasteBuilder, RegionType.TESTBLOCK, RegionExtensionType.EXTENSION);
|
|
||||||
} catch (SecurityException e) {
|
|
||||||
stop();
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (data.cancel) {
|
|
||||||
HandlerList.unregisterAll(this);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
runSimulator(this::calculateStab);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void calculateStab() {
|
|
||||||
TNTPhase lastPhase = data.phases.getLast();
|
|
||||||
|
|
||||||
List<Map.Entry<Integer, Set<Location>>> locations = destroyedBlocksPerSlice.entrySet()
|
|
||||||
.stream()
|
|
||||||
.sorted(Comparator.comparingInt(Map.Entry::getKey))
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
int depth = 0;
|
|
||||||
for (int i = 0; i < locations.size(); i++) {
|
|
||||||
if (data.direction != Y && i > 0 && Math.abs(locations.get(i - 1).getKey() - locations.get(i).getKey()) > 3) {
|
|
||||||
if (gabStart.add(locations.get(i).getKey())) {
|
|
||||||
Bukkit.getLogger().log(StabData.LEVEL, "Increasing tnt count by {0} because of gap", StabData.TNT_INCREASE);
|
|
||||||
lastPhase.setCount(lastPhase.getCount() + StabData.TNT_INCREASE);
|
|
||||||
recordings = 0;
|
|
||||||
currentDepths.clear();
|
|
||||||
|
|
||||||
run();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (i == 0 || i == locations.size() - 1) {
|
|
||||||
if (locations.get(i).getValue().size() > StabData.MIN_BLOCK_TO_COUNT_AS_DEPTH) {
|
|
||||||
depth++;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
depth++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (depth > 0) {
|
|
||||||
Bukkit.getLogger().log(StabData.LEVEL, "{0} {1} {2}", new Object[]{depth, destroyedBlocksPerSlice.size(), destroyedBlocksPerSlice.values().stream().map(Set::size).collect(Collectors.toList())});
|
|
||||||
destroyedBlocksPerSlice.clear();
|
|
||||||
currentDepths.add(depth);
|
|
||||||
} else {
|
|
||||||
destroyedBlocksPerSlice.clear();
|
|
||||||
lastPhase.setTickOffset(lastPhase.getTickOffset() + 1);
|
|
||||||
Bukkit.getLogger().log(StabData.LEVEL, "No dimension - Increasing tickOffset to: {0}", lastPhase.getTickOffset());
|
|
||||||
lastPhase.setOrder(0);
|
|
||||||
if (lastPhase.getTickOffset() > 80) {
|
|
||||||
stop();
|
|
||||||
} else {
|
|
||||||
run();
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
int minDepth = currentDepths.stream().min(Integer::compareTo).orElse(0);
|
|
||||||
int maxDepth = currentDepths.stream().max(Integer::compareTo).orElse(0);
|
|
||||||
data.currentDepth = maxDepth;
|
|
||||||
|
|
||||||
int countWithoutLast = 0;
|
|
||||||
for (int i = 0; i < data.phases.size() - 1; i++) {
|
|
||||||
countWithoutLast += data.phases.get(i).getCount();
|
|
||||||
}
|
|
||||||
countWithoutLast -= gabStart.size();
|
|
||||||
|
|
||||||
boolean moreTNTNeeded = maxDepth - countWithoutLast >= lastPhase.getCount() - 5;
|
|
||||||
if (moreTNTNeeded) {
|
|
||||||
Bukkit.getLogger().log(StabData.LEVEL, "Increasing tnt count by {0}", StabData.TNT_INCREASE);
|
|
||||||
lastPhase.setCount(lastPhase.getCount() + StabData.TNT_INCREASE);
|
|
||||||
recordings = 0;
|
|
||||||
currentDepths.clear();
|
|
||||||
|
|
||||||
run();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (recordings++ < StabData.MAX_RECORDINGS) {
|
|
||||||
run();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
recordings = 0;
|
|
||||||
currentDepths.clear();
|
|
||||||
|
|
||||||
if (maxDepth - minDepth > lastPhase.getCount()) {
|
|
||||||
Bukkit.getLogger().log(StabData.LEVEL, "Stab failed at least once. Adding one tnt to {0}", minDepth - 3);
|
|
||||||
int current = 0;
|
|
||||||
TNTPhase last = null;
|
|
||||||
for (TNTPhase phase : data.phases) {
|
|
||||||
if (current < minDepth - 3) {
|
|
||||||
current += phase.getCount();
|
|
||||||
last = phase;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (failedAtLeastOnce.add(last)) {
|
|
||||||
last = null;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (last != null) {
|
|
||||||
last.setCount(last.getCount() + 1);
|
|
||||||
Bukkit.getLogger().log(StabData.LEVEL, "Added to phase {0} now has {1} tnt", new Object[]{data.phases.indexOf(last), last.getCount()});
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (last != null) {
|
|
||||||
run();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Bukkit.getLogger().log(StabData.LEVEL, "No more TNT needed on phase adjusting - {0} new count; {1} current count", new Object[]{maxDepth - countWithoutLast, lastPhase.getCount()});
|
|
||||||
lastPhase.setCount(maxDepth - countWithoutLast);
|
|
||||||
if (lastPhase.getCount() <= 0) {
|
|
||||||
Bukkit.getLogger().log(StabData.LEVEL, "Count was 0 or negative - removing last phase");
|
|
||||||
data.phases.removeLast();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (maxDepth > data.depthLimit) {
|
|
||||||
Bukkit.getLogger().log(StabData.LEVEL, "Depth is greater than {0} - finished", data.depthLimit);
|
|
||||||
new StabFinalizer(data);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (maxDepth <= lastDepth) {
|
|
||||||
if (lastPhase.getCount() <= 0) {
|
|
||||||
retries++;
|
|
||||||
}
|
|
||||||
if (lastPhase.getCount() > 0 || retries > StabData.MAX_TICK_DIFFERENCE) {
|
|
||||||
Bukkit.getLogger().log(StabData.LEVEL, "Depth is equal to last depth recorded {0} - finished", maxDepth);
|
|
||||||
new StabFinalizer(data);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
lastDepth = maxDepth;
|
|
||||||
|
|
||||||
newPhase(data, lastPhase);
|
|
||||||
run();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void newPhase(StabData data, TNTPhase lastPhase) {
|
|
||||||
Bukkit.getLogger().log(StabData.LEVEL, "Adding new phase in next tick");
|
|
||||||
TNTPhase nextPhase = new TNTPhase();
|
|
||||||
nextPhase.setCount(StabData.TNT_INCREASE);
|
|
||||||
nextPhase.setTickOffset(lastPhase.getTickOffset() + 1);
|
|
||||||
nextPhase.setXJump(lastPhase.isXJump());
|
|
||||||
nextPhase.setYJump(lastPhase.isYJump());
|
|
||||||
nextPhase.setZJump(lastPhase.isZJump());
|
|
||||||
data.phases.add(nextPhase);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void bossbar(BauSystemBossbar bossbar, boolean finished) {
|
|
||||||
bossbar.setProgress(Math.min(data.currentDepth / (double) data.depthLimit, 1.0));
|
|
||||||
if (finished) {
|
|
||||||
bossbar.setTitle("§e" + data.currentDepth + "§8/§7" + data.depthLimit);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
StringBuilder st = new StringBuilder();
|
|
||||||
st.append("§7Direction §e").append(data.direction);
|
|
||||||
st.append(" §e").append(data.currentDepth).append("§8/§7").append(data.depthLimit);
|
|
||||||
if (recordings > 0) {
|
|
||||||
st.append(" §7Retries§8:§e ").append(recordings).append("§8/§7").append(StabData.MAX_RECORDINGS);
|
|
||||||
}
|
|
||||||
bossbar.setTitle(st.toString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-85
@@ -1,85 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.features.simulator.execute;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
|
|
||||||
import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
|
|
||||||
import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
|
|
||||||
import de.steamwar.bausystem.features.tracer.TraceRecorder;
|
|
||||||
import de.steamwar.bausystem.utils.FlatteningWrapper;
|
|
||||||
import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
|
|
||||||
|
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
public class StabSetup extends StabStep {
|
|
||||||
|
|
||||||
public StabSetup(StabData data) {
|
|
||||||
super(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void start() {
|
|
||||||
TNTPhase tntPhase = data.simulator.getGroups().stream()
|
|
||||||
.filter(simulatorGroup -> !simulatorGroup.isDisabled())
|
|
||||||
.map(SimulatorGroup::getElements)
|
|
||||||
.flatMap(List::stream)
|
|
||||||
.filter(TNTElement.class::isInstance)
|
|
||||||
.map(TNTElement.class::cast)
|
|
||||||
.filter(tntElement -> !tntElement.isDisabled())
|
|
||||||
.filter(tntElement -> data.tntElement != tntElement)
|
|
||||||
.map(tntElement -> tntElement.getPhases().stream().max(Comparator.comparingInt(TNTPhase::getTickOffset)))
|
|
||||||
.filter(Optional::isPresent)
|
|
||||||
.map(Optional::get)
|
|
||||||
.peek(phase -> {
|
|
||||||
if (phase.getOrder() > TNTPhase.ORDER_LIMIT) {
|
|
||||||
phase.setOrder(TNTPhase.ORDER_LIMIT);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.filter(phase -> phase != data.phases.get(0))
|
|
||||||
.max(Comparator.comparingInt(TNTPhase::getTickOffset))
|
|
||||||
.orElse(null);
|
|
||||||
if (tntPhase == null) {
|
|
||||||
throw new SecurityException("");
|
|
||||||
}
|
|
||||||
|
|
||||||
TNTPhase phase = data.phases.get(0);
|
|
||||||
data.phases.clear();
|
|
||||||
data.phases.add(phase);
|
|
||||||
phase.setCount(1);
|
|
||||||
phase.setTickOffset(tntPhase.getTickOffset());
|
|
||||||
phase.setOrder(100);
|
|
||||||
|
|
||||||
TraceRecorder.instance.stopRecording(data.region);
|
|
||||||
if (TraceRecorder.instance.isAutoTraceEnabledInRegion(data.region)) {
|
|
||||||
TraceRecorder.instance.removeAutoTraceRegion(data.region);
|
|
||||||
}
|
|
||||||
data.clipboard = FlatteningWrapper.impl.copy(data.region.getMinPointTestblockExtension(), data.region.getMaxPointTestblockExtension(), data.region.getTestBlockPoint());
|
|
||||||
|
|
||||||
new StabDirection(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void bossbar(BauSystemBossbar bossbar, boolean finished) {
|
|
||||||
bossbar.setProgress(0);
|
|
||||||
bossbar.setTitle("§eSetting up Simulator");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-95
@@ -1,95 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.features.simulator.execute;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.BauSystem;
|
|
||||||
import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
|
|
||||||
import de.steamwar.bausystem.utils.bossbar.BauSystemBossbar;
|
|
||||||
import de.steamwar.bausystem.utils.bossbar.BossBarService;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.boss.BarColor;
|
|
||||||
import org.bukkit.boss.BarStyle;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.HandlerList;
|
|
||||||
import org.bukkit.event.Listener;
|
|
||||||
|
|
||||||
public abstract class StabStep {
|
|
||||||
|
|
||||||
protected final StabData data;
|
|
||||||
|
|
||||||
protected StabStep(StabData data) {
|
|
||||||
this.data = data;
|
|
||||||
run();
|
|
||||||
}
|
|
||||||
|
|
||||||
protected final void run() {
|
|
||||||
Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
|
|
||||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
|
||||||
BauSystemBossbar bossbar = BossBarService.instance.get(player, data.region, "simulator_stab_generator");
|
|
||||||
bossbar.setColor(BarColor.GREEN);
|
|
||||||
bossbar.setStyle(BarStyle.SEGMENTED_10);
|
|
||||||
bossbar(bossbar, false);
|
|
||||||
}
|
|
||||||
}, 1);
|
|
||||||
|
|
||||||
if (this instanceof Listener) {
|
|
||||||
Bukkit.getPluginManager().registerEvents((Listener) this, BauSystem.getInstance());
|
|
||||||
}
|
|
||||||
Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), this::start, 20);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected abstract void start();
|
|
||||||
|
|
||||||
protected final void runSimulator(Runnable onFinish) {
|
|
||||||
SimulatorExecutor.run(data.simulator, () -> {
|
|
||||||
Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
|
|
||||||
if (this instanceof Listener) {
|
|
||||||
HandlerList.unregisterAll((Listener) this);
|
|
||||||
}
|
|
||||||
onFinish.run();
|
|
||||||
}, 20);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
protected abstract void bossbar(BauSystemBossbar bossbar, boolean stopped);
|
|
||||||
|
|
||||||
protected final void stop() {
|
|
||||||
data.simulator.setStabGenerator(null);
|
|
||||||
SimulatorWatcher.update(data.simulator);
|
|
||||||
|
|
||||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
|
||||||
BauSystemBossbar bossbar = BossBarService.instance.get(player, data.region, "simulator_stab_generator");
|
|
||||||
bossbar.setColor(BarColor.GREEN);
|
|
||||||
bossbar.setStyle(BarStyle.SEGMENTED_10);
|
|
||||||
bossbar(bossbar, true);
|
|
||||||
}
|
|
||||||
new Thread(() -> {
|
|
||||||
try {
|
|
||||||
Thread.sleep(4000);
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
Thread.currentThread().interrupt();
|
|
||||||
} finally {
|
|
||||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
|
||||||
BossBarService.instance.remove(player, data.region, "simulator_stab_generator");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}).start();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-10
@@ -53,16 +53,6 @@ public class SimulatorMaterialGui extends SimulatorPageGui<Material> {
|
|||||||
this.back = back;
|
this.back = back;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean shouldOpen() {
|
|
||||||
if (player.getItemOnCursor().getType().isAir()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
change.accept(player.getItemOnCursor().getType());
|
|
||||||
SimulatorWatcher.update(simulator);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String baseTitle() {
|
public String baseTitle() {
|
||||||
return "Material";
|
return "Material";
|
||||||
|
|||||||
-11
@@ -24,11 +24,8 @@ import de.steamwar.bausystem.features.simulator.data.Simulator;
|
|||||||
import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
|
import de.steamwar.bausystem.features.simulator.data.SimulatorGroup;
|
||||||
import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
|
import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
|
||||||
import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
|
import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
|
||||||
import de.steamwar.bausystem.features.simulator.execute.SimulatorStabGenerator;
|
|
||||||
import de.steamwar.bausystem.features.simulator.gui.base.SimulatorAnvilGui;
|
|
||||||
import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
|
import de.steamwar.bausystem.features.simulator.gui.base.SimulatorBaseGui;
|
||||||
import de.steamwar.bausystem.features.simulator.gui.base.SimulatorScrollGui;
|
import de.steamwar.bausystem.features.simulator.gui.base.SimulatorScrollGui;
|
||||||
import de.steamwar.bausystem.region.Region;
|
|
||||||
import de.steamwar.inventory.SWItem;
|
import de.steamwar.inventory.SWItem;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@@ -100,14 +97,6 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
|
|||||||
tnt.setDisabled(!tnt.isDisabled());
|
tnt.setDisabled(!tnt.isDisabled());
|
||||||
SimulatorWatcher.update(simulator);
|
SimulatorWatcher.update(simulator);
|
||||||
}));
|
}));
|
||||||
inventory.setItem(49, new SWItem(Material.CALIBRATED_SCULK_SENSOR, "§eCreate Stab", click -> {
|
|
||||||
new SimulatorAnvilGui<>(player, "Depth Limit", "", Integer::parseInt, depthLimit -> {
|
|
||||||
if (depthLimit <= 0) return false;
|
|
||||||
simulator.setStabGenerator(new SimulatorStabGenerator(Region.getRegion(player.getLocation()), simulator, tnt, depthLimit));
|
|
||||||
SimulatorWatcher.update(simulator);
|
|
||||||
return true;
|
|
||||||
}, null).open();
|
|
||||||
}));
|
|
||||||
inventory.setItem(50, new SWItem(Material.CHEST, parent.getElements().size() == 1 ? "§eMake Group" : "§eAdd another TNT to Group", clickType -> {
|
inventory.setItem(50, new SWItem(Material.CHEST, parent.getElements().size() == 1 ? "§eMake Group" : "§eAdd another TNT to Group", clickType -> {
|
||||||
TNTElement tntElement = new TNTElement(tnt.getPosition().clone());
|
TNTElement tntElement = new TNTElement(tnt.getPosition().clone());
|
||||||
tntElement.add(new TNTPhase());
|
tntElement.add(new TNTPhase());
|
||||||
|
|||||||
+1
-1
@@ -44,7 +44,7 @@ public class SimulatorAnvilGui<T extends Number> {
|
|||||||
if (error.get()) {
|
if (error.get()) {
|
||||||
anvilInv.open();
|
anvilInv.open();
|
||||||
} else {
|
} else {
|
||||||
if (back != null) back.open();
|
back.open();
|
||||||
}
|
}
|
||||||
error.set(false);
|
error.set(false);
|
||||||
}, 0);
|
}, 0);
|
||||||
|
|||||||
+3
-23
@@ -22,6 +22,7 @@ package de.steamwar.bausystem.features.simulator.gui.base;
|
|||||||
import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
|
import de.steamwar.bausystem.features.simulator.SimulatorWatcher;
|
||||||
import de.steamwar.bausystem.features.simulator.data.Simulator;
|
import de.steamwar.bausystem.features.simulator.data.Simulator;
|
||||||
import de.steamwar.core.Core;
|
import de.steamwar.core.Core;
|
||||||
|
import de.steamwar.core.TrickyTrialsWrapper;
|
||||||
import de.steamwar.inventory.SWInventory;
|
import de.steamwar.inventory.SWInventory;
|
||||||
import de.steamwar.inventory.SWItem;
|
import de.steamwar.inventory.SWItem;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
@@ -45,8 +46,6 @@ public abstract class SimulatorBaseGui {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public final void open() {
|
public final void open() {
|
||||||
if (!shouldOpen()) return;
|
|
||||||
|
|
||||||
String newTitle = title();
|
String newTitle = title();
|
||||||
String originalTitle = player.getOpenInventory().getTitle();
|
String originalTitle = player.getOpenInventory().getTitle();
|
||||||
|
|
||||||
@@ -63,11 +62,7 @@ public abstract class SimulatorBaseGui {
|
|||||||
if (Core.getVersion() > 19) {
|
if (Core.getVersion() > 19) {
|
||||||
player.getOpenInventory().setTitle(title());
|
player.getOpenInventory().setTitle(title());
|
||||||
}
|
}
|
||||||
if (simulator != null && simulator.getStabGenerator() != null) {
|
populate();
|
||||||
populateStabGenerator();
|
|
||||||
} else {
|
|
||||||
populate();
|
|
||||||
}
|
|
||||||
if (player.getOpenInventory().getTopInventory() == inv) {
|
if (player.getOpenInventory().getTopInventory() == inv) {
|
||||||
inventory.open();
|
inventory.open();
|
||||||
SimulatorWatcher.watch(player, simulator, this::open);
|
SimulatorWatcher.watch(player, simulator, this::open);
|
||||||
@@ -87,25 +82,10 @@ public abstract class SimulatorBaseGui {
|
|||||||
});
|
});
|
||||||
|
|
||||||
SimulatorWatcher.watch(player, simulator, this::open);
|
SimulatorWatcher.watch(player, simulator, this::open);
|
||||||
if (simulator != null && simulator.getStabGenerator() != null) {
|
populate();
|
||||||
populateStabGenerator();
|
|
||||||
} else {
|
|
||||||
populate();
|
|
||||||
}
|
|
||||||
inventory.open();
|
inventory.open();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void populateStabGenerator() {
|
|
||||||
inventory.setItem(22, new SWItem(Material.BARRIER, "§cCancel Stab Generator", click -> {
|
|
||||||
simulator.getStabGenerator().cancel();
|
|
||||||
SimulatorWatcher.update(simulator);
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean shouldOpen() {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setup() {
|
private void setup() {
|
||||||
for (int i = 0; i < 9; i++) {
|
for (int i = 0; i < 9; i++) {
|
||||||
inventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§8", clickType -> {
|
inventory.setItem(i, new SWItem(Material.GRAY_STAINED_GLASS_PANE, "§8", clickType -> {
|
||||||
|
|||||||
+1
-2
@@ -25,7 +25,6 @@ import com.sk89q.worldedit.world.block.BaseBlock;
|
|||||||
import com.sk89q.worldedit.world.block.BlockState;
|
import com.sk89q.worldedit.world.block.BlockState;
|
||||||
import com.sk89q.worldedit.world.block.BlockTypes;
|
import com.sk89q.worldedit.world.block.BlockTypes;
|
||||||
import de.steamwar.bausystem.utils.WorldEditUtils;
|
import de.steamwar.bausystem.utils.WorldEditUtils;
|
||||||
import de.steamwar.core.Core;
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.SneakyThrows;
|
import lombok.SneakyThrows;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
@@ -57,7 +56,7 @@ public class Panzern {
|
|||||||
|
|
||||||
private BaseBlock blockType;
|
private BaseBlock blockType;
|
||||||
private BaseBlock slabType;
|
private BaseBlock slabType;
|
||||||
private static final BaseBlock jukeboxType = (Core.getVersion() > 19 ? BlockTypes.get("lodestone"): BlockTypes.get("jukebox")).getDefaultState().toBaseBlock();
|
private static final BaseBlock jukeboxType = BlockTypes.JUKEBOX.getDefaultState().toBaseBlock();
|
||||||
private static final BaseBlock cobwebType = BlockTypes.COBWEB.getDefaultState().toBaseBlock();
|
private static final BaseBlock cobwebType = BlockTypes.COBWEB.getDefaultState().toBaseBlock();
|
||||||
private static final BaseBlock airType = BlockTypes.AIR.getDefaultState().toBaseBlock();
|
private static final BaseBlock airType = BlockTypes.AIR.getDefaultState().toBaseBlock();
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -19,8 +19,8 @@
|
|||||||
|
|
||||||
package de.steamwar.bausystem.features.smartplace;
|
package de.steamwar.bausystem.features.smartplace;
|
||||||
|
|
||||||
import com.comphenix.tinyprotocol.TinyProtocol;
|
|
||||||
import de.steamwar.Reflection;
|
import de.steamwar.Reflection;
|
||||||
|
import com.comphenix.tinyprotocol.TinyProtocol;
|
||||||
import de.steamwar.bausystem.BauSystem;
|
import de.steamwar.bausystem.BauSystem;
|
||||||
import de.steamwar.bausystem.Permission;
|
import de.steamwar.bausystem.Permission;
|
||||||
import de.steamwar.bausystem.configplayer.Config;
|
import de.steamwar.bausystem.configplayer.Config;
|
||||||
@@ -223,7 +223,7 @@ public class SmartPlaceListener implements Listener {
|
|||||||
Block block = event.getBlock().getRelative(BlockFace.DOWN);
|
Block block = event.getBlock().getRelative(BlockFace.DOWN);
|
||||||
BlockState old = block.getState();
|
BlockState old = block.getState();
|
||||||
Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
|
Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
|
||||||
block.setType(Material.GLASS, true);
|
block.setType(Material.GLASS);
|
||||||
old.update(true, false);
|
old.update(true, false);
|
||||||
}, 1);
|
}, 1);
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-6
@@ -42,16 +42,16 @@ public class TPSCommand extends SWCommand {
|
|||||||
public void genericCommand(Player p, String... args) {
|
public void genericCommand(Player p, String... args) {
|
||||||
BauSystem.MESSAGE.sendPrefixless("OTHER_TPS_HEAD", p);
|
BauSystem.MESSAGE.sendPrefixless("OTHER_TPS_HEAD", p);
|
||||||
BauSystem.MESSAGE.sendPrefixless("OTHER_TPS_MESSAGE", p,
|
BauSystem.MESSAGE.sendPrefixless("OTHER_TPS_MESSAGE", p,
|
||||||
TPSWatcher.getTPSUnlimited(TPSWatcher.TPSType.ONE_SECOND),
|
TPSWatcher.getTPS(TPSWatcher.TPSType.ONE_SECOND),
|
||||||
TPSWatcher.getTPSUnlimited(TPSWatcher.TPSType.TEN_SECONDS),
|
TPSWatcher.getTPS(TPSWatcher.TPSType.TEN_SECONDS),
|
||||||
TPSWatcher.getTPSUnlimited(TPSWatcher.TPSType.ONE_MINUTE),
|
TPSWatcher.getTPS(TPSWatcher.TPSType.ONE_MINUTE),
|
||||||
TPSWatcher.getTPSUnlimited(TPSWatcher.TPSType.FIVE_MINUTES),
|
TPSWatcher.getTPS(TPSWatcher.TPSType.FIVE_MINUTES),
|
||||||
TPSWatcher.getTPSUnlimited(TPSWatcher.TPSType.TEN_MINUTES)
|
TPSWatcher.getTPS(TPSWatcher.TPSType.TEN_MINUTES)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Register
|
@Register
|
||||||
public void genericCommand(Player p, TPSWatcher.TPSType type) {
|
public void genericCommand(Player p, TPSWatcher.TPSType type) {
|
||||||
BauSystem.MESSAGE.sendPrefixless("OTHER_TPS_SINGLE", p, TPSWatcher.getTPSUnlimited(type));
|
BauSystem.MESSAGE.sendPrefixless("OTHER_TPS_SINGLE", p, tpsSystem.getTPS(type));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-9
@@ -38,7 +38,6 @@ import de.steamwar.inventory.SWAnvilInv;
|
|||||||
import de.steamwar.inventory.SWItem;
|
import de.steamwar.inventory.SWItem;
|
||||||
import de.steamwar.linkage.Linked;
|
import de.steamwar.linkage.Linked;
|
||||||
import de.steamwar.linkage.LinkedInstance;
|
import de.steamwar.linkage.LinkedInstance;
|
||||||
import de.steamwar.linkage.MaxVersion;
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
@@ -52,11 +51,14 @@ import org.bukkit.inventory.ItemStack;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
||||||
@Linked
|
@Linked
|
||||||
@MaxVersion(20) // Hotfix for 1.21 tps limit! -> Backport coming later
|
|
||||||
public class TPSSystem implements Listener {
|
public class TPSSystem implements Listener {
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
private static double currentTPSLimit = 20;
|
private double currentTPSLimit = 20;
|
||||||
|
|
||||||
|
public double getTPS(TPSWatcher.TPSType tpsType) {
|
||||||
|
return TPSWatcher.getTPSUnlimited(tpsType);
|
||||||
|
}
|
||||||
|
|
||||||
public TPSSystem() {
|
public TPSSystem() {
|
||||||
if (TPSFreezeUtils.isCanFreeze()) {
|
if (TPSFreezeUtils.isCanFreeze()) {
|
||||||
@@ -334,26 +336,26 @@ public class TPSSystem implements Listener {
|
|||||||
} else if (TPSFreezeUtils.frozen()) {
|
} else if (TPSFreezeUtils.frozen()) {
|
||||||
return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_TPS", p) + "§8: " + BauSystem.MESSAGE.parse("SCOREBOARD_TPS_FROZEN", p);
|
return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_TPS", p) + "§8: " + BauSystem.MESSAGE.parse("SCOREBOARD_TPS_FROZEN", p);
|
||||||
} else {
|
} else {
|
||||||
return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_TPS", p) + "§8: " + tpsColor() + TPSWatcher.getTPSUnlimited(TPSWatcher.TPSType.ONE_SECOND) + tpsLimit();
|
return "§e" + BauSystem.MESSAGE.parse("SCOREBOARD_TPS", p) + "§8: " + tpsColor() + tpsSystem.getTPS(TPSWatcher.TPSType.ONE_SECOND) + tpsLimit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private String tpsColor() {
|
private String tpsColor() {
|
||||||
double tps = TPSWatcher.getTPSUnlimited(TPSWatcher.TPSType.ONE_SECOND);
|
double tps = tpsSystem.getTPS(TPSWatcher.TPSType.ONE_SECOND);
|
||||||
if (tps > TPSSystem.getCurrentTPSLimit() * 0.9) {
|
if (tps > tpsSystem.getCurrentTPSLimit() * 0.9) {
|
||||||
return "§a";
|
return "§a";
|
||||||
}
|
}
|
||||||
if (tps > TPSSystem.getCurrentTPSLimit() * 0.5) {
|
if (tps > tpsSystem.getCurrentTPSLimit() * 0.5) {
|
||||||
return "§e";
|
return "§e";
|
||||||
}
|
}
|
||||||
return "§c";
|
return "§c";
|
||||||
}
|
}
|
||||||
|
|
||||||
private String tpsLimit() {
|
private String tpsLimit() {
|
||||||
if (TPSSystem.getCurrentTPSLimit() == 20) {
|
if (tpsSystem.getCurrentTPSLimit() == 20) {
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
return "§8/§7" + TPSSystem.getCurrentTPSLimit();
|
return "§8/§7" + tpsSystem.getCurrentTPSLimit();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-5
@@ -102,14 +102,11 @@ public class TraceRecorder implements Listener {
|
|||||||
*
|
*
|
||||||
* @param region region to be recorded
|
* @param region region to be recorded
|
||||||
*/
|
*/
|
||||||
public Trace startRecording(Region region) {
|
public void startRecording(Region region) {
|
||||||
if (activeTraces.containsKey(region)) {
|
if (activeTraces.containsKey(region)) return;
|
||||||
return activeTraces.get(region).getTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
TraceRecordingWrapper wrappedTrace = new TraceRecordingWrapper(region);
|
TraceRecordingWrapper wrappedTrace = new TraceRecordingWrapper(region);
|
||||||
activeTraces.put(region, wrappedTrace);
|
activeTraces.put(region, wrappedTrace);
|
||||||
return wrappedTrace.getTrace();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
-5
@@ -20,7 +20,6 @@
|
|||||||
package de.steamwar.bausystem.features.tracer.rendering;
|
package de.steamwar.bausystem.features.tracer.rendering;
|
||||||
|
|
||||||
import de.steamwar.bausystem.BauSystem;
|
import de.steamwar.bausystem.BauSystem;
|
||||||
import de.steamwar.bausystem.configplayer.Config;
|
|
||||||
import de.steamwar.bausystem.features.tracer.TNTPoint;
|
import de.steamwar.bausystem.features.tracer.TNTPoint;
|
||||||
import de.steamwar.bausystem.features.tracer.Trace;
|
import de.steamwar.bausystem.features.tracer.Trace;
|
||||||
import de.steamwar.bausystem.features.tracer.TraceManager;
|
import de.steamwar.bausystem.features.tracer.TraceManager;
|
||||||
@@ -31,13 +30,10 @@ import net.md_5.bungee.api.chat.ClickEvent;
|
|||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import yapion.hierarchy.types.YAPIONValue;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import static de.steamwar.bausystem.features.util.TNTClickListener.TNT_CLICK_DETAILS;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wrapper for the rendering of a record bundle
|
* Wrapper for the rendering of a record bundle
|
||||||
*/
|
*/
|
||||||
@@ -70,7 +66,6 @@ public class TraceEntity extends RFallingBlockEntity {
|
|||||||
* @param player the player the message should be printed for
|
* @param player the player the message should be printed for
|
||||||
*/
|
*/
|
||||||
public void printIntoChat(Player player) {
|
public void printIntoChat(Player player) {
|
||||||
if (!Config.getInstance().get(player).getOrSetDefault(TNT_CLICK_DETAILS, new YAPIONValue<>(true)).asBoolean().orElse(true)) return;
|
|
||||||
TNTPoint representative = records.get(0);
|
TNTPoint representative = records.get(0);
|
||||||
|
|
||||||
BauSystem.MESSAGE.sendPrefixless("TNT_CLICK_HEADER", player);
|
BauSystem.MESSAGE.sendPrefixless("TNT_CLICK_HEADER", player);
|
||||||
|
|||||||
@@ -42,15 +42,6 @@ public class SkullCommand extends SWCommand {
|
|||||||
super("skull", "head");
|
super("skull", "head");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Register
|
|
||||||
public void giveCommand(@Validator Player p) {
|
|
||||||
if (p.getName().startsWith(".")) {
|
|
||||||
BauSystem.MESSAGE.send("SKULL_INVALID", p);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
giveCommand(p, p.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register(description = "SKULL_HELP")
|
@Register(description = "SKULL_HELP")
|
||||||
public void giveCommand(@Validator Player p, @Mapper("player") @ErrorMessage("SKULL_INVALID") String skull) {
|
public void giveCommand(@Validator Player p, @Mapper("player") @ErrorMessage("SKULL_INVALID") String skull) {
|
||||||
ItemStack is = SWItem.getPlayerSkull(skull).getItemStack();
|
ItemStack is = SWItem.getPlayerSkull(skull).getItemStack();
|
||||||
@@ -72,7 +63,7 @@ public class SkullCommand extends SWCommand {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<String> tabCompletes(CommandSender commandSender, PreviousArguments previousArguments, String s) {
|
public List<String> tabCompletes(CommandSender commandSender, PreviousArguments previousArguments, String s) {
|
||||||
return Bukkit.getOnlinePlayers().stream().map(Player::getName).filter(s1 -> !s1.startsWith(".")).collect(Collectors.toList());
|
return Bukkit.getOnlinePlayers().stream().map(Player::getName).filter(s1 -> !s1.endsWith("⍇")).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-25
@@ -21,46 +21,22 @@ package de.steamwar.bausystem.features.util;
|
|||||||
|
|
||||||
import de.steamwar.bausystem.BauSystem;
|
import de.steamwar.bausystem.BauSystem;
|
||||||
import de.steamwar.bausystem.Permission;
|
import de.steamwar.bausystem.Permission;
|
||||||
import de.steamwar.bausystem.configplayer.Config;
|
|
||||||
import de.steamwar.command.SWCommand;
|
|
||||||
import de.steamwar.linkage.Linked;
|
import de.steamwar.linkage.Linked;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.entity.TNTPrimed;
|
import org.bukkit.entity.TNTPrimed;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.player.PlayerInteractEntityEvent;
|
import org.bukkit.event.player.PlayerInteractEntityEvent;
|
||||||
import org.bukkit.inventory.EquipmentSlot;
|
import org.bukkit.inventory.EquipmentSlot;
|
||||||
import yapion.hierarchy.types.YAPIONObject;
|
|
||||||
import yapion.hierarchy.types.YAPIONValue;
|
|
||||||
|
|
||||||
@Linked
|
@Linked
|
||||||
public class TNTClickListener extends SWCommand implements Listener {
|
public class TNTClickListener implements Listener {
|
||||||
|
|
||||||
public static final String TNT_CLICK_DETAILS = "tnt_click_details";
|
|
||||||
|
|
||||||
public TNTClickListener() {
|
|
||||||
super("tntdetails");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register(description = "TNT_DETAILS_COMMAND")
|
|
||||||
public void toggle(Player player) {
|
|
||||||
YAPIONObject yapionObject = Config.getInstance().get(player);
|
|
||||||
if (yapionObject.getOrSetDefault(TNT_CLICK_DETAILS, new YAPIONValue<>(true)).asBoolean().orElse(true)) {
|
|
||||||
yapionObject.put(TNT_CLICK_DETAILS, false);
|
|
||||||
BauSystem.MESSAGE.send("TNT_DETAILS_OFF", player);
|
|
||||||
} else {
|
|
||||||
yapionObject.put(TNT_CLICK_DETAILS, true);
|
|
||||||
BauSystem.MESSAGE.send("TNT_DETAILS_ON", player);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
|
public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
|
||||||
if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
|
if (!Permission.BUILD.hasPermission(event.getPlayer())) return;
|
||||||
if (event.getHand() != EquipmentSlot.HAND) return;
|
if (event.getHand() != EquipmentSlot.HAND) return;
|
||||||
if (!Config.getInstance().get(event.getPlayer()).getOrSetDefault(TNT_CLICK_DETAILS, new YAPIONValue<>(true)).asBoolean().orElse(true)) return;
|
|
||||||
|
|
||||||
Entity entity = event.getRightClicked();
|
Entity entity = event.getRightClicked();
|
||||||
if (event.getRightClicked() instanceof TNTPrimed) {
|
if (event.getRightClicked() instanceof TNTPrimed) {
|
||||||
|
|||||||
+1
-6
@@ -179,12 +179,7 @@ public class SpectatorListener implements Listener {
|
|||||||
|
|
||||||
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
|
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
|
||||||
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
|
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
|
||||||
if (event.getMessage().startsWith("/schem save") ||
|
if (event.getMessage().startsWith("/schem save") || event.getMessage().startsWith("//schem save") || event.getMessage().startsWith("/schematic save") || event.getMessage().startsWith("//schematic save")) {
|
||||||
event.getMessage().startsWith("//schem save") ||
|
|
||||||
event.getMessage().startsWith("/schematic save") ||
|
|
||||||
event.getMessage().startsWith("//schematic save") ||
|
|
||||||
event.getMessage().startsWith("/download") ||
|
|
||||||
event.getMessage().startsWith("//download")) {
|
|
||||||
if (!Permission.SUPERVISOR.hasPermission(event.getPlayer())) {
|
if (!Permission.SUPERVISOR.hasPermission(event.getPlayer())) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
event.setMessage("/");
|
event.setMessage("/");
|
||||||
|
|||||||
@@ -73,8 +73,4 @@ public class Point {
|
|||||||
public Location toLocation(Player player, double dx, double dy, double dz) {
|
public Location toLocation(Player player, double dx, double dy, double dz) {
|
||||||
return new Location(player.getWorld(), x + dx, y + dy, z + dz, player.getLocation().getYaw(), player.getLocation().getPitch());
|
return new Location(player.getWorld(), x + dx, y + dy, z + dz, player.getLocation().getYaw(), player.getLocation().getPitch());
|
||||||
}
|
}
|
||||||
|
|
||||||
public BlockVector3 toBlockVector3() {
|
|
||||||
return BlockVector3.at(this.x, this.y, this.z);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,204 +0,0 @@
|
|||||||
package de.steamwar.bausystem.utils.cursor;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.utils.RayTraceUtils;
|
|
||||||
import de.steamwar.entity.REntity;
|
|
||||||
import de.steamwar.entity.REntityServer;
|
|
||||||
import de.steamwar.entity.RFallingBlockEntity;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.Setter;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.World;
|
|
||||||
import org.bukkit.block.BlockFace;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.EventHandler;
|
|
||||||
import org.bukkit.event.block.Action;
|
|
||||||
import org.bukkit.util.Vector;
|
|
||||||
import yapion.hierarchy.types.YAPIONType;
|
|
||||||
|
|
||||||
import java.util.function.BiConsumer;
|
|
||||||
import java.util.function.BiFunction;
|
|
||||||
|
|
||||||
@Getter
|
|
||||||
public class RCursor {
|
|
||||||
private final World WORLD = Bukkit.getWorlds().get(0);
|
|
||||||
|
|
||||||
private final REntityServer targetServer;
|
|
||||||
private final REntityServer cursorServer;
|
|
||||||
|
|
||||||
private final Player owner;
|
|
||||||
private final Material highlightMaterial;
|
|
||||||
private final ClickHandler onClickHandler;
|
|
||||||
|
|
||||||
private RFallingBlockEntity cursorEntity;
|
|
||||||
|
|
||||||
private Location cursorLocation;
|
|
||||||
private boolean isHittingEntity = false;
|
|
||||||
|
|
||||||
@Setter
|
|
||||||
private Material cursorMaterial;
|
|
||||||
@Setter
|
|
||||||
private CursorMode cursorMode;
|
|
||||||
private boolean visible = true;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public RCursor(REntityServer targetServer, Player owner, Material highlightMaterial, Material cursorMaterial, CursorMode cursorMode, ClickHandler onClickHandler) {
|
|
||||||
this.targetServer = targetServer;
|
|
||||||
this.owner = owner;
|
|
||||||
this.highlightMaterial = highlightMaterial;
|
|
||||||
this.cursorMaterial = cursorMaterial;
|
|
||||||
this.cursorMode = cursorMode;
|
|
||||||
this.onClickHandler = onClickHandler;
|
|
||||||
|
|
||||||
cursorServer = new REntityServer();
|
|
||||||
cursorServer.addPlayer(owner);
|
|
||||||
|
|
||||||
RCursorManager.getInstance().registerCursor(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void render() {
|
|
||||||
if (!visible) return;
|
|
||||||
|
|
||||||
RayTraceUtils.RRayTraceResult rayTraceResult = RayTraceUtils.traceREntity(owner, owner.getLocation(), targetServer.getEntities());
|
|
||||||
if (rayTraceResult == null) {
|
|
||||||
if(cursorEntity != null) cursorEntity.die();
|
|
||||||
cursorEntity = null;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
REntity hitEntity = rayTraceResult.getHitEntity() == cursorEntity ? null : rayTraceResult.getHitEntity();
|
|
||||||
|
|
||||||
|
|
||||||
Material activeCursorMaterial = hitEntity == null ? cursorMaterial : highlightMaterial;
|
|
||||||
Location activeCursorLocation = hitEntity == null ? cursorMode.positionTransform.apply(owner, rayTraceResult).toLocation(WORLD)
|
|
||||||
: new Vector(hitEntity.getX(), hitEntity.getY(), hitEntity.getZ()).toLocation(WORLD);
|
|
||||||
|
|
||||||
cursorLocation = activeCursorLocation;
|
|
||||||
isHittingEntity = hitEntity != null;
|
|
||||||
|
|
||||||
if (cursorEntity == null) {
|
|
||||||
cursorEntity = new RFallingBlockEntity(cursorServer, activeCursorLocation, activeCursorMaterial);
|
|
||||||
cursorEntity.setNoGravity(true);
|
|
||||||
} if (cursorEntity.getMaterial() == activeCursorMaterial) {
|
|
||||||
cursorEntity.move(activeCursorLocation);
|
|
||||||
} else {
|
|
||||||
cursorEntity.die();
|
|
||||||
cursorEntity = new RFallingBlockEntity(cursorServer, activeCursorLocation, activeCursorMaterial);
|
|
||||||
cursorEntity.setNoGravity(true);
|
|
||||||
if(activeCursorMaterial == highlightMaterial) {
|
|
||||||
cursorEntity.setGlowing(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void hide() {
|
|
||||||
visible = false;
|
|
||||||
if (cursorEntity != null) {
|
|
||||||
cursorEntity.die();
|
|
||||||
cursorEntity = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void show() {
|
|
||||||
visible = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void handleClick(Action action) {
|
|
||||||
if(!visible || cursorLocation == null) return;
|
|
||||||
|
|
||||||
onClickHandler.handle(cursorLocation, isHittingEntity, action);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void close() {
|
|
||||||
cursorServer.close();
|
|
||||||
RCursorManager.getInstance().unregisterCursor(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@AllArgsConstructor
|
|
||||||
public enum CursorMode {
|
|
||||||
FREE((player, rayTraceResult) -> {
|
|
||||||
Vector pos = rayTraceResult.getHitPosition();
|
|
||||||
|
|
||||||
BlockFace face = rayTraceResult.getHitBlockFace();
|
|
||||||
if (face != null) {
|
|
||||||
switch (face) {
|
|
||||||
case DOWN:
|
|
||||||
pos.setY(pos.getY() - 0.98);
|
|
||||||
break;
|
|
||||||
case EAST:
|
|
||||||
pos.setX(pos.getX() + 0.49);
|
|
||||||
break;
|
|
||||||
case WEST:
|
|
||||||
pos.setX(pos.getX() - 0.49);
|
|
||||||
break;
|
|
||||||
case NORTH:
|
|
||||||
pos.setZ(pos.getZ() - 0.49);
|
|
||||||
break;
|
|
||||||
case SOUTH:
|
|
||||||
pos.setZ(pos.getZ() + 0.49);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (face.getModY() == 0 && player.isSneaking()) {
|
|
||||||
pos.setY(pos.getY() - 0.49);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!player.isSneaking()) {
|
|
||||||
pos.setX(pos.getBlockX() + 0.5);
|
|
||||||
if (face == null || face.getModY() == 0)
|
|
||||||
pos.setY(pos.getBlockY() + 0.0);
|
|
||||||
pos.setZ(pos.getBlockZ() + 0.5);
|
|
||||||
}
|
|
||||||
|
|
||||||
return pos;
|
|
||||||
}),
|
|
||||||
BLOCK_ALIGNED((player, rayTraceResult) -> {
|
|
||||||
Vector pos = rayTraceResult.getHitPosition();
|
|
||||||
|
|
||||||
BlockFace face = rayTraceResult.getHitBlockFace();
|
|
||||||
if (face != null) {
|
|
||||||
switch (face) {
|
|
||||||
case DOWN:
|
|
||||||
pos.setY(pos.getY() - 0.98);
|
|
||||||
break;
|
|
||||||
case EAST:
|
|
||||||
pos.setX(pos.getX() + 0.49);
|
|
||||||
break;
|
|
||||||
case WEST:
|
|
||||||
pos.setX(pos.getX() - 0.49);
|
|
||||||
break;
|
|
||||||
case NORTH:
|
|
||||||
pos.setZ(pos.getZ() - 0.49);
|
|
||||||
break;
|
|
||||||
case SOUTH:
|
|
||||||
pos.setZ(pos.getZ() + 0.49);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pos.setX(pos.getBlockX() + 0.5);
|
|
||||||
if (pos.getY() - pos.getBlockY() != 0 && face == BlockFace.UP) {
|
|
||||||
pos.setY(pos.getBlockY() + 1.0);
|
|
||||||
} else {
|
|
||||||
pos.setY(pos.getBlockY());
|
|
||||||
}
|
|
||||||
pos.setZ(pos.getBlockZ() + 0.5);
|
|
||||||
return pos;
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
private final BiFunction<Player, RayTraceUtils.RRayTraceResult, Vector> positionTransform;
|
|
||||||
}
|
|
||||||
|
|
||||||
public interface ClickHandler{
|
|
||||||
public void handle(Location cursorLocation, boolean didHitEntity, Action action);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,112 +0,0 @@
|
|||||||
package de.steamwar.bausystem.utils.cursor;
|
|
||||||
|
|
||||||
import com.comphenix.tinyprotocol.TinyProtocol;
|
|
||||||
import de.steamwar.Reflection;
|
|
||||||
import de.steamwar.bausystem.BauSystem;
|
|
||||||
import de.steamwar.linkage.Linked;
|
|
||||||
import lombok.Getter;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.EventHandler;
|
|
||||||
import org.bukkit.event.Listener;
|
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
|
||||||
import org.bukkit.event.player.PlayerQuitEvent;
|
|
||||||
|
|
||||||
import java.lang.ref.SoftReference;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.function.BiFunction;
|
|
||||||
|
|
||||||
@Linked
|
|
||||||
public class RCursorManager implements Listener {
|
|
||||||
@Getter
|
|
||||||
private static RCursorManager instance;
|
|
||||||
|
|
||||||
private final Set<Player> calculationActive = new HashSet<>();
|
|
||||||
private final Map<Player, RCursor> activeCursors = new HashMap<>();
|
|
||||||
|
|
||||||
public RCursorManager() {
|
|
||||||
if (instance == null) {
|
|
||||||
instance = this;
|
|
||||||
}
|
|
||||||
|
|
||||||
BiFunction<Player, Object, Object> function = (player, object) -> {
|
|
||||||
updateCursor(player);
|
|
||||||
return object;
|
|
||||||
};
|
|
||||||
|
|
||||||
Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
|
|
||||||
Set<Player> playersWithActiveCursor = activeCursors.keySet();
|
|
||||||
|
|
||||||
playersWithActiveCursor.forEach(this::updateCursor);
|
|
||||||
}, 0);
|
|
||||||
|
|
||||||
Class<?> positionPacketClass = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Pos");
|
|
||||||
Class<?> lookPacketClass = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$Rot");
|
|
||||||
Class<?> positionLookPacketClass = Reflection.getClass("net.minecraft.network.protocol.game.ServerboundMovePlayerPacket$PosRot");
|
|
||||||
|
|
||||||
TinyProtocol.instance.addFilter(positionPacketClass, function);
|
|
||||||
TinyProtocol.instance.addFilter(lookPacketClass, function);
|
|
||||||
TinyProtocol.instance.addFilter(positionLookPacketClass, function);
|
|
||||||
}
|
|
||||||
|
|
||||||
void registerCursor(RCursor cursor) {
|
|
||||||
closeCursorOf(cursor.getOwner());
|
|
||||||
|
|
||||||
activeCursors.put(cursor.getOwner(), cursor);
|
|
||||||
}
|
|
||||||
|
|
||||||
void unregisterCursor(RCursor cursor) {
|
|
||||||
activeCursors.remove(cursor.getOwner());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void closeCursorOf(Player player) {
|
|
||||||
RCursor currentPlayerCursor = activeCursors.get(player);
|
|
||||||
|
|
||||||
if(currentPlayerCursor != null) {
|
|
||||||
currentPlayerCursor.close();
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private void updateCursor(Player player) {
|
|
||||||
if (!activeCursors.containsKey(player)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
synchronized (calculationActive) {
|
|
||||||
if (calculationActive.contains(player)) {
|
|
||||||
return;
|
|
||||||
} else {
|
|
||||||
calculationActive.add(player);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
RCursor cursor = activeCursors.get(player);
|
|
||||||
|
|
||||||
if (cursor != null) {
|
|
||||||
cursor.render();
|
|
||||||
}
|
|
||||||
|
|
||||||
synchronized (calculationActive) {
|
|
||||||
calculationActive.remove(player);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
private void handlePlayerInteract(PlayerInteractEvent event) {
|
|
||||||
Player player = event.getPlayer();
|
|
||||||
|
|
||||||
RCursor cursorOfPlayer = activeCursors.get(player);
|
|
||||||
|
|
||||||
cursorOfPlayer.handleClick(event.getAction());
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
private void handlePlayerQuit(PlayerQuitEvent event) {
|
|
||||||
closeCursorOf(event.getPlayer());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,419 +0,0 @@
|
|||||||
# SteamWar.de - Script System
|
|
||||||
|
|
||||||
---
|
|
||||||
<!-- TOC -->
|
|
||||||
* [SteamWar.de - Script System](#steamwarde---script-system)
|
|
||||||
* [Einleitung](#einleitung)
|
|
||||||
* [Nutzung mit einer IDE](#nutzung-mit-einer-ide)
|
|
||||||
* [Basis-Apis](#basis-apis)
|
|
||||||
* [SteamWar.de-Api](#steamwarde-api)
|
|
||||||
* [player](#player)
|
|
||||||
* [random](#random)
|
|
||||||
* [region](#region)
|
|
||||||
* [tnt](#tnt)
|
|
||||||
* [trace](#trace)
|
|
||||||
* [server](#server)
|
|
||||||
* [tps](#tps)
|
|
||||||
* [storage](#storage)
|
|
||||||
* [inventory](#inventory)
|
|
||||||
* [SteamWar.de-Global-Api](#steamwarde-global-api)
|
|
||||||
* [Commands](#commands)
|
|
||||||
* [Hotkeys](#hotkeys)
|
|
||||||
* [Eventtypen](#eventtypen)
|
|
||||||
* [BlockEvent](#blockevent)
|
|
||||||
* [InteractEvent](#interactevent)
|
|
||||||
* [Position](#position)
|
|
||||||
* [Instabile APIs](#instabile-apis)
|
|
||||||
* [_worldedit](#worldedit)
|
|
||||||
* [Beispiele](#beispiele)
|
|
||||||
* [Hello, World!](#hello-world)
|
|
||||||
* [Code](#code)
|
|
||||||
* [Ausgabe](#ausgabe)
|
|
||||||
* [BauGUI on DoubleSwap](#baugui-on-doubleswap)
|
|
||||||
* [Code](#code-1)
|
|
||||||
* [SL Command](#sl-command)
|
|
||||||
* [Code](#code-2)
|
|
||||||
* [Paste Hotkey](#paste-hotkey)
|
|
||||||
* [Code](#code-3)
|
|
||||||
* [Inventory](#inventory-1)
|
|
||||||
* [Code](#code-4)
|
|
||||||
<!-- TOC -->
|
|
||||||
|
|
||||||
|
|
||||||
## Einleitung
|
|
||||||
Das Script System auf SteamWar.de basiert auf [Lua](https://www.lua.org/docs.html).
|
|
||||||
Der Code wird einfach in ein Minecraft Buch geschrieben und kann mit einem Links-Klick ausgeführt werden.
|
|
||||||
|
|
||||||
## Nutzung mit einer IDE
|
|
||||||
Im Repository liegen [Lua-Definitionen](sw.def.lua) für [Luanalysis](https://plugins.jetbrains.com/plugin/14698-luanalysis).
|
|
||||||
Diese können in der IDE genutzt werden, um die APIs zu nutzen.
|
|
||||||
|
|
||||||
Einfach die `sw.def.lua` in denselben Ordner wie das Script legen und die IDE sollte die APIs erkennen.
|
|
||||||
|
|
||||||
# Basis-Apis
|
|
||||||
Es werden folgende Standard-Apis zur Verfügung gestellt:
|
|
||||||
- [`math`](https://www.lua.org/manual/5.4/manual.html#6.7)
|
|
||||||
- [`string`](https://www.lua.org/manual/5.4/manual.html#6.4)
|
|
||||||
- [`table`](https://www.lua.org/manual/5.4/manual.html#6.6)
|
|
||||||
- [`bit32`](https://www.lua.org/manual/5.2/manual.html#6.7)
|
|
||||||
|
|
||||||
# SteamWar.de-Api
|
|
||||||
APIs, die mit einem `_` beginnen sind noch nicht stabil und können sich jederzeit ändern.
|
|
||||||
Sie sollten daher nicht verwendet werden, da sie sich noch in der Entwicklung befinden.
|
|
||||||
Diese können auch undokumentierte Funktionen enthalten, die nicht in der Dokumentation aufgeführt sind.
|
|
||||||
|
|
||||||
In den Scripten gibt es dazu noch folgende globale Variablen:
|
|
||||||
- [`player`](#player)
|
|
||||||
- [`random`](#random)
|
|
||||||
- [`region`](#region)
|
|
||||||
- [`server`](#server)
|
|
||||||
- [`storage`](#storage)
|
|
||||||
- [`inventory`](#inventory)
|
|
||||||
- `_worldedit`
|
|
||||||
|
|
||||||
Ohne eine Kategorie sind folgende Funktionen verfügbar, die nicht allgemein sind:
|
|
||||||
|
|
||||||
| Name | Signature | Beschreibung |
|
|
||||||
|-----------|-----------------------------------|-------------------------------------------------------------------------------------------------------------------|
|
|
||||||
| `print` | print(String...) | @see chat(String...) |
|
|
||||||
| `input` | input(String, Function\<String>) | Fragt den User nach einer Eingabe mit der Nachricht und called die zugehörige Funktion nach dieser |
|
|
||||||
| `delayed` | delayed(Number, Function\<Void>) | Wartet die angegebene Anzahl an Ticks und führt danach die zugehörige Funktion aus |
|
|
||||||
| `pos` | pos(Number, Number, Number) | Erstellt aus drei Zahlen eine Position-Table. Die Koordinaten sind unter den Namen `x`, `y` und `z` abgespeichert |
|
|
||||||
| `exec` | exec(String...) | Führt den angegebenen Befehl als Spieler aus |
|
|
||||||
| `length` | length(Any): Int | Gibt die Länge des Objekts zurück |
|
|
||||||
| `join` | length(String, String...): String | Füge die Texte mit den ersten Parameter zusammen |
|
|
||||||
|
|
||||||
### player
|
|
||||||
Das `player`-Modul stellt Funktionen zur Verfügung, die den Spieler betreffen.
|
|
||||||
Es gibt folgende Funktionen:
|
|
||||||
|
|
||||||
| Name | Signature | Beschreibung |
|
|
||||||
|------------------|--------------------------------|---------------------------------------------------------------------------------------------------------------------------|
|
|
||||||
| `name` | name(): String | Gibt den `displayName` des Spielers zurück |
|
|
||||||
| `chat` | chat(String...) | Sendet den Text in den Chat des Spielers |
|
|
||||||
| `actionbar` | actionbar(String...) | Sendet den Text in die ActionBar des Spielers |
|
|
||||||
| `x` | x(Number), x(): Number | Setzt oder gibt die X-Koordinate des Spielers |
|
|
||||||
| `y` | y(Number), y(): Number | Setzt oder gibt die Y-Koordinate des Spielers |
|
|
||||||
| `z` | z(Number), z(): Number | Setzt oder gibt die Z-Koordinate des Spielers |
|
|
||||||
| `yaw` | yaw(Number), yaw(): Number | Setzt oder gibt die Gierung des Spielers |
|
|
||||||
| `pitch` | pitch(Number), pitch(): Number | Setzt oder gibt die Steigung des Spielers |
|
|
||||||
| `sneaking` | sneaking(): Boolean | Wahr, wenn der Spieler am Sneaken ist |
|
|
||||||
| `sprinting` | sprinting(): Boolean | Wahr, wenn der Spieler am Sprinten ist |
|
|
||||||
| `slot` | slot(Number), slot(): Number | Setzt oder gibt den Slot des gehaltenden Items des Spielers [(Wiki)](https://minecraft.fandom.com/wiki/Slot#Java_Edition) |
|
|
||||||
| `item` | item(): String | Gibt den Itemtyp der Main-Hand zurück |
|
|
||||||
| `offHandItem` | offHandItem(): String | Gibt den Itemtyp der Off-Hand zurück |
|
|
||||||
| `closeInventory` | closeInventory() | Schließe das aktuell geöffnete Inventar des Spielers |
|
|
||||||
|
|
||||||
### random
|
|
||||||
Das `random`-Modul stellt Funktionen zur Verfügung, die Zufallszahlen betreffen.
|
|
||||||
Es gibt folgende Funktionen:
|
|
||||||
|
|
||||||
| Name | Signature | Beschreibung |
|
|
||||||
|------------|------------------------------------|-------------------------------------------------------------------------------|
|
|
||||||
| nextInt | nextInt(): Int | Gibt eine Zufallszahl zurück zwischen Integer.MIN_VALUE und Integer.MAX_VALUE |
|
|
||||||
| -"- | nextInt(Int): Int | Gibt eine Zufallszahl zurück zischen 0 und dem Argument |
|
|
||||||
| -"- | nextInt(Int, Int): Int | Gibt eine Zufallszahl zurück zwischen dem ersten und zweiten Argument |
|
|
||||||
| nextDouble | nextDouble(): Double | Gibt eine Zufallszahl zurück zwischen 0 und 1 |
|
|
||||||
| -"- | nextDouble(Double): Double | Gibt eine Zufallszahl zurück zwischen 0 und dem Argument |
|
|
||||||
| -"- | nextDouble(Double, Double): Double | Gibt eine Zufallszahl zurück zwischen ersten und zweiten Argument |
|
|
||||||
| nextBool | nextBool(): Boolean | Gibt true oder false zurück |
|
|
||||||
|
|
||||||
### region
|
|
||||||
Das `region`-Modul stellt Funktion zur Verfügung, die die Region des Spielers betreffen.
|
|
||||||
Es gibt folgende Funktionen:
|
|
||||||
|
|
||||||
| Name | Signature | Beschreibung |
|
|
||||||
|-----------|---------------------|------------------------------------------------------------------------------------------------------------|
|
|
||||||
| `name` | name(): String | Gibt den Regionsnamen |
|
|
||||||
| `type` | type(): String | Gibt den Regionstyp |
|
|
||||||
| `fire` | fire(): Boolean | Gibt den Fire-Modus der Region zurück |
|
|
||||||
| `freeze` | freeze(): Boolean | Gibt den Freeze-Modus der Region zurück |
|
|
||||||
| `protect` | protect(): Boolean | Gibt den Protect-Modus der Region zurück |
|
|
||||||
| `loader` | loader(): String | Gibt den Status des Loaders des Spielers zurück, die Werte sind: `OFF`, `SETUP`, `RUNNING`, `PAUSE`, `END` |
|
|
||||||
| `get` | get(String): Region | Gibt die Region mit dem Namen zurück. Die Region ist gleich aufgebaut wie das Regions-Modul |
|
|
||||||
| `list` | list(): Region[] | Gibt alle Region zurück. Die Region ist gleich aufgebaut wie das Regions-Modul |
|
|
||||||
|
|
||||||
Es gibt folgende weitere Module:
|
|
||||||
|
|
||||||
| Name | Beschreibung |
|
|
||||||
|---------|-----------------|
|
|
||||||
| `tnt` | [tnt](#tnt) |
|
|
||||||
| `trace` | [trace](#trace) |
|
|
||||||
|
|
||||||
#### tnt
|
|
||||||
Das `tnt`-Modul stellt Funktionen zur Verfügung, die den TNT-Modus in der Region des Spielers betreffen.
|
|
||||||
Es gibt folgende Funktionen:
|
|
||||||
|
|
||||||
| Name | Signature | Beschreibung |
|
|
||||||
|-------------|----------------------|-------------------------------------------------------------------------------------|
|
|
||||||
| `mode` | mode(): String | Gibt den Aktuellen TNT-Modus zurück, die werte sind: `ALLOW`, `DENY` oder `ONLY_TB` |
|
|
||||||
| `enabled` | enabled(): Boolean | Gibt zurück, ob der TNT-Modus in der Region des Spielers aktiviert ist oder nicht |
|
|
||||||
| `onlyTb` | onlyTb(): Boolean | Gibt zurück, ob der TNT-Modus auf Only-Tb ist |
|
|
||||||
| `onlyBuild` | onlyBuild(): Boolean | Gibt zurück, ob der TNT-Modus auf Only-Build ist |
|
|
||||||
|
|
||||||
|
|
||||||
#### trace
|
|
||||||
Das `trace`-Modul stellt Funktionen zur Verfügung, die den Status des Tracers der Region betreffen.
|
|
||||||
Es gibt folgende Funktionen:
|
|
||||||
|
|
||||||
| Name | Signature | Beschreibung |
|
|
||||||
|----------|-------------------|--------------------------------------------------------------------------------|
|
|
||||||
| `active` | active(): Boolean | Gibt zurück, ob der Tracer in der Region des Spielers aktiviert ist oder nicht |
|
|
||||||
| `auto` | auto(): Boolean | Gibt zurück, ob der Tracer in der Region ein Auto-Tracer ist |
|
|
||||||
| `status` | status(): String | Gibt den Status des Tracers zurück |
|
|
||||||
| `time` | time(): String | Gibt die Zeit des Tracers zurück |
|
|
||||||
|
|
||||||
## server
|
|
||||||
Das `server`-Modul stellt Funktionen zur Verfügung, die den Server betreffen.
|
|
||||||
Es gibt folgende Funktionen:
|
|
||||||
|
|
||||||
| Name | Signature | Beschreibung |
|
|
||||||
|--------------|-------------------------|---------------------------------------------------------------------|
|
|
||||||
| `time` | time(): String | Gibt die aktuelle Zeit im Format `HH:mm:ss` zurück |
|
|
||||||
| `ticks` | ticks(): Number | Gibt die Ticks seit start des Serverstarts zurück |
|
|
||||||
| `getBlockAt` | getBlockAt(Pos): String | Gibt das Material an der Position zurück |
|
|
||||||
| `setBlockAt` | setBlockAt(Pos, String) | Setzt das Material an der angegebenen Stelle (z.B. Stein = `STONE`) |
|
|
||||||
|
|
||||||
Es gibt folgende weitere Module:
|
|
||||||
|
|
||||||
| Name | Beschreibung |
|
|
||||||
|-------|--------------|
|
|
||||||
| `tps` | [tps](#tps) |
|
|
||||||
|
|
||||||
#### tps
|
|
||||||
Das `tps`-Modul stellt Funktionen zur Verfügung, die die TPS des Servers betreffen.
|
|
||||||
Es gibt folgende Funktionen:
|
|
||||||
|
|
||||||
| Name | Signature | Beschreibung |
|
|
||||||
|--------------|----------------------|-------------------------------------------------------------------|
|
|
||||||
| `current` | current(): Number | Gibt die aktuelle TPS zurück (Das selbe wie `oneSecound()`) |
|
|
||||||
| `oneSecond` | oneSecond(): Number | Gibt die durchschnittliche TPS über die letzte Sekunde zurück |
|
|
||||||
| `tenSecond` | tenSecond(): Number | Gibt die durchschnittliche TPS über die letzte 10 Sekunden zurück |
|
|
||||||
| `oneMinute` | oneMinute(): Number | Gibt die durchschnittliche TPS über die letzte Minute zurück |
|
|
||||||
| `fiveMinute` | fiveMinute(): Number | Gibt die durchschnittliche TPS über die letzte 5 Minuten zurück |
|
|
||||||
| `tenMinute` | tenMinute(): Number | Gibt die durchschnittliche TPS über die letzte 10 Minuten zurück |
|
|
||||||
| `limit` | limit(): Number | Gibt das TPS-Limit zurück |
|
|
||||||
|
|
||||||
## storage
|
|
||||||
Das `storage`-Modul stellt Funktionen zur Verfügung, mit welchen man Werte speichern kann.
|
|
||||||
|
|
||||||
Es gibt folgende Module:
|
|
||||||
|
|
||||||
| Name | Beschreibung |
|
|
||||||
|----------|---------------------|
|
|
||||||
| `player` | Spieler abhängig |
|
|
||||||
| `region` | Region des Spielers |
|
|
||||||
| `global` | Alle Skripte |
|
|
||||||
|
|
||||||
Alle Module haben folgende Funktionen:
|
|
||||||
|
|
||||||
| Name | Signature | Beschreibung |
|
|
||||||
|------------|----------------------------|--------------------------------------------------------|
|
|
||||||
| `get` | get(String): Any | Gibt den Wert des Schlüssels zurück |
|
|
||||||
| `set` | set(String, Any) | Setzt den Wert des Schlüssels auf den angegebenen Wert |
|
|
||||||
| `has` | has(String): Boolean | Prüft ob ein Wert vorhanden ist |
|
|
||||||
| `remove` | remove(String) | Löscht den Schlüssel |
|
|
||||||
| `accessor` | accessor(String): Accessor | Gibt einen Accessor zurück |
|
|
||||||
|
|
||||||
Ein Accessor ist ein Objekt, womit du direkt auf einen Wert zugreifen kannst und es ändern kannst.
|
|
||||||
Es geht wie folgt:
|
|
||||||
```lua
|
|
||||||
keyAccessor = storage.player.accessor("key")
|
|
||||||
|
|
||||||
keyAccessor("Hello World") -- Setzt den Wert auf "Hello World"
|
|
||||||
print(keyAccessor()) -- Gibt den Wert zurück
|
|
||||||
```
|
|
||||||
|
|
||||||
## inventory
|
|
||||||
Das `inventory`-Modul stellt Funktionen zur Verfügung, um ein Inventar zu öffnen.
|
|
||||||
Es gibt folgende Funktionen:
|
|
||||||
|
|
||||||
| Name | Signature | Beschreibung |
|
|
||||||
|----------|-----------------------------------|-------------------------------------------------------------------|
|
|
||||||
| `create` | create(String, Number): Inventory | Erstellt ein Inventar mit dem Title und der Anzahl an Zeilen |
|
|
||||||
|
|
||||||
Das `Inventory`-Objekt hat folgende Funktionen:
|
|
||||||
|
|
||||||
| Name | Signature | Beschreibung |
|
|
||||||
|-------------------|--------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
|
||||||
| `item` | item(Number, String, String, Function\<String>) | Setze ein Item mit dem Typen des ersten Strings an den Slot (Startet bei 0) mit dem Namen des zweiten Strings mit einem Klick-Handler der den Klick-Typen rein gibt (z.B. `LEFT`, `SHIFT_LEFT`, `RIGHT`, `SHIFT_RIGHT`) |
|
|
||||||
| -"- | item(Number, String, String, Function\<String>, List<String>) | Füge eine Lore an das Item hinzu |
|
|
||||||
| -"- | item(Number, String, String, Function\<String>, List<String>, Boolean) | Gebe an, ob das Item enchanted sein soll |
|
|
||||||
| -"- | item(Number, String, String, Function\<String>, List<String>, Boolean, Number) | Gebe die Anzahl der Items an |
|
|
||||||
| `setCloseHandler` | setCloseHandler(Function\<Void>) | Gebe einen Handler an, der beim schließen des Inventares ausgeführt wird |
|
|
||||||
| `open` | open() | Öffne das Inventar |
|
|
||||||
|
|
||||||
Siehe auch: [Inventory Beispiel](#inventory-1)
|
|
||||||
|
|
||||||
Siehe auch: [Liste an Materials](https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/Material.html)
|
|
||||||
|
|
||||||
```
|
|
||||||
⚠️⚠️⚠️
|
|
||||||
|
|
||||||
Wenn eine Barrier statt des richtigen Items angezeigt wird, dann ist das angegebene Material nicht gültig.
|
|
||||||
|
|
||||||
⚠️⚠️⚠️
|
|
||||||
```
|
|
||||||
|
|
||||||
# SteamWar.de-Global-Api
|
|
||||||
Mit `/script` kann man Script-Bücher global abspeichern. Diese haben dann zugrif auf die `global`-Api.
|
|
||||||
Die `global`-Api stellt Funktionen zur Verfügung um auf Events, Commands und Hotkeys mit einem Script zu reagieren.
|
|
||||||
|
|
||||||
Es gibt folgende Funktionen:
|
|
||||||
|
|
||||||
| Name | Signature | Beschreibung |
|
|
||||||
|-----------|-----------------------------------|-----------------------------------------------------------------------------|
|
|
||||||
| `event` | event(EventType, Function(Any)) | Registriere einen Event Listener |
|
|
||||||
| `command` | command(String, Function(Args)) | Registriere einen Befehl |
|
|
||||||
| `hotkey` | hotkey(String, Function(Boolean)) | Registriere einen Hotkey, the function gets a boolean if the key is pressed |
|
|
||||||
|
|
||||||
Es gibt folgende Variablen:
|
|
||||||
|
|
||||||
| Name | Beschreibung |
|
|
||||||
|----------|----------------------------------|
|
|
||||||
| `events` | Siehe: [Event Type](#eventtypen) |
|
|
||||||
|
|
||||||
## Commands
|
|
||||||
Der Command Handler kriegt eine Liste aller angegeben argumenten. Die Argumente sind vom Typ `String`. Mit dem Wert gespeichert unter `args.alias` oder `args["alias"]` erhältst du, welcher command eingegeben wurde. Wenn ein handler für mehrere Befehle registriert wurde kannst du es hiermit erkennen.
|
|
||||||
Du kannst `args.hasShortFlag(String)` um herauszufinden ob eine Flag angegeben wurde wie zum Beispiel `-f`. Mit `args.removeShortFlag(String)` kannst du die Flag entfernen und erhältst ob sie angegeben wurde.
|
|
||||||
|
|
||||||
## Hotkeys
|
|
||||||
|
|
||||||
Hotkeys werden im folgenden Format angegeben: `MODIFIER+KEY`. Bei den Hotkey erstellung ist die Großschreibung egal. Es gibt folgende Modifier:
|
|
||||||
- `ctrl`
|
|
||||||
- `shift`
|
|
||||||
- `alt`
|
|
||||||
- `meta`
|
|
||||||
|
|
||||||
Es können auch mehrere Modifier angegeben werden, z.B. `ctrl+shift+alt+c`. Die Reihenfolge der Modifier und des Keys ist egal.
|
|
||||||
|
|
||||||
## Eventtypen
|
|
||||||
Einige Events sind auch abbrechbar, dazu muss die Funktion `setCancelled()` aufgerufen werden.
|
|
||||||
|
|
||||||
| Name | Wenn | Parameter | Abbrechbar |
|
|
||||||
|---------------------|-----------------------------------------------------|---------------------------------|------------|
|
|
||||||
| `DoubleSwap` | Beim Doppelten Drücken der Swap-Hands taste | NIL | false |
|
|
||||||
| `PlaceBlock` | Beim Platzieren von Blöcken | [BlockEvent](#blockevent) | true |
|
|
||||||
| `BreakBlock` | Beim Zerstören von Blöcken | [BlockEvent](#blockevent) | true |
|
|
||||||
| `RightClick` | Beim Rechtsklick | [InteractEvent](#interactevent) | true |
|
|
||||||
| `LeftClick` | Beim Linksklick | [InteractEvent](#interactevent) | true |
|
|
||||||
| `TNTSpawn` | Wenn ein TNT in der aktuellen Region spawnt | NIL | false |
|
|
||||||
| `TNTExplode` | Wenn ein TNT in der aktuellen Region explodiert | [Position](#position) | true |
|
|
||||||
| `TNTExplodeInBuild` | Wenn ein TNT in der aktuellen Bau Region explodiert | [Position](#position) | true |
|
|
||||||
| `SelfJoin` | Wenn man selbst den Server betritt | NIL | false |
|
|
||||||
| `SelfLeave` | Wenn man den Server verlässt | NIL | false |
|
|
||||||
| `DropItem` | Wenn man ein Item droppt | (type: Material) | true |
|
|
||||||
| `EntityDeath` | Wenn ein Entity stirbt | (type: Entity Type) | false |
|
|
||||||
|
|
||||||
### BlockEvent
|
|
||||||
Das übergebene Objekt an den Handler hat folgende Variablen:
|
|
||||||
|
|
||||||
| Name | Beschreibung |
|
|
||||||
|--------|-----------------------------|
|
|
||||||
| `x` | Die X-Koordinate des Blocks |
|
|
||||||
| `y` | Die Y-Koordinate des Blocks |
|
|
||||||
| `z` | Die Z-Koordinate des Blocks |
|
|
||||||
| `type` | Das Material des Blocks |
|
|
||||||
|
|
||||||
### InteractEvent
|
|
||||||
Das übergebene Objekt an den Handler hat folgende Variablen:
|
|
||||||
|
|
||||||
| Name | Beschreibung |
|
|
||||||
|------------|-------------------------------------------------------------------------------------------------------------------------------|
|
|
||||||
| `action` | Die Action die ausgeführt wurde, Mögliche Werte: `RIGHT_CLICK_BLOCK`, `RIGHT_CLICK_AIR`, `LEFT_CLICK_BLOCK`, `LEFT_CLICK_AIR` |
|
|
||||||
| `hand` | Die Hand die zum ausführen genutzt wird, Mögliche Werte: `HAND`, `OFF_HAND`, `null` |
|
|
||||||
| `block` | Der Typ des Items mit dem geklickt wurde |
|
|
||||||
| `hasBlock` | Wahr, wenn auf einen Block geklickt wurde |
|
|
||||||
|
|
||||||
Wenn `hasBlock` wahr ist, gibt es folgende Variablen:
|
|
||||||
|
|
||||||
| Name | Beschreibung |
|
|
||||||
|-------------|-----------------------------------------|
|
|
||||||
| `blockX` | Die X-Koordinate des Blocks |
|
|
||||||
| `blockY` | Die Y-Koordinate des Blocks |
|
|
||||||
| `blockZ` | Die Z-Koordinate des Blocks |
|
|
||||||
| `blockFace` | Die Seite des Blocks die geklickt wurde |
|
|
||||||
|
|
||||||
|
|
||||||
### Position
|
|
||||||
Die Position ist ein Objekt mit folgenden Variablen:
|
|
||||||
|
|
||||||
| Name | Beschreibung |
|
|
||||||
|------|------------------|
|
|
||||||
| `x` | Die X-Koordinate |
|
|
||||||
| `y` | Die Y-Koordinate |
|
|
||||||
| `z` | Die Z-Koordinate |
|
|
||||||
|
|
||||||
# Instabile APIs
|
|
||||||
Hier sind einige APIs aufgelistet, die nicht stabil sind und sich jederzeit ändern können.
|
|
||||||
|
|
||||||
## _worldedit
|
|
||||||
|
|
||||||
| Name | Signatur | Beschreibung |
|
|
||||||
|-------------|-----------------------------------------------------------|-----------------------------------|
|
|
||||||
| `selection` | selection(Liste\<Pos>), selection(): {min: Pos, max: Pos} | Die aktuelle auswahl des Spielers |
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Beispiele
|
|
||||||
|
|
||||||
## Hello, World!
|
|
||||||
Ein einfaches Hello, World!-Script.
|
|
||||||
|
|
||||||
#### Code
|
|
||||||
```lua
|
|
||||||
print("Hello, World!")
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Ausgabe
|
|
||||||
```
|
|
||||||
Hello, World!
|
|
||||||
```
|
|
||||||
|
|
||||||
## BauGUI on DoubleSwap
|
|
||||||
Das Standardskript für das Öffnen des BauGUIs
|
|
||||||
|
|
||||||
#### Code
|
|
||||||
```lua
|
|
||||||
function handler(event)
|
|
||||||
exec("gui")
|
|
||||||
end
|
|
||||||
|
|
||||||
event(events.DoubleSwap, handler)
|
|
||||||
```
|
|
||||||
|
|
||||||
## SL Command
|
|
||||||
Ein einfacher Command Redefiner.
|
|
||||||
|
|
||||||
#### Code
|
|
||||||
```lua
|
|
||||||
function handler(args)
|
|
||||||
exec("stoplag")
|
|
||||||
end
|
|
||||||
|
|
||||||
command("sl", handler)
|
|
||||||
```
|
|
||||||
|
|
||||||
## Paste Hotkey
|
|
||||||
Ein Hotkey zum Pasten des Clipboard-Inhalts.
|
|
||||||
|
|
||||||
#### Code
|
|
||||||
```lua
|
|
||||||
function handler(pressed)
|
|
||||||
if pressed then
|
|
||||||
exec("/paste -o")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
hotkey("ctrl+v", handler)
|
|
||||||
```
|
|
||||||
|
|
||||||
## Inventory
|
|
||||||
Ein Beispiel für ein Inventar.
|
|
||||||
|
|
||||||
#### Code
|
|
||||||
```lua
|
|
||||||
inv = inventory.create("Test Inv", 3)
|
|
||||||
inv.item(13, "STONE", "Ich bin ein Stein", function(e) player.chat(e) end, {"Die Lore", "Die Zweite Zeile"}, true)
|
|
||||||
inv.open()
|
|
||||||
```
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* This file is a part of the SteamWar software.
|
* This file is a part of the SteamWar software.
|
||||||
*
|
*
|
||||||
* Copyright (C) 2024 SteamWar.de-Serverteam
|
* Copyright (C) 2024 SteamWar.de-Serverteam
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
@@ -34,19 +34,3 @@ dependencies {
|
|||||||
implementation(project(":BauSystem:BauSystem_20"))
|
implementation(project(":BauSystem:BauSystem_20"))
|
||||||
implementation(project(":BauSystem:BauSystem_21"))
|
implementation(project(":BauSystem:BauSystem_21"))
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register<DevServer>("DevBau20") {
|
|
||||||
group = "run"
|
|
||||||
description = "Run a 1.20 Dev Bau"
|
|
||||||
dependsOn(":SpigotCore:shadowJar")
|
|
||||||
dependsOn(":BauSystem:shadowJar")
|
|
||||||
template = "Bau20"
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register<DevServer>("DevBau21") {
|
|
||||||
group = "run"
|
|
||||||
description = "Run a 1.21 Dev Bau"
|
|
||||||
dependsOn(":SpigotCore:shadowJar")
|
|
||||||
dependsOn(":BauSystem:shadowJar")
|
|
||||||
template = "Bau21"
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,87 +0,0 @@
|
|||||||
-- This file is a part of the SteamWar software.
|
|
||||||
--
|
|
||||||
-- Copyright (C) 2025 SteamWar.de-Serverteam
|
|
||||||
--
|
|
||||||
-- This program is free software: you can redistribute it and/or modify
|
|
||||||
-- it under the terms of the GNU Affero General Public License as published by
|
|
||||||
-- the Free Software Foundation, either version 3 of the License, or
|
|
||||||
-- (at your option) any later version.
|
|
||||||
--
|
|
||||||
-- This program is distributed in the hope that it will be useful,
|
|
||||||
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
-- GNU Affero General Public License for more details.
|
|
||||||
--
|
|
||||||
-- You should have received a copy of the GNU Affero General Public License
|
|
||||||
-- along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
---
|
|
||||||
--- This serves both as an example and a quick start to the Stewamwar Script Api
|
|
||||||
---
|
|
||||||
|
|
||||||
function hotkeys_freeze(pressed)
|
|
||||||
if pressed then
|
|
||||||
exec("/freeze")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function hotkeys_rgc(pressed)
|
|
||||||
if pressed then
|
|
||||||
exec("/rgc")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function hotkeys_rgp(pressed)
|
|
||||||
if pressed then
|
|
||||||
exec("/rgp")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
trace_cycle_counter = 0;
|
|
||||||
function hotkeys_cycle_trace_view(pressed)
|
|
||||||
if not pressed then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
trace_cycle = (trace_cycle + 1) % 3
|
|
||||||
trace_commands = {"trace hide", "trace show", "trace show -e -c"}
|
|
||||||
exec(trace_commands[trace_cycle + 1])
|
|
||||||
end
|
|
||||||
|
|
||||||
function hotkeys_tick_step(pressed)
|
|
||||||
if pressed then
|
|
||||||
exec("tick step")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function hotkeys_tpslimit(pressed)
|
|
||||||
if not pressed then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
if tps.limit() == 20 then
|
|
||||||
exec("tpslimit 200")
|
|
||||||
else
|
|
||||||
exec("tpslimit 20")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function hotkeys_tb(pressed)
|
|
||||||
if pressed then
|
|
||||||
exec("tb -e")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function hotkeys_trace_delete(pressed)
|
|
||||||
if pressed then
|
|
||||||
exec("trace delete")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
hotkey("ctrl+g", hotkeys_freeze)
|
|
||||||
hotkey("ctrl+c", hotkeys_rgc)
|
|
||||||
hotkey("ctrl+v", hotkeys_rgp)
|
|
||||||
hotkey("ctrl+x", hotkeys_tick_step)
|
|
||||||
hotkey("shift+x", hotkeys_cycle_trace_view)
|
|
||||||
hotkey("ctrl+y", hotkeys_tb)
|
|
||||||
hotkey("ctrl+alt", hotkeys_trace_delete)
|
|
||||||
hotkey("ctrl+h", hotkeys_trace_delete)
|
|
||||||
|
|
||||||
@@ -1,432 +0,0 @@
|
|||||||
-- This file is a part of the SteamWar software.
|
|
||||||
--
|
|
||||||
-- Copyright (C) 2021 SteamWar.de-Serverteam
|
|
||||||
--
|
|
||||||
-- This program is free software: you can redistribute it and/or modify
|
|
||||||
-- it under the terms of the GNU Affero General Public License as published by
|
|
||||||
-- the Free Software Foundation, either version 3 of the License, or
|
|
||||||
-- (at your option) any later version.
|
|
||||||
--
|
|
||||||
-- This program is distributed in the hope that it will be useful,
|
|
||||||
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
-- GNU Affero General Public License for more details.
|
|
||||||
--
|
|
||||||
-- You should have received a copy of the GNU Affero General Public License
|
|
||||||
-- along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
---
|
|
||||||
--- This file contains the definitions for the SteamWar.de script API.
|
|
||||||
--- It is used by the IDE to provide code completion and type checking.
|
|
||||||
--- Created by Chaoscaot
|
|
||||||
---
|
|
||||||
|
|
||||||
inventory = {}
|
|
||||||
|
|
||||||
---@param title string
|
|
||||||
---@param size number
|
|
||||||
---@return Inventory
|
|
||||||
function inventory.create(title, size) return nil end
|
|
||||||
|
|
||||||
---@alias InventoryClick 'LEFT' | 'SHIFT_LEFT' | 'RIGHT' | 'SHIFT_RIGHT' | 'MIDDLE' | 'NUMBER_KEY'
|
|
||||||
|
|
||||||
---@class Inventory
|
|
||||||
local Inventory = {}
|
|
||||||
|
|
||||||
---@overload fun(slot: number, material: string, name: string, handler: fun(click: InventoryClick)): void
|
|
||||||
---@overload fun(slot: number, material: string, name: string, handler: fun(click: InventoryClick), lore: string[]): void
|
|
||||||
---@overload fun(slot: number, material: string, name: string, handler: fun(click: InventoryClick), lore: string[], enchanted: boolean): void
|
|
||||||
---@param slot number
|
|
||||||
---@param material string
|
|
||||||
---@param name string
|
|
||||||
---@param handler fun(click: InventoryClick): void
|
|
||||||
---@param lore string[]
|
|
||||||
---@param enchanted boolean
|
|
||||||
---@param amount number
|
|
||||||
---@return void
|
|
||||||
function Inventory.item(slot, material, name, handler, lore, enchanted, amount) end
|
|
||||||
|
|
||||||
---@param handler fun(): void
|
|
||||||
---@return void
|
|
||||||
function Inventory.setCloseHandler(handler) end
|
|
||||||
|
|
||||||
---@return void
|
|
||||||
function Inventory.open() end
|
|
||||||
|
|
||||||
player = {}
|
|
||||||
|
|
||||||
---@return string
|
|
||||||
---Get the name of the player.
|
|
||||||
function player.name() return "" end
|
|
||||||
|
|
||||||
---@return void
|
|
||||||
function player.chat(...) end
|
|
||||||
|
|
||||||
---@return void
|
|
||||||
---Send a message to the actionbar of the player.
|
|
||||||
function player.actionbar(...) end
|
|
||||||
|
|
||||||
---@overload fun(): number
|
|
||||||
---@param newX number
|
|
||||||
function player.x(newX) end
|
|
||||||
|
|
||||||
---@overload fun(): number
|
|
||||||
---@param newY number
|
|
||||||
function player.y(newY) end
|
|
||||||
|
|
||||||
---@overload fun(): number
|
|
||||||
---@param newZ number
|
|
||||||
function player.z(newZ) end
|
|
||||||
|
|
||||||
---@overload fun(): number
|
|
||||||
---@param newYaw number
|
|
||||||
function player.yaw(newYaw) end
|
|
||||||
|
|
||||||
---@overload fun(): number
|
|
||||||
---@param newPitch number
|
|
||||||
function player.pitch(newPitch) end
|
|
||||||
|
|
||||||
---@return boolean
|
|
||||||
function player.sneaking() return nil end
|
|
||||||
|
|
||||||
---@return boolean
|
|
||||||
function player.sprinting() return nil end
|
|
||||||
|
|
||||||
---@overload fun(): number
|
|
||||||
---@param newSlot number
|
|
||||||
function player.slot(newSlot) end
|
|
||||||
|
|
||||||
---@return string
|
|
||||||
function player.item() return nil end
|
|
||||||
|
|
||||||
---@return string
|
|
||||||
function player.offHandItem() return nil end
|
|
||||||
|
|
||||||
---@return void
|
|
||||||
function player.closeInventory() end
|
|
||||||
|
|
||||||
---@field nextBool fun(): boolean
|
|
||||||
random = {}
|
|
||||||
|
|
||||||
---@overload fun(): number
|
|
||||||
---@overload fun(bound: number): number
|
|
||||||
---@param origin number
|
|
||||||
---@param bound number
|
|
||||||
---@return number
|
|
||||||
function random.nextInt(origin, bound) return nil end
|
|
||||||
|
|
||||||
---@overload fun(): number
|
|
||||||
---@overload fun(bound: number): number
|
|
||||||
---@param origin number
|
|
||||||
---@param bound number
|
|
||||||
---@return number
|
|
||||||
function random.nextDouble(origin, bound) return nil end
|
|
||||||
|
|
||||||
---@return boolean
|
|
||||||
function random.nextBool() return nil end
|
|
||||||
|
|
||||||
---@alias RegionType 'wg' | 'mwg' | 'as' | 'ws' | 'ws_inner' | 'ws_rumpf' | 'ws_rahmen' | 'spawn'
|
|
||||||
|
|
||||||
---@class iregion
|
|
||||||
---@field tnt tnt
|
|
||||||
---@field trace trace
|
|
||||||
local iregion = {}
|
|
||||||
|
|
||||||
---@class region: iregion
|
|
||||||
region = {}
|
|
||||||
|
|
||||||
---@return string
|
|
||||||
function iregion.name() return nil end
|
|
||||||
|
|
||||||
---@return RegionType
|
|
||||||
function iregion.type() return nil end
|
|
||||||
|
|
||||||
---@return boolean
|
|
||||||
function iregion.fire() return nil end
|
|
||||||
|
|
||||||
---@return boolean
|
|
||||||
function iregion.freeze() return nil end
|
|
||||||
|
|
||||||
---@return boolean
|
|
||||||
function iregion.protect() return nil end
|
|
||||||
|
|
||||||
---@return string
|
|
||||||
function iregion.loader() return nil end
|
|
||||||
|
|
||||||
---@return Position
|
|
||||||
function iregion.copyPoint() return nil end
|
|
||||||
|
|
||||||
---@return Position
|
|
||||||
function iregion.minPointBuild() return nil end
|
|
||||||
|
|
||||||
---@return Position
|
|
||||||
function iregion.maxPointBuild() return nil end
|
|
||||||
|
|
||||||
---@return Position
|
|
||||||
function iregion.minPointBuildExtension() return nil end
|
|
||||||
|
|
||||||
---@return Position
|
|
||||||
function iregion.maxPointBuildExtension() return nil end
|
|
||||||
|
|
||||||
---@return Position
|
|
||||||
function iregion.testblockPoint() return nil end
|
|
||||||
|
|
||||||
---@return Position
|
|
||||||
function iregion.minPointTestblock() return nil end
|
|
||||||
|
|
||||||
---@return Position
|
|
||||||
function iregion.maxPointTestblock() return nil end
|
|
||||||
|
|
||||||
---@return Position
|
|
||||||
function iregion.minPointTestblockExtension() return nil end
|
|
||||||
|
|
||||||
---@return Position
|
|
||||||
function iregion.maxPointTestblockExtension() return nil end
|
|
||||||
|
|
||||||
---@alias TNTMode 'ALLOW' | 'DENY' | 'ONLY_TB'
|
|
||||||
|
|
||||||
---@class tnt
|
|
||||||
local tnt = {}
|
|
||||||
|
|
||||||
---@return TNTMode
|
|
||||||
function tnt.mode() return nil end
|
|
||||||
|
|
||||||
---@return boolean
|
|
||||||
function tnt.enabled() return nil end
|
|
||||||
|
|
||||||
---@return boolean
|
|
||||||
function tnt.onlyTb() return nil end
|
|
||||||
|
|
||||||
---@return boolean
|
|
||||||
function tnt.onlyBuild() return nil end
|
|
||||||
|
|
||||||
---@param name string
|
|
||||||
---@return iregion
|
|
||||||
function region.get(name) return nil end
|
|
||||||
|
|
||||||
---@return iregion[]
|
|
||||||
function region.list() return nil end
|
|
||||||
|
|
||||||
---@class tracerLib
|
|
||||||
tracer = {}
|
|
||||||
|
|
||||||
---@class TraceRecord
|
|
||||||
---@field pos Position
|
|
||||||
---@field vel Position
|
|
||||||
---@field ticksSinceStart number
|
|
||||||
---@field fuse number
|
|
||||||
---@field isExplosion boolean
|
|
||||||
---@field isInWater boolean
|
|
||||||
---@field hasDestroyedBuild boolean
|
|
||||||
---@field hasDestroyedTestblock boolean
|
|
||||||
|
|
||||||
---@class Tracer
|
|
||||||
---@field getId fun(): string
|
|
||||||
---@field getRecords fun(): {[number]: {[number]: TraceRecord}}
|
|
||||||
|
|
||||||
function tracer.getTraces() return nil end
|
|
||||||
|
|
||||||
---@class Position
|
|
||||||
---@field x number
|
|
||||||
---@field y number
|
|
||||||
---@field z number
|
|
||||||
|
|
||||||
---@class server
|
|
||||||
---@field tps tps
|
|
||||||
server = {}
|
|
||||||
|
|
||||||
---@return string
|
|
||||||
function server.time() return nil end
|
|
||||||
|
|
||||||
---@return number
|
|
||||||
function server.ticks() return nil end
|
|
||||||
|
|
||||||
---@param position Position
|
|
||||||
---@return string
|
|
||||||
function getBlockAt(position) return nil end
|
|
||||||
|
|
||||||
---@param position Position
|
|
||||||
---@param material string
|
|
||||||
---@return void
|
|
||||||
function setBlockAt(position, material) return nil end
|
|
||||||
|
|
||||||
---@class tps
|
|
||||||
local tps = {}
|
|
||||||
|
|
||||||
---@return number
|
|
||||||
function tps.oneSecond() return nil end
|
|
||||||
|
|
||||||
---@return number
|
|
||||||
function tps.tenSecond() return nil end
|
|
||||||
|
|
||||||
---@return number
|
|
||||||
function tps.oneMinute() return nil end
|
|
||||||
|
|
||||||
---@return number
|
|
||||||
function tps.fiveMinute() return nil end
|
|
||||||
|
|
||||||
---@return number
|
|
||||||
function tps.tenMinute() return nil end
|
|
||||||
|
|
||||||
---@return number
|
|
||||||
function tps.current() return nil end
|
|
||||||
|
|
||||||
---@return number
|
|
||||||
function tps.limit() return nil end
|
|
||||||
|
|
||||||
---@class storage
|
|
||||||
---@field global storageLib
|
|
||||||
---@field player storageLib
|
|
||||||
---@field region storageLib
|
|
||||||
storage = {}
|
|
||||||
|
|
||||||
---@class storageLib
|
|
||||||
---Any Primitive, Array or Table will be saved across restarts, everything else will be discarded
|
|
||||||
local storageLib = {}
|
|
||||||
|
|
||||||
---@param key string
|
|
||||||
---@return any
|
|
||||||
function storageLib.get(key) return nil end
|
|
||||||
|
|
||||||
---@param key string
|
|
||||||
---@param value any
|
|
||||||
---@return void
|
|
||||||
function storageLib.set(key, value) end
|
|
||||||
|
|
||||||
---@param key string
|
|
||||||
---@return boolean
|
|
||||||
function storageLib.has(key) return nil end
|
|
||||||
|
|
||||||
---@param key string
|
|
||||||
---@return void
|
|
||||||
function storageLib.remove(key) end
|
|
||||||
|
|
||||||
---@param key string
|
|
||||||
---@return Accessor
|
|
||||||
function storageLib.accessor(key) return nil end
|
|
||||||
|
|
||||||
---@class Accessor
|
|
||||||
---@overload fun(): any
|
|
||||||
---@overload fun(value: any)
|
|
||||||
|
|
||||||
---@class Selection
|
|
||||||
---@field max Position
|
|
||||||
---@field min Position
|
|
||||||
|
|
||||||
---@class _worldedit
|
|
||||||
_worldedit = {}
|
|
||||||
|
|
||||||
---@overload fun(pos: Position[]): void
|
|
||||||
---@return Selection
|
|
||||||
function _worldedit.selection() return nil end
|
|
||||||
|
|
||||||
---@param msg string
|
|
||||||
---@param callback fun(value: string): void
|
|
||||||
---@return void
|
|
||||||
function input(msg, callback) end
|
|
||||||
|
|
||||||
---@param ticks number
|
|
||||||
---@param callback fun(): void
|
|
||||||
---@return void
|
|
||||||
function delayed(ticks, callback) end
|
|
||||||
|
|
||||||
---@param x number
|
|
||||||
---@param y number
|
|
||||||
---@param z number
|
|
||||||
---@return Position
|
|
||||||
function pos(x, y, z) return nil end
|
|
||||||
|
|
||||||
---@return void
|
|
||||||
function exec(...) end
|
|
||||||
|
|
||||||
---@param obj any
|
|
||||||
---@return number
|
|
||||||
function length(obj) return 0 end
|
|
||||||
|
|
||||||
---@param separator string
|
|
||||||
---@param table any[]
|
|
||||||
---@return string
|
|
||||||
function join(separator, table) return "" end
|
|
||||||
|
|
||||||
---@class EventType
|
|
||||||
---@class events
|
|
||||||
---@field DoubleSwap EventType
|
|
||||||
---@field PlaceBlock EventType
|
|
||||||
---@field BreakBlock EventType
|
|
||||||
---@field RightClick EventType
|
|
||||||
---@field LeftClick EventType
|
|
||||||
---@field TNTSpawn EventType
|
|
||||||
---@field TNTExplode EventType
|
|
||||||
---@field TNTExplodeInBuild EventType
|
|
||||||
---@field SelfJoin EventType
|
|
||||||
---@field SelfLeave EventType
|
|
||||||
---@field DropItem EventType
|
|
||||||
---@field EntityDeath EventType
|
|
||||||
events = {}
|
|
||||||
|
|
||||||
|
|
||||||
---@param id EventType
|
|
||||||
---@param handler fun(params: any): void
|
|
||||||
---@return void
|
|
||||||
function event(id, handler) end
|
|
||||||
|
|
||||||
---@param command string
|
|
||||||
---@param handler fun(params: string[]): void
|
|
||||||
---@return void
|
|
||||||
function command(command, handler) end
|
|
||||||
|
|
||||||
---@param trigger string
|
|
||||||
---@param handler fun(pressed: boolean): void
|
|
||||||
---@return void
|
|
||||||
function hotkey(trigger, handler) end
|
|
||||||
|
|
||||||
---@class bossbar
|
|
||||||
bossbar = {}
|
|
||||||
|
|
||||||
---@alias BossBarColor 'PINK' | 'BLUE' | 'RED' | 'GREEN' | 'YELLOW' | 'PURPLE' | 'WHITE'
|
|
||||||
---@alias BossBarStyle 'SEGMENTED_6' | 'SEGMENTED_10' | 'SEGMENTED_12' | 'SEGMENTED_20' | 'SOLID'
|
|
||||||
---@alias BossBarFlag 'DARKEN_SKY' | 'PLAY_BOSS_MUSIC' | 'CREATE_FOG'
|
|
||||||
|
|
||||||
---@class BossBar
|
|
||||||
local BossBar = {}
|
|
||||||
|
|
||||||
---@param title string
|
|
||||||
---@param color BossBarColor
|
|
||||||
---@param style BossBarStyle
|
|
||||||
---@return BossBar
|
|
||||||
function bossbar.create(title, color, style) return nil end
|
|
||||||
|
|
||||||
---@return string
|
|
||||||
---@overload fun(title: string): void
|
|
||||||
function BossBar.title() end
|
|
||||||
|
|
||||||
---@return BossBarColor
|
|
||||||
---@overload fun(color: BossBarColor): void
|
|
||||||
function BossBar.color() end
|
|
||||||
|
|
||||||
---@return BossBarStyle
|
|
||||||
---@overload fun(style: BossBarStyle): void
|
|
||||||
function BossBar.style() end
|
|
||||||
|
|
||||||
---@return number
|
|
||||||
---@overload fun(progress: number): void
|
|
||||||
function BossBar.progress() end
|
|
||||||
|
|
||||||
---@return boolean
|
|
||||||
---@overload fun(visible: boolean): void
|
|
||||||
function BossBar.visible() end
|
|
||||||
|
|
||||||
---@return boolean
|
|
||||||
---@param flag BossBarFlag
|
|
||||||
function BossBar.hasFlag(flag) return nil end
|
|
||||||
|
|
||||||
---@return void
|
|
||||||
---@param flag BossBarFlag
|
|
||||||
function BossBar.addFlag(flag) end
|
|
||||||
|
|
||||||
---@return boolean
|
|
||||||
---@param flag BossBarFlag
|
|
||||||
function BossBar.removeFlag(flag) return nil end
|
|
||||||
|
|
||||||
---@return void
|
|
||||||
function BossBar.destroy() end
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* This file is a part of the SteamWar software.
|
* This file is a part of the SteamWar software.
|
||||||
*
|
*
|
||||||
* Copyright (C) 2024 SteamWar.de-Serverteam
|
* Copyright (C) 2024 SteamWar.de-Serverteam
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ public class Event {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Event create(String eventName, Timestamp start, Timestamp end){
|
public static Event create(String eventName, Timestamp start, Timestamp end){
|
||||||
return get(create.insertGetKey(eventName, start, start, end, 5, false));
|
return get(create.insertGetKey(eventName, start, start, end, 5, false, false));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Event get(int eventID){
|
public static Event get(int eventID){
|
||||||
|
|||||||
@@ -35,9 +35,8 @@ import java.util.stream.Collectors;
|
|||||||
public class Fight {
|
public class Fight {
|
||||||
|
|
||||||
private static final Table<Fight> table = new Table<>(Fight.class);
|
private static final Table<Fight> table = new Table<>(Fight.class);
|
||||||
private static final SelectStatement<Fight> getPage = new SelectStatement<>(table, "SELECT f.*, (b.NodeId IS NULL OR b.AllowReplay) AND (r.NodeId IS NULL OR r.AllowReplay) AS ReplayAllowed FROM Fight f LEFT OUTER JOIN SchematicNode b ON f.BlueSchem = b.NodeId LEFT OUTER JOIN SchematicNode r ON f.RedSchem = r.NodeId ORDER BY FightID DESC LIMIT ?, ?");
|
private static final SelectStatement<Fight> getPage = new SelectStatement<>(table, "SELECT f.*, (b.NodeId IS NULL OR b.AllowReplay) AND (r.NodeId IS NULL OR r.AllowReplay) AS ReplayAllowed, (SELECT COUNT(1) FROM Replay WHERE Replay.FightID = f.FightID) as ReplayAvailable FROM Fight f LEFT OUTER JOIN SchematicNode b ON f.BlueSchem = b.NodeId LEFT OUTER JOIN SchematicNode r ON f.RedSchem = r.NodeId ORDER BY FightID DESC LIMIT ?, ?");
|
||||||
private static final Statement insert = table.insertFields(true, "GameMode", "Server", "StartTime", "Duration", "BlueLeader", "RedLeader", "BlueSchem", "RedSchem", "Win", "WinCondition");
|
private static final Statement insert = table.insertFields(true, "GameMode", "Server", "StartTime", "Duration", "BlueLeader", "RedLeader", "BlueSchem", "RedSchem", "Win", "WinCondition");
|
||||||
private static final Statement updateReplayAvailable = table.update(Table.PRIMARY, "ReplayAvailable");
|
|
||||||
|
|
||||||
public static List<Fight> getPage(int page, int elementsPerPage) {
|
public static List<Fight> getPage(int page, int elementsPerPage) {
|
||||||
List<Fight> fights = getPage.listSelect(page * elementsPerPage, elementsPerPage);
|
List<Fight> fights = getPage.listSelect(page * elementsPerPage, elementsPerPage);
|
||||||
@@ -55,10 +54,6 @@ public class Fight {
|
|||||||
return insert.insertGetKey(gamemode, server, starttime, duration, blueleader, redleader, blueschem, redschem, win, wincondition);
|
return insert.insertGetKey(gamemode, server, starttime, duration, blueleader, redleader, blueschem, redschem, win, wincondition);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void markReplayAvailable(int fightID) {
|
|
||||||
updateReplayAvailable.update(true, fightID);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@Field(keys = {Table.PRIMARY}, autoincrement = true)
|
@Field(keys = {Table.PRIMARY}, autoincrement = true)
|
||||||
private final int fightID;
|
private final int fightID;
|
||||||
@@ -85,10 +80,10 @@ public class Fight {
|
|||||||
private final int win;
|
private final int win;
|
||||||
@Field
|
@Field
|
||||||
private final String wincondition;
|
private final String wincondition;
|
||||||
@Field
|
|
||||||
private final boolean replayAvailable;
|
|
||||||
@Field // Virtual field for easy select
|
@Field // Virtual field for easy select
|
||||||
private final boolean replayAllowed;
|
private final boolean replayAllowed;
|
||||||
|
@Field // Virtual field for easy select
|
||||||
|
private final boolean replayAvailable;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
private final List<FightPlayer> bluePlayers = new ArrayList<>();
|
private final List<FightPlayer> bluePlayers = new ArrayList<>();
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ import java.util.zip.GZIPInputStream;
|
|||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@Getter
|
@Getter
|
||||||
public class NodeData {
|
public class NodeData {
|
||||||
|
|
||||||
static {
|
static {
|
||||||
new SqlTypeMapper<>(PipedInputStream.class, "BLOB", (rs, identifier) -> { throw new SecurityException("PipedInputStream is write only datatype"); }, PreparedStatement::setBinaryStream);
|
new SqlTypeMapper<>(PipedInputStream.class, "BLOB", (rs, identifier) -> { throw new SecurityException("PipedInputStream is write only datatype"); }, PreparedStatement::setBinaryStream);
|
||||||
new SqlTypeMapper<>(ByteArrayInputStream.class, "BLOB", (rs, identifier) -> { throw new SecurityException("ByteArrayInputStream is write only datatype"); }, PreparedStatement::setBinaryStream);
|
new SqlTypeMapper<>(ByteArrayInputStream.class, "BLOB", (rs, identifier) -> { throw new SecurityException("ByteArrayInputStream is write only datatype"); }, PreparedStatement::setBinaryStream);
|
||||||
@@ -64,10 +65,6 @@ public class NodeData {
|
|||||||
private SchematicFormat nodeFormat;
|
private SchematicFormat nodeFormat;
|
||||||
|
|
||||||
public InputStream schemData() throws IOException {
|
public InputStream schemData() throws IOException {
|
||||||
return schemData(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
public InputStream schemData(boolean decompress) throws IOException {
|
|
||||||
try {
|
try {
|
||||||
return selSchemData.select(rs -> {
|
return selSchemData.select(rs -> {
|
||||||
rs.next();
|
rs.next();
|
||||||
@@ -76,11 +73,7 @@ public class NodeData {
|
|||||||
if(rs.wasNull() || schemData.available() == 0) {
|
if(rs.wasNull() || schemData.available() == 0) {
|
||||||
throw new SecurityException("SchemData is null");
|
throw new SecurityException("SchemData is null");
|
||||||
}
|
}
|
||||||
if (decompress) {
|
return new GZIPInputStream(schemData);
|
||||||
return new GZIPInputStream(schemData);
|
|
||||||
} else {
|
|
||||||
return schemData;
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new SecurityException("SchemData is wrong", e);
|
throw new SecurityException("SchemData is wrong", e);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* This file is a part of the SteamWar software.
|
* This file is a part of the SteamWar software.
|
||||||
*
|
*
|
||||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
* Copyright (C) 2021 SteamWar.de-Serverteam
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
@@ -35,7 +35,7 @@ import java.time.Instant;
|
|||||||
public class NodeDownload {
|
public class NodeDownload {
|
||||||
|
|
||||||
private static final char[] HEX = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
|
private static final char[] HEX = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
|
||||||
private static final String LINK_BASE = "https://api.steamwar.de/download/";
|
private static final String LINK_BASE = "https://steamwar.de/download.php?schem=";
|
||||||
|
|
||||||
private static final Table<NodeDownload> table = new Table<>(NodeDownload.class);
|
private static final Table<NodeDownload> table = new Table<>(NodeDownload.class);
|
||||||
private static final Statement insert = table.insertFields("NodeId", "Link");
|
private static final Statement insert = table.insertFields("NodeId", "Link");
|
||||||
|
|||||||
@@ -0,0 +1,74 @@
|
|||||||
|
/*
|
||||||
|
* This file is a part of the SteamWar software.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2022 SteamWar.de-Serverteam
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package de.steamwar.sql;
|
||||||
|
|
||||||
|
import de.steamwar.sql.internal.*;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.StandardCopyOption;
|
||||||
|
import java.sql.SQLException;
|
||||||
|
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class Replay {
|
||||||
|
|
||||||
|
static {
|
||||||
|
new SqlTypeMapper<>(File.class, "BLOB", (rs, identifier) -> {
|
||||||
|
try {
|
||||||
|
File file = File.createTempFile("replay", ".replay");
|
||||||
|
file.deleteOnExit();
|
||||||
|
Files.copy(rs.getBinaryStream(identifier), file.toPath(), StandardCopyOption.REPLACE_EXISTING);
|
||||||
|
return file;
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new SQLException(e);
|
||||||
|
}
|
||||||
|
}, (st, index, value) -> {
|
||||||
|
try {
|
||||||
|
st.setBinaryStream(index, new FileInputStream(value));
|
||||||
|
} catch (FileNotFoundException e) {
|
||||||
|
throw new SQLException(e);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final Table<Replay> table = new Table<>(Replay.class);
|
||||||
|
private static final SelectStatement<Replay> get = table.select(Table.PRIMARY);
|
||||||
|
|
||||||
|
public static final Statement insert = table.insertAll();
|
||||||
|
|
||||||
|
public static Replay get(int fightID) {
|
||||||
|
return get.select(fightID);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void save(int fightID, File file) {
|
||||||
|
insert.update(fightID, file);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Field(keys = {Table.PRIMARY})
|
||||||
|
private final int fightID;
|
||||||
|
@Getter
|
||||||
|
@Field
|
||||||
|
private final File replay;
|
||||||
|
}
|
||||||
@@ -31,13 +31,10 @@ public class SchematicNode {
|
|||||||
|
|
||||||
static {
|
static {
|
||||||
SchematicType.Normal.name(); // Ensure SchematicType is loaded.
|
SchematicType.Normal.name(); // Ensure SchematicType is loaded.
|
||||||
new SqlTypeMapper<>(SchematicNode.class, null, (rs, identifier) -> {
|
new SqlTypeMapper<>(SchematicNode.class, null, (rs, identifier) -> { throw new SecurityException("SchematicNode cannot be used as type (recursive select)"); }, (st, index, value) -> st.setInt(index, value.nodeId));
|
||||||
throw new SecurityException("SchematicNode cannot be used as type (recursive select)");
|
|
||||||
}, (st, index, value) -> st.setInt(index, value.nodeId));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final Map<Integer, Map<String, List<String>>> TAB_CACHE = new HashMap<>();
|
private static final Map<Integer, Map<String, List<String>>> TAB_CACHE = new HashMap<>();
|
||||||
|
|
||||||
public static void clear() {
|
public static void clear() {
|
||||||
TAB_CACHE.clear();
|
TAB_CACHE.clear();
|
||||||
}
|
}
|
||||||
@@ -45,60 +42,39 @@ public class SchematicNode {
|
|||||||
private static final String nodeSelector = "SELECT NodeId, NodeOwner, NodeOwner AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode ";
|
private static final String nodeSelector = "SELECT NodeId, NodeOwner, NodeOwner AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode ";
|
||||||
|
|
||||||
private static final Table<SchematicNode> table = new Table<>(SchematicNode.class);
|
private static final Table<SchematicNode> table = new Table<>(SchematicNode.class);
|
||||||
private static final Statement create = table.insertFields(true, "NodeOwner", "NodeName", "ParentNode", "NodeItem",
|
private static final Statement create = table.insertFields(true, "NodeOwner", "NodeName", "ParentNode", "NodeItem", "NodeType");
|
||||||
"NodeType");
|
private static final Statement update = table.update(Table.PRIMARY, "NodeName", "ParentNode", "NodeItem", "NodeType", "NodeRank", "ReplaceColor", "AllowReplay");
|
||||||
private static final Statement update = table.update(Table.PRIMARY, "NodeName", "ParentNode", "NodeItem",
|
|
||||||
"NodeType", "NodeRank", "ReplaceColor", "AllowReplay");
|
|
||||||
private static final Statement delete = table.delete(Table.PRIMARY);
|
private static final Statement delete = table.delete(Table.PRIMARY);
|
||||||
|
|
||||||
private static final SelectStatement<SchematicNode> byId = new SelectStatement<>(table,
|
private static final SelectStatement<SchematicNode> byId = new SelectStatement<>(table, nodeSelector + "WHERE NodeId = ?");
|
||||||
nodeSelector + "WHERE NodeId = ?");
|
private static final SelectStatement<SchematicNode> byOwnerNameParent = new SelectStatement<>(table, nodeSelector + "WHERE NodeOwner = ? AND NodeName = ? AND ParentNode " + Statement.NULL_SAFE_EQUALS + "?");
|
||||||
private static final SelectStatement<SchematicNode> byOwnerNameParent = new SelectStatement<>(table,
|
private static final SelectStatement<SchematicNode> byParent = new SelectStatement<>(table, nodeSelector + "WHERE ParentNode" + Statement.NULL_SAFE_EQUALS + "? ORDER BY NodeName");
|
||||||
nodeSelector + "WHERE NodeOwner = ? AND NodeName = ? AND ParentNode " + Statement.NULL_SAFE_EQUALS + "?");
|
private static final SelectStatement<SchematicNode> dirsByParent = new SelectStatement<>(table, nodeSelector + "WHERE ParentNode" + Statement.NULL_SAFE_EQUALS + "? AND NodeType is NULL ORDER BY NodeName");
|
||||||
private static final SelectStatement<SchematicNode> byParent = new SelectStatement<>(table,
|
private static final SelectStatement<SchematicNode> byOwnerType = new SelectStatement<>(table, nodeSelector + "WHERE NodeOwner = ? AND NodeType = ? ORDER BY NodeName");
|
||||||
nodeSelector + "WHERE ParentNode" + Statement.NULL_SAFE_EQUALS + "? ORDER BY NodeName");
|
private static final SelectStatement<SchematicNode> byType = new SelectStatement<>(table, nodeSelector + "WHERE NodeType = ? ORDER BY NodeName");
|
||||||
private static final SelectStatement<SchematicNode> dirsByParent = new SelectStatement<>(table, nodeSelector
|
private static final SelectStatement<SchematicNode> all = new SelectStatement<>(table, "SELECT * FROM EffectiveSchematicNode WHERE EffectiveOwner = ? ORDER BY NodeName");
|
||||||
+ "WHERE ParentNode" + Statement.NULL_SAFE_EQUALS + "? AND NodeType is NULL ORDER BY NodeName");
|
private static final SelectStatement<SchematicNode> list = new SelectStatement<>(table, "SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, NM.ParentId AS ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode INNER JOIN NodeMember NM on SchematicNode.NodeId = NM.NodeId WHERE NM.ParentId " + Statement.NULL_SAFE_EQUALS + "? AND NM.UserId = ? UNION ALL SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode WHERE (? IS NULL AND ParentNode IS NULL AND NodeOwner = ?) OR (? IS NOT NULL AND ParentNode = ?) ORDER BY NodeName");
|
||||||
private static final SelectStatement<SchematicNode> byOwnerType = new SelectStatement<>(table,
|
private static final SelectStatement<SchematicNode> byParentName = new SelectStatement<>(table, "SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, NM.ParentId AS ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode INNER JOIN NodeMember NM on SchematicNode.NodeId = NM.NodeId WHERE NM.ParentId " + Statement.NULL_SAFE_EQUALS + "? AND NM.UserId = ? AND SchematicNode.NodeName = ? UNION ALL SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode WHERE ((? IS NULL AND ParentNode IS NULL AND NodeOwner = ?) OR (? IS NOT NULL AND ParentNode = ?)) AND NodeName = ?");
|
||||||
nodeSelector + "WHERE NodeOwner = ? AND NodeType = ? ORDER BY NodeName");
|
private static final SelectStatement<SchematicNode> schematicAccessibleForUser = new SelectStatement<>(table, "SELECT COUNT(DISTINCT NodeId) FROM EffectiveSchematicNode WHERE EffectiveOwner = ? AND NodeId = ?");
|
||||||
private static final SelectStatement<SchematicNode> byType = new SelectStatement<>(table,
|
private static final SelectStatement<SchematicNode> accessibleByUserTypeInParent = new SelectStatement<>(table, "WITH RECURSIVE RSASN AS(WITH RECURSIVE RSAN AS (WITH RSANH AS (WITH RECURSIVE RSA AS (SELECT SN.NodeId, NM.ParentId FROM SchematicNode SN LEFT JOIN NodeMember NM on SN.NodeId = NM.NodeId WHERE NM.UserId = ? UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN INNER JOIN RSA ON RSA.NodeId = SN.ParentNode) SELECT * FROM RSA UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?) SELECT * FROM RSANH UNION SELECT SN.NodeId, SN.ParentNode FROM RSANH JOIN SchematicNode SN ON SN.ParentNode = RSANH.NodeId) SELECT RSAN.NodeId, RSAN.ParentId FROM RSAN JOIN SchematicNode SN ON SN.NodeId = RSAN.NodeId WHERE NodeType = ? UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN JOIN RSASN ON SN.NodeId = RSASN.ParentId) SELECT SN.*, ? as EffectiveOwner, RSASN.ParentId AS ParentNode FROM RSASN JOIN SchematicNode SN ON SN.NodeId = RSASN.NodeId WHERE RSASN.ParentId" + Statement.NULL_SAFE_EQUALS + "? ORDER BY NodeName");
|
||||||
nodeSelector + "WHERE NodeType = ? ORDER BY NodeName");
|
private static final SelectStatement<SchematicNode> accessibleByUserType = new SelectStatement<>(table, "WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE NodeType = ?");
|
||||||
private static final SelectStatement<SchematicNode> all = new SelectStatement<>(table,
|
private static final SelectStatement<SchematicNode> byIdAndUser = new SelectStatement<>(table, "SELECT NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode WHERE NodeId = ?");
|
||||||
"WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId");
|
private static final SelectStatement<SchematicNode> allParentsOfNode = new SelectStatement<>(table, "WITH RECURSIVE R AS (SELECT NodeId, ParentNode FROM EffectiveSchematicNode WHERE NodeId = ? AND EffectiveOwner = ? UNION SELECT E.NodeId, E.ParentNode FROM R, EffectiveSchematicNode E WHERE R.ParentNode = E.NodeId AND E.EffectiveOwner = ?) SELECT SN.NodeId, SN.NodeOwner, ? AS EffectiveOwner, SN.NodeName, R.ParentNode, SN.LastUpdate, SN.NodeItem, SN.NodeType, SN.NodeRank, SN.ReplaceColor, SN.AllowReplay FROM R INNER JOIN SchematicNode SN ON SN.NodeId = R.NodeId");
|
||||||
private static final SelectStatement<SchematicNode> list = new SelectStatement<>(table,
|
|
||||||
"SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, NM.ParentId AS ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode INNER JOIN NodeMember NM on SchematicNode.NodeId = NM.NodeId WHERE NM.ParentId "
|
|
||||||
+ Statement.NULL_SAFE_EQUALS
|
|
||||||
+ "? AND NM.UserId = ? UNION ALL SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode WHERE (? IS NULL AND ParentNode IS NULL AND NodeOwner = ?) OR (? IS NOT NULL AND ParentNode = ?) ORDER BY NodeName");
|
|
||||||
private static final SelectStatement<SchematicNode> byParentName = new SelectStatement<>(table,
|
|
||||||
"SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, NM.ParentId AS ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode INNER JOIN NodeMember NM on SchematicNode.NodeId = NM.NodeId WHERE NM.ParentId "
|
|
||||||
+ Statement.NULL_SAFE_EQUALS
|
|
||||||
+ "? AND NM.UserId = ? AND SchematicNode.NodeName = ? UNION ALL SELECT SchematicNode.NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode WHERE ((? IS NULL AND ParentNode IS NULL AND NodeOwner = ?) OR (? IS NOT NULL AND ParentNode = ?)) AND NodeName = ?");
|
|
||||||
private static final SelectStatement<SchematicNode> schematicAccessibleForUser = new SelectStatement<>(table,
|
|
||||||
"WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE NodeId = ?");
|
|
||||||
private static final SelectStatement<SchematicNode> accessibleByUserTypeInParent = new SelectStatement<>(table,
|
|
||||||
"WITH RECURSIVE RSASN AS(WITH RECURSIVE RSAN AS (WITH RSANH AS (WITH RECURSIVE RSA AS (SELECT SN.NodeId, NM.ParentId FROM SchematicNode SN LEFT JOIN NodeMember NM on SN.NodeId = NM.NodeId WHERE NM.UserId = ? UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN INNER JOIN RSA ON RSA.NodeId = SN.ParentNode) SELECT * FROM RSA UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?) SELECT * FROM RSANH UNION SELECT SN.NodeId, SN.ParentNode FROM RSANH JOIN SchematicNode SN ON SN.ParentNode = RSANH.NodeId) SELECT RSAN.NodeId, RSAN.ParentId FROM RSAN JOIN SchematicNode SN ON SN.NodeId = RSAN.NodeId WHERE NodeType = ? UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN JOIN RSASN ON SN.NodeId = RSASN.ParentId) SELECT SN.*, ? as EffectiveOwner, RSASN.ParentId AS ParentNode FROM RSASN JOIN SchematicNode SN ON SN.NodeId = RSASN.NodeId WHERE RSASN.ParentId"
|
|
||||||
+ Statement.NULL_SAFE_EQUALS + "? ORDER BY NodeName");
|
|
||||||
private static final SelectStatement<SchematicNode> accessibleByUserType = new SelectStatement<>(table,
|
|
||||||
"WITH RECURSIVE Nodes AS (SELECT NodeId, ParentId as ParentNode FROM NodeMember WHERE UserId = ? UNION SELECT NodeId, ParentNode FROM SchematicNode WHERE NodeOwner = ?), RSN AS ( SELECT NodeId, ParentNode FROM Nodes UNION SELECT SN.NodeId, SN.ParentNode FROM SchematicNode SN, RSN WHERE SN.ParentNode = RSN.NodeId ) SELECT SN.*, ? AS EffectiveOwner FROM RSN INNER JOIN SchematicNode SN ON RSN.NodeId = SN.NodeId WHERE NodeType = ?");
|
|
||||||
private static final SelectStatement<SchematicNode> byIdAndUser = new SelectStatement<>(table,
|
|
||||||
"SELECT NodeId, NodeOwner, ? AS EffectiveOwner, NodeName, ParentNode, LastUpdate, NodeItem, NodeType, NodeRank, ReplaceColor, AllowReplay FROM SchematicNode WHERE NodeId = ?");
|
|
||||||
private static final SelectStatement<SchematicNode> allParentsOfNode = new SelectStatement<>(table,
|
|
||||||
"WITH RECURSIVE R AS (SELECT NodeId, ParentNode FROM EffectiveSchematicNode WHERE NodeId = ? AND EffectiveOwner = ? UNION SELECT E.NodeId, E.ParentNode FROM R, EffectiveSchematicNode E WHERE R.ParentNode = E.NodeId AND E.EffectiveOwner = ?) SELECT SN.NodeId, SN.NodeOwner, ? AS EffectiveOwner, SN.NodeName, R.ParentNode, SN.LastUpdate, SN.NodeItem, SN.NodeType, SN.NodeRank, SN.ReplaceColor, SN.AllowReplay FROM R INNER JOIN SchematicNode SN ON SN.NodeId = R.NodeId");
|
|
||||||
|
|
||||||
static {
|
static {
|
||||||
NodeMember.init();
|
NodeMember.init();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Field(keys = { Table.PRIMARY }, autoincrement = true)
|
@Field(keys = {Table.PRIMARY}, autoincrement = true)
|
||||||
private final int nodeId;
|
private final int nodeId;
|
||||||
@Field(keys = { "OwnerNameParent" })
|
@Field(keys = {"OwnerNameParent"})
|
||||||
private final int nodeOwner;
|
private final int nodeOwner;
|
||||||
@Field(def = "0")
|
@Field(def = "0")
|
||||||
@Getter
|
@Getter
|
||||||
private final int effectiveOwner;
|
private final int effectiveOwner;
|
||||||
@Field(keys = { "OwnerNameParent" })
|
@Field(keys = {"OwnerNameParent"})
|
||||||
private String nodeName;
|
private String nodeName;
|
||||||
@Field(keys = { "OwnerNameParent" }, nullable = true)
|
@Field(keys = {"OwnerNameParent"}, nullable = true)
|
||||||
private Integer parentNode;
|
private Integer parentNode;
|
||||||
@Field(def = "CURRENT_TIMESTAMP")
|
@Field(def = "CURRENT_TIMESTAMP")
|
||||||
private Timestamp lastUpdate;
|
private Timestamp lastUpdate;
|
||||||
@@ -126,7 +102,8 @@ public class SchematicNode {
|
|||||||
SchematicType nodeType,
|
SchematicType nodeType,
|
||||||
int nodeRank,
|
int nodeRank,
|
||||||
boolean replaceColor,
|
boolean replaceColor,
|
||||||
boolean allowReplay) {
|
boolean allowReplay
|
||||||
|
) {
|
||||||
this.nodeId = nodeId;
|
this.nodeId = nodeId;
|
||||||
this.nodeOwner = nodeOwner;
|
this.nodeOwner = nodeOwner;
|
||||||
this.effectiveOwner = effectiveOwner;
|
this.effectiveOwner = effectiveOwner;
|
||||||
@@ -141,7 +118,7 @@ public class SchematicNode {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static List<SchematicNode> getAll(SteamwarUser user) {
|
public static List<SchematicNode> getAll(SteamwarUser user) {
|
||||||
return all.listSelect(user, user, user);
|
return all.listSelect(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Map<Integer, List<SchematicNode>> getAllMap(SteamwarUser user) {
|
public static Map<Integer, List<SchematicNode>> getAllMap(SteamwarUser user) {
|
||||||
@@ -153,8 +130,7 @@ public class SchematicNode {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static SchematicNode byParentName(SteamwarUser user, Integer schematicId, String name) {
|
public static SchematicNode byParentName(SteamwarUser user, Integer schematicId, String name) {
|
||||||
return byParentName.select(user, schematicId, user, name, user, schematicId, user, schematicId, schematicId,
|
return byParentName.select(user, schematicId, user, name, user, schematicId, user, schematicId, schematicId, name);
|
||||||
name);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<SchematicNode> accessibleByUserType(SteamwarUser user, SchematicType type) {
|
public static List<SchematicNode> accessibleByUserType(SteamwarUser user, SchematicType type) {
|
||||||
@@ -166,11 +142,10 @@ public class SchematicNode {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static boolean schematicAccessibleForUser(SteamwarUser user, Integer schematicId) {
|
public static boolean schematicAccessibleForUser(SteamwarUser user, Integer schematicId) {
|
||||||
return schematicAccessibleForUser.select(user, user, user, schematicId) != null;
|
return schematicAccessibleForUser.select(user, schematicId) != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<SchematicNode> accessibleByUserTypeParent(SteamwarUser user, SchematicType type,
|
public static List<SchematicNode> accessibleByUserTypeParent(SteamwarUser user, SchematicType type, Integer parentId) {
|
||||||
Integer parentId) {
|
|
||||||
return accessibleByUserTypeInParent.listSelect(user, user, type, user, parentId);
|
return accessibleByUserTypeInParent.listSelect(user, user, type, user, parentId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -185,8 +160,7 @@ public class SchematicNode {
|
|||||||
private static Map<Integer, List<SchematicNode>> map(List<SchematicNode> in) {
|
private static Map<Integer, List<SchematicNode>> map(List<SchematicNode> in) {
|
||||||
Map<Integer, List<SchematicNode>> map = new HashMap<>();
|
Map<Integer, List<SchematicNode>> map = new HashMap<>();
|
||||||
for (SchematicNode effectiveSchematicNode : in) {
|
for (SchematicNode effectiveSchematicNode : in) {
|
||||||
map.computeIfAbsent(effectiveSchematicNode.getOptionalParent().orElse(0), k -> new ArrayList<>())
|
map.computeIfAbsent(effectiveSchematicNode.getOptionalParent().orElse(0), k -> new ArrayList<>()).add(effectiveSchematicNode);
|
||||||
.add(effectiveSchematicNode);
|
|
||||||
}
|
}
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
@@ -244,8 +218,7 @@ public class SchematicNode {
|
|||||||
return byId.select(id);
|
return byId.select(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static List<SchematicNode> getAccessibleSchematicsOfTypeInParent(int owner, String schemType,
|
public static List<SchematicNode> getAccessibleSchematicsOfTypeInParent(int owner, String schemType, Integer parent) {
|
||||||
Integer parent) {
|
|
||||||
return accessibleByUserTypeParent(SteamwarUser.get(owner), SchematicType.fromDB(schemType), parent);
|
return accessibleByUserTypeParent(SteamwarUser.get(owner), SchematicType.fromDB(schemType), parent);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -310,12 +283,10 @@ public class SchematicNode {
|
|||||||
}
|
}
|
||||||
if (s.contains("/")) {
|
if (s.contains("/")) {
|
||||||
String[] layers = s.split("/");
|
String[] layers = s.split("/");
|
||||||
Optional<SchematicNode> currentNode = Optional
|
Optional<SchematicNode> currentNode = Optional.ofNullable(SchematicNode.byParentName(user, null, layers[0]));
|
||||||
.ofNullable(SchematicNode.byParentName(user, null, layers[0]));
|
|
||||||
for (int i = 1; i < layers.length; i++) {
|
for (int i = 1; i < layers.length; i++) {
|
||||||
int finalI = i;
|
int finalI = i;
|
||||||
Optional<SchematicNode> node = currentNode.map(effectiveSchematicNode -> SchematicNode
|
Optional<SchematicNode> node = currentNode.map(effectiveSchematicNode -> SchematicNode.byParentName(user, effectiveSchematicNode.getId(), layers[finalI]));
|
||||||
.byParentName(user, effectiveSchematicNode.getId(), layers[finalI]));
|
|
||||||
if (!node.isPresent()) {
|
if (!node.isPresent()) {
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
@@ -394,7 +365,7 @@ public class SchematicNode {
|
|||||||
|
|
||||||
@Deprecated
|
@Deprecated
|
||||||
public void setType(String type) {
|
public void setType(String type) {
|
||||||
if (isDir())
|
if(isDir())
|
||||||
throw new SecurityException("Node is Directory");
|
throw new SecurityException("Node is Directory");
|
||||||
this.nodeType = SchematicType.fromDB(type);
|
this.nodeType = SchematicType.fromDB(type);
|
||||||
updateDB();
|
updateDB();
|
||||||
@@ -405,13 +376,13 @@ public class SchematicNode {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String getFileEnding() {
|
public String getFileEnding() {
|
||||||
if (isDir())
|
if(isDir())
|
||||||
throw new SecurityException("Node is Directory");
|
throw new SecurityException("Node is Directory");
|
||||||
return NodeData.get(this).getNodeFormat().getFileEnding();
|
return NodeData.get(this).getNodeFormat().getFileEnding();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getRank() {
|
public int getRank() {
|
||||||
if (isDir())
|
if(isDir())
|
||||||
throw new SecurityException("Node is Directory");
|
throw new SecurityException("Node is Directory");
|
||||||
return nodeRank;
|
return nodeRank;
|
||||||
}
|
}
|
||||||
@@ -422,19 +393,19 @@ public class SchematicNode {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setRank(int rank) {
|
public void setRank(int rank) {
|
||||||
if (isDir())
|
if(isDir())
|
||||||
throw new SecurityException("Node is Directory");
|
throw new SecurityException("Node is Directory");
|
||||||
this.nodeRank = rank;
|
this.nodeRank = rank;
|
||||||
}
|
}
|
||||||
|
|
||||||
public SchematicType getSchemtype() {
|
public SchematicType getSchemtype() {
|
||||||
if (isDir())
|
if(isDir())
|
||||||
throw new SecurityException("Is Directory");
|
throw new SecurityException("Is Directory");
|
||||||
return nodeType;
|
return nodeType;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSchemtype(SchematicType type) {
|
public void setSchemtype(SchematicType type) {
|
||||||
if (isDir())
|
if(isDir())
|
||||||
throw new SecurityException("Is Directory");
|
throw new SecurityException("Is Directory");
|
||||||
this.nodeType = type;
|
this.nodeType = type;
|
||||||
updateDB();
|
updateDB();
|
||||||
@@ -445,7 +416,7 @@ public class SchematicNode {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setReplaceColor(boolean replaceColor) {
|
public void setReplaceColor(boolean replaceColor) {
|
||||||
if (isDir())
|
if(isDir())
|
||||||
throw new SecurityException("Is Directory");
|
throw new SecurityException("Is Directory");
|
||||||
this.replaceColor = replaceColor;
|
this.replaceColor = replaceColor;
|
||||||
updateDB();
|
updateDB();
|
||||||
@@ -456,15 +427,14 @@ public class SchematicNode {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setAllowReplay(boolean allowReplay) {
|
public void setAllowReplay(boolean allowReplay) {
|
||||||
if (isDir())
|
if(isDir())
|
||||||
throw new SecurityException("Is Directory");
|
throw new SecurityException("Is Directory");
|
||||||
this.allowReplay = allowReplay;
|
this.allowReplay = allowReplay;
|
||||||
updateDB();
|
updateDB();
|
||||||
}
|
}
|
||||||
|
|
||||||
public SchematicNode getParentNode() {
|
public SchematicNode getParentNode() {
|
||||||
if (parentNode == null)
|
if(parentNode == null) return null;
|
||||||
return null;
|
|
||||||
return SchematicNode.getSchematicNode(parentNode);
|
return SchematicNode.getSchematicNode(parentNode);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -516,7 +486,7 @@ public class SchematicNode {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String generateBreadcrumbs() {
|
public String generateBreadcrumbs() {
|
||||||
if (brCache == null) {
|
if(brCache == null) {
|
||||||
brCache = generateBreadcrumbs("/");
|
brCache = generateBreadcrumbs("/");
|
||||||
}
|
}
|
||||||
return brCache;
|
return brCache;
|
||||||
@@ -525,15 +495,11 @@ public class SchematicNode {
|
|||||||
public String generateBreadcrumbs(String split) {
|
public String generateBreadcrumbs(String split) {
|
||||||
StringBuilder builder = new StringBuilder(getName());
|
StringBuilder builder = new StringBuilder(getName());
|
||||||
Optional<SchematicNode> currentNode = Optional.of(this);
|
Optional<SchematicNode> currentNode = Optional.of(this);
|
||||||
if (currentNode.map(SchematicNode::isDir).orElse(false)) {
|
if(currentNode.map(SchematicNode::isDir).orElse(false)) {
|
||||||
builder.append(split);
|
builder.append(split);
|
||||||
}
|
}
|
||||||
while (currentNode.isPresent()) {
|
while (currentNode.isPresent()) {
|
||||||
currentNode = currentNode
|
currentNode = currentNode.flatMap(schematicNode -> Optional.ofNullable(NodeMember.getNodeMember(schematicNode.getId(), effectiveOwner)).map(NodeMember::getParent).orElse(schematicNode.getOptionalParent())).map(SchematicNode::getSchematicNode);
|
||||||
.flatMap(schematicNode -> Optional
|
|
||||||
.ofNullable(NodeMember.getNodeMember(schematicNode.getId(), effectiveOwner))
|
|
||||||
.map(NodeMember::getParent).orElse(schematicNode.getOptionalParent()))
|
|
||||||
.map(SchematicNode::getSchematicNode);
|
|
||||||
currentNode.ifPresent(node -> builder.insert(0, split).insert(0, node.getName()));
|
currentNode.ifPresent(node -> builder.insert(0, split).insert(0, node.getName()));
|
||||||
}
|
}
|
||||||
return builder.toString();
|
return builder.toString();
|
||||||
@@ -542,22 +508,17 @@ public class SchematicNode {
|
|||||||
public List<Map.Entry<String, Integer>> generateBreadcrumbsMap(SteamwarUser user) {
|
public List<Map.Entry<String, Integer>> generateBreadcrumbsMap(SteamwarUser user) {
|
||||||
List<Map.Entry<String, Integer>> map = new ArrayList<>();
|
List<Map.Entry<String, Integer>> map = new ArrayList<>();
|
||||||
Optional<SchematicNode> currentNode = Optional.of(this);
|
Optional<SchematicNode> currentNode = Optional.of(this);
|
||||||
if (currentNode.map(SchematicNode::isDir).orElse(false)) {
|
if(currentNode.map(SchematicNode::isDir).orElse(false)) {
|
||||||
map.add(new AbstractMap.SimpleEntry<>(getName(), getId()));
|
map.add(new AbstractMap.SimpleEntry<>(getName(), getId()));
|
||||||
}
|
}
|
||||||
while (currentNode.isPresent()) {
|
while (currentNode.isPresent()) {
|
||||||
currentNode = currentNode
|
currentNode = currentNode.flatMap(schematicNode -> Optional.ofNullable(NodeMember.getNodeMember(schematicNode.getId(), effectiveOwner)).map(NodeMember::getParent).orElse(schematicNode.getOptionalParent())).map(SchematicNode::getSchematicNode);
|
||||||
.flatMap(schematicNode -> Optional
|
|
||||||
.ofNullable(NodeMember.getNodeMember(schematicNode.getId(), effectiveOwner))
|
|
||||||
.map(NodeMember::getParent).orElse(schematicNode.getOptionalParent()))
|
|
||||||
.map(SchematicNode::getSchematicNode);
|
|
||||||
currentNode.ifPresent(node -> map.add(0, new AbstractMap.SimpleEntry<>(node.getName(), node.getId())));
|
currentNode.ifPresent(node -> map.add(0, new AbstractMap.SimpleEntry<>(node.getName(), node.getId())));
|
||||||
}
|
}
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static final List<String> FORBIDDEN_NAMES = Collections.unmodifiableList(Arrays.asList("public"));
|
private static final List<String> FORBIDDEN_NAMES = Collections.unmodifiableList(Arrays.asList("public"));
|
||||||
|
|
||||||
public static boolean invalidSchemName(String[] layers) {
|
public static boolean invalidSchemName(String[] layers) {
|
||||||
for (String layer : layers) {
|
for (String layer : layers) {
|
||||||
if (layer.isEmpty()) {
|
if (layer.isEmpty()) {
|
||||||
@@ -574,7 +535,7 @@ public class SchematicNode {
|
|||||||
layer.contains(" ")) {
|
layer.contains(" ")) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (FORBIDDEN_NAMES.contains(layer.toLowerCase())) {
|
if(FORBIDDEN_NAMES.contains(layer.toLowerCase())) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -588,15 +549,14 @@ public class SchematicNode {
|
|||||||
}
|
}
|
||||||
int index = s.lastIndexOf("/");
|
int index = s.lastIndexOf("/");
|
||||||
String cacheKey = index == -1 ? "" : s.substring(0, index);
|
String cacheKey = index == -1 ? "" : s.substring(0, index);
|
||||||
if (TAB_CACHE.containsKey(user.getId()) && TAB_CACHE.get(user.getId()).containsKey(cacheKey)) {
|
if(TAB_CACHE.containsKey(user.getId()) && TAB_CACHE.get(user.getId()).containsKey(cacheKey)) {
|
||||||
return new ArrayList<>(TAB_CACHE.get(user.getId()).get(cacheKey));
|
return new ArrayList<>(TAB_CACHE.get(user.getId()).get(cacheKey));
|
||||||
}
|
}
|
||||||
List<String> list = new ArrayList<>();
|
List<String> list = new ArrayList<>();
|
||||||
if (s.contains("/")) {
|
if (s.contains("/")) {
|
||||||
String preTab = s.substring(0, s.lastIndexOf("/") + 1);
|
String preTab = s.substring(0, s.lastIndexOf("/") + 1);
|
||||||
SchematicNode pa = SchematicNode.getNodeFromPath(user, preTab);
|
SchematicNode pa = SchematicNode.getNodeFromPath(user, preTab);
|
||||||
if (pa == null)
|
if (pa == null) return new ArrayList<>();
|
||||||
return new ArrayList<>();
|
|
||||||
List<SchematicNode> nodes = SchematicNode.list(user, pa.getId());
|
List<SchematicNode> nodes = SchematicNode.list(user, pa.getId());
|
||||||
String br = pa.generateBreadcrumbs();
|
String br = pa.generateBreadcrumbs();
|
||||||
nodes.forEach(node -> list.add((sws ? "/" : "") + br + node.getName() + (node.isDir() ? "/" : "")));
|
nodes.forEach(node -> list.add((sws ? "/" : "") + br + node.getName() + (node.isDir() ? "/" : "")));
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ import java.security.SecureRandom;
|
|||||||
import java.security.spec.InvalidKeySpecException;
|
import java.security.spec.InvalidKeySpecException;
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import java.util.function.BiConsumer;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -121,12 +122,13 @@ public class SteamwarUser {
|
|||||||
return byDiscord.select(discordId);
|
return byDiscord.select(discordId);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static SteamwarUser getOrCreate(UUID uuid, String name, Consumer<UUID> newPlayer) {
|
public static SteamwarUser getOrCreate(UUID uuid, String name, Consumer<UUID> newPlayer, BiConsumer<String, String> nameUpdate) {
|
||||||
SteamwarUser user = get(uuid);
|
SteamwarUser user = get(uuid);
|
||||||
|
|
||||||
if (user != null) {
|
if (user != null) {
|
||||||
if (!user.userName.equals(name)) {
|
if (!user.userName.equals(name)) {
|
||||||
updateName.update(name, user.id);
|
updateName.update(name, user.id);
|
||||||
|
nameUpdate.accept(user.userName, name);
|
||||||
user.userName = name;
|
user.userName = name;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -335,7 +337,7 @@ public class SteamwarUser {
|
|||||||
|
|
||||||
public boolean verifyPassword(String password) {
|
public boolean verifyPassword(String password) {
|
||||||
try {
|
try {
|
||||||
if (!hasPassword()) {
|
if (this.password == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -357,10 +359,6 @@ public class SteamwarUser {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean hasPassword() {
|
|
||||||
return this.password != null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private byte[] generateHash(String password, byte[] salt)
|
private byte[] generateHash(String password, byte[] salt)
|
||||||
throws InvalidKeySpecException {
|
throws InvalidKeySpecException {
|
||||||
PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 65536, 512);
|
PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 65536, 512);
|
||||||
|
|||||||
@@ -75,7 +75,15 @@ public class UserElo {
|
|||||||
|
|
||||||
public static void setElo(int userId, String gameMode, int elo) {
|
public static void setElo(int userId, String gameMode, int elo) {
|
||||||
emblemCache.remove(userId);
|
emblemCache.remove(userId);
|
||||||
|
|
||||||
|
int oldPlacement = getPlacement(getElo(userId, gameMode).orElse(0), gameMode);
|
||||||
|
int newPlacement = getPlacement(elo, gameMode);
|
||||||
|
|
||||||
gameModeUserEloCache.getOrDefault(gameMode, Collections.emptyMap()).remove(userId);
|
gameModeUserEloCache.getOrDefault(gameMode, Collections.emptyMap()).remove(userId);
|
||||||
|
if (oldPlacement <= 3 || newPlacement <= 3) {
|
||||||
|
emblemCache.clear();
|
||||||
|
}
|
||||||
|
|
||||||
setElo.update(Season.getSeason(), gameMode, userId, elo);
|
setElo.update(Season.getSeason(), gameMode, userId, elo);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -104,17 +112,27 @@ public class UserElo {
|
|||||||
public static String getEmblemProgression(String gameMode, int userId) {
|
public static String getEmblemProgression(String gameMode, int userId) {
|
||||||
switch (getProgression(userId, gameMode)) {
|
switch (getProgression(userId, gameMode)) {
|
||||||
case -1:
|
case -1:
|
||||||
return "§8❱❱❱❱ ❂";
|
return "§f/ §8∨ ∧ ∨ ∧ ∨ ∧ ❂ III II I";
|
||||||
case 0:
|
case 0:
|
||||||
return "§e❱§8❱❱❱ ❂";
|
return "§8/ §6∨ §8∧ ∨ ∧ ∨ ∧ ❂ III II I";
|
||||||
case 1:
|
case 1:
|
||||||
return "§e❱❱§8❱❱ ❂";
|
return "§8/ ∨ §6∧ §8∨ ∧ ∨ ∧ ❂ III II I";
|
||||||
case 2:
|
case 2:
|
||||||
return "§e❱❱❱§8❱ ❂";
|
return "§8/ ∨ ∧ §7∨ §8∧ ∨ ∧ ❂ III II I";
|
||||||
case 3:
|
case 3:
|
||||||
return "§e❱❱❱❱§8 ❂";
|
return "§8/ ∨ ∧ ∨ §7∧ §8∨ ∧ ❂ III II I";
|
||||||
case 4:
|
case 4:
|
||||||
return "§8❱❱❱❱ §5❂";
|
return "§8/ ∨ ∧ ∨ ∧ §e∨ §8∧ ❂ III II I";
|
||||||
|
case 5:
|
||||||
|
return "§8/ ∨ ∧ ∨ ∧ ∨ §e∧ §8❂ III II I";
|
||||||
|
case 6:
|
||||||
|
return "§8/ ∨ ∧ ∨ ∧ ∨ ∧ §5❂ §8III II I";
|
||||||
|
case 7:
|
||||||
|
return "§8/ ∨ ∧ ∨ ∧ ∨ ∧ ❂ §5III §8II I";
|
||||||
|
case 8:
|
||||||
|
return "§8/ ∨ ∧ ∨ ∧ ∨ ∧ ❂ III §5II §8I";
|
||||||
|
case 9:
|
||||||
|
return "§8/ ∨ ∧ ∨ ∧ ∨ ∧ ❂ III II §5I";
|
||||||
default:
|
default:
|
||||||
throw new SecurityException("Progression is not in range");
|
throw new SecurityException("Progression is not in range");
|
||||||
}
|
}
|
||||||
@@ -124,11 +142,19 @@ public class UserElo {
|
|||||||
int elo = getElo(userId, gameMode).orElse(-1);
|
int elo = getElo(userId, gameMode).orElse(-1);
|
||||||
if (elo < 0) return -1;
|
if (elo < 0) return -1;
|
||||||
|
|
||||||
if (elo < 150) return 0;
|
if (elo <= 100) return 0;
|
||||||
if (elo < 350) return 1;
|
if (elo <= 200) return 1;
|
||||||
if (elo < 600) return 2;
|
if (elo <= 400) return 2;
|
||||||
if (elo < 900) return 3;
|
if (elo <= 600) return 3;
|
||||||
return 4;
|
if (elo <= 900) return 4;
|
||||||
|
if (elo <= 1200) return 5;
|
||||||
|
|
||||||
|
int placement = getPlacement(elo, gameMode);
|
||||||
|
if (placement == 1) return 9;
|
||||||
|
if (placement == 2) return 8;
|
||||||
|
if (placement == 3) return 7;
|
||||||
|
|
||||||
|
return 6;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String toEmblem(int progression) {
|
public static String toEmblem(int progression) {
|
||||||
@@ -136,15 +162,25 @@ public class UserElo {
|
|||||||
case -1:
|
case -1:
|
||||||
return "";
|
return "";
|
||||||
case 0:
|
case 0:
|
||||||
return "§e❱ ";
|
return "§6∨ ";
|
||||||
case 1:
|
case 1:
|
||||||
return "§e❱❱ ";
|
return "§6∧ ";
|
||||||
case 2:
|
case 2:
|
||||||
return "§e❱❱❱ ";
|
return "§7∨ ";
|
||||||
case 3:
|
case 3:
|
||||||
return "§e❱❱❱❱ ";
|
return "§7∧ ";
|
||||||
case 4:
|
case 4:
|
||||||
|
return "§e∨ ";
|
||||||
|
case 5:
|
||||||
|
return "§e∧ ";
|
||||||
|
case 6:
|
||||||
return "§5❂ ";
|
return "§5❂ ";
|
||||||
|
case 7:
|
||||||
|
return "§5III ";
|
||||||
|
case 8:
|
||||||
|
return "§5II ";
|
||||||
|
case 9:
|
||||||
|
return "§5I ";
|
||||||
default:
|
default:
|
||||||
throw new SecurityException("Progression out of range");
|
throw new SecurityException("Progression out of range");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ public class Statement implements AutoCloseable {
|
|||||||
String user = properties.getProperty("user");
|
String user = properties.getProperty("user");
|
||||||
String password = properties.getProperty("password");
|
String password = properties.getProperty("password");
|
||||||
|
|
||||||
PRODUCTION_DATABASE = "production".equals(properties.getProperty("database"));
|
PRODUCTION_DATABASE = "core".equals(properties.getProperty("database"));
|
||||||
MAX_CONNECTIONS = SQLConfig.impl.maxConnections();
|
MAX_CONNECTIONS = SQLConfig.impl.maxConnections();
|
||||||
conProvider = () -> {
|
conProvider = () -> {
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -31,6 +31,5 @@ dependencies {
|
|||||||
compileOnly(libs.nms18)
|
compileOnly(libs.nms18)
|
||||||
compileOnly(libs.fawe18)
|
compileOnly(libs.fawe18)
|
||||||
|
|
||||||
compileOnly(libs.authlib)
|
|
||||||
compileOnly(libs.fastutil)
|
compileOnly(libs.fastutil)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,29 +19,24 @@
|
|||||||
|
|
||||||
package de.steamwar.fightsystem.utils;
|
package de.steamwar.fightsystem.utils;
|
||||||
|
|
||||||
import com.comphenix.tinyprotocol.TinyProtocol;
|
import de.steamwar.Reflection;
|
||||||
import com.mojang.authlib.GameProfile;
|
|
||||||
import de.steamwar.core.ProtocolWrapper;
|
|
||||||
import de.steamwar.fightsystem.FightSystem;
|
|
||||||
import org.bukkit.GameMode;
|
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
public class BlockIdWrapper18 extends BlockIdWrapper14 {
|
public class BlockIdWrapper18 extends BlockIdWrapper14 {
|
||||||
|
|
||||||
|
private static final Reflection.Field<Map> hiddenEntities = Reflection.getField(Reflection.getClass("org.bukkit.craftbukkit.entity.CraftPlayer"), Map.class, 0, UUID.class, Set.class);
|
||||||
@Override
|
@Override
|
||||||
public void trackEntity(Player player, Entity entity) {
|
public void trackEntity(Player player, Entity entity) {
|
||||||
if(entity instanceof Player)
|
hiddenEntities.get(player).remove(entity.getUniqueId());
|
||||||
TinyProtocol.instance.sendPacket(player, ProtocolWrapper.impl.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.REMOVE, new GameProfile(entity.getUniqueId(), entity.getName()), GameMode.CREATIVE));
|
super.trackEntity(player, entity);
|
||||||
|
|
||||||
player.showEntity(FightSystem.getPlugin(), entity);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void untrackEntity(Player player, Entity entity) {
|
public void untrackEntity(Player player, Entity entity) {
|
||||||
player.hideEntity(FightSystem.getPlugin(), entity);
|
hiddenEntities.get(player).put(entity.getUniqueId(), new HashSet<>(1));
|
||||||
|
super.untrackEntity(player, entity);
|
||||||
if(entity instanceof Player)
|
|
||||||
TinyProtocol.instance.sendPacket(player, ProtocolWrapper.impl.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.ADD, new GameProfile(entity.getUniqueId(), entity.getName()), GameMode.CREATIVE));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,5 +29,4 @@ dependencies {
|
|||||||
compileOnly(libs.worldedit15)
|
compileOnly(libs.worldedit15)
|
||||||
compileOnly(libs.fastutil)
|
compileOnly(libs.fastutil)
|
||||||
compileOnly(libs.authlib)
|
compileOnly(libs.authlib)
|
||||||
compileOnly(libs.netty)
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -97,7 +97,6 @@ public class FightSystem extends JavaPlugin {
|
|||||||
new PrepareSchem();
|
new PrepareSchem();
|
||||||
new TestJoin();
|
new TestJoin();
|
||||||
new NormalJoin();
|
new NormalJoin();
|
||||||
new Spectator();
|
|
||||||
new RunningWorldInteraction();
|
new RunningWorldInteraction();
|
||||||
new PersonalKitCreator();
|
new PersonalKitCreator();
|
||||||
new ArrowStopper();
|
new ArrowStopper();
|
||||||
@@ -157,7 +156,6 @@ public class FightSystem extends JavaPlugin {
|
|||||||
new LockschemCommand();
|
new LockschemCommand();
|
||||||
new StateCommand();
|
new StateCommand();
|
||||||
new SkipCommand();
|
new SkipCommand();
|
||||||
new TechhiderbugCommand();
|
|
||||||
new TPSWarpCommand();
|
new TPSWarpCommand();
|
||||||
new UnrankCommand();
|
new UnrankCommand();
|
||||||
new WinCommand();
|
new WinCommand();
|
||||||
|
|||||||
@@ -176,15 +176,15 @@ UI_WIN={0}Victory {1}
|
|||||||
UI_DRAW=§7Draw
|
UI_DRAW=§7Draw
|
||||||
|
|
||||||
BAR_PRE_LEADER=§7Waiting for team leader
|
BAR_PRE_LEADER=§7Waiting for team leader
|
||||||
BAR_PRE_SCHEM = {1} §7Schematic selection {0} {2}
|
BAR_PRE_SCHEM={1} §7Schematic selection {0} {2}
|
||||||
BAR_PREPARE = {1} {3} §7Preparation {0} {4} {2}
|
BAR_PREPARE={1} {3} §7Preparation {0} {4} {2}
|
||||||
BAR_PRE_RUNNING = {1} {3} §7Start of fight in {0} {4} {2}
|
BAR_PRE_RUNNING={1} {3} §7Start of fight in {0} {4} {2}
|
||||||
BAR_RUNNING0 = {1} {3} {0} {4} {2}
|
BAR_RUNNING0={1} {3} {0} {4} {2}
|
||||||
BAR_RUNNING1 = {1} {3} {5} {0} {6} {4} {2}
|
BAR_RUNNING1={1} {3} {5} {0} {6} {4} {2}
|
||||||
BAR_RUNNING2 = {1} {3} {5} {7} {0} {6} {8} {4} {2}
|
BAR_RUNNING2={1} {3} {5} {7} {0} {6} {8} {4} {2}
|
||||||
BAR_RUNNING3 = {1} {3} {5} {7} {9} {0} {6} {8} {10} {4} {2}
|
BAR_RUNNING3={1} {3} {5} {7} {9} {0} {6} {8} {10} {4} {2}
|
||||||
BAR_TIE = {1} §7Draw {0} {2}
|
BAR_TIE={1} §7Draw {0} {2}
|
||||||
BAR_WIN = {1} §7Victory {3} {0} {2}
|
BAR_WIN={1} §7Victory {3} {0} {2}
|
||||||
BAR_POINTS={0} §8Points
|
BAR_POINTS={0} §8Points
|
||||||
BAR_POINTS_OF={0}§8/§7{1} §8Points
|
BAR_POINTS_OF={0}§8/§7{1} §8Points
|
||||||
BAR_PERCENT={0}§8%
|
BAR_PERCENT={0}§8%
|
||||||
|
|||||||
@@ -161,11 +161,11 @@ UI_WIN={0}Sieg {1}
|
|||||||
UI_DRAW=§7Unentschieden
|
UI_DRAW=§7Unentschieden
|
||||||
|
|
||||||
BAR_PRE_LEADER=§7Warten auf Teamleader
|
BAR_PRE_LEADER=§7Warten auf Teamleader
|
||||||
BAR_PRE_SCHEM = {1} §7Schemauswahl {0} {2}
|
BAR_PRE_SCHEM={1} §7Schemauswahl {0} {2}
|
||||||
BAR_PREPARE = {1} {3} §7Vorbereitung {0} {4} {2}
|
BAR_PREPARE={1} {3} §7Vorbereitung {0} {4} {2}
|
||||||
BAR_PRE_RUNNING = {1} {3} §7Kampfbeginn in {0} {4} {2}
|
BAR_PRE_RUNNING={1} {3} §7Kampfbeginn in {0} {4} {2}
|
||||||
BAR_TIE = {1} §7Unentschieden {0} {2}
|
BAR_TIE={1} §7Unentschieden {0} {2}
|
||||||
BAR_WIN = {1} §7Sieg {3} {0} {2}
|
BAR_WIN={1} §7Sieg {3} {0} {2}
|
||||||
BAR_POINTS={0} §8Punkte
|
BAR_POINTS={0} §8Punkte
|
||||||
BAR_POINTS_OF={0}§8/§7{1} §8Punkte
|
BAR_POINTS_OF={0}§8/§7{1} §8Punkte
|
||||||
BAR_PERCENT={0}§8%
|
BAR_PERCENT={0}§8%
|
||||||
|
|||||||
-80
@@ -1,80 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.fightsystem.commands;
|
|
||||||
|
|
||||||
import com.comphenix.tinyprotocol.TinyProtocol;
|
|
||||||
import de.steamwar.fightsystem.ArenaMode;
|
|
||||||
import de.steamwar.fightsystem.Config;
|
|
||||||
import de.steamwar.fightsystem.FightSystem;
|
|
||||||
import de.steamwar.fightsystem.fight.Fight;
|
|
||||||
import de.steamwar.fightsystem.states.FightState;
|
|
||||||
import de.steamwar.fightsystem.states.StateDependentCommand;
|
|
||||||
import de.steamwar.sql.SWException;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.command.Command;
|
|
||||||
import org.bukkit.command.CommandExecutor;
|
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
|
|
||||||
import java.io.StringWriter;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.logging.Level;
|
|
||||||
|
|
||||||
public class TechhiderbugCommand implements CommandExecutor {
|
|
||||||
|
|
||||||
public TechhiderbugCommand() {
|
|
||||||
new StateDependentCommand(ArenaMode.All, FightState.All, "techhiderbug", this);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onCommand(CommandSender sender, Command cmd, String alias, String[] args) {
|
|
||||||
StringWriter writer = new StringWriter();
|
|
||||||
|
|
||||||
try {
|
|
||||||
writer.append("ArenaMode: ").append(Config.mode.name()).append('\n');
|
|
||||||
writer.append("FightState: ").append(FightState.getFightState().name()).append('\n');
|
|
||||||
writer.append("TechHider enabled: ").append(FightState.getStateDependentFeatures().get(FightSystem.getTechHider()).toString()).append('\n');
|
|
||||||
|
|
||||||
writer.append("Arena region: ").append(Config.ArenaRegion.toString()).append('\n');
|
|
||||||
writer.append("Team regions: ");
|
|
||||||
Fight.teams().forEach(t -> writer.append(t.getName()).append(':').append(t.getExtendRegion().toString()).append(' '));
|
|
||||||
writer.append('\n');
|
|
||||||
|
|
||||||
writer.append("HullHider regions: ");
|
|
||||||
FightSystem.getHullHider().getHullMap().forEach((t, h) -> writer.append(t.getName()).append(':').append(h.getRegion().toString()).append(' '));
|
|
||||||
writer.append('\n');
|
|
||||||
|
|
||||||
writer.append("Hidden regions: ");
|
|
||||||
FightSystem.getTechHider().getHiddenRegion().forEach((p, r) -> writer.append(p.getName()).append(':').append(r.toString()).append(' '));
|
|
||||||
writer.append('\n');
|
|
||||||
|
|
||||||
writer.append("TinyProtocol: ");
|
|
||||||
writer.append(TinyProtocol.instance.toString()).append('\n');
|
|
||||||
|
|
||||||
writer.append('\n').append("Netty pipelines:\n");
|
|
||||||
Bukkit.getOnlinePlayers().forEach(p -> writer.append(p.getName()).append(": ").append(String.join(" ", TinyProtocol.instance.getPlayerInterceptors().get(p).getChannel().pipeline().names())).append('\n'));
|
|
||||||
} catch (Exception e) {
|
|
||||||
writer.append("Error while generating bug report: ").append(e.getMessage()).append('\n');
|
|
||||||
Bukkit.getLogger().log(Level.SEVERE, "Error while generating bug report", e);
|
|
||||||
}
|
|
||||||
|
|
||||||
SWException.log("Techhider-Bug reported by " + sender.getName() + ": " + Arrays.toString(args), writer.toString());
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -104,6 +104,40 @@ public class Fight {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
|
public static void setPlayerGamemode(Player player, GameMode gameMode) {
|
||||||
|
player.setGameMode(gameMode);
|
||||||
|
|
||||||
|
if(gameMode == GameMode.SPECTATOR) {
|
||||||
|
for(Player currentPlayer : Bukkit.getServer().getOnlinePlayers()) {
|
||||||
|
if(currentPlayer.getUniqueId() != player.getUniqueId() && currentPlayer.getGameMode() == GameMode.SPECTATOR) {
|
||||||
|
currentPlayer.hidePlayer(player);
|
||||||
|
player.hidePlayer(currentPlayer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(Config.test() || Config.isReferee(player))
|
||||||
|
return;
|
||||||
|
|
||||||
|
Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), () -> {
|
||||||
|
if(!player.isOnline())
|
||||||
|
return;
|
||||||
|
pseudoSpectator(player, true);
|
||||||
|
}, 1);
|
||||||
|
}else if(gameMode == GameMode.SURVIVAL) {
|
||||||
|
for(Player currentPlayer : Bukkit.getServer().getOnlinePlayers()) {
|
||||||
|
if(currentPlayer.getUniqueId() != player.getUniqueId() && currentPlayer.getGameMode() == GameMode.SPECTATOR) {
|
||||||
|
currentPlayer.showPlayer(player);
|
||||||
|
player.showPlayer(currentPlayer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void pseudoSpectator(Player player, boolean enable) {
|
||||||
|
TinyProtocol.instance.sendPacket(player, ProtocolWrapper.impl.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.GAMEMODE, new GameProfile(player.getUniqueId(), player.getName()), enable ? GameMode.CREATIVE : GameMode.SPECTATOR));
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean publicOnly() {
|
public static boolean publicOnly() {
|
||||||
if (Config.OnlyPublicSchematics) {
|
if (Config.OnlyPublicSchematics) {
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ public class FightTeam {
|
|||||||
|
|
||||||
if(ArenaMode.VariableTeams.contains(Config.mode)){
|
if(ArenaMode.VariableTeams.contains(Config.mode)){
|
||||||
notReadyKit.setItem(2, "REQUESTS", new ItemBuilder(Material.PAPER).build(), GUI::chooseJoinRequests);
|
notReadyKit.setItem(2, "REQUESTS", new ItemBuilder(Material.PAPER).build(), GUI::chooseJoinRequests);
|
||||||
|
notReadyKit.setItem(3, "MANAGE_PLAYERS", SWItem.getPlayerSkull("AdmiralSeekrank").getItemStack(), GUI::managePlayers);
|
||||||
if(!AIManager.availableAIs().isEmpty())
|
if(!AIManager.availableAIs().isEmpty())
|
||||||
notReadyKit.setItem(6, "ADD_AI", new ItemBuilder(Material.REDSTONE).build(), GUI::addAI);
|
notReadyKit.setItem(6, "ADD_AI", new ItemBuilder(Material.REDSTONE).build(), GUI::addAI);
|
||||||
}
|
}
|
||||||
@@ -80,7 +81,6 @@ public class FightTeam {
|
|||||||
if(Config.test())
|
if(Config.test())
|
||||||
notReadyKit.setItem(5, "CHOOSE_SCHEMATIC", new ItemBuilder(SWItem.getMaterial("CAULDRON_ITEM")).enchant().build(), GUI::preSchemDialog);
|
notReadyKit.setItem(5, "CHOOSE_SCHEMATIC", new ItemBuilder(SWItem.getMaterial("CAULDRON_ITEM")).enchant().build(), GUI::preSchemDialog);
|
||||||
|
|
||||||
notReadyKit.setItem(3, "MANAGE_PLAYERS", SWItem.getPlayerSkull("AdmiralSeekrank").getItemStack(), GUI::managePlayers);
|
|
||||||
notReadyKit.setItem(4, "TEAM_NOT_READY", new ItemBuilder(SWItem.getDye(10), (short) 10).enchant().build(), player -> Objects.requireNonNull(Fight.getPlayerTeam(player)).setReady(true));
|
notReadyKit.setItem(4, "TEAM_NOT_READY", new ItemBuilder(SWItem.getDye(10), (short) 10).enchant().build(), player -> Objects.requireNonNull(Fight.getPlayerTeam(player)).setReady(true));
|
||||||
}
|
}
|
||||||
private static final HotbarKit chooseSchemKit = new HotbarKit(notReadyKit);
|
private static final HotbarKit chooseSchemKit = new HotbarKit(notReadyKit);
|
||||||
@@ -282,9 +282,9 @@ public class FightTeam {
|
|||||||
FightSystem.getHullHider().updatePlayer(player);
|
FightSystem.getHullHider().updatePlayer(player);
|
||||||
|
|
||||||
if(FightState.Spectate.contains(FightState.getFightState())) {
|
if(FightState.Spectate.contains(FightState.getFightState())) {
|
||||||
player.setGameMode(GameMode.SPECTATOR);
|
Fight.setPlayerGamemode(player, GameMode.SPECTATOR);
|
||||||
} else {
|
} else {
|
||||||
player.setGameMode(GameMode.SURVIVAL);
|
Fight.setPlayerGamemode(player, GameMode.SURVIVAL);
|
||||||
(FightState.ingame() ? fightPlayer.getKit() : memberKit).loadToPlayer(player);
|
(FightState.ingame() ? fightPlayer.getKit() : memberKit).loadToPlayer(player);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -317,7 +317,7 @@ public class FightTeam {
|
|||||||
entity.teleport(Config.SpecSpawn);
|
entity.teleport(Config.SpecSpawn);
|
||||||
|
|
||||||
fightPlayer.ifPlayer(player -> {
|
fightPlayer.ifPlayer(player -> {
|
||||||
player.setGameMode(GameMode.SPECTATOR);
|
Fight.setPlayerGamemode(player, GameMode.SPECTATOR);
|
||||||
player.getInventory().clear();
|
player.getInventory().clear();
|
||||||
|
|
||||||
if(player.isOnline()){
|
if(player.isOnline()){
|
||||||
@@ -517,14 +517,14 @@ public class FightTeam {
|
|||||||
@Override
|
@Override
|
||||||
public void enable() {
|
public void enable() {
|
||||||
players.values().forEach(fightPlayer -> {
|
players.values().forEach(fightPlayer -> {
|
||||||
fightPlayer.ifPlayer(player -> player.setGameMode(GameMode.SPECTATOR));
|
fightPlayer.ifPlayer(player -> Fight.setPlayerGamemode(player, GameMode.SPECTATOR));
|
||||||
fightPlayer.getEntity().teleport(FightTeam.this.spawn);
|
fightPlayer.getEntity().teleport(FightTeam.this.spawn);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void disable() {
|
public void disable() {
|
||||||
players.values().forEach(fightPlayer -> fightPlayer.ifPlayer(player -> player.setGameMode(GameMode.SURVIVAL)));
|
players.values().forEach(fightPlayer -> fightPlayer.ifPlayer(player -> Fight.setPlayerGamemode(player, GameMode.SURVIVAL)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,15 +29,11 @@ import de.steamwar.fightsystem.states.FightState;
|
|||||||
import de.steamwar.fightsystem.states.StateDependentListener;
|
import de.steamwar.fightsystem.states.StateDependentListener;
|
||||||
import de.steamwar.fightsystem.states.StateDependentTask;
|
import de.steamwar.fightsystem.states.StateDependentTask;
|
||||||
import de.steamwar.fightsystem.utils.ItemBuilder;
|
import de.steamwar.fightsystem.utils.ItemBuilder;
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.Cancellable;
|
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.block.Action;
|
import org.bukkit.event.block.Action;
|
||||||
import org.bukkit.event.inventory.InventoryClickEvent;
|
|
||||||
import org.bukkit.event.inventory.InventoryOpenEvent;
|
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
import org.bukkit.event.player.PlayerInteractEvent;
|
||||||
import org.bukkit.inventory.EquipmentSlot;
|
import org.bukkit.inventory.EquipmentSlot;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
@@ -111,19 +107,6 @@ public class HotbarKit extends Kit {
|
|||||||
|
|
||||||
Player player = event.getPlayer();
|
Player player = event.getPlayer();
|
||||||
int slot = player.getInventory().getHeldItemSlot();
|
int slot = player.getInventory().getHeldItemSlot();
|
||||||
click(player, slot, event);
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onInventoryClick(InventoryClickEvent event) {
|
|
||||||
int slot = event.getSlot();
|
|
||||||
if (slot < 0 || slot >= HOTBAR_SIZE) return;
|
|
||||||
|
|
||||||
Player player = (Player) event.getWhoClicked();
|
|
||||||
click(player, slot, event);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void click(Player player, int slot, Cancellable event) {
|
|
||||||
Kit activeKit = activeKits.get(player);
|
Kit activeKit = activeKits.get(player);
|
||||||
if(!(activeKit instanceof HotbarKit) || PersonalKitCreator.inKitCreator(player) || activeKit.getInventory()[slot] == null)
|
if(!(activeKit instanceof HotbarKit) || PersonalKitCreator.inKitCreator(player) || activeKit.getInventory()[slot] == null)
|
||||||
return;
|
return;
|
||||||
|
|||||||
+1
-1
@@ -84,6 +84,6 @@ public class LeaveableArena implements Listener {
|
|||||||
|
|
||||||
private void markInArena(Player player) {
|
private void markInArena(Player player) {
|
||||||
spectatorsInArena.put(player, player.getGameMode());
|
spectatorsInArena.put(player, player.getGameMode());
|
||||||
player.setGameMode(GameMode.SPECTATOR);
|
Fight.setPlayerGamemode(player, GameMode.SPECTATOR);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ public class Permanent implements Listener {
|
|||||||
public void handlePlayerRespawn(PlayerRespawnEvent event){
|
public void handlePlayerRespawn(PlayerRespawnEvent event){
|
||||||
Player player = event.getPlayer();
|
Player player = event.getPlayer();
|
||||||
if(Fight.fighting(player)) {
|
if(Fight.fighting(player)) {
|
||||||
player.setGameMode(GameMode.SPECTATOR);
|
Fight.setPlayerGamemode(player, GameMode.SPECTATOR);
|
||||||
|
|
||||||
FightTeam team = Fight.getPlayerTeam(player);
|
FightTeam team = Fight.getPlayerTeam(player);
|
||||||
event.setRespawnLocation(team == null ? Config.SpecSpawn : team.getSpawn());
|
event.setRespawnLocation(team == null ? Config.SpecSpawn : team.getSpawn());
|
||||||
@@ -98,11 +98,11 @@ public class Permanent implements Listener {
|
|||||||
FightPlayer fp = Fight.getFightPlayer(player);
|
FightPlayer fp = Fight.getFightPlayer(player);
|
||||||
|
|
||||||
if (!Config.ArenaLeaveable && fp == null) {
|
if (!Config.ArenaLeaveable && fp == null) {
|
||||||
player.setGameMode(GameMode.SPECTATOR);
|
Fight.setPlayerGamemode(player, GameMode.SPECTATOR);
|
||||||
spectatorTeam.addEntry(player.getName());
|
spectatorTeam.addEntry(player.getName());
|
||||||
player.teleport(Config.SpecSpawn);
|
player.teleport(Config.SpecSpawn);
|
||||||
} else if(fp != null && !fp.isLiving()) {
|
} else if(fp != null && !fp.isLiving()) {
|
||||||
player.setGameMode(GameMode.SPECTATOR);
|
Fight.setPlayerGamemode(player, GameMode.SPECTATOR);
|
||||||
player.teleport(fp.getTeam().getSpawn());
|
player.teleport(fp.getTeam().getSpawn());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,114 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.fightsystem.listener;
|
|
||||||
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.GameMode;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.EventHandler;
|
|
||||||
import org.bukkit.event.EventPriority;
|
|
||||||
import org.bukkit.event.Listener;
|
|
||||||
import org.bukkit.event.player.PlayerGameModeChangeEvent;
|
|
||||||
import org.bukkit.event.player.PlayerJoinEvent;
|
|
||||||
import org.bukkit.event.player.PlayerQuitEvent;
|
|
||||||
|
|
||||||
import com.comphenix.tinyprotocol.TinyProtocol;
|
|
||||||
import com.mojang.authlib.GameProfile;
|
|
||||||
|
|
||||||
import de.steamwar.core.ProtocolWrapper;
|
|
||||||
import de.steamwar.fightsystem.ArenaMode;
|
|
||||||
import de.steamwar.fightsystem.Config;
|
|
||||||
import de.steamwar.fightsystem.fight.Fight;
|
|
||||||
import de.steamwar.fightsystem.fight.FightPlayer;
|
|
||||||
import de.steamwar.fightsystem.states.FightState;
|
|
||||||
import de.steamwar.fightsystem.states.StateDependentListener;
|
|
||||||
import de.steamwar.fightsystem.states.StateDependentTask;
|
|
||||||
|
|
||||||
|
|
||||||
public class Spectator implements Listener {
|
|
||||||
|
|
||||||
private final Set<Player> pseudoSpectator = new HashSet<>();
|
|
||||||
|
|
||||||
public Spectator() {
|
|
||||||
new StateDependentListener(ArenaMode.AntiTest, FightState.All, this);
|
|
||||||
new StateDependentTask(ArenaMode.AntiTest, FightState.All, this::pseudoSpectatorCheck, 1, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR)
|
|
||||||
public void handlePlayerJoin(PlayerJoinEvent e) {
|
|
||||||
Player player = e.getPlayer();
|
|
||||||
|
|
||||||
if(player.getGameMode() == GameMode.SPECTATOR)
|
|
||||||
gameModeChange(player, GameMode.SPECTATOR);
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onGameModeChange(PlayerGameModeChangeEvent e) {
|
|
||||||
gameModeChange(e.getPlayer(), e.getNewGameMode());
|
|
||||||
}
|
|
||||||
|
|
||||||
@SuppressWarnings("deprecation")
|
|
||||||
private void gameModeChange(Player player, GameMode gameMode) {
|
|
||||||
if (gameMode == GameMode.SPECTATOR) {
|
|
||||||
for(Player p : Bukkit.getServer().getOnlinePlayers()) {
|
|
||||||
if(p.getUniqueId() != player.getUniqueId())
|
|
||||||
p.hidePlayer(player);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
for(Player p : Bukkit.getServer().getOnlinePlayers()) {
|
|
||||||
if(p.getUniqueId() != player.getUniqueId())
|
|
||||||
p.showPlayer(player);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void playerQuit(PlayerQuitEvent e) {
|
|
||||||
pseudoSpectator.remove(e.getPlayer());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void pseudoSpectatorCheck() {
|
|
||||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
|
||||||
if (player.getGameMode() != GameMode.SPECTATOR) {
|
|
||||||
pseudoSpectator.remove(player);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Config.isReferee(player))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
FightPlayer fightPlayer = Fight.getFightPlayer(player);
|
|
||||||
if (fightPlayer == null || !fightPlayer.getTeam().getExtendRegion().playerInRegion(player.getLocation())) {
|
|
||||||
if (pseudoSpectator.add(player))
|
|
||||||
pseudoSpectator(player, true);
|
|
||||||
} else {
|
|
||||||
if (pseudoSpectator.remove(player))
|
|
||||||
pseudoSpectator(player, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void pseudoSpectator(Player player, boolean enable) {
|
|
||||||
TinyProtocol.instance.sendPacket(player, ProtocolWrapper.impl.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.GAMEMODE, new GameProfile(player.getUniqueId(), player.getName()), enable ? GameMode.CREATIVE : GameMode.SPECTATOR));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -19,14 +19,9 @@
|
|||||||
|
|
||||||
package de.steamwar.fightsystem.listener;
|
package de.steamwar.fightsystem.listener;
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.EventHandler;
|
|
||||||
import org.bukkit.event.Listener;
|
|
||||||
import org.bukkit.event.player.PlayerJoinEvent;
|
|
||||||
import org.bukkit.event.player.PlayerQuitEvent;
|
|
||||||
|
|
||||||
import de.steamwar.fightsystem.ArenaMode;
|
import de.steamwar.fightsystem.ArenaMode;
|
||||||
import de.steamwar.fightsystem.Config;
|
import de.steamwar.fightsystem.Config;
|
||||||
|
import de.steamwar.fightsystem.FightSystem;
|
||||||
import de.steamwar.fightsystem.events.BoardingEvent;
|
import de.steamwar.fightsystem.events.BoardingEvent;
|
||||||
import de.steamwar.fightsystem.events.TeamDeathEvent;
|
import de.steamwar.fightsystem.events.TeamDeathEvent;
|
||||||
import de.steamwar.fightsystem.events.TeamLeaveEvent;
|
import de.steamwar.fightsystem.events.TeamLeaveEvent;
|
||||||
@@ -37,12 +32,23 @@ import de.steamwar.fightsystem.fight.FightTeam;
|
|||||||
import de.steamwar.fightsystem.states.FightState;
|
import de.steamwar.fightsystem.states.FightState;
|
||||||
import de.steamwar.fightsystem.states.OneShotStateDependent;
|
import de.steamwar.fightsystem.states.OneShotStateDependent;
|
||||||
import de.steamwar.fightsystem.states.StateDependentListener;
|
import de.steamwar.fightsystem.states.StateDependentListener;
|
||||||
|
import de.steamwar.fightsystem.states.StateDependentTask;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.EventHandler;
|
||||||
|
import org.bukkit.event.Listener;
|
||||||
|
import org.bukkit.event.player.PlayerJoinEvent;
|
||||||
|
import org.bukkit.event.player.PlayerQuitEvent;
|
||||||
|
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
public class TeamArea implements Listener {
|
public class TeamArea implements Listener {
|
||||||
|
|
||||||
private final FightTeam team;
|
private final FightTeam team;
|
||||||
private final Border spectatorBorder;
|
private final Border spectatorBorder;
|
||||||
private final Border bordingBorder;
|
private final Border bordingBorder;
|
||||||
|
private final Set<Player> realSpectator = new HashSet<>();
|
||||||
|
|
||||||
public TeamArea(FightTeam team) {
|
public TeamArea(FightTeam team) {
|
||||||
this.team = team;
|
this.team = team;
|
||||||
@@ -50,6 +56,7 @@ public class TeamArea implements Listener {
|
|||||||
this.bordingBorder = new Border(team.getExtendRegion().to2d(), true, 1, "NO_ENTERN", team.getName() + ".boardingBorder");
|
this.bordingBorder = new Border(team.getExtendRegion().to2d(), true, 1, "NO_ENTERN", team.getName() + ".boardingBorder");
|
||||||
|
|
||||||
new StateDependentListener(ArenaMode.AntiTest, FightState.All, this);
|
new StateDependentListener(ArenaMode.AntiTest, FightState.All, this);
|
||||||
|
new StateDependentTask(ArenaMode.AntiTest, FightState.TeamFix, this::realSpectatorCheck, 1, 1);
|
||||||
new OneShotStateDependent(ArenaMode.AntiTest, FightState.Spectate, () -> Fight.teams().forEach(t -> t.getPlayers().forEach(this::teamSpectator)));
|
new OneShotStateDependent(ArenaMode.AntiTest, FightState.Spectate, () -> Fight.teams().forEach(t -> t.getPlayers().forEach(this::teamSpectator)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -107,5 +114,30 @@ public class TeamArea implements Listener {
|
|||||||
Player player = e.getPlayer();
|
Player player = e.getPlayer();
|
||||||
spectatorBorder.removePlayer(player);
|
spectatorBorder.removePlayer(player);
|
||||||
bordingBorder.removePlayer(player);
|
bordingBorder.removePlayer(player);
|
||||||
|
realSpectator.remove(player);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void realSpectatorCheck() {
|
||||||
|
for(FightPlayer fightPlayer : team.getPlayers()) {
|
||||||
|
if(fightPlayer.isLiving())
|
||||||
|
continue;
|
||||||
|
|
||||||
|
fightPlayer.ifPlayer(player -> {
|
||||||
|
boolean inRegion = team.getExtendRegion().playerInRegion(player.getLocation());
|
||||||
|
if(inRegion && !realSpectator.contains(player)) {
|
||||||
|
realSpectator.add(player);
|
||||||
|
|
||||||
|
//Later to prevent race condition with Fight.setSpecatator() during respawn
|
||||||
|
Bukkit.getScheduler().runTaskLater(FightSystem.getPlugin(), () -> {
|
||||||
|
if(!player.isOnline())
|
||||||
|
return;
|
||||||
|
Fight.pseudoSpectator(player, false);
|
||||||
|
}, 2);
|
||||||
|
}else if(!inRegion && realSpectator.contains(player)) {
|
||||||
|
Fight.pseudoSpectator(player, true);
|
||||||
|
realSpectator.remove(player);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,18 +20,15 @@
|
|||||||
package de.steamwar.fightsystem.record;
|
package de.steamwar.fightsystem.record;
|
||||||
|
|
||||||
import de.steamwar.fightsystem.Config;
|
import de.steamwar.fightsystem.Config;
|
||||||
|
import de.steamwar.sql.Replay;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.util.zip.GZIPInputStream;
|
import java.util.zip.GZIPInputStream;
|
||||||
|
|
||||||
public class FileSource extends PacketSource {
|
public class FileSource extends PacketSource {
|
||||||
|
|
||||||
public static File replayFile(int fightId) {
|
|
||||||
return new File("/mnt/storage/replays", fightId + ".replay");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void startReplay() {
|
public static void startReplay() {
|
||||||
if(Config.replayserver()) {
|
if(Config.replayserver()) {
|
||||||
try {
|
try {
|
||||||
@@ -44,7 +41,7 @@ public class FileSource extends PacketSource {
|
|||||||
|
|
||||||
if(Config.ReplayID > 0) {
|
if(Config.ReplayID > 0) {
|
||||||
try {
|
try {
|
||||||
new FileSource(replayFile(Config.ReplayID));
|
new FileSource(Replay.get(Config.ReplayID).getReplay());
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new SecurityException("Could not start replay", e);
|
throw new SecurityException("Could not start replay", e);
|
||||||
}
|
}
|
||||||
@@ -52,7 +49,7 @@ public class FileSource extends PacketSource {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public FileSource(File fightFile) throws IOException {
|
public FileSource(File fightFile) throws IOException {
|
||||||
super(new GZIPInputStream(Files.newInputStream(fightFile.toPath())));
|
super(new GZIPInputStream(new FileInputStream(fightFile)));
|
||||||
new PacketProcessor(this);
|
new PacketProcessor(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ public enum FightState {
|
|||||||
public static final Set<FightState> AntiIngame = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(PRE_RUNNING, RUNNING)));
|
public static final Set<FightState> AntiIngame = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(PRE_RUNNING, RUNNING)));
|
||||||
public static final Set<FightState> AntiSpectate = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(SPECTATE)));
|
public static final Set<FightState> AntiSpectate = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(SPECTATE)));
|
||||||
|
|
||||||
@Getter
|
|
||||||
private static final Map<IStateDependent, Boolean> stateDependentFeatures = new HashMap<>();
|
private static final Map<IStateDependent, Boolean> stateDependentFeatures = new HashMap<>();
|
||||||
@Getter
|
@Getter
|
||||||
private static FightState fightState = PRE_LEADER_SETUP;
|
private static FightState fightState = PRE_LEADER_SETUP;
|
||||||
|
|||||||
@@ -27,25 +27,23 @@ import de.steamwar.fightsystem.fight.Fight;
|
|||||||
import de.steamwar.fightsystem.fight.FightPlayer;
|
import de.steamwar.fightsystem.fight.FightPlayer;
|
||||||
import de.steamwar.fightsystem.fight.FightTeam;
|
import de.steamwar.fightsystem.fight.FightTeam;
|
||||||
import de.steamwar.fightsystem.record.FileRecorder;
|
import de.steamwar.fightsystem.record.FileRecorder;
|
||||||
import de.steamwar.fightsystem.record.FileSource;
|
|
||||||
import de.steamwar.fightsystem.states.FightState;
|
import de.steamwar.fightsystem.states.FightState;
|
||||||
import de.steamwar.fightsystem.states.OneShotStateDependent;
|
import de.steamwar.fightsystem.states.OneShotStateDependent;
|
||||||
import de.steamwar.fightsystem.winconditions.Wincondition;
|
import de.steamwar.fightsystem.winconditions.Wincondition;
|
||||||
import de.steamwar.network.NetworkSender;
|
import de.steamwar.network.NetworkSender;
|
||||||
import de.steamwar.network.packets.common.FightEndsPacket;
|
import de.steamwar.network.packets.common.FightEndsPacket;
|
||||||
|
import de.steamwar.sql.Replay;
|
||||||
import de.steamwar.sql.SchematicNode;
|
import de.steamwar.sql.SchematicNode;
|
||||||
import de.steamwar.sql.SteamwarUser;
|
import de.steamwar.sql.SteamwarUser;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.sql.Timestamp;
|
import java.sql.Timestamp;
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import static de.steamwar.sql.Fight.create;
|
import static de.steamwar.sql.Fight.create;
|
||||||
import static de.steamwar.sql.Fight.markReplayAvailable;
|
|
||||||
|
|
||||||
public class FightStatistics {
|
public class FightStatistics {
|
||||||
|
|
||||||
@@ -126,9 +124,11 @@ public class FightStatistics {
|
|||||||
Config.EventKampf.setFight(fightId);
|
Config.EventKampf.setFight(fightId);
|
||||||
}
|
}
|
||||||
|
|
||||||
Files.move(FileRecorder.getFile().toPath(), FileSource.replayFile(fightId).toPath());
|
try {
|
||||||
|
Replay.save(fightId, FileRecorder.getFile());
|
||||||
markReplayAvailable(fightId);
|
} catch (Exception e) {
|
||||||
|
Bukkit.getLogger().log(Level.INFO, "Failed to save replay", e);
|
||||||
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Bukkit.getLogger().log(Level.SEVERE, "Failed to save statistics", e);
|
Bukkit.getLogger().log(Level.SEVERE, "Failed to save statistics", e);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,7 +45,6 @@ public class Hull {
|
|||||||
return material.isOccluding() || Config.HiddenBlocks.contains(material);
|
return material.isOccluding() || Config.HiddenBlocks.contains(material);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Getter
|
|
||||||
private final Region region;
|
private final Region region;
|
||||||
private final boolean groundVisible;
|
private final boolean groundVisible;
|
||||||
private final IntVector[] directions;
|
private final IntVector[] directions;
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ import de.steamwar.fightsystem.states.StateDependent;
|
|||||||
import de.steamwar.fightsystem.states.StateDependentListener;
|
import de.steamwar.fightsystem.states.StateDependentListener;
|
||||||
import de.steamwar.fightsystem.states.StateDependentTask;
|
import de.steamwar.fightsystem.states.StateDependentTask;
|
||||||
import de.steamwar.techhider.TechHider;
|
import de.steamwar.techhider.TechHider;
|
||||||
import lombok.Getter;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
@@ -57,7 +56,6 @@ import java.util.function.Function;
|
|||||||
|
|
||||||
public class HullHider implements Listener {
|
public class HullHider implements Listener {
|
||||||
|
|
||||||
@Getter
|
|
||||||
private final Map<FightTeam, Hull> hullMap = new HashMap<>();
|
private final Map<FightTeam, Hull> hullMap = new HashMap<>();
|
||||||
private final Hull[] hulls;
|
private final Hull[] hulls;
|
||||||
private final Map<Class<?>, BiFunction<Player, Object, Object>> packetHiders = new HashMap<>();
|
private final Map<Class<?>, BiFunction<Player, Object, Object>> packetHiders = new HashMap<>();
|
||||||
|
|||||||
@@ -159,9 +159,4 @@ public class Region {
|
|||||||
public interface TriConsumer<T, V, U>{
|
public interface TriConsumer<T, V, U>{
|
||||||
void accept(T x, V y, U z);
|
void accept(T x, V y, U z);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return minX + "," + minY + "," + minZ + "->" + maxX + "," + maxY + "," + maxZ;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,8 +32,6 @@ import de.steamwar.fightsystem.states.StateDependent;
|
|||||||
import de.steamwar.fightsystem.states.StateDependentListener;
|
import de.steamwar.fightsystem.states.StateDependentListener;
|
||||||
import de.steamwar.sql.SteamwarUser;
|
import de.steamwar.sql.SteamwarUser;
|
||||||
import de.steamwar.techhider.TechHider;
|
import de.steamwar.techhider.TechHider;
|
||||||
import lombok.Getter;
|
|
||||||
import org.bukkit.GameMode;
|
|
||||||
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;
|
||||||
@@ -52,7 +50,6 @@ public class TechHiderWrapper extends StateDependent implements TechHider.Locati
|
|||||||
|
|
||||||
public static final boolean ENABLED = !Config.OnlyPublicSchematics && !Config.test() && Config.TechhiderActive;
|
public static final boolean ENABLED = !Config.OnlyPublicSchematics && !Config.test() && Config.TechhiderActive;
|
||||||
|
|
||||||
@Getter
|
|
||||||
private final ConcurrentHashMap<Player, Region> hiddenRegion = new ConcurrentHashMap<>();
|
private final ConcurrentHashMap<Player, Region> hiddenRegion = new ConcurrentHashMap<>();
|
||||||
private final ConcurrentHashMap<Player, Long> patterns = new ConcurrentHashMap<>();
|
private final ConcurrentHashMap<Player, Long> patterns = new ConcurrentHashMap<>();
|
||||||
private final TechHider techHider;
|
private final TechHider techHider;
|
||||||
@@ -117,11 +114,6 @@ public class TechHiderWrapper extends StateDependent implements TechHider.Locati
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean suppressInteractions(Player player) {
|
|
||||||
return player.getGameMode() == GameMode.SPECTATOR;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean skipChunk(Player player, int chunkX, int chunkZ) {
|
public boolean skipChunk(Player player, int chunkX, int chunkZ) {
|
||||||
return getHiddenRegion(player).chunkOutside(chunkX, chunkZ);
|
return getHiddenRegion(player).chunkOutside(chunkX, chunkZ);
|
||||||
|
|||||||
@@ -27,5 +27,4 @@ commands:
|
|||||||
resettb:
|
resettb:
|
||||||
tpslimit:
|
tpslimit:
|
||||||
tpswarp:
|
tpswarp:
|
||||||
techhiderbug:
|
|
||||||
unrank:
|
unrank:
|
||||||
@@ -39,13 +39,3 @@ dependencies {
|
|||||||
implementation(project(":FightSystem:FightSystem_20"))
|
implementation(project(":FightSystem:FightSystem_20"))
|
||||||
implementation(project(":FightSystem:FightSystem_21"))
|
implementation(project(":FightSystem:FightSystem_21"))
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.register<FightServer>("WarGear20") {
|
|
||||||
group = "run"
|
|
||||||
description = "Run a WarGear 1.20 Fight Server"
|
|
||||||
dependsOn(":SpigotCore:shadowJar")
|
|
||||||
dependsOn(":FightSystem:shadowJar")
|
|
||||||
template = "WarGear20"
|
|
||||||
worldName = "arenas/Pentraki"
|
|
||||||
config = "WarGear20.yml"
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* This file is a part of the SteamWar software.
|
* This file is a part of the SteamWar software.
|
||||||
*
|
*
|
||||||
* Copyright (C) 2024 SteamWar.de-Serverteam
|
* Copyright (C) 2024 SteamWar.de-Serverteam
|
||||||
*
|
*
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
|||||||
@@ -1,42 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2025 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.kotlin
|
|
||||||
|
|
||||||
import de.steamwar.inventory.SWInventory
|
|
||||||
import org.bukkit.entity.Player
|
|
||||||
import org.bukkit.event.inventory.InventoryClickEvent
|
|
||||||
import org.bukkit.inventory.ItemStack
|
|
||||||
|
|
||||||
abstract class KotlinInventory(val player: Player) {
|
|
||||||
|
|
||||||
private val inv: SWInventory by lazy { createInventory() }
|
|
||||||
|
|
||||||
abstract fun createInventory(): SWInventory
|
|
||||||
|
|
||||||
fun open() = inv.open()
|
|
||||||
|
|
||||||
operator fun set(slot: Int, item: Pair<ItemStack, (event: InventoryClickEvent) -> Unit>) {
|
|
||||||
inv.setItemEvent(slot, item.first, item.second)
|
|
||||||
}
|
|
||||||
|
|
||||||
operator fun set(slot: Int, item: ItemStack) {
|
|
||||||
inv.setItemEvent(slot, item) { }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
/*
|
||||||
|
* This file is a part of the SteamWar software.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2024 SteamWar.de-Serverteam
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package de.steamwar.kotlin.inventory
|
||||||
|
|
||||||
|
import org.bukkit.event.inventory.InventoryClickEvent
|
||||||
|
import org.bukkit.event.inventory.InventoryCloseEvent
|
||||||
|
import org.bukkit.inventory.Inventory
|
||||||
|
import org.bukkit.inventory.InventoryHolder
|
||||||
|
import org.bukkit.inventory.ItemStack
|
||||||
|
|
||||||
|
abstract class SWInventoryHolder: InventoryHolder {
|
||||||
|
|
||||||
|
val _inventory: Inventory by lazy { createInventory() }
|
||||||
|
|
||||||
|
private val callbacks = mutableMapOf<Int, (event: InventoryClickEvent) -> Unit>()
|
||||||
|
|
||||||
|
override fun getInventory(): Inventory = _inventory
|
||||||
|
|
||||||
|
abstract fun createInventory(): Inventory
|
||||||
|
|
||||||
|
open fun handleInventoryClick(event: InventoryClickEvent) {
|
||||||
|
callbacks[event.slot]?.invoke(event)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun addItem(item: ItemStack, slot: Int, callback: (event: InventoryClickEvent) -> Unit) {
|
||||||
|
_inventory.setItem(slot, item)
|
||||||
|
addCallback(slot, callback)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun addCallback(slot: Int, callback: (event: InventoryClickEvent) -> Unit) {
|
||||||
|
callbacks[slot] = callback
|
||||||
|
}
|
||||||
|
|
||||||
|
open fun handleClose(event: InventoryCloseEvent) { }
|
||||||
|
|
||||||
|
operator fun set(slot: Int, item: Pair<ItemStack, (event: InventoryClickEvent) -> Unit>) {
|
||||||
|
addItem(item.first, slot, item.second)
|
||||||
|
}
|
||||||
|
|
||||||
|
operator fun set(slot: Int, item: ItemStack) {
|
||||||
|
addItem(item, slot) { }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2024 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
plugins {
|
|
||||||
steamwar.java
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
compileOnly(project(":SpigotCore", "default"))
|
|
||||||
|
|
||||||
compileOnly(libs.nms12)
|
|
||||||
compileOnly(libs.worldedit12)
|
|
||||||
}
|
|
||||||
@@ -1,197 +0,0 @@
|
|||||||
/*
|
|
||||||
This file is a part of the SteamWar software.
|
|
||||||
|
|
||||||
Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.commands.*;
|
|
||||||
import de.steamwar.bausystem.world.*;
|
|
||||||
import de.steamwar.bausystem.world.regions.Region;
|
|
||||||
import de.steamwar.core.Core;
|
|
||||||
import de.steamwar.providers.BauServerInfo;
|
|
||||||
import de.steamwar.scoreboard.SWScoreboard;
|
|
||||||
import de.steamwar.sql.SteamwarUser;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.enchantments.Enchantment;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.EventHandler;
|
|
||||||
import org.bukkit.event.Listener;
|
|
||||||
import org.bukkit.event.entity.PlayerDeathEvent;
|
|
||||||
import org.bukkit.event.inventory.InventoryClickEvent;
|
|
||||||
import org.bukkit.event.player.PlayerLoginEvent;
|
|
||||||
import org.bukkit.event.player.PlayerQuitEvent;
|
|
||||||
import org.bukkit.inventory.ItemStack;
|
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
|
||||||
import org.bukkit.scheduler.BukkitTask;
|
|
||||||
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.logging.Level;
|
|
||||||
|
|
||||||
public class BauSystem extends JavaPlugin implements Listener {
|
|
||||||
|
|
||||||
private static BauSystem plugin;
|
|
||||||
private static Integer owner;
|
|
||||||
public static final String PREFIX = "§eBauSystem§8» §7";
|
|
||||||
|
|
||||||
private BukkitTask autoShutdown;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onEnable() {
|
|
||||||
plugin = this;
|
|
||||||
|
|
||||||
Mapper.init();
|
|
||||||
|
|
||||||
new CommandTrace();
|
|
||||||
new CommandTPSLimiter();
|
|
||||||
new CommandNV();
|
|
||||||
new CommandReset();
|
|
||||||
new CommandSpeed();
|
|
||||||
new CommandTNT();
|
|
||||||
new CommandGamemode();
|
|
||||||
new CommandClear();
|
|
||||||
new CommandTime();
|
|
||||||
new CommandTeleport();
|
|
||||||
new CommandFire();
|
|
||||||
new CommandFreeze();
|
|
||||||
new CommandTestblock();
|
|
||||||
new CommandInfo();
|
|
||||||
new CommandProtect();
|
|
||||||
new CommandSkull();
|
|
||||||
new CommandLoader();
|
|
||||||
new CommandLockschem();
|
|
||||||
new CommandDebugStick();
|
|
||||||
new CommandGills();
|
|
||||||
new CommandDetonator();
|
|
||||||
new CommandScript();
|
|
||||||
new CommandScriptVars();
|
|
||||||
new CommandRedstoneTester();
|
|
||||||
new CommandGUI();
|
|
||||||
new CommandWorldSpawn();
|
|
||||||
new CommandRegion();
|
|
||||||
new CommandSelect();
|
|
||||||
new CommandKillAll();
|
|
||||||
|
|
||||||
if (Core.getVersion() > 14 && Region.buildAreaEnabled()) {
|
|
||||||
new CommandColor();
|
|
||||||
}
|
|
||||||
|
|
||||||
Bukkit.getPluginManager().registerEvents(this, this);
|
|
||||||
Bukkit.getPluginManager().registerEvents(new RegionListener(), this);
|
|
||||||
Bukkit.getPluginManager().registerEvents(new ScriptListener(), this);
|
|
||||||
Bukkit.getPluginManager().registerEvents(new BauScoreboard(), this);
|
|
||||||
Bukkit.getPluginManager().registerEvents(new ClipboardListener(), this);
|
|
||||||
Bukkit.getPluginManager().registerEvents(new CommandGUI(), this);
|
|
||||||
Bukkit.getPluginManager().registerEvents(new DetonatorListener(), this);
|
|
||||||
Bukkit.getPluginManager().registerEvents(new ItemFrameListener(), this);
|
|
||||||
new AFKStopper();
|
|
||||||
|
|
||||||
autoShutdown = Bukkit.getScheduler().runTaskLater(this, Bukkit::shutdown, 1200);
|
|
||||||
TPSUtils.init();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDisable() {
|
|
||||||
Region.save();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static BauSystem getPlugin() {
|
|
||||||
return plugin;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static UUID getOwner() {
|
|
||||||
return SteamwarUser.get(getOwnerID()).getUUID();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static int getOwnerID() {
|
|
||||||
//Lazy loading to improve startup time of the server in 1.15
|
|
||||||
if (owner == null) {
|
|
||||||
owner = BauServerInfo.getOwnerId();
|
|
||||||
}
|
|
||||||
return owner;
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onDeath(PlayerDeathEvent e) {
|
|
||||||
e.setDeathMessage(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onJoin(PlayerLoginEvent e) {
|
|
||||||
if (autoShutdown != null) {
|
|
||||||
autoShutdown.cancel();
|
|
||||||
autoShutdown = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
Player p = e.getPlayer();
|
|
||||||
p.setOp(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onLeave(PlayerQuitEvent e) {
|
|
||||||
Player p = e.getPlayer();
|
|
||||||
SWScoreboard.impl.removeScoreboard(p);
|
|
||||||
if (Bukkit.getOnlinePlayers().isEmpty() || (Bukkit.getOnlinePlayers().size() == 1 && Bukkit.getOnlinePlayers().contains(p))) {
|
|
||||||
if (autoShutdown != null) {
|
|
||||||
autoShutdown.cancel();
|
|
||||||
}
|
|
||||||
CommandTPSLimiter.setTPS(20.0);
|
|
||||||
autoShutdown = Bukkit.getScheduler().runTaskTimer(this, new Runnable() {
|
|
||||||
int count = 0;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
if (count >= 300) {
|
|
||||||
Bukkit.shutdown();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
count++;
|
|
||||||
try {
|
|
||||||
if (RamUsage.getUsage() > 0.8) {
|
|
||||||
Bukkit.shutdown();
|
|
||||||
}
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
Bukkit.getLogger().log(Level.WARNING, throwable.getMessage(), throwable);
|
|
||||||
Bukkit.shutdown();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, 20, 20);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onInventoryClick(InventoryClickEvent e) {
|
|
||||||
ItemStack stack = e.getCursor();
|
|
||||||
if (stack == null || !stack.hasItemMeta())
|
|
||||||
return;
|
|
||||||
assert stack.getItemMeta() != null;
|
|
||||||
if (stack.getItemMeta().hasEnchants()) {
|
|
||||||
for (Enchantment en : Enchantment.values()) {
|
|
||||||
if (stack.getEnchantmentLevel(en) > en.getMaxLevel())
|
|
||||||
stack.removeEnchantment(en);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Material material = stack.getType();
|
|
||||||
if (material == Material.POTION || material == Material.SPLASH_POTION || material == Material.LINGERING_POTION) {
|
|
||||||
stack.setType(Material.MILK_BUCKET);
|
|
||||||
}
|
|
||||||
|
|
||||||
e.setCurrentItem(stack);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2021 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.tracer.AbstractTraceEntity;
|
|
||||||
import de.steamwar.core.VersionDependent;
|
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.World;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.util.Vector;
|
|
||||||
|
|
||||||
public class CraftbukkitWrapper {
|
|
||||||
private CraftbukkitWrapper() {}
|
|
||||||
|
|
||||||
public static final ICraftbukkitWrapper impl = VersionDependent.getVersionImpl(BauSystem.getPlugin());
|
|
||||||
|
|
||||||
public interface ICraftbukkitWrapper {
|
|
||||||
void initTPS();
|
|
||||||
void createTickCache(World world);
|
|
||||||
void sendTickPackets();
|
|
||||||
|
|
||||||
void openSignEditor(Player player, Location location);
|
|
||||||
|
|
||||||
AbstractTraceEntity create(World world, Vector tntPosition, boolean tnt);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,80 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2021 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.tracer.AbstractTraceEntity;
|
|
||||||
import de.steamwar.bausystem.world.TPSUtils;
|
|
||||||
import net.minecraft.server.v1_12_R1.*;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.World;
|
|
||||||
import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity;
|
|
||||||
import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.entity.TNTPrimed;
|
|
||||||
import org.bukkit.util.Vector;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class CraftbukkitWrapper12 implements CraftbukkitWrapper.ICraftbukkitWrapper {
|
|
||||||
|
|
||||||
private final List<Packet<?>> packets = new ArrayList<>();
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void initTPS() {
|
|
||||||
TPSUtils.disableWarp();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void createTickCache(World world) {
|
|
||||||
packets.clear();
|
|
||||||
world.getEntities().stream().filter(entity -> !(entity instanceof Player)).forEach(entity -> {
|
|
||||||
packets.add(new PacketPlayOutEntityVelocity(entity.getEntityId(), 0, 0, 0));
|
|
||||||
packets.add(new PacketPlayOutEntityTeleport(((CraftEntity) entity).getHandle()));
|
|
||||||
|
|
||||||
if (entity instanceof TNTPrimed) {
|
|
||||||
net.minecraft.server.v1_12_R1.Entity serverEntity = ((CraftEntity) entity).getHandle();
|
|
||||||
packets.add(new PacketPlayOutEntityMetadata(serverEntity.getId(), serverEntity.getDataWatcher(), true));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void sendTickPackets() {
|
|
||||||
Bukkit.getOnlinePlayers().forEach(player -> {
|
|
||||||
PlayerConnection connection = ((CraftPlayer) player).getHandle().playerConnection;
|
|
||||||
for (Packet<?> p : packets) {
|
|
||||||
connection.sendPacket(p);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void openSignEditor(Player player, Location location) {
|
|
||||||
PacketPlayOutOpenSignEditor packet = new PacketPlayOutOpenSignEditor(new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()));
|
|
||||||
((CraftPlayer) player).getHandle().playerConnection.sendPacket(packet);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AbstractTraceEntity create(World world, Vector tntPosition, boolean tnt) {
|
|
||||||
return new TraceEntity12(world, tntPosition, tnt);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2021 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.world.Detoloader;
|
|
||||||
import de.steamwar.core.VersionDependent;
|
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.World;
|
|
||||||
import org.bukkit.block.Block;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
|
||||||
import org.bukkit.inventory.ItemStack;
|
|
||||||
import org.bukkit.util.Vector;
|
|
||||||
|
|
||||||
public class FlatteningWrapper {
|
|
||||||
private FlatteningWrapper(){}
|
|
||||||
|
|
||||||
public static final IFlatteningWrapper impl = VersionDependent.getVersionImpl(BauSystem.getPlugin());
|
|
||||||
|
|
||||||
public interface IFlatteningWrapper {
|
|
||||||
boolean tntPlaceActionPerform(Location location);
|
|
||||||
boolean setRedstone(Location location, boolean active);
|
|
||||||
Detoloader onPlayerInteractLoader(PlayerInteractEvent event);
|
|
||||||
boolean getLever(Block block);
|
|
||||||
|
|
||||||
boolean isNoBook(ItemStack item);
|
|
||||||
|
|
||||||
boolean inWater(World world, Vector tntPosition);
|
|
||||||
Material getTraceShowMaterial();
|
|
||||||
Material getTraceHideMaterial();
|
|
||||||
Material getTraceXZMaterial();
|
|
||||||
|
|
||||||
void giveStick(Player player);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,148 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2021 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.world.Detoloader;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.Location;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.World;
|
|
||||||
import org.bukkit.block.Block;
|
|
||||||
import org.bukkit.entity.ArmorStand;
|
|
||||||
import org.bukkit.entity.Entity;
|
|
||||||
import org.bukkit.entity.EntityType;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
|
||||||
import org.bukkit.inventory.ItemStack;
|
|
||||||
import org.bukkit.util.Vector;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
public class FlatteningWrapper12 implements FlatteningWrapper.IFlatteningWrapper {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean tntPlaceActionPerform(Location location) {
|
|
||||||
Material m = location.getBlock().getType();
|
|
||||||
if (m != Material.AIR && m != Material.STATIONARY_WATER && m != Material.WATER)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
location.getBlock().setType(Material.TNT);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
@SuppressWarnings("deprecation")
|
|
||||||
public boolean setRedstone(Location location, boolean active) {
|
|
||||||
Block block = location.getBlock();
|
|
||||||
Material material = block.getType();
|
|
||||||
if (material == Material.LEVER || material == Material.STONE_BUTTON || material == Material.WOOD_BUTTON) {
|
|
||||||
if (active)
|
|
||||||
block.setData((byte) (block.getData() | 8));
|
|
||||||
else
|
|
||||||
block.setData((byte) (block.getData() & -9));
|
|
||||||
} else if (material == Material.STONE_PLATE || material == Material.WOOD_PLATE) {
|
|
||||||
if (active)
|
|
||||||
block.setData((byte) 1);
|
|
||||||
else
|
|
||||||
block.setData((byte) 0);
|
|
||||||
} else if (material == Material.TRIPWIRE) {
|
|
||||||
if (active) {
|
|
||||||
ArmorStand armorStand = (ArmorStand) Bukkit.getWorlds().get(0).spawnEntity(location, EntityType.ARMOR_STAND);
|
|
||||||
armorStand.setVisible(false);
|
|
||||||
armorStand.setBasePlate(false);
|
|
||||||
armorStand.addScoreboardTag("detonator-" + location.getBlockX() + location.getBlockY() + location.getBlockZ());
|
|
||||||
} else {
|
|
||||||
List<Entity> entityList = Bukkit.getWorlds().get(0).getEntitiesByClasses(ArmorStand.class).stream().filter(entity ->
|
|
||||||
entity.getScoreboardTags().contains("detonator-" + location.getBlockX() + location.getBlockY() + location.getBlockZ()))
|
|
||||||
.limit(1)
|
|
||||||
.collect(Collectors.toList());
|
|
||||||
if (entityList.isEmpty()) return false;
|
|
||||||
entityList.get(0).remove();
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
block.getState().update(true);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
@SuppressWarnings("deprecation")
|
|
||||||
public Detoloader onPlayerInteractLoader(PlayerInteractEvent event) {
|
|
||||||
Block block = event.getClickedBlock();
|
|
||||||
Material material = block.getType();
|
|
||||||
if (material == Material.LEVER) {
|
|
||||||
if ((block.getData() & 8) == 8) {
|
|
||||||
return new Detoloader("Hebel", 0).setActive(false);
|
|
||||||
} else {
|
|
||||||
return new Detoloader("Hebel", 0).setActive(true);
|
|
||||||
}
|
|
||||||
} else if (material == Material.STONE_BUTTON) {
|
|
||||||
return new Detoloader("Knopf", Detoloader.STONE_BUTTON);
|
|
||||||
} else if (material == Material.WOOD_BUTTON) {
|
|
||||||
return new Detoloader("Knopf", Detoloader.WOODEN_BUTTON);
|
|
||||||
} else if (material == Material.NOTE_BLOCK) {
|
|
||||||
return new Detoloader("Noteblock", Detoloader.NOTE_BLOCK);
|
|
||||||
} else if (material == Material.STONE_PLATE || material == Material.WOOD_PLATE) {
|
|
||||||
return new Detoloader("Druckplatte", Detoloader.PRESSURE_PLATE);
|
|
||||||
} else if (material == Material.TRIPWIRE) {
|
|
||||||
return new Detoloader("Tripwire", Detoloader.TRIPWIRE);
|
|
||||||
}
|
|
||||||
return new Detoloader("§eUnbekannter Block betätigt (nicht aufgenommen)", -1).setAddBack(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
@SuppressWarnings("deprecation")
|
|
||||||
public boolean getLever(Block block) {
|
|
||||||
return (block.getData() & 8) == 8;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isNoBook(ItemStack item) {
|
|
||||||
return item.getType() != Material.BOOK_AND_QUILL && item.getType() != Material.WRITTEN_BOOK;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean inWater(World world, Vector tntPosition) {
|
|
||||||
Material material = world.getBlockAt(tntPosition.getBlockX(), tntPosition.getBlockY(), tntPosition.getBlockZ()).getType();
|
|
||||||
return material == Material.WATER || material == Material.STATIONARY_WATER;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Material getTraceShowMaterial() {
|
|
||||||
return Material.CONCRETE;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Material getTraceHideMaterial() {
|
|
||||||
return Material.CONCRETE;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Material getTraceXZMaterial() {
|
|
||||||
return Material.STEP;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void giveStick(Player player) {
|
|
||||||
player.sendMessage(BauSystem.PREFIX + "§cDen Debugstick gibt es nicht in der 1.12.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.tracer.show.ShowModeParameterType;
|
|
||||||
import de.steamwar.command.SWCommandUtils;
|
|
||||||
import de.steamwar.command.TypeMapper;
|
|
||||||
import de.steamwar.sql.BauweltMember;
|
|
||||||
import de.steamwar.sql.SteamwarUser;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
|
|
||||||
public class Mapper {
|
|
||||||
|
|
||||||
private Mapper() {
|
|
||||||
throw new IllegalStateException("Utility Class");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void init() {
|
|
||||||
SWCommandUtils.addMapper(ShowModeParameterType.class, showModeParameterTypesTypeMapper());
|
|
||||||
SWCommandUtils.addMapper(BauweltMember.class, bauweltMemberTypeMapper());
|
|
||||||
}
|
|
||||||
|
|
||||||
private static TypeMapper<ShowModeParameterType> showModeParameterTypesTypeMapper() {
|
|
||||||
Map<String, ShowModeParameterType> showModeParameterTypesMap = new HashMap<>();
|
|
||||||
showModeParameterTypesMap.put("-water", ShowModeParameterType.WATER);
|
|
||||||
|
|
||||||
showModeParameterTypesMap.put("-interpolatey", ShowModeParameterType.INTERPOLATE_Y);
|
|
||||||
showModeParameterTypesMap.put("-interpolate-y", ShowModeParameterType.INTERPOLATE_Y);
|
|
||||||
showModeParameterTypesMap.put("-interpolate_y", ShowModeParameterType.INTERPOLATE_Y);
|
|
||||||
showModeParameterTypesMap.put("-y", ShowModeParameterType.INTERPOLATE_Y);
|
|
||||||
|
|
||||||
showModeParameterTypesMap.put("-interpolatex", ShowModeParameterType.INTERPOLATE_XZ);
|
|
||||||
showModeParameterTypesMap.put("-interpolate-x", ShowModeParameterType.INTERPOLATE_XZ);
|
|
||||||
showModeParameterTypesMap.put("-interpolate_x", ShowModeParameterType.INTERPOLATE_XZ);
|
|
||||||
showModeParameterTypesMap.put("-x", ShowModeParameterType.INTERPOLATE_XZ);
|
|
||||||
|
|
||||||
showModeParameterTypesMap.put("-interpolatez", ShowModeParameterType.INTERPOLATE_XZ);
|
|
||||||
showModeParameterTypesMap.put("-interpolate-z", ShowModeParameterType.INTERPOLATE_XZ);
|
|
||||||
showModeParameterTypesMap.put("-interpolate_z", ShowModeParameterType.INTERPOLATE_XZ);
|
|
||||||
showModeParameterTypesMap.put("-z", ShowModeParameterType.INTERPOLATE_XZ);
|
|
||||||
|
|
||||||
showModeParameterTypesMap.put("-interpolatexz", ShowModeParameterType.INTERPOLATE_XZ);
|
|
||||||
showModeParameterTypesMap.put("-interpolate-xz", ShowModeParameterType.INTERPOLATE_XZ);
|
|
||||||
showModeParameterTypesMap.put("-interpolate_xz", ShowModeParameterType.INTERPOLATE_XZ);
|
|
||||||
showModeParameterTypesMap.put("-xz", ShowModeParameterType.INTERPOLATE_XZ);
|
|
||||||
|
|
||||||
showModeParameterTypesMap.put("-advanced", ShowModeParameterType.ADVANCED);
|
|
||||||
showModeParameterTypesMap.put("-a", ShowModeParameterType.ADVANCED);
|
|
||||||
showModeParameterTypesMap.put("advanced", ShowModeParameterType.ADVANCED);
|
|
||||||
showModeParameterTypesMap.put("a", ShowModeParameterType.ADVANCED);
|
|
||||||
|
|
||||||
List<String> tabCompletes = new ArrayList<>(showModeParameterTypesMap.keySet());
|
|
||||||
return SWCommandUtils.createMapper(s -> showModeParameterTypesMap.getOrDefault(s, null), s -> tabCompletes);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static TypeMapper<BauweltMember> bauweltMemberTypeMapper() {
|
|
||||||
return SWCommandUtils.createMapper(s -> BauweltMember.getMembers(BauSystem.getOwnerID())
|
|
||||||
.stream()
|
|
||||||
.filter(m -> SteamwarUser.get(m.getMemberID()).getUserName().equals(s)).findFirst().orElse(null),
|
|
||||||
s -> BauweltMember.getMembers(BauSystem.getOwnerID())
|
|
||||||
.stream()
|
|
||||||
.map(m -> SteamwarUser.get(m.getMemberID()).getUserName())
|
|
||||||
.collect(Collectors.toList()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
/*
|
|
||||||
This file is a part of the SteamWar software.
|
|
||||||
|
|
||||||
Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem;
|
|
||||||
|
|
||||||
public enum Permission {
|
|
||||||
WORLD,
|
|
||||||
WORLDEDIT,
|
|
||||||
MEMBER
|
|
||||||
}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
|
|
||||||
import java.lang.management.ManagementFactory;
|
|
||||||
import java.util.logging.Level;
|
|
||||||
|
|
||||||
public class RamUsage {
|
|
||||||
|
|
||||||
private RamUsage() {
|
|
||||||
throw new IllegalStateException("Utility Class");
|
|
||||||
}
|
|
||||||
|
|
||||||
public static double getUsage() {
|
|
||||||
try {
|
|
||||||
long memorySize = ((com.sun.management.OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean()).getTotalPhysicalMemorySize();
|
|
||||||
long freeMemory = ((com.sun.management.OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean()).getFreePhysicalMemorySize();
|
|
||||||
return (memorySize - freeMemory) / (double) memorySize;
|
|
||||||
} catch (Throwable throwable) {
|
|
||||||
Bukkit.getLogger().log(Level.WARNING, throwable.getMessage(), throwable);
|
|
||||||
return 1D;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem;
|
|
||||||
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.ItemStack;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class SWUtils {
|
|
||||||
|
|
||||||
public static void giveItemToPlayer(Player player, ItemStack itemStack) {
|
|
||||||
if (itemStack == null || itemStack.getType() == Material.AIR) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
for (int i = 0; i < player.getInventory().getSize(); i++) {
|
|
||||||
ItemStack current = player.getInventory().getItem(i);
|
|
||||||
if (current != null && current.isSimilar(itemStack)) {
|
|
||||||
player.getInventory().setItem(i, null);
|
|
||||||
itemStack = current;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ItemStack current = player.getInventory().getItemInMainHand();
|
|
||||||
player.getInventory().setItemInMainHand(itemStack);
|
|
||||||
if (current.getType() != Material.AIR) {
|
|
||||||
player.getInventory().addItem(current);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static List<String> manageList(List<String> strings, String[] args, int index) {
|
|
||||||
strings = new ArrayList<>(strings);
|
|
||||||
for (int i = strings.size() - 1; i >= 0; i--) {
|
|
||||||
if (!strings.get(i).startsWith(args[index])) {
|
|
||||||
strings.remove(i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return strings;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static List<String> manageList(List<String> strings, String[] args) {
|
|
||||||
return manageList(strings, args, args.length - 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2021 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.tracer.AbstractTraceEntity;
|
|
||||||
import net.minecraft.server.v1_12_R1.*;
|
|
||||||
import org.bukkit.World;
|
|
||||||
import org.bukkit.craftbukkit.v1_12_R1.CraftWorld;
|
|
||||||
import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.util.Vector;
|
|
||||||
|
|
||||||
class TraceEntity12 extends EntityFallingBlock implements AbstractTraceEntity {
|
|
||||||
|
|
||||||
private boolean exploded;
|
|
||||||
private int references;
|
|
||||||
|
|
||||||
public TraceEntity12(World world, Vector position, boolean tnt) {
|
|
||||||
super(((CraftWorld) world).getHandle(), position.getX(), position.getY(), position.getZ(), tnt ? Blocks.TNT.getBlockData() : Blocks.STAINED_GLASS.getBlockData());
|
|
||||||
|
|
||||||
this.setNoGravity(true);
|
|
||||||
this.ticksLived = -12000;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void display(Player player, boolean exploded) {
|
|
||||||
if (!this.exploded && exploded) {
|
|
||||||
this.setCustomNameVisible(true);
|
|
||||||
this.setCustomName("Bumm");
|
|
||||||
this.exploded = true;
|
|
||||||
if (references++ > 0)
|
|
||||||
sendDestroy(player);
|
|
||||||
} else if (references++ > 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
PacketPlayOutSpawnEntity packetPlayOutSpawnEntity = new PacketPlayOutSpawnEntity(this, 70, Block.getCombinedId(getBlock()));
|
|
||||||
PlayerConnection playerConnection = ((CraftPlayer) player).getHandle().playerConnection;
|
|
||||||
playerConnection.sendPacket(packetPlayOutSpawnEntity);
|
|
||||||
|
|
||||||
PacketPlayOutEntityMetadata packetPlayOutEntityMetadata = new PacketPlayOutEntityMetadata(getId(), datawatcher, true);
|
|
||||||
playerConnection.sendPacket(packetPlayOutEntityMetadata);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean hide(Player player, boolean force) {
|
|
||||||
if (!force && --references > 0)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
sendDestroy(player);
|
|
||||||
die();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void sendDestroy(Player player) {
|
|
||||||
PacketPlayOutEntityDestroy packetPlayOutEntityDestroy = new PacketPlayOutEntityDestroy(getId());
|
|
||||||
((CraftPlayer) player).getHandle().playerConnection.sendPacket(packetPlayOutEntityDestroy);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2021 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem;
|
|
||||||
|
|
||||||
import com.sk89q.worldedit.EditSession;
|
|
||||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
|
||||||
import de.steamwar.bausystem.world.regions.PasteOptions;
|
|
||||||
import de.steamwar.bausystem.world.regions.Point;
|
|
||||||
import de.steamwar.core.VersionDependent;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
|
|
||||||
public class WorldeditWrapper {
|
|
||||||
private WorldeditWrapper() {}
|
|
||||||
|
|
||||||
public static final IWorldeditWrapper impl = VersionDependent.getVersionImpl(BauSystem.getPlugin());
|
|
||||||
|
|
||||||
public interface IWorldeditWrapper {
|
|
||||||
void setSelection(Player p, Point minPoint, Point maxPoint);
|
|
||||||
|
|
||||||
EditSession paste(File file, int x, int y, int z, PasteOptions pasteOptions);
|
|
||||||
EditSession paste(Clipboard clipboard, int x, int y, int z, PasteOptions pasteOptions);
|
|
||||||
|
|
||||||
boolean isWorldEditCommand(String command);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,114 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2021 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem;
|
|
||||||
|
|
||||||
import com.sk89q.worldedit.EditSession;
|
|
||||||
import com.sk89q.worldedit.MaxChangedBlocksException;
|
|
||||||
import com.sk89q.worldedit.Vector;
|
|
||||||
import com.sk89q.worldedit.WorldEdit;
|
|
||||||
import com.sk89q.worldedit.blocks.BaseBlock;
|
|
||||||
import com.sk89q.worldedit.blocks.BlockID;
|
|
||||||
import com.sk89q.worldedit.bukkit.BukkitWorld;
|
|
||||||
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
|
|
||||||
import com.sk89q.worldedit.extent.clipboard.Clipboard;
|
|
||||||
import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
|
|
||||||
import com.sk89q.worldedit.function.operation.Operations;
|
|
||||||
import com.sk89q.worldedit.math.transform.AffineTransform;
|
|
||||||
import com.sk89q.worldedit.regions.CuboidRegion;
|
|
||||||
import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
|
|
||||||
import com.sk89q.worldedit.session.ClipboardHolder;
|
|
||||||
import com.sk89q.worldedit.world.World;
|
|
||||||
import de.steamwar.bausystem.world.regions.PasteOptions;
|
|
||||||
import de.steamwar.bausystem.world.regions.Point;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileInputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
public class WorldeditWrapper12 implements WorldeditWrapper.IWorldeditWrapper {
|
|
||||||
|
|
||||||
private final WorldEditPlugin WORLDEDIT_PLUGIN = ((WorldEditPlugin) Bukkit.getPluginManager().getPlugin("WorldEdit"));
|
|
||||||
private final World BUKKITWORLD = new BukkitWorld(Bukkit.getWorlds().get(0));
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void setSelection(Player p, Point minPoint, Point maxPoint) {
|
|
||||||
WORLDEDIT_PLUGIN.getSession(p).setRegionSelector(BUKKITWORLD, new CuboidRegionSelector(BUKKITWORLD, toVector(minPoint), toVector(maxPoint)));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public EditSession paste(File file, int x, int y, int z, PasteOptions pasteOptions) {
|
|
||||||
World w = new BukkitWorld(Bukkit.getWorlds().get(0));
|
|
||||||
Clipboard clipboard;
|
|
||||||
try {
|
|
||||||
clipboard = Objects.requireNonNull(ClipboardFormat.findByFile(file)).getReader(new FileInputStream(file)).read(w.getWorldData());
|
|
||||||
} catch (NullPointerException | IOException e) {
|
|
||||||
throw new SecurityException("Bausystem schematic not found", e);
|
|
||||||
}
|
|
||||||
|
|
||||||
return paste(clipboard, x, y, z, pasteOptions);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public EditSession paste(Clipboard clipboard, int x, int y, int z, PasteOptions pasteOptions) {
|
|
||||||
World w = new BukkitWorld(Bukkit.getWorlds().get(0));
|
|
||||||
|
|
||||||
Vector dimensions = clipboard.getDimensions();
|
|
||||||
Vector v = new Vector(x, y, z);
|
|
||||||
Vector offset = clipboard.getRegion().getMinimumPoint().subtract(clipboard.getOrigin());
|
|
||||||
AffineTransform aT = new AffineTransform();
|
|
||||||
if (pasteOptions.isRotate()) {
|
|
||||||
aT = aT.rotateY(180);
|
|
||||||
v = v.add(dimensions.getX() / 2 + dimensions.getX() % 2, 0, dimensions.getZ() / 2 + dimensions.getZ() % 2).subtract(offset.multiply(-1, 1, -1)).subtract(1, 0, 1);
|
|
||||||
} else {
|
|
||||||
v = v.subtract(dimensions.getX() / 2 - dimensions.getX() % 2, 0, dimensions.getZ() / 2 - dimensions.getZ() % 2).subtract(offset);
|
|
||||||
}
|
|
||||||
|
|
||||||
EditSession e = WorldEdit.getInstance().getEditSessionFactory().getEditSession(w, -1);
|
|
||||||
ClipboardHolder ch = new ClipboardHolder(clipboard, w.getWorldData());
|
|
||||||
ch.setTransform(aT);
|
|
||||||
|
|
||||||
if (pasteOptions.isReset()) {
|
|
||||||
try {
|
|
||||||
e.setBlocks(new CuboidRegion(toVector(pasteOptions.getMinPoint()), toVector(pasteOptions.getMaxPoint())), new BaseBlock(BlockID.AIR));
|
|
||||||
} catch (MaxChangedBlocksException ex) {
|
|
||||||
throw new SecurityException("Max blocks changed?", ex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Operations.completeBlindly(ch.createPaste(e, w.getWorldData()).to(v).ignoreAirBlocks(pasteOptions.isIgnoreAir()).build());
|
|
||||||
return e;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isWorldEditCommand(String command) {
|
|
||||||
if (command.startsWith("/")) {
|
|
||||||
command = command.replaceFirst("/", "");
|
|
||||||
}
|
|
||||||
command = command.toLowerCase();
|
|
||||||
return ((WorldEditPlugin) Bukkit.getPluginManager().getPlugin("WorldEdit")).getWorldEdit().getPlatformManager()
|
|
||||||
.getCommandManager().getDispatcher().get(command) != null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Vector toVector(Point point) {
|
|
||||||
return Vector.toBlockPoint(point.getX(), point.getY(), point.getZ());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.commands;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.BauSystem;
|
|
||||||
import de.steamwar.bausystem.Permission;
|
|
||||||
import de.steamwar.bausystem.world.Welt;
|
|
||||||
import de.steamwar.command.SWCommand;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.inventory.ItemStack;
|
|
||||||
|
|
||||||
public class CommandClear extends SWCommand {
|
|
||||||
|
|
||||||
public CommandClear() {
|
|
||||||
super("clear");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register(help = true)
|
|
||||||
public void genericHelp(Player p, String... args) {
|
|
||||||
p.sendMessage("§8/§eclear §8- §7Leere dein Inventar");
|
|
||||||
p.sendMessage("§8/§ebau clear §8[§7Player§8] §8- §7Leere ein Spieler Inventar");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register
|
|
||||||
public void genericClearCommand(Player p) {
|
|
||||||
clear(p);
|
|
||||||
p.sendMessage(BauSystem.PREFIX + "Dein Inventar wurde geleert.");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register
|
|
||||||
public void clearPlayerCommand(Player p, Player target) {
|
|
||||||
if (!permissionCheck(p)) return;
|
|
||||||
clear(target);
|
|
||||||
target.sendMessage(BauSystem.PREFIX + "Dein Inventar wurde von " + p.getDisplayName() + " §7geleert.");
|
|
||||||
p.sendMessage(BauSystem.PREFIX + "Das Inventar von " + target.getDisplayName() + " §7wurde geleert.");
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean permissionCheck(Player player) {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD)) {
|
|
||||||
player.sendMessage(BauSystem.PREFIX + "§cDu darfst hier keine fremden Inventare leeren.");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void clear(Player player) {
|
|
||||||
player.getInventory().clear();
|
|
||||||
player.getInventory().setHelmet(new ItemStack(Material.AIR));
|
|
||||||
player.getInventory().setChestplate(new ItemStack(Material.AIR));
|
|
||||||
player.getInventory().setLeggings(new ItemStack(Material.AIR));
|
|
||||||
player.getInventory().setBoots(new ItemStack(Material.AIR));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
package de.steamwar.bausystem.commands;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.BauSystem;
|
|
||||||
import de.steamwar.bausystem.world.Color;
|
|
||||||
import de.steamwar.bausystem.world.regions.GlobalRegion;
|
|
||||||
import de.steamwar.bausystem.world.regions.Region;
|
|
||||||
import de.steamwar.command.SWCommand;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
|
|
||||||
public class CommandColor extends SWCommand {
|
|
||||||
|
|
||||||
private static CommandColor instance = null;
|
|
||||||
|
|
||||||
public CommandColor() {
|
|
||||||
super("color");
|
|
||||||
instance = this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static CommandColor getInstance() {
|
|
||||||
return instance;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register(help = true)
|
|
||||||
public void genericHelp(Player p, String... args) {
|
|
||||||
p.sendMessage("§8/§ecolor §8[§7Color§8] §8- §7Setze die Farbe der Region");
|
|
||||||
p.sendMessage("§8/§ecolor §8[§7Color§8] §8[§7Type§8] §8- §7Setze die Farbe der Region oder Global");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register
|
|
||||||
public void genericColor(Player p, Color color) {
|
|
||||||
genericColorSet(p, color, ColorizationType.LOCAL);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register
|
|
||||||
public void genericColorSet(Player p, Color color, ColorizationType colorizationType) {
|
|
||||||
if (!permissionCheck(p)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (colorizationType == ColorizationType.GLOBAL) {
|
|
||||||
Region.setGlobalColor(color);
|
|
||||||
p.sendMessage(BauSystem.PREFIX + "Alle Regions farben auf §e" + color.name().toLowerCase() + "§7 gesetzt");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
Region region = Region.getRegion(p.getLocation());
|
|
||||||
if (GlobalRegion.isGlobalRegion(region)) {
|
|
||||||
p.sendMessage(BauSystem.PREFIX + "§cDu befindest dich derzeit in keiner Region");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
region.setColor(color);
|
|
||||||
p.sendMessage(BauSystem.PREFIX + "Regions farben auf §e" + color.name().toLowerCase() + "§7 gesetzt");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register
|
|
||||||
public void genericColorSet(Player p, ColorizationType colorizationType, Color color) {
|
|
||||||
genericColorSet(p, color, colorizationType);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean permissionCheck(Player p) {
|
|
||||||
if (!BauSystem.getOwner().equals(p.getUniqueId())) {
|
|
||||||
p.sendMessage(BauSystem.PREFIX + "§cDies ist nicht deine Welt!");
|
|
||||||
return false;
|
|
||||||
} else {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum ColorizationType {
|
|
||||||
LOCAL,
|
|
||||||
GLOBAL
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.commands;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.FlatteningWrapper;
|
|
||||||
import de.steamwar.command.SWCommand;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
public class CommandDebugStick extends SWCommand {
|
|
||||||
|
|
||||||
public CommandDebugStick() {
|
|
||||||
super("debugstick");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register(help = true)
|
|
||||||
public void genericHelp(Player p, String... args) {
|
|
||||||
p.sendMessage("§8/§edebugstick §8- §7Erhalte einen DebugStick");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register
|
|
||||||
public void genericCommand(Player p) {
|
|
||||||
FlatteningWrapper.impl.giveStick(p);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,114 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.commands;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.BauSystem;
|
|
||||||
import de.steamwar.bausystem.Permission;
|
|
||||||
import de.steamwar.bausystem.SWUtils;
|
|
||||||
import de.steamwar.bausystem.world.Detonator;
|
|
||||||
import de.steamwar.bausystem.world.Welt;
|
|
||||||
import de.steamwar.command.SWCommand;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
public class CommandDetonator extends SWCommand {
|
|
||||||
|
|
||||||
public CommandDetonator() {
|
|
||||||
super ("detonator", "dt");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register(help = true)
|
|
||||||
public void genericHelp(Player p, String... args) {
|
|
||||||
p.sendMessage("§8/§edetonator wand §8- §7Legt den Fernzünder ins Inventar");
|
|
||||||
p.sendMessage("§8/§edetonator detonate §8- §7Benutzt den nächst besten Fernzünder");
|
|
||||||
p.sendMessage("§8/§edetonator reset §8- §7Löscht alle markierten Positionen");
|
|
||||||
p.sendMessage("§8/§edetonator remove §8- §7Entfernt den Fernzünder");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register("wand")
|
|
||||||
public void wandCommand(Player p) {
|
|
||||||
if (!permissionCheck(p)) return;
|
|
||||||
SWUtils.giveItemToPlayer(p, Detonator.WAND);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register("detonator")
|
|
||||||
public void detonatorCommand(Player p) {
|
|
||||||
if (!permissionCheck(p)) return;
|
|
||||||
SWUtils.giveItemToPlayer(p, Detonator.WAND);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register("item")
|
|
||||||
public void itemCommand(Player p) {
|
|
||||||
if (!permissionCheck(p)) return;
|
|
||||||
SWUtils.giveItemToPlayer(p, Detonator.WAND);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Register("remove")
|
|
||||||
public void removeCommand(Player p) {
|
|
||||||
if (!permissionCheck(p)) return;
|
|
||||||
p.getInventory().removeItem(Detonator.WAND);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Register("detonate")
|
|
||||||
public void detonateCommand(Player p) {
|
|
||||||
if (!permissionCheck(p)) return;
|
|
||||||
Detonator.execute(p);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register("click")
|
|
||||||
public void clickCommand(Player p) {
|
|
||||||
if (!permissionCheck(p)) return;
|
|
||||||
Detonator.execute(p);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register("use")
|
|
||||||
public void useCommand(Player p) {
|
|
||||||
if (!permissionCheck(p)) return;
|
|
||||||
Detonator.execute(p);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Register("clear")
|
|
||||||
public void clearCommand(Player p) {
|
|
||||||
if (!permissionCheck(p)) return;
|
|
||||||
Detonator.clear(p);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register("delete")
|
|
||||||
public void deleteCommand(Player p) {
|
|
||||||
if (!permissionCheck(p)) return;
|
|
||||||
Detonator.clear(p);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register("reset")
|
|
||||||
public void resetCommand(Player p) {
|
|
||||||
if (!permissionCheck(p)) return;
|
|
||||||
Detonator.clear(p);
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean permissionCheck(Player player) {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD)) {
|
|
||||||
player.sendMessage(BauSystem.PREFIX + "§cDu darfst hier nicht den Detonator nutzen");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,92 +0,0 @@
|
|||||||
/*
|
|
||||||
This file is a part of the SteamWar software.
|
|
||||||
|
|
||||||
Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.commands;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.BauSystem;
|
|
||||||
import de.steamwar.bausystem.Permission;
|
|
||||||
import de.steamwar.bausystem.world.regions.Region;
|
|
||||||
import de.steamwar.bausystem.world.Welt;
|
|
||||||
import de.steamwar.command.SWCommand;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.EventHandler;
|
|
||||||
import org.bukkit.event.Listener;
|
|
||||||
import org.bukkit.event.block.BlockBurnEvent;
|
|
||||||
import org.bukkit.event.block.BlockSpreadEvent;
|
|
||||||
|
|
||||||
public class CommandFire extends SWCommand implements Listener {
|
|
||||||
|
|
||||||
public CommandFire() {
|
|
||||||
super("fire");
|
|
||||||
Bukkit.getPluginManager().registerEvents(this, BauSystem.getPlugin());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register(help = true)
|
|
||||||
public void genericHelp(Player p, String... args) {
|
|
||||||
p.sendMessage("§8/§efire §8- §7Toggle Feuerschaden");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register
|
|
||||||
public void toggleCommand(Player p) {
|
|
||||||
if (!permissionCheck(p)) return;
|
|
||||||
Region region = Region.getRegion(p.getLocation());
|
|
||||||
if (toggle(region)) {
|
|
||||||
RegionUtils.actionBar(region, getEnableMessage());
|
|
||||||
} else {
|
|
||||||
RegionUtils.actionBar(region, getDisableMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getNoPermMessage() {
|
|
||||||
return "§cDu darfst hier nicht Feuerschaden (de-)aktivieren";
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getEnableMessage() {
|
|
||||||
return "§cRegions Feuerschaden deaktiviert";
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getDisableMessage() {
|
|
||||||
return "§aRegions Feuerschaden aktiviert";
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean toggle(Region region) {
|
|
||||||
region.setFire(!region.isFire());
|
|
||||||
return region.isFire();
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean permissionCheck(Player player) {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD)) {
|
|
||||||
player.sendMessage(BauSystem.PREFIX + getNoPermMessage());
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onFireDamage(BlockBurnEvent e) {
|
|
||||||
if (Region.getRegion(e.getBlock().getLocation()).isFire()) e.setCancelled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onFireSpread(BlockSpreadEvent e) {
|
|
||||||
if (Region.getRegion(e.getBlock().getLocation()).isFire()) e.setCancelled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,148 +0,0 @@
|
|||||||
/*
|
|
||||||
This file is a part of the SteamWar software.
|
|
||||||
|
|
||||||
Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU Affero General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU Affero General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.commands;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.BauSystem;
|
|
||||||
import de.steamwar.bausystem.Permission;
|
|
||||||
import de.steamwar.bausystem.world.regions.Region;
|
|
||||||
import de.steamwar.bausystem.world.Welt;
|
|
||||||
import de.steamwar.command.SWCommand;
|
|
||||||
import de.steamwar.core.Core;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.EntityType;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.EventHandler;
|
|
||||||
import org.bukkit.event.Listener;
|
|
||||||
import org.bukkit.event.block.*;
|
|
||||||
import org.bukkit.event.entity.EntityChangeBlockEvent;
|
|
||||||
import org.bukkit.event.entity.EntitySpawnEvent;
|
|
||||||
import org.bukkit.event.inventory.InventoryMoveItemEvent;
|
|
||||||
|
|
||||||
public class CommandFreeze extends SWCommand implements Listener {
|
|
||||||
|
|
||||||
public CommandFreeze() {
|
|
||||||
super("freeze", "stoplag");
|
|
||||||
Bukkit.getPluginManager().registerEvents(this, BauSystem.getPlugin());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register(help = true)
|
|
||||||
public void genericHelp(Player p, String... args) {
|
|
||||||
p.sendMessage("§8/§efreeze §8- §7Toggle Freeze");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register
|
|
||||||
public void toggleCommand(Player p) {
|
|
||||||
if (!permissionCheck(p)) return;
|
|
||||||
Region region = Region.getRegion(p.getLocation());
|
|
||||||
if (toggle(region)) {
|
|
||||||
RegionUtils.actionBar(region, getEnableMessage());
|
|
||||||
} else {
|
|
||||||
RegionUtils.actionBar(region, getDisableMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getNoPermMessage() {
|
|
||||||
return "§cDu darfst diese Welt nicht einfrieren";
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getEnableMessage(){
|
|
||||||
return "§cRegion eingefroren";
|
|
||||||
}
|
|
||||||
|
|
||||||
private String getDisableMessage(){
|
|
||||||
return "§aRegion aufgetaut";
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean toggle(Region region) {
|
|
||||||
region.setFreeze(!region.isFreeze());
|
|
||||||
return region.isFreeze();
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean permissionCheck(Player player) {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD)) {
|
|
||||||
player.sendMessage(BauSystem.PREFIX + getNoPermMessage());
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onEntitySpawn(EntitySpawnEvent e) {
|
|
||||||
if (!Region.getRegion(e.getLocation()).isFreeze()) return;
|
|
||||||
e.setCancelled(true);
|
|
||||||
if (e.getEntityType() == EntityType.PRIMED_TNT) {
|
|
||||||
Bukkit.getScheduler().runTaskLater(BauSystem.getPlugin(), () -> {
|
|
||||||
e.getLocation().getBlock().setType(Material.TNT, false);
|
|
||||||
}, 1L);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onBlockCanBuild(BlockCanBuildEvent e) {
|
|
||||||
if (Core.getVersion() == 12) return;
|
|
||||||
if (!e.isBuildable()) return;
|
|
||||||
if (!Region.getRegion(e.getBlock().getLocation()).isFreeze()) return;
|
|
||||||
if (e.getMaterial() == Material.TNT) {
|
|
||||||
e.setBuildable(false);
|
|
||||||
e.getBlock().setType(Material.TNT, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onEntityChangeBlock(EntityChangeBlockEvent e) {
|
|
||||||
if (Region.getRegion(e.getBlock().getLocation()).isFreeze()) e.setCancelled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onPhysicsEvent(BlockPhysicsEvent e){
|
|
||||||
if (Region.getRegion(e.getBlock().getLocation()).isFreeze()) e.setCancelled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onPistonExtend(BlockPistonExtendEvent e){
|
|
||||||
if (Region.getRegion(e.getBlock().getLocation()).isFreeze()) e.setCancelled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onPistonRetract(BlockPistonRetractEvent e){
|
|
||||||
if (Region.getRegion(e.getBlock().getLocation()).isFreeze()) e.setCancelled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onBlockGrow(BlockGrowEvent e){
|
|
||||||
if (Region.getRegion(e.getBlock().getLocation()).isFreeze()) e.setCancelled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onRedstoneEvent(BlockRedstoneEvent e) {
|
|
||||||
if (Region.getRegion(e.getBlock().getLocation()).isFreeze()) e.setNewCurrent(e.getOldCurrent());
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onBlockDispense(BlockDispenseEvent e) {
|
|
||||||
if (Region.getRegion(e.getBlock().getLocation()).isFreeze()) e.setCancelled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onInventoryMoveEvent(InventoryMoveItemEvent e){
|
|
||||||
if (Region.getRegion(e.getDestination().getLocation()).isFreeze()) e.setCancelled(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,530 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.commands;
|
|
||||||
|
|
||||||
import de.steamwar.bausystem.BauSystem;
|
|
||||||
import de.steamwar.bausystem.Permission;
|
|
||||||
import de.steamwar.bausystem.SWUtils;
|
|
||||||
import de.steamwar.bausystem.tracer.record.RecordStateMachine;
|
|
||||||
import de.steamwar.bausystem.tracer.show.TraceShowManager;
|
|
||||||
import de.steamwar.bausystem.world.*;
|
|
||||||
import de.steamwar.bausystem.world.regions.GlobalRegion;
|
|
||||||
import de.steamwar.bausystem.world.regions.Region;
|
|
||||||
import de.steamwar.command.SWCommand;
|
|
||||||
import de.steamwar.core.Core;
|
|
||||||
import de.steamwar.inventory.SWAnvilInv;
|
|
||||||
import de.steamwar.inventory.SWInventory;
|
|
||||||
import de.steamwar.inventory.SWItem;
|
|
||||||
import de.steamwar.inventory.SWListInv;
|
|
||||||
import de.steamwar.sql.BauweltMember;
|
|
||||||
import de.steamwar.sql.SteamwarUser;
|
|
||||||
import net.md_5.bungee.api.ChatColor;
|
|
||||||
import net.md_5.bungee.api.chat.ClickEvent;
|
|
||||||
import net.md_5.bungee.api.chat.HoverEvent;
|
|
||||||
import net.md_5.bungee.api.chat.TextComponent;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.EventHandler;
|
|
||||||
import org.bukkit.event.Listener;
|
|
||||||
import org.bukkit.event.block.Action;
|
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
|
||||||
import org.bukkit.event.player.PlayerSwapHandItemsEvent;
|
|
||||||
import org.bukkit.inventory.ItemStack;
|
|
||||||
import org.bukkit.inventory.meta.ItemMeta;
|
|
||||||
import org.bukkit.potion.PotionEffectType;
|
|
||||||
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
public class CommandGUI extends SWCommand implements Listener {
|
|
||||||
|
|
||||||
private static final Set<Player> OPEN_INVS = new HashSet<>();
|
|
||||||
private static final Set<Player> OPEN_TRACER_INVS = new HashSet<>();
|
|
||||||
private static final Set<Player> LAST_F_PLAYER = new HashSet<>();
|
|
||||||
private static boolean isRefreshing = false;
|
|
||||||
|
|
||||||
public CommandGUI() {
|
|
||||||
super("gui");
|
|
||||||
Bukkit.getScheduler().runTaskTimerAsynchronously(BauSystem.getPlugin(), LAST_F_PLAYER::clear, 0, 20);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register(help = true)
|
|
||||||
public void genericHelp(Player p, String... args) {
|
|
||||||
p.sendMessage("§8/§egui §8- §7Öffne die GUI");
|
|
||||||
p.sendMessage("§8/§egui item §8- §7Gebe das GUI item");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register
|
|
||||||
public void genericCommand(Player p) {
|
|
||||||
openBauGui(p);
|
|
||||||
OPEN_INVS.add(p);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register({"item"})
|
|
||||||
public void itemCommand(Player p) {
|
|
||||||
SWUtils.giveItemToPlayer(p, new ItemStack(Material.NETHER_STAR));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void openBauGui(Player player) {
|
|
||||||
Region region = Region.getRegion(player.getLocation());
|
|
||||||
SWInventory inv = new SWInventory(player, 5 * 9, SteamwarUser.get(BauSystem.getOwner()).getUserName() + "s Bau");
|
|
||||||
inv.setCallback(-1, clickType -> {
|
|
||||||
if (!isRefreshing)
|
|
||||||
OPEN_INVS.remove(player);
|
|
||||||
});
|
|
||||||
|
|
||||||
inv.setItem(43, getMaterial("GLASS_PANE", "THIN_GLASS"), "§7Platzhalter", clickType -> {
|
|
||||||
});
|
|
||||||
inv.setItem(42, Material.NETHER_STAR, "§7Bau GUI Item", Arrays.asList("§7Du kannst dieses Item zum Öffnen der BauGUI nutzen", "§7oder Doppel F (Swap hands) drücken."), false, clickType -> {
|
|
||||||
player.closeInventory();
|
|
||||||
player.performCommand("gui item");
|
|
||||||
});
|
|
||||||
|
|
||||||
ItemStack dtWand = wand(player, Detonator.WAND, "§8/§7dt wand", Permission.WORLD, "§cDu hast keine Worldrechte");
|
|
||||||
inv.setItem(39, dtWand, clickType -> {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD))
|
|
||||||
return;
|
|
||||||
player.closeInventory();
|
|
||||||
player.performCommand("dt wand");
|
|
||||||
});
|
|
||||||
|
|
||||||
ItemStack redstoneWand = wand(player, CommandRedstoneTester.WAND, "§8/§7redstonetester", null, "");
|
|
||||||
inv.setItem(37, redstoneWand, clickType -> {
|
|
||||||
player.closeInventory();
|
|
||||||
player.performCommand("redstonetester");
|
|
||||||
});
|
|
||||||
|
|
||||||
inv.setItem(40, getMaterial("WOODEN_AXE", "WOOD_AXE"), "§eWorldedit Axt", getNoPermsLore(Arrays.asList("§8//§7wand"), player, "§cDu hast keine Worldeditrechte", Permission.WORLDEDIT), false, clickType -> {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD))
|
|
||||||
return;
|
|
||||||
player.closeInventory();
|
|
||||||
player.performCommand("/wand");
|
|
||||||
});
|
|
||||||
inv.setItem(41, getMaterial("DEBUG_STICK", "STICK"), "§eDebugstick", getNoPermsLore(Arrays.asList("§8/§7debugstick"), player, "§cDu hast keine Worldrechte", Permission.WORLD), Core.getVersion() < 13, clickType -> {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD))
|
|
||||||
return;
|
|
||||||
player.closeInventory();
|
|
||||||
player.performCommand("debugstick");
|
|
||||||
});
|
|
||||||
|
|
||||||
inv.setItem(20, Material.COMPASS, "§7TPS Limitieren", getNoPermsLore(Arrays.asList("§7Aktuell: §e" + CommandTPSLimiter.getCurrentTPSLimit(), "§8/§7tpslimit §8[§e0,5 - " + (TPSUtils.isWarpAllowed() ? 40 : 20) + "§8]"), player, "§cDu hast keine Worldrechte", Permission.WORLD), false, clickType -> {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD))
|
|
||||||
return;
|
|
||||||
SWAnvilInv anvilInv = new SWAnvilInv(player, "TPS Limitieren");
|
|
||||||
anvilInv.setItem(Material.COMPASS);
|
|
||||||
anvilInv.setCallback(s -> player.performCommand("tpslimit " + s));
|
|
||||||
anvilInv.open();
|
|
||||||
});
|
|
||||||
inv.setItem(5, Material.FEATHER, "§7Geschwindigkeit", Arrays.asList("§7Aktuell: §e" + player.getFlySpeed() * 10, "§8/§7speed §8[§e1 - 10§8]"), false, clickType -> {
|
|
||||||
SWAnvilInv anvilInv = new SWAnvilInv(player, "Geschwindigkeit");
|
|
||||||
anvilInv.setItem(Material.FEATHER);
|
|
||||||
anvilInv.setCallback(s -> player.performCommand("speed " + s));
|
|
||||||
anvilInv.open();
|
|
||||||
});
|
|
||||||
|
|
||||||
if (player.getUniqueId().equals(BauSystem.getOwner())) {
|
|
||||||
SWItem skull = SWItem.getPlayerSkull(player.getName());
|
|
||||||
skull.setName("§7Bau verwalten");
|
|
||||||
List<String> skullLore = new ArrayList<>();
|
|
||||||
skullLore.add("§7TNT: §e" + region.getTntMode().getName());
|
|
||||||
skullLore.add("§7StopLag: §e" + (region.isFreeze() ? "Eingeschaltet" : "Ausgeschaltet"));
|
|
||||||
skullLore.add("§7Fire: §e" + (region.isFire() ? "Ausgeschaltet" : "Eingeschaltet"));
|
|
||||||
skullLore.add("§7Members: §e" + (BauweltMember.getMembers(BauSystem.getOwnerID()).size() - 1));
|
|
||||||
skull.setLore(skullLore);
|
|
||||||
inv.setItem(4, skull);
|
|
||||||
}
|
|
||||||
|
|
||||||
inv.setItem(6, Material.BOOK, "§7Script Bücher", Arrays.asList("§7Aktuell §e" + PredefinedBook.getBookCount() + " §7Bücher"), true, clickType -> {
|
|
||||||
player.closeInventory();
|
|
||||||
scriptBooksGUI(player);
|
|
||||||
});
|
|
||||||
|
|
||||||
inv.setItem(21, Material.OBSERVER, "§7Tracer", getNoPermsLore(Arrays.asList("§7Status: §e" + RecordStateMachine.getRecordStatus().getName()), player, "§cDu hast keine Worldrechte", Permission.WORLD), false, clickType -> {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD))
|
|
||||||
return;
|
|
||||||
player.closeInventory();
|
|
||||||
OPEN_TRACER_INVS.add(player);
|
|
||||||
traceGUI(player);
|
|
||||||
});
|
|
||||||
|
|
||||||
inv.setItem(22, Material.DISPENSER, "§7Auto-Loader", getNoPermsLore(Arrays.asList("§7Status: " + (AutoLoader.hasLoader(player) ? "§aan" : "§caus")), player, "§cDu hast keine Worldrechte", Permission.WORLD), false, clickType -> {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD))
|
|
||||||
return;
|
|
||||||
player.closeInventory();
|
|
||||||
autoLoaderGUI(player);
|
|
||||||
});
|
|
||||||
|
|
||||||
inv.setItem(17, getMaterial("PLAYER_HEAD", "SKULL_ITEM"), (byte) 3, "§7Spielerkopf geben", Arrays.asList("§8/§7skull §8[§eSpieler§8]"), false, clickType -> {
|
|
||||||
SWAnvilInv anvilInv = new SWAnvilInv(player, "Spielerköpfe");
|
|
||||||
anvilInv.setItem(Material.NAME_TAG);
|
|
||||||
anvilInv.setCallback(s -> player.performCommand("skull " + s));
|
|
||||||
anvilInv.open();
|
|
||||||
});
|
|
||||||
|
|
||||||
if (GlobalRegion.isGlobalRegion(region)) {
|
|
||||||
inv.setItem(9, Material.BARRIER, "§eKeine Region", clickType -> {
|
|
||||||
});
|
|
||||||
inv.setItem(18, Material.BARRIER, "§eKeine Region", clickType -> {
|
|
||||||
});
|
|
||||||
inv.setItem(27, Material.BARRIER, "§eKeine Region", clickType -> {
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
inv.setItem(27, getMaterial("HEAVY_WEIGHTED_PRESSURE_PLATE", "IRON_PLATE"), "§eRegion Reseten", getNoPermsLore(Arrays.asList("§8/§7reset"), player, "§cDu hast keine Worldrechte", Permission.WORLD), false, clickType -> {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD))
|
|
||||||
return;
|
|
||||||
confirmationInventory(player, "Region Reseten?", () -> player.performCommand("reset"), () -> openBauGui(player));
|
|
||||||
});
|
|
||||||
|
|
||||||
if (region.hasProtection()) {
|
|
||||||
inv.setItem(18, Material.OBSIDIAN, "§eRegion Protecten", getNoPermsLore(Arrays.asList("§8/§7protect"), player, "§cDu hast keine Worldrechte", Permission.WORLD), false, clickType -> {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD))
|
|
||||||
return;
|
|
||||||
confirmationInventory(player, "Region Protecten", () -> player.performCommand("protect"), () -> openBauGui(player));
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
inv.setItem(18, Material.BARRIER, "§eRegion nicht Protect bar", clickType -> {
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (region.hasTestblock()) {
|
|
||||||
inv.setItem(9, getMaterial("END_STONE", "ENDER_STONE"), "§eTestblock erneuern", getNoPermsLore(Arrays.asList("§8/§7testblock"), player, "§cDu hast keine Worldrechte", Permission.WORLD), false, clickType -> {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD))
|
|
||||||
return;
|
|
||||||
confirmationInventory(player, "Testblock erneuern", () -> player.performCommand("testblock"), () -> openBauGui(player));
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
inv.setItem(9, Material.BARRIER, "§eDie Region hat keinen Testblock", clickType -> {
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (player.hasPotionEffect(PotionEffectType.NIGHT_VISION)) {
|
|
||||||
inv.setItem(26, Material.POTION, "§7Nightvision: §eEingeschaltet", Collections.singletonList("§8/§7nv"), false, clickType -> {
|
|
||||||
CommandNV.toggleNightvision(player);
|
|
||||||
openBauGui(player);
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
inv.setItem(26, Material.GLASS_BOTTLE, "§7Nightvision: §eAusgeschaltet", Collections.singletonList("§8/§7nv"), false, clickType -> {
|
|
||||||
CommandNV.toggleNightvision(player);
|
|
||||||
openBauGui(player);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (player.hasPotionEffect(PotionEffectType.WATER_BREATHING)) {
|
|
||||||
inv.setItem(35, Material.WATER_BUCKET, "§7Waterbreathing: §eEingeschaltet", Collections.singletonList("§8/§7wv"), false, clickType -> {
|
|
||||||
CommandGills.toggleGills(player);
|
|
||||||
openBauGui(player);
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
inv.setItem(35, Material.BUCKET, "§7Waterbreathing: §eAusgeschaltet", Collections.singletonList("§8/§7wv"), false, clickType -> {
|
|
||||||
CommandGills.toggleGills(player);
|
|
||||||
openBauGui(player);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean isBuildArea = region.hasBuildRegion();
|
|
||||||
List<String> tntLore = getNoPermsLore(Arrays.asList("§8/§7tnt §8[" + (isBuildArea ? "§eTB§7, " : "") + "§eOff §7oder §eOn§7]"), player, "§cDu hast keine Worldrechte", Permission.WORLD);
|
|
||||||
switch (region.getTntMode()) {
|
|
||||||
case OFF:
|
|
||||||
inv.setItem(23, Material.MINECART, "§7TNT: §eAusgeschaltet", tntLore, false, clickType -> {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD))
|
|
||||||
return;
|
|
||||||
player.performCommand("tnt " + (isBuildArea ? "tb" : "on"));
|
|
||||||
updateInventories();
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
case ONLY_TB:
|
|
||||||
inv.setItem(23, getMaterial("TNT_MINECART", "EXPLOSIVE_MINECART"), "§7TNT: §enur Testblock", tntLore, false, clickType -> {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD))
|
|
||||||
return;
|
|
||||||
player.performCommand("tnt on");
|
|
||||||
updateInventories();
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
inv.setItem(23, Material.TNT, "§7TNT: §eEingeschaltet", tntLore, false, clickType -> {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD))
|
|
||||||
return;
|
|
||||||
player.performCommand("tnt off");
|
|
||||||
updateInventories();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (region.isFreeze()) {
|
|
||||||
inv.setItem(24, getMaterial("GUNPOWDER", "SULPHUR"), "§7Freeze: §eEingeschaltet", getNoPermsLore(Arrays.asList("§8/§7freeze"), player, "§cDu hast keine Worldrechte", Permission.WORLD), false, clickType -> {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD))
|
|
||||||
return;
|
|
||||||
player.performCommand("freeze");
|
|
||||||
updateInventories();
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
inv.setItem(24, Material.REDSTONE, "§7Freeze: §eAusgeschaltet", getNoPermsLore(Arrays.asList("§8/§7freeze"), player, "§cDu hast keine Worldrechte", Permission.WORLD), false, clickType -> {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD))
|
|
||||||
return;
|
|
||||||
player.performCommand("freeze");
|
|
||||||
updateInventories();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (region.isFire()) {
|
|
||||||
inv.setItem(3, getMaterial("FIREWORK_STAR", "FIREWORK_CHARGE"), "§7Fire: §eAusgeschaltet", getNoPermsLore(Arrays.asList("§8/§7fire"), player, "§cDu hast keine Worldrechte", Permission.WORLD), false, clickType -> {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD))
|
|
||||||
return;
|
|
||||||
player.performCommand("fire");
|
|
||||||
updateInventories();
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
inv.setItem(3, getMaterial("FIRE_CHARGE", "FIREBALL"), "§7Fire: §eEingeschaltet", getNoPermsLore(Arrays.asList("§8/§7fire"), player, "§cDu hast keine Worldrechte", Permission.WORLD), false, clickType -> {
|
|
||||||
if (Welt.noPermission(player, Permission.WORLD))
|
|
||||||
return;
|
|
||||||
player.performCommand("fire");
|
|
||||||
updateInventories();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
inv.setItem(2, Material.ENDER_PEARL, "§7Teleporter", getNoPermsLore(Arrays.asList("§8/§7tp §8[§eSpieler§8]"), player, "", null), false, clickType -> {
|
|
||||||
List<SWListInv.SWListEntry<String>> playerSWListEntry = new ArrayList<>();
|
|
||||||
Bukkit.getOnlinePlayers().forEach(player1 -> {
|
|
||||||
if (player1.equals(player))
|
|
||||||
return;
|
|
||||||
playerSWListEntry.add(new SWListInv.SWListEntry<>(SWItem.getPlayerSkull(player1.getName()), player1.getName()));
|
|
||||||
});
|
|
||||||
SWListInv<String> playerSWListInv = new SWListInv<>(player, "Teleporter", playerSWListEntry, (clickType1, player1) -> {
|
|
||||||
player.closeInventory();
|
|
||||||
player.performCommand("tp " + player1);
|
|
||||||
});
|
|
||||||
playerSWListInv.open();
|
|
||||||
});
|
|
||||||
|
|
||||||
inv.open();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void traceGUI(Player player) {
|
|
||||||
SWInventory inv = new SWInventory(player, 9, "Tracer");
|
|
||||||
inv.setCallback(-1, clickType -> {
|
|
||||||
if (!isRefreshing)
|
|
||||||
OPEN_TRACER_INVS.remove(player);
|
|
||||||
});
|
|
||||||
List<String> stateLore = Arrays.asList("§7Aktuell: §e" + RecordStateMachine.getRecordStatus().getName(), "§8/§7trace §8[§estart§8, stop §8oder §eauto§8]");
|
|
||||||
switch (RecordStateMachine.getRecordStatus()) {
|
|
||||||
case IDLE:
|
|
||||||
inv.setItem(0, getMaterial("SNOWBALL", "SNOW_BALL"), "§7Tracerstatus", stateLore, false, clickType -> {
|
|
||||||
RecordStateMachine.commandAuto();
|
|
||||||
updateInventories();
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
case IDLE_AUTO:
|
|
||||||
inv.setItem(0, Material.ENDER_PEARL, "§7Tracerstatus", stateLore, false, clickType -> {
|
|
||||||
RecordStateMachine.commandStart();
|
|
||||||
updateInventories();
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
case RECORD:
|
|
||||||
case RECORD_AUTO:
|
|
||||||
inv.setItem(0, getMaterial("ENDER_EYE", "EYE_OF_ENDER"), "§7Tracerstatus", stateLore, false, clickType -> {
|
|
||||||
RecordStateMachine.commandStop();
|
|
||||||
updateInventories();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if (TraceShowManager.hasActiveShow(player)) {
|
|
||||||
inv.setItem(2, Material.TNT, "§7Showstatus", Arrays.asList("§7Aktuell: §eGezeigt", "§8/§7trace §8[§eshow§8/§ehide§8]"), false, clickType -> {
|
|
||||||
player.performCommand("trace hide");
|
|
||||||
traceGUI(player);
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
inv.setItem(2, Material.GLASS, "§7Showstatus", Arrays.asList("§7Aktuell: §eVersteckt", "§8/§7trace §8[§eshow§8/§ehide§8]"), false, clickType -> {
|
|
||||||
player.performCommand("trace show");
|
|
||||||
traceGUI(player);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
inv.setItem(4, getMaterial("TNT_MINECART", "EXPLOSIVE_MINECART"), "§7Trace GUI", Collections.singletonList("§8/§7trace show gui"), false, clickType -> {
|
|
||||||
player.closeInventory();
|
|
||||||
player.performCommand("trace show gui");
|
|
||||||
});
|
|
||||||
|
|
||||||
inv.setItem(6, Material.BARRIER, "§7Trace löschen", Arrays.asList("§8/§7trace delete"), false, clickType -> confirmationInventory(player, "Trace löschen", () -> player.performCommand("trace delete"), () -> {
|
|
||||||
}));
|
|
||||||
|
|
||||||
inv.setItem(8, Material.ARROW, "§7Zurück", clickType -> {
|
|
||||||
player.closeInventory();
|
|
||||||
openBauGui(player);
|
|
||||||
OPEN_INVS.add(player);
|
|
||||||
});
|
|
||||||
|
|
||||||
inv.open();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void scriptBooksGUI(Player player) {
|
|
||||||
List<SWListInv.SWListEntry<PredefinedBook>> entries = new ArrayList<>();
|
|
||||||
List<PredefinedBook> books = PredefinedBook.getBooks();
|
|
||||||
books.forEach(predefinedBook -> entries.add(new SWListInv.SWListEntry<>(new SWItem(predefinedBook.getBookMat(), predefinedBook.getName(), predefinedBook.getLore(), false, clickType -> {
|
|
||||||
}), predefinedBook)));
|
|
||||||
SWListInv<PredefinedBook> inv = new SWListInv<>(player, "Script Bücher", entries, (clickType, predefinedBook) -> {
|
|
||||||
player.closeInventory();
|
|
||||||
player.getInventory().addItem(predefinedBook.toItemStack());
|
|
||||||
});
|
|
||||||
inv.open();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void autoLoaderGUI(Player player) {
|
|
||||||
SWInventory inv = new SWInventory(player, 9, "Autoloader");
|
|
||||||
|
|
||||||
boolean hasLoader = AutoLoader.hasLoader(player);
|
|
||||||
|
|
||||||
if (hasLoader) {
|
|
||||||
AutoLoader loader = AutoLoader.getLoader(player);
|
|
||||||
if (loader.isSetup()) {
|
|
||||||
inv.setItem(0, Material.DROPPER, "§7Loader Starten", Collections.singletonList("§8/§7loader start"), false, clickType -> {
|
|
||||||
loader.start();
|
|
||||||
autoLoaderGUI(player);
|
|
||||||
});
|
|
||||||
|
|
||||||
inv.setItem(2, Material.ARROW, "§7Letzte Aktion entfernen", Collections.singletonList("§8/§7loader undo"), false, clickType -> {
|
|
||||||
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
inv.setItem(0, Material.BLAZE_ROD, "§7Loader Bearbeiten", Collections.singletonList("§8/§7loader setup"), false, clickType -> {
|
|
||||||
loader.setup();
|
|
||||||
autoLoaderGUI(player);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
inv.setItem(4, Material.COMPASS, "§7Schuss Delay", Arrays.asList("§7Aktuell: §e" + loader.getTicksBetweenShots(), "§8/§7loader wait §8[§eTicks§8]"), false, clickType -> {
|
|
||||||
SWAnvilInv anvilInv = new SWAnvilInv(player, "Schuss Delay", loader.getTicksBetweenShots() + "");
|
|
||||||
anvilInv.setItem(Material.STONE);
|
|
||||||
anvilInv.setCallback(s -> {
|
|
||||||
player.performCommand("loader wait " + s);
|
|
||||||
autoLoaderGUI(player);
|
|
||||||
});
|
|
||||||
anvilInv.open();
|
|
||||||
});
|
|
||||||
|
|
||||||
inv.setItem(6, getMaterial("CLOCK", "WATCH"), "§7Block platzier Geschwindigkeit", Arrays.asList("§7Aktuell: §e" + loader.getTicksBetweenBlocks(), "§8/§7loader speed §8[§eTicks§8]"), false, clickType -> {
|
|
||||||
SWAnvilInv anvilInv = new SWAnvilInv(player, "Platzier Geschwindigkeit", loader.getTicksBetweenBlocks() + "");
|
|
||||||
anvilInv.setItem(Material.STONE);
|
|
||||||
anvilInv.setCallback(s -> {
|
|
||||||
player.performCommand("loader speed " + s);
|
|
||||||
autoLoaderGUI(player);
|
|
||||||
});
|
|
||||||
anvilInv.open();
|
|
||||||
});
|
|
||||||
|
|
||||||
inv.setItem(8, Material.BARRIER, "§7Loader löschen", Collections.singletonList("§8/§7loader stop"), false, clickType -> confirmationInventory(player, "Loader löschen?", () -> {
|
|
||||||
loader.stop();
|
|
||||||
autoLoaderGUI(player);
|
|
||||||
}, () -> autoLoaderGUI(player)));
|
|
||||||
} else {
|
|
||||||
inv.setItem(4, Material.GOLD_NUGGET, "§eNeuer Autoloader", clickType -> {
|
|
||||||
AutoLoader.getLoader(player);
|
|
||||||
player.closeInventory();
|
|
||||||
});
|
|
||||||
inv.setItem(8, Material.ARROW, "§7Zurück", clickType -> {
|
|
||||||
player.closeInventory();
|
|
||||||
openBauGui(player);
|
|
||||||
OPEN_INVS.add(player);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
inv.open();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private static void confirmChatMessage(Player player, String command) {
|
|
||||||
player.sendMessage(BauSystem.PREFIX + "§7Klicke auf die Nachricht zum bestätigen");
|
|
||||||
TextComponent t = new TextComponent();
|
|
||||||
t.setText("[Hier]");
|
|
||||||
t.setColor(ChatColor.YELLOW);
|
|
||||||
t.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command));
|
|
||||||
t.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText("§7" + command)));
|
|
||||||
player.spigot().sendMessage(t);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static List<String> getNoPermsLore(List<String> lore, Player player, String noPerms, Permission perm) {
|
|
||||||
if (perm != null && Welt.noPermission(player, perm)) {
|
|
||||||
lore = new ArrayList<>(lore);
|
|
||||||
lore.add(noPerms);
|
|
||||||
}
|
|
||||||
return lore;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void updateInventories() {
|
|
||||||
isRefreshing = true;
|
|
||||||
OPEN_INVS.forEach(CommandGUI::openBauGui);
|
|
||||||
OPEN_TRACER_INVS.forEach(CommandGUI::traceGUI);
|
|
||||||
isRefreshing = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void confirmationInventory(Player player, String title, Runnable confirm, Runnable decline) {
|
|
||||||
SWInventory inv = new SWInventory(player, 9, title);
|
|
||||||
inv.setItem(0, SWItem.getDye(1), (byte) 1, "§cAbbrechen", clickType -> {
|
|
||||||
player.closeInventory();
|
|
||||||
decline.run();
|
|
||||||
});
|
|
||||||
inv.setItem(8, SWItem.getDye(10), (byte) 10, "§aBestätigen", clickType -> {
|
|
||||||
player.closeInventory();
|
|
||||||
confirm.run();
|
|
||||||
});
|
|
||||||
inv.open();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Material getMaterial(String... names) {
|
|
||||||
for (String name : names) {
|
|
||||||
try {
|
|
||||||
return Material.valueOf(name);
|
|
||||||
} catch (IllegalArgumentException ignored) {
|
|
||||||
//Ignored /\
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static ItemStack wand(Player player, ItemStack base, String command, Permission permission, String noPermissionMessage) {
|
|
||||||
base = base.clone();
|
|
||||||
ItemMeta meta = base.getItemMeta();
|
|
||||||
List<String> lore = meta.getLore();
|
|
||||||
lore.add(command);
|
|
||||||
if (permission != null && Welt.noPermission(player, permission))
|
|
||||||
lore.add(noPermissionMessage);
|
|
||||||
meta.setLore(lore);
|
|
||||||
base.setItemMeta(meta);
|
|
||||||
return base;
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onPlayerInteract(PlayerInteractEvent event) {
|
|
||||||
if (event.getAction() != Action.RIGHT_CLICK_AIR && event.getAction() != Action.RIGHT_CLICK_BLOCK)
|
|
||||||
return;
|
|
||||||
if (event.getItem() == null || event.getItem().getType() != Material.NETHER_STAR)
|
|
||||||
return;
|
|
||||||
openBauGui(event.getPlayer());
|
|
||||||
OPEN_INVS.add(event.getPlayer());
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler
|
|
||||||
public void onPlayerSwapHandItems(PlayerSwapHandItemsEvent event) {
|
|
||||||
if (LAST_F_PLAYER.contains(event.getPlayer())) {
|
|
||||||
openBauGui(event.getPlayer());
|
|
||||||
OPEN_INVS.add(event.getPlayer());
|
|
||||||
} else {
|
|
||||||
LAST_F_PLAYER.add(event.getPlayer());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.bausystem.commands;
|
|
||||||
|
|
||||||
import de.steamwar.command.SWCommand;
|
|
||||||
import org.bukkit.GameMode;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
public class CommandGamemode extends SWCommand {
|
|
||||||
|
|
||||||
public CommandGamemode() {
|
|
||||||
super("gamemode", "gm", "g");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register(help = true)
|
|
||||||
public void gamemodeHelp(Player p, String... args) {
|
|
||||||
p.sendMessage("§cUnbekannter Spielmodus");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register
|
|
||||||
public void genericCommand(Player p) {
|
|
||||||
if (p.getGameMode() == GameMode.CREATIVE) {
|
|
||||||
p.setGameMode(GameMode.SPECTATOR);
|
|
||||||
} else {
|
|
||||||
p.setGameMode(GameMode.CREATIVE);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Register
|
|
||||||
public void gamemodeCommand(Player p, GameMode gameMode) {
|
|
||||||
p.setGameMode(gameMode);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user