From d7062b05c3d309e7a1e14d6d50c586b1dfe2138c Mon Sep 17 00:00:00 2001 From: inglettronald <71849533+inglettronald@users.noreply.github.com> Date: Wed, 11 Jan 2023 02:36:35 -0600 Subject: - 1.14 commit: oldanimations "fix" and scalable tooltips --- .../java/dulkirmod/mixins/ItemRendererMixin.java | 37 ---------------------- .../java/dulkirmod/mixins/MixinGuiContainer.java | 6 ++++ src/main/java/dulkirmod/mixins/MixinGuiUtils.java | 21 ++++++++++++ .../java/dulkirmod/mixins/MixinItemRenderer.java | 37 ++++++++++++++++++++++ src/main/java/dulkirmod/mixins/MixinItemStack.java | 27 ++++++++++++++++ .../java/dulkirmod/mixins/MixinOldAnimations.java | 30 ++++++++++++++++++ 6 files changed, 121 insertions(+), 37 deletions(-) delete mode 100644 src/main/java/dulkirmod/mixins/ItemRendererMixin.java create mode 100644 src/main/java/dulkirmod/mixins/MixinGuiUtils.java create mode 100644 src/main/java/dulkirmod/mixins/MixinItemRenderer.java create mode 100644 src/main/java/dulkirmod/mixins/MixinItemStack.java create mode 100644 src/main/java/dulkirmod/mixins/MixinOldAnimations.java (limited to 'src/main/java') diff --git a/src/main/java/dulkirmod/mixins/ItemRendererMixin.java b/src/main/java/dulkirmod/mixins/ItemRendererMixin.java deleted file mode 100644 index 0fb56e4..0000000 --- a/src/main/java/dulkirmod/mixins/ItemRendererMixin.java +++ /dev/null @@ -1,37 +0,0 @@ -package dulkirmod.mixins; - -import dulkirmod.features.ItemAnimations; -import net.minecraft.client.entity.AbstractClientPlayer; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.item.ItemStack; -import org.spongepowered.asm.mixin.Final; -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.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(value = {ItemRenderer.class}) -public class ItemRendererMixin { - - @Shadow @Final private RenderItem itemRenderer; - - @Shadow private ItemStack itemToRender; - - @Inject(method = "transformFirstPersonItem(FF)V", at = @At("HEAD"), cancellable = true) - public void itemTransform(float equipProgress, float swingProgress, CallbackInfo ci) { - if (ItemAnimations.INSTANCE.itemTransforHook(equipProgress, swingProgress)) ci.cancel(); - } - - @Inject(method = "doItemUsedTransformations", at = @At("HEAD"), cancellable = true) - public void useTransform(float swingProgress, CallbackInfo ci){ - if (ItemAnimations.INSTANCE.scaledSwing(swingProgress)) ci.cancel(); - } - - @Inject(method ="performDrinking", at = @At("HEAD"), cancellable = true) - public void drinkTransform(AbstractClientPlayer clientPlayer, float partialTicks, CallbackInfo ci) { - if (ItemAnimations.INSTANCE.rotationlessDrink(clientPlayer, partialTicks)) ci.cancel(); - if (ItemAnimations.INSTANCE.scaledDrinking(clientPlayer, partialTicks, itemToRender)) ci.cancel(); - } -} diff --git a/src/main/java/dulkirmod/mixins/MixinGuiContainer.java b/src/main/java/dulkirmod/mixins/MixinGuiContainer.java index 4a50163..50118f1 100644 --- a/src/main/java/dulkirmod/mixins/MixinGuiContainer.java +++ b/src/main/java/dulkirmod/mixins/MixinGuiContainer.java @@ -2,6 +2,7 @@ package dulkirmod.mixins; import dulkirmod.features.Croesus; import dulkirmod.features.DungeonLeap; +import dulkirmod.features.ScalableTooltips; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -43,4 +44,9 @@ public abstract class MixinGuiContainer extends GuiScreen { this.zLevel = 0.0F; } } + @Inject(method = "onGuiClosed", at = @At("HEAD")) + private void onGuiClosed(CallbackInfo ci) { + // reset values here + ScalableTooltips.INSTANCE.resetPos(); + } } diff --git a/src/main/java/dulkirmod/mixins/MixinGuiUtils.java b/src/main/java/dulkirmod/mixins/MixinGuiUtils.java new file mode 100644 index 0000000..414963b --- /dev/null +++ b/src/main/java/dulkirmod/mixins/MixinGuiUtils.java @@ -0,0 +1,21 @@ +package dulkirmod.mixins; + +import dulkirmod.features.ScalableTooltips; +import net.minecraft.client.gui.FontRenderer; +import net.minecraftforge.fml.client.config.GuiUtils; +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; + +import java.util.List; + +@Mixin(value = {GuiUtils.class}, remap = false) +public class MixinGuiUtils { + + @Inject(method = "drawHoveringText", at = @At("HEAD"), cancellable = true) + private static void drawScaledHoveringText(List textLines, int mouseX, int mouseY, int screenWidth, int screenHeight, int maxTextWidth, FontRenderer font, CallbackInfo ci) { + if (ScalableTooltips.INSTANCE.drawScaledHoveringText(textLines, mouseX, mouseY, screenWidth, screenHeight, maxTextWidth, font, ci)) + ci.cancel(); + } +} diff --git a/src/main/java/dulkirmod/mixins/MixinItemRenderer.java b/src/main/java/dulkirmod/mixins/MixinItemRenderer.java new file mode 100644 index 0000000..a81e67d --- /dev/null +++ b/src/main/java/dulkirmod/mixins/MixinItemRenderer.java @@ -0,0 +1,37 @@ +package dulkirmod.mixins; + +import dulkirmod.features.ItemAnimations; +import net.minecraft.client.entity.AbstractClientPlayer; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.item.ItemStack; +import org.spongepowered.asm.mixin.Final; +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.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(value = {ItemRenderer.class}) +public class MixinItemRenderer { + + @Shadow @Final private RenderItem itemRenderer; + + @Shadow private ItemStack itemToRender; + + @Inject(method = "transformFirstPersonItem(FF)V", at = @At("HEAD"), cancellable = true) + public void itemTransform(float equipProgress, float swingProgress, CallbackInfo ci) { + if (ItemAnimations.INSTANCE.itemTransforHook(equipProgress, swingProgress)) ci.cancel(); + } + + @Inject(method = "doItemUsedTransformations", at = @At("HEAD"), cancellable = true) + public void useTransform(float swingProgress, CallbackInfo ci){ + if (ItemAnimations.INSTANCE.scaledSwing(swingProgress)) ci.cancel(); + } + + @Inject(method ="performDrinking", at = @At("HEAD"), cancellable = true) + public void drinkTransform(AbstractClientPlayer clientPlayer, float partialTicks, CallbackInfo ci) { + if (ItemAnimations.INSTANCE.rotationlessDrink(clientPlayer, partialTicks)) ci.cancel(); + if (ItemAnimations.INSTANCE.scaledDrinking(clientPlayer, partialTicks, itemToRender)) ci.cancel(); + } +} diff --git a/src/main/java/dulkirmod/mixins/MixinItemStack.java b/src/main/java/dulkirmod/mixins/MixinItemStack.java new file mode 100644 index 0000000..76440ef --- /dev/null +++ b/src/main/java/dulkirmod/mixins/MixinItemStack.java @@ -0,0 +1,27 @@ +package dulkirmod.mixins; +import dulkirmod.features.ScalableTooltips; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +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.CallbackInfoReturnable; + +import java.util.List; + +@Mixin(ItemStack.class) +public abstract class MixinItemStack { + + private static ItemStack previousStack; + + @Inject(method = "getTooltip", at = @At("HEAD")) + public void onTooltip(EntityPlayer playerIn, boolean advanced, CallbackInfoReturnable> cir) { + + ItemStack currentStack = (ItemStack)(Object)this; + if (currentStack != previousStack) { + // reset values here for scrollable tooltips + ScalableTooltips.INSTANCE.resetPos(); + previousStack = currentStack; + } + } +} diff --git a/src/main/java/dulkirmod/mixins/MixinOldAnimations.java b/src/main/java/dulkirmod/mixins/MixinOldAnimations.java new file mode 100644 index 0000000..de38ddc --- /dev/null +++ b/src/main/java/dulkirmod/mixins/MixinOldAnimations.java @@ -0,0 +1,30 @@ +package dulkirmod.mixins; + +import dulkirmod.DulkirMod; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.item.ItemStack; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Pseudo; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +/** + * This method will basically just turn off all the oldanimations code that is breaking dulkirmod. + * + * It will only run if you have the global settings of Custom Animations turned on, so you can basically + * pick which one you want to have. Either custom animations or old. This is not a great fix, but + * to make them work together seamlessly I would *basically* be recoding the entirety of Old Animations into + * this mod, which I don't really want to do. + */ + +@Pseudo +@Mixin(targets = "club.sk1er.oldanimations.AnimationHandler", remap = false) +public class MixinOldAnimations { + + @Inject(method = "renderItemInFirstPerson", at = @At(value = "HEAD"), cancellable = true) + public void angy(ItemRenderer renderer, ItemStack stack, float equipProgress, float partialTicks, CallbackInfoReturnable cir) { + if (DulkirMod.Companion.getConfig().getCustomAnimations()) + cir.setReturnValue(false); + } +} -- cgit