Reduce duplicate code (#18)

* Reduce duplicate code * Fix gradle task name * Revert name changes * Revert action name * Cleanup * Revert to java 17 * Fix generation * Cleanup * Simplify code of DGU * Remove unnecessary annotations * Remove unused var * Halt with error on error * Remove unused mixins * Update fabric loader * Ignore success result * Update gradle and use merged jar * Implement new client and server merged environment for running fabric * Set server run dir as asset dir * More cleanup * More cleanup 2 * More improvements * Remove more duplicate code * Use newer java methods * More cleanup * Remove SoundAccessors * More cleanup * Use java 21 for build * Initial work on 1.20.5 * Cleanup a lot of stuff * Do not generate mod jars to speed up builds * Override merger on now open classes directly * Use recommended approach * Readd custom merger * Working materials data generator * Fix inconsistencies * Fix collision order to be random * Use LinkedHashMap for more reproducibility * Fix imports
2024-07-14 09:23:34 +02:00
parent 44f49b4ab5
commit 71070c32bc
459 changed files with 3421 additions and 9078 deletions
@@ -0,0 +1,23 @@
+import org.gradle.api.Project
+import xyz.wagyourtail.unimined.api.minecraft.EnvType
+import xyz.wagyourtail.unimined.api.minecraft.MinecraftJar
+import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider
+import xyz.wagyourtail.unimined.internal.minecraft.patch.fabric.OfficialFabricMinecraftTransformer
+import xyz.wagyourtail.unimined.internal.minecraft.transform.merge.ClassMerger
+
+// Prevents adding @Environment annotations to classes
+@Suppress("UnstableApiUsage")
+class CustomOfficialFabricMinecraftTransformer(
+    project: Project,
+    provider: MinecraftProvider
+) : OfficialFabricMinecraftTransformer(project, provider) {
+    override val merger: ClassMerger = ClassMerger()
+
+    override fun mergedJar(clientjar: MinecraftJar, serverjar: MinecraftJar): MinecraftJar {
+        return MinecraftJar(
+            clientjar,
+            envType = EnvType.COMBINED,
+            patches = listOf("$providerName-merged", "custom-no-environment") + clientjar.patches + serverjar.patches
+        )
+    }
+}