diff --git a/gradle.properties b/gradle.properties index f993d92..f1a984c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ # Fabric Properties # check these on https://fabricmc.net/versions.html - minecraft_version=1.19.2 - yarn_mappings=1.19.2+build.8 - loader_version=0.14.9 + minecraft_version=1.19.3 + yarn_mappings=1.19.3+build.3 + loader_version=0.14.11 # Mod Properties - mod_version = 1.19.2.7 + mod_version = 1.19.3.0 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric # Dependencies - fabric_version=0.60.0+1.19.2 + fabric_version=0.69.1+1.19.3 diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/QuickieFabric.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/QuickieFabric.java index 3c8eeef..5a8f2e3 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/QuickieFabric.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/QuickieFabric.java @@ -4,7 +4,7 @@ import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; import net.fabricmc.api.ModInitializer; /** - * + * * @author jotty * */ @@ -17,8 +17,8 @@ public class QuickieFabric implements ModInitializer { RegistryManager.registerEvents(); RegistryManager.registerBlocks(); RegistryManager.registerBlockEntities(); - RegistryManager.registerContainer(); RegistryManager.registerFeatures(); + RegistryManager.registerContainer(); RegistryManager.registerLootings(); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreNetherSulphor.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreNetherSulphor.java index 997b682..9d89021 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreNetherSulphor.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreNetherSulphor.java @@ -5,9 +5,10 @@ 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.ExperienceDroppingBlock; import net.minecraft.block.Material; -import net.minecraft.block.OreBlock; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext.Builder; @@ -16,7 +17,7 @@ import net.minecraft.loot.context.LootContext.Builder; * @author jotty * */ -public class BlockOreNetherSulphor extends OreBlock { +public class BlockOreNetherSulphor extends ExperienceDroppingBlock { public BlockOreNetherSulphor() { super(FabricBlockSettings.of(Material.STONE).hardness(2.1f).requiresTool()); @@ -26,9 +27,4 @@ public class BlockOreNetherSulphor extends OreBlock { public List getDroppedStacks(BlockState state, Builder builder) { return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SULPHOR) }); } - -// @Override -// protected int getExperienceWhenMined(Random random) { -// return random.nextInt(3); -// } } 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 b5d058c..3e7e386 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSalpeter.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSalpeter.java @@ -6,8 +6,8 @@ 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.block.OreBlock; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext.Builder; import net.minecraft.util.math.random.Random; @@ -17,7 +17,7 @@ import net.minecraft.util.math.random.Random; * @author jotty * */ -public class BlockOreSalpeter extends OreBlock { +public class BlockOreSalpeter extends ExperienceDroppingBlock { public BlockOreSalpeter() { super(FabricBlockSettings.of(Material.STONE).hardness(3.1f).requiresTool()); 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 4639968..b2dd3af 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSandSalpeter.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSandSalpeter.java @@ -7,8 +7,8 @@ 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.Blocks; +import net.minecraft.block.ExperienceDroppingBlock; 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; @@ -18,7 +18,7 @@ import net.minecraft.util.math.random.Random; * @author jotty * */ -public class BlockOreSandSalpeter extends OreBlock { +public class BlockOreSandSalpeter extends ExperienceDroppingBlock { public BlockOreSandSalpeter() { super(FabricBlockSettings.of(Material.STONE).hardness(2.9f).requiresTool()); diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSulphor.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSulphor.java index fe879ac..e3263e2 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSulphor.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSulphor.java @@ -6,8 +6,8 @@ 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.block.OreBlock; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext.Builder; @@ -16,7 +16,7 @@ import net.minecraft.loot.context.LootContext.Builder; * @author jotty * */ -public class BlockOreSulphor extends OreBlock { +public class BlockOreSulphor extends ExperienceDroppingBlock { public BlockOreSulphor() { super(FabricBlockSettings.of(Material.STONE).hardness(1.9f).requiresTool()); @@ -26,9 +26,4 @@ public class BlockOreSulphor extends OreBlock { public List getDroppedStacks(BlockState state, Builder builder) { return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SULPHOR) }); } - -// @Override -// protected int getExperienceWhenMined(Random random) { -// return random.nextInt(3); -// } } 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 fbf81d9..4e76e13 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java @@ -6,8 +6,8 @@ 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.block.OreBlock; import net.minecraft.item.ItemStack; import net.minecraft.loot.context.LootContext.Builder; @@ -16,7 +16,7 @@ import net.minecraft.loot.context.LootContext.Builder; * @author jotty * */ -public class BlockSulphor extends OreBlock { +public class BlockSulphor extends ExperienceDroppingBlock { public BlockSulphor() { super(FabricBlockSettings.of(Material.STONE).hardness(0.5f)); diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BackpackScreenHandler.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BackpackScreenHandler.java index c63fa94..d6c58fb 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BackpackScreenHandler.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BackpackScreenHandler.java @@ -67,7 +67,7 @@ public class BackpackScreenHandler extends ScreenHandler { } @Override - public ItemStack transferSlot(PlayerEntity player, int index) { + public ItemStack quickMove(PlayerEntity player, int index) { ItemStack itemStack = ItemStack.EMPTY; Slot slot = (Slot) this.slots.get(index); if (slot != null && slot.hasStack()) { diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BlockStackerScreen.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BlockStackerScreen.java index 9051544..ea4e1be 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BlockStackerScreen.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BlockStackerScreen.java @@ -42,7 +42,6 @@ public class BlockStackerScreen extends HandledScreen @Override protected void drawBackground(MatrixStack matrices, float delta, int mouseX, int mouseY) { - RenderSystem.setShader(GameRenderer::getPositionTexShader); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); RenderSystem.setShaderTexture(0, TEXTURE); int x = (width - backgroundWidth) / 2; diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BlockStackerScreenHandler.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BlockStackerScreenHandler.java index 4cfbafd..4669165 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BlockStackerScreenHandler.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/container/BlockStackerScreenHandler.java @@ -61,7 +61,7 @@ public class BlockStackerScreenHandler extends ScreenHandler { } @Override - public ItemStack transferSlot(PlayerEntity player, int invSlot) { + public ItemStack quickMove(PlayerEntity player, int invSlot) { ItemStack newStack = ItemStack.EMPTY; Slot slot = this.slots.get(invSlot); if (slot != null && slot.hasStack()) { diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/FeaturesManager.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/FeaturesManager.java new file mode 100644 index 0000000..c66ece2 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/FeaturesManager.java @@ -0,0 +1,54 @@ +package de.jottyfan.minecraft.quickiefabric.init; + +import java.util.function.BiConsumer; + +import net.fabricmc.fabric.api.biome.v1.BiomeModificationContext; +import net.fabricmc.fabric.api.biome.v1.BiomeSelectionContext; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; +import net.minecraft.world.gen.GenerationStep; +import net.minecraft.world.gen.feature.ConfiguredFeature; +import net.minecraft.world.gen.feature.PlacedFeature; + +/** + * + * @author jotty + * + */ +public class FeaturesManager { + + public static final RegistryKey> CF_ORESULFUR = genCf("oresulphor"); + 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 PF_ORESULPHOR = genPf("oresulphor"); + 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 + + private static final RegistryKey> genCf(String name) { + return RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, new Identifier(RegistryManager.QUICKIEFABRIC, name)); + } + + private static final RegistryKey genPf(String name) { + return RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier(RegistryManager.QUICKIEFABRIC, name)); + } + + 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); + }; + } + + protected static final BiConsumer netherOres() { + return (bsc, bmc) -> { + bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_ORENETHERSULPHOR); + bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_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 841cb24..f9eb8e7 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -1,8 +1,5 @@ package de.jottyfan.minecraft.quickiefabric.init; -import java.util.Arrays; -import java.util.function.Predicate; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -26,9 +23,10 @@ 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; import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; -import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; +import net.fabricmc.fabric.api.biome.v1.ModificationPhase; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; import net.fabricmc.fabric.api.loot.v2.LootTableEvents; import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; import net.fabricmc.fabric.api.registry.FuelRegistry; @@ -42,24 +40,12 @@ import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.screen.ScreenHandlerType; +import net.minecraft.text.Text; import net.minecraft.util.ActionResult; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.BuiltinRegistries; -import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.RegistryEntry; -import net.minecraft.util.registry.RegistryKey; -import net.minecraft.world.gen.GenerationStep; -import net.minecraft.world.gen.YOffset; -import net.minecraft.world.gen.feature.ConfiguredFeature; -import net.minecraft.world.gen.feature.EmeraldOreFeatureConfig; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.OreConfiguredFeatures; -import net.minecraft.world.gen.feature.OreFeatureConfig; -import net.minecraft.world.gen.feature.PlacedFeature; -import net.minecraft.world.gen.placementmodifier.CountPlacementModifier; -import net.minecraft.world.gen.placementmodifier.HeightRangePlacementModifier; -import net.minecraft.world.gen.placementmodifier.SquarePlacementModifier; /** * @@ -78,56 +64,10 @@ public class RegistryManager { public static final ScreenHandlerType BLOCKSTACKER_SCREEN_HANDLER = ScreenHandlerRegistry .registerSimple(RegistryManager.STACKER_IDENTIFIER, BlockStackerScreenHandler::new); - @SuppressWarnings("unchecked") - public static final ConfiguredFeature CF_ORESULPHOR = new ConfiguredFeature(Feature.ORE, new OreFeatureConfig( - OreConfiguredFeatures.STONE_ORE_REPLACEABLES, QuickieBlocks.ORE_SULPHOR.getDefaultState(), 20)); - @SuppressWarnings("unchecked") - public static final ConfiguredFeature CF_ORENETHERSULPHOR = new ConfiguredFeature(Feature.ORE, - new OreFeatureConfig(OreConfiguredFeatures.NETHERRACK, QuickieBlocks.ORE_NETHER_SULPHOR.getDefaultState(), 24)); - @SuppressWarnings("unchecked") - public static final ConfiguredFeature CF_ORESALPETER = new ConfiguredFeature(Feature.ORE, new OreFeatureConfig( - OreConfiguredFeatures.STONE_ORE_REPLACEABLES, QuickieBlocks.ORE_SALPETER.getDefaultState(), 12)); - @SuppressWarnings("unchecked") - public static final ConfiguredFeature CF_DIRTSALPETER = new ConfiguredFeature(Feature.REPLACE_SINGLE_BLOCK, - new EmeraldOreFeatureConfig(Blocks.DIRT.getDefaultState(), QuickieBlocks.DIRT_SALPETER.getDefaultState())); - @SuppressWarnings("unchecked") - public static final ConfiguredFeature CF_SANDSALPETER = new ConfiguredFeature(Feature.REPLACE_SINGLE_BLOCK, - new EmeraldOreFeatureConfig(Blocks.SAND.getDefaultState(), QuickieBlocks.SAND_SALPETER.getDefaultState())); - @SuppressWarnings("unchecked") - 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(), - HeightRangePlacementModifier.uniform(YOffset.aboveBottom(0), YOffset.belowTop(0)))); - public static final PlacedFeature PF_ORENETHERSULPHOR = new PlacedFeature(RegistryEntry.of(CF_ORENETHERSULPHOR), - Arrays.asList(CountPlacementModifier.of(10), SquarePlacementModifier.of(), - HeightRangePlacementModifier.uniform(YOffset.aboveBottom(0), YOffset.belowTop(0)))); - public static final PlacedFeature PF_ORESALPETER = new PlacedFeature(RegistryEntry.of(CF_ORESALPETER), - 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(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(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(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)) - .appendItems(stacks -> { + public static final ItemGroup QUICKIEFABRIC_GROUP = FabricItemGroup.builder(new Identifier(QUICKIEFABRIC, "all")) + .displayName(Text.literal(QUICKIEFABRIC)) + .icon(() -> new ItemStack(QuickieItems.SPEEDPOWDER)) + .entries((enabledFeatures, stacks, operatorEnabled) -> { stacks.add(new ItemStack(QuickieItems.SALPETER)); stacks.add(new ItemStack(QuickieItems.SULPHOR)); stacks.add(new ItemStack(QuickieItems.SPEEDPOWDER)); @@ -188,13 +128,13 @@ public class RegistryManager { }).build(); private static final void registerBlock(Block block, String name) { - Registry.register(Registry.BLOCK, new Identifier(QUICKIEFABRIC, name), block); - Registry.register(Registry.ITEM, new Identifier(QUICKIEFABRIC, name), - new BlockItem(block, new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP))); + Registry.register(Registries.BLOCK, new Identifier(QUICKIEFABRIC, name), block); + Registry.register(Registries.ITEM, new Identifier(QUICKIEFABRIC, name), + new BlockItem(block, new FabricItemSettings())); } private static final void registerItem(Item item, String name) { - Registry.register(Registry.ITEM, new Identifier(QUICKIEFABRIC, name), item); + Registry.register(Registries.ITEM, new Identifier(QUICKIEFABRIC, name), item); } public static final BlockEntityType registerBlockEntity(String name, @@ -202,7 +142,7 @@ public class RegistryManager { String fullname = new StringBuilder().append(QUICKIEFABRIC).append(":").append(name).toString(); FabricBlockEntityTypeBuilder builder = FabricBlockEntityTypeBuilder.create(supplier, blocks); BlockEntityType blockEntityType = builder.build(null); - return Registry.register(Registry.BLOCK_ENTITY_TYPE, fullname, blockEntityType); + return Registry.register(Registries.BLOCK_ENTITY_TYPE, fullname, blockEntityType); } @SuppressWarnings("unchecked") @@ -321,37 +261,17 @@ public class RegistryManager { }); } - /** - * register ore generation feature - * - * @param name the name for the identifier - * @param feature the feature - */ - private static final void registerFeature(String name, ConfiguredFeature conf, PlacedFeature feature, - Predicate predicate) { - RegistryKey> identifier = RegistryKey.of(Registry.CONFIGURED_FEATURE_KEY, - new Identifier(QUICKIEFABRIC, name)); - RegistryKey identifierP = RegistryKey.of(Registry.PLACED_FEATURE_KEY, - new Identifier(QUICKIEFABRIC, name)); - Registry.register(BuiltinRegistries.PLACED_FEATURE, identifier.getValue(), feature); - Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, identifier.getValue(), conf); - BiomeModifications.addFeature(predicate, GenerationStep.Feature.UNDERGROUND_ORES, identifierP); - } - /** * register ore generation features */ public static final void registerFeatures() { - Predicate nether = BiomeSelectors.foundInTheNether(); - Predicate overworld = BiomeSelectors.foundInOverworld(); + // Overworld features + BiomeModifications.create(new Identifier(QUICKIEFABRIC, "features")).add(ModificationPhase.ADDITIONS, + BiomeSelectors.foundInOverworld(), FeaturesManager.overworldOres()); - registerFeature("feature_orenethersulphor", CF_ORENETHERSULPHOR, PF_ORENETHERSULPHOR, nether); - registerFeature("feature_oresalpeter", CF_ORESALPETER, PF_ORESALPETER, overworld); - registerFeature("feature_oresulphor", CF_ORESULPHOR, PF_ORESULPHOR, overworld); - 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); + // Nether features + BiomeModifications.create(new Identifier(QUICKIEFABRIC, "nether_features")) + .add(ModificationPhase.ADDITIONS, BiomeSelectors.foundInTheNether(), FeaturesManager.netherOres()); } public static final void registerLootings() { diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemBackpack.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemBackpack.java index 7291187..3c9ff95 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemBackpack.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemBackpack.java @@ -9,6 +9,7 @@ import de.jottyfan.minecraft.quickiefabric.container.BackpackInventory; import de.jottyfan.minecraft.quickiefabric.container.BackpackScreenHandler; import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; import io.netty.buffer.Unpooled; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.LootableContainerBlockEntity; @@ -36,7 +37,7 @@ public class ItemBackpack extends Item { public final static Integer SLOTSIZE = 54; public ItemBackpack() { - super(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP).maxCount(1)); + super(new FabricItemSettings().maxCount(1)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCarrotstack.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCarrotstack.java index d95b478..f42c562 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCarrotstack.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCarrotstack.java @@ -1,6 +1,6 @@ package de.jottyfan.minecraft.quickiefabric.items; -import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.item.FoodComponent; import net.minecraft.item.Item; @@ -10,7 +10,9 @@ import net.minecraft.item.Item; * */ public class ItemCarrotstack extends Item { + public ItemCarrotstack() { - super(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP).maxCount(64).food(new FoodComponent.Builder().hunger(12).saturationModifier(0.6F).build())); + super(new FabricItemSettings().maxCount(64) + .food(new FoodComponent.Builder().hunger(12).saturationModifier(0.6F).build())); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCotton.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCotton.java index 3c425d8..8bb2fdb 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCotton.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCotton.java @@ -1,6 +1,6 @@ package de.jottyfan.minecraft.quickiefabric.items; -import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.item.Item; /** @@ -9,7 +9,8 @@ import net.minecraft.item.Item; * */ public class ItemCotton extends Item { + public ItemCotton() { - super(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP).maxCount(64)); + super(new FabricItemSettings().maxCount(64)); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCottonseed.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCottonseed.java index 389ddb5..7f388fd 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCottonseed.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemCottonseed.java @@ -1,7 +1,7 @@ package de.jottyfan.minecraft.quickiefabric.items; import de.jottyfan.minecraft.quickiefabric.blocks.QuickieBlocks; -import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.item.Item; @@ -16,8 +16,9 @@ import net.minecraft.world.World; * */ public class ItemCottonseed extends Item { + public ItemCottonseed() { - super(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP).maxCount(64)); + super(new FabricItemSettings().maxCount(64)); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemLevelup.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemLevelup.java index c47eaa7..3682f94 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemLevelup.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemLevelup.java @@ -1,6 +1,6 @@ package de.jottyfan.minecraft.quickiefabric.items; -import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.item.Item; /** @@ -9,7 +9,8 @@ import net.minecraft.item.Item; * */ public class ItemLevelup extends Item { + public ItemLevelup() { - super(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP).maxCount(64)); + super(new FabricItemSettings().maxCount(64)); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemPencil.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemPencil.java index 63f6133..1b1f9b4 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemPencil.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemPencil.java @@ -1,16 +1,16 @@ package de.jottyfan.minecraft.quickiefabric.items; -import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.item.Item; /** - * + * * @author jotty * */ public class ItemPencil extends Item { public ItemPencil() { - super(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP)); + super(new FabricItemSettings()); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemRottenFleshStripes.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemRottenFleshStripes.java index 08e246c..2ebb53c 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemRottenFleshStripes.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemRottenFleshStripes.java @@ -1,6 +1,6 @@ package de.jottyfan.minecraft.quickiefabric.items; -import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.item.Item; /** @@ -9,7 +9,8 @@ import net.minecraft.item.Item; * */ public class ItemRottenFleshStripes extends Item { + public ItemRottenFleshStripes() { - super(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP).maxCount(64)); + super(new FabricItemSettings().maxCount(64)); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSalpeter.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSalpeter.java index 412bccf..e2ccfcb 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSalpeter.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSalpeter.java @@ -1,16 +1,16 @@ package de.jottyfan.minecraft.quickiefabric.items; -import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.item.Item; /** - * + * * @author jotty * */ public class ItemSalpeter extends Item { public ItemSalpeter() { - super(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP)); + super(new FabricItemSettings()); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSpeedpowder.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSpeedpowder.java index a80bd6c..a32ceea 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSpeedpowder.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSpeedpowder.java @@ -1,15 +1,16 @@ package de.jottyfan.minecraft.quickiefabric.items; -import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.item.Item; /** - * + * * @author jotty * */ public class ItemSpeedpowder extends Item { + public ItemSpeedpowder() { - super(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP)); + super(new FabricItemSettings()); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemStub.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemStub.java index 5009037..935e5d3 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemStub.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemStub.java @@ -1,6 +1,6 @@ package de.jottyfan.minecraft.quickiefabric.items; -import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.item.Item; /** @@ -10,6 +10,6 @@ import net.minecraft.item.Item; */ public class ItemStub extends Item { public ItemStub() { - super(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP).maxCount(64)); + super(new FabricItemSettings().maxCount(64)); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSulphor.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSulphor.java index 2c0c761..fcd2511 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSulphor.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSulphor.java @@ -1,16 +1,16 @@ package de.jottyfan.minecraft.quickiefabric.items; -import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.item.Item; /** - * + * * @author jotty * */ public class ItemSulphor extends Item { public ItemSulphor() { - super(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP)); + super(new FabricItemSettings()); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderAxe.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderAxe.java index b66cc4e..de6e3a8 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderAxe.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderAxe.java @@ -1,16 +1,16 @@ package de.jottyfan.minecraft.quickiefabric.tools; -import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; -import net.minecraft.item.Item; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.item.ToolMaterials; /** - * + * * @author jotty * */ public class ToolSpeedpowderAxe extends ToolRangeableAxe { + public ToolSpeedpowderAxe() { - super(ToolMaterials.DIAMOND, 4, 2.0f, new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP)); + super(ToolMaterials.DIAMOND, 4, 2.0f, new FabricItemSettings()); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderHoe.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderHoe.java index 086b99c..38f206d 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderHoe.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderHoe.java @@ -2,18 +2,14 @@ package de.jottyfan.minecraft.quickiefabric.tools; import java.util.List; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import com.google.common.collect.Lists; -import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.CropBlock; import net.minecraft.item.HoeItem; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; import net.minecraft.item.ToolMaterials; @@ -31,13 +27,11 @@ import net.minecraft.world.World; */ public class ToolSpeedpowderHoe extends HoeItem implements ToolRangeable { - private static final Logger LOGGER = LogManager.getLogger(ToolSpeedpowderHoe.class); - public static final Integer DEFAULT_PLOW_RANGE = 4; public HarvestRange range; public ToolSpeedpowderHoe() { - super(ToolMaterials.DIAMOND, 4, 2.0f, new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP)); + super(ToolMaterials.DIAMOND, 4, 2.0f, new FabricItemSettings()); this.range = new HarvestRange(DEFAULT_PLOW_RANGE); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderPickaxe.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderPickaxe.java index 92ee2bb..9b76f60 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderPickaxe.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderPickaxe.java @@ -4,10 +4,9 @@ import java.util.List; import com.google.common.collect.Lists; -import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.PickaxeItem; import net.minecraft.item.ToolMaterials; @@ -23,7 +22,7 @@ public class ToolSpeedpowderPickaxe extends PickaxeItem implements ToolRangeable public static final int[] DEFAULT_HARVEST_RANGE = new int[] { 3, 3, 3 }; public ToolSpeedpowderPickaxe() { - super(ToolMaterials.DIAMOND, 4, 2.0f, new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP)); + super(ToolMaterials.DIAMOND, 4, 2.0f, new FabricItemSettings()); } @Override diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderShovel.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderShovel.java index c87c01f..468b5e3 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderShovel.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderShovel.java @@ -4,10 +4,9 @@ import java.util.List; import com.google.common.collect.Lists; -import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; import net.minecraft.item.ShovelItem; @@ -27,7 +26,7 @@ public class ToolSpeedpowderShovel extends ShovelItem implements ToolRangeable { public HarvestRange range; public ToolSpeedpowderShovel() { - super(ToolMaterials.DIAMOND, 4, 2.0f, new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP)); + super(ToolMaterials.DIAMOND, 4, 2.0f, new FabricItemSettings()); this.range = new HarvestRange(DEFAULT_HARVEST_RANGE); } diff --git a/src/main/resources/data/quickiefabric/loot_tables/blocks/speedpowder.json b/src/main/resources/data/quickiefabric/loot_tables/blocks/speedpowder.json new file mode 100644 index 0000000..748b466 --- /dev/null +++ b/src/main/resources/data/quickiefabric/loot_tables/blocks/speedpowder.json @@ -0,0 +1,48 @@ +{ + "type": "minecraft:block", + "pools": [ + {"name": "main", + "rolls": 1, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "quickiefabric:speedpowder" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "quickiefabric:speedpowder" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/tags/items/ores/oresalpeter.json b/src/main/resources/data/quickiefabric/tags/items/ores/oresalpeter.json new file mode 100644 index 0000000..c6a24ec --- /dev/null +++ b/src/main/resources/data/quickiefabric/tags/items/ores/oresalpeter.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "quickiefabric:oresalpeter" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/tags/items/ores/oresulphor.json b/src/main/resources/data/quickiefabric/tags/items/ores/oresulphor.json new file mode 100644 index 0000000..f43e7d9 --- /dev/null +++ b/src/main/resources/data/quickiefabric/tags/items/ores/oresulphor.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "quickiefabric:oresulphor" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/worldgen/configured_feature/blocksulphor.json b/src/main/resources/data/quickiefabric/worldgen/configured_feature/blocksulphor.json new file mode 100644 index 0000000..acdac23 --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/configured_feature/blocksulphor.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 3, + "targets": [ + { + "state": { + "Name": "quickiefabric:blocksulphor" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:netherrack" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/worldgen/configured_feature/orenethersulphor.json b/src/main/resources/data/quickiefabric/worldgen/configured_feature/orenethersulphor.json new file mode 100644 index 0000000..e0cba29 --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/configured_feature/orenethersulphor.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 20, + "targets": [ + { + "state": { + "Name": "quickiefabric:orenethersulphor" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:netherrack" + } + } + ] + } +} \ 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 new file mode 100644 index 0000000..f9b6991 --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/configured_feature/oresalpeter.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 12, + "targets": [ + { + "state": { + "Name": "quickiefabric:oresalpeter" + }, + "target": { + "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" + } + } + ] + } +} \ 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 new file mode 100644 index 0000000..2f21e5b --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/configured_feature/oresulphor.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 20, + "targets": [ + { + "state": { + "Name": "quickiefabric:oresulphor" + }, + "target": { + "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" + } + } + ] + } +} \ 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 new file mode 100644 index 0000000..2c40eb5 --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/placed_feature/blocksulphor.json @@ -0,0 +1,24 @@ +{ + "feature": "quickiefabric:oresulphor", + "placement": [ + { + "type": "minecraft:count", + "count": 4 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 125 + }, + "min_inclusive": { + "absolute": 5 + } + } + } + ] +} \ 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 new file mode 100644 index 0000000..60f6476 --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/placed_feature/orenethersulphor.json @@ -0,0 +1,24 @@ +{ + "feature": "quickiefabric:oresulphor", + "placement": [ + { + "type": "minecraft:count", + "count": 25 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 125 + }, + "min_inclusive": { + "absolute": 5 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/worldgen/placed_feature/oresalpeter.json b/src/main/resources/data/quickiefabric/worldgen/placed_feature/oresalpeter.json new file mode 100644 index 0000000..bf1cb8b --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/placed_feature/oresalpeter.json @@ -0,0 +1,24 @@ +{ + "feature": "quickiefabric:oresalpeter", + "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": 0 + } + } + } + ] +} \ 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 new file mode 100644 index 0000000..e4509a0 --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/placed_feature/oresulphor.json @@ -0,0 +1,24 @@ +{ + "feature": "quickiefabric:oresulphor", + "placement": [ + { + "type": "minecraft:count", + "count": 15 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "max_inclusive": { + "absolute": 64 + }, + "min_inclusive": { + "absolute": -125 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index d638cc4..1b1010e 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -26,9 +26,9 @@ "quickiefabric.mixins.json" ], "depends": { - "fabricloader": ">=0.14.9", + "fabricloader": ">=0.14.11", "fabric": "*", - "minecraft": "1.19.2", + "minecraft": "1.19.3", "java": ">=17" }, "suggests": {