Update to MC 1.14 / Fabric

2019-05-04 14:37:00 +02:00
parent 17fe5b345f
commit 3d009e45c7
151 changed files with 3963 additions and 1455 deletions
--- a/src/main/java/com/replaymod/render/blend/mixin/ContainerLocalRenderInformationAccessor.java
+++ b/src/main/java/com/replaymod/render/blend/mixin/ContainerLocalRenderInformationAccessor.java
@@ -5,13 +5,21 @@ import net.minecraft.client.renderer.chunk.RenderChunk;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

+//#if MC>=11400
+//$$ @Mixin(targets = "net/minecraft/client/render/WorldRenderer$ChunkInfo")
+//#else
 //#if MC>=11300
@Mixin(targets = "net/minecraft/client/renderer/WorldRenderer$ContainerLocalRenderInformation")
 //#else
 //$$ @Mixin(targets = "net/minecraft/client/renderer/RenderGlobal$ContainerLocalRenderInformation")
 //#endif
+//#endif
 public interface ContainerLocalRenderInformationAccessor {
+    //#if MC>=11400
+    //$$ @Accessor("renderer")
+    //#else
    @Accessor
+    //#endif
    RenderChunk getRenderChunk();
 }
 //#endif
--- a/src/main/java/com/replaymod/render/blend/mixin/MixinEffectRenderer.java
+++ b/src/main/java/com/replaymod/render/blend/mixin/MixinEffectRenderer.java
@@ -3,12 +3,17 @@ package com.replaymod.render.blend.mixin;

 import com.replaymod.render.blend.BlendState;
 import com.replaymod.render.blend.exporters.ParticlesExporter;
-import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

+//#if MC>=11400
+//$$ import net.minecraft.client.render.Camera;
+//#else
+import net.minecraft.entity.Entity;
+//#endif
+
 //#if MC>=10904
 import net.minecraft.client.particle.ParticleManager;
 //#else
@@ -23,7 +28,15 @@ import net.minecraft.client.particle.ParticleManager;
 public abstract class MixinEffectRenderer {

    @Inject(method = "renderParticles", at = @At("HEAD"))
-    public void preRender(Entity view, float renderPartialTicks, CallbackInfo ci) {
+    private void preRender(
+            //#if MC>=11400
+            //$$ Camera view,
+            //#else
+            Entity view,
+            //#endif
+            float renderPartialTicks,
+            CallbackInfo ci
+    ) {
        BlendState blendState = BlendState.getState();
        if (blendState != null) {
            blendState.get(ParticlesExporter.class).preParticlesRender(false);
@@ -31,13 +44,22 @@ public abstract class MixinEffectRenderer {
    }

    @Inject(method = "renderParticles", at = @At("RETURN"))
-    public void postRender(Entity view, float renderPartialTicks, CallbackInfo ci) {
+    private void postRender(
+            //#if MC>=11400
+            //$$ Camera view,
+            //#else
+            Entity view,
+            //#endif
+            float renderPartialTicks,
+            CallbackInfo ci
+    ) {
        BlendState blendState = BlendState.getState();
        if (blendState != null) {
            blendState.get(ParticlesExporter.class).postParticlesRender();
        }
    }

+    //#if MC<11400
    @Inject(method = "renderLitParticles", at = @At("HEAD"))
    public void preLitRender(Entity view, float renderPartialTicks, CallbackInfo ci) {
        BlendState blendState = BlendState.getState();
@@ -53,5 +75,6 @@ public abstract class MixinEffectRenderer {
            blendState.get(ParticlesExporter.class).postParticlesRender();
        }
    }
+    //#endif
 }
 //#endif
--- a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderGlobal.java
+++ b/src/main/java/com/replaymod/render/blend/mixin/MixinRenderGlobal.java
@@ -5,12 +5,17 @@ import com.replaymod.render.blend.BlendState;
 import com.replaymod.render.blend.exporters.EntityExporter;
 import com.replaymod.render.blend.exporters.TileEntityExporter;
 import net.minecraft.client.renderer.culling.ICamera;
-import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

+//#if MC>=11400
+//$$ import net.minecraft.client.render.Camera;
+//#else
+import net.minecraft.entity.Entity;
+//#endif
+
 //#if MC>=11300
 import net.minecraft.client.renderer.WorldRenderer;
 //#else
@@ -33,7 +38,13 @@ public abstract class MixinRenderGlobal {
                    //#else
                    //$$ target = "Lnet/minecraft/client/renderer/entity/RenderManager;renderEntitySimple(Lnet/minecraft/entity/Entity;F)Z"))
                    //#endif
-    public void preEntityRender(Entity view, ICamera camera, float renderPartialTicks, CallbackInfo ci) {
+    private void preEntityRender(
+            //#if MC>=11400
+            //$$ Camera view,
+            //#else
+            Entity view,
+            //#endif
+            ICamera camera, float renderPartialTicks, CallbackInfo ci) {
        BlendState blendState = BlendState.getState();
        if (blendState != null) {
            blendState.get(EntityExporter.class).preEntitiesRender();
@@ -48,7 +59,13 @@ public abstract class MixinRenderGlobal {
                    //$$ target = "Lnet/minecraft/client/renderer/entity/RenderManager;renderEntitySimple(Lnet/minecraft/entity/Entity;F)Z",
                    //#endif
                    shift = At.Shift.AFTER))
-    public void postEntityRender(Entity view, ICamera camera, float renderPartialTicks, CallbackInfo ci) {
+    private void postEntityRender(
+            //#if MC>=11400
+            //$$ Camera view,
+            //#else
+            Entity view,
+            //#endif
+            ICamera camera, float renderPartialTicks, CallbackInfo ci) {
        BlendState blendState = BlendState.getState();
        if (blendState != null) {
            blendState.get(EntityExporter.class).postEntitiesRender();
@@ -63,7 +80,13 @@ public abstract class MixinRenderGlobal {
            //$$ target = "Lnet/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher;renderTileEntity(Lnet/minecraft/tileentity/TileEntity;FI)V"
            //#endif
    ))
-    public void preTileEntityRender(Entity view, ICamera camera, float renderPartialTicks, CallbackInfo ci) {
+    private void preTileEntityRender(
+            //#if MC>=11400
+            //$$ Camera view,
+            //#else
+            Entity view,
+            //#endif
+            ICamera camera, float renderPartialTicks, CallbackInfo ci) {
        BlendState blendState = BlendState.getState();
        if (blendState != null) {
            blendState.get(TileEntityExporter.class).preTileEntitiesRender();
@@ -79,7 +102,13 @@ public abstract class MixinRenderGlobal {
            //#endif
            shift = At.Shift.AFTER
    ))
-    public void postTileEntityRender(Entity view, ICamera camera, float renderPartialTicks, CallbackInfo ci) {
+    private void postTileEntityRender(
+            //#if MC>=11400
+            //$$ Camera view,
+            //#else
+            Entity view,
+            //#endif
+            ICamera camera, float renderPartialTicks, CallbackInfo ci) {
        BlendState blendState = BlendState.getState();
        if (blendState != null) {
            blendState.get(TileEntityExporter.class).postTileEntitiesRender();
--- a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderItem.java
+++ b/src/main/java/com/replaymod/render/blend/mixin/MixinRenderItem.java
@@ -28,6 +28,9 @@ import net.minecraft.client.renderer.model.IBakedModel;
 //$$ @Mixin(RenderItem.class)
 //#endif
 public abstract class MixinRenderItem {
+    //#if MC>=11400
+    //$$ @Inject(method = "renderItemModel", at = @At("HEAD"))
+    //#else
    //#if MC>=11300
    @Inject(method = "renderModel(Lnet/minecraft/client/renderer/model/IBakedModel;Lnet/minecraft/item/ItemStack;)V",
            at = @At("HEAD"))
@@ -40,6 +43,7 @@ public abstract class MixinRenderItem {
    //$$         at = @At("HEAD"))
    //#endif
    //#endif
+    //#endif
    private void onRenderModel(IBakedModel model, ItemStack stack, CallbackInfo ci) {
        BlendState blendState = BlendState.getState();
        if (blendState != null) {
--- a/src/main/java/com/replaymod/render/blend/mixin/MixinRenderManager.java
+++ b/src/main/java/com/replaymod/render/blend/mixin/MixinRenderManager.java
@@ -19,11 +19,15 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class MixinRenderManager {

    @Inject(
+            //#if MC>=11400
+            //$$ method = "render(Lnet/minecraft/entity/Entity;DDDFFZ)V",
+            //#else
            //#if MC>=11300
            method = "renderEntity",
            //#else
            //$$ method = "doRenderEntity",
            //#endif
+            //#endif
            at = @At(value = "INVOKE",
                     target = "Lnet/minecraft/client/renderer/entity/Render;doRender(Lnet/minecraft/entity/Entity;DDDFF)V"))
    public void preRender(Entity entity, double x, double y, double z, float yaw, float renderPartialTicks, boolean box,
@@ -39,11 +43,15 @@ public abstract class MixinRenderManager {
    }

    @Inject(
+            //#if MC>=11400
+            //$$ method = "render(Lnet/minecraft/entity/Entity;DDDFFZ)V",
+            //#else
            //#if MC>=11300
            method = "renderEntity",
            //#else
            //$$ method = "doRenderEntity",
            //#endif
+            //#endif
            at = @At(value = "INVOKE",
                     target = "Lnet/minecraft/client/renderer/entity/Render;doRender(Lnet/minecraft/entity/Entity;DDDFF)V",
                     shift = At.Shift.AFTER))
--- a/src/main/java/com/replaymod/render/blend/mixin/MixinTileEntityRendererDispatcher.java
+++ b/src/main/java/com/replaymod/render/blend/mixin/MixinTileEntityRendererDispatcher.java
@@ -14,8 +14,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class MixinTileEntityRendererDispatcher {

    //#if MC>=11300
+    //#if MC>=11400
+    //$$ @Inject(method = "renderEntity(Lnet/minecraft/block/entity/BlockEntity;DDDFIZ)V",
+    //$$         at = @At("HEAD"))
+    //#else
    @Inject(method = "render(Lnet/minecraft/tileentity/TileEntity;DDDFIZ)V",
            at = @At("HEAD"))
+    //#endif
    public void preRender(TileEntity tileEntity, double x, double y, double z, float renderPartialTicks, int destroyStage, boolean hasNoBlock, CallbackInfo ci) {
        float alpha = 1;
    //#else
@@ -37,8 +42,13 @@ public abstract class MixinTileEntityRendererDispatcher {
    }

    //#if MC>=11300
+    //#if MC>=11400
+    //$$ @Inject(method = "renderEntity(Lnet/minecraft/block/entity/BlockEntity;DDDFIZ)V",
+    //$$         at = @At("RETURN"))
+    //#else
    @Inject(method = "render(Lnet/minecraft/tileentity/TileEntity;DDDFIZ)V",
            at = @At("RETURN"))
+    //#endif
    public void postRender(TileEntity tileEntity, double x, double y, double z, float renderPartialTicks, int destroyStage, boolean hasNoBlock, CallbackInfo ci) {
    //#else
    //#if MC>=11200