From 6cd6e5e3b18ebcab743de265b63f07352921cb14 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 13 Jun 2020 00:19:15 +0200 Subject: [PATCH] Fix and bump --- gradle.properties | 2 +- .../com/voxelmodpack/hdskins/mixin/MixinGuiScreen.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index c1b235ae..4d5b63c5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ authors=Verdana, Rene_Z, Mumfrey, Killjoy1221, Sollace description=Mine Little Pony turns players and mobs into ponies description_mlp=Mine Little Pony turns players and mobs into ponies. Press F9 ingame to access settings. description_hd=Separate skin server for Mine Little Pony that also supports HD skins. Access via button on the main menu. -version=3.2.10 +version=3.2.11 release=RELEASE minecraft_version=1.12.2 mappings_version=stable_39 diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinGuiScreen.java b/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinGuiScreen.java index 363ffac0..c409cabb 100644 --- a/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinGuiScreen.java +++ b/src/hdskins/java/com/voxelmodpack/hdskins/mixin/MixinGuiScreen.java @@ -9,7 +9,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiYesNoCallback; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.gen.Invoker; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -17,11 +17,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(GuiScreen.class) abstract class MixinGuiScreen extends Gui implements GuiYesNoCallback { - @Shadow - protected abstract T addButton(T buttonIn); + @Invoker("addButton") + protected abstract T invokeAddButton(T buttonIn); @Inject(method = "setWorldAndResolution(Lnet/minecraft/client/Minecraft;II)V", at = @At("RETURN")) private void setWorldAndResolution(Minecraft mc, int width, int height, CallbackInfo info) { - HDSkinManager.INSTANCE.displaySkinningGui((GuiScreen)(Object)this, this::addButton); + HDSkinManager.INSTANCE.displaySkinningGui((GuiScreen)(Object)this, this::invokeAddButton); } }