diff --git a/src/main/generated/assets/acesbs/blockstates/fractal_diamond_block.json b/src/main/generated/assets/acesbs/blockstates/fractal_diamond_block.json new file mode 100644 index 0000000..9336108 --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/fractal_diamond_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "acesbs:block/fractal_diamond_block" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/blockstates/hellfire_diamond_block.json b/src/main/generated/assets/acesbs/blockstates/hellfire_diamond_block.json new file mode 100644 index 0000000..7bfbadb --- /dev/null +++ b/src/main/generated/assets/acesbs/blockstates/hellfire_diamond_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "acesbs:block/hellfire_diamond_block" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/fractal_diamond_block.json b/src/main/generated/assets/acesbs/items/fractal_diamond_block.json new file mode 100644 index 0000000..878f28c --- /dev/null +++ b/src/main/generated/assets/acesbs/items/fractal_diamond_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/fractal_diamond_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/hellfire_diamond_block.json b/src/main/generated/assets/acesbs/items/hellfire_diamond_block.json new file mode 100644 index 0000000..bb6eab4 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/hellfire_diamond_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/hellfire_diamond_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/fractal_diamond_block.json b/src/main/generated/assets/acesbs/models/block/fractal_diamond_block.json new file mode 100644 index 0000000..1b8e4fc --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/fractal_diamond_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "acesbs:block/fractal_diamond_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/block/hellfire_diamond_block.json b/src/main/generated/assets/acesbs/models/block/hellfire_diamond_block.json new file mode 100644 index 0000000..60e9ffc --- /dev/null +++ b/src/main/generated/assets/acesbs/models/block/hellfire_diamond_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "acesbs:block/hellfire_diamond_block" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fractal_diamond.json b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fractal_diamond.json new file mode 100644 index 0000000..91ac195 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/fractal_diamond.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fractal_diamond_block": { + "conditions": { + "items": [ + { + "items": "acesbs:fractal_diamond_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fractal_diamond" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fractal_diamond_block" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fractal_diamond" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/building_blocks/hellfire_diamond.json b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/hellfire_diamond.json new file mode 100644 index 0000000..a8b9659 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/building_blocks/hellfire_diamond.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hellfire_diamond_block": { + "conditions": { + "items": [ + { + "items": "acesbs:hellfire_diamond_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:hellfire_diamond" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hellfire_diamond_block" + ] + ], + "rewards": { + "recipes": [ + "acesbs:hellfire_diamond" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/decorations/fractal_diamond_block.json b/src/main/generated/data/acesbs/advancement/recipes/decorations/fractal_diamond_block.json new file mode 100644 index 0000000..e9e2482 --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/decorations/fractal_diamond_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_fractal_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:fractal_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:fractal_diamond_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_fractal_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:fractal_diamond_block" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/advancement/recipes/decorations/hellfire_diamond_block.json b/src/main/generated/data/acesbs/advancement/recipes/decorations/hellfire_diamond_block.json new file mode 100644 index 0000000..d3780db --- /dev/null +++ b/src/main/generated/data/acesbs/advancement/recipes/decorations/hellfire_diamond_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_hellfire_diamond": { + "conditions": { + "items": [ + { + "items": "acesbs:hellfire_diamond" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "acesbs:hellfire_diamond_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_hellfire_diamond" + ] + ], + "rewards": { + "recipes": [ + "acesbs:hellfire_diamond_block" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/ashen_steel_block.json b/src/main/generated/data/acesbs/loot_table/blocks/ashen_steel_block.json new file mode 100644 index 0000000..02a70a2 --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/ashen_steel_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:ashen_steel_block" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/fractal_diamond_block.json b/src/main/generated/data/acesbs/loot_table/blocks/fractal_diamond_block.json new file mode 100644 index 0000000..beeefd7 --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/fractal_diamond_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:fractal_diamond_block" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/loot_table/blocks/hellfire_diamond_block.json b/src/main/generated/data/acesbs/loot_table/blocks/hellfire_diamond_block.json new file mode 100644 index 0000000..5d09a38 --- /dev/null +++ b/src/main/generated/data/acesbs/loot_table/blocks/hellfire_diamond_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "acesbs:hellfire_diamond_block" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fractal_diamond.json b/src/main/generated/data/acesbs/recipe/fractal_diamond.json new file mode 100644 index 0000000..6f0bac2 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fractal_diamond.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + "acesbs:fractal_diamond_block" + ], + "result": { + "count": 9, + "id": "acesbs:fractal_diamond" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/fractal_diamond_block.json b/src/main/generated/data/acesbs/recipe/fractal_diamond_block.json new file mode 100644 index 0000000..de95235 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/fractal_diamond_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": "acesbs:fractal_diamond" + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "count": 1, + "id": "acesbs:fractal_diamond_block" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/hellfire_diamond.json b/src/main/generated/data/acesbs/recipe/hellfire_diamond.json new file mode 100644 index 0000000..628e108 --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/hellfire_diamond.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + "acesbs:hellfire_diamond_block" + ], + "result": { + "count": 9, + "id": "acesbs:hellfire_diamond" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/recipe/hellfire_diamond_block.json b/src/main/generated/data/acesbs/recipe/hellfire_diamond_block.json new file mode 100644 index 0000000..1097bfb --- /dev/null +++ b/src/main/generated/data/acesbs/recipe/hellfire_diamond_block.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": "acesbs:hellfire_diamond" + }, + "pattern": [ + "###", + "###", + "###" + ], + "result": { + "count": 1, + "id": "acesbs:hellfire_diamond_block" + } +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks.json b/src/main/generated/data/c/tags/item/storage_blocks.json index dc49082..688a634 100644 --- a/src/main/generated/data/c/tags/item/storage_blocks.json +++ b/src/main/generated/data/c/tags/item/storage_blocks.json @@ -2,6 +2,8 @@ "values": [ "acesbs:prisma_steel_block", "acesbs:ashen_steel_block", + "acesbs:fractal_diamond_block", + "acesbs:hellfire_diamond_block", "acesbs:raw_entropy_block", "acesbs:infernal_ashes_block", "acesbs:raw_endtropy_block" 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 046ab01..b1263ed 100644 --- a/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json @@ -6,6 +6,8 @@ "acesbs:stable_endtropy_block", "acesbs:prisma_steel_block", "acesbs:ashen_steel_block", + "acesbs:fractal_diamond_block", + "acesbs:hellfire_diamond_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 df41046..f186b5a 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,8 @@ "acesbs:raw_endtropy_block", "acesbs:stable_endtropy_block", "acesbs:prisma_steel_block", - "acesbs:ashen_steel_block" + "acesbs:ashen_steel_block", + "acesbs:fractal_diamond_block", + "acesbs:hellfire_diamond_block" ] } \ No newline at end of file diff --git a/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md b/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md index aa62fb5..52504ce 100644 --- a/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md +++ b/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md @@ -22,6 +22,4 @@ # Known Issues - The Command Core Item does not display the correct texture when activated. - The Command Core Item does not offer any functionality -- Fractal Diamonds have no use and no translation -- Hellfire Diamonds have no use and no translation - The Combustible Lemon does not render when thrown. \ No newline at end of file diff --git a/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java b/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java index 11b31f5..b97e262 100644 --- a/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java +++ b/src/main/java/com/acethewildfire/acesbs/block/ModBlocks.java @@ -205,7 +205,7 @@ public class ModBlocks { .instrument(NoteBlockInstrument.CHIME) .requiresTool() .strength(5.0F, 6.0F) - .sounds(BlockSoundGroup.NETHERITE) + .sounds(BlockSoundGroup.METAL) ) ); @@ -217,7 +217,7 @@ public class ModBlocks { .instrument(NoteBlockInstrument.CHIME) .requiresTool() .strength(5.0F, 6.0F) - .sounds(BlockSoundGroup.NETHERITE) + .sounds(BlockSoundGroup.METAL) ) ); diff --git a/src/main/resources/assets/acesbs/lang/en_us.json b/src/main/resources/assets/acesbs/lang/en_us.json index 713f009..06eba25 100644 --- a/src/main/resources/assets/acesbs/lang/en_us.json +++ b/src/main/resources/assets/acesbs/lang/en_us.json @@ -159,6 +159,8 @@ "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.fractal_diamond_block": "Block of Fractal Diamond", + "block.acesbs.hellfire_diamond_block": "Block of Hellfire Diamond", "block.acesbs.entropy_ore": "Entropic Ore", "block.acesbs.deepslate_entropy_ore": "Deepslate Entropic Ore", "block.acesbs.infernal_ashes_ore": "Infernal Ashes Ore",