Support OptiFine_1.15.2_HD_U_G1_pre20.

ZekerZhayard · Jun 5, 2020 · fecffd2 · fecffd2
1 parent 4e560c5
commit fecffd2
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 # OptiForge ([CurseForge](https://www.curseforge.com/minecraft/mc-mods/optiforge))
 
-*Compatibility: (2020-05-17)*  
-&emsp;*OptiForge-0.1.19*  
+*Compatibility: (2020-06-05)*  
+&emsp;*OptiForge-0.1.20*  
 &emsp;*Forge-1.15.2-31.1.95 or newer version*  
-&emsp;*OptiFine-1.15.2-G1-pre15 or newer version*  
+&emsp;*OptiFine-1.15.2-G1-pre20 or newer version*  
 
 ## How to Use
 

diff --git a/gradle.properties b/gradle.properties
@@ -3,9 +3,9 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-mod_version=0.1.19
-# G1_pre15
-optifine_version=7.1.15
+mod_version=0.1.20
+# G1_pre20
+optifine_version=7.1.20
 minecraft_version=1.15.2
 forge_version=31.1.95
 forge_gradle_version=3.0.170

diff --git a/...rzhayard/optiforge/asm/mixins/net/minecraft/client/renderer/entity/MixinItemRenderer.java b/...rzhayard/optiforge/asm/mixins/net/minecraft/client/renderer/entity/MixinItemRenderer.java
@@ -6,12 +6,24 @@
 import net.minecraft.client.renderer.model.IBakedModel;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.Slice;
 
 @Mixin(ItemRenderer.class)
 @SuppressWarnings("deprecation")
 public abstract class MixinItemRenderer {
+    @ModifyVariable(
+        method = "Lnet/minecraft/client/renderer/entity/ItemRenderer;render(Lnet/minecraft/entity/item/ItemEntity;FFLcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;I)V",
+        at = @At("STORE"),
+        ordinal = 3,
+        require = 1,
+        allow = 1
+    )
+    private float modifyVariable$render$0(float f1) {
+        return this.shouldBob() ? f1 : 0;
+    }
+
     @Redirect(
         method = "Lnet/minecraft/client/renderer/entity/ItemRenderer;render(Lnet/minecraft/entity/item/ItemEntity;FFLcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;I)V",
         slice = @Slice(
@@ -108,12 +120,48 @@ public abstract class MixinItemRenderer {
         at = @At(
             value = "INVOKE",
             target = "Lcom/mojang/blaze3d/matrix/MatrixStack;translate(DDD)V",
-            ordinal = 4
+            ordinal = 2
         ),
         require = 1,
         allow = 1
     )
     private void redirect$render$6(MatrixStack matrixStackIn, double x, double y, double z) {
+        matrixStackIn.translate(this.shouldSpreadItems() ? x : 0, this.shouldSpreadItems() ? y : 0, this.shouldSpreadItems() ? z : 0);
+    }
+
+    @Redirect(
+        method = "Lnet/minecraft/client/renderer/entity/ItemRenderer;render(Lnet/minecraft/entity/item/ItemEntity;FFLcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;I)V",
+        at = @At(
+            value = "INVOKE",
+            target = "Lcom/mojang/blaze3d/matrix/MatrixStack;translate(DDD)V",
+            ordinal = 3
+        ),
+        require = 1,
+        allow = 1
+    )
+    private void redirect$render$7(MatrixStack matrixStackIn, double x, double y, double z) {
+        matrixStackIn.translate(this.shouldSpreadItems() ? x : 0, this.shouldSpreadItems() ? y : 0, z);
+    }
+
+    @Redirect(
+        method = "Lnet/minecraft/client/renderer/entity/ItemRenderer;render(Lnet/minecraft/entity/item/ItemEntity;FFLcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;I)V",
+        at = @At(
+            value = "INVOKE",
+            target = "Lcom/mojang/blaze3d/matrix/MatrixStack;translate(DDD)V",
+            ordinal = 4
+        ),
+        require = 1,
+        allow = 1
+    )
+    private void redirect$render$8(MatrixStack matrixStackIn, double x, double y, double z) {
         matrixStackIn.translate(0.0, 0.0, 0.09375F);
     }
+
+    public boolean shouldSpreadItems() {
+        return true;
+    }
+
+    public boolean shouldBob() {
+        return true;
+    }
 }