diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreDeepslateSulphor.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreDeepslateSulphor.java new file mode 100644 index 0000000..e9615e9 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreDeepslateSulphor.java @@ -0,0 +1,29 @@ +package de.jottyfan.minecraft.quickiefabric.blocks; + +import java.util.Arrays; +import java.util.List; + +import de.jottyfan.minecraft.quickiefabric.items.QuickieItems; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.BlockState; +import net.minecraft.block.ExperienceDroppingBlock; +import net.minecraft.block.Material; +import net.minecraft.item.ItemStack; +import net.minecraft.loot.context.LootContext.Builder; + +/** + * + * @author jotty + * + */ +public class BlockOreDeepslateSulphor extends ExperienceDroppingBlock { + + public BlockOreDeepslateSulphor() { + super(FabricBlockSettings.of(Material.STONE).hardness(1.9f).requiresTool()); + } + + @Override + public List getDroppedStacks(BlockState state, Builder builder) { + return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SULPHOR, 4) }); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java index d5a5b2b..19fdf32 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java @@ -11,6 +11,7 @@ public class QuickieBlocks { public static final BlockOreSalpeter ORE_SALPETER = new BlockOreSalpeter(); public static final BlockOreSandSalpeter ORE_SAND_SALPETER = new BlockOreSandSalpeter(); public static final BlockOreSulphor ORE_SULPHOR = new BlockOreSulphor(); + public static final BlockOreDeepslateSulphor ORE_DEEPSLATESULPHOR = new BlockOreDeepslateSulphor(); public static final BlockSandSalpeter SAND_SALPETER = new BlockSandSalpeter(); public static final BlockLavahoarder LAVAHOARDER = new BlockLavahoarder(); public static final BlockEmptyLavahoarder EMPTYLAVAHOARDER = new BlockEmptyLavahoarder(); diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/FeaturesManager.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/FeaturesManager.java index c66ece2..e3280a7 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/FeaturesManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/FeaturesManager.java @@ -19,16 +19,22 @@ import net.minecraft.world.gen.feature.PlacedFeature; public class FeaturesManager { public static final RegistryKey> CF_ORESULFUR = genCf("oresulphor"); + public static final RegistryKey> CF_OREDEEPSLATESULFUR = genCf("oredepslatesulphor"); public static final RegistryKey> CF_ORESALPETER = genCf("oresalpeter"); public static final RegistryKey> CF_ORENETHERSULPHOR = genCf("orenethersulphore"); - public static final RegistryKey> CF_BLOCKSULPHOR = genCf("blocksulphore"); - // TODO: CF_DIRTSALPETER, CF_SANDSALPETER, CF_ORESANDSALPETER, also the json files for that + public static final RegistryKey> CF_BLOCKSULPHOR = genCf("blocksulphor"); + public static final RegistryKey> CF_DIRTSALPETER = genCf("dirtsalpeter"); + public static final RegistryKey> CF_SANDSALPETER = genCf("sandsalpeter"); + public static final RegistryKey> CF_ORESANDSALPETER = genCf("oresandsalpeter"); public static final RegistryKey PF_ORESULPHOR = genPf("oresulphor"); + public static final RegistryKey PF_OREDEEPSLATESULPHOR = genPf("oredeepslatesulphor"); public static final RegistryKey PF_ORESALPETER = genPf("oresalpeter"); public static final RegistryKey PF_ORENETHERSULPHOR = genPf("orenethersulphor"); public static final RegistryKey PF_BLOCKSULPHOR = genPf("blocksulphor"); - // TODO: PF_DIRTSALPETER, PF_SANDSALPETER, PF_ORESANDSALPETER, also the json files for that + public static final RegistryKey PF_DIRTSALPETER = genPf("dirtsalpeter"); + public static final RegistryKey PF_SANDSALPETER = genPf("sandsalpeter"); + public static final RegistryKey PF_ORESANDSALPETER = genPf("oresandsalpeter"); private static final RegistryKey> genCf(String name) { return RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, new Identifier(RegistryManager.QUICKIEFABRIC, name)); @@ -40,8 +46,12 @@ public class FeaturesManager { protected static final BiConsumer overworldOres() { return (bsc, bmc) -> { - bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_ORESALPETER); bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_ORESULPHOR); + bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_ORESALPETER); + bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_DIRTSALPETER); + bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_SANDSALPETER); + bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_ORESANDSALPETER); + bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_OREDEEPSLATESULPHOR); }; } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java index f9eb8e7..20328d2 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -105,6 +105,7 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieBlocks.ORE_SALPETER)); stacks.add(new ItemStack(QuickieBlocks.ORE_SAND_SALPETER)); stacks.add(new ItemStack(QuickieBlocks.ORE_SULPHOR)); + stacks.add(new ItemStack(QuickieBlocks.ORE_DEEPSLATESULPHOR)); stacks.add(new ItemStack(QuickieBlocks.SAND_SALPETER)); stacks.add(new ItemStack(QuickieBlocks.LAVAHOARDER)); stacks.add(new ItemStack(QuickieBlocks.EMPTYLAVAHOARDER)); @@ -180,6 +181,7 @@ public class RegistryManager { registerBlock(QuickieBlocks.ORE_SALPETER, "oresalpeter"); registerBlock(QuickieBlocks.ORE_SAND_SALPETER, "oresandsalpeter"); registerBlock(QuickieBlocks.ORE_SULPHOR, "oresulphor"); + registerBlock(QuickieBlocks.ORE_DEEPSLATESULPHOR, "oredeepslatesulphor"); registerBlock(QuickieBlocks.SAND_SALPETER, "sandsalpeter"); registerBlock(QuickieBlocks.LAVAHOARDER, "lavahoarder"); registerBlock(QuickieBlocks.EMPTYLAVAHOARDER, "emptylavahoarder"); diff --git a/src/main/resources/assets/quickiefabric/blockstates/oredeepslatesulphor.json b/src/main/resources/assets/quickiefabric/blockstates/oredeepslatesulphor.json new file mode 100644 index 0000000..609b835 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/blockstates/oredeepslatesulphor.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "quickiefabric:block/oredeepslatesulphor" + } + } +} diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index aaa8df1..818523e 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -39,6 +39,7 @@ "block.quickiefabric.oresalpeter": "Salpetererz", "block.quickiefabric.oresandsalpeter": "Salpetergestein", "block.quickiefabric.oresulphor": "Schwefelgestein", + "block.quickiefabric.oredeepslatesulphor": "Schwefeltiefengestein", "block.quickiefabric.dirtsalpeter": "Salpetererde", "block.quickiefabric.sandsalpeter": "Salpetersand", "block.quickiefabric.constructionborder": "Bauplangrenzblock", diff --git a/src/main/resources/assets/quickiefabric/lang/en_us.json b/src/main/resources/assets/quickiefabric/lang/en_us.json index d63fe4c..9113ec4 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -39,6 +39,7 @@ "block.quickiefabric.oresalpeter": "salpeter ore", "block.quickiefabric.oresandsalpeter": "salpeter stone", "block.quickiefabric.oresulphor": "sulfur stone", + "block.quickiefabric.oredeepslatesulphor": "deepslate sulfur stone", "block.quickiefabric.dirtsalpeter": "salpeter dirt", "block.quickiefabric.sandsalpeter": "salpeter sand", "block.quickiefabric.constructionborder": "building plan border block", diff --git a/src/main/resources/assets/quickiefabric/models/block/oredeepslatesulphor.json b/src/main/resources/assets/quickiefabric/models/block/oredeepslatesulphor.json new file mode 100644 index 0000000..d4a4161 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/block/oredeepslatesulphor.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "quickiefabric:block/oredeepslatesulphor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/oredeepslatesulphor.json b/src/main/resources/assets/quickiefabric/models/item/oredeepslatesulphor.json new file mode 100644 index 0000000..814772d --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/oredeepslatesulphor.json @@ -0,0 +1,10 @@ +{ + "parent": "quickiefabric:block/oredeepslatesulphor", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/textures/block/oredeepslatesulphor.png b/src/main/resources/assets/quickiefabric/textures/block/oredeepslatesulphor.png new file mode 100644 index 0000000..da2828b Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/block/oredeepslatesulphor.png differ diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 4328181..3df7823 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "quickiefabric:oresulphor", + "quickiefabric:oredeepslatesulphor", "quickiefabric:orenethersulphor", "quickiefabric:oresalpeter", "quickiefabric:oresandsalpeter", diff --git a/src/main/resources/data/quickiefabric/worldgen/configured_feature/dirtsalpeter.json b/src/main/resources/data/quickiefabric/worldgen/configured_feature/dirtsalpeter.json new file mode 100644 index 0000000..bf59ce6 --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/configured_feature/dirtsalpeter.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 4, + "targets": [ + { + "state": { + "Name": "quickiefabric:dirtsalpeter" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:dirt" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/worldgen/configured_feature/oredeepslatesulphor.json b/src/main/resources/data/quickiefabric/worldgen/configured_feature/oredeepslatesulphor.json new file mode 100644 index 0000000..8dfb5a4 --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/configured_feature/oredeepslatesulphor.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 20, + "targets": [ + { + "state": { + "Name": "quickiefabric:oredeepslatesulphor" + }, + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:deepslate_ore_replaceables" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/worldgen/configured_feature/oresalpeter.json b/src/main/resources/data/quickiefabric/worldgen/configured_feature/oresalpeter.json index f9b6991..846eecd 100644 --- a/src/main/resources/data/quickiefabric/worldgen/configured_feature/oresalpeter.json +++ b/src/main/resources/data/quickiefabric/worldgen/configured_feature/oresalpeter.json @@ -12,15 +12,6 @@ "predicate_type": "minecraft:tag_match", "tag": "minecraft:stone_ore_replaceables" } - }, - { - "state": { - "Name": "quickiefabric:oresalpeter" - }, - "target": { - "predicate_type": "minecraft:tag_match", - "tag": "minecraft:deepslate_ore_replaceables" - } } ] } diff --git a/src/main/resources/data/quickiefabric/worldgen/configured_feature/oresandsalpeter.json b/src/main/resources/data/quickiefabric/worldgen/configured_feature/oresandsalpeter.json new file mode 100644 index 0000000..81a3c2d --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/configured_feature/oresandsalpeter.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 6, + "targets": [ + { + "state": { + "Name": "quickiefabric:oresandsalpeter" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:sandstone" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/worldgen/configured_feature/oresulphor.json b/src/main/resources/data/quickiefabric/worldgen/configured_feature/oresulphor.json index 2f21e5b..46ce35a 100644 --- a/src/main/resources/data/quickiefabric/worldgen/configured_feature/oresulphor.json +++ b/src/main/resources/data/quickiefabric/worldgen/configured_feature/oresulphor.json @@ -2,7 +2,7 @@ "type": "minecraft:ore", "config": { "discard_chance_on_air_exposure": 0.0, - "size": 20, + "size": 10, "targets": [ { "state": { @@ -12,15 +12,6 @@ "predicate_type": "minecraft:tag_match", "tag": "minecraft:stone_ore_replaceables" } - }, - { - "state": { - "Name": "quickiefabric:oresulphor" - }, - "target": { - "predicate_type": "minecraft:tag_match", - "tag": "minecraft:deepslate_ore_replaceables" - } } ] } diff --git a/src/main/resources/data/quickiefabric/worldgen/configured_feature/sandsalpeter.json b/src/main/resources/data/quickiefabric/worldgen/configured_feature/sandsalpeter.json new file mode 100644 index 0000000..d743e61 --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/configured_feature/sandsalpeter.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 8, + "targets": [ + { + "state": { + "Name": "quickiefabric:sandsalpeter" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:sand" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/worldgen/placed_feature/blocksulphor.json b/src/main/resources/data/quickiefabric/worldgen/placed_feature/blocksulphor.json index 2c40eb5..32c98c9 100644 --- a/src/main/resources/data/quickiefabric/worldgen/placed_feature/blocksulphor.json +++ b/src/main/resources/data/quickiefabric/worldgen/placed_feature/blocksulphor.json @@ -1,5 +1,5 @@ { - "feature": "quickiefabric:oresulphor", + "feature": "quickiefabric:blocksulphor", "placement": [ { "type": "minecraft:count", diff --git a/src/main/resources/data/quickiefabric/worldgen/placed_feature/dirtsalpeter.json b/src/main/resources/data/quickiefabric/worldgen/placed_feature/dirtsalpeter.json new file mode 100644 index 0000000..eb27da5 --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/placed_feature/dirtsalpeter.json @@ -0,0 +1,24 @@ +{ + "feature": "quickiefabric:dirtsalpeter", + "placement": [ + { + "type": "minecraft:count", + "count": 5 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 125 + }, + "min_inclusive": { + "absolute": 16 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/worldgen/placed_feature/oredeepslatesulphor.json b/src/main/resources/data/quickiefabric/worldgen/placed_feature/oredeepslatesulphor.json new file mode 100644 index 0000000..2dd317b --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/placed_feature/oredeepslatesulphor.json @@ -0,0 +1,24 @@ +{ + "feature": "quickiefabric:oredeepslatesulphor", + "placement": [ + { + "type": "minecraft:count", + "count": 9 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 0 + }, + "min_inclusive": { + "absolute": -125 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/worldgen/placed_feature/orenethersulphor.json b/src/main/resources/data/quickiefabric/worldgen/placed_feature/orenethersulphor.json index 60f6476..03b7067 100644 --- a/src/main/resources/data/quickiefabric/worldgen/placed_feature/orenethersulphor.json +++ b/src/main/resources/data/quickiefabric/worldgen/placed_feature/orenethersulphor.json @@ -1,5 +1,5 @@ { - "feature": "quickiefabric:oresulphor", + "feature": "quickiefabric:orenethersulphor", "placement": [ { "type": "minecraft:count", diff --git a/src/main/resources/data/quickiefabric/worldgen/placed_feature/oresandsalpeter.json b/src/main/resources/data/quickiefabric/worldgen/placed_feature/oresandsalpeter.json new file mode 100644 index 0000000..fc03bc7 --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/placed_feature/oresandsalpeter.json @@ -0,0 +1,24 @@ +{ + "feature": "quickiefabric:oresandsalpeter", + "placement": [ + { + "type": "minecraft:count", + "count": 15 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 125 + }, + "min_inclusive": { + "absolute": 32 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/worldgen/placed_feature/oresulphor.json b/src/main/resources/data/quickiefabric/worldgen/placed_feature/oresulphor.json index e4509a0..6c72434 100644 --- a/src/main/resources/data/quickiefabric/worldgen/placed_feature/oresulphor.json +++ b/src/main/resources/data/quickiefabric/worldgen/placed_feature/oresulphor.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 15 + "count": 9 }, { "type": "minecraft:in_square" @@ -16,7 +16,7 @@ "absolute": 64 }, "min_inclusive": { - "absolute": -125 + "absolute": 0 } } } diff --git a/src/main/resources/data/quickiefabric/worldgen/placed_feature/sandsalpeter.json b/src/main/resources/data/quickiefabric/worldgen/placed_feature/sandsalpeter.json new file mode 100644 index 0000000..9a4e3cf --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/placed_feature/sandsalpeter.json @@ -0,0 +1,24 @@ +{ + "feature": "quickiefabric:sandsalpeter", + "placement": [ + { + "type": "minecraft:count", + "count": 10 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 125 + }, + "min_inclusive": { + "absolute": 32 + } + } + } + ] +} \ No newline at end of file