DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split off 1.12.2 overwrite from MixinCamera

Browse Source
This commit is contained in:
Jonas Herzig
2021-02-23 00:59:56 +01:00
parent 06db2ebb92
commit 01d47279fd
2 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/replaymod/replay/mixin/MixinCamera.java
View File

@@ -1,31 +1,20 @@
//#if MC>=11400
package com.replaymod.replay.mixin; package com.replaymod.replay.mixin;
import com.replaymod.replay.camera.CameraEntity; import com.replaymod.replay.camera.CameraEntity;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.util.math.Vector3f;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
//#if MC>=11500 @Mixin(GameRenderer.class)
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.util.math.Vector3f;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Shadow;
//#else
//$$ import com.mojang.blaze3d.platform.GlStateManager;
//$$ import net.minecraft.world.BlockView;
//#endif
//#if MC>=11500
@Mixin(net.minecraft.client.render.GameRenderer.class)
//#else
//$$ @Mixin(net.minecraft.client.render.Camera.class)
//#endif
public class MixinCamera { public class MixinCamera {
//#if MC>=11500
@Shadow @Final private MinecraftClient client; @Shadow @Final private MinecraftClient client;
@Inject( @Inject(
method = "renderWorld", method = "renderWorld",
@@ -40,20 +29,4 @@ public class MixinCamera {
matrixStack.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(((CameraEntity) entity).roll)); matrixStack.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(((CameraEntity) entity).roll));
} }
} }
//#else
//$$ @Inject(
//$$ method = "update",
//$$ at = @At(
//$$ value = "INVOKE",
//$$ target = "Lcom/mojang/blaze3d/platform/GlStateManager;rotatef(FFFF)V",
//$$ ordinal = 0
//$$ )
//$$ )
//$$ private void applyRoll(BlockView blockView, Entity view, boolean boolean_1, boolean boolean_2, float float_1, CallbackInfo ci) {
//$$ if (view instanceof CameraEntity) {
//$$ GlStateManager.rotatef(((CameraEntity) view).roll, 0.0F, 0.0F, 1.0F);
//$$ }
//$$ }
//#endif
} }
//#endif

30
versions/1.14.4/src/main/java/com/replaymod/replay/mixin/MixinCamera.java Normal file
View File

@@ -0,0 +1,30 @@
//#if MC>=11400
package com.replaymod.replay.mixin;
import com.mojang.blaze3d.platform.GlStateManager;
import com.replaymod.replay.camera.CameraEntity;
import net.minecraft.client.render.Camera;
import net.minecraft.entity.Entity;
import net.minecraft.world.BlockView;
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;
@Mixin(Camera.class)
public class MixinCamera {
@Inject(
method = "update",
at = @At(
value = "INVOKE",
target = "Lcom/mojang/blaze3d/platform/GlStateManager;rotatef(FFFF)V",
ordinal = 0
)
)
private void applyRoll(BlockView blockView, Entity view, boolean boolean_1, boolean boolean_2, float float_1, CallbackInfo ci) {
if (view instanceof CameraEntity) {
GlStateManager.rotatef(((CameraEntity) view).roll, 0.0F, 0.0F, 1.0F);
}
}
}
//#endif