diff --git a/src/main/generated/data/acesbs/advancement/recipes/food/bricked_up.json b/src/main/generated/data/acesbs/advancement/recipes/combat/fractal_diamond_sword.json similarity index 68% rename from src/main/generated/data/acesbs/advancement/recipes/food/bricked_up.json rename to src/main/generated/data/acesbs/advancement/recipes/combat/fractal_diamond_sword.json index 2f6d904..04fed6f 100644 --- a/src/main/generated/data/acesbs/advancement/recipes/food/bricked_up.json +++ b/src/main/generated/data/acesbs/advancement/recipes/combat/fractal_diamond_sword.json @@ -1,11 +1,11 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_stable_endtropy": { + "has_fractal_diamond": { "conditions": { "items": [ { - "items": "acesbs:stable_endtropy" + "items": "acesbs:fractal_diamond" } ] }, @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "acesbs:bricked_up" + "recipe": "acesbs:fractal_diamond_sword" }, "trigger": "minecraft:recipe_unlocked" } @@ -21,12 +21,12 @@ "requirements": [ [ "has_the_recipe", - "has_stable_endtropy" + "has_fractal_diamond" ] ], "rewards": { "recipes": [ - "acesbs:bricked_up" + "acesbs:fractal_diamond_sword" ] } } \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/combat/hellfire_diamond_sword.json b/src/main/generated/data/acesbs/advancement/recipes/combat/hellfire_diamond_sword.json new file mode 100644 index 0000000..2b7d4e6 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/combat/hellfire_diamond_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hellfire_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:hellfire_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:hellfire_diamond_sword" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hellfire_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:hellfire_diamond_sword" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/misc/ashen_armor_trim_smithing_template.json b/src/main/generated/data/acesbs/advancement/recipes/misc/ashen_armor_trim_smithing_template.json new file mode 100644 index 0000000..e345f8e --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/misc/ashen_armor_trim_smithing_template.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ashen_armor_trim_smithing_template": { + "conditions": { + "items": [ + { + "items": "acesbs:ashen_armor_trim_smithing_template" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:ashen_armor_trim_smithing_template" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ashen_armor_trim_smithing_template" + ] + ], + "rewards": { + "recipes": [ + "acesbs:ashen_armor_trim_smithing_template" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/misc/prisma_armor_trim_smithing_template.json b/src/main/generated/data/acesbs/advancement/recipes/misc/prisma_armor_trim_smithing_template.json new file mode 100644 index 0000000..c5c0761 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/misc/prisma_armor_trim_smithing_template.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_prisma_armor_trim_smithing_template": { + "conditions": { + "items": [ + { + "items": "acesbs:prisma_armor_trim_smithing_template" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:prisma_armor_trim_smithing_template" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_prisma_armor_trim_smithing_template" + ] + ], + "rewards": { + "recipes": [ + "acesbs:prisma_armor_trim_smithing_template" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/fractal_diamond_hammer.json b/src/main/generated/data/acesbs/advancement/recipes/tools/fractal_diamond_hammer.json new file mode 100644 index 0000000..d450bf8 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/fractal_diamond_hammer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fractal_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:fractal_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fractal_diamond_hammer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fractal_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fractal_diamond_hammer" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/fractal_diamond_pickaxe.json b/src/main/generated/data/acesbs/advancement/recipes/tools/fractal_diamond_pickaxe.json new file mode 100644 index 0000000..7cf913b --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/fractal_diamond_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fractal_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:fractal_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fractal_diamond_pickaxe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fractal_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fractal_diamond_pickaxe" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/fractal_diamond_shovel.json b/src/main/generated/data/acesbs/advancement/recipes/tools/fractal_diamond_shovel.json new file mode 100644 index 0000000..d363771 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/fractal_diamond_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fractal_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:fractal_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fractal_diamond_shovel" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fractal_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fractal_diamond_shovel" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/hellfire_diamond_hammer.json b/src/main/generated/data/acesbs/advancement/recipes/tools/hellfire_diamond_hammer.json new file mode 100644 index 0000000..61c05a5 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/hellfire_diamond_hammer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hellfire_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:hellfire_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:hellfire_diamond_hammer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hellfire_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:hellfire_diamond_hammer" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/hellfire_diamond_pickaxe.json b/src/main/generated/data/acesbs/advancement/recipes/tools/hellfire_diamond_pickaxe.json new file mode 100644 index 0000000..215bf3c --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/hellfire_diamond_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hellfire_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:hellfire_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:hellfire_diamond_pickaxe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hellfire_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:hellfire_diamond_pickaxe" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/hellfire_diamond_shovel.json b/src/main/generated/data/acesbs/advancement/recipes/tools/hellfire_diamond_shovel.json new file mode 100644 index 0000000..5ed7879 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/hellfire_diamond_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hellfire_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:hellfire_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:hellfire_diamond_shovel" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hellfire_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:hellfire_diamond_shovel" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.fractal_diamond_axe.left.json b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.fractal_diamond_axe.left.json new file mode 100644 index 0000000..157c98b --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.fractal_diamond_axe.left.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fractal_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:fractal_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:item.acesbs.fractal_diamond_axe.left" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fractal_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:item.acesbs.fractal_diamond_axe.left" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.fractal_diamond_axe.right.json b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.fractal_diamond_axe.right.json new file mode 100644 index 0000000..77b6e3a --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.fractal_diamond_axe.right.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fractal_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:fractal_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:item.acesbs.fractal_diamond_axe.right" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fractal_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:item.acesbs.fractal_diamond_axe.right" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.fractal_diamond_hoe.left.json b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.fractal_diamond_hoe.left.json new file mode 100644 index 0000000..e501598 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.fractal_diamond_hoe.left.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fractal_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:fractal_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:item.acesbs.fractal_diamond_hoe.left" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fractal_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:item.acesbs.fractal_diamond_hoe.left" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.fractal_diamond_hoe.right.json b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.fractal_diamond_hoe.right.json new file mode 100644 index 0000000..4cb3810 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.fractal_diamond_hoe.right.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fractal_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:fractal_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:item.acesbs.fractal_diamond_hoe.right" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fractal_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:item.acesbs.fractal_diamond_hoe.right" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.hellfire_diamond_axe.left.json b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.hellfire_diamond_axe.left.json new file mode 100644 index 0000000..097574f --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.hellfire_diamond_axe.left.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hellfire_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:hellfire_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:item.acesbs.hellfire_diamond_axe.left" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hellfire_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:item.acesbs.hellfire_diamond_axe.left" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.hellfire_diamond_axe.right.json b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.hellfire_diamond_axe.right.json new file mode 100644 index 0000000..f7c2ef5 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.hellfire_diamond_axe.right.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hellfire_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:hellfire_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:item.acesbs.hellfire_diamond_axe.right" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hellfire_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:item.acesbs.hellfire_diamond_axe.right" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.hellfire_diamond_hoe.left.json b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.hellfire_diamond_hoe.left.json new file mode 100644 index 0000000..c24a510 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.hellfire_diamond_hoe.left.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hellfire_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:hellfire_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:item.acesbs.hellfire_diamond_hoe.left" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hellfire_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:item.acesbs.hellfire_diamond_hoe.left" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.hellfire_diamond_hoe.right.json b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.hellfire_diamond_hoe.right.json new file mode 100644 index 0000000..6617258 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.hellfire_diamond_hoe.right.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hellfire_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:hellfire_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:item.acesbs.hellfire_diamond_hoe.right" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hellfire_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:item.acesbs.hellfire_diamond_hoe.right" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/ashen_armor_trim_smithing_template.json b/src/main/generated/data/acesbs/recipe/ashen_armor_trim_smithing_template.json new file mode 100644 index 0000000..fcd6621 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/ashen_armor_trim_smithing_template.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "D": "minecraft:diamond", + "M": "acesbs:ashen_steel", + "T": "acesbs:ashen_armor_trim_smithing_template" + }, + "pattern": [ + "DTD", + "DMD", + "DDD" + ], + "result": { + "count": 2, + "id": "acesbs:ashen_armor_trim_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/bricked_up.json b/src/main/generated/data/acesbs/recipe/bricked_up.json deleted file mode 100644 index a2cbfbe..0000000 --- a/src/main/generated/data/acesbs/recipe/bricked_up.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - "minecraft:brick", - "acesbs:stable_endtropy" - ], - "result": { - "count": 1, - "id": "acesbs:bricked_up" - } -} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fire_oak_wall.json b/src/main/generated/data/acesbs/recipe/fire_oak_wall.json index 8f1d069..27003f2 100644 --- a/src/main/generated/data/acesbs/recipe/fire_oak_wall.json +++ b/src/main/generated/data/acesbs/recipe/fire_oak_wall.json @@ -2,14 +2,16 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "#": "acesbs:fire_oak_planks" + "#": "acesbs:fire_oak_planks", + "W": "#minecraft:walls" }, "pattern": [ "###", - "###" + "WWW", + " " ], "result": { - "count": 6, + "count": 3, "id": "acesbs:fire_oak_wall" } } \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fractal_diamond_hammer.json b/src/main/generated/data/acesbs/recipe/fractal_diamond_hammer.json new file mode 100644 index 0000000..1ad74d0 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fractal_diamond_hammer.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "acesbs:fractal_diamond", + "B": "acesbs:fractal_diamond_block", + "I": "minecraft:stick" + }, + "pattern": [ + "B#B", + " I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:fractal_diamond_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fractal_diamond_pickaxe.json b/src/main/generated/data/acesbs/recipe/fractal_diamond_pickaxe.json new file mode 100644 index 0000000..7c027cf --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fractal_diamond_pickaxe.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "acesbs:fractal_diamond", + "I": "minecraft:stick" + }, + "pattern": [ + "###", + " I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:fractal_diamond_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fractal_diamond_shovel.json b/src/main/generated/data/acesbs/recipe/fractal_diamond_shovel.json new file mode 100644 index 0000000..13caf60 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fractal_diamond_shovel.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "acesbs:fractal_diamond", + "I": "minecraft:stick" + }, + "pattern": [ + " # ", + " I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:fractal_diamond_shovel" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fractal_diamond_sword.json b/src/main/generated/data/acesbs/recipe/fractal_diamond_sword.json new file mode 100644 index 0000000..a93bfe7 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fractal_diamond_sword.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "acesbs:fractal_diamond", + "I": "minecraft:stick" + }, + "pattern": [ + " # ", + " # ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:fractal_diamond_sword" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/hellfire_diamond_hammer.json b/src/main/generated/data/acesbs/recipe/hellfire_diamond_hammer.json new file mode 100644 index 0000000..fe67db4 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/hellfire_diamond_hammer.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "acesbs:hellfire_diamond", + "B": "acesbs:hellfire_diamond_block", + "I": "minecraft:stick" + }, + "pattern": [ + "B#B", + " I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:hellfire_diamond_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/hellfire_diamond_pickaxe.json b/src/main/generated/data/acesbs/recipe/hellfire_diamond_pickaxe.json new file mode 100644 index 0000000..22717fa --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/hellfire_diamond_pickaxe.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "acesbs:hellfire_diamond", + "I": "minecraft:stick" + }, + "pattern": [ + "###", + " I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:hellfire_diamond_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/hellfire_diamond_shovel.json b/src/main/generated/data/acesbs/recipe/hellfire_diamond_shovel.json new file mode 100644 index 0000000..266ccba --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/hellfire_diamond_shovel.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "acesbs:hellfire_diamond", + "I": "minecraft:stick" + }, + "pattern": [ + " # ", + " I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:hellfire_diamond_shovel" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/hellfire_diamond_sword.json b/src/main/generated/data/acesbs/recipe/hellfire_diamond_sword.json new file mode 100644 index 0000000..ac862bf --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/hellfire_diamond_sword.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "acesbs:hellfire_diamond", + "I": "minecraft:stick" + }, + "pattern": [ + " # ", + " # ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:hellfire_diamond_sword" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/item.acesbs.fractal_diamond_axe.left.json b/src/main/generated/data/acesbs/recipe/item.acesbs.fractal_diamond_axe.left.json new file mode 100644 index 0000000..93652f4 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/item.acesbs.fractal_diamond_axe.left.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "acesbs:fractal_diamond", + "I": "minecraft:stick" + }, + "pattern": [ + "## ", + "#I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:fractal_diamond_axe" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/item.acesbs.fractal_diamond_axe.right.json b/src/main/generated/data/acesbs/recipe/item.acesbs.fractal_diamond_axe.right.json new file mode 100644 index 0000000..9c08673 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/item.acesbs.fractal_diamond_axe.right.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "acesbs:fractal_diamond", + "I": "minecraft:stick" + }, + "pattern": [ + " ##", + " I#", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:fractal_diamond_axe" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/item.acesbs.fractal_diamond_hoe.left.json b/src/main/generated/data/acesbs/recipe/item.acesbs.fractal_diamond_hoe.left.json new file mode 100644 index 0000000..d0ca7fb --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/item.acesbs.fractal_diamond_hoe.left.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "acesbs:fractal_diamond", + "I": "minecraft:stick" + }, + "pattern": [ + "## ", + " I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:fractal_diamond_hoe" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/item.acesbs.fractal_diamond_hoe.right.json b/src/main/generated/data/acesbs/recipe/item.acesbs.fractal_diamond_hoe.right.json new file mode 100644 index 0000000..9430e16 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/item.acesbs.fractal_diamond_hoe.right.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "acesbs:fractal_diamond", + "I": "minecraft:stick" + }, + "pattern": [ + " ##", + " I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:fractal_diamond_hoe" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/item.acesbs.hellfire_diamond_axe.left.json b/src/main/generated/data/acesbs/recipe/item.acesbs.hellfire_diamond_axe.left.json new file mode 100644 index 0000000..375bd8a --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/item.acesbs.hellfire_diamond_axe.left.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "acesbs:hellfire_diamond", + "I": "minecraft:stick" + }, + "pattern": [ + "## ", + "#I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:hellfire_diamond_axe" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/item.acesbs.hellfire_diamond_axe.right.json b/src/main/generated/data/acesbs/recipe/item.acesbs.hellfire_diamond_axe.right.json new file mode 100644 index 0000000..fb38f47 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/item.acesbs.hellfire_diamond_axe.right.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "acesbs:hellfire_diamond", + "I": "minecraft:stick" + }, + "pattern": [ + " ##", + " I#", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:hellfire_diamond_axe" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/item.acesbs.hellfire_diamond_hoe.left.json b/src/main/generated/data/acesbs/recipe/item.acesbs.hellfire_diamond_hoe.left.json new file mode 100644 index 0000000..73c4a07 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/item.acesbs.hellfire_diamond_hoe.left.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "acesbs:hellfire_diamond", + "I": "minecraft:stick" + }, + "pattern": [ + "## ", + " I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:hellfire_diamond_hoe" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/item.acesbs.hellfire_diamond_hoe.right.json b/src/main/generated/data/acesbs/recipe/item.acesbs.hellfire_diamond_hoe.right.json new file mode 100644 index 0000000..b9e64c7 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/item.acesbs.hellfire_diamond_hoe.right.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": "acesbs:hellfire_diamond", + "I": "minecraft:stick" + }, + "pattern": [ + " ##", + " I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:hellfire_diamond_hoe" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/lemonwood_wall.json b/src/main/generated/data/acesbs/recipe/lemonwood_wall.json index 19e9d43..f0f9a0c 100644 --- a/src/main/generated/data/acesbs/recipe/lemonwood_wall.json +++ b/src/main/generated/data/acesbs/recipe/lemonwood_wall.json @@ -2,14 +2,16 @@ "type": "minecraft:crafting_shaped", "category": "building", "key": { - "#": "acesbs:lemonwood_planks" + "#": "acesbs:lemonwood_planks", + "W": "#minecraft:walls" }, "pattern": [ "###", - "###" + "WWW", + " " ], "result": { - "count": 6, + "count": 3, "id": "acesbs:lemonwood_wall" } } \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/prisma_armor_trim_smithing_template.json b/src/main/generated/data/acesbs/recipe/prisma_armor_trim_smithing_template.json new file mode 100644 index 0000000..ec616cf --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/prisma_armor_trim_smithing_template.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "D": "minecraft:diamond", + "M": "acesbs:prisma_steel", + "T": "acesbs:prisma_armor_trim_smithing_template" + }, + "pattern": [ + "DTD", + "DMD", + "DDD" + ], + "result": { + "count": 2, + "id": "acesbs:prisma_armor_trim_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/mineable/axe.json b/src/main/generated/data/minecraft/tags/block/mineable/axe.json index 45d11bb..e7253dd 100644 --- a/src/main/generated/data/minecraft/tags/block/mineable/axe.json +++ b/src/main/generated/data/minecraft/tags/block/mineable/axe.json @@ -4,10 +4,30 @@ "acesbs:lemonwood_wall", "acesbs:lemonwood_fence", "acesbs:lemonwood_fence_gate", + "acesbs:lemonwood_door", + "acesbs:lemonwood_button", + "acesbs:lemonwood_pressure_plate", + "acesbs:lemonwood_slab", + "acesbs:lemonwood_stairs", + "acesbs:lemonwood_trapdoor", + "acesbs:lemonwood_log", + "acesbs:stripped_lemonwood_log", + "acesbs:lemonwood_wood", + "acesbs:stripped_lemonwood_wood", "acesbs:fire_oak_planks", "acesbs:fire_oak_wall", "acesbs:fire_oak_fence", "acesbs:fire_oak_fence_gate", + "acesbs:fire_oak_door", + "acesbs:fire_oak_button", + "acesbs:fire_oak_pressure_plate", + "acesbs:fire_oak_slab", + "acesbs:fire_oak_stairs", + "acesbs:fire_oak_trapdoor", + "acesbs:fire_oak_log", + "acesbs:stripped_fire_oak_log", + "acesbs:fire_oak_wood", + "acesbs:stripped_fire_oak_wood", "acesbs:lizard_planks", "acesbs:lizard_button" ] diff --git a/src/main/generated/data/minecraft/tags/item/shovels.json b/src/main/generated/data/minecraft/tags/item/shovels.json index 83d2ad3..da7496f 100644 --- a/src/main/generated/data/minecraft/tags/item/shovels.json +++ b/src/main/generated/data/minecraft/tags/item/shovels.json @@ -1,7 +1,7 @@ { "values": [ "acesbs:prisma_steel_shovel", - "acesbs:ashen_steel_pickaxe", + "acesbs:ashen_steel_shovel", "acesbs:fractal_diamond_shovel", "acesbs:hellfire_diamond_shovel" ] diff --git a/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md b/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md index d4f7c2b..84840c2 100644 --- a/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md +++ b/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md @@ -2,20 +2,28 @@ ## Additions - Ashen Smithing Template can be found in Nether Fortress Chests - Prisma Smithing Templates can be given by Armorers as a Hero of the Village Gift. +- Ashen and Prisma Smithing Templates can be duplicated like other templates. - Hammers are now included in the pickaxe item tag. (aka, to other mods they will be considered a type of pickaxe) - Fire Oak Trees and associated wood blocks. Obtainable by placing an oak sapling and infernal ashes in an Entropic Entangler - Leaf Litter for both Lemonwood and the new Fire Oak leaf types. - Fractal Diamonds can now be obtained by placing a diamond and stable entropy into an entropic entangler. They can be used to craft tools and armor. They have the same effect as Prisma Steel and drop additional ores when mining. - Hellfire Diamonds can now be obtained by placing a diamond and infernal ashes into an entropic entangler. They can be used to craft tools and armor. They automatically smelt items that are smeltable. (Ex: Ores->ingots, logs->charcoal, sand->glass). - Bag of Holding which acts as a portable double chest. +- Green Bricks (Useless) can be obtained by placing a brick in an Entropic Eviscerator. Though, this is pointless as green bricks are useless. +- Kaupen Bow can be obtained by placing a bow in an Entropic Evicerator. It functions the same as a normal bow but is a nice reference to the YT Channel that taught me modding. - More Advancements! ## Fixes - Blocks of Ashen Steel now have a recipe and drop when mined. Not sure how I missed that one. - Hammers are now enchantable and are compatible with pickaxe enchantments. +- The Ashen Steel Pickaxe is no longer considered a shovel, and the Ashen Steel Shovel now IS correctly considered a shovel. - Lemonwood Sapling renders as an item now, rather than a block - Lemonwood Trapdoors face the correct direction +- Lemonwood Logs now break at the correct speed. +- Lemonwood logs, stripped logs, wood, stripped wood, doors, trapdoors, pressure plates, buttons, stairs and slabs now all are assigned a correct tool (axe). Kinda embarrassing that I forgot to do that for 10/14 of the Lemonwood Blocks (And Fire Oak, but I fixed it before you noticed >:D ). +- The crafting recipe for Lemonwood walls no longer conflict with the recipe for Lemonwood Trapdoors. ## Changes - Lemonwood saplings are now obtained through an Entropic Entangler recipe (Stable Entropy + Birch Sapling) +- Bricked Up are now obtained through an Entropic Entangler recipe (Stable Endtropy + Brick) - Ashen Steel tools now automatically smelt items that can be smeltable. (Ex: Ores->ingots, logs->charcoal, sand->glass) - Durability calculations have changed to reflect the material's rarity. - Tools have the mining level of the base material with the durability of the next tier. diff --git a/src/main/java/com/acethewildfire/acesbs/block/FireOakBlocks.java b/src/main/java/com/acethewildfire/acesbs/block/FireOakBlocks.java index 9757185..939fc3c 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/FireOakBlocks.java +++ b/src/main/java/com/acethewildfire/acesbs/block/FireOakBlocks.java @@ -10,7 +10,7 @@ import net.minecraft.sound.BlockSoundGroup; public class FireOakBlocks { public static final Block FIRE_OAK_LOG = ModBlocks.registerBlock("fire_oak_log", - properties -> new PillarBlock(properties.mapColor(MapColor.DARK_RED).sounds(BlockSoundGroup.WOOD))); + properties -> new PillarBlock(properties.mapColor(MapColor.DARK_RED).strength(2.0F).sounds(BlockSoundGroup.WOOD))); public static final Block FIRE_OAK_WOOD = ModBlocks.registerBlock("fire_oak_wood", properties -> new PillarBlock(properties.mapColor(MapColor.DARK_RED).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD))); public static final Block STRIPPED_FIRE_OAK_LOG = ModBlocks.registerBlock("stripped_fire_oak_log", diff --git a/src/main/java/com/acethewildfire/acesbs/block/LemonWoodBlocks.java b/src/main/java/com/acethewildfire/acesbs/block/LemonWoodBlocks.java index 85ec0fb..2d6b551 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/LemonWoodBlocks.java +++ b/src/main/java/com/acethewildfire/acesbs/block/LemonWoodBlocks.java @@ -10,7 +10,7 @@ import net.minecraft.sound.BlockSoundGroup; public class LemonWoodBlocks { public static final Block LEMONWOOD_LOG = ModBlocks.registerBlock("lemonwood_log", - properties -> new PillarBlock(properties.mapColor(MapColor.PALE_YELLOW).sounds(BlockSoundGroup.WOOD))); + properties -> new PillarBlock(properties.mapColor(MapColor.PALE_YELLOW).strength(2.0F).sounds(BlockSoundGroup.WOOD))); public static final Block LEMONWOOD_WOOD = ModBlocks.registerBlock("lemonwood_wood", properties -> new PillarBlock(properties.mapColor(MapColor.PALE_YELLOW).instrument(NoteBlockInstrument.BASS).strength(2.0F).sounds(BlockSoundGroup.WOOD).burnable())); public static final Block STRIPPED_LEMONWOOD_LOG = ModBlocks.registerBlock("stripped_lemonwood_log", diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java index ec978d9..c65b2bc 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java @@ -61,10 +61,30 @@ public class ModBlockTagProvider extends FabricTagProvider.BlockTagProvider { .add(LemonWoodBlocks.LEMONWOOD_WALL) .add(LemonWoodBlocks.LEMONWOOD_FENCE) .add(LemonWoodBlocks.LEMONWOOD_FENCE_GATE) + .add(LemonWoodBlocks.LEMONWOOD_DOOR) + .add(LemonWoodBlocks.LEMONWOOD_BUTTON) + .add(LemonWoodBlocks.LEMONWOOD_PRESSURE_PLATE) + .add(LemonWoodBlocks.LEMONWOOD_SLAB) + .add(LemonWoodBlocks.LEMONWOOD_STAIRS) + .add(LemonWoodBlocks.LEMONWOOD_TRAPDOOR) + .add(LemonWoodBlocks.LEMONWOOD_LOG) + .add(LemonWoodBlocks.STRIPPED_LEMONWOOD_LOG) + .add(LemonWoodBlocks.LEMONWOOD_WOOD) + .add(LemonWoodBlocks.STRIPPED_LEMONWOOD_WOOD) .add(FireOakBlocks.FIRE_OAK_PLANKS) .add(FireOakBlocks.FIRE_OAK_WALL) .add(FireOakBlocks.FIRE_OAK_FENCE) .add(FireOakBlocks.FIRE_OAK_FENCE_GATE) + .add(FireOakBlocks.FIRE_OAK_DOOR) + .add(FireOakBlocks.FIRE_OAK_BUTTON) + .add(FireOakBlocks.FIRE_OAK_PRESSURE_PLATE) + .add(FireOakBlocks.FIRE_OAK_SLAB) + .add(FireOakBlocks.FIRE_OAK_STAIRS) + .add(FireOakBlocks.FIRE_OAK_TRAPDOOR) + .add(FireOakBlocks.FIRE_OAK_LOG) + .add(FireOakBlocks.STRIPPED_FIRE_OAK_LOG) + .add(FireOakBlocks.FIRE_OAK_WOOD) + .add(FireOakBlocks.STRIPPED_FIRE_OAK_WOOD) .add(ModBlocks.LIZARD_PLANKS) .add(ModBlocks.LIZARD_BUTTON); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java index ce8686a..6e88d91 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java @@ -84,7 +84,7 @@ public class ModItemTagProvider extends FabricTagProvider.ItemTagProvider { valueLookupBuilder(ItemTags.SHOVELS) .add(PrismaSteelItems.PRISMA_STEEL_SHOVEL) - .add(AshenSteelItems.ASHEN_STEEL_PICKAXE) + .add(AshenSteelItems.ASHEN_STEEL_SHOVEL) .add(FractalDiamondItems.FRACTAL_DIAMOND_SHOVEL) .add(HellfireDiamondItems.HELLFIRE_DIAMOND_SHOVEL); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java index 7074f02..ad931c2 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java @@ -20,6 +20,8 @@ import net.minecraft.recipe.book.RecipeCategory; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.ItemTags; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; @@ -119,12 +121,32 @@ public class ModRecipeProvider extends FabricRecipeProvider { .criterion(hasItem(ModItems.INFERNAL_ASHES), conditionsFromItem(ModItems.INFERNAL_ASHES)) .offerTo(recipeExporter); - createShapeless(RecipeCategory.FOOD, ModItems.BRICKED_UP, 1) - .input(Items.BRICK, 1) - .input(ModItems.STABLE_ENDTROPY, 1) - .criterion(hasItem(ModItems.STABLE_ENDTROPY), conditionsFromItem(ModItems.STABLE_ENDTROPY)) + createShaped(RecipeCategory.MISC, PrismaSteelItems.PRISMA_SMITHING_TEMPLATE, 2) + .pattern("DTD") + .pattern("DMD") + .pattern("DDD") + .input('M', PrismaSteelItems.PRISMA_STEEL) + .input('D', Items.DIAMOND) + .input('T', PrismaSteelItems.PRISMA_SMITHING_TEMPLATE) + .criterion(hasItem(PrismaSteelItems.PRISMA_SMITHING_TEMPLATE), conditionsFromItem(PrismaSteelItems.PRISMA_SMITHING_TEMPLATE)) .offerTo(recipeExporter); + createShaped(RecipeCategory.MISC, AshenSteelItems.ASHEN_SMITHING_TEMPLATE, 2) + .pattern("DTD") + .pattern("DMD") + .pattern("DDD") + .input('M', AshenSteelItems.ASHEN_STEEL) + .input('D', Items.DIAMOND) + .input('T', AshenSteelItems.ASHEN_SMITHING_TEMPLATE) + .criterion(hasItem(AshenSteelItems.ASHEN_SMITHING_TEMPLATE), conditionsFromItem(AshenSteelItems.ASHEN_SMITHING_TEMPLATE)) + .offerTo(recipeExporter); + +// createShapeless(RecipeCategory.FOOD, ModItems.BRICKED_UP, 1) +// .input(Items.BRICK, 1) +// .input(ModItems.STABLE_ENDTROPY, 1) +// .criterion(hasItem(ModItems.STABLE_ENDTROPY), conditionsFromItem(ModItems.STABLE_ENDTROPY)) +// .offerTo(recipeExporter); + createShapeless(RecipeCategory.FOOD, ModItems.CIGARETTE, 1) .input(Items.PAPER, 1) .input(ModItems.TOBACCO, 1) @@ -281,7 +303,15 @@ public class ModRecipeProvider extends FabricRecipeProvider { createFenceGateRecipe(LemonWoodBlocks.LEMONWOOD_FENCE_GATE, Ingredient.ofItems(LemonWoodBlocks.LEMONWOOD_PLANKS)) .criterion(hasItem(LemonWoodBlocks.LEMONWOOD_PLANKS), conditionsFromItem(LemonWoodBlocks.LEMONWOOD_PLANKS)) .offerTo(recipeExporter); - offerWallRecipe(RecipeCategory.BUILDING_BLOCKS, LemonWoodBlocks.LEMONWOOD_WALL, LemonWoodBlocks.LEMONWOOD_PLANKS); +// offerWallRecipe(RecipeCategory.BUILDING_BLOCKS, LemonWoodBlocks.LEMONWOOD_WALL, LemonWoodBlocks.LEMONWOOD_PLANKS); + createShaped(RecipeCategory.BUILDING_BLOCKS, LemonWoodBlocks.LEMONWOOD_WALL, 3) + .pattern("###") + .pattern("WWW") + .pattern(" ") + .input('#', LemonWoodBlocks.LEMONWOOD_PLANKS) + .input('W', ItemTags.WALLS) + .criterion(hasItem(LemonWoodBlocks.LEMONWOOD_PLANKS), conditionsFromItem(LemonWoodBlocks.LEMONWOOD_PLANKS)) + .offerTo(recipeExporter); createDoorRecipe(LemonWoodBlocks.LEMONWOOD_DOOR, Ingredient.ofItems(LemonWoodBlocks.LEMONWOOD_PLANKS)) .criterion(hasItem(LemonWoodBlocks.LEMONWOOD_PLANKS), conditionsFromItem(LemonWoodBlocks.LEMONWOOD_PLANKS)) @@ -348,7 +378,15 @@ public class ModRecipeProvider extends FabricRecipeProvider { createFenceGateRecipe(FireOakBlocks.FIRE_OAK_FENCE_GATE, Ingredient.ofItems(FireOakBlocks.FIRE_OAK_PLANKS)) .criterion(hasItem(FireOakBlocks.FIRE_OAK_PLANKS), conditionsFromItem(FireOakBlocks.FIRE_OAK_PLANKS)) .offerTo(recipeExporter); - offerWallRecipe(RecipeCategory.BUILDING_BLOCKS, FireOakBlocks.FIRE_OAK_WALL, FireOakBlocks.FIRE_OAK_PLANKS); +// offerWallRecipe(RecipeCategory.BUILDING_BLOCKS, FireOakBlocks.FIRE_OAK_WALL, FireOakBlocks.FIRE_OAK_PLANKS); + createShaped(RecipeCategory.BUILDING_BLOCKS, FireOakBlocks.FIRE_OAK_WALL, 3) + .pattern("###") + .pattern("WWW") + .pattern(" ") + .input('#', FireOakBlocks.FIRE_OAK_PLANKS) + .input('W', ItemTags.WALLS) + .criterion(hasItem(FireOakBlocks.FIRE_OAK_PLANKS), conditionsFromItem(FireOakBlocks.FIRE_OAK_PLANKS)) + .offerTo(recipeExporter); createDoorRecipe(FireOakBlocks.FIRE_OAK_DOOR, Ingredient.ofItems(FireOakBlocks.FIRE_OAK_PLANKS)) .criterion(hasItem(FireOakBlocks.FIRE_OAK_PLANKS), conditionsFromItem(FireOakBlocks.FIRE_OAK_PLANKS)) @@ -371,6 +409,20 @@ public class ModRecipeProvider extends FabricRecipeProvider { ShovelRecipeJsonBuilder(recipeExporter, AshenSteelItems.ASHEN_STEEL_SHOVEL, AshenSteelItems.ASHEN_STEEL, Items.STICK, AshenSteelItems.ASHEN_STEEL); HoeRecipeJsonBuilder(recipeExporter, AshenSteelItems.ASHEN_STEEL_HOE, AshenSteelItems.ASHEN_STEEL, Items.STICK, AshenSteelItems.ASHEN_STEEL); + SwordRecipeJsonBuilder(recipeExporter, FractalDiamondItems.FRACTAL_DIAMOND_SWORD, FractalDiamondItems.FRACTAL_DIAMOND, Items.STICK, FractalDiamondItems.FRACTAL_DIAMOND); + PickaxeRecipeJsonBuilder(recipeExporter, FractalDiamondItems.FRACTAL_DIAMOND_PICKAXE, FractalDiamondItems.FRACTAL_DIAMOND, Items.STICK, FractalDiamondItems.FRACTAL_DIAMOND); + HammerRecipeJsonBuilder(recipeExporter, FractalDiamondItems.FRACTAL_DIAMOND_HAMMER, FractalDiamondItems.FRACTAL_DIAMOND, ModBlocks.FRACTAL_DIAMOND_BLOCK, Items.STICK, FractalDiamondItems.FRACTAL_DIAMOND); + AxeRecipeJsonBuilder(recipeExporter, FractalDiamondItems.FRACTAL_DIAMOND_AXE, FractalDiamondItems.FRACTAL_DIAMOND, Items.STICK, FractalDiamondItems.FRACTAL_DIAMOND); + ShovelRecipeJsonBuilder(recipeExporter, FractalDiamondItems.FRACTAL_DIAMOND_SHOVEL, FractalDiamondItems.FRACTAL_DIAMOND, Items.STICK, FractalDiamondItems.FRACTAL_DIAMOND); + HoeRecipeJsonBuilder(recipeExporter, FractalDiamondItems.FRACTAL_DIAMOND_HOE, FractalDiamondItems.FRACTAL_DIAMOND, Items.STICK, FractalDiamondItems.FRACTAL_DIAMOND); + + SwordRecipeJsonBuilder(recipeExporter, HellfireDiamondItems.HELLFIRE_DIAMOND_SWORD, HellfireDiamondItems.HELLFIRE_DIAMOND, Items.STICK, HellfireDiamondItems.HELLFIRE_DIAMOND); + PickaxeRecipeJsonBuilder(recipeExporter, HellfireDiamondItems.HELLFIRE_DIAMOND_PICKAXE, HellfireDiamondItems.HELLFIRE_DIAMOND, Items.STICK, HellfireDiamondItems.HELLFIRE_DIAMOND); + HammerRecipeJsonBuilder(recipeExporter, HellfireDiamondItems.HELLFIRE_DIAMOND_HAMMER, HellfireDiamondItems.HELLFIRE_DIAMOND, ModBlocks.HELLFIRE_DIAMOND_BLOCK, Items.STICK, HellfireDiamondItems.HELLFIRE_DIAMOND); + AxeRecipeJsonBuilder(recipeExporter, HellfireDiamondItems.HELLFIRE_DIAMOND_AXE, HellfireDiamondItems.HELLFIRE_DIAMOND, Items.STICK, HellfireDiamondItems.HELLFIRE_DIAMOND); + ShovelRecipeJsonBuilder(recipeExporter, HellfireDiamondItems.HELLFIRE_DIAMOND_SHOVEL, HellfireDiamondItems.HELLFIRE_DIAMOND, Items.STICK, HellfireDiamondItems.HELLFIRE_DIAMOND); + HoeRecipeJsonBuilder(recipeExporter, HellfireDiamondItems.HELLFIRE_DIAMOND_HOE, HellfireDiamondItems.HELLFIRE_DIAMOND, Items.STICK, HellfireDiamondItems.HELLFIRE_DIAMOND); + ModArmorRecipeJsonBuilder(recipeExporter, PrismaSteelItems.PRISMA_STEEL_HELMET, PrismaSteelItems.PRISMA_STEEL_CHESTPLATE, PrismaSteelItems.PRISMA_STEEL_LEGGINGS, PrismaSteelItems.PRISMA_STEEL_BOOTS, PrismaSteelItems.PRISMA_STEEL, PrismaSteelItems.PRISMA_STEEL); ModArmorRecipeJsonBuilder(recipeExporter, AshenSteelItems.ASHEN_STEEL_HELMET, AshenSteelItems.ASHEN_STEEL_CHESTPLATE, AshenSteelItems.ASHEN_STEEL_LEGGINGS, AshenSteelItems.ASHEN_STEEL_BOOTS, AshenSteelItems.ASHEN_STEEL, AshenSteelItems.ASHEN_STEEL); ModArmorRecipeJsonBuilder(recipeExporter, FractalDiamondItems.FRACTAL_DIAMOND_HELMET, FractalDiamondItems.FRACTAL_DIAMOND_CHESTPLATE, FractalDiamondItems.FRACTAL_DIAMOND_LEGGINGS, FractalDiamondItems.FRACTAL_DIAMOND_BOOTS, FractalDiamondItems.FRACTAL_DIAMOND, FractalDiamondItems.FRACTAL_DIAMOND); diff --git a/src/main/resources/data/acesbs/recipe/green_bricks_from_entropic_eviscerator.json b/src/main/resources/data/acesbs/recipe/green_bricks_from_entropic_eviscerator.json new file mode 100644 index 0000000..410c387 --- /dev/null +++ b/src/main/resources/data/acesbs/recipe/green_bricks_from_entropic_eviscerator.json @@ -0,0 +1,8 @@ +{ + "type": "acesbs:entropic_eviscerator", + "ingredient": "minecraft:brick", + "result": { + "count": 1, + "id": "acesbs:green_bricks" + } +} \ No newline at end of file diff --git a/src/main/resources/data/acesbs/recipe/kaupen_bow_from_entropic_eviscerator.json b/src/main/resources/data/acesbs/recipe/kaupen_bow_from_entropic_eviscerator.json new file mode 100644 index 0000000..d89c6e2 --- /dev/null +++ b/src/main/resources/data/acesbs/recipe/kaupen_bow_from_entropic_eviscerator.json @@ -0,0 +1,8 @@ +{ + "type": "acesbs:entropic_eviscerator", + "ingredient": "minecraft:bow", + "result": { + "count": 1, + "id": "acesbs:kaupen_bow" + } +} \ No newline at end of file