diff --git a/SpigotCore/SpigotCore_12/src/src/de/steamwar/core/LocaleChangeWrapper12.java b/SpigotCore/SpigotCore_12/src/de/steamwar/core/LocaleChangeWrapper12.java similarity index 100% rename from SpigotCore/SpigotCore_12/src/src/de/steamwar/core/LocaleChangeWrapper12.java rename to SpigotCore/SpigotCore_12/src/de/steamwar/core/LocaleChangeWrapper12.java diff --git a/SpigotCore/SpigotCore_14/src/src/de/steamwar/core/FlatteningWrapper14.java b/SpigotCore/SpigotCore_14/src/de/steamwar/core/FlatteningWrapper14.java similarity index 100% rename from SpigotCore/SpigotCore_14/src/src/de/steamwar/core/FlatteningWrapper14.java rename to SpigotCore/SpigotCore_14/src/de/steamwar/core/FlatteningWrapper14.java diff --git a/SpigotCore/SpigotCore_14/src/src/de/steamwar/core/RecipeDiscoverWrapper14.java b/SpigotCore/SpigotCore_14/src/de/steamwar/core/RecipeDiscoverWrapper14.java similarity index 100% rename from SpigotCore/SpigotCore_14/src/src/de/steamwar/core/RecipeDiscoverWrapper14.java rename to SpigotCore/SpigotCore_14/src/de/steamwar/core/RecipeDiscoverWrapper14.java diff --git a/SpigotCore/SpigotCore_14/src/src/de/steamwar/core/WorldEditWrapper14.java b/SpigotCore/SpigotCore_14/src/de/steamwar/core/WorldEditWrapper14.java similarity index 100% rename from SpigotCore/SpigotCore_14/src/src/de/steamwar/core/WorldEditWrapper14.java rename to SpigotCore/SpigotCore_14/src/de/steamwar/core/WorldEditWrapper14.java diff --git a/SpigotCore/SpigotCore_14/src/src/de/steamwar/techhider/BlockIds14.java b/SpigotCore/SpigotCore_14/src/de/steamwar/techhider/BlockIds14.java similarity index 100% rename from SpigotCore/SpigotCore_14/src/src/de/steamwar/techhider/BlockIds14.java rename to SpigotCore/SpigotCore_14/src/de/steamwar/techhider/BlockIds14.java diff --git a/SpigotCore/SpigotCore_14/src/src/de/steamwar/techhider/ChunkHider14.java b/SpigotCore/SpigotCore_14/src/de/steamwar/techhider/ChunkHider14.java similarity index 100% rename from SpigotCore/SpigotCore_14/src/src/de/steamwar/techhider/ChunkHider14.java rename to SpigotCore/SpigotCore_14/src/de/steamwar/techhider/ChunkHider14.java diff --git a/SpigotCore/SpigotCore_14/src/src/de/steamwar/techhider/ProtocolWrapper14.java b/SpigotCore/SpigotCore_14/src/de/steamwar/techhider/ProtocolWrapper14.java similarity index 100% rename from SpigotCore/SpigotCore_14/src/src/de/steamwar/techhider/ProtocolWrapper14.java rename to SpigotCore/SpigotCore_14/src/de/steamwar/techhider/ProtocolWrapper14.java diff --git a/SpigotCore/SpigotCore_18/src/src/de/steamwar/core/CraftbukkitWrapper18.java b/SpigotCore/SpigotCore_18/src/de/steamwar/core/CraftbukkitWrapper18.java similarity index 100% rename from SpigotCore/SpigotCore_18/src/src/de/steamwar/core/CraftbukkitWrapper18.java rename to SpigotCore/SpigotCore_18/src/de/steamwar/core/CraftbukkitWrapper18.java diff --git a/SpigotCore/SpigotCore_18/src/src/de/steamwar/core/ProtocolWrapper18.java b/SpigotCore/SpigotCore_18/src/de/steamwar/core/ProtocolWrapper18.java similarity index 100% rename from SpigotCore/SpigotCore_18/src/src/de/steamwar/core/ProtocolWrapper18.java rename to SpigotCore/SpigotCore_18/src/de/steamwar/core/ProtocolWrapper18.java diff --git a/SpigotCore/SpigotCore_18/src/src/de/steamwar/core/WorldEditWrapper18.java b/SpigotCore/SpigotCore_18/src/de/steamwar/core/WorldEditWrapper18.java similarity index 100% rename from SpigotCore/SpigotCore_18/src/src/de/steamwar/core/WorldEditWrapper18.java rename to SpigotCore/SpigotCore_18/src/de/steamwar/core/WorldEditWrapper18.java diff --git a/SpigotCore/SpigotCore_18/src/src/de/steamwar/techhider/ChunkHider18.java b/SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ChunkHider18.java similarity index 100% rename from SpigotCore/SpigotCore_18/src/src/de/steamwar/techhider/ChunkHider18.java rename to SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ChunkHider18.java diff --git a/SpigotCore/SpigotCore_18/src/src/de/steamwar/techhider/ProtocolWrapper18.java b/SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ProtocolWrapper18.java similarity index 100% rename from SpigotCore/SpigotCore_18/src/src/de/steamwar/techhider/ProtocolWrapper18.java rename to SpigotCore/SpigotCore_18/src/de/steamwar/techhider/ProtocolWrapper18.java diff --git a/SpigotCore/SpigotCore_19/src/src/de/steamwar/core/ChatWrapper19.java b/SpigotCore/SpigotCore_19/src/de/steamwar/core/ChatWrapper19.java similarity index 100% rename from SpigotCore/SpigotCore_19/src/src/de/steamwar/core/ChatWrapper19.java rename to SpigotCore/SpigotCore_19/src/de/steamwar/core/ChatWrapper19.java diff --git a/SpigotCore/SpigotCore_19/src/src/de/steamwar/core/ProtocolWrapper19.java b/SpigotCore/SpigotCore_19/src/de/steamwar/core/ProtocolWrapper19.java similarity index 100% rename from SpigotCore/SpigotCore_19/src/src/de/steamwar/core/ProtocolWrapper19.java rename to SpigotCore/SpigotCore_19/src/de/steamwar/core/ProtocolWrapper19.java diff --git a/SpigotCore/SpigotCore_19/src/src/de/steamwar/techhider/ProtocolWrapper19.java b/SpigotCore/SpigotCore_19/src/de/steamwar/techhider/ProtocolWrapper19.java similarity index 100% rename from SpigotCore/SpigotCore_19/src/src/de/steamwar/techhider/ProtocolWrapper19.java rename to SpigotCore/SpigotCore_19/src/de/steamwar/techhider/ProtocolWrapper19.java diff --git a/SpigotCore/SpigotCore_20/src/de/steamwar/core/CraftbukkitWrapper20.java b/SpigotCore/SpigotCore_20/src/de/steamwar/core/CraftbukkitWrapper20.java new file mode 100644 index 00000000..68963457 --- /dev/null +++ b/SpigotCore/SpigotCore_20/src/de/steamwar/core/CraftbukkitWrapper20.java @@ -0,0 +1,41 @@ +/* + 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 . +*/ + +package de.steamwar.core; + +import com.comphenix.tinyprotocol.Reflection; +import com.comphenix.tinyprotocol.TinyProtocol; +import net.minecraft.network.protocol.game.ClientboundLevelChunkWithLightPacket; +import net.minecraft.world.level.World; +import net.minecraft.world.level.chunk.Chunk; +import net.minecraft.world.level.chunk.ChunkStatus; +import net.minecraft.world.level.lighting.LevelLightEngine; +import org.bukkit.entity.Player; + +public class CraftbukkitWrapper20 implements CraftbukkitWrapper.ICraftbukkitWrapper { + + private static final Reflection.MethodInvoker getHandle = Reflection.getMethod("{obc}.CraftChunk", "getHandle", ChunkStatus.class); + private static final Reflection.MethodInvoker getLightEngine = Reflection.getTypedMethod(World.class, null, LevelLightEngine.class); + + @Override + public void sendChunk(Player p, int chunkX, int chunkZ) { + Chunk chunk = (Chunk) getHandle.invoke(p.getWorld().getChunkAt(chunkX, chunkZ), ChunkStatus.n); + TinyProtocol.instance.sendPacket(p, new ClientboundLevelChunkWithLightPacket(chunk, (LevelLightEngine) getLightEngine.invoke(chunk.r), null, null, true)); + } +} diff --git a/SpigotCore/SpigotCore_Main/src/src/SpigotCore.properties b/SpigotCore/SpigotCore_Main/src/SpigotCore.properties similarity index 84% rename from SpigotCore/SpigotCore_Main/src/src/SpigotCore.properties rename to SpigotCore/SpigotCore_Main/src/SpigotCore.properties index 04425f0a..10c64603 100644 --- a/SpigotCore/SpigotCore_Main/src/src/SpigotCore.properties +++ b/SpigotCore/SpigotCore_Main/src/SpigotCore.properties @@ -1,20 +1,20 @@ # -# This file is a part of the SteamWar software. +# This file is a part of the SteamWar software. # -# Copyright (C) 2022 SteamWar.de-Serverteam +# 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 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. +# 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 . +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # LOCAL_CHAT=§eLocal §r{0}§8»§7 {1} diff --git a/SpigotCore/SpigotCore_Main/src/src/SpigotCore_de.properties b/SpigotCore/SpigotCore_Main/src/SpigotCore_de.properties similarity index 84% rename from SpigotCore/SpigotCore_Main/src/src/SpigotCore_de.properties rename to SpigotCore/SpigotCore_Main/src/SpigotCore_de.properties index 967190be..83fa39f5 100644 --- a/SpigotCore/SpigotCore_Main/src/src/SpigotCore_de.properties +++ b/SpigotCore/SpigotCore_Main/src/SpigotCore_de.properties @@ -1,20 +1,20 @@ # -# This file is a part of the SteamWar software. +# This file is a part of the SteamWar software. # -# Copyright (C) 2022 SteamWar.de-Serverteam +# 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 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. +# 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 . +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . # LOCAL_CHAT=§eLokal §r{0}§8»§7 {1} diff --git a/SpigotCore/SpigotCore_Main/src/src/com/comphenix/tinyprotocol/Reflection.java b/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/Reflection.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/com/comphenix/tinyprotocol/Reflection.java rename to SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/Reflection.java diff --git a/SpigotCore/SpigotCore_Main/src/src/com/comphenix/tinyprotocol/TinyProtocol.java b/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/com/comphenix/tinyprotocol/TinyProtocol.java rename to SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/command/CaseInsensitiveCommandsListener.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CaseInsensitiveCommandsListener.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/command/CaseInsensitiveCommandsListener.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/command/CaseInsensitiveCommandsListener.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/command/CommandRegistering.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/CommandRegistering.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/command/CommandRegistering.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/command/CommandRegistering.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/command/SWCommand.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/SWCommand.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/command/SWCommand.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/command/SWCommand.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/command/TypeMapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeMapper.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/command/TypeMapper.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeMapper.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/command/TypeUtils.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeUtils.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/command/TypeUtils.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeUtils.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/command/TypeValidator.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeValidator.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/command/TypeValidator.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/command/TypeValidator.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/BountifulWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/BountifulWrapper.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/BountifulWrapper.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/BountifulWrapper.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/ChatWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ChatWrapper.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/ChatWrapper.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/ChatWrapper.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/CheckpointUtils.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtils.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/CheckpointUtils.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/CheckpointUtils.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/CommandRemover.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CommandRemover.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/CommandRemover.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/CommandRemover.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/Core.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/Core.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/CraftbukkitWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CraftbukkitWrapper.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/CraftbukkitWrapper.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/CraftbukkitWrapper.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/CrashDetector.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/CrashDetector.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/CrashDetector.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/CrashDetector.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/ErrorHandler.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/ErrorHandler.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/FlatteningWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/FlatteningWrapper.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/FlatteningWrapper.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/FlatteningWrapper.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/LocaleChangeWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/LocaleChangeWrapper.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/LocaleChangeWrapper.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/LocaleChangeWrapper.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/ProtocolWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ProtocolWrapper.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/ProtocolWrapper.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/ProtocolWrapper.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/RecipeDiscoverWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/RecipeDiscoverWrapper.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/RecipeDiscoverWrapper.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/RecipeDiscoverWrapper.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/TPSWarpUtils.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWarpUtils.java similarity index 93% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/TPSWarpUtils.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWarpUtils.java index 3550a991..439864ed 100644 --- a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/TPSWarpUtils.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWarpUtils.java @@ -19,14 +19,10 @@ package de.steamwar.core; -import com.comphenix.tinyprotocol.Reflection; -import de.steamwar.core.Core; import lombok.experimental.UtilityClass; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitTask; -import java.util.function.LongSupplier; - @UtilityClass public class TPSWarpUtils { diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/TPSWatcher.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWatcher.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/TPSWatcher.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWatcher.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/VersionDependent.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/VersionDependent.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/VersionDependent.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/VersionDependent.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/WorldEditWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditWrapper.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/WorldEditWrapper.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditWrapper.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/authlib/AuthlibInjector.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/AuthlibInjector.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/authlib/AuthlibInjector.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/AuthlibInjector.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/authlib/SteamwarGameProfileRepository.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/SteamwarGameProfileRepository.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/authlib/SteamwarGameProfileRepository.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/authlib/SteamwarGameProfileRepository.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/events/AntiNocom.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/events/AntiNocom.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/events/ChattingEvent.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/ChattingEvent.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/events/ChattingEvent.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/ChattingEvent.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/events/PartialChunkFixer.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PartialChunkFixer.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/events/PartialChunkFixer.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PartialChunkFixer.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/events/PlayerJoinedEvent.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PlayerJoinedEvent.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/events/PlayerJoinedEvent.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/PlayerJoinedEvent.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/events/WorldLoadEvent.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/WorldLoadEvent.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/core/events/WorldLoadEvent.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/WorldLoadEvent.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/entity/RArmorStand.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RArmorStand.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/entity/RArmorStand.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RArmorStand.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/entity/REntity.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntity.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/entity/REntity.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntity.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/entity/REntityServer.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntityServer.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/entity/REntityServer.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntityServer.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/entity/RFallingBlockEntity.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RFallingBlockEntity.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/entity/RFallingBlockEntity.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RFallingBlockEntity.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/entity/RPlayer.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/entity/RPlayer.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RPlayer.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/inventory/InvCallback.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/InvCallback.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/inventory/InvCallback.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/InvCallback.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/inventory/SWAnvilInv.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWAnvilInv.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/inventory/SWAnvilInv.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWAnvilInv.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/inventory/SWInventory.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/inventory/SWInventory.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/inventory/SWItem.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/inventory/SWItem.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/inventory/SWListInv.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWListInv.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/inventory/SWListInv.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWListInv.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/inventory/SchematicSelector.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SchematicSelector.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/inventory/SchematicSelector.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SchematicSelector.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/inventory/SchematicSelectorInjectable.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SchematicSelectorInjectable.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/inventory/SchematicSelectorInjectable.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SchematicSelectorInjectable.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/inventory/UtilGui.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/UtilGui.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/inventory/UtilGui.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/UtilGui.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/message/Message.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/message/Message.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/message/Message.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/message/Message.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/network/CoreNetworkHandler.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/CoreNetworkHandler.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/network/CoreNetworkHandler.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/network/CoreNetworkHandler.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/network/NetworkReceiver.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/NetworkReceiver.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/network/NetworkReceiver.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/network/NetworkReceiver.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/network/NetworkSender.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/NetworkSender.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/network/NetworkSender.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/network/NetworkSender.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/network/handlers/InventoryHandler.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/InventoryHandler.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/network/handlers/InventoryHandler.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/InventoryHandler.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/network/handlers/ServerDataHandler.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/ServerDataHandler.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/network/handlers/ServerDataHandler.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/ServerDataHandler.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/providers/BauServerInfo.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/providers/BauServerInfo.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/providers/BauServerInfo.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/providers/BauServerInfo.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/scoreboard/SWScoreboard.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/scoreboard/SWScoreboard.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/SWScoreboard.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/scoreboard/ScoreboardCallback.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/scoreboard/ScoreboardCallback.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/scoreboard/ScoreboardCallback.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/sql/PersonalKit.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/PersonalKit.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/sql/PersonalKit.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/sql/PersonalKit.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/sql/SQLConfigImpl.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLConfigImpl.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/sql/SQLConfigImpl.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLConfigImpl.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/sql/SQLWrapperImpl.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/sql/SQLWrapperImpl.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SQLWrapperImpl.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/sql/SchematicData.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/sql/SchematicData.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/techhider/BlockIds.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/BlockIds.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/techhider/BlockIds.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/BlockIds.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/techhider/ChunkHider.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/techhider/ChunkHider.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/techhider/ProtocolUtils.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolUtils.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/techhider/ProtocolUtils.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolUtils.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/techhider/ProtocolWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolWrapper.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/techhider/ProtocolWrapper.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolWrapper.java diff --git a/SpigotCore/SpigotCore_Main/src/src/de/steamwar/techhider/TechHider.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/de/steamwar/techhider/TechHider.java rename to SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java diff --git a/SpigotCore/SpigotCore_Main/src/src/plugin.yml b/SpigotCore/SpigotCore_Main/src/plugin.yml similarity index 100% rename from SpigotCore/SpigotCore_Main/src/src/plugin.yml rename to SpigotCore/SpigotCore_Main/src/plugin.yml