Skip to content

Commit

Permalink
feat(bio-forge): reorganize tabs
Browse files Browse the repository at this point in the history
  • Loading branch information
@Elenterius
Elenterius committed Jan 21, 2024
1 parent b32a997 commit 4fc9c33
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions src/datagen/java/com/github/elenterius/biomancy/datagen/lang/EnglishLangProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,9 @@ protected void addTranslations() {
addBioForgeTab(ModBioForgeTabs.SEARCH, "All");
addBioForgeTab(ModBioForgeTabs.BUILDING_BLOCKS, "Building Blocks");
addBioForgeTab(ModBioForgeTabs.MACHINES, "Machines");
addBioForgeTab(ModBioForgeTabs.WEAPONS, "Combat");
addBioForgeTab(ModBioForgeTabs.TOOLS, "Tools");
addBioForgeTab(ModBioForgeTabs.COMPONENTS, "Components");
addBioForgeTab(ModBioForgeTabs.MISC, "Misc");
addBioForgeTab(ModBioForgeTabs.REPLICAS, "Replicas");

add("jei.biomancy.recipe.bio_lab", "Bio-Lab Recipes");
add("jei.biomancy.recipe.decomposer", "Decomposer Recipes");
Expand Down
40 changes: 20 additions & 20 deletions src/datagen/java/com/github/elenterius/biomancy/datagen/recipes/ModRecipeProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,7 @@ private void registerBioForgeRecipes(Consumer<FinishedRecipe> consumer) {
.addIngredient(ModItems.MOB_FANG.get())
.addIngredient(ModItems.TOUGH_FIBERS.get(), 2)
.addIngredient(ModItems.FLESH_BITS.get(), 1)
.setCategory(ModBioForgeTabs.WEAPONS)
.setCategory(ModBioForgeTabs.TOOLS)
.unlockedBy(ModItems.MOB_FANG.get()).save(consumer);

BioForgeRecipeBuilder.create(ModItems.FLESH_FENCE_GATE.get(), 4)
Expand Down Expand Up @@ -1068,7 +1068,7 @@ private void registerBioForgeRecipes(Consumer<FinishedRecipe> consumer) {
.addIngredient(ModItems.BIO_LUMENS.get(), 10)
.addIngredient(Items.YELLOW_DYE, 2)
.addIngredient(ModItems.ORGANIC_MATTER.get(), 4)
.setCategory(ModBioForgeTabs.REPLICAS)
.setCategory(ModBioForgeTabs.COMPONENTS)
.unlockedBy(Items.SHROOMLIGHT).save(consumer);

BioForgeRecipeBuilder.create(ModItems.VIAL_HOLDER.get())
Expand All @@ -1088,20 +1088,20 @@ private void registerBioForgeRecipes(Consumer<FinishedRecipe> consumer) {
.addIngredient(ModItems.TOUGH_FIBERS.get(), 6 * 3)
.addIngredient(ModItems.MINERAL_FRAGMENT.get(), 5 * 3)
.setCraftingCost(250)
.setCategory(ModBioForgeTabs.WEAPONS)
.setCategory(ModBioForgeTabs.TOOLS)
.unlockedBy(ModItems.LIVING_FLESH.get()).save(consumer);

BioForgeRecipeBuilder.create(ModItems.INJECTOR.get())
.addIngredient(ModItems.FLESH_BITS.get(), 20)
.addIngredient(ModItems.MINERAL_FRAGMENT.get(), 10)
.addIngredient(ModItems.ELASTIC_FIBERS.get(), 3)
.addIngredient(ModItems.TOUGH_FIBERS.get(), 5)
.setCategory(ModBioForgeTabs.WEAPONS)
.setCategory(ModBioForgeTabs.TOOLS)
.unlockedBy(ModItems.FLESH_BITS.get()).save(consumer);

BioForgeRecipeBuilder.create(ModItems.VIAL.get())
.addIngredient(ModItems.ELASTIC_FIBERS.get(), 1)
.setCategory(ModBioForgeTabs.WEAPONS)
.setCategory(ModBioForgeTabs.TOOLS)
.unlockedBy(ModItems.ELASTIC_FIBERS.get()).save(consumer);

//////////// MISC ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand All @@ -1111,14 +1111,14 @@ private void registerBioForgeRecipes(Consumer<FinishedRecipe> consumer) {
.addIngredient(ModItems.BONE_FRAGMENTS.get(), 3)
.addIngredient(ModItems.EXOTIC_DUST.get(), 2)
.addIngredient(ModItems.NUTRIENTS.get(), 3)
.setCategory(ModBioForgeTabs.MISC)
.setCategory(ModBioForgeTabs.COMPONENTS)
.unlockedBy(ModItems.EXOTIC_DUST.get()).save(consumer);

BioForgeRecipeBuilder.create(ModItems.FERTILIZER.get())
.addIngredient(ModItems.NUTRIENTS.get(), 4)
.addIngredient(ModItems.ORGANIC_MATTER.get(), 4)
.addIngredient(ModItems.AGEING_SERUM.get())
.setCategory(ModBioForgeTabs.MISC)
.setCategory(ModBioForgeTabs.COMPONENTS)
.unlockedBy(ModItems.AGEING_SERUM.get()).save(consumer);

BioForgeRecipeBuilder.create(ModItems.MASCOT_BANNER_PATTERNS.get())
Expand All @@ -1134,57 +1134,57 @@ private void registerBioForgeRecipes(Consumer<FinishedRecipe> consumer) {
.addIngredient(ModItems.MINERAL_FRAGMENT.get(), 6)
.addIngredient(ModItems.BONE_FRAGMENTS.get(), 8)
.addIngredient(ModItems.STONE_POWDER.get(), 1)
.setCategory(ModBioForgeTabs.REPLICAS)
.setCategory(ModBioForgeTabs.COMPONENTS)
.unlockedBy(ModItems.MOB_FANG.get()).save(consumer);

BioForgeRecipeBuilder.create(ModItems.MOB_CLAW.get())
.addIngredient(ModItems.MINERAL_FRAGMENT.get(), 7)
.addIngredient(ModItems.TOUGH_FIBERS.get(), 8)
.addIngredient(ModItems.STONE_POWDER.get(), 1)
.setCategory(ModBioForgeTabs.REPLICAS)
.setCategory(ModBioForgeTabs.COMPONENTS)
.unlockedBy(ModItems.MOB_CLAW.get()).save(consumer);

BioForgeRecipeBuilder.create(Items.BONE)
.addIngredient(ModItems.BONE_FRAGMENTS.get(), 5)
.addIngredient(ModItems.MINERAL_FRAGMENT.get(), 1)
.addIngredient(ModItems.STONE_POWDER.get(), 1)
.setCategory(ModBioForgeTabs.REPLICAS)
.setCategory(ModBioForgeTabs.COMPONENTS)
.unlockedBy(ModItems.BONE_FRAGMENTS.get()).save(consumer);

BioForgeRecipeBuilder.create(Items.LEATHER)
.addIngredient(ModItems.TOUGH_FIBERS.get(), 5)
.addIngredient(ModItems.ELASTIC_FIBERS.get(), 1)
.setCategory(ModBioForgeTabs.REPLICAS)
.setCategory(ModBioForgeTabs.COMPONENTS)
.unlockedBy(Items.LEATHER).save(consumer);

BioForgeRecipeBuilder.create(Items.STRING)
.addIngredient(ModItems.ELASTIC_FIBERS.get(), 2)
.addIngredient(ModItems.MINERAL_FRAGMENT.get(), 1)
.setCategory(ModBioForgeTabs.REPLICAS)
.setCategory(ModBioForgeTabs.COMPONENTS)
.unlockedBy(Items.STRING).save(consumer);

BioForgeRecipeBuilder.create(Items.SCUTE)
.addIngredient(ModItems.TOUGH_FIBERS.get(), 6)
.addIngredient(ModItems.MINERAL_FRAGMENT.get(), 4)
.addIngredient(ModItems.STONE_POWDER.get(), 1)
.setCategory(ModBioForgeTabs.REPLICAS)
.setCategory(ModBioForgeTabs.COMPONENTS)
.unlockedBy(Items.SCUTE).save(consumer);

BioForgeRecipeBuilder.create(Items.NAUTILUS_SHELL)
.addIngredient(ModItems.MINERAL_FRAGMENT.get(), 11)
.addIngredient(ModItems.TOUGH_FIBERS.get(), 8)
.addIngredient(ModItems.STONE_POWDER.get(), 1)
.setCategory(ModBioForgeTabs.REPLICAS)
.setCategory(ModBioForgeTabs.COMPONENTS)
.unlockedBy(Items.NAUTILUS_SHELL).save(consumer);

//////////// Testing ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////

BioForgeRecipeBuilder.create(Items.PAPER)
.addIngredient(ItemTags.PLANKS, 11)
.addIngredient(ModItems.ORGANIC_MATTER.get(), 8)
.addIngredient(ItemTags.SMALL_FLOWERS, 3)
.setCategory(ModBioForgeTabs.REPLICAS)
.unlockedBy(Items.PAPER).save(consumer);
// BioForgeRecipeBuilder.create(Items.PAPER)
// .addIngredient(ItemTags.PLANKS, 11)
// .addIngredient(ModItems.ORGANIC_MATTER.get(), 8)
// .addIngredient(ItemTags.SMALL_FLOWERS, 3)
// .setCategory(ModBioForgeTabs.REPLICAS)
// .unlockedBy(Items.PAPER).save(consumer);
}

private void registerBioLabRecipes(Consumer<FinishedRecipe> consumer) {
Expand Down
4 changes: 2 additions & 2 deletions src/generated/resources/assets/biomancy/lang/en_us.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,9 @@
"bio_forge_tab.biomancy.search": "All",
"bio_forge_tab.biomancy.blocks": "Building Blocks",
"bio_forge_tab.biomancy.machines": "Machines",
"bio_forge_tab.biomancy.weapons": "Combat",
"bio_forge_tab.biomancy.tools": "Tools",
"bio_forge_tab.biomancy.components": "Components",
"bio_forge_tab.biomancy.misc": "Misc",
"bio_forge_tab.biomancy.replicas": "Replicas",
"jei.biomancy.recipe.bio_lab": "Bio-Lab Recipes",
"jei.biomancy.recipe.decomposer": "Decomposer Recipes",
"jei.biomancy.recipe.digester": "Digester Recipes",
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/github/elenterius/biomancy/init/ModBioForgeTabs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ public final class ModBioForgeTabs {
public static final Supplier<IForgeRegistry<BioForgeTab>> REGISTRY = BIO_FORGE_TABS.makeRegistry(RegistryBuilder::new);

public static final RegistryObject<BioForgeTab> SEARCH = register("search", 99, () -> Items.COMPASS);
public static final RegistryObject<BioForgeTab> MISC = register("misc", -98, ModItems.FLESH_IRIS_DOOR);
public static final RegistryObject<BioForgeTab> REPLICAS = register("replicas", -99, ModItems.MOB_CLAW);
public static final RegistryObject<BioForgeTab> BUILDING_BLOCKS = register("blocks", ModItems.FLESH_BLOCK);
public static final RegistryObject<BioForgeTab> MACHINES = register("machines", ModItems.DECOMPOSER);
public static final RegistryObject<BioForgeTab> WEAPONS = register("weapons", ModItems.RAVENOUS_CLAWS);
public static final RegistryObject<BioForgeTab> BUILDING_BLOCKS = register("blocks", 10, ModItems.FLESH_BLOCK);
public static final RegistryObject<BioForgeTab> MACHINES = register("machines", 9, ModItems.DECOMPOSER);
public static final RegistryObject<BioForgeTab> TOOLS = register("tools", 8, ModItems.RAVENOUS_CLAWS);
public static final RegistryObject<BioForgeTab> COMPONENTS = register("components", 7, ModItems.CREATOR_MIX);
public static final RegistryObject<BioForgeTab> MISC = register("misc", -99, ModItems.FLESH_IRIS_DOOR);

private ModBioForgeTabs() {}

Expand Down

0 comments on commit 4fc9c33

Please sign in to comment.