From 3d2673d27ce08c3129bd0684bd8e8ab7ad694c81 Mon Sep 17 00:00:00 2001 From: rlnt Date: Mon, 26 Aug 2024 21:38:45 +0200 Subject: [PATCH] change prefix and naming of mixin methods --- .../unified/mixin/runtime/ClientPacketListenerMixin.java | 2 +- .../unified/mixin/runtime/RecipeManagerMixin.java | 2 +- .../almostreliable/unified/mixin/runtime/TagLoaderMixin.java | 2 +- .../unified/mixin/unification/ArmorItemMixin.java | 2 +- .../unified/mixin/unification/TieredItemMixin.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Common/src/main/java/com/almostreliable/unified/mixin/runtime/ClientPacketListenerMixin.java b/Common/src/main/java/com/almostreliable/unified/mixin/runtime/ClientPacketListenerMixin.java index ba3743c..da59bc7 100644 --- a/Common/src/main/java/com/almostreliable/unified/mixin/runtime/ClientPacketListenerMixin.java +++ b/Common/src/main/java/com/almostreliable/unified/mixin/runtime/ClientPacketListenerMixin.java @@ -13,7 +13,7 @@ @Mixin(ClientPacketListener.class) public class ClientPacketListenerMixin { @Inject(method = "handleUpdateTags", at = @At("RETURN")) - private void runClientTagUpdateEvent(ClientboundUpdateTagsPacket packet, CallbackInfo ci) { + private void almostunified$onClientTagsUpdate(ClientboundUpdateTagsPacket packet, CallbackInfo ci) { ClientTagUpdateEvent.invoke(); } } diff --git a/Common/src/main/java/com/almostreliable/unified/mixin/runtime/RecipeManagerMixin.java b/Common/src/main/java/com/almostreliable/unified/mixin/runtime/RecipeManagerMixin.java index 886541a..0298ea0 100644 --- a/Common/src/main/java/com/almostreliable/unified/mixin/runtime/RecipeManagerMixin.java +++ b/Common/src/main/java/com/almostreliable/unified/mixin/runtime/RecipeManagerMixin.java @@ -25,7 +25,7 @@ public class RecipeManagerMixin { @Shadow @Final private HolderLookup.Provider registries; @Inject(method = "apply(Ljava/util/Map;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)V", at = @At("HEAD")) - private void runTransformation(Map recipes, ResourceManager resourceManager, ProfilerFiller profiler, CallbackInfo ci) { + private void almostunified$onRecipeReload(Map recipes, ResourceManager resourceManager, ProfilerFiller profiler, CallbackInfo ci) { try { AlmostUnifiedCommon.onRecipeManagerReload(recipes, registries); } catch (Exception e) { diff --git a/Common/src/main/java/com/almostreliable/unified/mixin/runtime/TagLoaderMixin.java b/Common/src/main/java/com/almostreliable/unified/mixin/runtime/TagLoaderMixin.java index 6f84556..9330e3f 100644 --- a/Common/src/main/java/com/almostreliable/unified/mixin/runtime/TagLoaderMixin.java +++ b/Common/src/main/java/com/almostreliable/unified/mixin/runtime/TagLoaderMixin.java @@ -27,7 +27,7 @@ public class TagLoaderMixin { @Shadow @Final private String directory; @Inject(method = "build(Ljava/util/Map;)Ljava/util/Map;", at = @At("RETURN")) - private void onCreateLoadResult(Map> map, CallbackInfoReturnable>> cir) { + private void almostunified$onTagUpdate(Map> map, CallbackInfoReturnable>> cir) { if (directory.equals("tags/item")) { try { Map>> tags = Utils.cast(cir.getReturnValue()); diff --git a/Common/src/main/java/com/almostreliable/unified/mixin/unification/ArmorItemMixin.java b/Common/src/main/java/com/almostreliable/unified/mixin/unification/ArmorItemMixin.java index e2d29a5..4d04efb 100644 --- a/Common/src/main/java/com/almostreliable/unified/mixin/unification/ArmorItemMixin.java +++ b/Common/src/main/java/com/almostreliable/unified/mixin/unification/ArmorItemMixin.java @@ -22,7 +22,7 @@ public class ArmorItemMixin { @Shadow @Final protected Holder material; @Inject(method = "isValidRepairItem", at = @At("HEAD"), cancellable = true) - private void unified$repairUnification(ItemStack stack, ItemStack repairCandidate, CallbackInfoReturnable cir) { + private void almostunified$onArmorRepair(ItemStack stack, ItemStack repairCandidate, CallbackInfoReturnable cir) { AlmostUnifiedRuntime runtime = AlmostUnified.INSTANCE.getRuntime(); if (runtime == null) return; diff --git a/Common/src/main/java/com/almostreliable/unified/mixin/unification/TieredItemMixin.java b/Common/src/main/java/com/almostreliable/unified/mixin/unification/TieredItemMixin.java index 9f0cfe1..81417a6 100644 --- a/Common/src/main/java/com/almostreliable/unified/mixin/unification/TieredItemMixin.java +++ b/Common/src/main/java/com/almostreliable/unified/mixin/unification/TieredItemMixin.java @@ -21,7 +21,7 @@ public class TieredItemMixin { @Shadow @Final private Tier tier; @Inject(method = "isValidRepairItem", at = @At("HEAD"), cancellable = true) - private void unified$repairUnification(ItemStack stack, ItemStack repairCandidate, CallbackInfoReturnable cir) { + private void almostunified$onItemRepair(ItemStack stack, ItemStack repairCandidate, CallbackInfoReturnable cir) { AlmostUnifiedRuntime runtime = AlmostUnified.INSTANCE.getRuntime(); if (runtime == null) return;