FightSystem_18/pom.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     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/>.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>steamwar</groupId>
+        <artifactId>FightSystem</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <properties>
+        <main.basedir>${project.basedir}/..</main.basedir>
+    </properties>
+
+    <artifactId>FightSystem_18</artifactId>
+    <version>1.0</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>steamwar</groupId>
+            <artifactId>Spigot</artifactId>
+            <version>1.18</version>
+            <scope>system</scope>
+            <systemPath>${main.basedir}/lib/Spigot-1.18.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>steamwar</groupId>
+            <artifactId>WorldEdit</artifactId>
+            <version>1.0</version>
+            <scope>system</scope>
+            <systemPath>${main.basedir}/lib/WorldEdit-1.15.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>steamwar</groupId>
+            <artifactId>FightSystem_Core</artifactId>
+            <version>1.0</version>
+        </dependency>
+    </dependencies>
+</project>

FightSystem_Core/pom.xml

@@ -19,11 +19,22 @@
 
     <dependencies>
         <dependency>
-            <groupId>steamwar</groupId>
+            <groupId>org.spigotmc</groupId>
-            <artifactId>Spigot</artifactId>
+            <artifactId>spigot-api</artifactId>
-            <version>1.15</version>
+            <version>1.18-R0.1-SNAPSHOT</version>
-            <scope>system</scope>
+            <scope>provided</scope>
-            <systemPath>${main.basedir}/lib/Spigot-1.15.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>4.1.68.Final</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.mojang</groupId>
+            <artifactId>authlib</artifactId>
+            <version>1.5.25</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>steamwar</groupId>

FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHider.java

@@ -43,15 +43,15 @@ import java.util.stream.Collectors;
 
 public class TechHider extends StateDependent {
 
-    private static final Class<?> blockPosition = Reflection.getClass("{nms}.BlockPosition");
+    private static final Class<?> blockPosition = Reflection.getClass("{nms.core}.BlockPosition");
-    private static final Class<?> baseBlockPosition = Reflection.getClass("{nms}.BaseBlockPosition");
+    private static final Class<?> baseBlockPosition = Reflection.getClass("{nms.core}.BaseBlockPosition");
     private static final Reflection.FieldAccessor<Integer> blockPositionX = Reflection.getField(baseBlockPosition, int.class, 0);
     private static final Reflection.FieldAccessor<Integer> blockPositionZ = Reflection.getField(baseBlockPosition, int.class, 2);
 
-    private static final Class<?> iBlockData = Reflection.getClass("{nms}.IBlockData");
+    private static final Class<?> iBlockData = Reflection.getClass("{nms.world.level.block.state}.IBlockData");
-    private static final Class<?> block = Reflection.getClass("{nms}.Block");
+    private static final Class<?> block = Reflection.getClass("{nms.world.level.block}.Block");
-    private static final Reflection.MethodInvoker getBlockByBlockData = Reflection.getTypedMethod(iBlockData, "getBlock", block);
+    private static final Reflection.MethodInvoker getBlockByBlockData = Reflection.getTypedMethod(iBlockData, null, block);
-    private static final Reflection.MethodInvoker getBlockDataByBlock = Reflection.getTypedMethod(block, "getBlockData", iBlockData);
+    private static final Reflection.MethodInvoker getBlockDataByBlock = Reflection.getTypedMethod(block, null, iBlockData);
 
     private static final Class<?> craftMagicNumbers = Reflection.getClass("{obc}.util.CraftMagicNumbers");
     private static final Reflection.MethodInvoker getMaterialByBlock = Reflection.getTypedMethod(craftMagicNumbers, "getMaterial", Material.class, block);
@@ -76,14 +76,14 @@ public class TechHider extends StateDependent {
             techhiders.put(mapChunkPacket, this::mapChunkHider);
         }
         if(Core.getVersion() > 12) {
-            Class<?> blockBreakClass = Reflection.getClass("{nms}.PacketPlayOutBlockBreak");
+            Class<?> blockBreakClass = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutBlockBreak");
             techhiders.put(blockBreakClass, blockBreakHiderGenerator(blockBreakClass));
         }
 
         if(Core.getVersion() > 8){
-            ProtocolAPI.setIncomingHandler(Reflection.getClass("{nms}.PacketPlayInUseItem"), (p, packet) -> p.getGameMode() == GameMode.SPECTATOR ? null : packet);
+            ProtocolAPI.setIncomingHandler(Reflection.getClass("{nms.network.protocol.game}.PacketPlayInUseItem"), (p, packet) -> p.getGameMode() == GameMode.SPECTATOR ? null : packet);
         }
-        ProtocolAPI.setIncomingHandler(Reflection.getClass("{nms}.PacketPlayInUseEntity"), (p, packet) -> p.getGameMode() == GameMode.SPECTATOR ? null : packet);
+        ProtocolAPI.setIncomingHandler(Reflection.getClass("{nms.network.protocol.game}.PacketPlayInUseEntity"), (p, packet) -> p.getGameMode() == GameMode.SPECTATOR ? null : packet);
 
         register();
     }
@@ -98,9 +98,10 @@ public class TechHider extends StateDependent {
         techhiders.keySet().forEach(ProtocolAPI::removeOutgoingHandler);
     }
 
-    private static final Class<?> nbtTagCompound = Reflection.getClass("{nms}.NBTTagCompound");
+    private static final Class<?> nbtTagCompound = Reflection.getClass("{nms.nbt}.NBTTagCompound");
-    private static final Reflection.MethodInvoker nbtTagGetString = Reflection.getTypedMethod(nbtTagCompound, "getString", String.class, String.class);
+    private static final Reflection.MethodInvoker nbtTagGetString = Reflection.getTypedMethod(nbtTagCompound, null, String.class, String.class);
 
+    //TODO
     private static final Class<?> mapChunkPacket = Reflection.getClass("{nms}.PacketPlayOutMapChunk");
     private static final UnaryOperator<Object> mapChunkCloner = ProtocolAPI.shallowCloneGenerator(mapChunkPacket);
     private static final Reflection.FieldAccessor<Integer> mapChunkX = Reflection.getField(mapChunkPacket, int.class, 0);
@@ -134,7 +135,8 @@ public class TechHider extends StateDependent {
         return packet;
     }
 
-    private static final Class<?> multiBlockChangePacket = Reflection.getClass("{nms}.PacketPlayOutMultiBlockChange");
+    private static final Class<?> multiBlockChangePacket = Reflection.getClass("{nms.network.protocol.game}.PacketPlayOutMultiBlockChange");
+    //TODO
     private static final UnaryOperator<Object> multiBlockChangeCloner = ProtocolAPI.shallowCloneGenerator(multiBlockChangePacket);
     private static final Class<?> chunkCoordinateIntPair = Reflection.getClass("{nms}.ChunkCoordIntPair");
     private static final Reflection.FieldAccessor<?> multiBlockChangeChunk = Reflection.getField(multiBlockChangePacket, chunkCoordinateIntPair, 0);

FightSystem_Main/pom.xml

@@ -92,6 +92,12 @@
             <version>1.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>steamwar</groupId>
+            <artifactId>FightSystem_18</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>steamwar</groupId>
             <artifactId>FightSystem_Core</artifactId>

pom.xml

@@ -57,10 +57,23 @@
         <module>FightSystem_12</module>
         <module>FightSystem_14</module>
         <module>FightSystem_15</module>
+        <module>FightSystem_18</module>
         <module>FightSystem_Core</module>
         <module>FightSystem_Main</module>
     </modules>
 
+    <repositories>
+        <repository>
+            <id>minecraft-libraries</id>
+            <name>Minecraft Libraries</name>
+            <url>https://libraries.minecraft.net</url>
+        </repository>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>steamwar</groupId>