Skip to content

Commit

Permalink
fix: remove biomancy's stonecutting recipes from the minecraft namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
Elenterius committed Apr 1, 2024
1 parent 4819c58 commit ac0b552
Show file tree
Hide file tree
Showing 39 changed files with 66 additions and 62 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -199,44 +199,44 @@ private void buildWorkbenchRecipes(Consumer<FinishedRecipe> consumer) {
stairs(consumer, ModItems.FLESH_STAIRS.get(), ModItems.FLESH_BLOCK.get());
slab(consumer, ModItems.FLESH_SLAB.get(), ModItems.FLESH_BLOCK.get());
wall(consumer, ModItems.FLESH_WALL.get(), ModItems.FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.FLESH_STAIRS.get(), ModItems.FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.FLESH_SLAB.get(), ModItems.FLESH_BLOCK.get(), 2);
stonecutterResultFromBase(consumer, ModItems.FLESH_WALL.get(), ModItems.FLESH_BLOCK.get());
stonecutting(consumer, ModItems.FLESH_STAIRS.get(), ModItems.FLESH_BLOCK.get());
stonecutting(consumer, ModItems.FLESH_SLAB.get(), ModItems.FLESH_BLOCK.get(), 2);
stonecutting(consumer, ModItems.FLESH_WALL.get(), ModItems.FLESH_BLOCK.get());

stairs(consumer, ModItems.PACKED_FLESH_STAIRS.get(), ModItems.PACKED_FLESH_BLOCK.get());
slab(consumer, ModItems.PACKED_FLESH_SLAB.get(), ModItems.PACKED_FLESH_BLOCK.get());
wall(consumer, ModItems.PACKED_FLESH_WALL.get(), ModItems.PACKED_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.PACKED_FLESH_STAIRS.get(), ModItems.PACKED_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.PACKED_FLESH_SLAB.get(), ModItems.PACKED_FLESH_BLOCK.get(), 2);
stonecutterResultFromBase(consumer, ModItems.PACKED_FLESH_WALL.get(), ModItems.PACKED_FLESH_BLOCK.get());
stonecutting(consumer, ModItems.PACKED_FLESH_STAIRS.get(), ModItems.PACKED_FLESH_BLOCK.get());
stonecutting(consumer, ModItems.PACKED_FLESH_SLAB.get(), ModItems.PACKED_FLESH_BLOCK.get(), 2);
stonecutting(consumer, ModItems.PACKED_FLESH_WALL.get(), ModItems.PACKED_FLESH_BLOCK.get());

stairs(consumer, ModItems.PRIMAL_FLESH_STAIRS.get(), ModItems.PRIMAL_FLESH_BLOCK.get());
slab(consumer, ModItems.PRIMAL_FLESH_SLAB.get(), ModItems.PRIMAL_FLESH_BLOCK.get());
blockFromSlabs(consumer, ModItems.PRIMAL_FLESH_BLOCK.get(), ModItems.PRIMAL_FLESH_SLAB.get());
wall(consumer, ModItems.PRIMAL_FLESH_WALL.get(), ModItems.PRIMAL_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.PRIMAL_FLESH_WALL.get(), ModItems.PRIMAL_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.PRIMAL_FLESH_STAIRS.get(), ModItems.PRIMAL_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.PRIMAL_FLESH_SLAB.get(), ModItems.PRIMAL_FLESH_BLOCK.get(), 2);
stonecutting(consumer, ModItems.PRIMAL_FLESH_WALL.get(), ModItems.PRIMAL_FLESH_BLOCK.get());
stonecutting(consumer, ModItems.PRIMAL_FLESH_STAIRS.get(), ModItems.PRIMAL_FLESH_BLOCK.get());
stonecutting(consumer, ModItems.PRIMAL_FLESH_SLAB.get(), ModItems.PRIMAL_FLESH_BLOCK.get(), 2);

stairs(consumer, ModItems.SMOOTH_PRIMAL_FLESH_STAIRS.get(), ModItems.SMOOTH_PRIMAL_FLESH_BLOCK.get());
slab(consumer, ModItems.SMOOTH_PRIMAL_FLESH_SLAB.get(), ModItems.SMOOTH_PRIMAL_FLESH_BLOCK.get());
blockFromSlabs(consumer, ModItems.SMOOTH_PRIMAL_FLESH_BLOCK.get(), ModItems.SMOOTH_PRIMAL_FLESH_SLAB.get());
wall(consumer, ModItems.SMOOTH_PRIMAL_FLESH_WALL.get(), ModItems.SMOOTH_PRIMAL_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.SMOOTH_PRIMAL_FLESH_WALL.get(), ModItems.SMOOTH_PRIMAL_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.SMOOTH_PRIMAL_FLESH_STAIRS.get(), ModItems.SMOOTH_PRIMAL_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.SMOOTH_PRIMAL_FLESH_SLAB.get(), ModItems.SMOOTH_PRIMAL_FLESH_BLOCK.get(), 2);
stonecutting(consumer, ModItems.SMOOTH_PRIMAL_FLESH_WALL.get(), ModItems.SMOOTH_PRIMAL_FLESH_BLOCK.get());
stonecutting(consumer, ModItems.SMOOTH_PRIMAL_FLESH_STAIRS.get(), ModItems.SMOOTH_PRIMAL_FLESH_BLOCK.get());
stonecutting(consumer, ModItems.SMOOTH_PRIMAL_FLESH_SLAB.get(), ModItems.SMOOTH_PRIMAL_FLESH_BLOCK.get(), 2);

stairs(consumer, ModItems.POROUS_PRIMAL_FLESH_STAIRS.get(), ModItems.POROUS_PRIMAL_FLESH_BLOCK.get());
slab(consumer, ModItems.POROUS_PRIMAL_FLESH_SLAB.get(), ModItems.POROUS_PRIMAL_FLESH_BLOCK.get());
blockFromSlabs(consumer, ModItems.POROUS_PRIMAL_FLESH_BLOCK.get(), ModItems.POROUS_PRIMAL_FLESH_SLAB.get());
wall(consumer, ModItems.POROUS_PRIMAL_FLESH_WALL.get(), ModItems.POROUS_PRIMAL_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.POROUS_PRIMAL_FLESH_WALL.get(), ModItems.POROUS_PRIMAL_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.POROUS_PRIMAL_FLESH_STAIRS.get(), ModItems.POROUS_PRIMAL_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.POROUS_PRIMAL_FLESH_SLAB.get(), ModItems.POROUS_PRIMAL_FLESH_BLOCK.get(), 2);
stonecutting(consumer, ModItems.POROUS_PRIMAL_FLESH_WALL.get(), ModItems.POROUS_PRIMAL_FLESH_BLOCK.get());
stonecutting(consumer, ModItems.POROUS_PRIMAL_FLESH_STAIRS.get(), ModItems.POROUS_PRIMAL_FLESH_BLOCK.get());
stonecutting(consumer, ModItems.POROUS_PRIMAL_FLESH_SLAB.get(), ModItems.POROUS_PRIMAL_FLESH_BLOCK.get(), 2);

slab(consumer, ModItems.ORNATE_FLESH_SLAB.get(), ModItems.ORNATE_FLESH_BLOCK.get());
blockFromSlabs(consumer, ModItems.ORNATE_FLESH_BLOCK.get(), ModItems.ORNATE_FLESH_SLAB.get());
stonecutterResultFromBase(consumer, ModItems.ORNATE_FLESH_SLAB.get(), ModItems.ORNATE_FLESH_BLOCK.get(), 2);
stonecutting(consumer, ModItems.ORNATE_FLESH_SLAB.get(), ModItems.ORNATE_FLESH_BLOCK.get(), 2);

WorkbenchRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.PRIMAL_FLESH_BLOCK.get(), 4)
.define('S', ModItems.STONE_POWDER.get())
Expand All @@ -253,9 +253,9 @@ private void buildWorkbenchRecipes(Consumer<FinishedRecipe> consumer) {
slab(consumer, ModItems.MALIGNANT_FLESH_SLAB.get(), ModItems.MALIGNANT_FLESH_BLOCK.get());
blockFromSlabs(consumer, ModItems.MALIGNANT_FLESH_BLOCK.get(), ModItems.MALIGNANT_FLESH_SLAB.get());
wall(consumer, ModItems.MALIGNANT_FLESH_WALL.get(), ModItems.MALIGNANT_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.MALIGNANT_FLESH_WALL.get(), ModItems.MALIGNANT_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.MALIGNANT_FLESH_STAIRS.get(), ModItems.MALIGNANT_FLESH_BLOCK.get());
stonecutterResultFromBase(consumer, ModItems.MALIGNANT_FLESH_SLAB.get(), ModItems.MALIGNANT_FLESH_BLOCK.get(), 2);
stonecutting(consumer, ModItems.MALIGNANT_FLESH_WALL.get(), ModItems.MALIGNANT_FLESH_BLOCK.get());
stonecutting(consumer, ModItems.MALIGNANT_FLESH_STAIRS.get(), ModItems.MALIGNANT_FLESH_BLOCK.get());
stonecutting(consumer, ModItems.MALIGNANT_FLESH_SLAB.get(), ModItems.MALIGNANT_FLESH_BLOCK.get(), 2);

WorkbenchRecipeBuilder.shaped(RecipeCategory.MISC, ModItems.MALIGNANT_FLESH_BLOCK.get())
.define('F', ModItems.FLESH_BITS.get())
Expand Down Expand Up @@ -316,6 +316,10 @@ protected ResourceLocation getConversionRecipeId(ItemLike result, ItemLike ingre
return BiomancyMod.createRL(getItemName(result) + "_from_" + getItemName(ingredient));
}

protected ResourceLocation getStoneCuttingRecipeId(ItemLike result, ItemLike ingredient) {
return BiomancyMod.createRL(getItemName(result) + "_from_" + getItemName(ingredient) + "_stonecutting");
}

protected ResourceLocation getSmeltingRecipeId(ItemLike itemLike) {
return BiomancyMod.createRL(getItemName(itemLike) + "_from_smelting");
}
Expand All @@ -332,14 +336,14 @@ protected void wall(Consumer<FinishedRecipe> consumer, BlockItem result, BlockIt
wall(consumer, RecipeCategory.BUILDING_BLOCKS, result, ingredient);
}

protected void stonecutterResultFromBase(Consumer<FinishedRecipe> consumer, ItemLike result, ItemLike ingredient) {
stonecutterResultFromBase(consumer, RecipeCategory.BUILDING_BLOCKS, result, ingredient, 1);
protected void stonecutting(Consumer<FinishedRecipe> consumer, ItemLike result, ItemLike ingredient) {
stonecutting(consumer, result, ingredient, 1);
}

protected void stonecutterResultFromBase(Consumer<FinishedRecipe> consumer, ItemLike result, ItemLike ingredient, int count) {
protected void stonecutting(Consumer<FinishedRecipe> consumer, ItemLike result, ItemLike ingredient, int count) {
SingleItemRecipeBuilder builder = SingleItemRecipeBuilder.stonecutting(Ingredient.of(ingredient), RecipeCategory.BUILDING_BLOCKS, result, count).unlockedBy(getHasName(ingredient), has(ingredient));
String recipeName = getConversionRecipeName(result, ingredient);
builder.save(consumer, recipeName + "_stonecutting");
ResourceLocation recipeName = getStoneCuttingRecipeId(result, ingredient);
builder.save(consumer, recipeName);
}

protected void stairs(Consumer<FinishedRecipe> consumer, ItemLike result, ItemLike ingredient) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:flesh_slab_from_flesh_stonecutting"
"recipe": "biomancy:flesh_slab_from_flesh_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"minecraft:flesh_slab_from_flesh_stonecutting"
"biomancy:flesh_slab_from_flesh_stonecutting"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:flesh_stairs_from_flesh_stonecutting"
"recipe": "biomancy:flesh_stairs_from_flesh_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"minecraft:flesh_stairs_from_flesh_stonecutting"
"biomancy:flesh_stairs_from_flesh_stonecutting"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:flesh_wall_from_flesh_stonecutting"
"recipe": "biomancy:flesh_wall_from_flesh_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"minecraft:flesh_wall_from_flesh_stonecutting"
"biomancy:flesh_wall_from_flesh_stonecutting"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:malignant_flesh_slab_from_malignant_flesh_stonecutting"
"recipe": "biomancy:malignant_flesh_slab_from_malignant_flesh_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"minecraft:malignant_flesh_slab_from_malignant_flesh_stonecutting"
"biomancy:malignant_flesh_slab_from_malignant_flesh_stonecutting"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:malignant_flesh_stairs_from_malignant_flesh_stonecutting"
"recipe": "biomancy:malignant_flesh_stairs_from_malignant_flesh_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"minecraft:malignant_flesh_stairs_from_malignant_flesh_stonecutting"
"biomancy:malignant_flesh_stairs_from_malignant_flesh_stonecutting"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:malignant_flesh_wall_from_malignant_flesh_stonecutting"
"recipe": "biomancy:malignant_flesh_wall_from_malignant_flesh_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"minecraft:malignant_flesh_wall_from_malignant_flesh_stonecutting"
"biomancy:malignant_flesh_wall_from_malignant_flesh_stonecutting"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:ornate_flesh_slab_from_ornate_flesh_stonecutting"
"recipe": "biomancy:ornate_flesh_slab_from_ornate_flesh_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"minecraft:ornate_flesh_slab_from_ornate_flesh_stonecutting"
"biomancy:ornate_flesh_slab_from_ornate_flesh_stonecutting"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:packed_flesh_slab_from_packed_flesh_stonecutting"
"recipe": "biomancy:packed_flesh_slab_from_packed_flesh_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"minecraft:packed_flesh_slab_from_packed_flesh_stonecutting"
"biomancy:packed_flesh_slab_from_packed_flesh_stonecutting"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:packed_flesh_stairs_from_packed_flesh_stonecutting"
"recipe": "biomancy:packed_flesh_stairs_from_packed_flesh_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"minecraft:packed_flesh_stairs_from_packed_flesh_stonecutting"
"biomancy:packed_flesh_stairs_from_packed_flesh_stonecutting"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:packed_flesh_wall_from_packed_flesh_stonecutting"
"recipe": "biomancy:packed_flesh_wall_from_packed_flesh_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"minecraft:packed_flesh_wall_from_packed_flesh_stonecutting"
"biomancy:packed_flesh_wall_from_packed_flesh_stonecutting"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:porous_primal_flesh_slab_from_porous_primal_flesh_stonecutting"
"recipe": "biomancy:porous_primal_flesh_slab_from_porous_primal_flesh_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"minecraft:porous_primal_flesh_slab_from_porous_primal_flesh_stonecutting"
"biomancy:porous_primal_flesh_slab_from_porous_primal_flesh_stonecutting"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:porous_primal_flesh_stairs_from_porous_primal_flesh_stonecutting"
"recipe": "biomancy:porous_primal_flesh_stairs_from_porous_primal_flesh_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"minecraft:porous_primal_flesh_stairs_from_porous_primal_flesh_stonecutting"
"biomancy:porous_primal_flesh_stairs_from_porous_primal_flesh_stonecutting"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:porous_primal_flesh_wall_from_porous_primal_flesh_stonecutting"
"recipe": "biomancy:porous_primal_flesh_wall_from_porous_primal_flesh_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"minecraft:porous_primal_flesh_wall_from_porous_primal_flesh_stonecutting"
"biomancy:porous_primal_flesh_wall_from_porous_primal_flesh_stonecutting"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:primal_flesh_slab_from_primal_flesh_stonecutting"
"recipe": "biomancy:primal_flesh_slab_from_primal_flesh_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"minecraft:primal_flesh_slab_from_primal_flesh_stonecutting"
"biomancy:primal_flesh_slab_from_primal_flesh_stonecutting"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:primal_flesh_stairs_from_primal_flesh_stonecutting"
"recipe": "biomancy:primal_flesh_stairs_from_primal_flesh_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"minecraft:primal_flesh_stairs_from_primal_flesh_stonecutting"
"biomancy:primal_flesh_stairs_from_primal_flesh_stonecutting"
]
},
"sends_telemetry_event": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:primal_flesh_wall_from_primal_flesh_stonecutting"
"recipe": "biomancy:primal_flesh_wall_from_primal_flesh_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -28,7 +28,7 @@
],
"rewards": {
"recipes": [
"minecraft:primal_flesh_wall_from_primal_flesh_stonecutting"
"biomancy:primal_flesh_wall_from_primal_flesh_stonecutting"
]
},
"sends_telemetry_event": false
Expand Down
Loading

0 comments on commit ac0b552

Please sign in to comment.