Skip to content

Commit 397ecf3

Browse files
lowercasebtwlowercasebtw
committed
26.2
1 parent 932c0fd commit 397ecf3

24 files changed

Lines changed: 63 additions & 62 deletions

‎settings.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ stonecutter {
2424
}
2525
}
2626

27-
mc("26.1.1", listOf("fabric"))
27+
mc("26.2", listOf("fabric"))
2828

29-
vcsVersion = "26.1.1-fabric"
29+
vcsVersion = "26.2-fabric"
3030
}
3131
}
3232

‎src/main/java/org/visuals/legacy/animatium/command/AnimatiumCommand.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public static LiteralArgumentBuilder<FabricClientCommandSource> create() {
8585
ConfigUtil.put("onboarding", true);
8686

8787
final Minecraft minecraft = context.getSource().getClient();
88-
minecraft.schedule(() -> minecraft.setScreen(new OnboardingScreen(minecraft.screen)));
88+
minecraft.schedule(() -> minecraft.gui.setScreen(new OnboardingScreen(minecraft.gui.screen())));
8989

9090
return Command.SINGLE_SUCCESS;
9191
}));
@@ -99,7 +99,7 @@ public int run(final CommandContext<FabricClientCommandSource> context) {
9999
source.sendFeedback(Component.literal("Opening config menu...").withColor(new Random().nextInt(0xFFFFFF)));
100100

101101
final Minecraft minecraft = source.getClient();
102-
minecraft.schedule(() -> minecraft.setScreen(AnimatiumConfig.getConfigScreen(minecraft.screen)));
102+
minecraft.schedule(() -> minecraft.gui.setScreen(AnimatiumConfig.getConfigScreen(minecraft.gui.screen())));
103103

104104
return Command.SINGLE_SUCCESS;
105105
}

‎src/main/java/org/visuals/legacy/animatium/mixins/v1/entity/MixinLivingEntityRenderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public abstract class MixinLivingEntityRenderer<S extends LivingEntityRenderStat
5858
&& livingEntityRenderState instanceof ArmedEntityRenderState armedEntityRenderState
5959
&& Utils.isSelf(armedEntityRenderState)
6060
&& !livingEntityRenderState.hasPose(Pose.SWIMMING) /* Disable Crawling/Swimming as it's wrong */
61-
&& (Minecraft.getInstance().screen == null /* Disable when in inventory/not in-game */)) {
61+
&& (Minecraft.getInstance().gui.screen() == null /* Disable when in inventory/not in-game */)) {
6262
final float cameraLerpValue = Utils.lerpCameraPosition(cameraRenderState);
6363
poseStack.translate(0.0F, (armedEntityRenderState.animatium$getStandingDimensions().eyeHeight() * livingEntityRenderState.scale) - cameraLerpValue, 0.0F);
6464
}

‎src/main/java/org/visuals/legacy/animatium/mixins/v1/entity/armor_hurt/MixinEquipmentLayerRenderer.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@
3030
import com.llamalad7.mixinextras.sugar.Local;
3131
import com.mojang.blaze3d.opengl.GlConst;
3232
import com.mojang.blaze3d.opengl.GlStateManager;
33-
import com.mojang.blaze3d.platform.DestFactor;
34-
import com.mojang.blaze3d.platform.SourceFactor;
33+
import com.mojang.blaze3d.platform.BlendFactor;
3534
import com.mojang.blaze3d.vertex.PoseStack;
3635
import com.moulberry.mixinconstraints.annotations.IfModAbsent;
3736
import net.minecraft.client.model.Model;
@@ -95,7 +94,7 @@ public abstract class MixinEquipmentLayerRenderer {
9594
// TODO: Check if this code even does anything at all
9695
// TODO: Too strong? & glint needs to be tinted hurt color
9796
GlStateManager._enableBlend();
98-
GlStateManager._blendFuncSeparate(GlConst.toGl(SourceFactor.SRC_ALPHA), GlConst.toGl(DestFactor.ONE_MINUS_SRC_ALPHA), GlConst.toGl(SourceFactor.SRC_ALPHA), GlConst.toGl(DestFactor.ONE_MINUS_SRC_ALPHA));
97+
GlStateManager._blendFuncSeparate(GlConst.toGl(BlendFactor.SRC_ALPHA), GlConst.toGl(BlendFactor.ONE_MINUS_SRC_ALPHA), GlConst.toGl(BlendFactor.SRC_ALPHA), GlConst.toGl(BlendFactor.ONE_MINUS_SRC_ALPHA));
9998
original.call(instance, model, renderState, poseStack, renderType, light, overlay, color, textureAtlasSprite, i, crumblingOverlay);
10099
GlStateManager._disableBlend();
101100
}

‎src/main/java/org/visuals/legacy/animatium/mixins/v1/general/network/MixinClientPacketListener_DontCloseChat.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@
3939
public abstract class MixinClientPacketListener_DontCloseChat {
4040
@WrapWithCondition(method = "handleContainerClose", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;clientSideCloseContainer()V"))
4141
private boolean animatium$dontCloseChat(LocalPlayer instance) {
42-
return !Animatium.isEnabled() || !AnimatiumConfig.instance().extras.dontCloseChat || !(Minecraft.getInstance().screen instanceof ChatScreen);
42+
return !Animatium.isEnabled() || !AnimatiumConfig.instance().extras.dontCloseChat || !(Minecraft.getInstance().gui.screen() instanceof ChatScreen);
4343
}
4444
}

src/main/java/org/visuals/legacy/animatium/mixins/v1/gui/MixinInGameHud.java renamed to src/main/java/org/visuals/legacy/animatium/mixins/v1/gui/MixinHud.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131
import com.llamalad7.mixinextras.sugar.Local;
3232
import com.mojang.blaze3d.pipeline.RenderPipeline;
3333
import net.minecraft.client.CameraType;
34-
import net.minecraft.client.gui.Gui;
3534
import net.minecraft.client.gui.GuiGraphicsExtractor;
35+
import net.minecraft.client.gui.Hud;
3636
import net.minecraft.resources.Identifier;
3737
import org.spongepowered.asm.mixin.Mixin;
3838
import org.spongepowered.asm.mixin.injection.At;
3939
import org.visuals.legacy.animatium.Animatium;
4040
import org.visuals.legacy.animatium.config.AnimatiumConfig;
4141

42-
@Mixin(Gui.class)
43-
public abstract class MixinInGameHud {
42+
@Mixin(Hud.class)
43+
public abstract class MixinHud {
4444
@WrapOperation(method = "extractCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/CameraType;isFirstPerson()Z"))
4545
private boolean animatium$crosshairInThirdPerson(CameraType instance, Operation<Boolean> original) {
4646
if (Animatium.isEnabled() && AnimatiumConfig.instance().screen.crosshairInThirdPerson) {
@@ -59,8 +59,8 @@ public abstract class MixinInGameHud {
5959
}
6060
}
6161

62-
@WrapWithCondition(method = "extractHearts", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Gui;extractHeart(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/gui/Gui$HeartType;IIZZZ)V"))
63-
private boolean animatium$heartFlash(Gui instance, GuiGraphicsExtractor guiGraphics, Gui.HeartType type, int x, int y, boolean hardcore, boolean blinking, boolean half) {
64-
return !Animatium.isEnabled() || !AnimatiumConfig.instance().screen.disableHeartFlash || !blinking || type == Gui.HeartType.CONTAINER;
62+
@WrapWithCondition(method = "extractHearts", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Hud;extractHeart(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/gui/Hud$HeartType;IIZZZ)V"))
63+
private boolean animatium$heartFlash(Hud instance, GuiGraphicsExtractor guiGraphics, Hud.HeartType type, int x, int y, boolean hardcore, boolean blinking, boolean half) {
64+
return !Animatium.isEnabled() || !AnimatiumConfig.instance().screen.disableHeartFlash || !blinking || type == Hud.HeartType.CONTAINER;
6565
}
6666
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@
3232
import net.minecraft.client.gui.screens.inventory.InventoryScreen;
3333
import net.minecraft.client.renderer.entity.state.EntityRenderState;
3434
import net.minecraft.client.renderer.state.gui.pip.GuiEntityRenderState;
35-
import org.joml.Quaternionf;
36-
import org.joml.Vector3f;
35+
import org.joml.Quaternionfc;
36+
import org.joml.Vector3fc;
3737
import org.spongepowered.asm.mixin.Mixin;
3838
import org.spongepowered.asm.mixin.injection.At;
3939
import org.visuals.legacy.animatium.Animatium;
4040
import org.visuals.legacy.animatium.config.AnimatiumConfig;
4141

4242
@Mixin(InventoryScreen.class)
4343
public abstract class MixinInventoryScreen_DisableEntityScissor {
44-
@WrapOperation(method = "extractEntityInInventoryFollowsMouse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphicsExtractor;entity(Lnet/minecraft/client/renderer/entity/state/EntityRenderState;FLorg/joml/Vector3f;Lorg/joml/Quaternionf;Lorg/joml/Quaternionf;IIII)V"))
45-
private static void animatium$disableEntityScissor(final GuiGraphicsExtractor instance, final EntityRenderState renderState, final float scale, final Vector3f translation, final Quaternionf rotation, final Quaternionf overrideCameraAngle, final int x0, final int y0, final int x1, final int y1, final Operation<Void> original) {
44+
@WrapOperation(method = "extractEntityInInventoryFollowsMouse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphicsExtractor;entity(Lnet/minecraft/client/renderer/entity/state/EntityRenderState;FLorg/joml/Vector3fc;Lorg/joml/Quaternionfc;Lorg/joml/Quaternionfc;IIII)V"))
45+
private static void animatium$disableEntityScissor(final GuiGraphicsExtractor instance, final EntityRenderState renderState, final float scale, final Vector3fc translation, final Quaternionfc rotation, final Quaternionfc overrideCameraAngle, final int x0, final int y0, final int x1, final int y1, final Operation<Void> original) {
4646
if (Animatium.isEnabled() && AnimatiumConfig.instance().other.disableInventoryEntityScissor) {
4747
final ScreenRectangle bounds = new ScreenRectangle(0, 0, instance.guiWidth(), instance.guiHeight());
4848
final int expansion = 40;

src/main/java/org/visuals/legacy/animatium/mixins/v1/gui/screen_tweaks/MixinMinecraft_OnboardingScreen.java renamed to src/main/java/org/visuals/legacy/animatium/mixins/v1/gui/screen_tweaks/MixinGui_OnboardingScreen.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import com.llamalad7.mixinextras.expression.Definition;
2929
import com.llamalad7.mixinextras.expression.Expression;
3030
import com.llamalad7.mixinextras.sugar.Local;
31-
import net.minecraft.client.Minecraft;
31+
import net.minecraft.client.gui.Gui;
3232
import net.minecraft.client.gui.screens.Screen;
3333
import net.minecraft.client.gui.screens.TitleScreen;
3434
import org.spongepowered.asm.mixin.Mixin;
@@ -37,9 +37,9 @@
3737
import org.visuals.legacy.animatium.screens.OnboardingScreen;
3838
import org.visuals.legacy.animatium.util.config.ConfigUtil;
3939

40-
@Mixin(Minecraft.class)
41-
public abstract class MixinMinecraft_OnboardingScreen {
42-
@Definition(id = "screen", field = "Lnet/minecraft/client/Minecraft;screen:Lnet/minecraft/client/gui/screens/Screen;")
40+
@Mixin(Gui.class)
41+
public abstract class MixinGui_OnboardingScreen {
42+
@Definition(id = "screen", field = "Lnet/minecraft/client/gui/Gui;screen:Lnet/minecraft/client/gui/screens/Screen;")
4343
@Definition(id = "guiScreen", local = @Local(type = Screen.class, argsOnly = true))
4444
@Expression("@(this).screen = guiScreen")
4545
@ModifyVariable(method = "setScreen", at = @At(value = "MIXINEXTRAS:EXPRESSION", shift = At.Shift.BEFORE), argsOnly = true)

src/main/java/org/visuals/legacy/animatium/mixins/v1/gui/screen_tweaks/MixinGui_OldCrosshairPosition.java renamed to src/main/java/org/visuals/legacy/animatium/mixins/v1/gui/screen_tweaks/MixinHud_OldCrosshairPosition.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929
import com.llamalad7.mixinextras.expression.Expression;
3030
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
3131
import com.llamalad7.mixinextras.sugar.Local;
32-
import net.minecraft.client.gui.Gui;
3332
import net.minecraft.client.gui.GuiGraphicsExtractor;
33+
import net.minecraft.client.gui.Hud;
3434
import org.spongepowered.asm.mixin.Mixin;
3535
import org.spongepowered.asm.mixin.injection.At;
3636
import org.visuals.legacy.animatium.Animatium;
3737
import org.visuals.legacy.animatium.config.AnimatiumConfig;
3838

39-
@Mixin(Gui.class)
40-
public abstract class MixinGui_OldCrosshairPosition {
39+
@Mixin(Hud.class)
40+
public abstract class MixinHud_OldCrosshairPosition {
4141
@Definition(id = "graphics", local = @Local(type = GuiGraphicsExtractor.class, argsOnly = true))
4242
@Definition(id = "guiWidth", method = "Lnet/minecraft/client/gui/GuiGraphicsExtractor;guiWidth()I")
4343
@Expression("(graphics.guiWidth() - 15) / 2")

‎src/main/java/org/visuals/legacy/animatium/mixins/v1/rendering/MixinMinecraft_ColorBoost.java‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,18 @@
2828
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
2929
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
3030
import com.mojang.blaze3d.pipeline.RenderPipeline;
31-
import com.mojang.blaze3d.pipeline.RenderTarget;
31+
import com.mojang.blaze3d.systems.CommandEncoder;
32+
import com.mojang.blaze3d.systems.GpuSurface;
3233
import com.mojang.blaze3d.systems.RenderPass;
3334
import com.mojang.blaze3d.systems.RenderSystem;
3435
import com.mojang.blaze3d.textures.FilterMode;
36+
import com.mojang.blaze3d.textures.GpuTextureView;
3537
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
3638
import com.mojang.blaze3d.vertex.VertexFormat;
3739
import net.minecraft.client.Minecraft;
38-
import net.minecraft.client.gui.screens.Screen;
40+
import net.minecraft.client.gui.Gui;
3941
import net.minecraft.client.renderer.RenderPipelines;
40-
import org.jetbrains.annotations.Nullable;
42+
import org.spongepowered.asm.mixin.Final;
4143
import org.spongepowered.asm.mixin.Mixin;
4244
import org.spongepowered.asm.mixin.Shadow;
4345
import org.spongepowered.asm.mixin.Unique;
@@ -50,8 +52,8 @@
5052
@Mixin(Minecraft.class)
5153
public abstract class MixinMinecraft_ColorBoost {
5254
@Shadow
53-
@Nullable
54-
public Screen screen;
55+
@Final
56+
public Gui gui;
5557

5658
@Unique
5759
private static final RenderPipeline animatium$boostPipeline = RenderPipelines.register(
@@ -64,17 +66,17 @@ public abstract class MixinMinecraft_ColorBoost {
6466
.build()
6567
);
6668

67-
@WrapOperation(method = "renderFrame", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/pipeline/RenderTarget;blitToScreen()V"))
68-
private void animatium$colorBoost(final RenderTarget instance, final Operation<Void> original) {
69-
if (AnimatiumConfig.instance().extras.colorBoost && this.screen == null) {
70-
try (final RenderPass renderPass = RenderSystem.getDevice().createCommandEncoder().createRenderPass(() -> "Color boost render target blit", instance.getColorTextureView(), OptionalInt.empty())) {
69+
@WrapOperation(method = "renderFrame", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/systems/GpuSurface;blitFromTexture(Lcom/mojang/blaze3d/systems/CommandEncoder;Lcom/mojang/blaze3d/textures/GpuTextureView;)V"))
70+
private void animatium$colorBoost(final GpuSurface instance, final CommandEncoder commandEncoder, final GpuTextureView textureView, final Operation<Void> original) {
71+
if (AnimatiumConfig.instance().extras.colorBoost && this.gui.screen() == null) {
72+
try (final RenderPass renderPass = RenderSystem.getDevice().createCommandEncoder().createRenderPass(() -> "Color boost render target blit", textureView, OptionalInt.empty())) {
7173
renderPass.setPipeline(animatium$boostPipeline);
7274
RenderSystem.bindDefaultUniforms(renderPass);
73-
renderPass.bindTexture("Sampler0", instance.getColorTextureView(), RenderSystem.getSamplerCache().getClampToEdge(FilterMode.NEAREST));
75+
renderPass.bindTexture("Sampler0", textureView, RenderSystem.getSamplerCache().getClampToEdge(FilterMode.NEAREST));
7476
renderPass.draw(0, 3);
7577
}
7678
}
7779

78-
original.call(instance);
80+
original.call(instance, commandEncoder, textureView);
7981
}
8082
}

0 commit comments

Comments
 (0)