Skip to content

Commit 8f14c33

Browse files
committed
PanoramaRendererUtility stuff / Renderer
1 parent 05652fa commit 8f14c33

21 files changed

+765
-484
lines changed

src/main/java/org/visuals/legacy/animatium/mixins/v1/entity/fishing/MixinFishingHookRenderer.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,10 @@
5353
import org.visuals.legacy.animatium.Animatium;
5454
import org.visuals.legacy.animatium.config.AnimatiumConfig;
5555
import org.visuals.legacy.animatium.mixins.accessor.CameraAccessor;
56-
import org.visuals.legacy.animatium.util.RenderUtils;
5756
import org.visuals.legacy.animatium.util.Utils;
5857
import org.visuals.legacy.animatium.util.enums.FishingRodVersion;
58+
import org.visuals.legacy.animatium.util.rendering.LineState;
59+
import org.visuals.legacy.animatium.util.rendering.RenderUtils;
5960

6061
@Mixin(FishingHookRenderer.class)
6162
public abstract class MixinFishingHookRenderer extends EntityRenderer<FishingHook, FishingHookRenderState> {
@@ -81,10 +82,11 @@ protected MixinFishingHookRenderer(EntityRendererProvider.Context context) {
8182
private void animatium$fishingRodLineThickness(FishingHookRenderState fishingHookRenderState, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, CameraRenderState cameraRenderState, CallbackInfo ci) {
8283
if (Animatium.ENABLED) {
8384
// TODO/NOTE: 1.21.11 removes setLineWidth, lineWidth is now part of the buffer
85+
final LineState lineState = RenderUtils.getLineState();
8486
if (AnimatiumConfig.instance().items.thinFishingRodLineThickness) {
85-
RenderUtils.setLineWidth(1.0F);
87+
lineState.setWidth(1.0F);
8688
} else if (AnimatiumConfig.instance().items.fishingRodLineThickness) {
87-
RenderUtils.setLineWidth(2.0F);
89+
lineState.setWidth(2.0F);
8890
}
8991
}
9092
}

src/main/java/org/visuals/legacy/animatium/mixins/v1/general/outlines/MixinCompositeRenderType_BlockOutlineLineWidth.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
import org.spongepowered.asm.mixin.Mixin;
3030
import org.spongepowered.asm.mixin.injection.At;
3131
import org.spongepowered.asm.mixin.injection.ModifyArg;
32-
import org.visuals.legacy.animatium.util.RenderUtils;
32+
import org.visuals.legacy.animatium.util.rendering.RenderUtils;
3333

3434
@Mixin(RenderType.CompositeRenderType.class)
3535
public abstract class MixinCompositeRenderType_BlockOutlineLineWidth {
3636
@ModifyArg(method = "draw", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/DynamicUniforms;writeTransform(Lorg/joml/Matrix4fc;Lorg/joml/Vector4fc;Lorg/joml/Vector3fc;Lorg/joml/Matrix4fc;F)Lcom/mojang/blaze3d/buffers/GpuBufferSlice;"), index = 4)
3737
private float animatium$blockOutlineRendering$lineWidth(float original) {
38-
return RenderUtils.getLineWidth(original);
38+
return RenderUtils.getLineState().get(original);
3939
}
4040
}

src/main/java/org/visuals/legacy/animatium/mixins/v1/general/outlines/MixinLevelRenderer_BlockOutlines.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,20 +36,22 @@
3636
import org.spongepowered.asm.mixin.injection.At;
3737
import org.visuals.legacy.animatium.Animatium;
3838
import org.visuals.legacy.animatium.config.AnimatiumConfig;
39-
import org.visuals.legacy.animatium.util.RenderUtils;
4039
import org.visuals.legacy.animatium.util.Utils;
40+
import org.visuals.legacy.animatium.util.rendering.LineState;
41+
import org.visuals.legacy.animatium.util.rendering.RenderUtils;
4142

4243
@Mixin(LevelRenderer.class)
4344
public abstract class MixinLevelRenderer_BlockOutlines {
4445
@WrapOperation(method = "renderBlockOutline", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/LevelRenderer;renderHitOutline(Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;DDDLnet/minecraft/client/renderer/state/BlockOutlineRenderState;I)V"))
4546
private void animatium$setBlockOutlineWidth(LevelRenderer instance, PoseStack poseStack, VertexConsumer consumer, double camX, double camY, double camZ, BlockOutlineRenderState outlineRenderState, int color, Operation<Void> original) {
47+
final LineState lineState = RenderUtils.getLineState();
4648
if (Animatium.ENABLED && AnimatiumConfig.instance().other.blockOutlineRendering) {
47-
RenderUtils.setLineWidth(2.0F);
49+
lineState.setWidth(2.0F);
4850
}
4951

5052
original.call(instance, poseStack, consumer, camX, camY, camZ, outlineRenderState, color);
5153
if (Animatium.ENABLED && AnimatiumConfig.instance().other.blockOutlineRendering) {
52-
RenderUtils.setLineWidth(-1.0F);
54+
lineState.setWidth(-1.0F); // Restores vanilla value
5355
}
5456
}
5557

src/main/java/org/visuals/legacy/animatium/mixins/v1/general/sky/blue_void/MixinLevelRenderer_BlueVoidDisc.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@
4040
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
4141
import org.visuals.legacy.animatium.Animatium;
4242
import org.visuals.legacy.animatium.config.AnimatiumConfig;
43-
import org.visuals.legacy.animatium.util.RenderUtils;
44-
import org.visuals.legacy.animatium.util.SkyRendererUtility;
43+
import org.visuals.legacy.animatium.util.rendering.SkyRendererUtility;
4544

4645
@Mixin(LevelRenderer.class)
4746
public abstract class MixinLevelRenderer_BlueVoidDisc {
@@ -58,7 +57,7 @@ public abstract class MixinLevelRenderer_BlueVoidDisc {
5857
if (Animatium.ENABLED && AnimatiumConfig.instance().other.blueVoidSky && skyRenderState.skyType != DimensionSpecialEffects.SkyType.END && this.level != null && this.minecraft.player != null) {
5958
final float tickDelta = this.minecraft.getDeltaTracker().getGameTimeDeltaPartialTick(true);
6059
final int skyColor = this.level.getSkyColor(this.minecraft.gameRenderer.getMainCamera().getPosition(), tickDelta);
61-
SkyRendererUtility.renderBlueVoid(skyColor, this.minecraft.player.getEyePosition(tickDelta).y - RenderUtils.getLevelHorizonHeight(this.level));
60+
SkyRendererUtility.renderBlueVoid(skyColor, this.minecraft.player.getEyePosition(tickDelta).y - SkyRendererUtility.getHorizonDepth(this.level));
6261
}
6362
}
6463
}

src/main/java/org/visuals/legacy/animatium/mixins/v1/general/sky/horizon_height/MixinSkyRenderer_LegacyHorizonHeight.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
import org.spongepowered.asm.mixin.injection.At;
3636
import org.visuals.legacy.animatium.Animatium;
3737
import org.visuals.legacy.animatium.config.AnimatiumConfig;
38-
import org.visuals.legacy.animatium.util.RenderUtils;
38+
import org.visuals.legacy.animatium.util.rendering.SkyRendererUtility;
3939

4040
@Mixin(SkyRenderer.class)
4141
public abstract class MixinSkyRenderer_LegacyHorizonHeight {
4242
@WrapOperation(method = "shouldRenderDarkDisc", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientLevel$ClientLevelData;getHorizonHeight(Lnet/minecraft/world/level/LevelHeightAccessor;)D"))
4343
private double animatium$skyHorizonHeight(ClientLevel.ClientLevelData instance, LevelHeightAccessor levelHeightAccessor, Operation<Double> original, @Local(argsOnly = true) ClientLevel level) {
4444
if (Animatium.ENABLED && AnimatiumConfig.instance().other.skyHorizonHeight && level != null) {
45-
return RenderUtils.getLevelHorizonHeight(level);
45+
return SkyRendererUtility.getHorizonDepth(level);
4646
} else {
4747
return original.call(instance, levelHeightAccessor);
4848
}

src/main/java/org/visuals/legacy/animatium/mixins/v1/general/sky/planar_fog/MixinSkyRenderer_PlanarFogSky.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
4141
import org.visuals.legacy.animatium.Animatium;
4242
import org.visuals.legacy.animatium.config.AnimatiumConfig;
43-
import org.visuals.legacy.animatium.util.SkyRendererUtility;
43+
import org.visuals.legacy.animatium.util.rendering.SkyRendererUtility;
4444

4545
@Mixin(SkyRenderer.class)
4646
public abstract class MixinSkyRenderer_PlanarFogSky {

src/main/java/org/visuals/legacy/animatium/mixins/v1/gui/MixinPanoramaRenderer_LegacyRendering.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
import org.spongepowered.asm.mixin.injection.At;
3939
import org.visuals.legacy.animatium.Animatium;
4040
import org.visuals.legacy.animatium.config.AnimatiumConfig;
41-
import org.visuals.legacy.animatium.util.PanoramaRendererUtility;
41+
import org.visuals.legacy.animatium.util.rendering.PanoramaRendererUtility;
4242

4343
@Mixin(PanoramaRenderer.class)
4444
public abstract class MixinPanoramaRenderer_LegacyRendering {
4545
@WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/CubeMap;render(Lnet/minecraft/client/Minecraft;FF)V", ordinal = 0))
4646
private void animatium$panoramaRendering(CubeMap instance, Minecraft minecraft, float xRot, float yRot, Operation<Void> original, @Local(argsOnly = true) GuiGraphics guiGraphics, @Local(argsOnly = true, ordinal = 0) int width, @Local(argsOnly = true, ordinal = 1) int height) {
4747
if (Animatium.ENABLED && AnimatiumConfig.instance().screen.panoramaRendering) {
48-
PanoramaRendererUtility.update(minecraft.getDeltaTracker().getRealtimeDeltaTicks());
48+
PanoramaRendererUtility.update(minecraft.getDeltaTracker().getGameTimeDeltaTicks());
4949
PanoramaRendererUtility.render(guiGraphics, width, height);
5050
} else {
5151
original.call(instance, minecraft, xRot, yRot);

src/main/java/org/visuals/legacy/animatium/mixins/v1/gui/old_inventory_rendering/MixinGuiGraphics.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
import org.visuals.legacy.animatium.Animatium;
4242
import org.visuals.legacy.animatium.config.AnimatiumConfig;
4343
import org.visuals.legacy.animatium.util.ItemUtils;
44-
import org.visuals.legacy.animatium.util.RenderUtils;
44+
import org.visuals.legacy.animatium.util.rendering.RenderUtils;
4545

4646
@Mixin(GuiGraphics.class)
4747
public abstract class MixinGuiGraphics {

src/main/java/org/visuals/legacy/animatium/screens/OnboardingScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import net.minecraft.network.chat.Component;
3434
import net.minecraft.util.ARGB;
3535
import org.visuals.legacy.animatium.config.AnimatiumConfig;
36-
import org.visuals.legacy.animatium.util.RenderUtils;
36+
import org.visuals.legacy.animatium.util.rendering.RenderUtils;
3737
import org.visuals.legacy.animatium.util.config.ConfigUtil;
3838
import org.visuals.legacy.animatium.util.config.Version;
3939

src/main/java/org/visuals/legacy/animatium/util/DynamicTransformsBuilder.java

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
 (0)