diff --git a/src/main/java/dev/dubhe/anvilcraft/block/InteractMachineBlock.java b/src/main/java/dev/dubhe/anvilcraft/block/InteractMachineBlock.java deleted file mode 100644 index 46b58acfd..000000000 --- a/src/main/java/dev/dubhe/anvilcraft/block/InteractMachineBlock.java +++ /dev/null @@ -1,73 +0,0 @@ -package dev.dubhe.anvilcraft.block; - -import dev.dubhe.anvilcraft.block.entity.InteractMachineBlockEntity; -import dev.dubhe.anvilcraft.network.MachineOutputDirectionPack; -import net.minecraft.core.BlockPos; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.Container; -import net.minecraft.world.Containers; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.BaseEntityBlock; -import net.minecraft.world.level.block.RenderShape; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.phys.BlockHitResult; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public class InteractMachineBlock extends BaseEntityBlock { - public InteractMachineBlock(Properties properties) { - super(properties); - } - - @Override - @SuppressWarnings("deprecation") - public @NotNull InteractionResult use(BlockState state, @NotNull Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - if (level.isClientSide) { - return InteractionResult.SUCCESS; - } - BlockEntity blockEntity = level.getBlockEntity(pos); - if (blockEntity instanceof InteractMachineBlockEntity entity) { - player.openMenu(entity); - if (player instanceof ServerPlayer serverPlayer) - new MachineOutputDirectionPack(entity.getDirection()).send(serverPlayer); - } - return InteractionResult.CONSUME; - } - - @Override - @SuppressWarnings("deprecation") - public void onRemove(@NotNull BlockState state, Level level, BlockPos pos, @NotNull BlockState newState, boolean movedByPiston) { - if (state.is(newState.getBlock())) { - return; - } - BlockEntity blockEntity = level.getBlockEntity(pos); - if (blockEntity instanceof Container) { - Containers.dropContents(level, pos, (Container) blockEntity); - level.updateNeighbourForOutputSignal(pos, this); - } - super.onRemove(state, level, pos, newState, movedByPiston); - } - - @Nullable - @Override - public BlockEntity newBlockEntity(BlockPos pos, BlockState state) { - return new InteractMachineBlockEntity(pos, state); - } - - @Nullable - @Override - public BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType blockEntityType) { - return (level1, pos, state1, e) -> InteractMachineBlockEntity.tick(level1, pos, e); - } - - @Override - public @NotNull RenderShape getRenderShape(BlockState state) { - return RenderShape.MODEL; - } -} diff --git a/src/main/java/dev/dubhe/anvilcraft/block/entity/InteractMachineBlockEntity.java b/src/main/java/dev/dubhe/anvilcraft/block/entity/InteractMachineBlockEntity.java deleted file mode 100644 index 505388e3d..000000000 --- a/src/main/java/dev/dubhe/anvilcraft/block/entity/InteractMachineBlockEntity.java +++ /dev/null @@ -1,41 +0,0 @@ -package dev.dubhe.anvilcraft.block.entity; - -import dev.dubhe.anvilcraft.init.ModBlockEntities; -import dev.dubhe.anvilcraft.inventory.InteractMachineMenu; -import dev.dubhe.anvilcraft.init.ModItemTags; -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.state.BlockState; -import org.jetbrains.annotations.NotNull; - -public class InteractMachineBlockEntity extends BaseMachineBlockEntity { - public InteractMachineBlockEntity(BlockPos pos, BlockState blockState) { - super(ModBlockEntities.INTERACT_MACHINE, pos, blockState, 11); - } - - @Override - protected @NotNull Component getDefaultName() { - return Component.translatable("block.anvilcraft.interact_machine"); - } - - public static void tick(Level level, BlockPos pos, BlockEntity e) { - if (!(e instanceof InteractMachineBlockEntity entity)) return; - BaseMachineBlockEntity.tick(level, pos, entity); - } - - @Override - protected @NotNull AbstractContainerMenu createMenu(int containerId, Inventory inventory) { - return new InteractMachineMenu(containerId, inventory, this); - } - - @Override - public boolean canPlaceItem(int index, ItemStack stack) { - if (index != 0 && index != this.getContainerSize() - 1) return true; - return index == 0 && stack.is(ModItemTags.PROTOCOL); - } -} diff --git a/src/main/java/dev/dubhe/anvilcraft/client/AnvilCraftClient.java b/src/main/java/dev/dubhe/anvilcraft/client/AnvilCraftClient.java index dd0694369..1b2fba276 100644 --- a/src/main/java/dev/dubhe/anvilcraft/client/AnvilCraftClient.java +++ b/src/main/java/dev/dubhe/anvilcraft/client/AnvilCraftClient.java @@ -4,7 +4,6 @@ import dev.dubhe.anvilcraft.client.gui.screen.inventory.AutoCrafterScreen; import dev.dubhe.anvilcraft.client.init.ModNetworks; import dev.dubhe.anvilcraft.init.ModBlocks; -import dev.dubhe.anvilcraft.client.gui.screen.inventory.InteractMachineScreen; import dev.dubhe.anvilcraft.init.ModMenuTypes; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; @@ -15,7 +14,6 @@ public class AnvilCraftClient implements ClientModInitializer { @Override public void onInitializeClient() { BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.HOLLOW_MAGNET_BLOCK, RenderType.cutout()); - MenuScreens.register(ModMenuTypes.INTERACT_MACHINE, InteractMachineScreen::new); MenuScreens.register(ModMenuTypes.AUTO_CRAFTER, AutoCrafterScreen::new); ModNetworks.register(); Networking.CLIENT.register(); diff --git a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/inventory/InteractMachineScreen.java b/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/inventory/InteractMachineScreen.java deleted file mode 100644 index e4b0ea7b1..000000000 --- a/src/main/java/dev/dubhe/anvilcraft/client/gui/screen/inventory/InteractMachineScreen.java +++ /dev/null @@ -1,36 +0,0 @@ -package dev.dubhe.anvilcraft.client.gui.screen.inventory; - -import dev.dubhe.anvilcraft.AnvilCraft; -import dev.dubhe.anvilcraft.inventory.InteractMachineMenu; -import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.entity.player.Inventory; -import org.jetbrains.annotations.NotNull; - -public class InteractMachineScreen extends BaseMachineScreen { - private static final ResourceLocation CONTAINER_LOCATION = AnvilCraft.of("textures/gui/container/interact_machine.png"); - - public InteractMachineScreen(InteractMachineMenu menu, Inventory playerInventory, Component title) { - super(menu, playerInventory, title); - } - - @Override - protected void init() { - super.init(); - } - - @Override - public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { - this.renderBackground(guiGraphics); - super.render(guiGraphics, mouseX, mouseY, partialTick); - this.renderTooltip(guiGraphics, mouseX, mouseY); - } - - @Override - protected void renderBg(@NotNull GuiGraphics guiGraphics, float partialTick, int mouseX, int mouseY) { - int i = (this.width - this.imageWidth) / 2; - int j = (this.height - this.imageHeight) / 2; - guiGraphics.blit(CONTAINER_LOCATION, i, j, 0, 0, this.imageWidth, this.imageHeight); - } -} diff --git a/src/main/java/dev/dubhe/anvilcraft/data/generator/MyBlockLootGenerator.java b/src/main/java/dev/dubhe/anvilcraft/data/generator/MyBlockLootGenerator.java index d38a31983..1e8ca572d 100644 --- a/src/main/java/dev/dubhe/anvilcraft/data/generator/MyBlockLootGenerator.java +++ b/src/main/java/dev/dubhe/anvilcraft/data/generator/MyBlockLootGenerator.java @@ -17,7 +17,6 @@ public void generate() { this.dropSelf(ModBlocks.MAGNET_BLOCK); this.dropSelf(ModBlocks.HOLLOW_MAGNET_BLOCK); this.dropSelf(ModBlocks.FERRITE_CORE_MAGNET_BLOCK); - this.dropSelf(ModBlocks.INTERACT_MACHINE); this.dropSelf(ModBlocks.AUTO_CRAFTER); this.dropSelf(ModBlocks.ROYAL_STEEL_BLOCK); this.dropSelf(ModBlocks.SMOOTH_ROYAL_STEEL_BLOCK); diff --git a/src/main/java/dev/dubhe/anvilcraft/data/generator/MyBlockTagGenerator.java b/src/main/java/dev/dubhe/anvilcraft/data/generator/MyBlockTagGenerator.java index 25884cc3a..bfd4c5c23 100644 --- a/src/main/java/dev/dubhe/anvilcraft/data/generator/MyBlockTagGenerator.java +++ b/src/main/java/dev/dubhe/anvilcraft/data/generator/MyBlockTagGenerator.java @@ -37,7 +37,6 @@ protected void addTags(HolderLookup.Provider arg) { .add(ModBlocks.MAGNET_BLOCK) .add(ModBlocks.HOLLOW_MAGNET_BLOCK) .add(ModBlocks.FERRITE_CORE_MAGNET_BLOCK) - .add(ModBlocks.INTERACT_MACHINE) .add(ModBlocks.AUTO_CRAFTER) .add(ModBlocks.ROYAL_STEEL_BLOCK) .add(ModBlocks.SMOOTH_ROYAL_STEEL_BLOCK) @@ -46,7 +45,6 @@ protected void addTags(HolderLookup.Provider arg) { .add(ModBlocks.CUT_ROYAL_STEEL_STAIRS) .add(ModBlocks.LAVA_CAULDRON); this.getOrCreateTagBuilder(BlockTags.MINEABLE_WITH_AXE).setReplace(false) - .add(ModBlocks.INTERACT_MACHINE) .add(ModBlocks.AUTO_CRAFTER); } } diff --git a/src/main/java/dev/dubhe/anvilcraft/data/generator/MyItemTagGenerator.java b/src/main/java/dev/dubhe/anvilcraft/data/generator/MyItemTagGenerator.java index 05cb0a54a..4d7df813e 100644 --- a/src/main/java/dev/dubhe/anvilcraft/data/generator/MyItemTagGenerator.java +++ b/src/main/java/dev/dubhe/anvilcraft/data/generator/MyItemTagGenerator.java @@ -26,9 +26,7 @@ protected void addTags(HolderLookup.Provider arg) { this.getOrCreateTagBuilder(ModItemTags.WHEAT_DOUGH).setReplace(false) .add(ModItems.DOUGH); this.getOrCreateTagBuilder(ModItemTags.PICKAXES).setReplace(false) - .add(ModItems.AMETHYST_PICKAXE) - .add(ModItems.CHANGEABLE_PICKAXE_SILK_TOUCH) - .add(ModItems.CHANGEABLE_PICKAXE_FORTUNE); + .add(ModItems.AMETHYST_PICKAXE); this.getOrCreateTagBuilder(ModItemTags.AXES).setReplace(false) .add(ModItems.AMETHYST_AXE); this.getOrCreateTagBuilder(ModItemTags.HOES).setReplace(false) @@ -42,21 +40,6 @@ protected void addTags(HolderLookup.Provider arg) { .add(ModItems.CHOCOLATE_BLACK) .add(ModItems.CHOCOLATE_WHITE) .add(ModItems.CREAMY_BREAD_ROLL) - .add(ModItems.MEATBALLS) - .add(ModItems.DUMPLING) - .add(ModItems.SHENGJIAN) - .add(ModItems.SWEET_DUMPLING) .add(ModItems.BEEF_MUSHROOM_STEW); - this.getOrCreateTagBuilder(ModItemTags.PROTOCOL).setReplace(false) - .add(ModItems.PROTOCOL_ABSORB) - .add(ModItems.PROTOCOL_PROTECT) - .add(ModItems.PROTOCOL_RESTOCK) - .add(ModItems.PROTOCOL_REPAIR); - this.getOrCreateTagBuilder(ModItemTags.RAW_FOODS).setReplace(false) - .add(ModItems.BEEF_MUSHROOM_STEW_RAW) - .add(ModItems.DUMPLING_RAW) - .add(ModItems.MEATBALLS_RAW) - .add(ModItems.SWEET_DUMPLING_RAW) - .add(ModItems.SHENGJIAN_RAW); } } diff --git a/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/BulgingAndCrystallizeRecipesGenerator.java b/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/BulgingAndCrystallizeRecipesGenerator.java index 02f0e0086..2b58dcb1b 100644 --- a/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/BulgingAndCrystallizeRecipesGenerator.java +++ b/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/BulgingAndCrystallizeRecipesGenerator.java @@ -31,6 +31,7 @@ public static void buildRecipes(Consumer exporter) { bulging(Items.HORN_CORAL, Items.HORN_CORAL_BLOCK, exporter); bulging(Items.TUBE_CORAL, Items.TUBE_CORAL_BLOCK, exporter); bulging(ModItems.FLOUR, ModItems.DOUGH, exporter); + bulging(ModItems.BARK, ModItems.PULP, exporter); bulging(ModItems.SEED_OF_THE_SEA, ModItems.FRUIT_OF_THE_SEA, exporter); crystallize(ModItems.SEED_OF_THE_SEA, ModItems.TEAR_OF_THE_SEA, exporter); bulging(ModItems.SPONGE_GEMMULE, Items.WET_SPONGE, exporter); diff --git a/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/CompressRecipesGenerator.java b/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/CompressRecipesGenerator.java index bc6e841b4..4c6efbc25 100644 --- a/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/CompressRecipesGenerator.java +++ b/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/CompressRecipesGenerator.java @@ -30,14 +30,6 @@ public static void buildRecipes(Consumer exporter) { .unlockedBy(MyRecipesGenerator.hasItem(Items.PRISMARINE_SHARD), FabricRecipeProvider.has(Items.PRISMARINE_SHARD)) .unlockedBy(MyRecipesGenerator.hasItem(ModItems.TEAR_OF_THE_SEA), FabricRecipeProvider.has(ModItems.TEAR_OF_THE_SEA)) .save(exporter); - AnvilRecipe.Builder.create(RecipeCategory.MISC) - .hasBlock(Blocks.CAULDRON) - .hasItemIngredient(Items.ANVIL) - .hasItemIngredient(Items.DISPENSER) - .spawnItem(ModItems.INTERACT_MACHINE) - .unlockedBy(MyRecipesGenerator.hasItem(Items.ANVIL), FabricRecipeProvider.has(Items.ANVIL)) - .unlockedBy(MyRecipesGenerator.hasItem(Items.DISPENSER), FabricRecipeProvider.has(Items.DISPENSER)) - .save(exporter); AnvilRecipe.Builder.create(RecipeCategory.MISC) .hasBlock(Blocks.CAULDRON) .hasItemIngredient(3,Items.BONE) diff --git a/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/StampingRecipesGenerator.java b/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/StampingRecipesGenerator.java index e3df7f5c8..ddbcd6ca7 100644 --- a/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/StampingRecipesGenerator.java +++ b/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/StampingRecipesGenerator.java @@ -25,7 +25,7 @@ public static void buildRecipes(Consumer exporter) { stamping(Items.GOLD_INGOT, Items.LIGHT_WEIGHTED_PRESSURE_PLATE, exporter); stamping(Items.SUGAR_CANE, Items.PAPER, exporter); stamping(Items.SNOWBALL, Items.SNOW, exporter); - stamping(ModItems.DOUGH, ModItems.FLATDOUGH, exporter); + stamping(ModItems.PULP, Items.PAPER, exporter); AnvilRecipe.Builder.create(RecipeCategory.MISC) .hasBlock(Blocks.PISTON.defaultBlockState().setValue(PistonBaseBlock.FACING, Direction.UP)) .hasItemIngredient(Items.COCOA_BEANS) @@ -39,24 +39,6 @@ public static void buildRecipes(Consumer exporter) { .spawnItem(ModItems.CREAM) .unlockedBy(MyRecipesGenerator.hasItem(Items.MILK_BUCKET), FabricRecipeProvider.has(Items.MILK_BUCKET)) .save(exporter, AnvilCraft.of("stamping/cream")); - AnvilRecipe.Builder.create(RecipeCategory.MISC) - .hasBlock(Blocks.PISTON.defaultBlockState().setValue(PistonBaseBlock.FACING, Direction.UP)) - .hasItemIngredient(Items.MELON_SEEDS) - .spawnItem(ModItems.GREASE) - .unlockedBy(MyRecipesGenerator.hasItem(Items.MELON_SEEDS), FabricRecipeProvider.has(Items.MELON_SEEDS)) - .save(exporter, AnvilCraft.of("stamping/melon_seeds_2_grease")); - AnvilRecipe.Builder.create(RecipeCategory.MISC) - .hasBlock(Blocks.PISTON.defaultBlockState().setValue(PistonBaseBlock.FACING, Direction.UP)) - .hasItemIngredient(Items.PUMPKIN_SEEDS) - .spawnItem(ModItems.GREASE) - .unlockedBy(MyRecipesGenerator.hasItem(Items.PUMPKIN_SEEDS), FabricRecipeProvider.has(Items.PUMPKIN_SEEDS)) - .save(exporter, AnvilCraft.of("stamping/pumpkin_seeds_2_grease")); - AnvilRecipe.Builder.create(RecipeCategory.MISC) - .hasBlock(Blocks.PISTON.defaultBlockState().setValue(PistonBaseBlock.FACING, Direction.UP)) - .hasItemIngredient(Items.COOKED_PORKCHOP) - .spawnItem(ModItems.GREASE, 8) - .unlockedBy(MyRecipesGenerator.hasItem(Items.COOKED_PORKCHOP), FabricRecipeProvider.has(Items.COOKED_PORKCHOP)) - .save(exporter, AnvilCraft.of("stamping/cooked_porkchop_2_grease")); } public static void stamping(Item item, Item item1, Consumer exporter) { @@ -65,6 +47,6 @@ public static void stamping(Item item, Item item1, Consumer expo .hasItemIngredient(item) .spawnItem(item1) .unlockedBy(MyRecipesGenerator.hasItem(item), FabricRecipeProvider.has(item)) - .save(exporter, AnvilCraft.of("stamping/" + BuiltInRegistries.ITEM.getKey(item1).getPath())); + .save(exporter, AnvilCraft.of("stamping/"+ BuiltInRegistries.ITEM.getKey(item).getPath() + "_2_" + BuiltInRegistries.ITEM.getKey(item1).getPath())); } } diff --git a/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/VanillaRecipesGenerator.java b/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/VanillaRecipesGenerator.java index 48f3bde5b..5d737129c 100644 --- a/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/VanillaRecipesGenerator.java +++ b/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/VanillaRecipesGenerator.java @@ -110,52 +110,6 @@ public static void buildRecipes(Consumer exporter) { .unlockedBy(MyRecipesGenerator.hasItem(ModItems.BLADE_OF_THE_SEA), FabricRecipeProvider.has(ModItems.BLADE_OF_THE_SEA)) .unlockedBy(MyRecipesGenerator.hasItem(Items.PRISMARINE_SHARD), FabricRecipeProvider.has(Items.PRISMARINE_SHARD)) .save(exporter); - ShapelessRecipeBuilder.shapeless(RecipeCategory.TOOLS, ModItems.PROTOCOL_EMPTY) - .requires(Items.PAPER) - .requires(Items.FEATHER) - .requires(Items.GLOW_INK_SAC) - .unlockedBy(MyRecipesGenerator.hasItem(Items.PAPER), FabricRecipeProvider.has(Items.PAPER)) - .unlockedBy(MyRecipesGenerator.hasItem(Items.FEATHER), FabricRecipeProvider.has(Items.FEATHER)) - .unlockedBy(MyRecipesGenerator.hasItem(Items.GLOW_INK_SAC), FabricRecipeProvider.has(Items.GLOW_INK_SAC)) - .save(exporter); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.PROTOCOL_ABSORB) - .pattern("ABA") - .pattern("BCB") - .pattern("ABA") - .define('A', Items.IRON_INGOT) - .define('B', Items.HEAVY_WEIGHTED_PRESSURE_PLATE) - .define('C', ModItems.PROTOCOL_EMPTY) - .unlockedBy(MyRecipesGenerator.hasItem(Items.IRON_INGOT), FabricRecipeProvider.has(Items.IRON_INGOT)) - .unlockedBy(MyRecipesGenerator.hasItem(Items.HEAVY_WEIGHTED_PRESSURE_PLATE), FabricRecipeProvider.has(Items.HEAVY_WEIGHTED_PRESSURE_PLATE)) - .unlockedBy(MyRecipesGenerator.hasItem(ModItems.PROTOCOL_EMPTY), FabricRecipeProvider.has(ModItems.PROTOCOL_EMPTY)) - .save(exporter); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.PROTOCOL_REPAIR) - .pattern("AAA") - .pattern("ABA") - .pattern("AAA") - .define('A', Items.GLASS_BOTTLE) - .define('B', ModItems.PROTOCOL_EMPTY) - .unlockedBy(MyRecipesGenerator.hasItem(Items.GLASS_BOTTLE), FabricRecipeProvider.has(Items.GLASS_BOTTLE)) - .unlockedBy(MyRecipesGenerator.hasItem(ModItems.PROTOCOL_EMPTY), FabricRecipeProvider.has(ModItems.PROTOCOL_EMPTY)) - .save(exporter); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.PROTOCOL_RESTOCK) - .pattern("AAA") - .pattern("ABA") - .pattern("AAA") - .define('A', Items.IRON_INGOT) - .define('B', ModItems.PROTOCOL_EMPTY) - .unlockedBy(MyRecipesGenerator.hasItem(Items.IRON_INGOT), FabricRecipeProvider.has(Items.IRON_INGOT)) - .unlockedBy(MyRecipesGenerator.hasItem(ModItems.PROTOCOL_EMPTY), FabricRecipeProvider.has(ModItems.PROTOCOL_EMPTY)) - .save(exporter); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.PROTOCOL_PROTECT) - .pattern("AAA") - .pattern("ABA") - .pattern("AAA") - .define('A', Items.SHIELD) - .define('B', ModItems.PROTOCOL_EMPTY) - .unlockedBy(MyRecipesGenerator.hasItem(Items.SHIELD), FabricRecipeProvider.has(Items.SHIELD)) - .unlockedBy(MyRecipesGenerator.hasItem(ModItems.PROTOCOL_EMPTY), FabricRecipeProvider.has(ModItems.PROTOCOL_EMPTY)) - .save(exporter); ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, ModItems.COCOA_LIQUOR) .requires(ModItems.COCOA_POWDER) .requires(ModItems.COCOA_POWDER) @@ -226,36 +180,6 @@ public static void buildRecipes(Consumer exporter) { .unlockedBy(MyRecipesGenerator.hasItem(ModItems.CREAM), FabricRecipeProvider.has(ModItems.CREAM)) .unlockedBy(MyRecipesGenerator.hasItem(Items.SUGAR), FabricRecipeProvider.has(Items.SUGAR)) .save(exporter); - ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, ModItems.SWEET_DUMPLING_RAW) - .requires(Items.COCOA_BEANS) - .requires(ModItems.FLATDOUGH) - .requires(Items.SUGAR) - .unlockedBy(MyRecipesGenerator.hasItem(Items.COCOA_BEANS), FabricRecipeProvider.has(Items.COCOA_BEANS)) - .unlockedBy(MyRecipesGenerator.hasItem(ModItems.FLATDOUGH), FabricRecipeProvider.has(ModItems.FLATDOUGH)) - .unlockedBy(MyRecipesGenerator.hasItem(Items.SUGAR), FabricRecipeProvider.has(Items.SUGAR)) - .save(exporter); - ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, ModItems.DUMPLING_RAW) - .requires(ModItems.MEAT_STUFFING) - .requires(ModItems.FLATDOUGH) - .unlockedBy(MyRecipesGenerator.hasItem(ModItems.MEAT_STUFFING), FabricRecipeProvider.has(ModItems.MEAT_STUFFING)) - .unlockedBy(MyRecipesGenerator.hasItem(ModItems.FLATDOUGH), FabricRecipeProvider.has(ModItems.FLATDOUGH)) - .save(exporter); - ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, ModItems.SHENGJIAN_RAW) - .requires(ModItems.MEAT_STUFFING) - .requires(ModItems.FLATDOUGH) - .requires(ModItems.GREASE) - .unlockedBy(MyRecipesGenerator.hasItem(ModItems.MEAT_STUFFING), FabricRecipeProvider.has(ModItems.MEAT_STUFFING)) - .unlockedBy(MyRecipesGenerator.hasItem(ModItems.FLATDOUGH), FabricRecipeProvider.has(ModItems.FLATDOUGH)) - .unlockedBy(MyRecipesGenerator.hasItem(ModItems.GREASE), FabricRecipeProvider.has(ModItems.GREASE)) - .save(exporter); - ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, ModItems.MEATBALLS_RAW) - .requires(ModItems.MEAT_STUFFING) - .requires(ModItems.FLOUR) - .requires(ModItems.GREASE) - .unlockedBy(MyRecipesGenerator.hasItem(ModItems.MEAT_STUFFING), FabricRecipeProvider.has(ModItems.MEAT_STUFFING)) - .unlockedBy(MyRecipesGenerator.hasItem(ModItems.FLOUR), FabricRecipeProvider.has(ModItems.FLOUR)) - .unlockedBy(MyRecipesGenerator.hasItem(ModItems.GREASE), FabricRecipeProvider.has(ModItems.GREASE)) - .save(exporter); ShapelessRecipeBuilder.shapeless(RecipeCategory.FOOD, ModItems.BEEF_MUSHROOM_STEW_RAW) .requires(Items.BEEF) .requires(Items.BROWN_MUSHROOM) diff --git a/src/main/java/dev/dubhe/anvilcraft/init/ModBlockEntities.java b/src/main/java/dev/dubhe/anvilcraft/init/ModBlockEntities.java index 0479d8f00..e846606dd 100644 --- a/src/main/java/dev/dubhe/anvilcraft/init/ModBlockEntities.java +++ b/src/main/java/dev/dubhe/anvilcraft/init/ModBlockEntities.java @@ -2,7 +2,6 @@ import com.mojang.datafixers.types.Type; import dev.dubhe.anvilcraft.block.entity.AutoCrafterBlockEntity; -import dev.dubhe.anvilcraft.block.entity.InteractMachineBlockEntity; import net.minecraft.Util; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; @@ -12,7 +11,6 @@ import org.jetbrains.annotations.NotNull; public class ModBlockEntities { - public static final BlockEntityType INTERACT_MACHINE = ModBlockEntities.register("interact_machine", BlockEntityType.Builder.of(InteractMachineBlockEntity::new, ModBlocks.INTERACT_MACHINE)); public static final BlockEntityType AUTO_CRAFTER = ModBlockEntities.register("crefting_machine", BlockEntityType.Builder.of(AutoCrafterBlockEntity::new, ModBlocks.AUTO_CRAFTER)); public static void register() {} diff --git a/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java b/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java index dd73a420d..92015e591 100644 --- a/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java +++ b/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java @@ -20,7 +20,6 @@ public class ModBlocks { public static final Block MAGNET_BLOCK = registerBlock("magnet_block", MagnetBlock::new, BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK)); public static final Block HOLLOW_MAGNET_BLOCK = registerBlock("hollow_magnet_block", HollowMagnetBlock::new, BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK)); public static final Block FERRITE_CORE_MAGNET_BLOCK = registerBlock("ferrite_core_magnet_block", FerriteCoreMagnetBlock::new, BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK).randomTicks()); - public static final Block INTERACT_MACHINE = registerBlock("interact_machine", InteractMachineBlock::new, BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK)); public static final Block AUTO_CRAFTER = registerBlock("auto_crafter", AutoCrafterBlock::new, BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK)); public static final Block ROYAL_STEEL_BLOCK = registerBlock("royal_steel_block", Block::new, BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK)); public static final Block SMOOTH_ROYAL_STEEL_BLOCK = registerBlock("smooth_royal_steel_block", Block::new, BlockBehaviour.Properties.copy(Blocks.IRON_BLOCK)); diff --git a/src/main/java/dev/dubhe/anvilcraft/init/ModItemGroups.java b/src/main/java/dev/dubhe/anvilcraft/init/ModItemGroups.java index 434694f42..606bfdace 100644 --- a/src/main/java/dev/dubhe/anvilcraft/init/ModItemGroups.java +++ b/src/main/java/dev/dubhe/anvilcraft/init/ModItemGroups.java @@ -21,51 +21,20 @@ public class ModItemGroups { .icon(() -> new ItemStack(ModItems.MAGNET_INGOT)) .displayItems((ctx, entries) -> { entries.accept(ModItems.MAGNET.getDefaultInstance()); - entries.accept(ModItems.CHANGEABLE_PICKAXE_FORTUNE.getDefaultInstance()); - entries.accept(ModItems.CHANGEABLE_PICKAXE_SILK_TOUCH.getDefaultInstance()); entries.accept(ModItems.AMETHYST_PICKAXE.getDefaultInstance()); - entries.accept(ModItems.PROTOCOL_EMPTY.getDefaultInstance()); - entries.accept(ModItems.PROTOCOL_PROTECT.getDefaultInstance()); - entries.accept(ModItems.PROTOCOL_REPAIR.getDefaultInstance()); - entries.accept(ModItems.PROTOCOL_RESTOCK.getDefaultInstance()); - entries.accept(ModItems.PROTOCOL_ABSORB.getDefaultInstance()); - entries.accept(ModItems.GREASE.getDefaultInstance()); entries.accept(ModItems.CREAM.getDefaultInstance()); entries.accept(ModItems.FLOUR.getDefaultInstance()); entries.accept(ModItems.DOUGH.getDefaultInstance()); - entries.accept(ModItems.FLATDOUGH.getDefaultInstance()); - entries.accept(ModItems.MEAT_STUFFING.getDefaultInstance()); entries.accept(ModItems.CHOCOLATE.getDefaultInstance()); entries.accept(ModItems.CHOCOLATE_BLACK.getDefaultInstance()); entries.accept(ModItems.CHOCOLATE_WHITE.getDefaultInstance()); entries.accept(ModItems.CREAMY_BREAD_ROLL.getDefaultInstance()); - entries.accept(ModItems.MEATBALLS_RAW.getDefaultInstance()); - entries.accept(ModItems.MEATBALLS.getDefaultInstance()); - entries.accept(ModItems.DUMPLING_RAW.getDefaultInstance()); - entries.accept(ModItems.DUMPLING.getDefaultInstance()); - entries.accept(ModItems.SHENGJIAN_RAW.getDefaultInstance()); - entries.accept(ModItems.SHENGJIAN.getDefaultInstance()); - entries.accept(ModItems.SWEET_DUMPLING_RAW.getDefaultInstance()); - entries.accept(ModItems.SWEET_DUMPLING.getDefaultInstance()); entries.accept(ModItems.BEEF_MUSHROOM_STEW_RAW.getDefaultInstance()); entries.accept(ModItems.BEEF_MUSHROOM_STEW.getDefaultInstance()); entries.accept(ModItems.UTUSAN_RAW.getDefaultInstance()); entries.accept(ModItems.UTUSAN.getDefaultInstance()); entries.accept(ModItems.MAGNET_INGOT.getDefaultInstance()); entries.accept(ModItems.ROYAL_STEEL_INGOT.getDefaultInstance()); - entries.accept(ModItems.DEBRIS_SCRAP.getDefaultInstance()); - entries.accept(ModItems.NETHER_STAR_SHARD.getDefaultInstance()); - entries.accept(ModItems.NETHERITE_CORE.getDefaultInstance()); - entries.accept(ModItems.NETHERITE_COIL.getDefaultInstance()); - entries.accept(ModItems.ELYTRA_FRAME.getDefaultInstance()); - entries.accept(ModItems.ELYTRA_MEMBRANE.getDefaultInstance()); - entries.accept(ModItems.SEED_OF_THE_SEA.getDefaultInstance()); - entries.accept(ModItems.FRUIT_OF_THE_SEA.getDefaultInstance()); - entries.accept(ModItems.KERNEL_OF_THE_SEA.getDefaultInstance()); - entries.accept(ModItems.TEAR_OF_THE_SEA.getDefaultInstance()); - entries.accept(ModItems.BLADE_OF_THE_SEA.getDefaultInstance()); - entries.accept(ModItems.BARK.getDefaultInstance()); - entries.accept(ModItems.PULP.getDefaultInstance()); entries.accept(ModItems.SPONGE_GEMMULE.getDefaultInstance()); entries.accept(ModItems.COCOA_LIQUOR.getDefaultInstance()); entries.accept(ModItems.COCOA_BUTTER.getDefaultInstance()); @@ -81,7 +50,6 @@ public class ModItemGroups { entries.accept(ModItems.MAGNET_BLOCK.getDefaultInstance()); entries.accept(ModItems.HOLLOW_MAGNET_BLOCK.getDefaultInstance()); entries.accept(ModItems.FERRITE_CORE_MAGNET_BLOCK.getDefaultInstance()); - entries.accept(ModItems.INTERACT_MACHINE.getDefaultInstance()); entries.accept(ModItems.AUTO_CRAFTER.getDefaultInstance()); entries.accept(ModItems.ROYAL_STEEL_BLOCK.getDefaultInstance()); entries.accept(ModItems.SMOOTH_ROYAL_STEEL_BLOCK.getDefaultInstance()); diff --git a/src/main/java/dev/dubhe/anvilcraft/init/ModItemTags.java b/src/main/java/dev/dubhe/anvilcraft/init/ModItemTags.java index 270000d16..415cfbbb4 100644 --- a/src/main/java/dev/dubhe/anvilcraft/init/ModItemTags.java +++ b/src/main/java/dev/dubhe/anvilcraft/init/ModItemTags.java @@ -7,6 +7,7 @@ import net.minecraft.world.item.Item; import org.jetbrains.annotations.NotNull; +@SuppressWarnings("unused") public class ModItemTags { public static final TagKey FLOUR = bindC("flour"); public static final TagKey WHEAT_FLOUR = bindC("flour/wheat"); @@ -18,8 +19,6 @@ public class ModItemTags { public static final TagKey SHOVELS = bindC("shovels"); public static final TagKey SWORDS = bindC("swords"); public static final TagKey FOODS = bindC("foods"); - public static final TagKey PROTOCOL = bind("protocol"); - public static final TagKey RAW_FOODS = bind("raw_foods"); private static @NotNull TagKey bindC(String id) { return TagKey.create(Registries.ITEM, new ResourceLocation("c", id)); diff --git a/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java b/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java index 8cd750a6a..5e5978023 100644 --- a/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java +++ b/src/main/java/dev/dubhe/anvilcraft/init/ModItems.java @@ -23,8 +23,6 @@ public class ModItems { private static final Map ITEM_MAP = new HashMap<>(); public static final Item MAGNET = registerItem("magnet", MagnetItem::new, defaultProperties().durability(114)); - public static final Item CHANGEABLE_PICKAXE_FORTUNE = registerItem("changeable_pickaxe_fortune", ChangeablePickaxeItem::new, defaultProperties()); - public static final Item CHANGEABLE_PICKAXE_SILK_TOUCH = registerItem("changeable_pickaxe_silk_touch", ChangeablePickaxeItem::new, defaultProperties()); public static final Item AMETHYST_PICKAXE = registerItem("amethyst_pickaxe", properties -> new PickaxeItem(ModTiers.AMETHYST, 1, -2.8f, properties) { @Override public @NotNull ItemStack getDefaultInstance() { @@ -73,32 +71,16 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List INTERACT_MACHINE = ModMenuTypes.register("interact_machine", InteractMachineMenu::new); public static final MenuType AUTO_CRAFTER = ModMenuTypes.register("auto_crafter", AutoCrafterMenu::new); public static void register() { diff --git a/src/main/java/dev/dubhe/anvilcraft/inventory/InteractMachineMenu.java b/src/main/java/dev/dubhe/anvilcraft/inventory/InteractMachineMenu.java deleted file mode 100644 index 8524b5b49..000000000 --- a/src/main/java/dev/dubhe/anvilcraft/inventory/InteractMachineMenu.java +++ /dev/null @@ -1,47 +0,0 @@ -package dev.dubhe.anvilcraft.inventory; - -import dev.dubhe.anvilcraft.init.ModMenuTypes; -import dev.dubhe.anvilcraft.inventory.component.LimitSlot; -import dev.dubhe.anvilcraft.init.ModItemTags; -import lombok.Getter; -import net.minecraft.world.Container; -import net.minecraft.world.SimpleContainer; -import net.minecraft.world.entity.player.Inventory; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.Slot; -import org.jetbrains.annotations.NotNull; - -@Getter -public class InteractMachineMenu extends BaseMachineMenu { - - public InteractMachineMenu(int containerId, Inventory inventory) { - this(containerId, inventory, new SimpleContainer(11)); - } - - public InteractMachineMenu(int containerId, @NotNull Inventory inventory, @NotNull Container interactMachine) { - super(ModMenuTypes.INTERACT_MACHINE, containerId, interactMachine); - this.machine.startOpen(inventory.player); - int i, j; - this.addSlot(new LimitSlot(this.machine, 0, 26, 18, item -> item.is(ModItemTags.PROTOCOL))); - for (i = 0; i < 3; ++i) { - for (j = 0; j < 3; ++j) { - this.addSlot(new Slot(this.machine, j + i * 3 + 1, 62 + j * 18, 18 + i * 18)); - } - } - this.addSlot(new LimitSlot(this.machine, 10, 134, 54)); - for (i = 0; i < 3; ++i) { - for (j = 0; j < 9; ++j) { - this.addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); - } - } - for (i = 0; i < 9; ++i) { - this.addSlot(new Slot(inventory, i, 8 + i * 18, 142)); - } - } - - @Override - public void removed(Player player) { - super.removed(player); - this.machine.stopOpen(player); - } -} diff --git a/src/main/java/dev/dubhe/anvilcraft/item/ChangeablePickaxeItem.java b/src/main/java/dev/dubhe/anvilcraft/item/ChangeablePickaxeItem.java deleted file mode 100644 index b09f966b1..000000000 --- a/src/main/java/dev/dubhe/anvilcraft/item/ChangeablePickaxeItem.java +++ /dev/null @@ -1,44 +0,0 @@ -package dev.dubhe.anvilcraft.item; - -import dev.dubhe.anvilcraft.init.ModItems; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.PickaxeItem; -import net.minecraft.world.item.Tiers; -import net.minecraft.world.item.enchantment.Enchantment; -import net.minecraft.world.item.enchantment.Enchantments; -import net.minecraft.world.level.Level; -import org.jetbrains.annotations.NotNull; - -public class ChangeablePickaxeItem extends PickaxeItem { - public ChangeablePickaxeItem(@NotNull Properties properties) { - super(Tiers.NETHERITE, 1, -2.8f, properties.fireResistant()); - } - - @Override - public @NotNull ItemStack getDefaultInstance() { - ItemStack stack = new ItemStack(this); - Item item = this.asItem(); - Enchantment enchant = item.equals(ModItems.CHANGEABLE_PICKAXE_FORTUNE) ? Enchantments.BLOCK_FORTUNE : Enchantments.SILK_TOUCH; - int level = item.equals(ModItems.CHANGEABLE_PICKAXE_FORTUNE) ? 3 : 1; - stack.enchant(enchant, level); - return stack; - } - - @Override - public @NotNull InteractionResultHolder use(Level level, @NotNull Player player, InteractionHand interactionHand) { - ItemStack fromStack = player.getItemInHand(interactionHand); - if (!player.isShiftKeyDown()) return InteractionResultHolder.pass(fromStack); - Item fromItem = fromStack.getItem(); - Item toItem = fromItem.equals(ModItems.CHANGEABLE_PICKAXE_FORTUNE) ? ModItems.CHANGEABLE_PICKAXE_SILK_TOUCH : ModItems.CHANGEABLE_PICKAXE_FORTUNE; - Enchantment fromEnchant = fromItem.equals(ModItems.CHANGEABLE_PICKAXE_FORTUNE) ? Enchantments.BLOCK_FORTUNE : Enchantments.SILK_TOUCH; - Enchantment toEnchant = toItem.equals(ModItems.CHANGEABLE_PICKAXE_FORTUNE) ? Enchantments.BLOCK_FORTUNE : Enchantments.SILK_TOUCH; - int toLevel = toItem.equals(ModItems.CHANGEABLE_PICKAXE_FORTUNE) ? 3 : 1; - ItemStack toStack = fromStack.dataCopy(new ItemStack(toItem)); - if (fromStack.removeEnchant(fromEnchant)) toStack.enchant(toEnchant, toLevel); - return InteractionResultHolder.success(toStack); - } -} diff --git a/src/main/java/dev/dubhe/anvilcraft/item/ModFoods.java b/src/main/java/dev/dubhe/anvilcraft/item/ModFoods.java index 9e3fff7ab..e7ee1f2ff 100644 --- a/src/main/java/dev/dubhe/anvilcraft/item/ModFoods.java +++ b/src/main/java/dev/dubhe/anvilcraft/item/ModFoods.java @@ -9,9 +9,5 @@ public class ModFoods { public static final FoodProperties CHOCOLATE_BLACK = new FoodProperties.Builder().nutrition(20).saturationMod(0.6f).alwaysEat().fast().effect(new MobEffectInstance(MobEffects.DIG_SPEED, 1200), 1.0f).build(); public static final FoodProperties CHOCOLATE_WHITE = new FoodProperties.Builder().nutrition(20).saturationMod(0.6f).alwaysEat().fast().effect(new MobEffectInstance(MobEffects.JUMP, 1200), 1.0f).build(); public static final FoodProperties CREAMY_BREAD_ROLL = new FoodProperties.Builder().nutrition(6).saturationMod(0.6f).build(); - public static final FoodProperties MEATBALLS = new FoodProperties.Builder().nutrition(8).saturationMod(0.8f).meat().build(); - public static final FoodProperties DUMPLING = new FoodProperties.Builder().nutrition(6).saturationMod(0.8f).build(); - public static final FoodProperties SHENGJIAN = new FoodProperties.Builder().nutrition(8).saturationMod(0.8f).meat().build(); - public static final FoodProperties SWEET_DUMPLING = new FoodProperties.Builder().nutrition(6).saturationMod(0.6f).meat().build(); public static final FoodProperties BEEF_MUSHROOM_STEW = new FoodProperties.Builder().nutrition(6).saturationMod(0.6f).effect(new MobEffectInstance(MobEffects.SATURATION, 1200), 1.0f).build(); } diff --git a/src/main/java/dev/dubhe/anvilcraft/mixin/AxeItemMixin.java b/src/main/java/dev/dubhe/anvilcraft/mixin/AxeItemMixin.java new file mode 100644 index 000000000..e4e8733cc --- /dev/null +++ b/src/main/java/dev/dubhe/anvilcraft/mixin/AxeItemMixin.java @@ -0,0 +1,29 @@ +package dev.dubhe.anvilcraft.mixin; + +import dev.dubhe.anvilcraft.init.ModItems; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.item.AxeItem; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.phys.Vec3; +import org.jetbrains.annotations.NotNull; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(AxeItem.class) +public class AxeItemMixin { + @Inject(method = "useOn", at = @At(value = "INVOKE", ordinal = 0, target = "Lnet/minecraft/world/level/Level;playSound(Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/core/BlockPos;Lnet/minecraft/sounds/SoundEvent;Lnet/minecraft/sounds/SoundSource;FF)V")) + private void useOn(@NotNull UseOnContext context, CallbackInfoReturnable cir) { + if (context.getPlayer() == null || context.getPlayer().isCreative()) return; + Direction direction = context.getHorizontalDirection().getOpposite(); + BlockPos pos = context.getClickedPos().relative(direction); + Vec3 vec3 = pos.getCenter().relative(direction, -0.25); + Vec3 move = pos.getCenter().subtract(vec3); + ItemEntity entity = new ItemEntity(context.getLevel(), vec3.x, vec3.y, vec3.z, ModItems.BARK.getDefaultInstance(), move.x, move.y, move.z); + context.getLevel().addFreshEntity(entity); + } +} diff --git a/src/main/resources/anvilcraft.mixins.json b/src/main/resources/anvilcraft.mixins.json index 0a4a9511d..1683ed28d 100644 --- a/src/main/resources/anvilcraft.mixins.json +++ b/src/main/resources/anvilcraft.mixins.json @@ -5,6 +5,7 @@ "compatibilityLevel": "JAVA_17", "mixins": [ "AnvilBlockMixin", + "AxeItemMixin", "BlockStateInjector", "ClientboundUpdateRecipesPacketMixin", "ItemEntityMixin", diff --git a/src/main/resources/assets/anvilcraft/blockstates/interact_machine.json b/src/main/resources/assets/anvilcraft/blockstates/interact_machine.json deleted file mode 100644 index b0dac7792..000000000 --- a/src/main/resources/assets/anvilcraft/blockstates/interact_machine.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "anvilcraft:block/interact_machine" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/lang/en_us.json b/src/main/resources/assets/anvilcraft/lang/en_us.json index 85f82ad69..e8ceb03de 100644 --- a/src/main/resources/assets/anvilcraft/lang/en_us.json +++ b/src/main/resources/assets/anvilcraft/lang/en_us.json @@ -1,11 +1,6 @@ { "itemGroup.anvilcraft.block": "AnvilCraft Blocks", "itemGroup.anvilcraft.item": "AnvilCraft Items", - "item.anvilcraft.protocol_empty": "Empty Protocol", - "item.anvilcraft.protocol_absorb": "Absorb Protocol", - "item.anvilcraft.protocol_repair": "Repair Protocol", - "item.anvilcraft.protocol_protect": "Protect Protocol", - "item.anvilcraft.protocol_restock": "Restock Protocol", "item.anvilcraft.seed_of_the_sea": "Seed Of The Sea", "item.anvilcraft.fruit_of_the_sea": "Fruit Of The Sea", "item.anvilcraft.kernel_of_the_sea": "Kernel Of The Sea", @@ -21,31 +16,20 @@ "item.anvilcraft.royal_steel_ingot": "Royal Steel Ingot", "item.anvilcraft.magnet": "Magnet", "item.anvilcraft.cream": "Cream", - "item.anvilcraft.grease": "Grease", "item.anvilcraft.flour": "Flour", "item.anvilcraft.dough": "Dough", - "item.anvilcraft.flatdough": "Flatdough", - "item.anvilcraft.dumpling_raw": "Dumpling Raw", - "item.anvilcraft.shengjian_raw": "Shengjian Raw", - "item.anvilcraft.meatballs_raw": "Meatballs Raw", "item.anvilcraft.beef_mushroom_stew_raw": "Beef Mushroom Stew Raw", - "item.anvilcraft.meat_stuffing": "Meat Stuffing", "item.anvilcraft.creamy_bread_roll": "Creamy Bread Roll", "item.anvilcraft.chocolate": "Chocolate", "item.anvilcraft.chocolate_black": "Black Chocolate", "item.anvilcraft.chocolate_white": "White Chocolate", - "item.anvilcraft.shengjian": "Shengjian", - "item.anvilcraft.meatballs": "Meatballs", "item.anvilcraft.beef_mushroom_stew": "Beef Mushroom Stew", - "item.anvilcraft.dumpling": "Dumpling", "item.anvilcraft.cocoa_butter": "Cocoa Butter", "item.anvilcraft.cocoa_powder": "Cocoa Powder", "item.anvilcraft.cocoa_liquor": "Cocoa Liquor", "item.anvilcraft.utusan_raw": "Utusan Raw", "item.anvilcraft.utusan": "Utusan", "item.anvilcraft.sponge_gemmule": "Sponge Gemmule", - "item.anvilcraft.sweet_dumpling_raw": "Sweet Dumpling Raw", - "item.anvilcraft.sweet_dumpling": "Sweet Dumpling", "item.anvilcraft.amethyst_axe": "Amethyst Axe", "item.anvilcraft.amethyst_hoe": "Amethyst Hoe", "item.anvilcraft.amethyst_pickaxe": "Amethyst Pickaxe", @@ -54,13 +38,10 @@ "item.anvilcraft.amethyst_sword": "Amethyst Sword", "item.anvilcraft.bark": "Bark", "item.anvilcraft.pulp": "Pulp", - "item.anvilcraft.changeable_pickaxe_silk_touch": "Changeable Pickaxe Silk Touch", - "item.anvilcraft.changeable_pickaxe_fortune": "Changeable Pickaxe Fortune", "block.anvilcraft.royal_anvil": "Royal Anvil", "block.anvilcraft.magnet_block": "Magnet Block", "block.anvilcraft.hollow_magnet_block": "Hollow Magnet Block", "block.anvilcraft.ferrite_core_magnet_block": "Ferrite Core Magnet Block", - "block.anvilcraft.interact_machine": "Interact Machine", "block.anvilcraft.auto_crafter": "Auto Crafter", "block.anvilcraft.royal_steel_block": "Royal Steel Block", "block.anvilcraft.smooth_royal_steel_block": "Smooth Royal Steel Block", diff --git a/src/main/resources/assets/anvilcraft/lang/zh_cn.json b/src/main/resources/assets/anvilcraft/lang/zh_cn.json index 4cf51c413..a4c222f17 100644 --- a/src/main/resources/assets/anvilcraft/lang/zh_cn.json +++ b/src/main/resources/assets/anvilcraft/lang/zh_cn.json @@ -11,41 +11,25 @@ "item.anvilcraft.netherite_core": "下界核心", "item.anvilcraft.elytra_frame": "翅骨", "item.anvilcraft.elytra_membrane": "翅膜", - "item.anvilcraft.protocol_empty": "空协议", - "item.anvilcraft.protocol_absorb": "吸收协议", - "item.anvilcraft.protocol_repair": "维修协议", - "item.anvilcraft.protocol_protect": "保护协议", - "item.anvilcraft.protocol_restock": "补货协议", "item.anvilcraft.netherite_coil": "下界合金卷材", "item.anvilcraft.magnet_ingot": "磁铁锭", "item.anvilcraft.royal_steel_ingot": "皇家钢锭", "item.anvilcraft.magnet": "手持磁铁", "item.anvilcraft.cream": "奶油", - "item.anvilcraft.grease": "油脂", "item.anvilcraft.flour": "面粉", "item.anvilcraft.dough": "面团", - "item.anvilcraft.flatdough": "面皮", - "item.anvilcraft.dumpling_raw": "水饺（生）", - "item.anvilcraft.shengjian_raw": "生煎（生）", - "item.anvilcraft.meatballs_raw": "肉丸（生）", "item.anvilcraft.beef_mushroom_stew_raw": "牛肉炖蘑菇（生）", - "item.anvilcraft.meat_stuffing": "肉馅", "item.anvilcraft.creamy_bread_roll": "奶油面包卷", "item.anvilcraft.chocolate": "巧克力", "item.anvilcraft.chocolate_black": "黑巧克力", "item.anvilcraft.chocolate_white": "白巧克力", - "item.anvilcraft.shengjian": "生煎", - "item.anvilcraft.meatballs": "炸肉丸", "item.anvilcraft.beef_mushroom_stew": "牛肉炖蘑菇", - "item.anvilcraft.dumpling": "水饺", "item.anvilcraft.cocoa_butter": "可可脂", "item.anvilcraft.cocoa_powder": "可可粉", "item.anvilcraft.cocoa_liquor": "可可液块", "item.anvilcraft.utusan_raw": "五毒散（生）", "item.anvilcraft.utusan": "五毒散", "item.anvilcraft.sponge_gemmule": "海绵芽球", - "item.anvilcraft.sweet_dumpling_raw": "汤圆（生）", - "item.anvilcraft.sweet_dumpling": "汤圆", "item.anvilcraft.amethyst_axe": "紫水晶斧", "item.anvilcraft.amethyst_hoe": "紫水晶锄", "item.anvilcraft.amethyst_pickaxe": "紫水晶镐", @@ -54,13 +38,10 @@ "item.anvilcraft.amethyst_sword": "紫水晶剑", "item.anvilcraft.bark": "树皮", "item.anvilcraft.pulp": "纸浆", - "item.anvilcraft.changeable_pickaxe_silk_touch": "应变之镐（丝触）", - "item.anvilcraft.changeable_pickaxe_fortune": "应变之镐（时运）", "block.anvilcraft.royal_anvil": "皇家铁砧", "block.anvilcraft.magnet_block": "磁铁块", "block.anvilcraft.hollow_magnet_block": "空心磁铁块", "block.anvilcraft.ferrite_core_magnet_block": "铁芯磁铁块", - "block.anvilcraft.interact_machine": "交互机", "block.anvilcraft.auto_crafter": "自动合成器", "block.anvilcraft.royal_steel_block": "皇家钢块", "block.anvilcraft.smooth_royal_steel_block": "平滑皇家钢块", diff --git a/src/main/resources/assets/anvilcraft/lang/zh_hk.json b/src/main/resources/assets/anvilcraft/lang/zh_hk.json index 90a1a50f5..878d3afe2 100644 --- a/src/main/resources/assets/anvilcraft/lang/zh_hk.json +++ b/src/main/resources/assets/anvilcraft/lang/zh_hk.json @@ -1,11 +1,6 @@ { "itemGroup.anvilcraft.block": "鐵砧工藝 - 方塊", "itemGroup.anvilcraft.item": "鐵砧工藝 - 物品", - "item.anvilcraft.protocol_empty": "空協議", - "item.anvilcraft.protocol_absorb": "吸收協議", - "item.anvilcraft.protocol_repair": "維修協議", - "item.anvilcraft.protocol_protect": "保護協議", - "item.anvilcraft.protocol_restock": "補貨協議", "item.anvilcraft.seed_of_the_sea": "海洋種子", "item.anvilcraft.fruit_of_the_sea": "海洋之果", "item.anvilcraft.kernel_of_the_sea": "海洋之核", @@ -21,31 +16,20 @@ "item.anvilcraft.royal_steel_ingot": "皇家鋼錠", "item.anvilcraft.magnet": "手持磁鐵", "item.anvilcraft.cream": "奶油", - "item.anvilcraft.grease": "油脂", "item.anvilcraft.flour": "麪粉", "item.anvilcraft.dough": "麪團", - "item.anvilcraft.flatdough": "麪皮", - "item.anvilcraft.dumpling_raw": "水餃（生）", - "item.anvilcraft.shengjian_raw": "生煎（生）", - "item.anvilcraft.meatballs_raw": "肉丸（生）", "item.anvilcraft.beef_mushroom_stew_raw": "牛肉燉蘑菇（生）", - "item.anvilcraft.meat_stuffing": "肉餡", "item.anvilcraft.creamy_bread_roll": "奶油麪包卷", "item.anvilcraft.chocolate": "巧克力", "item.anvilcraft.chocolate_black": "黑巧克力", "item.anvilcraft.chocolate_white": "白巧克力", - "item.anvilcraft.shengjian": "生煎", - "item.anvilcraft.meatballs": "炸肉丸", "item.anvilcraft.beef_mushroom_stew": "牛肉燉蘑菇", - "item.anvilcraft.dumpling": "水餃", "item.anvilcraft.cocoa_butter": "可可脂", "item.anvilcraft.cocoa_powder": "可可粉", "item.anvilcraft.cocoa_liquor": "可可液塊", "item.anvilcraft.utusan_raw": "五毒散（生）", "item.anvilcraft.utusan": "五毒散", "item.anvilcraft.sponge_gemmule": "海綿芽球", - "item.anvilcraft.sweet_dumpling_raw": "湯圓（生）", - "item.anvilcraft.sweet_dumpling": "湯圓", "item.anvilcraft.amethyst_axe": "紫水晶斧頭", "item.anvilcraft.amethyst_hoe": "紫水晶鋤頭", "item.anvilcraft.amethyst_pickaxe": "紫水晶鎬", @@ -54,13 +38,10 @@ "item.anvilcraft.amethyst_sword": "紫水晶劍", "item.anvilcraft.bark": "樹皮", "item.anvilcraft.pulp": "紙漿", - "item.anvilcraft.changeable_pickaxe_silk_touch": "應變之鎬（絲觸）", - "item.anvilcraft.changeable_pickaxe_fortune": "應變之鎬（幸運）", "block.anvilcraft.royal_anvil": "皇家鐵砧", "block.anvilcraft.magnet_block": "磁鐵塊", "block.anvilcraft.hollow_magnet_block": "空心磁鐵塊", "block.anvilcraft.ferrite_core_magnet_block": "鐵芯磁鐵塊", - "block.anvilcraft.interact_machine": "互動機", "block.anvilcraft.auto_crafter": "自動合成器", "block.anvilcraft.royal_steel_block": "皇家鋼塊", "block.anvilcraft.smooth_royal_steel_block": "平滑皇家鋼塊", diff --git a/src/main/resources/assets/anvilcraft/lang/zh_tw.json b/src/main/resources/assets/anvilcraft/lang/zh_tw.json index b615ab0c4..0bb9050ff 100644 --- a/src/main/resources/assets/anvilcraft/lang/zh_tw.json +++ b/src/main/resources/assets/anvilcraft/lang/zh_tw.json @@ -1,11 +1,6 @@ { "itemGroup.anvilcraft.block": "鐵砧工藝 - 方塊", "itemGroup.anvilcraft.item": "鐵砧工藝 - 物品", - "item.anvilcraft.protocol_empty": "空協議", - "item.anvilcraft.protocol_absorb": "吸收協議", - "item.anvilcraft.protocol_repair": "維修協議", - "item.anvilcraft.protocol_protect": "保護協議", - "item.anvilcraft.protocol_restock": "補貨協議", "item.anvilcraft.seed_of_the_sea": "海洋種子", "item.anvilcraft.fruit_of_the_sea": "海洋之果", "item.anvilcraft.kernel_of_the_sea": "海洋之核", @@ -21,31 +16,20 @@ "item.anvilcraft.royal_steel_ingot": "皇家鋼錠", "item.anvilcraft.magnet": "手持磁鐵", "item.anvilcraft.cream": "奶油", - "item.anvilcraft.grease": "油脂", "item.anvilcraft.flour": "麵粉", "item.anvilcraft.dough": "麵糰", - "item.anvilcraft.flatdough": "麵皮", - "item.anvilcraft.dumpling_raw": "水餃（生）", - "item.anvilcraft.shengjian_raw": "生煎（生）", - "item.anvilcraft.meatballs_raw": "肉丸（生）", "item.anvilcraft.beef_mushroom_stew_raw": "牛肉燉蘑菇（生）", - "item.anvilcraft.meat_stuffing": "肉餡", "item.anvilcraft.creamy_bread_roll": "奶油麵包卷", "item.anvilcraft.chocolate": "巧克力", "item.anvilcraft.chocolate_black": "黑巧克力", "item.anvilcraft.chocolate_white": "白巧克力", - "item.anvilcraft.shengjian": "生煎", - "item.anvilcraft.meatballs": "炸肉丸", "item.anvilcraft.beef_mushroom_stew": "牛肉燉蘑菇", - "item.anvilcraft.dumpling": "水餃", "item.anvilcraft.cocoa_butter": "可可脂", "item.anvilcraft.cocoa_powder": "可可粉", "item.anvilcraft.cocoa_liquor": "可可液塊", "item.anvilcraft.utusan_raw": "五毒散（生）", "item.anvilcraft.utusan": "五毒散", "item.anvilcraft.sponge_gemmule": "海綿芽球", - "item.anvilcraft.sweet_dumpling_raw": "湯圓（生）", - "item.anvilcraft.sweet_dumpling": "湯圓", "item.anvilcraft.amethyst_axe": "紫水晶斧", "item.anvilcraft.amethyst_hoe": "紫水晶鋤", "item.anvilcraft.amethyst_pickaxe": "紫水晶鎬", @@ -54,13 +38,10 @@ "item.anvilcraft.amethyst_sword": "紫水晶劍", "item.anvilcraft.bark": "樹皮", "item.anvilcraft.pulp": "紙漿", - "item.anvilcraft.changeable_pickaxe_silk_touch": "應變之鎬（絲觸）", - "item.anvilcraft.changeable_pickaxe_fortune": "應變之鎬（幸運）", "block.anvilcraft.royal_anvil": "皇家鐵砧", "block.anvilcraft.magnet_block": "磁鐵方塊", "block.anvilcraft.hollow_magnet_block": "空心磁鐵方塊", "block.anvilcraft.ferrite_core_magnet_block": "鐵芯磁鐵方塊", - "block.anvilcraft.interact_machine": "交互機", "block.anvilcraft.auto_crafter": "自動合成器", "block.anvilcraft.royal_steel_block": "皇家鋼方塊", "block.anvilcraft.smooth_royal_steel_block": "平滑皇家鋼方塊", diff --git a/src/main/resources/assets/anvilcraft/models/block/interact_machine.json b/src/main/resources/assets/anvilcraft/models/block/interact_machine.json deleted file mode 100644 index c8de2faab..000000000 --- a/src/main/resources/assets/anvilcraft/models/block/interact_machine.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "anvilcraft:block/interact_machine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/changeable_pickaxe_fortune.json b/src/main/resources/assets/anvilcraft/models/item/changeable_pickaxe_fortune.json deleted file mode 100644 index 2de611e2c..000000000 --- a/src/main/resources/assets/anvilcraft/models/item/changeable_pickaxe_fortune.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "anvilcraft:item/changeable_pickaxe_fortune" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/changeable_pickaxe_silk_touch.json b/src/main/resources/assets/anvilcraft/models/item/changeable_pickaxe_silk_touch.json deleted file mode 100644 index dfec170b9..000000000 --- a/src/main/resources/assets/anvilcraft/models/item/changeable_pickaxe_silk_touch.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "anvilcraft:item/changeable_pickaxe_silk_touch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/dumpling.json b/src/main/resources/assets/anvilcraft/models/item/dumpling.json deleted file mode 100644 index 090cd63a6..000000000 --- a/src/main/resources/assets/anvilcraft/models/item/dumpling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "anvilcraft:item/dumpling" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/dumpling_raw.json b/src/main/resources/assets/anvilcraft/models/item/dumpling_raw.json deleted file mode 100644 index ad339fe58..000000000 --- a/src/main/resources/assets/anvilcraft/models/item/dumpling_raw.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "anvilcraft:item/dumpling_raw" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/flatdough.json b/src/main/resources/assets/anvilcraft/models/item/flatdough.json deleted file mode 100644 index 79c0f3ee1..000000000 --- a/src/main/resources/assets/anvilcraft/models/item/flatdough.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "anvilcraft:item/flatdough" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/grease.json b/src/main/resources/assets/anvilcraft/models/item/grease.json deleted file mode 100644 index 17a242219..000000000 --- a/src/main/resources/assets/anvilcraft/models/item/grease.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "anvilcraft:item/grease" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/interact_machine.json b/src/main/resources/assets/anvilcraft/models/item/interact_machine.json deleted file mode 100644 index 4316ebb94..000000000 --- a/src/main/resources/assets/anvilcraft/models/item/interact_machine.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "anvilcraft:block/interact_machine" -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/meat_stuffing.json b/src/main/resources/assets/anvilcraft/models/item/meat_stuffing.json deleted file mode 100644 index 5420e1251..000000000 --- a/src/main/resources/assets/anvilcraft/models/item/meat_stuffing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "anvilcraft:item/meat_stuffing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/meatballs.json b/src/main/resources/assets/anvilcraft/models/item/meatballs.json deleted file mode 100644 index 40d311276..000000000 --- a/src/main/resources/assets/anvilcraft/models/item/meatballs.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "anvilcraft:item/meatballs" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/meatballs_raw.json b/src/main/resources/assets/anvilcraft/models/item/meatballs_raw.json deleted file mode 100644 index 2b31f2d38..000000000 --- a/src/main/resources/assets/anvilcraft/models/item/meatballs_raw.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "anvilcraft:item/meatballs_raw" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/shengjian.json b/src/main/resources/assets/anvilcraft/models/item/shengjian.json deleted file mode 100644 index d42a619c1..000000000 --- a/src/main/resources/assets/anvilcraft/models/item/shengjian.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "anvilcraft:item/shengjian" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/shengjian_raw.json b/src/main/resources/assets/anvilcraft/models/item/shengjian_raw.json deleted file mode 100644 index c7a5771fe..000000000 --- a/src/main/resources/assets/anvilcraft/models/item/shengjian_raw.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "anvilcraft:item/shengjian_raw" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/sweet_dumpling.json b/src/main/resources/assets/anvilcraft/models/item/sweet_dumpling.json deleted file mode 100644 index 1d714a0d1..000000000 --- a/src/main/resources/assets/anvilcraft/models/item/sweet_dumpling.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "anvilcraft:item/sweet_dumpling" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/models/item/sweet_dumpling_raw.json b/src/main/resources/assets/anvilcraft/models/item/sweet_dumpling_raw.json deleted file mode 100644 index 05f698991..000000000 --- a/src/main/resources/assets/anvilcraft/models/item/sweet_dumpling_raw.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "anvilcraft:item/sweet_dumpling_raw" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/anvilcraft/textures/block/interact_machine.png b/src/main/resources/assets/anvilcraft/textures/block/interact_machine.png deleted file mode 100644 index 76618cc2f..000000000 Binary files a/src/main/resources/assets/anvilcraft/textures/block/interact_machine.png and /dev/null differ diff --git a/src/main/resources/assets/anvilcraft/textures/gui/container/interact_machine.png b/src/main/resources/assets/anvilcraft/textures/gui/container/interact_machine.png deleted file mode 100644 index 992b551bc..000000000 Binary files a/src/main/resources/assets/anvilcraft/textures/gui/container/interact_machine.png and /dev/null differ diff --git a/src/main/resources/assets/anvilcraft/textures/item/changeable_pickaxe_fortune.png b/src/main/resources/assets/anvilcraft/textures/item/changeable_pickaxe_fortune.png deleted file mode 100644 index 8d7051221..000000000 Binary files a/src/main/resources/assets/anvilcraft/textures/item/changeable_pickaxe_fortune.png and /dev/null differ diff --git a/src/main/resources/assets/anvilcraft/textures/item/changeable_pickaxe_silk_touch.png b/src/main/resources/assets/anvilcraft/textures/item/changeable_pickaxe_silk_touch.png deleted file mode 100644 index a027e5533..000000000 Binary files a/src/main/resources/assets/anvilcraft/textures/item/changeable_pickaxe_silk_touch.png and /dev/null differ diff --git a/src/main/resources/assets/anvilcraft/textures/item/dumpling.png b/src/main/resources/assets/anvilcraft/textures/item/dumpling.png deleted file mode 100644 index bde55b429..000000000 Binary files a/src/main/resources/assets/anvilcraft/textures/item/dumpling.png and /dev/null differ diff --git a/src/main/resources/assets/anvilcraft/textures/item/dumpling_raw.png b/src/main/resources/assets/anvilcraft/textures/item/dumpling_raw.png deleted file mode 100644 index 248fd1310..000000000 Binary files a/src/main/resources/assets/anvilcraft/textures/item/dumpling_raw.png and /dev/null differ diff --git a/src/main/resources/assets/anvilcraft/textures/item/flatdough.png b/src/main/resources/assets/anvilcraft/textures/item/flatdough.png deleted file mode 100644 index c5514eab1..000000000 Binary files a/src/main/resources/assets/anvilcraft/textures/item/flatdough.png and /dev/null differ diff --git a/src/main/resources/assets/anvilcraft/textures/item/grease.png b/src/main/resources/assets/anvilcraft/textures/item/grease.png deleted file mode 100644 index c55a51b14..000000000 Binary files a/src/main/resources/assets/anvilcraft/textures/item/grease.png and /dev/null differ diff --git a/src/main/resources/assets/anvilcraft/textures/item/meatballs.png b/src/main/resources/assets/anvilcraft/textures/item/meatballs.png deleted file mode 100644 index fde7075f1..000000000 Binary files a/src/main/resources/assets/anvilcraft/textures/item/meatballs.png and /dev/null differ diff --git a/src/main/resources/assets/anvilcraft/textures/item/meatballs_raw.png b/src/main/resources/assets/anvilcraft/textures/item/meatballs_raw.png deleted file mode 100644 index 0c2210c01..000000000 Binary files a/src/main/resources/assets/anvilcraft/textures/item/meatballs_raw.png and /dev/null differ diff --git a/src/main/resources/assets/anvilcraft/textures/item/shengjian.png b/src/main/resources/assets/anvilcraft/textures/item/shengjian.png deleted file mode 100644 index b003b96fe..000000000 Binary files a/src/main/resources/assets/anvilcraft/textures/item/shengjian.png and /dev/null differ diff --git a/src/main/resources/assets/anvilcraft/textures/item/shengjian_raw.png b/src/main/resources/assets/anvilcraft/textures/item/shengjian_raw.png deleted file mode 100644 index 7f54f648d..000000000 Binary files a/src/main/resources/assets/anvilcraft/textures/item/shengjian_raw.png and /dev/null differ diff --git a/src/main/resources/assets/anvilcraft/textures/item/sweet_dumpling.png b/src/main/resources/assets/anvilcraft/textures/item/sweet_dumpling.png deleted file mode 100644 index d239a7ba0..000000000 Binary files a/src/main/resources/assets/anvilcraft/textures/item/sweet_dumpling.png and /dev/null differ diff --git a/src/main/resources/assets/anvilcraft/textures/item/sweet_dumpling_raw.png b/src/main/resources/assets/anvilcraft/textures/item/sweet_dumpling_raw.png deleted file mode 100644 index 7a107358f..000000000 Binary files a/src/main/resources/assets/anvilcraft/textures/item/sweet_dumpling_raw.png and /dev/null differ