diff --git a/src/main/java/de/jottyfan/minecraft/block/ModBlocks.java b/src/main/java/de/jottyfan/minecraft/block/ModBlocks.java index 321ebd5..f865bba 100644 --- a/src/main/java/de/jottyfan/minecraft/block/ModBlocks.java +++ b/src/main/java/de/jottyfan/minecraft/block/ModBlocks.java @@ -21,6 +21,8 @@ public class ModBlocks { public static final Block RUBY_BLOCK = registerBlock(Identifier.of(Gtamfmd.MOD_ID, "ruby_block"), x -> new Block(x)); public static final Block RUBY_ORE = registerBlock(Identifier.of(Gtamfmd.MOD_ID, "ruby_ore"), x -> new Block(x.strength(4).requiresTool())); + public static final Block RUBY_DEEPSLATE_ORE = registerBlock(Identifier.of(Gtamfmd.MOD_ID, "ruby_deepslate_ore"), + x -> new Block(x.strength(4).requiresTool())); public static final Block CHRISTMASTREE = registerBlock(Identifier.of(Gtamfmd.MOD_ID, "christmastree"), x -> new ChristmasTree(x)); @@ -45,6 +47,7 @@ public class ModBlocks { ItemGroupEvents.modifyEntriesEvent(ItemGroups.BUILDING_BLOCKS).register(entries -> { entries.add(RUBY_BLOCK); entries.add(RUBY_ORE); + entries.add(RUBY_DEEPSLATE_ORE); }); } } diff --git a/src/main/resources/assets/gtamfmd/blockstates/ruby_deepslate_ore.json b/src/main/resources/assets/gtamfmd/blockstates/ruby_deepslate_ore.json new file mode 100644 index 0000000..5fee374 --- /dev/null +++ b/src/main/resources/assets/gtamfmd/blockstates/ruby_deepslate_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "gtamfmd:block/ruby_deepslate_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gtamfmd/items/ruby_deepslate_ore.json b/src/main/resources/assets/gtamfmd/items/ruby_deepslate_ore.json new file mode 100644 index 0000000..f1f7d9d --- /dev/null +++ b/src/main/resources/assets/gtamfmd/items/ruby_deepslate_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "gtamfmd:block/ruby_deepslate_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gtamfmd/lang/de_de.json b/src/main/resources/assets/gtamfmd/lang/de_de.json index 813322e..6e51539 100644 --- a/src/main/resources/assets/gtamfmd/lang/de_de.json +++ b/src/main/resources/assets/gtamfmd/lang/de_de.json @@ -8,5 +8,6 @@ "item.gtamfmd.ruby_helmet": "Rubinhelm", "item.gtamfmd.ruby_chestplate": "Rubinbrustpanzer", "item.gtamfmd.ruby_leggings": "Rubinhose", - "item.gtamfmd.ruby_boots": "Rubinschuhe" + "item.gtamfmd.ruby_boots": "Rubinschuhe", + "item.gtamfmd.ruby_deepslate_ore": "Rubinerzklumpen" } diff --git a/src/main/resources/assets/gtamfmd/lang/en_us.json b/src/main/resources/assets/gtamfmd/lang/en_us.json index 4aca011..7878bdb 100644 --- a/src/main/resources/assets/gtamfmd/lang/en_us.json +++ b/src/main/resources/assets/gtamfmd/lang/en_us.json @@ -8,5 +8,6 @@ "item.gtamfmd.ruby_helmet": "ruby helmet", "item.gtamfmd.ruby_chestplate": "ruby chestplate", "item.gtamfmd.ruby_leggings": "ruby leggings", - "item.gtamfmd.ruby_boots": "ruby boots" + "item.gtamfmd.ruby_boots": "ruby boots", + "item.gtamfmd.ruby_deepslate_ore": "ruby deepslate ore" } diff --git a/src/main/resources/assets/gtamfmd/models/block/ruby_deepslate_ore.json b/src/main/resources/assets/gtamfmd/models/block/ruby_deepslate_ore.json new file mode 100644 index 0000000..7a041c6 --- /dev/null +++ b/src/main/resources/assets/gtamfmd/models/block/ruby_deepslate_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "gtamfmd:block/ruby_deepslate_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gtamfmd/models/item/ruby_deepslate_ore.json b/src/main/resources/assets/gtamfmd/models/item/ruby_deepslate_ore.json new file mode 100644 index 0000000..d398586 --- /dev/null +++ b/src/main/resources/assets/gtamfmd/models/item/ruby_deepslate_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "gtamfmd:block/ruby_deepslate_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/gtamfmd/textures/block/ruby_deepslate_ore.png b/src/main/resources/assets/gtamfmd/textures/block/ruby_deepslate_ore.png new file mode 100644 index 0000000..00fbb00 Binary files /dev/null and b/src/main/resources/assets/gtamfmd/textures/block/ruby_deepslate_ore.png differ diff --git a/src/main/resources/data/gtamfmd/loot_table/blocks/ruby_deepslate_ore.json b/src/main/resources/data/gtamfmd/loot_table/blocks/ruby_deepslate_ore.json new file mode 100644 index 0000000..49b5857 --- /dev/null +++ b/src/main/resources/data/gtamfmd/loot_table/blocks/ruby_deepslate_ore.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "gtamfmd:ruby_ore" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json index b3a695a..3951377 100644 --- a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "gtamfmd:ruby_block", - "gtamfmd:ruby_ore" + "gtamfmd:ruby_ore", + "gtamfmd:ruby_deepslate_ore" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/block/need_iron_tool.json b/src/main/resources/data/minecraft/tags/block/need_iron_tool.json index b3a695a..3951377 100644 --- a/src/main/resources/data/minecraft/tags/block/need_iron_tool.json +++ b/src/main/resources/data/minecraft/tags/block/need_iron_tool.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "gtamfmd:ruby_block", - "gtamfmd:ruby_ore" + "gtamfmd:ruby_ore", + "gtamfmd:ruby_deepslate_ore" ] } \ No newline at end of file