Reconstruct the code; modify the language files; enhance the enchantment generator 重构代码；修改语言文件；加强附魔发电机

src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json

@@ -1,6 +1,6 @@
 {
-  "anvilcraft_pigsplus.configuration.auto_royal_smithing_table_cooldown": "uʍopןooƆ ǝןqɐ⟘ buıɥʇıɯS ןɐʎoᴚ oʇnⱯ",
-  "anvilcraft_pigsplus.configuration.auto_royal_smithing_table_cooldown.tooltip": ")sʞɔıʇ uı( ǝןqɐʇ buıɥʇıɯs ןɐʎoɹ oʇnɐ ɟo ǝɯıʇ uʍopןooɔ ɯnɯıxɐW",
+  "anvilcraft_pigsplus.configuration.auto_machine_cooldown": "uʍopןooƆ ǝuıɥɔɐW oʇnⱯ",
+  "anvilcraft_pigsplus.configuration.auto_machine_cooldown.tooltip": ")sʞɔıʇ uı( ǝuıɥɔɐɯ oʇnɐ ɟo ǝɯıʇ uʍopןooɔ ɯnɯıxɐW",
   "anvilcraft_pigsplus.configuration.electric_enchanting_table": "ǝןqɐ⟘ buıʇuɐɥɔuƎ ɔıɹʇɔǝןƎ",
   "anvilcraft_pigsplus.configuration.electric_enchanting_table.base_power_consumption_limit": "ʇıɯıꞀ uoıʇdɯnsuoƆ ɹǝʍoԀ ǝsɐᗺ",
   "anvilcraft_pigsplus.configuration.electric_enchanting_table.base_power_consumption_limit.tooltip": "ǝןqɐ⟘ buıʇuɐɥɔuƎ ɔıɹʇɔǝןƎ ɹoɟ ʇıɯıן uoıʇdɯnsuoɔ ɹǝʍod ǝsɐᗺ",
@@ -40,11 +40,11 @@
   "block.anvilcraft_pigsplus.budding_echo_shard": "pɹɐɥS oɥɔƎ buıppnᗺ",
   "block.anvilcraft_pigsplus.cauldron_output": "ʇndʇnO uoɹpןnɐƆ",
   "block.anvilcraft_pigsplus.chain_smithing_table": "ǝןqɐ⟘ buıɥʇıɯS uıɐɥƆ",
-  "block.anvilcraft_pigsplus.chaotic_raw_ore_block": "ʞɔoןᗺ ǝɹO ʍɐᴚ ɔıʇoɐɥƆ",
+  "block.anvilcraft_pigsplus.chaotic_raw_ore_block": "ǝɹO ʍɐᴚ ɔıʇoɐɥƆ ɟo ʞɔoןᗺ",
   "block.anvilcraft_pigsplus.deepslate_chaotic_ore": "ǝɹO ɔıʇoɐɥƆ ǝʇɐןsdǝǝᗡ",
   "block.anvilcraft_pigsplus.echo_cluster": "ɹǝʇsnןƆ oɥɔƎ",
   "block.anvilcraft_pigsplus.electric_enchanting_table": "ǝןqɐ⟘ buıʇuɐɥɔuƎ ɔıɹʇɔǝןƎ",
-  "block.anvilcraft_pigsplus.enchanted_generator": "ɹoʇɐɹǝuǝ⅁ pǝʇuɐɥɔuƎ",
+  "block.anvilcraft_pigsplus.enchanted_generator": "ɹoʇɐɹǝuǝ⅁ ʇuǝɯʇuɐɥɔuƎ",
   "block.anvilcraft_pigsplus.enchanted_generator.placement_too_close_to_another": "ɹoʇɐɹǝuǝb pǝʇuɐɥɔuǝ ɹǝɥʇouɐ oʇ ǝsoןɔ oo⟘",
   "block.anvilcraft_pigsplus.redstone_conduit_block": "ʞɔoןᗺ ʇınpuoƆ ǝuoʇspǝᴚ",
   "block.anvilcraft_pigsplus.sculk_extractor": "ɹoʇɔɐɹʇxƎ ʞןnɔS",

src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json

@@ -1,6 +1,6 @@
 {
-  "anvilcraft_pigsplus.configuration.auto_royal_smithing_table_cooldown": "Auto Royal Smithing Table Cooldown",
-  "anvilcraft_pigsplus.configuration.auto_royal_smithing_table_cooldown.tooltip": "Maximum cooldown time of auto royal smithing table (in ticks)",
+  "anvilcraft_pigsplus.configuration.auto_machine_cooldown": "Auto Machine Cooldown",
+  "anvilcraft_pigsplus.configuration.auto_machine_cooldown.tooltip": "Maximum cooldown time of auto machine (in ticks)",
   "anvilcraft_pigsplus.configuration.electric_enchanting_table": "Electric Enchanting Table",
   "anvilcraft_pigsplus.configuration.electric_enchanting_table.base_power_consumption_limit": "Base Power Consumption Limit",
   "anvilcraft_pigsplus.configuration.electric_enchanting_table.base_power_consumption_limit.tooltip": "Base power consumption limit for Electric Enchanting Table",
@@ -40,11 +40,11 @@
   "block.anvilcraft_pigsplus.budding_echo_shard": "Budding Echo Shard",
   "block.anvilcraft_pigsplus.cauldron_output": "Cauldron Output",
   "block.anvilcraft_pigsplus.chain_smithing_table": "Chain Smithing Table",
-  "block.anvilcraft_pigsplus.chaotic_raw_ore_block": "Chaotic Raw Ore Block",
+  "block.anvilcraft_pigsplus.chaotic_raw_ore_block": "Block of Chaotic Raw Ore",
   "block.anvilcraft_pigsplus.deepslate_chaotic_ore": "Deepslate Chaotic Ore",
   "block.anvilcraft_pigsplus.echo_cluster": "Echo Cluster",
   "block.anvilcraft_pigsplus.electric_enchanting_table": "Electric Enchanting Table",
-  "block.anvilcraft_pigsplus.enchanted_generator": "Enchanted Generator",
+  "block.anvilcraft_pigsplus.enchanted_generator": "Enchantment Generator",
   "block.anvilcraft_pigsplus.enchanted_generator.placement_too_close_to_another": "Too close to another enchanted generator",
   "block.anvilcraft_pigsplus.redstone_conduit_block": "Redstone Conduit Block",
   "block.anvilcraft_pigsplus.sculk_extractor": "Sculk Extractor",

src/generated/resources/data/anvilcraft_pigsplus/recipe/enchanted_generator.json

@@ -10,11 +10,14 @@
     },
     "C": {
       "item": "anvilcraft:frost_metal_ingot"
+    },
+    "D": {
+      "tag": "c:plates/silver"
     }
   },
   "pattern": [
-    "AAA",
-    "ABA",
+    "ADA",
+    "DBD",
     "CCC"
   ],
   "result": {

src/main/java/dev/anvilcraft/pigsplus/block/entity/AutoJewelCraftingTableBlockEntity.java

@@ -1,29 +1,16 @@
 package dev.anvilcraft.pigsplus.block.entity;
 
-import dev.anvilcraft.pigsplus.block.AutoJewelCraftingTableBlock;
 import dev.anvilcraft.pigsplus.init.AddonBlocks;
 import dev.anvilcraft.pigsplus.init.AddonMenuTypes;
 import dev.anvilcraft.pigsplus.inventory.AutoJewelCraftingMenu;
-import dev.dubhe.anvilcraft.api.itemhandler.ItemHandlerUtil;
-import dev.dubhe.anvilcraft.api.power.IPowerConsumer;
-import dev.dubhe.anvilcraft.api.power.PowerGrid;
-import dev.dubhe.anvilcraft.block.BatchCrafterBlock;
-import dev.dubhe.anvilcraft.block.entity.BaseMachineBlockEntity;
-import dev.dubhe.anvilcraft.init.block.ModBlocks;
 import dev.dubhe.anvilcraft.recipe.JewelCraftingRecipe;
 import dev.dubhe.anvilcraft.recipe.anvil.cache.RecipeCaches;
 import lombok.Getter;
-import lombok.Setter;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.ClientGamePacketListener;
-import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
-import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -37,84 +24,67 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.Vec3;
-import net.neoforged.neoforge.capabilities.Capabilities;
-import net.neoforged.neoforge.items.IItemHandler;
 import net.neoforged.neoforge.items.ItemStackHandler;
 import org.jetbrains.annotations.Nullable;
-import org.joml.Vector3f;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static dev.anvilcraft.pigsplus.AnvilCraftPigsPlus.CONFIG;
 
 @Getter
-public class AutoJewelCraftingTableBlockEntity extends BaseMachineBlockEntity implements IPowerConsumer {
-    private static final AtomicInteger COUNTER = new AtomicInteger(0);
-    @Getter
-    private final int inputPower = 16;
-    @Setter
-    @Getter
-    private PowerGrid grid;
-    private boolean poweredBefore = false;
-    private int cooldown = 0;
+public class AutoJewelCraftingTableBlockEntity extends AutoMachineBlockEntity {
     @Getter
     private ItemStack resultStack = ItemStack.EMPTY;
     @Getter
     private @Nullable JewelCraftingRecipe resultRecipe = null;
-    @Getter
-    private final int id;
 
-    private final ItemStackHandler itemHandler = new ItemStackHandler(5) {
-        @Override
-        public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
-            if (mayPlace(slot, stack)) {
-                return super.insertItem(slot, stack, simulate);
-            } else {
-                return stack;
-            }
-        }
+    public AutoJewelCraftingTableBlockEntity(BlockEntityType<? extends BlockEntity> type, BlockPos pos, BlockState state) {
+        super(type, pos, state, 5);
+    }
 
-        public boolean mayPlace(int slot, ItemStack stack) {
-            // slot 0 是源物品槽位
-            if (slot == 0) {
-                return RecipeCaches.getAllJewelResultItem().contains(stack.getItem());
-            }
-            if (resultRecipe != null) {
-                int idx = slot - 1;
-                var mergedIngredients = resultRecipe.mergedIngredients;
-                if (idx < mergedIngredients.size()) {
-                    var entry = mergedIngredients.get(idx);
-                    Ingredient ingredient = entry.getKey();
-                    return ingredient.test(stack);
+    @Override
+    protected ItemStackHandler createItemHandler(int size) {
+        return new ItemStackHandler(size) {
+            @Override
+            public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
+                if (mayPlace(slot, stack)) {
+                    return super.insertItem(slot, stack, simulate);
+                } else {
+                    return stack;
                 }
             }
-            return false;
-        }
 
-        @Override
-        protected void onContentsChanged(int slot) {
-            calcResult();
-            setChanged();
-        }
-    };
+            public boolean mayPlace(int slot, ItemStack stack) {
+                // slot 0 是源物品槽位
+                if (slot == 0) {
+                    return RecipeCaches.getAllJewelResultItem().contains(stack.getItem());
+                }
+                if (resultRecipe != null) {
+                    int idx = slot - 1;
+                    var mergedIngredients = resultRecipe.mergedIngredients;
+                    if (idx < mergedIngredients.size()) {
+                        var entry = mergedIngredients.get(idx);
+                        Ingredient ingredient = entry.getKey();
+                        return ingredient.test(stack);
+                    }
+                }
+                return false;
+            }
 
-    public AutoJewelCraftingTableBlockEntity(BlockEntityType<? extends BlockEntity> type, BlockPos pos, BlockState state) {
-        super(type, pos, state);
-        id = COUNTER.incrementAndGet();
+            @Override
+            protected void onContentsChanged(int slot) {
+                calcResult();
+                setChanged();
+            }
+        };
     }
 
+    @Override
     public void calcResult() {
         resultStack = ItemStack.EMPTY;
         resultRecipe = null;
         if (level == null) return;
 
         ItemStack mainStack = itemHandler.getStackInSlot(0);
-
         if (mainStack.isEmpty()) return;
 
         RecipeHolder<JewelCraftingRecipe> recipeHolder = RecipeCaches.getJewelRecipeByResult(mainStack);
@@ -137,25 +107,13 @@ public void calcResult() {
         resultStack.set(DataComponents.ENCHANTMENTS, enchantments.toImmutable());
     }
 
-    public void tick(Level level, BlockPos pos) {
-        flushState(level, pos);
-        BlockState state = level.getBlockState(pos);
-        level.updateNeighbourForOutputSignal(pos, state.getBlock());
-        boolean powered = state.getValue(AutoJewelCraftingTableBlock.POWERED);
-        // 红石信号上升沿且冷却完毕，尝试进行自动珠宝加工
-        cooldown = Math.max(0, cooldown - 1);
-        if (powered && !poweredBefore && !level.isClientSide && this.cooldown == 0) {
-            if (work(level)) cooldown = CONFIG.autoRoyalSmithingTableCooldown;
-        }
-        poweredBefore = powered;
-    }
-
-    private boolean work(Level level) {
-        if (grid == null || !grid.isWorking()) return false;
+    @Override
+    protected boolean work(Level level) {
+        if (getGrid() == null || !getGrid().isWorking()) return false;
 
         calcResult();
         if (resultStack.isEmpty() || resultRecipe == null) return false;
-        if (!exportItem(resultStack, getDirection())) return false;
+        if (!exportItem(resultStack)) return false;
 
         // 消耗输入物品
         JewelCraftingRecipe recipe = this.resultRecipe;
@@ -171,105 +129,25 @@ private boolean work(Level level) {
         return true;
     }
 
-    private boolean exportItem(ItemStack result, Direction direction) {
-        IItemHandler cap = Objects.requireNonNull(getLevel()).getCapability(
-            Capabilities.ItemHandler.BLOCK,
-            getBlockPos().relative(direction),
-            direction.getOpposite()
-        );
-        if (cap != null) {
-            // 尝试向容器插入物品
-            ItemStack remained = ItemHandlerUtil.insertItem(cap, result, true);
-            if (!remained.isEmpty()) return false;
-            ItemHandlerUtil.insertItem(cap, result, false);
-        } else {
-            // 尝试向世界喷出物品
-            Vec3 center = getBlockPos().relative(getDirection()).getCenter();
-            AABB aabb = new AABB(center.add(-0.125, -0.125, -0.125), center.add(0.125, 0.125, 0.125));
-            if (!getLevel().noCollision(aabb)) return false;
-
-            spawnItemEntity(result);
-        }
-        return true;
-    }
-
-    private void spawnItemEntity(ItemStack stack) {
-        Vec3 center = getBlockPos().relative(getDirection()).getCenter();
-        Vector3f step = getDirection().step();
-        Level level = this.getLevel();
-        if (level == null) return;
-        ItemEntity itemEntity =
-            new ItemEntity(level, center.x, center.y, center.z, stack, 0.25 * step.x, 0.25 * step.y, 0.25 * step.z);
-        itemEntity.setDefaultPickUpDelay();
-        level.addFreshEntity(itemEntity);
-    }
-
-    public IItemHandler getItemHandler() {
-        return itemHandler;
-    }
-
-
-    @Override
-    public Packet<ClientGamePacketListener> getUpdatePacket() {
-        return ClientboundBlockEntityDataPacket.create(this);
-    }
-
-    @Override
-    public CompoundTag getUpdateTag(HolderLookup.Provider provider) {
-        return this.saveWithoutMetadata(provider);
-    }
 
     @Override
     protected void loadAdditional(CompoundTag tag, HolderLookup.Provider provider) {
         super.loadAdditional(tag, provider);
-        itemHandler.deserializeNBT(provider, tag.getCompound("Inventory"));
         if (tag.getBoolean("HasResultItemStack") && tag.contains("ResultItemStack")) {
             CompoundTag ct = tag.getCompound("ResultItemStack");
-            resultStack =
-                ct.contains("id") ? ItemStack.parse(provider, ct).orElse(ItemStack.EMPTY) : ItemStack.EMPTY;
+            resultStack = ct.contains("id") ? ItemStack.parse(provider, ct).orElse(ItemStack.EMPTY) : ItemStack.EMPTY;
         }
-        this.poweredBefore = tag.getBoolean("PoweredBefore");
-        this.cooldown = tag.getInt("Cooldown");
     }
 
     @Override
     protected void saveAdditional(CompoundTag tag, HolderLookup.Provider provider) {
         super.saveAdditional(tag, provider);
-        tag.put("Inventory", this.itemHandler.serializeNBT(provider));
         boolean hasResultItemStack = resultStack != null && !resultStack.isEmpty();
         tag.putBoolean("HasResultItemStack", hasResultItemStack);
         if (hasResultItemStack) {
             CompoundTag item = (CompoundTag) this.resultStack.save(provider);
             tag.put("ResultItemStack", item);
         }
-        tag.putBoolean("PoweredBefore", this.poweredBefore);
-        tag.putInt("Cooldown", this.cooldown);
-    }
-
-    @Override
-    public Direction getDirection() {
-        return Direction.UP;
-    }
-
-    @Override
-    public void setDirection(Direction direction) {
-        if (level == null) return;
-        BlockPos pos = getBlockPos();
-        BlockState state = level.getBlockState(pos);
-        if (!state.is(ModBlocks.BATCH_CRAFTER.get())) return;
-        level.setBlockAndUpdate(pos, state.setValue(BatchCrafterBlock.FACING, direction));
-    }
-
-
-    public int getRedstoneSignal() {
-        /*输出等同于有物品的输入槽的数量的红石信号*/
-        int strength = 0;
-        for (int index = 0; index < itemHandler.getSlots(); index++) {
-            ItemStack itemStack = itemHandler.getStackInSlot(index);
-            if (itemStack.isEmpty()) continue;
-            strength++;
-        }
-        return strength;
     }
 
     @Nullable
@@ -283,14 +161,4 @@ public AbstractContainerMenu createMenu(int i, Inventory inventory, Player playe
     public Component getDisplayName() {
         return Component.translatable("block.anvilcraft_pigsplus.auto_jewel_crafting_table");
     }
-
-    @Override
-    public BlockPos getPos() {
-        return getBlockPos();
-    }
-
-    @Override
-    public @Nullable Level getCurrentLevel() {
-        return getLevel();
-    }
 }