From d70cd09b42973edc4286133f03a9b2d240a461e8 Mon Sep 17 00:00:00 2001
From: alterNERDtive <nerd@alternerd.tv>
Date: Wed, 26 Jul 2023 12:15:03 +0200
Subject: [PATCH] refactoring: renamed mixin methods

---
 .../mixin/MixinEnchantmentEntry.java           |  4 ++--
 .../mixin/MixinPlayerResearchesData.java       |  2 +-
 .../integration/mixin/MixinStageManager.java   | 18 +++++++++---------
 .../mixin/MixinVaultAltarBlock.java            |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinEnchantmentEntry.java b/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinEnchantmentEntry.java
index 1a568fb..f2dd955 100644
--- a/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinEnchantmentEntry.java
+++ b/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinEnchantmentEntry.java
@@ -53,7 +53,7 @@ public abstract class MixinEnchantmentEntry
         at = @At("RETURN"),
         remap = false
     )
-    private void initCallback(Enchantment enchantment, int level, CallbackInfo ci) {
+    private void init$return(Enchantment enchantment, int level, CallbackInfo ci) {
         if (Configuration.FORTUNE_ENABLED.get()) {
             ResourceLocation registryName = this.enchantment.getRegistryName();
             if (registryName != null && registryName.toString().equals("minecraft:fortune")) {
@@ -73,7 +73,7 @@ public abstract class MixinEnchantmentEntry
         cancellable = true,
         remap = false
     )
-    private void isValidCallback(CallbackInfoReturnable<Boolean> ci) {
+    private void isValid$return(CallbackInfoReturnable<Boolean> ci) {
         if (Configuration.FORTUNE_ENABLED.get()) {
             ResourceLocation registryName = this.enchantment.getRegistryName();
             if (registryName != null && registryName.toString().equals("minecraft:fortune")
diff --git a/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinPlayerResearchesData.java b/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinPlayerResearchesData.java
index e1b1579..6045cba 100644
--- a/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinPlayerResearchesData.java
+++ b/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinPlayerResearchesData.java
@@ -60,7 +60,7 @@ public class MixinPlayerResearchesData {
         cancellable = true,
         remap = false
     )
-    private void getResearchesCallback(UUID uuid, CallbackInfoReturnable<ResearchTree> ci) {
+    private void getResearches$return(UUID uuid, CallbackInfoReturnable<ResearchTree> ci) {
         if (Configuration.FAKE_PLAYER_FIX.get() && uuid.equals(ae2Uuid) && !this.ae2ResearchInjected) {
             VaultModTweaks.LOGGER.info(I18n.get("the_vault_tweaks.log.inject.ae2research"));
             this.playerMap.remove(ae2Uuid);
diff --git a/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinStageManager.java b/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinStageManager.java
index ca2bfc7..34665e0 100644
--- a/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinStageManager.java
+++ b/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinStageManager.java
@@ -53,8 +53,8 @@ public abstract class MixinStageManager {
         ),
         remap = false
     )
-    private static ResearchTree overrideOnItemCrafted(Player player) {
-        return getResearchTreeOverride(player);
+    private static ResearchTree onItemCrafted$getResearchTree(Player player) {
+        return getResearchTree$redirect(player);
     }
 
     @Redirect(
@@ -66,8 +66,8 @@ public abstract class MixinStageManager {
         ),
         remap = false
     )
-    private static ResearchTree overrideOnBlockInteraction(Player player) {
-        return getResearchTreeOverride(player);
+    private static ResearchTree onBlockInteraction$getResearchTree(Player player) {
+        return getResearchTree$redirect(player);
     }
 
     @Redirect(
@@ -79,8 +79,8 @@ public abstract class MixinStageManager {
         ),
         remap = false
     )
-    private static ResearchTree overrideOnItemUse(Player player) {
-        return getResearchTreeOverride(player);
+    private static ResearchTree onItemUse$getResearchTree(Player player) {
+        return getResearchTree$redirect(player);
     }
 
     @Redirect(
@@ -92,8 +92,8 @@ public abstract class MixinStageManager {
         ),
         remap = false
     )
-    private static ResearchTree overrideOnEntityInteraction(Player player) {
-        return getResearchTreeOverride(player);
+    private static ResearchTree onEntityInteraction$getResearchTree(Player player) {
+        return getResearchTree$redirect(player);
     }
 
     /**
@@ -102,7 +102,7 @@ public abstract class MixinStageManager {
      * @param player
      * @return
      */
-    private static ResearchTree getResearchTreeOverride(Player player) {
+    private static ResearchTree getResearchTree$redirect(Player player) {
         ResearchTree tree = ResearchTree.empty();
         if (player instanceof FakePlayer) {
             if (Configuration.FAKE_PLAYER_FIX.get()) {
diff --git a/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinVaultAltarBlock.java b/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinVaultAltarBlock.java
index b86589c..36e5d8c 100644
--- a/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinVaultAltarBlock.java
+++ b/src/main/java/tv/alterNERD/VaultModTweaks/integration/mixin/MixinVaultAltarBlock.java
@@ -71,7 +71,7 @@ public class MixinVaultAltarBlock {
         ),
         cancellable = true
     )
-    private void onUse(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit, CallbackInfoReturnable<InteractionResult> ci) {
+    private void use$return(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit, CallbackInfoReturnable<InteractionResult> ci) {
         if (Configuration.ROUTER_VAULTAR_FIX.get() && !world.isClientSide && hand == InteractionHand.MAIN_HAND && player instanceof ServerPlayer) {
             ServerPlayer serverPlayer = (ServerPlayer)player;
             ItemStack heldItem = player.getMainHandItem();