[MOD-31] 1.12.2 port

Deftu · Deftu · commit c780811122fe · 2024-12-24T08:55:12.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -62,7 +62,7 @@ repositories {
 dependencies {
     when {
         mcData.isLegacyForge -> {
-            compileOnly("org.spongepowered:mixin:0.7.11-SNAPSHOT")
+            compileOnly("org.polyfrost:polymixin:0.8.4+build.2")
         }
 
         mcData.isFabric -> {
diff --git a/root.gradle.kts b/root.gradle.kts
@@ -3,7 +3,11 @@ plugins {
 }
 
 preprocess {
-    "1.8.9-forge"(10809, "srg") {
-        "1.8.9-fabric"(10809, "yarn")
+    "1.12.2-fabric"(11202, "yarn") {
+        "1.12.2-forge"(11202, "srg") {
+            "1.8.9-forge"(10809, "srg", file("versions/1.12.2-forge+1.8.9-forge.txt")) {
+                "1.8.9-fabric"(10809, "yarn")
+            }
+        }
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -34,7 +34,9 @@ rootProject.buildFileName = "root.gradle.kts"
 // Adds all of our build target versions to the classpath if we need to add version-specific code.
 listOf(
     "1.8.9-forge",
-    "1.8.9-fabric"
+    "1.8.9-fabric",
+    "1.12.2-forge",
+    "1.12.2-fabric"
 ).forEach { version ->
     include(":$version")
     project(":$version").apply {
diff --git a/src/main/java/org/polyfrost/redaction/mixin/GuiScreenServerListMixin.java b/src/main/java/org/polyfrost/redaction/mixin/GuiScreenServerListMixin.java
@@ -50,7 +50,19 @@ public class GuiScreenServerListMixin extends GuiScreen {
                 previewData.field_78841_f = false;
             }
 
-            this.redaction$serverPreview.drawEntry(0, this.width / 2 - 100, 30, 200, 35, mouseX, mouseY, false);
+            this.redaction$serverPreview.drawEntry(
+                    0,
+                    this.width / 2 - 100,
+                    30,
+                    200,
+                    35,
+                    mouseX,
+                    mouseY,
+                    false
+                    //#if MC >= 1.12.2
+                    //$$ , partialTicks
+                    //#endif
+            );
         }
     }
 
diff --git a/src/main/java/org/polyfrost/redaction/mixin/RenderItemMixin.java b/src/main/java/org/polyfrost/redaction/mixin/RenderItemMixin.java
@@ -13,31 +13,57 @@
 
 @Mixin(RenderItem.class)
 public class RenderItemMixin {
-    @Inject(method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/RenderItem;renderModel(Lnet/minecraft/client/resources/model/IBakedModel;Lnet/minecraft/item/ItemStack;)V"))
+
+    @Inject(
+            method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/renderer/entity/RenderItem;renderModel(Lnet/minecraft/client/resources/model/IBakedModel;Lnet/minecraft/item/ItemStack;)V"
+            )
+    )
     private void beforeModelRender(ItemStack stack, IBakedModel model, CallbackInfo ci) {
         if (RedactionConfig.INSTANCE.getDisableHandLighting() && Redaction.INSTANCE.getRenderingHand()) {
             GlStateManager.disableLighting();
         }
     }
 
-    @Inject(method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/RenderItem;renderModel(Lnet/minecraft/client/resources/model/IBakedModel;Lnet/minecraft/item/ItemStack;)V", shift = At.Shift.AFTER))
+    @Inject(
+            method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/renderer/entity/RenderItem;renderModel(Lnet/minecraft/client/resources/model/IBakedModel;Lnet/minecraft/item/ItemStack;)V", shift = At.Shift.AFTER
+            )
+    )
     private void afterModelRender(ItemStack stack, IBakedModel model, CallbackInfo ci) {
         if (RedactionConfig.INSTANCE.getDisableHandLighting() && Redaction.INSTANCE.getRenderingHand()) {
             GlStateManager.enableLighting();
         }
     }
 
-    @Inject(method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer;renderByItem(Lnet/minecraft/item/ItemStack;)V"))
+    @Inject(
+            method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer;renderByItem(Lnet/minecraft/item/ItemStack;)V"
+            )
+    )
     private void beforeTileModelRender(ItemStack stack, IBakedModel model, CallbackInfo ci) {
         if (RedactionConfig.INSTANCE.getDisableHandLighting() && Redaction.INSTANCE.getRenderingHand()) {
             GlStateManager.disableLighting();
         }
     }
 
-    @Inject(method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer;renderByItem(Lnet/minecraft/item/ItemStack;)V", shift = At.Shift.AFTER))
+    @Inject(
+            method = "renderItem(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/resources/model/IBakedModel;)V",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer;renderByItem(Lnet/minecraft/item/ItemStack;)V", shift = At.Shift.AFTER
+            )
+    )
     private void afterTileModelRender(ItemStack stack, IBakedModel model, CallbackInfo ci) {
         if (RedactionConfig.INSTANCE.getDisableHandLighting() && Redaction.INSTANCE.getRenderingHand()) {
             GlStateManager.enableLighting();
         }
     }
+
 }
diff --git a/src/main/kotlin/org/polyfrost/redaction/plugin/RedactionMixinPlugin.kt b/src/main/kotlin/org/polyfrost/redaction/plugin/RedactionMixinPlugin.kt
@@ -1,11 +1,6 @@
 package org.polyfrost.redaction.plugin
 
-//#if FORGE && MC <= 1.12.2
-import org.spongepowered.asm.lib.tree.ClassNode
-//#else
-//$$ import org.objectweb.asm.tree.ClassNode
-//#endif
-
+import org.objectweb.asm.tree.ClassNode
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo
 
diff --git a/versions/1.12.2-forge+1.8.9-forge.txt b/versions/1.12.2-forge+1.8.9-forge.txt
@@ -0,0 +1,2 @@
+net.minecraft.client.renderer.RenderItem net.minecraft.client.renderer.entity.RenderItem
+net.minecraft.client.renderer.block.model.IBakedModel net.minecraft.client.resources.model.IBakedModel

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ repositories {`
`62`	`62`	`dependencies {`
`63`	`63`	`when {`
`64`	`64`	`mcData.isLegacyForge -> {`
`65`		`- compileOnly("org.spongepowered:mixin:0.7.11-SNAPSHOT")`
	`65`	`+ compileOnly("org.polyfrost:polymixin:0.8.4+build.2")`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`mcData.isFabric -> {`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,11 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`preprocess {`
`6`		`- "1.8.9-forge"(10809, "srg") {`
`7`		`- "1.8.9-fabric"(10809, "yarn")`
	`6`	`+ "1.12.2-fabric"(11202, "yarn") {`
	`7`	`+ "1.12.2-forge"(11202, "srg") {`
	`8`	`+ "1.8.9-forge"(10809, "srg", file("versions/1.12.2-forge+1.8.9-forge.txt")) {`
	`9`	`+ "1.8.9-fabric"(10809, "yarn")`
	`10`	`+ }`
	`11`	`+ }`
`8`	`12`	`}`
`9`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,19 @@ public class GuiScreenServerListMixin extends GuiScreen {`
`50`	`50`	`previewData.field_78841_f = false;`
`51`	`51`	`}`
`52`	`52`
`53`		`- this.redaction$serverPreview.drawEntry(0, this.width / 2 - 100, 30, 200, 35, mouseX, mouseY, false);`
	`53`	`+ this.redaction$serverPreview.drawEntry(`
	`54`	`+ 0,`
	`55`	`+ this.width / 2 - 100,`
	`56`	`+ 30,`
	`57`	`+ 200,`
	`58`	`+ 35,`
	`59`	`+ mouseX,`
	`60`	`+ mouseY,`
	`61`	`+ false`
	`62`	`+ //#if MC >= 1.12.2`
	`63`	`+ //$$ , partialTicks`
	`64`	`+ //#endif`
	`65`	`+ );`
`54`	`66`	`}`
`55`	`67`	`}`
`56`	`68`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+net.minecraft.client.renderer.RenderItem net.minecraft.client.renderer.entity.RenderItem`
	`2`	`+net.minecraft.client.renderer.block.model.IBakedModel net.minecraft.client.resources.model.IBakedModel`