Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

移除或隐藏暂时没有合理定位的数据包版本物品 #58

Merged
merged 1 commit into from
Mar 27, 2024
Merged

移除或隐藏暂时没有合理定位的数据包版本物品 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 0 additions & 73 deletions src/main/java/dev/dubhe/anvilcraft/block/InteractMachineBlock.java
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions src/main/java/dev/dubhe/anvilcraft/block/entity/InteractMachineBlockEntity.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/main/java/dev/dubhe/anvilcraft/client/AnvilCraftClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
Expand Down
36 changes: 0 additions & 36 deletions src/main/java/dev/dubhe/anvilcraft/client/gui/screen/inventory/InteractMachineScreen.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/main/java/dev/dubhe/anvilcraft/data/generator/MyBlockLootGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/dev/dubhe/anvilcraft/data/generator/MyBlockTagGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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);
}
}
19 changes: 1 addition & 18 deletions src/main/java/dev/dubhe/anvilcraft/data/generator/MyItemTagGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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);
}
}
1 change: 1 addition & 0 deletions ...ava/dev/dubhe/anvilcraft/data/generator/recipe/BulgingAndCrystallizeRecipesGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public static void buildRecipes(Consumer<FinishedRecipe> 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);
Expand Down
8 changes: 0 additions & 8 deletions src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/CompressRecipesGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,6 @@ public static void buildRecipes(Consumer<FinishedRecipe> 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)
Expand Down
22 changes: 2 additions & 20 deletions src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/StampingRecipesGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static void buildRecipes(Consumer<FinishedRecipe> 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)
Expand All @@ -39,24 +39,6 @@ public static void buildRecipes(Consumer<FinishedRecipe> 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<FinishedRecipe> exporter) {
Expand All @@ -65,6 +47,6 @@ public static void stamping(Item item, Item item1, Consumer<FinishedRecipe> 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()));
}
}
Loading
Loading