diff --git a/src/main/generated/assets/acesbs/blockstates/ashen_steel_block.json b/src/main/generated/assets/acesbs/blockstates/ashen_steel_block.json new file mode 100644 index 0000000..2fb2eb0 --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/ashen_steel_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "acesbs:block/ashen_steel_block" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/ashen_steel_block.json b/src/main/generated/assets/acesbs/models/block/ashen_steel_block.json new file mode 100644 index 0000000..89071bb --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/ashen_steel_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "acesbs:block/ashen_steel_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_armor_trim_smithing_template.json b/src/main/generated/assets/acesbs/models/item/ashen_armor_trim_smithing_template.json new file mode 100644 index 0000000..7232e1c --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_armor_trim_smithing_template.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_armor_trim_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel.json b/src/main/generated/assets/acesbs/models/item/ashen_steel.json new file mode 100644 index 0000000..68497e5 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_axe.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_axe.json new file mode 100644 index 0000000..1c4eb7d --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "acesbs:item/ashen_steel_axe" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_block.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_block.json new file mode 100644 index 0000000..5f6a5b5 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_block.json @@ -0,0 +1,3 @@ +{ + "parent": "acesbs:block/ashen_steel_block" +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_boots.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots.json new file mode 100644 index 0000000..fabeee4 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots.json @@ -0,0 +1,68 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "acesbs:item/ashen_steel_boots_quartz_trim", + "predicate": { + "trim_type": 0.1 + } + }, + { + "model": "acesbs:item/ashen_steel_boots_iron_trim", + "predicate": { + "trim_type": 0.2 + } + }, + { + "model": "acesbs:item/ashen_steel_boots_netherite_trim", + "predicate": { + "trim_type": 0.3 + } + }, + { + "model": "acesbs:item/ashen_steel_boots_redstone_trim", + "predicate": { + "trim_type": 0.4 + } + }, + { + "model": "acesbs:item/ashen_steel_boots_copper_trim", + "predicate": { + "trim_type": 0.5 + } + }, + { + "model": "acesbs:item/ashen_steel_boots_gold_trim", + "predicate": { + "trim_type": 0.6 + } + }, + { + "model": "acesbs:item/ashen_steel_boots_emerald_trim", + "predicate": { + "trim_type": 0.7 + } + }, + { + "model": "acesbs:item/ashen_steel_boots_diamond_trim", + "predicate": { + "trim_type": 0.8 + } + }, + { + "model": "acesbs:item/ashen_steel_boots_lapis_trim", + "predicate": { + "trim_type": 0.9 + } + }, + { + "model": "acesbs:item/ashen_steel_boots_amethyst_trim", + "predicate": { + "trim_type": 1.0 + } + } + ], + "textures": { + "layer0": "acesbs:item/ashen_steel_boots" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_amethyst_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_amethyst_trim.json new file mode 100644 index 0000000..5174c3c --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_boots", + "layer1": "minecraft:trims/items/boots_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_copper_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_copper_trim.json new file mode 100644 index 0000000..db15efd --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_boots", + "layer1": "minecraft:trims/items/boots_trim_copper" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_diamond_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_diamond_trim.json new file mode 100644 index 0000000..2b67a4d --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_boots", + "layer1": "minecraft:trims/items/boots_trim_diamond" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_emerald_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_emerald_trim.json new file mode 100644 index 0000000..b075a73 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_boots", + "layer1": "minecraft:trims/items/boots_trim_emerald" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_gold_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_gold_trim.json new file mode 100644 index 0000000..9ca625d --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_boots", + "layer1": "minecraft:trims/items/boots_trim_gold" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_iron_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_iron_trim.json new file mode 100644 index 0000000..b785580 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_boots", + "layer1": "minecraft:trims/items/boots_trim_iron" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_lapis_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_lapis_trim.json new file mode 100644 index 0000000..51b4131 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_boots", + "layer1": "minecraft:trims/items/boots_trim_lapis" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_netherite_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_netherite_trim.json new file mode 100644 index 0000000..a5e16cb --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_boots", + "layer1": "minecraft:trims/items/boots_trim_netherite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_quartz_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_quartz_trim.json new file mode 100644 index 0000000..22b847f --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_boots", + "layer1": "minecraft:trims/items/boots_trim_quartz" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_redstone_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_redstone_trim.json new file mode 100644 index 0000000..dd88106 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_boots", + "layer1": "minecraft:trims/items/boots_trim_redstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate.json new file mode 100644 index 0000000..dd471b0 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate.json @@ -0,0 +1,68 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "acesbs:item/ashen_steel_chestplate_quartz_trim", + "predicate": { + "trim_type": 0.1 + } + }, + { + "model": "acesbs:item/ashen_steel_chestplate_iron_trim", + "predicate": { + "trim_type": 0.2 + } + }, + { + "model": "acesbs:item/ashen_steel_chestplate_netherite_trim", + "predicate": { + "trim_type": 0.3 + } + }, + { + "model": "acesbs:item/ashen_steel_chestplate_redstone_trim", + "predicate": { + "trim_type": 0.4 + } + }, + { + "model": "acesbs:item/ashen_steel_chestplate_copper_trim", + "predicate": { + "trim_type": 0.5 + } + }, + { + "model": "acesbs:item/ashen_steel_chestplate_gold_trim", + "predicate": { + "trim_type": 0.6 + } + }, + { + "model": "acesbs:item/ashen_steel_chestplate_emerald_trim", + "predicate": { + "trim_type": 0.7 + } + }, + { + "model": "acesbs:item/ashen_steel_chestplate_diamond_trim", + "predicate": { + "trim_type": 0.8 + } + }, + { + "model": "acesbs:item/ashen_steel_chestplate_lapis_trim", + "predicate": { + "trim_type": 0.9 + } + }, + { + "model": "acesbs:item/ashen_steel_chestplate_amethyst_trim", + "predicate": { + "trim_type": 1.0 + } + } + ], + "textures": { + "layer0": "acesbs:item/ashen_steel_chestplate" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_amethyst_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_amethyst_trim.json new file mode 100644 index 0000000..c1fe38d --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_copper_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_copper_trim.json new file mode 100644 index 0000000..9e6f9b4 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_copper" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_diamond_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_diamond_trim.json new file mode 100644 index 0000000..7a8df5e --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_diamond" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_emerald_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_emerald_trim.json new file mode 100644 index 0000000..e3c69c6 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_emerald" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_gold_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_gold_trim.json new file mode 100644 index 0000000..362cfcb --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_gold" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_iron_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_iron_trim.json new file mode 100644 index 0000000..fc96471 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_iron" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_lapis_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_lapis_trim.json new file mode 100644 index 0000000..2bc157e --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_lapis" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_netherite_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_netherite_trim.json new file mode 100644 index 0000000..8f30277 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_netherite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_quartz_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_quartz_trim.json new file mode 100644 index 0000000..c440594 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_quartz" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_redstone_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_redstone_trim.json new file mode 100644 index 0000000..b6af9ba --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_redstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_hammer.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_hammer.json new file mode 100644 index 0000000..f0558d0 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_hammer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "acesbs:item/ashen_steel_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet.json new file mode 100644 index 0000000..4669cd8 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet.json @@ -0,0 +1,68 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "acesbs:item/ashen_steel_helmet_quartz_trim", + "predicate": { + "trim_type": 0.1 + } + }, + { + "model": "acesbs:item/ashen_steel_helmet_iron_trim", + "predicate": { + "trim_type": 0.2 + } + }, + { + "model": "acesbs:item/ashen_steel_helmet_netherite_trim", + "predicate": { + "trim_type": 0.3 + } + }, + { + "model": "acesbs:item/ashen_steel_helmet_redstone_trim", + "predicate": { + "trim_type": 0.4 + } + }, + { + "model": "acesbs:item/ashen_steel_helmet_copper_trim", + "predicate": { + "trim_type": 0.5 + } + }, + { + "model": "acesbs:item/ashen_steel_helmet_gold_trim", + "predicate": { + "trim_type": 0.6 + } + }, + { + "model": "acesbs:item/ashen_steel_helmet_emerald_trim", + "predicate": { + "trim_type": 0.7 + } + }, + { + "model": "acesbs:item/ashen_steel_helmet_diamond_trim", + "predicate": { + "trim_type": 0.8 + } + }, + { + "model": "acesbs:item/ashen_steel_helmet_lapis_trim", + "predicate": { + "trim_type": 0.9 + } + }, + { + "model": "acesbs:item/ashen_steel_helmet_amethyst_trim", + "predicate": { + "trim_type": 1.0 + } + } + ], + "textures": { + "layer0": "acesbs:item/ashen_steel_helmet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_amethyst_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_amethyst_trim.json new file mode 100644 index 0000000..366cec3 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_helmet", + "layer1": "minecraft:trims/items/helmet_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_copper_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_copper_trim.json new file mode 100644 index 0000000..d99001b --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_helmet", + "layer1": "minecraft:trims/items/helmet_trim_copper" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_diamond_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_diamond_trim.json new file mode 100644 index 0000000..8fa6330 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_helmet", + "layer1": "minecraft:trims/items/helmet_trim_diamond" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_emerald_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_emerald_trim.json new file mode 100644 index 0000000..5df0410 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_helmet", + "layer1": "minecraft:trims/items/helmet_trim_emerald" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_gold_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_gold_trim.json new file mode 100644 index 0000000..24658db --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_helmet", + "layer1": "minecraft:trims/items/helmet_trim_gold" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_iron_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_iron_trim.json new file mode 100644 index 0000000..de12809 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_helmet", + "layer1": "minecraft:trims/items/helmet_trim_iron" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_lapis_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_lapis_trim.json new file mode 100644 index 0000000..48d4a0b --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_helmet", + "layer1": "minecraft:trims/items/helmet_trim_lapis" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_netherite_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_netherite_trim.json new file mode 100644 index 0000000..972f6c1 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_helmet", + "layer1": "minecraft:trims/items/helmet_trim_netherite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_quartz_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_quartz_trim.json new file mode 100644 index 0000000..89925f7 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_helmet", + "layer1": "minecraft:trims/items/helmet_trim_quartz" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_redstone_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_redstone_trim.json new file mode 100644 index 0000000..0cc482b --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_helmet", + "layer1": "minecraft:trims/items/helmet_trim_redstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_hoe.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_hoe.json new file mode 100644 index 0000000..012bc32 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "acesbs:item/ashen_steel_hoe" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings.json new file mode 100644 index 0000000..b9e9fbb --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings.json @@ -0,0 +1,68 @@ +{ + "parent": "minecraft:item/generated", + "overrides": [ + { + "model": "acesbs:item/ashen_steel_leggings_quartz_trim", + "predicate": { + "trim_type": 0.1 + } + }, + { + "model": "acesbs:item/ashen_steel_leggings_iron_trim", + "predicate": { + "trim_type": 0.2 + } + }, + { + "model": "acesbs:item/ashen_steel_leggings_netherite_trim", + "predicate": { + "trim_type": 0.3 + } + }, + { + "model": "acesbs:item/ashen_steel_leggings_redstone_trim", + "predicate": { + "trim_type": 0.4 + } + }, + { + "model": "acesbs:item/ashen_steel_leggings_copper_trim", + "predicate": { + "trim_type": 0.5 + } + }, + { + "model": "acesbs:item/ashen_steel_leggings_gold_trim", + "predicate": { + "trim_type": 0.6 + } + }, + { + "model": "acesbs:item/ashen_steel_leggings_emerald_trim", + "predicate": { + "trim_type": 0.7 + } + }, + { + "model": "acesbs:item/ashen_steel_leggings_diamond_trim", + "predicate": { + "trim_type": 0.8 + } + }, + { + "model": "acesbs:item/ashen_steel_leggings_lapis_trim", + "predicate": { + "trim_type": 0.9 + } + }, + { + "model": "acesbs:item/ashen_steel_leggings_amethyst_trim", + "predicate": { + "trim_type": 1.0 + } + } + ], + "textures": { + "layer0": "acesbs:item/ashen_steel_leggings" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_amethyst_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_amethyst_trim.json new file mode 100644 index 0000000..b9d1d61 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_leggings", + "layer1": "minecraft:trims/items/leggings_trim_amethyst" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_copper_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_copper_trim.json new file mode 100644 index 0000000..26f3a68 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_leggings", + "layer1": "minecraft:trims/items/leggings_trim_copper" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_diamond_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_diamond_trim.json new file mode 100644 index 0000000..a785942 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_leggings", + "layer1": "minecraft:trims/items/leggings_trim_diamond" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_emerald_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_emerald_trim.json new file mode 100644 index 0000000..3ca77bf --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_leggings", + "layer1": "minecraft:trims/items/leggings_trim_emerald" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_gold_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_gold_trim.json new file mode 100644 index 0000000..b59276c --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_leggings", + "layer1": "minecraft:trims/items/leggings_trim_gold" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_iron_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_iron_trim.json new file mode 100644 index 0000000..609f36d --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_leggings", + "layer1": "minecraft:trims/items/leggings_trim_iron" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_lapis_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_lapis_trim.json new file mode 100644 index 0000000..d1bf944 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_leggings", + "layer1": "minecraft:trims/items/leggings_trim_lapis" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_netherite_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_netherite_trim.json new file mode 100644 index 0000000..2ed9abe --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_leggings", + "layer1": "minecraft:trims/items/leggings_trim_netherite" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_quartz_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_quartz_trim.json new file mode 100644 index 0000000..b8a662c --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_leggings", + "layer1": "minecraft:trims/items/leggings_trim_quartz" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_redstone_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_redstone_trim.json new file mode 100644 index 0000000..9d13c22 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_leggings", + "layer1": "minecraft:trims/items/leggings_trim_redstone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_pickaxe.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_pickaxe.json new file mode 100644 index 0000000..3bbb85d --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "acesbs:item/ashen_steel_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_shovel.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_shovel.json new file mode 100644 index 0000000..22e16a9 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "acesbs:item/ashen_steel_shovel" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_sword.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_sword.json new file mode 100644 index 0000000..ac4eb18 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "acesbs:item/ashen_steel_sword" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/thot_begone.json b/src/main/generated/assets/acesbs/models/item/thot_begone.json new file mode 100644 index 0000000..9213357 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/thot_begone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "acesbs:item/thot_begone" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/combat/ashen_steel_boots.json b/src/main/generated/data/acesbs/advancement/recipes/combat/ashen_steel_boots.json new file mode 100644 index 0000000..f001740 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/combat/ashen_steel_boots.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ashen_steel": { + "conditions": { + "items": [ + { + "items": "acesbs:ashen_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:ashen_steel_boots" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ashen_steel" + ] + ], + "rewards": { + "recipes": [ + "acesbs:ashen_steel_boots" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/combat/ashen_steel_chestplate.json b/src/main/generated/data/acesbs/advancement/recipes/combat/ashen_steel_chestplate.json new file mode 100644 index 0000000..01e79d8 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/combat/ashen_steel_chestplate.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ashen_steel": { + "conditions": { + "items": [ + { + "items": "acesbs:ashen_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:ashen_steel_chestplate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ashen_steel" + ] + ], + "rewards": { + "recipes": [ + "acesbs:ashen_steel_chestplate" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/combat/ashen_steel_helmet.json b/src/main/generated/data/acesbs/advancement/recipes/combat/ashen_steel_helmet.json new file mode 100644 index 0000000..958f80e --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/combat/ashen_steel_helmet.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ashen_steel": { + "conditions": { + "items": [ + { + "items": "acesbs:ashen_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:ashen_steel_helmet" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ashen_steel" + ] + ], + "rewards": { + "recipes": [ + "acesbs:ashen_steel_helmet" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/combat/ashen_steel_leggings.json b/src/main/generated/data/acesbs/advancement/recipes/combat/ashen_steel_leggings.json new file mode 100644 index 0000000..db010fa --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/combat/ashen_steel_leggings.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ashen_steel": { + "conditions": { + "items": [ + { + "items": "acesbs:ashen_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:ashen_steel_leggings" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ashen_steel" + ] + ], + "rewards": { + "recipes": [ + "acesbs:ashen_steel_leggings" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/combat/ashen_steel_sword.json b/src/main/generated/data/acesbs/advancement/recipes/combat/ashen_steel_sword.json new file mode 100644 index 0000000..06992d1 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/combat/ashen_steel_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ashen_steel": { + "conditions": { + "items": [ + { + "items": "acesbs:ashen_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:ashen_steel_sword" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ashen_steel" + ] + ], + "rewards": { + "recipes": [ + "acesbs:ashen_steel_sword" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/combat/prisma_steel_boots.json b/src/main/generated/data/acesbs/advancement/recipes/combat/prisma_steel_boots.json new file mode 100644 index 0000000..190d217 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/combat/prisma_steel_boots.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_prisma_steel": { + "conditions": { + "items": [ + { + "items": "acesbs:prisma_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:prisma_steel_boots" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_prisma_steel" + ] + ], + "rewards": { + "recipes": [ + "acesbs:prisma_steel_boots" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/combat/prisma_steel_chestplate.json b/src/main/generated/data/acesbs/advancement/recipes/combat/prisma_steel_chestplate.json new file mode 100644 index 0000000..6ac219d --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/combat/prisma_steel_chestplate.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_prisma_steel": { + "conditions": { + "items": [ + { + "items": "acesbs:prisma_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:prisma_steel_chestplate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_prisma_steel" + ] + ], + "rewards": { + "recipes": [ + "acesbs:prisma_steel_chestplate" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/combat/prisma_steel_helmet.json b/src/main/generated/data/acesbs/advancement/recipes/combat/prisma_steel_helmet.json new file mode 100644 index 0000000..eff801b --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/combat/prisma_steel_helmet.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_prisma_steel": { + "conditions": { + "items": [ + { + "items": "acesbs:prisma_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:prisma_steel_helmet" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_prisma_steel" + ] + ], + "rewards": { + "recipes": [ + "acesbs:prisma_steel_helmet" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/combat/prisma_steel_leggings.json b/src/main/generated/data/acesbs/advancement/recipes/combat/prisma_steel_leggings.json new file mode 100644 index 0000000..38ea0b1 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/combat/prisma_steel_leggings.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_prisma_steel": { + "conditions": { + "items": [ + { + "items": "acesbs:prisma_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:prisma_steel_leggings" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_prisma_steel" + ] + ], + "rewards": { + "recipes": [ + "acesbs:prisma_steel_leggings" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/combat/thot_begone.json b/src/main/generated/data/acesbs/advancement/recipes/combat/thot_begone.json new file mode 100644 index 0000000..cff8f78 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/combat/thot_begone.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stick": { + "conditions": { + "items": [ + { + "items": "minecraft:stick" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:thot_begone" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_stick" + ] + ], + "rewards": { + "recipes": [ + "acesbs:thot_begone" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/misc/ashen.json b/src/main/generated/data/acesbs/advancement/recipes/misc/ashen.json new file mode 100644 index 0000000..c9d0137 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/misc/ashen.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_smithing_trim_template": { + "conditions": { + "items": [ + { + "items": "acesbs:ashen_armor_trim_smithing_template" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:ashen" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_smithing_trim_template" + ] + ], + "rewards": { + "recipes": [ + "acesbs:ashen" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/ashen_steel_hammer.json b/src/main/generated/data/acesbs/advancement/recipes/tools/ashen_steel_hammer.json new file mode 100644 index 0000000..614f1f1 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/ashen_steel_hammer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ashen_steel": { + "conditions": { + "items": [ + { + "items": "acesbs:ashen_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:ashen_steel_hammer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ashen_steel" + ] + ], + "rewards": { + "recipes": [ + "acesbs:ashen_steel_hammer" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/ashen_steel_pickaxe.json b/src/main/generated/data/acesbs/advancement/recipes/tools/ashen_steel_pickaxe.json new file mode 100644 index 0000000..3bdcc51 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/ashen_steel_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ashen_steel": { + "conditions": { + "items": [ + { + "items": "acesbs:ashen_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:ashen_steel_pickaxe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ashen_steel" + ] + ], + "rewards": { + "recipes": [ + "acesbs:ashen_steel_pickaxe" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/ashen_steel_shovel.json b/src/main/generated/data/acesbs/advancement/recipes/tools/ashen_steel_shovel.json new file mode 100644 index 0000000..24bb417 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/ashen_steel_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ashen_steel": { + "conditions": { + "items": [ + { + "items": "acesbs:ashen_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:ashen_steel_shovel" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ashen_steel" + ] + ], + "rewards": { + "recipes": [ + "acesbs:ashen_steel_shovel" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.ashen_steel_axe.left.json b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.ashen_steel_axe.left.json new file mode 100644 index 0000000..d0c9037 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.ashen_steel_axe.left.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ashen_steel": { + "conditions": { + "items": [ + { + "items": "acesbs:ashen_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:item.acesbs.ashen_steel_axe.left" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ashen_steel" + ] + ], + "rewards": { + "recipes": [ + "acesbs:item.acesbs.ashen_steel_axe.left" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.ashen_steel_axe.right.json b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.ashen_steel_axe.right.json new file mode 100644 index 0000000..816e7b6 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.ashen_steel_axe.right.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ashen_steel": { + "conditions": { + "items": [ + { + "items": "acesbs:ashen_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:item.acesbs.ashen_steel_axe.right" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ashen_steel" + ] + ], + "rewards": { + "recipes": [ + "acesbs:item.acesbs.ashen_steel_axe.right" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.ashen_steel_hoe.left.json b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.ashen_steel_hoe.left.json new file mode 100644 index 0000000..1bce3bb --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.ashen_steel_hoe.left.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ashen_steel": { + "conditions": { + "items": [ + { + "items": "acesbs:ashen_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:item.acesbs.ashen_steel_hoe.left" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ashen_steel" + ] + ], + "rewards": { + "recipes": [ + "acesbs:item.acesbs.ashen_steel_hoe.left" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.ashen_steel_hoe.right.json b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.ashen_steel_hoe.right.json new file mode 100644 index 0000000..3918b84 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/tools/item.acesbs.ashen_steel_hoe.right.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_ashen_steel": { + "conditions": { + "items": [ + { + "items": "acesbs:ashen_steel" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:item.acesbs.ashen_steel_hoe.right" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_ashen_steel" + ] + ], + "rewards": { + "recipes": [ + "acesbs:item.acesbs.ashen_steel_hoe.right" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/ashen.json b/src/main/generated/data/acesbs/recipe/ashen.json new file mode 100644 index 0000000..788482e --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/ashen.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:smithing_trim", + "addition": { + "tag": "minecraft:trim_materials" + }, + "base": { + "tag": "minecraft:trimmable_armor" + }, + "template": { + "item": "acesbs:ashen_armor_trim_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/ashen_steel_boots.json b/src/main/generated/data/acesbs/recipe/ashen_steel_boots.json new file mode 100644 index 0000000..844deb1 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/ashen_steel_boots.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "acesbs:ashen_steel" + } + }, + "pattern": [ + " ", + "# #", + "# #" + ], + "result": { + "count": 1, + "id": "acesbs:ashen_steel_boots" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/ashen_steel_chestplate.json b/src/main/generated/data/acesbs/recipe/ashen_steel_chestplate.json new file mode 100644 index 0000000..9db23ee --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/ashen_steel_chestplate.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "acesbs:ashen_steel" + } + }, + "pattern": [ + "# #", + "###", + "###" + ], + "result": { + "count": 1, + "id": "acesbs:ashen_steel_chestplate" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/ashen_steel_hammer.json b/src/main/generated/data/acesbs/recipe/ashen_steel_hammer.json new file mode 100644 index 0000000..52a9671 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/ashen_steel_hammer.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "acesbs:ashen_steel" + }, + "B": { + "item": "acesbs:ashen_steel_block" + }, + "I": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "B#B", + " I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:ashen_steel_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/ashen_steel_helmet.json b/src/main/generated/data/acesbs/recipe/ashen_steel_helmet.json new file mode 100644 index 0000000..d4c2246 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/ashen_steel_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "acesbs:ashen_steel" + } + }, + "pattern": [ + "###", + "# #", + " " + ], + "result": { + "count": 1, + "id": "acesbs:ashen_steel_helmet" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/ashen_steel_leggings.json b/src/main/generated/data/acesbs/recipe/ashen_steel_leggings.json new file mode 100644 index 0000000..9bca381 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/ashen_steel_leggings.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "acesbs:ashen_steel" + } + }, + "pattern": [ + "###", + "# #", + "# #" + ], + "result": { + "count": 1, + "id": "acesbs:ashen_steel_leggings" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/ashen_steel_pickaxe.json b/src/main/generated/data/acesbs/recipe/ashen_steel_pickaxe.json new file mode 100644 index 0000000..29afce2 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/ashen_steel_pickaxe.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "acesbs:ashen_steel" + }, + "I": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "###", + " I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:ashen_steel_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/ashen_steel_shovel.json b/src/main/generated/data/acesbs/recipe/ashen_steel_shovel.json new file mode 100644 index 0000000..f06e655 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/ashen_steel_shovel.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "acesbs:ashen_steel" + }, + "I": { + "item": "minecraft:stick" + } + }, + "pattern": [ + " # ", + " I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:ashen_steel_shovel" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/ashen_steel_sword.json b/src/main/generated/data/acesbs/recipe/ashen_steel_sword.json new file mode 100644 index 0000000..513f907 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/ashen_steel_sword.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "acesbs:ashen_steel" + }, + "I": { + "item": "minecraft:stick" + } + }, + "pattern": [ + " # ", + " # ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:ashen_steel_sword" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/item.acesbs.ashen_steel_axe.left.json b/src/main/generated/data/acesbs/recipe/item.acesbs.ashen_steel_axe.left.json new file mode 100644 index 0000000..e98e5e9 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/item.acesbs.ashen_steel_axe.left.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "acesbs:ashen_steel" + }, + "I": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "## ", + "#I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:ashen_steel_axe" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/item.acesbs.ashen_steel_axe.right.json b/src/main/generated/data/acesbs/recipe/item.acesbs.ashen_steel_axe.right.json new file mode 100644 index 0000000..28a9bf7 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/item.acesbs.ashen_steel_axe.right.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "acesbs:ashen_steel" + }, + "I": { + "item": "minecraft:stick" + } + }, + "pattern": [ + " ##", + " I#", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:ashen_steel_axe" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/item.acesbs.ashen_steel_hoe.left.json b/src/main/generated/data/acesbs/recipe/item.acesbs.ashen_steel_hoe.left.json new file mode 100644 index 0000000..8ace9ce --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/item.acesbs.ashen_steel_hoe.left.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "acesbs:ashen_steel" + }, + "I": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "## ", + " I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:ashen_steel_hoe" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/item.acesbs.ashen_steel_hoe.right.json b/src/main/generated/data/acesbs/recipe/item.acesbs.ashen_steel_hoe.right.json new file mode 100644 index 0000000..e41f32c --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/item.acesbs.ashen_steel_hoe.right.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "acesbs:ashen_steel" + }, + "I": { + "item": "minecraft:stick" + } + }, + "pattern": [ + " ##", + " I ", + " I " + ], + "result": { + "count": 1, + "id": "acesbs:ashen_steel_hoe" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/prisma_steel_boots.json b/src/main/generated/data/acesbs/recipe/prisma_steel_boots.json new file mode 100644 index 0000000..df9498b --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/prisma_steel_boots.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "acesbs:prisma_steel" + } + }, + "pattern": [ + " ", + "# #", + "# #" + ], + "result": { + "count": 1, + "id": "acesbs:prisma_steel_boots" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/prisma_steel_chestplate.json b/src/main/generated/data/acesbs/recipe/prisma_steel_chestplate.json new file mode 100644 index 0000000..e2b1a18 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/prisma_steel_chestplate.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "acesbs:prisma_steel" + } + }, + "pattern": [ + "# #", + "###", + "###" + ], + "result": { + "count": 1, + "id": "acesbs:prisma_steel_chestplate" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/prisma_steel_helmet.json b/src/main/generated/data/acesbs/recipe/prisma_steel_helmet.json new file mode 100644 index 0000000..e46b343 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/prisma_steel_helmet.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "acesbs:prisma_steel" + } + }, + "pattern": [ + "###", + "# #", + " " + ], + "result": { + "count": 1, + "id": "acesbs:prisma_steel_helmet" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/prisma_steel_leggings.json b/src/main/generated/data/acesbs/recipe/prisma_steel_leggings.json new file mode 100644 index 0000000..e63f4fd --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/prisma_steel_leggings.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "#": { + "item": "acesbs:prisma_steel" + } + }, + "pattern": [ + "###", + "# #", + "# #" + ], + "result": { + "count": 1, + "id": "acesbs:prisma_steel_leggings" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/thot_begone.json b/src/main/generated/data/acesbs/recipe/thot_begone.json new file mode 100644 index 0000000..551cf98 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/thot_begone.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "P": { + "tag": "minecraft:planks" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + " P", + " P ", + "S " + ], + "result": { + "count": 1, + "id": "acesbs:thot_begone" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/tags/item/ashen_repair.json b/src/main/generated/data/acesbs/tags/item/ashen_repair.json new file mode 100644 index 0000000..456480d --- /dev/null +++ b/src/main/generated/data/acesbs/tags/item/ashen_repair.json @@ -0,0 +1,5 @@ +{ + "values": [ + "acesbs:ashen_steel" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/tags/item/prisma_repair.json b/src/main/generated/data/acesbs/tags/item/prisma_repair.json new file mode 100644 index 0000000..c40f18d --- /dev/null +++ b/src/main/generated/data/acesbs/tags/item/prisma_repair.json @@ -0,0 +1,5 @@ +{ + "values": [ + "acesbs:prisma_steel" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/trim_material/ashen_steel.json b/src/main/generated/data/acesbs/trim_material/ashen_steel.json new file mode 100644 index 0000000..df37ad3 --- /dev/null +++ b/src/main/generated/data/acesbs/trim_material/ashen_steel.json @@ -0,0 +1,9 @@ +{ + "asset_name": "ashen_steel", + "description": { + "color": "#B93425", + "translate": "trim_material.acesbs.ashen_steel" + }, + "ingredient": "acesbs:ashen_steel", + "item_model_index": 0.4 +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/trim_pattern/ashen.json b/src/main/generated/data/acesbs/trim_pattern/ashen.json new file mode 100644 index 0000000..69d2667 --- /dev/null +++ b/src/main/generated/data/acesbs/trim_pattern/ashen.json @@ -0,0 +1,8 @@ +{ + "asset_id": "acesbs:ashen", + "decal": false, + "description": { + "translate": "trim_pattern.acesbs.ashen" + }, + "template_item": "acesbs:ashen_armor_trim_smithing_template" +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json index f1ff0b9..046ab01 100644 --- a/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json @@ -5,6 +5,7 @@ "acesbs:raw_endtropy_block", "acesbs:stable_endtropy_block", "acesbs:prisma_steel_block", + "acesbs:ashen_steel_block", "acesbs:entropy_ore", "acesbs:deepslate_entropy_ore", "acesbs:infernal_ashes_ore", diff --git a/src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json b/src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json index 008846e..5791182 100644 --- a/src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json +++ b/src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json @@ -8,6 +8,7 @@ "acesbs:raw_endtropy_block", "acesbs:stable_endtropy_block", "acesbs:prisma_steel_block", + "acesbs:ashen_steel_block", "acesbs:entropic_stabilizer", "acesbs:entropic_eviscerator", "acesbs:entropic_entangler" diff --git a/src/main/generated/data/minecraft/tags/item/axes.json b/src/main/generated/data/minecraft/tags/item/axes.json index c60fe0c..8df4170 100644 --- a/src/main/generated/data/minecraft/tags/item/axes.json +++ b/src/main/generated/data/minecraft/tags/item/axes.json @@ -1,5 +1,6 @@ { "values": [ - "acesbs:prisma_steel_axe" + "acesbs:prisma_steel_axe", + "acesbs:ashen_steel_axe" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/hoes.json b/src/main/generated/data/minecraft/tags/item/hoes.json index aae443b..45161e0 100644 --- a/src/main/generated/data/minecraft/tags/item/hoes.json +++ b/src/main/generated/data/minecraft/tags/item/hoes.json @@ -1,5 +1,6 @@ { "values": [ - "acesbs:prisma_steel_hoe" + "acesbs:prisma_steel_hoe", + "acesbs:ashen_steel_hoe" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/pickaxes.json b/src/main/generated/data/minecraft/tags/item/pickaxes.json index 5646008..2ef9da0 100644 --- a/src/main/generated/data/minecraft/tags/item/pickaxes.json +++ b/src/main/generated/data/minecraft/tags/item/pickaxes.json @@ -1,5 +1,6 @@ { "values": [ - "acesbs:prisma_steel_pickaxe" + "acesbs:prisma_steel_pickaxe", + "acesbs:ashen_steel_pickaxe" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/shovels.json b/src/main/generated/data/minecraft/tags/item/shovels.json index c78453c..45cb251 100644 --- a/src/main/generated/data/minecraft/tags/item/shovels.json +++ b/src/main/generated/data/minecraft/tags/item/shovels.json @@ -1,5 +1,6 @@ { "values": [ - "acesbs:prisma_steel_shovel" + "acesbs:prisma_steel_shovel", + "acesbs:ashen_steel_pickaxe" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/swords.json b/src/main/generated/data/minecraft/tags/item/swords.json index 83391c9..3d92cb0 100644 --- a/src/main/generated/data/minecraft/tags/item/swords.json +++ b/src/main/generated/data/minecraft/tags/item/swords.json @@ -1,5 +1,6 @@ { "values": [ - "acesbs:prisma_steel_sword" + "acesbs:prisma_steel_sword", + "acesbs:thot_begone" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/trim_materials.json b/src/main/generated/data/minecraft/tags/item/trim_materials.json index c40f18d..6e3e853 100644 --- a/src/main/generated/data/minecraft/tags/item/trim_materials.json +++ b/src/main/generated/data/minecraft/tags/item/trim_materials.json @@ -1,5 +1,6 @@ { "values": [ - "acesbs:prisma_steel" + "acesbs:prisma_steel", + "acesbs:ashen_steel" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/trim_templates.json b/src/main/generated/data/minecraft/tags/item/trim_templates.json index b9cac6b..95b9a8c 100644 --- a/src/main/generated/data/minecraft/tags/item/trim_templates.json +++ b/src/main/generated/data/minecraft/tags/item/trim_templates.json @@ -1,5 +1,6 @@ { "values": [ - "acesbs:prisma_armor_trim_smithing_template" + "acesbs:prisma_armor_trim_smithing_template", + "acesbs:ashen_armor_trim_smithing_template" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/trimmable_armor.json b/src/main/generated/data/minecraft/tags/item/trimmable_armor.json index 4211054..1098567 100644 --- a/src/main/generated/data/minecraft/tags/item/trimmable_armor.json +++ b/src/main/generated/data/minecraft/tags/item/trimmable_armor.json @@ -4,6 +4,10 @@ "acesbs:prisma_steel_chestplate", "acesbs:prisma_steel_leggings", "acesbs:prisma_steel_boots", + "acesbs:ashen_steel_helmet", + "acesbs:ashen_steel_chestplate", + "acesbs:ashen_steel_leggings", + "acesbs:ashen_steel_boots", "acesbs:berserkers_pauldron", "acesbs:wildfire_boots", "acesbs:sovs_plate_carrier" diff --git a/src/main/java/com/acethewildfire/acesbs/TODO.txt b/src/main/java/com/acethewildfire/acesbs/TODO.txt index 1aaab7f..ba5261a 100644 --- a/src/main/java/com/acethewildfire/acesbs/TODO.txt +++ b/src/main/java/com/acethewildfire/acesbs/TODO.txt @@ -48,7 +48,6 @@ Potions X Lemon (Yellow Blindness) - Faerie Size (Small and Light) - Bottle o' Drunken Sailor -- Energy Drink (Hyper Sugar) Tools X Prisma Steel (May get a different Ore when mining) @@ -115,6 +114,7 @@ X (Rename) Block of Raw Entropy - Blocks of (Insert Metal/Gem) - Decorative (Bricks) - Crystalized Entropy (Stained Glass version of Stable Entropy) +- 2 Player Bed Workstations X Entropic Eviscerator (Extracts ores from stones) @@ -128,6 +128,7 @@ Mobs O Fren (Stable Entropy on a Creeper) (Move to Conversion manager?) - Burning Wizard (Infernal Ashes on a Witch) - Rat Bastard (Stable Entropy on a cat) +- Alice - Pet rock (Stable Entropy on a stone block) X Swearing skeleton (Stable Entropy on skeleton). - Infernal Bull (nether) diff --git a/src/main/java/com/acethewildfire/acesbs/V1 Complete.txt b/src/main/java/com/acethewildfire/acesbs/V1 Complete.txt new file mode 100644 index 0000000..3790350 --- /dev/null +++ b/src/main/java/com/acethewildfire/acesbs/V1 Complete.txt @@ -0,0 +1,14 @@ +Bubble Pipe + Pale Wood + Vanilla Wood Types +Ahab's Harpoon +Aquarium Gravel +Burning Wizard (Infernal Ashes on a Villager) +- Sells fire items + +Advancements +JEI + +Make sure everything is craft able +- Combustable lemon +- Prisma Armor + + diff --git a/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java b/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java index 26e1303..b305c67 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java +++ b/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java @@ -10,6 +10,7 @@ import net.minecraft.block.enums.NoteBlockInstrument; import net.minecraft.block.piston.PistonBehavior; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; +import net.minecraft.item.ItemConvertible; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.sound.BlockSoundGroup; @@ -329,6 +330,17 @@ public class ModBlocks { .sounds(BlockSoundGroup.CROP) .pistonBehavior(PistonBehavior.DESTROY) )); + public static final Block ASHEN_STEEL_BLOCK = registerBlock( + "ashen_steel_block", + new Block( + AbstractBlock.Settings.create() + .mapColor(MapColor.IRON_GRAY) + .instrument(NoteBlockInstrument.IRON_XYLOPHONE) + .requiresTool() + .strength(5.0F, 6.0F) + .sounds(BlockSoundGroup.METAL) + ) + ); private static Block registerBlockWithoutItem(String name, Block block){ return Registry.register(Registries.BLOCK, Identifier.of(AcesBS.MOD_ID, name), block); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java index ec0255c..cb110a0 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModBlockTagProvider.java @@ -22,6 +22,7 @@ public class ModBlockTagProvider extends FabricTagProvider.BlockTagProvider { .add(ModBlocks.RAW_ENDTROPY_BLOCK) .add(ModBlocks.STABLE_ENDTROPY_BLOCK) .add(ModBlocks.PRISMA_STEEL_BLOCK) + .add(ModBlocks.ASHEN_STEEL_BLOCK) .add(ModBlocks.ENTROPY_ORE) .add(ModBlocks.DEEPSLATE_ENTROPY_ORE) .add(ModBlocks.INFERNAL_ASHES_ORE) @@ -40,6 +41,7 @@ public class ModBlockTagProvider extends FabricTagProvider.BlockTagProvider { .add(ModBlocks.RAW_ENDTROPY_BLOCK) .add(ModBlocks.STABLE_ENDTROPY_BLOCK) .add(ModBlocks.PRISMA_STEEL_BLOCK) + .add(ModBlocks.ASHEN_STEEL_BLOCK) .add(ModBlocks.ENTROPIC_STABILIZER) .add(ModBlocks.ENTROPIC_EVISCERATOR) .add(ModBlocks.ENTROPIC_ENTANGLER); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java index 7638183..6028a67 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java @@ -1,6 +1,7 @@ package com.acethewildfire.acesbs.datagen; import com.acethewildfire.acesbs.block.ModBlocks; +import com.acethewildfire.acesbs.item.AshenSteelItems; import com.acethewildfire.acesbs.item.ModItems; import com.acethewildfire.acesbs.item.PrismaSteelItems; import com.acethewildfire.acesbs.util.ModTags; @@ -22,6 +23,10 @@ public class ModItemTagProvider extends FabricTagProvider.ItemTagProvider { protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) { getOrCreateTagBuilder(ModTags.Items.ENTROPY_CONVERTABLE) .add(Items.APPLE); + getOrCreateTagBuilder(ModTags.Items.PRISMA_REPAIR) + .add(PrismaSteelItems.PRISMA_STEEL); + getOrCreateTagBuilder(ModTags.Items.ASHEN_REPAIR) + .add(AshenSteelItems.ASHEN_STEEL); getOrCreateTagBuilder(ModTags.Items.PRISMA_CONVERTABLE) .add(Items.COAL) .add(Items.RAW_COPPER) @@ -34,27 +39,38 @@ public class ModItemTagProvider extends FabricTagProvider.ItemTagProvider { getOrCreateTagBuilder(ItemTags.BOW_ENCHANTABLE) .add(ModItems.KAUPEN_BOW); getOrCreateTagBuilder(ItemTags.SWORDS) - .add(PrismaSteelItems.PRISMA_STEEL_SWORD); + .add(PrismaSteelItems.PRISMA_STEEL_SWORD) + .add(ModItems.THOT_BEGONE); getOrCreateTagBuilder(ItemTags.AXES) - .add(PrismaSteelItems.PRISMA_STEEL_AXE); + .add(PrismaSteelItems.PRISMA_STEEL_AXE) + .add(AshenSteelItems.ASHEN_STEEL_AXE); getOrCreateTagBuilder(ItemTags.PICKAXES) - .add(PrismaSteelItems.PRISMA_STEEL_PICKAXE); + .add(PrismaSteelItems.PRISMA_STEEL_PICKAXE) + .add(AshenSteelItems.ASHEN_STEEL_PICKAXE); getOrCreateTagBuilder(ItemTags.SHOVELS) - .add(PrismaSteelItems.PRISMA_STEEL_SHOVEL); + .add(PrismaSteelItems.PRISMA_STEEL_SHOVEL) + .add(AshenSteelItems.ASHEN_STEEL_PICKAXE); getOrCreateTagBuilder(ItemTags.HOES) - .add(PrismaSteelItems.PRISMA_STEEL_HOE); + .add(PrismaSteelItems.PRISMA_STEEL_HOE) + .add(AshenSteelItems.ASHEN_STEEL_HOE); getOrCreateTagBuilder(ItemTags.TRIMMABLE_ARMOR) .add(PrismaSteelItems.PRISMA_STEEL_HELMET) .add(PrismaSteelItems.PRISMA_STEEL_CHESTPLATE) .add(PrismaSteelItems.PRISMA_STEEL_LEGGINGS) .add(PrismaSteelItems.PRISMA_STEEL_BOOTS) + .add(AshenSteelItems.ASHEN_STEEL_HELMET) + .add(AshenSteelItems.ASHEN_STEEL_CHESTPLATE) + .add(AshenSteelItems.ASHEN_STEEL_LEGGINGS) + .add(AshenSteelItems.ASHEN_STEEL_BOOTS) .add(ModItems.BERSERKERS_PAULDRON) .add(ModItems.WILDFIRE_BOOTS) .add(ModItems.SOVS_PLATE_CARRIER); getOrCreateTagBuilder(ItemTags.TRIM_MATERIALS) - .add(PrismaSteelItems.PRISMA_STEEL); + .add(PrismaSteelItems.PRISMA_STEEL) + .add(AshenSteelItems.ASHEN_STEEL); getOrCreateTagBuilder(ItemTags.TRIM_TEMPLATES) - .add(PrismaSteelItems.PRISMA_SMITHING_TEMPLATE); + .add(PrismaSteelItems.PRISMA_SMITHING_TEMPLATE) + .add(AshenSteelItems.ASHEN_SMITHING_TEMPLATE); getOrCreateTagBuilder(ItemTags.CREEPER_DROP_MUSIC_DISCS) .add(ModItems.CRAB_RAVE_MUSIC_DISC); getOrCreateTagBuilder(ItemTags.LOGS_THAT_BURN) diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java index 1c0f7fd..820c8d0 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java @@ -3,6 +3,7 @@ package com.acethewildfire.acesbs.datagen; import com.acethewildfire.acesbs.block.ModBlocks; import com.acethewildfire.acesbs.block.custom.EvilBlock; import com.acethewildfire.acesbs.block.custom.TobaccoCrop; +import com.acethewildfire.acesbs.item.AshenSteelItems; import com.acethewildfire.acesbs.item.ModItems; import com.acethewildfire.acesbs.item.PrismaSteelItems; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; @@ -31,6 +32,7 @@ public class ModModelProvider extends FabricModelProvider { blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.STABLE_ENDTROPY_BLOCK); blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.RAW_ENDTROPY_BLOCK); blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.PRISMA_STEEL_BLOCK); + blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.ASHEN_STEEL_BLOCK); blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.INFERNAL_ASHES_BLOCK); // blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.CRYSTAL_ENTROPY); @@ -90,8 +92,12 @@ public class ModModelProvider extends FabricModelProvider { // itemModelGenerator.register(ModItems.WAND, Models.HANDHELD_ROD); itemModelGenerator.register(PrismaSteelItems.PRISMA_STEEL, Models.GENERATED); itemModelGenerator.register(PrismaSteelItems.PRISMA_SMITHING_TEMPLATE, Models.GENERATED); + itemModelGenerator.register(AshenSteelItems.ASHEN_STEEL, Models.GENERATED); + itemModelGenerator.register(AshenSteelItems.ASHEN_SMITHING_TEMPLATE, Models.GENERATED); itemModelGenerator.register(ModItems.CRAB_RAVE_MUSIC_DISC, Models.GENERATED); + itemModelGenerator.register(ModItems.THOT_BEGONE, Models.HANDHELD); + itemModelGenerator.register(PrismaSteelItems.PRISMA_STEEL_SWORD, Models.HANDHELD); itemModelGenerator.register(PrismaSteelItems.PRISMA_STEEL_PICKAXE, Models.HANDHELD); itemModelGenerator.register(PrismaSteelItems.PRISMA_STEEL_HAMMER, Models.HANDHELD); @@ -104,6 +110,18 @@ public class ModModelProvider extends FabricModelProvider { itemModelGenerator.registerArmor((ArmorItem) PrismaSteelItems.PRISMA_STEEL_LEGGINGS); itemModelGenerator.registerArmor((ArmorItem) PrismaSteelItems.PRISMA_STEEL_BOOTS); + itemModelGenerator.register(AshenSteelItems.ASHEN_STEEL_SWORD, Models.HANDHELD); + itemModelGenerator.register(AshenSteelItems.ASHEN_STEEL_PICKAXE, Models.HANDHELD); + itemModelGenerator.register(AshenSteelItems.ASHEN_STEEL_HAMMER, Models.HANDHELD); + itemModelGenerator.register(AshenSteelItems.ASHEN_STEEL_AXE, Models.HANDHELD); + itemModelGenerator.register(AshenSteelItems.ASHEN_STEEL_SHOVEL, Models.HANDHELD); + itemModelGenerator.register(AshenSteelItems.ASHEN_STEEL_HOE, Models.HANDHELD); + + itemModelGenerator.registerArmor((ArmorItem) AshenSteelItems.ASHEN_STEEL_HELMET); + itemModelGenerator.registerArmor((ArmorItem) AshenSteelItems.ASHEN_STEEL_CHESTPLATE); + itemModelGenerator.registerArmor((ArmorItem) AshenSteelItems.ASHEN_STEEL_LEGGINGS); + itemModelGenerator.registerArmor((ArmorItem) AshenSteelItems.ASHEN_STEEL_BOOTS); + itemModelGenerator.registerArmor((ArmorItem) ModItems.BERSERKERS_PAULDRON); itemModelGenerator.registerArmor((ArmorItem) ModItems.WILDFIRE_BOOTS); itemModelGenerator.registerArmor((ArmorItem) ModItems.SOVS_PLATE_CARRIER); diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java index 3051ca9..c0d293c 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java @@ -2,19 +2,24 @@ package com.acethewildfire.acesbs.datagen; import com.acethewildfire.acesbs.AcesBS; import com.acethewildfire.acesbs.block.ModBlocks; +import com.acethewildfire.acesbs.item.AshenSteelItems; import com.acethewildfire.acesbs.item.ModItems; import com.acethewildfire.acesbs.item.PrismaSteelItems; +import com.acethewildfire.acesbs.util.ModTags; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.minecraft.block.Blocks; import net.minecraft.data.server.recipe.RecipeExporter; import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; +import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; import net.minecraft.item.Items; import net.minecraft.recipe.*; import net.minecraft.recipe.book.RecipeCategory; +import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; import java.util.concurrent.CompletableFuture; @@ -26,7 +31,7 @@ public class ModRecipeProvider extends FabricRecipeProvider { @Override public void generate(RecipeExporter recipeExporter) { - + TagKey PLANKS = TagKey.of(RegistryKeys.ITEM, Identifier.ofVanilla( "planks")); // List ENTROPY_SMELTABLES = List.of(ModItems.RAW_ENTROPY, ModBlocks.ENTROPY_ORE, ModBlocks.DEEPSLATE_ENTROPY_ORE); // List ENDTROPY_SMELTABLES = List.of(ModItems.RAW_ENDTROPY, ModBlocks.ENDTROPY_ORE); // @@ -55,6 +60,15 @@ public class ModRecipeProvider extends FabricRecipeProvider { .criterion(hasItem(ModItems.LEMON), conditionsFromItem(ModItems.LEMON)) .offerTo(recipeExporter); + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, ModItems.THOT_BEGONE, 1) + .pattern(" P") + .pattern(" P ") + .pattern("S ") + .input('S', Items.STICK) + .input('P', PLANKS) + .criterion(hasItem(Items.STICK), conditionsFromItem(Items.STICK)) + .offerTo(recipeExporter); + ShapelessRecipeJsonBuilder.create(RecipeCategory.FOOD, ModItems.BRICKED_UP, 1) .input(Items.BRICK, 1) .input(ModItems.STABLE_ENDTROPY, 1) @@ -217,7 +231,18 @@ public class ModRecipeProvider extends FabricRecipeProvider { ShovelRecipeJsonBuilder(recipeExporter, PrismaSteelItems.PRISMA_STEEL_SHOVEL, PrismaSteelItems.PRISMA_STEEL, Items.STICK, PrismaSteelItems.PRISMA_STEEL); HoeRecipeJsonBuilder(recipeExporter, PrismaSteelItems.PRISMA_STEEL_HOE, PrismaSteelItems.PRISMA_STEEL, Items.STICK, PrismaSteelItems.PRISMA_STEEL); + SwordRecipeJsonBuilder(recipeExporter, AshenSteelItems.ASHEN_STEEL_SWORD, AshenSteelItems.ASHEN_STEEL, Items.STICK, AshenSteelItems.ASHEN_STEEL); + PickaxeRecipeJsonBuilder(recipeExporter, AshenSteelItems.ASHEN_STEEL_PICKAXE, AshenSteelItems.ASHEN_STEEL, Items.STICK, AshenSteelItems.ASHEN_STEEL); + HammerRecipeJsonBuilder(recipeExporter, AshenSteelItems.ASHEN_STEEL_HAMMER, AshenSteelItems.ASHEN_STEEL, ModBlocks.ASHEN_STEEL_BLOCK, Items.STICK, AshenSteelItems.ASHEN_STEEL); + AxeRecipeJsonBuilder(recipeExporter, AshenSteelItems.ASHEN_STEEL_AXE, AshenSteelItems.ASHEN_STEEL, Items.STICK, AshenSteelItems.ASHEN_STEEL); + 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); + + 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); + offerSmithingTrimRecipe(recipeExporter, PrismaSteelItems.PRISMA_SMITHING_TEMPLATE, Identifier.of(AcesBS.MOD_ID, "prisma")); + offerSmithingTrimRecipe(recipeExporter, AshenSteelItems.ASHEN_SMITHING_TEMPLATE, Identifier.of(AcesBS.MOD_ID, "ashen")); // For 2+ recipes with the same RESULT use // .offerTo(recipeExporter, Identifier.of(AcesBS.MOD_ID, "output_item_from_input_item")); @@ -302,6 +327,39 @@ public class ModRecipeProvider extends FabricRecipeProvider { .offerTo(recipeExporter, Identifier.of(AcesBS.MOD_ID, result.asItem().getName().getString() + ".right")); } + private void ModArmorRecipeJsonBuilder(RecipeExporter recipeExporter, ItemConvertible helmetResult, ItemConvertible chestplateResult, ItemConvertible leggingsResult, ItemConvertible bootsResult, ItemConvertible baseMaterial, ItemConvertible criterionItem){ + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, helmetResult) + .pattern("###") + .pattern("# #") + .pattern(" ") + .input('#', baseMaterial) + .criterion(hasItem(criterionItem), conditionsFromItem(criterionItem)) + .offerTo(recipeExporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, chestplateResult) + .pattern("# #") + .pattern("###") + .pattern("###") + .input('#', baseMaterial) + .criterion(hasItem(criterionItem), conditionsFromItem(criterionItem)) + .offerTo(recipeExporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, leggingsResult) + .pattern("###") + .pattern("# #") + .pattern("# #") + .input('#', baseMaterial) + .criterion(hasItem(criterionItem), conditionsFromItem(criterionItem)) + .offerTo(recipeExporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.COMBAT, bootsResult) + .pattern(" ") + .pattern("# #") + .pattern("# #") + .input('#', baseMaterial) + .criterion(hasItem(criterionItem), conditionsFromItem(criterionItem)) + .offerTo(recipeExporter); + } public void offerAllFoodCookingRecipes (RecipeExporter recipeExporter, int baseCookingTime, ItemConvertible raw_item, ItemConvertible cooked_item, float experience ){ offerFoodCookingRecipe(recipeExporter, "smoking", RecipeSerializer.SMOKING, SmokingRecipe::new,baseCookingTime/2, raw_item, cooked_item, experience); diff --git a/src/main/java/com/acethewildfire/acesbs/item/AshenSteelItems.java b/src/main/java/com/acethewildfire/acesbs/item/AshenSteelItems.java new file mode 100644 index 0000000..f8c15c7 --- /dev/null +++ b/src/main/java/com/acethewildfire/acesbs/item/AshenSteelItems.java @@ -0,0 +1,54 @@ +package com.acethewildfire.acesbs.item; + +import com.acethewildfire.acesbs.AcesBS; +import com.acethewildfire.acesbs.item.custom.HammerItem; +import com.acethewildfire.acesbs.item.custom.ModArmorItem; +import net.minecraft.item.*; +import net.minecraft.resource.featuretoggle.FeatureFlags; +import net.minecraft.util.Identifier; + +public class AshenSteelItems { + + public static final Item ASHEN_STEEL = ModItems.registerItem("ashen_steel", new Item(new Item.Settings())); + public static final Item ASHEN_STEEL_SWORD = ModItems.registerItem("ashen_steel_sword", + new SwordItem(ModToolMaterials.ASHEN_STEEL, new Item.Settings() + .attributeModifiers(SwordItem.createAttributeModifiers(ModToolMaterials.ASHEN_STEEL, 3, -2.4f)))); + public static final Item ASHEN_STEEL_SHOVEL = ModItems.registerItem("ashen_steel_shovel", + new ShovelItem(ModToolMaterials.ASHEN_STEEL, new Item.Settings() + .attributeModifiers(ShovelItem.createAttributeModifiers(ModToolMaterials.ASHEN_STEEL, 1.5F, -3.0F))) + ); + public static final Item ASHEN_STEEL_PICKAXE = ModItems.registerItem("ashen_steel_pickaxe", + new PickaxeItem(ModToolMaterials.ASHEN_STEEL, new Item.Settings() + .attributeModifiers(PickaxeItem.createAttributeModifiers(ModToolMaterials.ASHEN_STEEL, 1.0F, -2.8F))) + ); + public static final Item ASHEN_STEEL_HAMMER = ModItems.registerItem("ashen_steel_hammer", + new HammerItem(ModToolMaterials.ASHEN_STEEL, new Item.Settings() + .attributeModifiers(PickaxeItem.createAttributeModifiers(ModToolMaterials.ASHEN_STEEL, 7.0F, -3.4F))) + ); + public static final Item ASHEN_STEEL_AXE = ModItems.registerItem("ashen_steel_axe", + new AxeItem(ModToolMaterials.ASHEN_STEEL, new Item.Settings() + .attributeModifiers(AxeItem.createAttributeModifiers(ModToolMaterials.ASHEN_STEEL, 6.0F, -3.1F))) + ); + public static final Item ASHEN_STEEL_HOE = ModItems.registerItem("ashen_steel_hoe", + new HoeItem(ModToolMaterials.ASHEN_STEEL, new Item.Settings() + .attributeModifiers(HoeItem.createAttributeModifiers(ModToolMaterials.ASHEN_STEEL, -2.0F, -1.0F))) + ); + public static final Item ASHEN_STEEL_HELMET = ModItems.registerItem("ashen_steel_helmet", + new ModArmorItem(ModArmorMaterials.ASHEN_STEEL_ARMOR_MATERIAL, ArmorItem.Type.HELMET, new Item.Settings() + .maxDamage(ArmorItem.Type.HELMET.getMaxDamage(15)))); + public static final Item ASHEN_STEEL_CHESTPLATE = ModItems.registerItem("ashen_steel_chestplate", + new ModArmorItem(ModArmorMaterials.ASHEN_STEEL_ARMOR_MATERIAL, ArmorItem.Type.CHESTPLATE, new Item.Settings() + .maxDamage(ArmorItem.Type.CHESTPLATE.getMaxDamage(15)))); + public static final Item ASHEN_STEEL_LEGGINGS = ModItems.registerItem("ashen_steel_leggings", + new ModArmorItem(ModArmorMaterials.ASHEN_STEEL_ARMOR_MATERIAL, ArmorItem.Type.LEGGINGS, new Item.Settings() + .maxDamage(ArmorItem.Type.LEGGINGS.getMaxDamage(15)))); + public static final Item ASHEN_STEEL_BOOTS = ModItems.registerItem("ashen_steel_boots", + new ModArmorItem(ModArmorMaterials.ASHEN_STEEL_ARMOR_MATERIAL, ArmorItem.Type.BOOTS, new Item.Settings() + .maxDamage(ArmorItem.Type.BOOTS.getMaxDamage(15)))); + public static final Item ASHEN_SMITHING_TEMPLATE = ModItems.registerItem("ashen_armor_trim_smithing_template", + SmithingTemplateItem.of(Identifier.of(AcesBS.MOD_ID, "ashen"), FeatureFlags.VANILLA)); + + public static void registerAshenItems() { + // Do nothing, this just makes sure the items get registered + } +} diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModArmorMaterials.java b/src/main/java/com/acethewildfire/acesbs/item/ModArmorMaterials.java index 9880f0c..9535612 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModArmorMaterials.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModArmorMaterials.java @@ -28,6 +28,16 @@ public class ModArmorMaterials { }), 20, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, () -> Ingredient.ofItems(PrismaSteelItems.PRISMA_STEEL), List.of(new ArmorMaterial.Layer(Identifier.of(AcesBS.MOD_ID, "prisma_steel"))), 0, 0)); + public static final RegistryEntry ASHEN_STEEL_ARMOR_MATERIAL = registerArmorMaterial("ashen_steel", + () -> new ArmorMaterial(Util.make(new EnumMap<>(ArmorItem.Type.class), map -> { + map.put(ArmorItem.Type.BOOTS, 2); + map.put(ArmorItem.Type.LEGGINGS, 4); + map.put(ArmorItem.Type.CHESTPLATE, 6); + map.put(ArmorItem.Type.HELMET, 2); + map.put(ArmorItem.Type.BODY, 4); + }), 20, SoundEvents.ITEM_ARMOR_EQUIP_IRON, () -> Ingredient.ofItems(AshenSteelItems.ASHEN_STEEL), + List.of(new ArmorMaterial.Layer(Identifier.of(AcesBS.MOD_ID, "ashen_steel"))), 0, 0)); + public static final RegistryEntry WILDFIRE_ARMOR_MATERIAL = registerArmorMaterial("wildfire", () -> new ArmorMaterial(Util.make(new EnumMap<>(ArmorItem.Type.class), map -> { map.put(ArmorItem.Type.BOOTS, 3); diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java index 0a4bfd6..58d5f47 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModItemGroups.java @@ -22,6 +22,7 @@ public class ModItemGroups { entries.add(ModItems.RAW_ENDTROPY); entries.add(ModItems.STABLE_ENDTROPY); entries.add(PrismaSteelItems.PRISMA_STEEL); + entries.add(AshenSteelItems.ASHEN_STEEL); entries.add(ModItems.MOTE_OF_ORDER); entries.add(ModItems.DUST_OF_ORDER); entries.add(ModItems.INGOT_OF_ORDER); @@ -58,6 +59,7 @@ public class ModItemGroups { entries.add(ModBlocks.STABLE_ENDTROPY_BLOCK); entries.add(ModBlocks.PRISMA_STEEL_BLOCK); + entries.add(ModBlocks.ASHEN_STEEL_BLOCK); entries.add(ModBlocks.ENTROPIC_STABILIZER); entries.add(ModBlocks.ENTROPIC_EVISCERATOR); @@ -102,6 +104,14 @@ public class ModItemGroups { entries.add(PrismaSteelItems.PRISMA_STEEL_LEGGINGS); entries.add(PrismaSteelItems.PRISMA_STEEL_BOOTS); entries.add(PrismaSteelItems.PRISMA_SMITHING_TEMPLATE); + entries.add(AshenSteelItems.ASHEN_STEEL_SWORD); + entries.add(AshenSteelItems.ASHEN_STEEL_AXE); + entries.add(AshenSteelItems.ASHEN_STEEL_HELMET); + entries.add(AshenSteelItems.ASHEN_STEEL_CHESTPLATE); + entries.add(AshenSteelItems.ASHEN_STEEL_LEGGINGS); + entries.add(AshenSteelItems.ASHEN_STEEL_BOOTS); + entries.add(AshenSteelItems.ASHEN_SMITHING_TEMPLATE); + entries.add(ModItems.THOT_BEGONE); entries.add(ModItems.KAUPEN_BOW); entries.add(ModItems.COMBUSTIBLE_LEMON); entries.add(ModItems.BERSERKERS_PAULDRON); @@ -124,6 +134,11 @@ public class ModItemGroups { entries.add(PrismaSteelItems.PRISMA_STEEL_HAMMER); entries.add(PrismaSteelItems.PRISMA_STEEL_AXE); entries.add(PrismaSteelItems.PRISMA_STEEL_HOE); + entries.add(AshenSteelItems.ASHEN_STEEL_SHOVEL); + entries.add(AshenSteelItems.ASHEN_STEEL_PICKAXE); + entries.add(AshenSteelItems.ASHEN_STEEL_HAMMER); + entries.add(AshenSteelItems.ASHEN_STEEL_AXE); + entries.add(AshenSteelItems.ASHEN_STEEL_HOE); entries.add(ModItems.COMMAND_CORE); diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModItems.java b/src/main/java/com/acethewildfire/acesbs/item/ModItems.java index 35d1e39..20eb4c3 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModItems.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModItems.java @@ -121,6 +121,18 @@ public class ModItems { } }); + public static final Item THOT_BEGONE = ModItems.registerItem("thot_begone", + new SwordItem(ToolMaterials.WOOD, new Item.Settings() + .attributeModifiers(SwordItem.createAttributeModifiers(ToolMaterials.WOOD, 0, -1.4f)) + .attributeModifiers(AttributeModifiersComponent.builder() + .add(EntityAttributes.GENERIC_ATTACK_KNOCKBACK, + new EntityAttributeModifier(Identifier.of(AcesBS.MOD_ID, "generic.attack_knockback"), 25, EntityAttributeModifier.Operation.ADD_VALUE), AttributeModifierSlot.MAINHAND) + .add(EntityAttributes.GENERIC_ATTACK_DAMAGE, + new EntityAttributeModifier(Identifier.of(AcesBS.MOD_ID, "generic.attack_damage"), -0.999, EntityAttributeModifier.Operation.ADD_MULTIPLIED_TOTAL), AttributeModifierSlot.MAINHAND) + .build()) + + )); + public static final Item CRAB_RAVE_MUSIC_DISC = registerItem("crab_rave_music_disc", new Item(new Item.Settings().jukeboxPlayable(ModSounds.CRAB_RAVE_KEY).maxCount(1))); @@ -207,6 +219,7 @@ public class ModItems { public static void registerModItems() { PrismaSteelItems.registerPrismaItems(); + AshenSteelItems.registerAshenItems(); AcesBS.LOGGER.info("Registering Mod Items for " + AcesBS.MOD_ID); AttackEntityCallback.EVENT.register((player, world, hand, entity, hitResult) -> { diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModToolMaterials.java b/src/main/java/com/acethewildfire/acesbs/item/ModToolMaterials.java index f704ccf..b9d4837 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModToolMaterials.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModToolMaterials.java @@ -17,7 +17,40 @@ public enum ModToolMaterials implements ToolMaterial { // GOLD(BlockTags.INCORRECT_FOR_GOLD_TOOL, 32, 12.0F, 0.0F, 22, () -> Ingredient.ofItems(Items.GOLD_INGOT)), // NETHERITE(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 2031, 9.0F, 4.0F, 15, () -> Ingredient.ofItems(Items.NETHERITE_INGOT)); - PRISMA_STEEL(ModTags.Blocks.INCORRECT_FOR_PRISMA_STEEL_TOOL, 750, 8.0F, 2.0F, 22, () -> Ingredient.ofItems(PrismaSteelItems.PRISMA_STEEL)); +// public static ToolMaterial PRISMA_STEEL = new ToolMaterial(ModTags.Blocks.INCORRECT_FOR_PRISMA_STEEL_TOOL, 750, 8.0F, 2.0F, 22, ModTags.Items.PRISMA_REPAIR) { +// @Override +// public int getDurability() { +// return 0; +// } +// +// @Override +// public float getMiningSpeedMultiplier() { +// return 0; +// } +// +// @Override +// public float getAttackDamage() { +// return 0; +// } +// +// @Override +// public TagKey getInverseTag() { +// return null; +// } +// +// @Override +// public int getEnchantability() { +// return 0; +// } +// +// @Override +// public Ingredient getRepairIngredient() { +// return null; +// } +// }; + + PRISMA_STEEL(ModTags.Blocks.INCORRECT_FOR_PRISMA_STEEL_TOOL, 750, 8.0F, 2.0F, 22, () -> Ingredient.ofItems(PrismaSteelItems.PRISMA_STEEL)), + ASHEN_STEEL(ModTags.Blocks.INCORRECT_FOR_PRISMA_STEEL_TOOL, 750, 8.0F, 2.0F, 22, () -> Ingredient.ofItems(AshenSteelItems.ASHEN_STEEL)); private final TagKey inverseTag; private final int itemDurability; diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/BubblePipe.java b/src/main/java/com/acethewildfire/acesbs/item/custom/BubblePipe.java new file mode 100644 index 0000000..171b8a3 --- /dev/null +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/BubblePipe.java @@ -0,0 +1,140 @@ +package com.acethewildfire.acesbs.item.custom; + +import com.acethewildfire.acesbs.component.ModDataComponentTypes; +import com.acethewildfire.acesbs.effect.ModEffects; +import com.acethewildfire.acesbs.item.ModItems; +import com.acethewildfire.acesbs.util.ModStats; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.effect.StatusEffectInstance; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvent; +import net.minecraft.sound.SoundEvents; +import net.minecraft.stat.Stats; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; +import net.minecraft.util.UseAction; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; + +import static com.acethewildfire.acesbs.util.ModStats.grantAdvancement; + +public class BubblePipe extends Item { + public BubblePipe(Settings settings) { + super(settings); + } + + @Override + public TypedActionResult use(World world, PlayerEntity user, Hand hand) { + if (!user.getItemCooldownManager().isCoolingDown(this)) { + user.setCurrentHand(hand); + user.getStackInHand(hand).set(ModDataComponentTypes.SMOKING, true); + return TypedActionResult.consume(user.getStackInHand(hand)); + } + return TypedActionResult.fail(user.getStackInHand(hand)); + } + + @Override + public void onStoppedUsing(ItemStack stack, World world, LivingEntity user, int remainingUseTicks) { + super.onStoppedUsing(stack, world, user, remainingUseTicks); + stack.set(ModDataComponentTypes.SMOKING, false); + } + + @Override + public UseAction getUseAction(ItemStack stack) { + return UseAction.TOOT_HORN; + } + + @Override + public SoundEvent getEatSound() { + return SoundEvents.INTENTIONALLY_EMPTY; + } + + @Override + public int getMaxUseTime(ItemStack stack, LivingEntity user) { + return 50; + } + + @Override + public void usageTick(World world, LivingEntity user, ItemStack stack, int remainingUseTicks) { + super.usageTick(world, user, stack, remainingUseTicks); + + if (world.isClient) { + + // Direction player is looking + Vec3d look = user.getRotationVec(1.0f); + + // Spawn position (near mouth) + double x = user.getX() + look.x * 0.3; + double y = user.getEyeY() - 0.15; + double z = user.getZ() + look.z * 0.3; + + // Base outward velocity + double speed = 0.08; + + // Add small randomness so it spreads naturally + double vx = look.x * speed + (world.random.nextDouble() - 0.5) * 0.02; + double vy = 0.02 + (world.random.nextDouble() * 0.02); // slight upward drift + double vz = look.z * speed + (world.random.nextDouble() - 0.5) * 0.02; + + if (remainingUseTicks % 4 == 0) { + world.addParticle( + ParticleTypes.SMOKE, + x, y, z, + vx, vy, vz + ); + } + } + + // Serverside code + if (!world.isClient){ + if (remainingUseTicks % 40 == 0) { + world.playSound( + null, + user.getX(), + user.getY(), + user.getZ(), + SoundEvents.ENTITY_GENERIC_EXTINGUISH_FIRE, + SoundCategory.PLAYERS, + 1.0f, + 1.0f + ); + } + } + + } + + @Override + public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) { + user.addStatusEffect(new StatusEffectInstance( + ModEffects.CIGARETTE, + 6000, + 0 + )); + stack.set(ModDataComponentTypes.SMOKING, false); + if (user instanceof PlayerEntity player) { + player.getItemCooldownManager().set(this, 2400); + stack.decrement(1); + + if (!world.isClient) { + player.incrementStat(ModStats.CIGARETTES_USED); + player.incrementStat(Stats.USED.getOrCreateStat(ModItems.CIGARETTE)); + if (player instanceof ServerPlayerEntity s_player){ + int uses = s_player.getStatHandler().getStat(Stats.CUSTOM.getOrCreateStat(ModStats.CIGARETTES_USED)); + + if (uses >= 500) { + grantAdvancement(s_player, "500_cigarettes"); + } + } + } + } + + + + return stack; + } +} diff --git a/src/main/java/com/acethewildfire/acesbs/trim/ModTrimMaterials.java b/src/main/java/com/acethewildfire/acesbs/trim/ModTrimMaterials.java index f5f9d08..281ef03 100644 --- a/src/main/java/com/acethewildfire/acesbs/trim/ModTrimMaterials.java +++ b/src/main/java/com/acethewildfire/acesbs/trim/ModTrimMaterials.java @@ -1,6 +1,7 @@ package com.acethewildfire.acesbs.trim; import com.acethewildfire.acesbs.AcesBS; +import com.acethewildfire.acesbs.item.AshenSteelItems; import com.acethewildfire.acesbs.item.PrismaSteelItems; import net.minecraft.item.Item; import net.minecraft.item.trim.ArmorTrimMaterial; @@ -21,10 +22,14 @@ public class ModTrimMaterials { public static final RegistryKey PRISMA_STEEL = RegistryKey.of(RegistryKeys.TRIM_MATERIAL, Identifier.of(AcesBS.MOD_ID, "prisma_steel")); + public static final RegistryKey ASHEN_STEEL = RegistryKey.of(RegistryKeys.TRIM_MATERIAL, + Identifier.of(AcesBS.MOD_ID, "ashen_steel")); public static void bootstrap (Registerable registerable){ register(registerable, PRISMA_STEEL, Registries.ITEM.getEntry(PrismaSteelItems.PRISMA_STEEL), Style.EMPTY.withColor(TextColor.parse("#B16491").getOrThrow()), 1.0f); + register(registerable, ASHEN_STEEL, Registries.ITEM.getEntry(AshenSteelItems.ASHEN_STEEL), + Style.EMPTY.withColor(TextColor.parse("#b93425").getOrThrow()), 0.4f); } diff --git a/src/main/java/com/acethewildfire/acesbs/trim/ModTrimPatterns.java b/src/main/java/com/acethewildfire/acesbs/trim/ModTrimPatterns.java index c6a4b79..1d9a849 100644 --- a/src/main/java/com/acethewildfire/acesbs/trim/ModTrimPatterns.java +++ b/src/main/java/com/acethewildfire/acesbs/trim/ModTrimPatterns.java @@ -1,6 +1,7 @@ package com.acethewildfire.acesbs.trim; import com.acethewildfire.acesbs.AcesBS; +import com.acethewildfire.acesbs.item.AshenSteelItems; import com.acethewildfire.acesbs.item.PrismaSteelItems; import net.minecraft.item.Item; import net.minecraft.item.trim.ArmorTrimPattern; @@ -15,9 +16,12 @@ import net.minecraft.util.Util; public class ModTrimPatterns { public static final RegistryKey PRISMA = RegistryKey.of(RegistryKeys.TRIM_PATTERN, Identifier.of(AcesBS.MOD_ID, "prisma")); + public static final RegistryKey ASHEN = RegistryKey.of(RegistryKeys.TRIM_PATTERN, + Identifier.of(AcesBS.MOD_ID, "ashen")); public static void bootstrap(Registerable context) { register(context, PrismaSteelItems.PRISMA_SMITHING_TEMPLATE, PRISMA); + register(context, AshenSteelItems.ASHEN_SMITHING_TEMPLATE, ASHEN); } private static void register(Registerable context, Item item, RegistryKey key) { diff --git a/src/main/java/com/acethewildfire/acesbs/util/ModTags.java b/src/main/java/com/acethewildfire/acesbs/util/ModTags.java index 68e78ed..f429bd7 100644 --- a/src/main/java/com/acethewildfire/acesbs/util/ModTags.java +++ b/src/main/java/com/acethewildfire/acesbs/util/ModTags.java @@ -12,6 +12,7 @@ public class ModTags { public static class Blocks { public static final TagKey NEEDS_PRISMA_STEEL_TOOL = createTag("needs_prisma_steel_tool"); public static final TagKey INCORRECT_FOR_PRISMA_STEEL_TOOL = createTag("incorrect_for_prisma_steel_tool"); + public static final TagKey INCORRECT_FOR_ASHEN_STEEL_TOOL = createTag("incorrect_for_ashen_steel_tool"); private static TagKey createTag(String name){ return TagKey.of(RegistryKeys.BLOCK, Identifier.of(AcesBS.MOD_ID, name)); @@ -21,6 +22,8 @@ public class ModTags { public static class Items { public static final TagKey ENTROPY_CONVERTABLE = createTag("entropy_convertable"); public static final TagKey PRISMA_CONVERTABLE = createTag("prisma_convertable"); + public static final TagKey PRISMA_REPAIR = createTag("prisma_repair"); + public static final TagKey ASHEN_REPAIR = createTag("ashen_repair"); private static TagKey createTag(String name){ return TagKey.of(RegistryKeys.ITEM, Identifier.of(AcesBS.MOD_ID, name)); diff --git a/src/main/resources/assets/acesbs/lang/en_us.json b/src/main/resources/assets/acesbs/lang/en_us.json index 5099d97..ea2a380 100644 --- a/src/main/resources/assets/acesbs/lang/en_us.json +++ b/src/main/resources/assets/acesbs/lang/en_us.json @@ -42,11 +42,26 @@ "item.acesbs.prisma_steel_boots": "Prisma Steel Boots", "item.acesbs.prisma_armor_trim_smithing_template": "Prisma Smithing Template", + "item.acesbs.ashen_steel": "Ashen Steel", + "item.acesbs.ashen_steel_sword": "Ashen Steel Sword", + "item.acesbs.ashen_steel_pickaxe": "Ashen Steel Pickaxe", + "item.acesbs.ashen_steel_hammer": "Ashen Steel Hammer", + "item.acesbs.ashen_steel_axe": "Ashen Steel Axe", + "item.acesbs.ashen_steel_shovel": "Ashen Steel Shovel", + "item.acesbs.ashen_steel_hoe": "Ashen Steel Hoe", + + "item.acesbs.ashen_steel_helmet": "Ashen Steel Helmet", + "item.acesbs.ashen_steel_chestplate": "Ashen Steel Chestplate", + "item.acesbs.ashen_steel_leggings": "Ashen Steel Leggings", + "item.acesbs.ashen_steel_boots": "Ashen Steel Boots", + "item.acesbs.ashen_armor_trim_smithing_template": "Ashen Smithing Template", + "item.acesbs.berserkers_pauldron": "Berserker's Pauldron", "item.acesbs.wildfire_boots": "Wildfire Boots", "item.acesbs.sovs_plate_carrier": "Sov's Plate Carrier", "item.acesbs.kaupen_bow": "Kaupen Bow", + "item.acesbs.thot_begone": "Thot Begone", "item.acesbs.crab_rave_music_disc": "Crab Rave Music Disc", "item.acesbs.crab_rave_music_disc.desc": "Noisestorm - Crab Rave [Monstercat Release]", @@ -102,10 +117,14 @@ "trim_material.acesbs.prisma_steel": "Prisma Steel Material", "trim_pattern.acesbs.prisma": "Prisma Armor Pattern", + "trim_material.acesbs.ashen_steel": "Ashen Steel Material", + "trim_pattern.acesbs.ashen": "Ashen Armor Pattern", + "block.acesbs.raw_entropy_block": "Block of Raw Entropy", "block.acesbs.raw_endtropy_block": "Block of Raw Endtropy", "block.acesbs.infernal_ashes_block": "Block of Infernal Ashes", "block.acesbs.prisma_steel_block": "Block of Prisma Steel", + "block.acesbs.ashen_steel_block": "Block of Ashen Steel", "block.acesbs.entropy_ore": "Entropic Ore", "block.acesbs.deepslate_entropy_ore": "Deepslate Entropic Ore", "block.acesbs.infernal_ashes_ore": "Infernal Ashes Ore", diff --git a/src/main/resources/assets/acesbs/textures/block/ashen_steel_block.png b/src/main/resources/assets/acesbs/textures/block/ashen_steel_block.png new file mode 100644 index 0000000..4767446 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/block/ashen_steel_block.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/ashen_armor_trim_smithing_template.png b/src/main/resources/assets/acesbs/textures/item/ashen_armor_trim_smithing_template.png new file mode 100644 index 0000000..4f826ca Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/ashen_armor_trim_smithing_template.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/ashen_steel.png b/src/main/resources/assets/acesbs/textures/item/ashen_steel.png new file mode 100644 index 0000000..854fd4d Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/ashen_steel.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/ashen_steel_axe.png b/src/main/resources/assets/acesbs/textures/item/ashen_steel_axe.png new file mode 100644 index 0000000..d49607d Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/ashen_steel_axe.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/ashen_steel_boots.png b/src/main/resources/assets/acesbs/textures/item/ashen_steel_boots.png new file mode 100644 index 0000000..8585cac Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/ashen_steel_boots.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/ashen_steel_chestplate.png b/src/main/resources/assets/acesbs/textures/item/ashen_steel_chestplate.png new file mode 100644 index 0000000..b213650 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/ashen_steel_chestplate.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/ashen_steel_hammer.png b/src/main/resources/assets/acesbs/textures/item/ashen_steel_hammer.png new file mode 100644 index 0000000..4cd75f7 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/ashen_steel_hammer.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/ashen_steel_helmet.png b/src/main/resources/assets/acesbs/textures/item/ashen_steel_helmet.png new file mode 100644 index 0000000..2513d90 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/ashen_steel_helmet.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/ashen_steel_hoe.png b/src/main/resources/assets/acesbs/textures/item/ashen_steel_hoe.png new file mode 100644 index 0000000..29f4496 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/ashen_steel_hoe.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/ashen_steel_leggings.png b/src/main/resources/assets/acesbs/textures/item/ashen_steel_leggings.png new file mode 100644 index 0000000..6479dea Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/ashen_steel_leggings.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/ashen_steel_pickaxe.png b/src/main/resources/assets/acesbs/textures/item/ashen_steel_pickaxe.png new file mode 100644 index 0000000..0dd81b5 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/ashen_steel_pickaxe.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/ashen_steel_shovel.png b/src/main/resources/assets/acesbs/textures/item/ashen_steel_shovel.png new file mode 100644 index 0000000..4038421 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/ashen_steel_shovel.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/ashen_steel_sword.png b/src/main/resources/assets/acesbs/textures/item/ashen_steel_sword.png new file mode 100644 index 0000000..6daf3c6 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/ashen_steel_sword.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/template_hammer.png b/src/main/resources/assets/acesbs/textures/item/template_hammer.png new file mode 100644 index 0000000..ea0e45e Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/template_hammer.png differ diff --git a/src/main/resources/assets/acesbs/textures/item/thot_begone.png b/src/main/resources/assets/acesbs/textures/item/thot_begone.png new file mode 100644 index 0000000..2f6c531 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/item/thot_begone.png differ diff --git a/src/main/resources/assets/acesbs/textures/models/armor/ashen_steel_layer_1.png b/src/main/resources/assets/acesbs/textures/models/armor/ashen_steel_layer_1.png new file mode 100644 index 0000000..0c36868 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/models/armor/ashen_steel_layer_1.png differ diff --git a/src/main/resources/assets/acesbs/textures/models/armor/ashen_steel_layer_2.png b/src/main/resources/assets/acesbs/textures/models/armor/ashen_steel_layer_2.png new file mode 100644 index 0000000..8590b2a Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/models/armor/ashen_steel_layer_2.png differ diff --git a/src/main/resources/assets/acesbs/textures/trims/color_palettes/ashen_steel.png b/src/main/resources/assets/acesbs/textures/trims/color_palettes/ashen_steel.png new file mode 100644 index 0000000..14c046f Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/trims/color_palettes/ashen_steel.png differ diff --git a/src/main/resources/assets/acesbs/textures/trims/models/armor/ashen.png b/src/main/resources/assets/acesbs/textures/trims/models/armor/ashen.png new file mode 100644 index 0000000..3861b33 Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/trims/models/armor/ashen.png differ diff --git a/src/main/resources/assets/acesbs/textures/trims/models/armor/ashen_leggings.png b/src/main/resources/assets/acesbs/textures/trims/models/armor/ashen_leggings.png new file mode 100644 index 0000000..7bb6fbd Binary files /dev/null and b/src/main/resources/assets/acesbs/textures/trims/models/armor/ashen_leggings.png differ diff --git a/src/main/resources/assets/minecraft/atlases/armor_trims.json b/src/main/resources/assets/minecraft/atlases/armor_trims.json index b763c22..c8c90f6 100644 --- a/src/main/resources/assets/minecraft/atlases/armor_trims.json +++ b/src/main/resources/assets/minecraft/atlases/armor_trims.json @@ -37,7 +37,9 @@ "trims/models/armor/host", "trims/models/armor/host_leggings", "acesbs:trims/models/armor/prisma", - "acesbs:trims/models/armor/prisma_leggings" + "acesbs:trims/models/armor/prisma_leggings", + "acesbs:trims/models/armor/ashen", + "acesbs:trims/models/armor/ashen_leggings" ], "palette_key": "trims/color_palettes/trim_palette", @@ -56,7 +58,8 @@ "gold_darker": "trims/color_palettes/gold_darker", "diamond_darker": "trims/color_palettes/diamond_darker", "netherite_darker": "trims/color_palettes/netherite_darker", - "prisma_steel": "acesbs:trims/color_palettes/prisma_steel" + "prisma_steel": "acesbs:trims/color_palettes/prisma_steel", + "ashen_steel": "acesbs:trims/color_palettes/ashen_steel" } } ] diff --git a/src/main/resources/data/acesbs/recipe/ashen_steel_ingot_from_entropic_entangler.json b/src/main/resources/data/acesbs/recipe/ashen_steel_ingot_from_entropic_entangler.json new file mode 100644 index 0000000..4d2efbe --- /dev/null +++ b/src/main/resources/data/acesbs/recipe/ashen_steel_ingot_from_entropic_entangler.json @@ -0,0 +1,13 @@ +{ + "type": "acesbs:entropic_entangler", + "ingredient": { + "item": "minecraft:iron_ingot" + }, + "ingredient2": { + "item": "acesbs:infernal_ashes" + }, + "result": { + "count": 1, + "id": "acesbs:ashen_steel" + } +} \ No newline at end of file