From 78017263ca17ade1774ede19df2e7494c767c7f5 Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Tue, 13 Dec 2022 19:15:05 +0100 Subject: [PATCH] more salpeter --- gradle.properties | 2 +- .../quickiefabric/blocks/BlockOreSalpeter.java | 8 ++------ .../quickiefabric/blocks/BlockOreSandSalpeter.java | 8 ++------ .../quickiefabric/blocks/BlockSandSalpeter.java | 3 ++- .../quickiefabric/blocks/BlockSulphor.java | 3 ++- .../quickiefabric/init/RegistryManager.java | 10 ++++++++++ .../quickiefabric/{init => loot}/LootHelper.java | 2 +- .../recipes/salpeter_from_brain_coral.json | 13 +++++++++++++ .../recipes/salpeter_from_bubble_coral.json | 13 +++++++++++++ .../recipes/salpeter_from_fire_coral.json | 13 +++++++++++++ .../recipes/salpeter_from_horn_coral.json | 13 +++++++++++++ .../recipes/salpeter_from_tube_coral.json | 13 +++++++++++++ 12 files changed, 85 insertions(+), 16 deletions(-) rename src/main/java/de/jottyfan/minecraft/quickiefabric/{init => loot}/LootHelper.java (93%) create mode 100644 src/main/resources/data/quickiefabric/recipes/salpeter_from_brain_coral.json create mode 100644 src/main/resources/data/quickiefabric/recipes/salpeter_from_bubble_coral.json create mode 100644 src/main/resources/data/quickiefabric/recipes/salpeter_from_fire_coral.json create mode 100644 src/main/resources/data/quickiefabric/recipes/salpeter_from_horn_coral.json create mode 100644 src/main/resources/data/quickiefabric/recipes/salpeter_from_tube_coral.json diff --git a/gradle.properties b/gradle.properties index bce16ad..f993d92 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.14.9 # Mod Properties - mod_version = 1.19.2.6 + mod_version = 1.19.2.7 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSalpeter.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSalpeter.java index bc22421..b5d058c 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSalpeter.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSalpeter.java @@ -10,6 +10,7 @@ import net.minecraft.block.Material; import net.minecraft.block.OreBlock; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.util.math.random.Random; /** * @@ -24,11 +25,6 @@ public class BlockOreSalpeter extends OreBlock { @Override public List getDroppedStacks(BlockState state, Builder builder) { - return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SALPETER) }); + return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SALPETER, 2 + Random.create().nextInt(3)) }); } - -// @Override -// protected int getExperienceWhenMined(Random random) { -// return random.nextInt(3); -// } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSandSalpeter.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSandSalpeter.java index 8c1d6fd..4639968 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSandSalpeter.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSandSalpeter.java @@ -11,6 +11,7 @@ import net.minecraft.block.Material; import net.minecraft.block.OreBlock; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.util.math.random.Random; /** * @@ -25,11 +26,6 @@ public class BlockOreSandSalpeter extends OreBlock { @Override public List getDroppedStacks(BlockState state, Builder builder) { - return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SALPETER), new ItemStack(Blocks.SAND) }); + return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SALPETER, 7 + Random.create().nextInt(4)), new ItemStack(Blocks.SAND) }); } - -// @Override -// protected int getExperienceWhenMined(Random random) { -// return random.nextInt(3); -// } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSandSalpeter.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSandSalpeter.java index 745643c..3a643ca 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSandSalpeter.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSandSalpeter.java @@ -11,6 +11,7 @@ import net.minecraft.block.GravelBlock; import net.minecraft.block.Material; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext.Builder; +import net.minecraft.util.math.random.Random; /** * @@ -25,6 +26,6 @@ public class BlockSandSalpeter extends GravelBlock { @Override public List getDroppedStacks(BlockState state, Builder builder) { - return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SALPETER), new ItemStack(Blocks.SAND) }); + return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SALPETER, 3 + Random.create().nextInt(2)), new ItemStack(Blocks.SAND) }); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java index 87c1367..fbf81d9 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java @@ -3,6 +3,7 @@ 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.Material; @@ -23,6 +24,6 @@ public class BlockSulphor extends OreBlock { @Override public List getDroppedStacks(BlockState state, Builder builder) { - return Arrays.asList(new ItemStack[] { new ItemStack(QuickieBlocks.BLOCKSULPHOR) }); + return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SULPHOR, 9) }); } } 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 c6eec8b..841cb24 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -23,6 +23,7 @@ import de.jottyfan.minecraft.quickiefabric.container.BlockStackerScreenHandler; import de.jottyfan.minecraft.quickiefabric.event.BreakBlockCallback; import de.jottyfan.minecraft.quickiefabric.event.EventBlockBreak; import de.jottyfan.minecraft.quickiefabric.items.QuickieItems; +import de.jottyfan.minecraft.quickiefabric.loot.LootHelper; import de.jottyfan.minecraft.quickiefabric.tools.QuickieTools; import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeSelectionContext; @@ -96,6 +97,10 @@ public class RegistryManager { public static final ConfiguredFeature CF_ORESANDSALPETER = new ConfiguredFeature(Feature.REPLACE_SINGLE_BLOCK, new EmeraldOreFeatureConfig(Blocks.SANDSTONE.getDefaultState(), QuickieBlocks.ORE_SAND_SALPETER.getDefaultState())); + @SuppressWarnings("unchecked") + public static final ConfiguredFeature CF_BLOCKSULFOR = new ConfiguredFeature(Feature.REPLACE_SINGLE_BLOCK, + new EmeraldOreFeatureConfig(Blocks.LAVA.getDefaultState(), + QuickieBlocks.BLOCKSULPHOR.getDefaultState())); public static final PlacedFeature PF_ORESULPHOR = new PlacedFeature(RegistryEntry.of(CF_ORESULPHOR), Arrays.asList(CountPlacementModifier.of(7), SquarePlacementModifier.of(), @@ -115,6 +120,10 @@ public class RegistryManager { public static final PlacedFeature PF_ORESANDSALPETER = new PlacedFeature(RegistryEntry.of(CF_ORESANDSALPETER), Arrays.asList(CountPlacementModifier.of(50), SquarePlacementModifier.of(), HeightRangePlacementModifier.uniform(YOffset.aboveBottom(0), YOffset.belowTop(0)))); + public static final PlacedFeature PF_BLOCKSULFOR = new PlacedFeature(RegistryEntry.of(CF_BLOCKSULFOR), + Arrays.asList(CountPlacementModifier.of(16), SquarePlacementModifier.of(), + HeightRangePlacementModifier.uniform(YOffset.aboveBottom(0), YOffset.belowTop(0)))); + public static final ItemGroup QUICKIEFABRIC_GROUP = FabricItemGroupBuilder .create(new Identifier(QUICKIEFABRIC, "all")).icon(() -> new ItemStack(QuickieItems.SPEEDPOWDER)) @@ -342,6 +351,7 @@ public class RegistryManager { registerFeature("feature_dirtsalpeter", CF_DIRTSALPETER, PF_DIRTSALPETER, overworld); registerFeature("feature_sandsalpeter", CF_SANDSALPETER, PF_SANDSALPETER, overworld); registerFeature("feature_oresandsalpeter", CF_ORESANDSALPETER, PF_ORESANDSALPETER, overworld); + registerFeature("feature_blocksulfor", CF_BLOCKSULFOR, PF_BLOCKSULFOR, nether); } public static final void registerLootings() { diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/LootHelper.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/loot/LootHelper.java similarity index 93% rename from src/main/java/de/jottyfan/minecraft/quickiefabric/init/LootHelper.java rename to src/main/java/de/jottyfan/minecraft/quickiefabric/loot/LootHelper.java index 1553eb7..8cc7f9a 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/LootHelper.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/loot/LootHelper.java @@ -1,4 +1,4 @@ -package de.jottyfan.minecraft.quickiefabric.init; +package de.jottyfan.minecraft.quickiefabric.loot; import net.minecraft.item.Item; import net.minecraft.loot.LootPool; diff --git a/src/main/resources/data/quickiefabric/recipes/salpeter_from_brain_coral.json b/src/main/resources/data/quickiefabric/recipes/salpeter_from_brain_coral.json new file mode 100644 index 0000000..1052425 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/salpeter_from_brain_coral.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:blasting", + "group": "ores", + "ingredient": [ + { + "item": "minecraft:dead_brain_coral_block" + } + ], + "result": "quickiefabric:salpeter", + "count": 3, + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/quickiefabric/recipes/salpeter_from_bubble_coral.json b/src/main/resources/data/quickiefabric/recipes/salpeter_from_bubble_coral.json new file mode 100644 index 0000000..5fcb5b6 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/salpeter_from_bubble_coral.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:blasting", + "group": "ores", + "ingredient": [ + { + "item": "minecraft:dead_bubble_coral_block" + } + ], + "result": "quickiefabric:salpeter", + "count": 3, + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/quickiefabric/recipes/salpeter_from_fire_coral.json b/src/main/resources/data/quickiefabric/recipes/salpeter_from_fire_coral.json new file mode 100644 index 0000000..a905915 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/salpeter_from_fire_coral.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:blasting", + "group": "ores", + "ingredient": [ + { + "item": "minecraft:dead_fire_coral_block" + } + ], + "result": "quickiefabric:salpeter", + "count": 3, + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/quickiefabric/recipes/salpeter_from_horn_coral.json b/src/main/resources/data/quickiefabric/recipes/salpeter_from_horn_coral.json new file mode 100644 index 0000000..cc7e541 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/salpeter_from_horn_coral.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:blasting", + "group": "ores", + "ingredient": [ + { + "item": "minecraft:dead_horn_coral_block" + } + ], + "result": "quickiefabric:salpeter", + "count": 3, + "experience": 0.5, + "cookingtime": 200 +} diff --git a/src/main/resources/data/quickiefabric/recipes/salpeter_from_tube_coral.json b/src/main/resources/data/quickiefabric/recipes/salpeter_from_tube_coral.json new file mode 100644 index 0000000..4519665 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/salpeter_from_tube_coral.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:blasting", + "group": "ores", + "ingredient": [ + { + "item": "minecraft:dead_tube_coral_block" + } + ], + "result": "quickiefabric:salpeter", + "count": 3, + "experience": 0.5, + "cookingtime": 200 +}