v1_17 part 10: final sweep of updates - it compiles!

DenizenScript · Jun 12, 2021 · 435c3c5 · 435c3c5
1 parent 91d3789
commit 435c3c5
Show file tree

Hide file tree

Showing 14 changed files with 224 additions and 196 deletions.
diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/Handler.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/Handler.java
@@ -6,7 +6,6 @@
 import com.denizenscript.denizen.nms.v1_16.impl.BiomeNMSImpl;
 import com.denizenscript.denizen.nms.v1_16.impl.ProfileEditorImpl;
 import com.denizenscript.denizen.nms.v1_16.impl.SidebarImpl;
-import com.denizenscript.denizen.nms.v1_17.helpers.*;
 import com.denizenscript.denizen.nms.v1_16.impl.blocks.BlockLightImpl;
 import com.denizenscript.denizen.nms.v1_16.impl.jnbt.CompoundTagImpl;
 import com.denizenscript.denizen.nms.v1_16.impl.network.handlers.DenizenPacketListenerImpl;

diff --git a/.../com/denizenscript/denizen/nms/v1_16/impl/network/handlers/DenizenNetworkManagerImpl.java b/.../com/denizenscript/denizen/nms/v1_16/impl/network/handlers/DenizenNetworkManagerImpl.java
@@ -8,7 +8,6 @@
 import com.denizenscript.denizen.nms.v1_16.impl.network.packets.PacketOutChatImpl;
 import com.denizenscript.denizen.nms.v1_16.impl.network.packets.PacketOutEntityMetadataImpl;
 import com.denizenscript.denizen.nms.v1_16.impl.network.packets.PacketOutSpawnEntityImpl;
-import com.denizenscript.denizen.nms.v1_17.impl.network.packets.*;
 import com.denizenscript.denizen.nms.interfaces.packets.PacketOutSpawnEntity;
 import com.denizenscript.denizen.objects.LocationTag;
 import com.denizenscript.denizen.objects.PlayerTag;

diff --git a/v1_17/pom.xml b/v1_17/pom.xml
@@ -46,4 +46,42 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>net.md-5</groupId>
+                <artifactId>specialsource-maven-plugin</artifactId>
+                <version>1.2.2</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>remap</goal>
+                        </goals>
+                        <id>remap-obf</id>
+                        <configuration>
+                            <srgIn>org.spigotmc:minecraft-server:1.17-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
+                            <reverse>true</reverse>
+                            <remappedDependencies>org.spigotmc:spigot:1.17-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
+                            <remappedArtifactAttached>true</remappedArtifactAttached>
+                            <remappedClassifierName>remapped-obf</remappedClassifierName>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>remap</goal>
+                        </goals>
+                        <id>remap-spigot</id>
+                        <configuration>
+                            <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
+                            <srgIn>org.spigotmc:minecraft-server:1.17-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
+                            <remappedDependencies>org.spigotmc:spigot:1.17-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/...src/main/java/com/denizenscript/denizen/nms/v1_17/impl/entities/EntityFakePlayerImpl.java b/...src/main/java/com/denizenscript/denizen/nms/v1_17/impl/entities/EntityFakePlayerImpl.java
@@ -2,7 +2,7 @@
 
 import com.denizenscript.denizen.nms.v1_17.Handler;
 import com.denizenscript.denizen.nms.v1_17.impl.network.fakes.FakeNetworkManagerImpl;
-import com.denizenscript.denizen.nms.v1_17.impl.network.fakes.FakePlayerConnectionImplImpl;
+import com.denizenscript.denizen.nms.v1_17.impl.network.fakes.FakePlayerConnectionImpl;
 import com.mojang.authlib.GameProfile;
 import com.denizenscript.denizencore.utilities.debugging.Debug;
 import net.minecraft.network.Connection;
@@ -26,7 +26,7 @@ public EntityFakePlayerImpl(MinecraftServer minecraftserver, ServerLevel worldse
             Debug.echoError(ex);
         }
         Connection networkManager = new FakeNetworkManagerImpl(PacketFlow.CLIENTBOUND);
-        connection = new FakePlayerConnectionImplImpl(minecraftserver, networkManager, this);
+        connection = new FakePlayerConnectionImpl(minecraftserver, networkManager, this);
         networkManager.setListener(connection);
         getEntityData().set(Player.DATA_PLAYER_MODE_CUSTOMISATION, (byte) 127);
         if (doAdd) {

diff --git a/...com/denizenscript/denizen/nms/v1_17/impl/network/handlers/AbstractListenerPlayInImpl.java b/...com/denizenscript/denizen/nms/v1_17/impl/network/handlers/AbstractListenerPlayInImpl.java
@@ -10,7 +10,6 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
 import org.bukkit.event.player.PlayerTeleportEvent;
 
 import java.util.Set;
@@ -26,10 +25,11 @@ public AbstractListenerPlayInImpl(DenizenNetworkManagerImpl networkManager, Serv
         this.denizenNetworkManager = networkManager;
     }
 
+    /*
     @Override
     public CraftPlayer getPlayer() {
         return oldListener.getPlayer();
-    }
+    }*/
 
     @Override
     public Connection getConnection() {