diff --git a/src/main/java/de/jottyfan/gta/gdp/GTAGDP.java b/src/main/java/de/jottyfan/gta/gdp/GTAGDP.java index a3f65ed..5a09adc 100644 --- a/src/main/java/de/jottyfan/gta/gdp/GTAGDP.java +++ b/src/main/java/de/jottyfan/gta/gdp/GTAGDP.java @@ -1,12 +1,12 @@ package de.jottyfan.gta.gdp; -import net.fabricmc.api.ModInitializer; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import de.jottyfan.gta.gdp.block.ModBlocks; import de.jottyfan.gta.gdp.item.ModItems; +import de.jottyfan.gta.gdp.world.gen.ModOreGeneration; +import net.fabricmc.api.ModInitializer; /** * @@ -21,5 +21,6 @@ public class GTAGDP implements ModInitializer { public void onInitialize() { ModItems.registerModItems(); ModBlocks.registerModBlocks(); + ModOreGeneration.generateOres(); } } \ No newline at end of file diff --git a/src/main/java/de/jottyfan/gta/gdp/block/ModBlocks.java b/src/main/java/de/jottyfan/gta/gdp/block/ModBlocks.java index b45f81c..e8e9bb4 100644 --- a/src/main/java/de/jottyfan/gta/gdp/block/ModBlocks.java +++ b/src/main/java/de/jottyfan/gta/gdp/block/ModBlocks.java @@ -26,6 +26,8 @@ public class ModBlocks { .luminance(state -> state.get(RubyBlock.ACTIVATED) ? 15 : 0)); public static final Block RUBY_ORE = registerBlock(Identifier.of(GTAGDP.MOD_ID, "ruby_ore"), AbstractBlock.Settings.create().strength(3f).requiresTool()); + public static final Block RUBY_DEEPSLATE_ORE = registerBlock(Identifier.of(GTAGDP.MOD_ID, "ruby_deepslate_ore"), + AbstractBlock.Settings.create().strength(3f).requiresTool()); private static Block registerRubyBlock(Identifier identifier, Block.Settings settings) { Block block = new RubyBlock(settings.registryKey(RegistryKey.of(RegistryKeys.BLOCK, identifier))); @@ -50,6 +52,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/gtagdp/blockstates/ruby_deepslate_ore.json b/src/main/resources/assets/gtagdp/blockstates/ruby_deepslate_ore.json new file mode 100644 index 0000000..0d91084 --- /dev/null +++ b/src/main/resources/assets/gtagdp/blockstates/ruby_deepslate_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "gtagdp:block/ruby_deepslate_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gtagdp/items/ruby_deepslate_ore.json b/src/main/resources/assets/gtagdp/items/ruby_deepslate_ore.json new file mode 100644 index 0000000..ac7ed90 --- /dev/null +++ b/src/main/resources/assets/gtagdp/items/ruby_deepslate_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "gtagdp:block/ruby_deepslate_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gtagdp/lang/de_de.json b/src/main/resources/assets/gtagdp/lang/de_de.json index 4dcbdb3..7ad5616 100644 --- a/src/main/resources/assets/gtagdp/lang/de_de.json +++ b/src/main/resources/assets/gtagdp/lang/de_de.json @@ -3,5 +3,6 @@ "item.gtagdp.rubyball": "Rubinball", "block.gtagdp.ruby_block": "Rubinblock", - "block.gtagdp.ruby_ore": "Rubinerz" + "block.gtagdp.ruby_ore": "Rubinerz", + "block.gtagdp.ruby_deepslate_ore": "Rubinerzklumpen" } \ No newline at end of file diff --git a/src/main/resources/assets/gtagdp/lang/en_us.json b/src/main/resources/assets/gtagdp/lang/en_us.json index a4d3366..0b21abd 100644 --- a/src/main/resources/assets/gtagdp/lang/en_us.json +++ b/src/main/resources/assets/gtagdp/lang/en_us.json @@ -3,5 +3,6 @@ "item.gtagdp.rubyball": "Ruby ball", "block.gtagdp.ruby_block": "Ruby block", - "block.gtagdp.ruby_ore": "Ruby ore" + "block.gtagdp.ruby_ore": "Ruby ore", + "block.gtagdp.ruby_deepslate_ore": "Ruby ore lump" } \ No newline at end of file diff --git a/src/main/resources/assets/gtagdp/models/block/ruby_deepslate_ore.json b/src/main/resources/assets/gtagdp/models/block/ruby_deepslate_ore.json new file mode 100644 index 0000000..e5c3f71 --- /dev/null +++ b/src/main/resources/assets/gtagdp/models/block/ruby_deepslate_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "gtagdp:block/ruby_deepslate_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/gtagdp/models/item/ruby_deepslate_ore.json b/src/main/resources/assets/gtagdp/models/item/ruby_deepslate_ore.json new file mode 100644 index 0000000..6aad57d --- /dev/null +++ b/src/main/resources/assets/gtagdp/models/item/ruby_deepslate_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "gtagdp:block/ruby_deepslate_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/gtagdp/textures/block/ruby_deepslate_ore.png b/src/main/resources/assets/gtagdp/textures/block/ruby_deepslate_ore.png new file mode 100644 index 0000000..00fbb00 Binary files /dev/null and b/src/main/resources/assets/gtagdp/textures/block/ruby_deepslate_ore.png differ diff --git a/src/main/resources/data/gtagdp/loot_table/blocks/ruby_deepslate_ore.json b/src/main/resources/data/gtagdp/loot_table/blocks/ruby_deepslate_ore.json new file mode 100644 index 0000000..c53e4be --- /dev/null +++ b/src/main/resources/data/gtagdp/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": "gtagdp: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 98b75b6..9c28cbb 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": [ "gtagdp:ruby_block", - "gtagdp:ruby_ore" + "gtagdp:ruby_ore", + "gtagdp:ruby_deepslate_ore" ] } 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 39d91b9..7645395 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": [ "gtagdp:ruby_block", - "gtagdp:ruby_ore" + "gtagdp:ruby_ore", + "gtagdp:ruby_deepslate_ore" ] } \ No newline at end of file