🐛 Fixed a bug with old versions

SkytAsul · Dec 23, 2024 · 65bc2b0 · 65bc2b0
1 parent ec30df9
commit 65bc2b0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>fr.skytasul</groupId>
 	<artifactId>glowingentities</artifactId>
-	<version>1.4.2</version>
+	<version>1.4.3</version>
 
 	<name>GlowingEntities</name>
 	<description>A Spigot util to easily make entities glow.</description>
@@ -64,7 +64,7 @@
 		<dependency>
 			<groupId>fr.skytasul</groupId>
 			<artifactId>reflection-mappings-shrieker</artifactId>
-			<version>1.0.0</version>
+			<version>1.1.0</version>
 			<scope>provided</scope>
 		</dependency>
 

diff --git a/src/main/resources/fr/skytasul/glowingentities/mappings/spigot.txt b/src/main/resources/fr/skytasul/glowingentities/mappings/spigot.txt
@@ -388,7 +388,7 @@ net.minecraft.world.scores.Team$CollisionRule -> net.minecraft.world.scores.Scor
     NEVER -> b
 net.minecraft.server.network.ServerGamePacketListenerImpl -> net.minecraft.server.network.PlayerConnection:
     connection -> a
-    send(net.minecraft.network.protocol.Packet) -> a
+    send(net.minecraft.network.protocol.Packet) -> sendPacket
 net.minecraft.network.syncher.SynchedEntityData$DataItem -> net.minecraft.network.syncher.DataWatcher$Item:
     getAccessor() -> a
     getValue() -> b
@@ -551,7 +551,7 @@ net.minecraft.world.scores.Team$CollisionRule -> net.minecraft.world.scores.Scor
     NEVER -> b
 net.minecraft.server.network.ServerGamePacketListenerImpl -> net.minecraft.server.network.PlayerConnection:
     connection -> a
-    send(net.minecraft.network.protocol.Packet) -> a
+    send(net.minecraft.network.protocol.Packet) -> sendPacket
 net.minecraft.network.syncher.SynchedEntityData$DataItem -> net.minecraft.network.syncher.DataWatcher$Item:
     getAccessor() -> a
     getValue() -> b

diff --git a/src/mappingsgen/java/fr/skytasul/glowingentities/GlowingEntitiesMappingsGenerator.java b/src/mappingsgen/java/fr/skytasul/glowingentities/GlowingEntitiesMappingsGenerator.java
@@ -2,6 +2,7 @@
 
 import fr.skytasul.reflection.Version;
 import fr.skytasul.reflection.mappings.files.ProguardMapping;
+import fr.skytasul.reflection.shrieker.CustomMappings;
 import fr.skytasul.reflection.shrieker.MappingsShrieker;
 import fr.skytasul.reflection.shrieker.PipeMappings;
 import fr.skytasul.reflection.shrieker.minecraft.MinecraftMappingsProvider;
@@ -35,7 +36,9 @@ public void start() throws MappingGenerationException, IOException {
 			try {
 				LOGGER.info("Downloading mappings for " + version + "...");
 				var minecraftMappings = mappingsProvider.loadMinecraftMappings(version);
-				var spigotMappings = mappingsProvider.loadSpigotMappings(version);
+				var spigotMappings = new CustomMappings(mappingsProvider.loadSpigotMappings(version));
+				spigotMappings.getClassFromMapped("net.minecraft.server.network.PlayerConnection").inheritsFrom(
+						spigotMappings.getClassFromMapped("net.minecraft.server.network.ServerPlayerConnection"));
 				LOGGER.info("Shrieking mappings...");
 				spigotShrieker.registerVersionMappings(version, new PipeMappings(minecraftMappings, spigotMappings));
 			} catch (ReflectiveOperationException ex) {