From 6ca6b35be4e3666c4a202c275bc1e896533f63db Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Mon, 9 Jun 2025 12:06:44 +0200 Subject: [PATCH] added deepslate ruby ore --- src/main/java/de/jottyfan/gta/gdp/GTAGDP.java | 5 +++-- .../de/jottyfan/gta/gdp/block/ModBlocks.java | 3 +++ .../blockstates/ruby_deepslate_ore.json | 7 ++++++ .../gtagdp/items/ruby_deepslate_ore.json | 6 ++++++ .../resources/assets/gtagdp/lang/de_de.json | 3 ++- .../resources/assets/gtagdp/lang/en_us.json | 3 ++- .../models/block/ruby_deepslate_ore.json | 6 ++++++ .../models/item/ruby_deepslate_ore.json | 3 +++ .../textures/block/ruby_deepslate_ore.png | Bin 0 -> 5266 bytes .../loot_table/blocks/ruby_deepslate_ore.json | 20 ++++++++++++++++++ .../tags/block/mineable/pickaxe.json | 3 ++- .../minecraft/tags/block/need_iron_tool.json | 3 ++- 12 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/assets/gtagdp/blockstates/ruby_deepslate_ore.json create mode 100644 src/main/resources/assets/gtagdp/items/ruby_deepslate_ore.json create mode 100644 src/main/resources/assets/gtagdp/models/block/ruby_deepslate_ore.json create mode 100644 src/main/resources/assets/gtagdp/models/item/ruby_deepslate_ore.json create mode 100644 src/main/resources/assets/gtagdp/textures/block/ruby_deepslate_ore.png create mode 100644 src/main/resources/data/gtagdp/loot_table/blocks/ruby_deepslate_ore.json 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 0000000000000000000000000000000000000000..00fbb00054a391c37f115721639ba69b9dcf5914 GIT binary patch literal 5266 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 N>WKL8Pp73W{U?k{gV6v0 literal 0 HcmV?d00001 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