MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use Intrinsic Proxying instead of Override (https://github.com/SpongePowered/Mixin/wiki/Introduction-to-Mixins---Overwriting-Methods#2-intrinsic-proxy-methods, #28)

Browse source
This commit is contained in:
Frank 2022-07-28 12:58:31 +02:00
parent dcdaf4838d
commit 24c3b8aed1
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/org/betterx/bclib/mixin/client/AnvilScreenMixin.java
View file

@ -6,6 +6,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.AbstractWidget;
import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.components.EditBox;
import net.minecraft.client.gui.components.events.ContainerEventHandler;
import net.minecraft.client.gui.screens.inventory.AnvilScreen; import net.minecraft.client.gui.screens.inventory.AnvilScreen;
import net.minecraft.client.gui.screens.inventory.ItemCombinerScreen; import net.minecraft.client.gui.screens.inventory.ItemCombinerScreen;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
@ -16,8 +17,7 @@ import net.minecraft.world.inventory.AnvilMenu;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.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;
@ -25,6 +25,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.List; import java.util.List;
@Mixin(AnvilScreen.class) @Mixin(AnvilScreen.class)
@Implements(@Interface(iface = ContainerEventHandler.class, prefix = "bcl$"))
public class AnvilScreenMixin extends ItemCombinerScreen<AnvilMenu> { public class AnvilScreenMixin extends ItemCombinerScreen<AnvilMenu> {
@Shadow @Shadow
@ -43,6 +44,8 @@ public class AnvilScreenMixin extends ItemCombinerScreen<AnvilMenu> {
be_buttons.clear(); be_buttons.clear();
be_buttons.add(new Button(x + 8, y + 45, 15, 20, Component.literal("<"), b -> be_previousRecipe())); be_buttons.add(new Button(x + 8, y + 45, 15, 20, Component.literal("<"), b -> be_previousRecipe()));
be_buttons.add(new Button(x + 154, y + 45, 15, 20, Component.literal(">"), b -> be_nextRecipe())); be_buttons.add(new Button(x + 154, y + 45, 15, 20, Component.literal(">"), b -> be_nextRecipe()));
be_buttons.forEach(button -> addWidget(button));
} }
@Inject(method = "renderFg", at = @At("TAIL")) @Inject(method = "renderFg", at = @At("TAIL"))
@ -76,8 +79,10 @@ public class AnvilScreenMixin extends ItemCombinerScreen<AnvilMenu> {
((AnvilScreenHandlerExtended) menu).be_previousRecipe(); ((AnvilScreenHandlerExtended) menu).be_previousRecipe();
} }
@Override
public boolean mouseClicked(double mouseX, double mouseY, int button) { @Intrinsic(displace = true)
//@Override
public boolean bcl$mouseClicked(double mouseX, double mouseY, int button) {
if (minecraft != null) { if (minecraft != null) {
for (AbstractWidget elem : be_buttons) { for (AbstractWidget elem : be_buttons) {
if (elem.visible && elem.mouseClicked(mouseX, mouseY, button)) { if (elem.visible && elem.mouseClicked(mouseX, mouseY, button)) {