add legacy exceptions/signatures provider for better gen1 support

OrnitheMC · Jul 17, 2024 · 8acc0d1 · 8acc0d1
1 parent 0d9e112
commit 8acc0d1
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/src/main/java/net/ornithemc/ploceus/PloceusGradleExtension.java b/src/main/java/net/ornithemc/ploceus/PloceusGradleExtension.java
@@ -70,7 +70,11 @@ public PloceusGradleExtension(Project project) {
 		this.exceptionsProvider.convention(project.provider(() -> {
 			ExceptionsProvider provider;
 			if (loom.getMinecraftProvider().isLegacyVersion()) {
-				provider = new ExceptionsProvider.Split(project, loom, this);
+				if (getGeneration().get() == 1) {
+					provider = new ExceptionsProvider.Legacy(project, loom, this, getSide().get());
+				} else {
+					provider = new ExceptionsProvider.Split(project, loom, this);
+				}
 			} else {
 				provider = new ExceptionsProvider.Simple(project, loom, this);
 			}
@@ -82,7 +86,11 @@ public PloceusGradleExtension(Project project) {
 		this.signaturesProvider.convention(project.provider(() -> {
 			SignaturesProvider provider;
 			if (loom.getMinecraftProvider().isLegacyVersion()) {
-				provider = new SignaturesProvider.Split(project, loom, this);
+				if (getGeneration().get() == 1) {
+					provider = new SignaturesProvider.Legacy(project, loom, this, getSide().get());
+				} else {
+					provider = new SignaturesProvider.Split(project, loom, this);
+				}
 			} else {
 				provider = new SignaturesProvider.Simple(project, loom, this);
 			}

diff --git a/src/main/java/net/ornithemc/ploceus/exceptions/ExceptionsProvider.java b/src/main/java/net/ornithemc/ploceus/exceptions/ExceptionsProvider.java
@@ -26,6 +26,7 @@
 import net.ornithemc.mappingutils.MappingUtils;
 import net.ornithemc.ploceus.Constants;
 import net.ornithemc.ploceus.PloceusGradleExtension;
+import net.ornithemc.ploceus.api.GameSide;
 
 public class ExceptionsProvider {
 
@@ -112,6 +113,13 @@ public Simple(Project project, LoomGradleExtension loom, PloceusGradleExtension
 		}
 	}
 
+	public static class Legacy extends ExceptionsProvider {
+
+		public Legacy(Project project, LoomGradleExtension loom, PloceusGradleExtension ploceus, GameSide side) {
+			super(project, loom, ploceus, Constants.EXCEPTIONS_CONFIGURATION, side == GameSide.CLIENT ? MappingsNamespace.CLIENT_OFFICIAL : MappingsNamespace.SERVER_OFFICIAL);
+		}
+	}
+
 	public static class Split extends ExceptionsProvider {
 
 		private final ExceptionsProvider client;

diff --git a/src/main/java/net/ornithemc/ploceus/signatures/SignaturesProvider.java b/src/main/java/net/ornithemc/ploceus/signatures/SignaturesProvider.java
@@ -27,6 +27,7 @@
 import net.ornithemc.mappingutils.MappingUtils;
 import net.ornithemc.ploceus.Constants;
 import net.ornithemc.ploceus.PloceusGradleExtension;
+import net.ornithemc.ploceus.api.GameSide;
 
 public class SignaturesProvider {
 
@@ -113,6 +114,13 @@ public Simple(Project project, LoomGradleExtension loom, PloceusGradleExtension
 		}
 	}
 
+	public static class Legacy extends SignaturesProvider {
+
+		public Legacy(Project project, LoomGradleExtension loom, PloceusGradleExtension ploceus, GameSide side) {
+			super(project, loom, ploceus, Constants.SIGNATURES_CONFIGURATION, side == GameSide.CLIENT ? MappingsNamespace.CLIENT_OFFICIAL : MappingsNamespace.SERVER_OFFICIAL);
+		}
+	}
+
 	public static class Split extends SignaturesProvider {
 
 		private final SignaturesProvider client;