fix missing resources on shadeapi

unimined · May 9, 2024 · 2da2270 · 2da2270
1 parent bed33f3
commit 2da2270
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/task/ShadeAPI.kt b/gradle-plugin/src/main/kotlin/xyz/wagyourtail/jvmdg/gradle/task/ShadeAPI.kt
@@ -191,6 +191,15 @@ abstract class ShadeAPI @Inject constructor(@Internal val jvmdg: JVMDowngraderEx
                     os.write(writer.toByteArray())
                 }
             }
+            forEachInZip(inputFile.get().asFile.toPath()) { name, stream ->
+                if (!name.endsWith(".class")) {
+                    val path = fs.getPath(name)
+                    path.parent?.createDirectories()
+                    path.outputStream(StandardOpenOption.CREATE).use { os ->
+                        stream.copyTo(os)
+                    }
+                }
+            }
         }
         from(project.zipTree(tempOutput))
         copy()

diff --git a/java-api/src/java17/java/xyz/wagyourtail/jvmdg/j17/stub/java_base/J_U_R_RandomGenerator.java b/java-api/src/java17/java/xyz/wagyourtail/jvmdg/j17/stub/java_base/J_U_R_RandomGenerator.java
@@ -9,12 +9,12 @@
 @Adapter(value = "java/util/random/RandomGenerator")
 public interface J_U_R_RandomGenerator {
 
-    public static boolean jvmdg$instanceof(Object obj) {
+    static boolean jvmdg$instanceof(Object obj) {
         return obj instanceof J_U_R_RandomGenerator ||
                 obj instanceof java.util.Random;
     }
 
-    public static J_U_R_RandomGenerator jvmdg$checkcast(Object obj) {
+    static J_U_R_RandomGenerator jvmdg$checkcast(Object obj) {
         if (obj instanceof Random) {
             throw MissingStubError.create();
         }