调整 Mixin

common/src/main/java/dev/dubhe/anvilcraft/api/registry/AnvilCraftRegistrate.java

@@ -9,7 +9,7 @@
 import com.tterrag.registrate.util.nullness.NonNullFunction;
 import com.tterrag.registrate.util.nullness.NonNullSupplier;
 import dev.architectury.injectables.annotations.ExpectPlatform;
-import dev.dubhe.anvilcraft.util.FormattingUtil;
+import dev.dubhe.anvilcraft.util.IFormattingUtil;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.item.CreativeModeTab;
@@ -42,7 +42,7 @@ public static AnvilCraftRegistrate create(String modId) {
         String name,
         NonNullFunction<Item.Properties, T> factory
     ) {
-        return super.item(name, factory).lang(FormattingUtil.toEnglishName(name.replaceAll("/.", "_")));
+        return super.item(name, factory).lang(IFormattingUtil.toEnglishName(name.replaceAll("/.", "_")));
     }
 
     private RegistryEntry<CreativeModeTab> currentTab;

common/src/main/java/dev/dubhe/anvilcraft/data/generator/lang/ConfigScreenLang.java

@@ -4,7 +4,7 @@
 import com.tterrag.registrate.providers.RegistrateLangProvider;
 import dev.dubhe.anvilcraft.AnvilCraft;
 import dev.dubhe.anvilcraft.config.AnvilCraftConfig;
-import dev.dubhe.anvilcraft.util.FormattingUtil;
+import dev.dubhe.anvilcraft.util.IFormattingUtil;
 import me.shedaniel.autoconfig.ConfigData;
 import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.Comment;
 import org.jetbrains.annotations.NotNull;
@@ -36,7 +36,7 @@ private static void readConfigClass(
             if (field.isAnnotationPresent(SerializedName.class)) {
                 name = field.getAnnotation(SerializedName.class).value();
             } else {
-                name = FormattingUtil.toEnglishName(FormattingUtil.toLowerCaseUnder(fieldName));
+                name = IFormattingUtil.toEnglishName(IFormattingUtil.toLowerCaseUnder(fieldName));
             }
             provider.add(OPTION_STRING.formatted(AnvilCraft.MOD_ID, fieldName), name);
             if (field.isAnnotationPresent(Comment.class)) {

common/src/main/java/dev/dubhe/anvilcraft/data/recipe/anvil/AnvilRecipe.java

@@ -13,7 +13,7 @@
 import dev.dubhe.anvilcraft.data.recipe.anvil.predicate.HasBlockIngredient;
 import dev.dubhe.anvilcraft.data.recipe.anvil.predicate.HasItem;
 import dev.dubhe.anvilcraft.data.recipe.anvil.predicate.HasItemIngredient;
-import dev.dubhe.anvilcraft.util.IItemStackInjector;
+import dev.dubhe.anvilcraft.util.IItemStackUtil;
 import lombok.Getter;
 import net.minecraft.advancements.Advancement;
 import net.minecraft.advancements.AdvancementRewards;
@@ -138,7 +138,7 @@ public enum Serializer implements RecipeSerializer<AnvilRecipe> {
         public @NotNull AnvilRecipe fromJson(@NotNull ResourceLocation recipeId, @NotNull JsonObject serializedRecipe) {
             ItemStack icon = ItemStack.EMPTY;
             if (serializedRecipe.has("icon")) {
-                icon = IItemStackInjector.fromJson(serializedRecipe.get("icon"));
+                icon = IItemStackUtil.fromJson(serializedRecipe.get("icon"));
             }
             AnvilRecipe recipe = new AnvilRecipe(recipeId, icon);
             JsonArray predicates = GsonHelper.getAsJsonArray(serializedRecipe, "predicates");
@@ -677,12 +677,11 @@ static class Result implements FinishedRecipe {
             }
 
             @Override
-            @SuppressWarnings("UnreachableCode")
             public void serializeRecipeData(@NotNull JsonObject json) {
                 if (!this.group.isEmpty()) {
                     json.addProperty("group", this.group);
                 }
-                json.add("icon", ((IItemStackInjector) (Object) this.icon).anvilcraft$toJson());
+                json.add("icon", IItemStackUtil.toJson(this.icon));
                 JsonArray predicates = new JsonArray();
                 for (RecipePredicate predicate : this.predicates) {
                     predicates.add(predicate.toJson());

common/src/main/java/dev/dubhe/anvilcraft/data/recipe/anvil/outcome/SetBlock.java

@@ -8,7 +8,7 @@
 import dev.dubhe.anvilcraft.AnvilCraft;
 import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilCraftingContainer;
 import dev.dubhe.anvilcraft.data.recipe.anvil.RecipeOutcome;
-import dev.dubhe.anvilcraft.util.IBlockStateInjector;
+import dev.dubhe.anvilcraft.util.IBlockStateUtil;
 import lombok.Getter;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.FriendlyByteBuf;
@@ -45,7 +45,7 @@ public SetBlock(Vec3 offset, double chance, BlockState result) {
     public SetBlock(@NotNull FriendlyByteBuf buffer) {
         this.offset = new Vec3(buffer.readVector3f());
         this.chance = buffer.readDouble();
-        this.result = IBlockStateInjector.fromJson(AnvilCraft.GSON.fromJson(buffer.readUtf(), JsonElement.class));
+        this.result = IBlockStateUtil.fromJson(AnvilCraft.GSON.fromJson(buffer.readUtf(), JsonElement.class));
     }
 
     /**
@@ -67,7 +67,7 @@ public SetBlock(@NotNull JsonObject serializedRecipe) {
         if (serializedRecipe.has("chance")) {
             this.chance = GsonHelper.getAsDouble(serializedRecipe, "chance");
         } else this.chance = 1.0;
-        this.result = IBlockStateInjector.fromJson(GsonHelper.getAsJsonObject(serializedRecipe, "result"));
+        this.result = IBlockStateUtil.fromJson(GsonHelper.getAsJsonObject(serializedRecipe, "result"));
     }
 
     @Override
@@ -86,7 +86,7 @@ public void toNetwork(@NotNull FriendlyByteBuf buffer) {
         buffer.writeUtf(this.getType());
         buffer.writeVector3f(this.offset.toVector3f());
         buffer.writeDouble(this.chance);
-        buffer.writeUtf(((IBlockStateInjector) this.result).anvilcraft$toJson().toString());
+        buffer.writeUtf(IBlockStateUtil.toJson(this.result).toString());
     }
 
     @Override
@@ -98,7 +98,7 @@ public JsonElement toJson() {
         object.addProperty("type", this.getType());
         object.add("offset", offset);
         object.addProperty("chance", this.chance);
-        object.add("result", ((IBlockStateInjector) this.result).anvilcraft$toJson());
+        object.add("result", IBlockStateUtil.toJson(this.result));
         return object;
     }
 }

common/src/main/java/dev/dubhe/anvilcraft/data/recipe/anvil/outcome/SpawnItem.java

@@ -7,7 +7,7 @@
 import com.google.gson.JsonSyntaxException;
 import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilCraftingContainer;
 import dev.dubhe.anvilcraft.data.recipe.anvil.RecipeOutcome;
-import dev.dubhe.anvilcraft.util.IItemStackInjector;
+import dev.dubhe.anvilcraft.util.IItemStackUtil;
 import lombok.Getter;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.FriendlyByteBuf;
@@ -67,7 +67,7 @@ public SpawnItem(@NotNull JsonObject serializedRecipe) {
         if (serializedRecipe.has("chance")) {
             this.chance = GsonHelper.getAsDouble(serializedRecipe, "chance");
         } else this.chance = 1.0;
-        this.result = IItemStackInjector.fromJson(GsonHelper.getAsJsonObject(serializedRecipe, "result"));
+        this.result = IItemStackUtil.fromJson(GsonHelper.getAsJsonObject(serializedRecipe, "result"));
     }
 
     @Override
@@ -98,7 +98,7 @@ public JsonElement toJson() {
         object.addProperty("type", this.getType());
         object.add("offset", offset);
         object.addProperty("chance", this.chance);
-        object.add("result", ((IItemStackInjector) (Object) this.result).anvilcraft$toJson());
+        object.add("result", IItemStackUtil.toJson(this.result));
         return object;
     }
 }

common/src/main/java/dev/dubhe/anvilcraft/item/GeodeItem.java

@@ -1,7 +1,7 @@
 package dev.dubhe.anvilcraft.item;
 
 import dev.dubhe.anvilcraft.AnvilCraft;
-import dev.dubhe.anvilcraft.util.BlockHighlightUtil;
+import dev.dubhe.anvilcraft.util.IBlockHighlightUtil;
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.ClickEvent;
@@ -69,7 +69,7 @@ public GeodeItem(Properties properties) {
                     player.sendSystemMessage(Component.translatable(
                         "item.anvilcraft.geode.find", component
                     ));
-                    BlockHighlightUtil.highlightBlock(level, offsetPos);
+                    IBlockHighlightUtil.highlightBlock(level, offsetPos);
                     break block;
                 }
             }

common/src/main/java/dev/dubhe/anvilcraft/mixin/AbstractCauldronBlockMixin.java

@@ -2,7 +2,6 @@
 
 
 import dev.dubhe.anvilcraft.init.ModBlocks;
-import dev.dubhe.anvilcraft.util.IBucketPickupInjector;
 import net.minecraft.core.BlockPos;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
@@ -11,6 +10,7 @@
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.AbstractCauldronBlock;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.BucketPickup;
 import net.minecraft.world.level.block.LayeredCauldronBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.NotNull;
@@ -19,7 +19,7 @@
 import java.util.Optional;
 
 @Mixin(AbstractCauldronBlock.class)
-abstract class AbstractCauldronBlockMixin implements IBucketPickupInjector {
+public abstract class AbstractCauldronBlockMixin implements BucketPickup {
     @Override
     public @NotNull ItemStack pickupBlock(
         @NotNull LevelAccessor level, @NotNull BlockPos pos, @NotNull BlockState state

common/src/main/java/dev/dubhe/anvilcraft/mixin/BeaconMenuMixin.java

@@ -24,7 +24,7 @@
 import java.util.Optional;
 
 @Mixin(BeaconMenu.class)
-public class BeaconMenuMixin {
+public abstract class BeaconMenuMixin {
     @Shadow
     @Final
     private BeaconMenu.PaymentSlot paymentSlot;