From 6a0749f8cea05ef8c52520931865b7117b2f7a6c Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 22 Apr 2023 16:45:50 +0200 Subject: [PATCH] [Change] More consistent Names for Anvil Mixins --- .../AnvilScreenHandlerExtended.java | 18 +++---- .../bclib/mixin/client/AnvilScreenMixin.java | 4 +- .../bclib/mixin/common/AnvilMenuMixin.java | 51 +++++++++---------- 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/src/main/java/org/betterx/bclib/interfaces/AnvilScreenHandlerExtended.java b/src/main/java/org/betterx/bclib/interfaces/AnvilScreenHandlerExtended.java index b17116f2..e00a2a32 100644 --- a/src/main/java/org/betterx/bclib/interfaces/AnvilScreenHandlerExtended.java +++ b/src/main/java/org/betterx/bclib/interfaces/AnvilScreenHandlerExtended.java @@ -6,31 +6,31 @@ import org.betterx.bclib.recipes.AnvilRecipe; import java.util.List; public interface AnvilScreenHandlerExtended { - void be_updateCurrentRecipe(AnvilRecipe recipe); + void bcl_updateCurrentRecipe(AnvilRecipe recipe); - AnvilRecipe be_getCurrentRecipe(); + AnvilRecipe bcl_getCurrentRecipe(); - List be_getRecipes(); + List bcl_getRecipes(); default void be_nextRecipe() { - List recipes = be_getRecipes(); + List recipes = bcl_getRecipes(); if (recipes.size() < 2) return; - AnvilRecipe current = be_getCurrentRecipe(); + AnvilRecipe current = bcl_getCurrentRecipe(); int i = recipes.indexOf(current) + 1; if (i >= recipes.size()) { i = 0; } - be_updateCurrentRecipe(recipes.get(i)); + bcl_updateCurrentRecipe(recipes.get(i)); } default void be_previousRecipe() { - List recipes = be_getRecipes(); + List recipes = bcl_getRecipes(); if (recipes.size() < 2) return; - AnvilRecipe current = be_getCurrentRecipe(); + AnvilRecipe current = bcl_getCurrentRecipe(); int i = recipes.indexOf(current) - 1; if (i <= 0) { i = recipes.size() - 1; } - be_updateCurrentRecipe(recipes.get(i)); + bcl_updateCurrentRecipe(recipes.get(i)); } } diff --git a/src/main/java/org/betterx/bclib/mixin/client/AnvilScreenMixin.java b/src/main/java/org/betterx/bclib/mixin/client/AnvilScreenMixin.java index 32da57e8..04cf3aef 100644 --- a/src/main/java/org/betterx/bclib/mixin/client/AnvilScreenMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/client/AnvilScreenMixin.java @@ -74,8 +74,8 @@ public class AnvilScreenMixin extends ItemCombinerScreen { @Inject(method = "slotChanged", at = @At("HEAD"), cancellable = true) public void be_onSlotUpdate(AbstractContainerMenu handler, int slotId, ItemStack stack, CallbackInfo info) { AnvilScreenHandlerExtended anvilHandler = (AnvilScreenHandlerExtended) handler; - if (anvilHandler.be_getCurrentRecipe() != null) { - if (anvilHandler.be_getRecipes().size() > 1) { + if (anvilHandler.bcl_getCurrentRecipe() != null) { + if (anvilHandler.bcl_getRecipes().size() > 1) { be_buttons.forEach(button -> button.visible = true); } else { be_buttons.forEach(button -> button.visible = false); diff --git a/src/main/java/org/betterx/bclib/mixin/common/AnvilMenuMixin.java b/src/main/java/org/betterx/bclib/mixin/common/AnvilMenuMixin.java index 602f1dcf..a27eff36 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/AnvilMenuMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/AnvilMenuMixin.java @@ -5,7 +5,6 @@ import org.betterx.bclib.blocks.LeveledAnvilBlock; import org.betterx.bclib.interfaces.AnvilScreenHandlerExtended; import org.betterx.bclib.recipes.AnvilRecipe; -import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.tags.BlockTags; import net.minecraft.world.entity.player.Inventory; @@ -34,7 +33,7 @@ import org.jetbrains.annotations.Nullable; @Mixin(AnvilMenu.class) public abstract class AnvilMenuMixin extends ItemCombinerMenu implements AnvilScreenHandlerExtended { private List be_recipes = Collections.emptyList(); - private AnvilRecipe be_currentRecipe; + private AnvilRecipe bcl_currentRecipe; private DataSlot anvilLevel; @Shadow @@ -71,14 +70,14 @@ public abstract class AnvilMenuMixin extends ItemCombinerMenu implements AnvilSc public abstract void createResult(); @Inject(method = "mayPickup", at = @At("HEAD"), cancellable = true) - protected void be_canTakeOutput(Player player, boolean present, CallbackInfoReturnable info) { - if (be_currentRecipe != null) { - info.setReturnValue(be_currentRecipe.checkHammerDurability(inputSlots, player)); + protected void bcl_canTakeOutput(Player player, boolean present, CallbackInfoReturnable info) { + if (bcl_currentRecipe != null) { + info.setReturnValue(bcl_currentRecipe.checkHammerDurability(inputSlots, player)); } } @Inject(method = "method_24922", at = @At(value = "HEAD"), cancellable = true) - private static void bclib_onDamageAnvil(Player player, Level level, BlockPos blockPos, CallbackInfo ci) { + private static void bcl_onDamageAnvil(Player player, Level level, BlockPos blockPos, CallbackInfo ci) { BlockState blockState = level.getBlockState(blockPos); if (blockState.getBlock() instanceof BaseAnvilBlock anvil) { BlockState damaged = anvil.damageAnvilUse(blockState, player.getRandom()); @@ -98,12 +97,12 @@ public abstract class AnvilMenuMixin extends ItemCombinerMenu implements AnvilSc } @Inject(method = "onTake", at = @At("HEAD"), cancellable = true) - protected void bclib_onTakeAnvilOutput(Player player, ItemStack stack, CallbackInfo info) { - if (be_currentRecipe != null) { + protected void bcl_onTakeAnvilOutput(Player player, ItemStack stack, CallbackInfo info) { + if (bcl_currentRecipe != null) { final int ingredientSlot = AnvilRecipe.getIngredientSlot(inputSlots); - inputSlots.getItem(ingredientSlot).shrink(be_currentRecipe.getInputCount()); - stack = be_currentRecipe.craft(inputSlots, player); + inputSlots.getItem(ingredientSlot).shrink(bcl_currentRecipe.getInputCount()); + stack = bcl_currentRecipe.craft(inputSlots, player); slotsChanged(inputSlots); access.execute((level, blockPos) -> { final BlockState anvilState = level.getBlockState(blockPos); @@ -124,7 +123,7 @@ public abstract class AnvilMenuMixin extends ItemCombinerMenu implements AnvilSc } @Inject(method = "createResult", at = @At("HEAD"), cancellable = true) - public void be_updateOutput(CallbackInfo info) { + public void bcl_updateOutput(CallbackInfo info) { RecipeManager recipeManager = this.player.level.getRecipeManager(); be_recipes = recipeManager.getRecipesFor(AnvilRecipe.TYPE, inputSlots, player.level); if (be_recipes.size() > 0) { @@ -133,20 +132,20 @@ public abstract class AnvilMenuMixin extends ItemCombinerMenu implements AnvilSc .filter(recipe -> anvilLevel >= recipe.getAnvilLevel()) .collect(Collectors.toList()); if (be_recipes.size() > 0) { - if (be_currentRecipe == null || !be_recipes.contains(be_currentRecipe)) { - be_currentRecipe = be_recipes.get(0); + if (bcl_currentRecipe == null || !be_recipes.contains(bcl_currentRecipe)) { + bcl_currentRecipe = be_recipes.get(0); } - be_updateResult(); + bcl_updateResult(); info.cancel(); } else { - be_currentRecipe = null; + bcl_currentRecipe = null; } } } @Inject(method = "setItemName", at = @At("HEAD"), cancellable = true) - public void be_setNewItemName(String string, CallbackInfo info) { - if (be_currentRecipe != null) { + public void bcl_setNewItemName(String string, CallbackInfo info) { + if (bcl_currentRecipe != null) { info.cancel(); } } @@ -163,25 +162,25 @@ public abstract class AnvilMenuMixin extends ItemCombinerMenu implements AnvilSc return super.clickMenuButton(player, id); } - private void be_updateResult() { - if (be_currentRecipe == null) return; - resultSlots.setItem(0, be_currentRecipe.assemble(inputSlots, Minecraft.getInstance().level.registryAccess())); + private void bcl_updateResult() { + if (bcl_currentRecipe == null) return; + resultSlots.setItem(0, bcl_currentRecipe.assemble(inputSlots, this.player.level.registryAccess())); broadcastChanges(); } @Override - public void be_updateCurrentRecipe(AnvilRecipe recipe) { - this.be_currentRecipe = recipe; - be_updateResult(); + public void bcl_updateCurrentRecipe(AnvilRecipe recipe) { + this.bcl_currentRecipe = recipe; + bcl_updateResult(); } @Override - public AnvilRecipe be_getCurrentRecipe() { - return be_currentRecipe; + public AnvilRecipe bcl_getCurrentRecipe() { + return bcl_currentRecipe; } @Override - public List be_getRecipes() { + public List bcl_getRecipes() { return be_recipes; } }