From 218c98ccfbfffeb6356496065cfab560f45167b3 Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Sat, 13 Aug 2022 12:11:59 +0200 Subject: [PATCH] small optimizations --- gradle.properties | 2 +- .../minecraft/quickiefabric/blocks/BlockSulphor.java | 9 ++++----- .../quickiefabric/init/RegistryManager.java | 7 ++++--- .../recipes/lavabucket_from_magmablock.json | 12 ++++++++++++ .../quickiefabric/recipes/sulphor_from_block.json | 12 ++++++++++++ 5 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/data/quickiefabric/recipes/lavabucket_from_magmablock.json create mode 100644 src/main/resources/data/quickiefabric/recipes/sulphor_from_block.json diff --git a/gradle.properties b/gradle.properties index 6adbb28..bad0cb2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.14.8 # Mod Properties - mod_version = 1.19.0 + mod_version = 1.19.0.1 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric 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 0c83f91..87c1367 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java @@ -3,11 +3,10 @@ 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.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Material; +import net.minecraft.block.OreBlock; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext.Builder; @@ -16,14 +15,14 @@ import net.minecraft.loot.context.LootContext.Builder; * @author jotty * */ -public class BlockSulphor extends Block { +public class BlockSulphor extends OreBlock { public BlockSulphor() { - super(FabricBlockSettings.of(Material.WOOL).hardness(0.5f).requiresTool()); + super(FabricBlockSettings.of(Material.STONE).hardness(0.5f)); } @Override public List getDroppedStacks(BlockState state, Builder builder) { - return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SULPHOR, 9) }); + return Arrays.asList(new ItemStack[] { new ItemStack(QuickieBlocks.BLOCKSULPHOR) }); } } 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 92f81ac..57c0e44 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -101,13 +101,13 @@ public class RegistryManager { Arrays.asList(CountPlacementModifier.of(10), SquarePlacementModifier.of(), HeightRangePlacementModifier.uniform(YOffset.aboveBottom(0), YOffset.belowTop(0)))); public static final PlacedFeature PF_DIRTSALPETER = new PlacedFeature(RegistryEntry.of(CF_DIRTSALPETER), - Arrays.asList(CountPlacementModifier.of(4), SquarePlacementModifier.of(), + Arrays.asList(CountPlacementModifier.of(50), SquarePlacementModifier.of(), HeightRangePlacementModifier.uniform(YOffset.aboveBottom(0), YOffset.belowTop(0)))); public static final PlacedFeature PF_SANDSALPETER = new PlacedFeature(RegistryEntry.of(CF_SANDSALPETER), - Arrays.asList(CountPlacementModifier.of(4), SquarePlacementModifier.of(), + Arrays.asList(CountPlacementModifier.of(50), SquarePlacementModifier.of(), HeightRangePlacementModifier.uniform(YOffset.aboveBottom(0), YOffset.belowTop(0)))); public static final PlacedFeature PF_ORESANDSALPETER = new PlacedFeature(RegistryEntry.of(CF_ORESANDSALPETER), - Arrays.asList(CountPlacementModifier.of(4), SquarePlacementModifier.of(), + Arrays.asList(CountPlacementModifier.of(50), SquarePlacementModifier.of(), HeightRangePlacementModifier.uniform(YOffset.aboveBottom(0), YOffset.belowTop(0)))); public static final ItemGroup QUICKIEFABRIC_GROUP = FabricItemGroupBuilder @@ -263,6 +263,7 @@ public class RegistryManager { FuelRegistry.INSTANCE.add(QuickieItems.SULPHOR, 200); FuelRegistry.INSTANCE.add(QuickieBlocks.BLOCKSULPHOR, 2000); + FuelRegistry.INSTANCE.add(Blocks.MAGMA_BLOCK, 5000); } public static final void registerTools() { diff --git a/src/main/resources/data/quickiefabric/recipes/lavabucket_from_magmablock.json b/src/main/resources/data/quickiefabric/recipes/lavabucket_from_magmablock.json new file mode 100644 index 0000000..5c6fa3d --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/lavabucket_from_magmablock.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:smithing", + "base": { + "item": "minecraft:bucket" + }, + "addition": { + "item": "minecraft:magma_block" + }, + "result": { + "item": "minecraft:lava_bucket" + } +} diff --git a/src/main/resources/data/quickiefabric/recipes/sulphor_from_block.json b/src/main/resources/data/quickiefabric/recipes/sulphor_from_block.json new file mode 100644 index 0000000..19b1f54 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/sulphor_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "quickiefabric:blocksulphor" + } + ], + "result": { + "item": "quickiefabric:sulphor", + "count": 9 + } +} \ No newline at end of file