Produce Java 8-compatible JARs

FiniteReality · Sep 17, 2024 · 9222fae · 9222fae
1 parent 4de314e
commit 9222fae
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import net.fabricmc.loom.task.RemapJarTask
 import org.embeddedt.embeddium.gradle.versioning.ProjectVersioner
-import org.w3c.dom.Element
+import xyz.wagyourtail.jvmdg.gradle.task.ShadeJar
 
 plugins {
     id("idea")
@@ -13,6 +13,8 @@ plugins {
     id("embeddium-fabric-remapper")
 
     id("com.gradleup.shadow") version "8.3.0"
+
+    id("xyz.wagyourtail.jvmdowngrader") version "1.0.0"
 }
 
 operator fun String.invoke(): String {
@@ -197,9 +199,9 @@ tasks.named<ShadowJar>("shadowJar").configure {
 }
 
 tasks.named<RemapJarTask>("remapJar") {
-    dependsOn("shadowJar")
+    dependsOn("shadeDowngradedApi")
     archiveClassifier = ""
-    inputFile = tasks.getByName<ShadowJar>("shadowJar").archiveFile.get()
+    inputFile = tasks.getByName<ShadeJar>("shadeDowngradedApi").archiveFile.get()
 }
 
 publishing {

diff --git a/...squid/mods/sodium/client/render/vertex/serializers/generated/VertexSerializerFactory.java b/...squid/mods/sodium/client/render/vertex/serializers/generated/VertexSerializerFactory.java
@@ -5,6 +5,8 @@
 import net.caffeinemc.mods.sodium.api.vertex.serializer.VertexSerializer;
 import org.lwjgl.system.MemoryUtil;
 import org.objectweb.asm.*;
+import org.spongepowered.asm.mixin.MixinEnvironment;
+
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.List;
@@ -18,7 +20,7 @@ public static Bytecode generate(VertexFormatDescription srcFormat, VertexFormatD
         var name = "me/jellysquid/mods/sodium/client/render/vertex/serializers/generated/VertexSerializer$Impl$" + identifier;
 
         ClassWriter classWriter = new ClassWriter(0);
-        classWriter.visit(Opcodes.V17, Opcodes.ACC_FINAL | Opcodes.ACC_PUBLIC, name, null,
+        classWriter.visit(MixinEnvironment.getCompatibilityLevel().getClassVersion(), Opcodes.ACC_FINAL | Opcodes.ACC_PUBLIC, name, null,
                 Type.getInternalName(Object.class),
                 new String[] { Type.getInternalName(VertexSerializer.class) });
 

diff --git a/src/main/resources/embeddium.mixins.json b/src/main/resources/embeddium.mixins.json
@@ -3,7 +3,7 @@
   "refmap": "embeddium-refmap.json",
   "required" : true,
   "minVersion": "0.8",
-  "compatibilityLevel" : "JAVA_17",
+  "compatibilityLevel" : "JAVA_8",
   "plugin" : "me.jellysquid.mods.sodium.mixin.SodiumMixinPlugin",
   "injectors" : {
     "defaultRequire" : 1