diff --git a/gradle.properties b/gradle.properties index eac6250..08d1ed2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ loader_version=0.15.1 # Mod Properties - mod_version = 1.20.4.0 + mod_version = 1.20.4.1 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric 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 58560f5..1113b06 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/FeaturesManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/FeaturesManager.java @@ -26,6 +26,8 @@ public class FeaturesManager { 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> CF_SULFORPAD = genCf("sulforpad"); +// public static final SulforpadFeature CF_SULFORPAD = genCfOwn("sulforpad"); public static final RegistryKey PF_ORESULPHOR = genPf("oresulphor"); public static final RegistryKey PF_OREDEEPSLATESULPHOR = genPf("oredeepslatesulphor"); @@ -35,6 +37,7 @@ public class FeaturesManager { public static final RegistryKey PF_DIRTSALPETER = genPf("dirtsalpeter"); public static final RegistryKey PF_SANDSALPETER = genPf("sandsalpeter"); public static final RegistryKey PF_ORESANDSALPETER = genPf("oresandsalpeter"); + public static final RegistryKey PF_SULFORPAD = genPf("sulforpad"); private static final RegistryKey> genCf(String name) { return RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, new Identifier(RegistryManager.QUICKIEFABRIC, name)); @@ -52,6 +55,7 @@ public class FeaturesManager { 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); + bmc.getGenerationSettings().addFeature(GenerationStep.Feature.VEGETAL_DECORATION, PF_SULFORPAD); }; } @@ -59,6 +63,7 @@ public class FeaturesManager { return (bsc, bmc) -> { bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_ORENETHERSULPHOR); bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_BLOCKSULPHOR); + bmc.getGenerationSettings().addFeature(GenerationStep.Feature.VEGETAL_DECORATION, PF_SULFORPAD); }; } 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 5a82ae8..85e2e9c 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -152,6 +152,7 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieBlocks.BLOCKSTACKERNORTH)); stacks.add(new ItemStack(QuickieBlocks.BLOCKSTACKERSOUTH)); stacks.add(new ItemStack(QuickieBlocks.BLOCKSPREADER)); + stacks.add(new ItemStack(QuickieBlocks.SULFORPAD)); }).build()); } @@ -312,16 +313,16 @@ public class RegistryManager { BiomeModifications.create(new Identifier(QUICKIEFABRIC, "nether_features")).add(ModificationPhase.ADDITIONS, BiomeSelectors.foundInTheNether(), FeaturesManager.netherOres()); - // Sulforpad feature - Identifier SULFORPAD_FEATURE_ID = new Identifier(QUICKIEFABRIC, "sulforpad_feature"); - Feature SULFORPAD_FEATURE = new SulforpadFeature(SulforpadFeatureConfig.CODEC); - ConfiguredFeature SULFORPAD_FEATURE_CONFIGURED = new ConfiguredFeature<>( - (SulforpadFeature) SULFORPAD_FEATURE, - new SulforpadFeatureConfig(new Identifier(QUICKIEFABRIC, "sulforpad"))); - PlacedFeature SULFORPAD_FEATURE_PLACED = new PlacedFeature(RegistryEntry.of(SULFORPAD_FEATURE_CONFIGURED), List.of(SquarePlacementModifier.of())); -// Registries.register(RegistryKeys.FEATURE, SULFORPAD_FEATURE_ID, SULFORPAD_FEATURE); -// Registries.register(RegistryKeys.CONFIGURED_FEATURE, SULFORPAD_FEATURE_ID, SULFORPAD_FEATURE_CONFIGURED); -// Registries.register(RegistryKeys.PLACED_FEATURE, SULFORPAD_FEATURE_ID, SULFORPAD_FEATURE_PLACED); +// // Sulforpad feature +// Identifier SULFORPAD_FEATURE_ID = new Identifier(QUICKIEFABRIC, "sulforpad"); +// Feature SULFORPAD_FEATURE = new SulforpadFeature(SulforpadFeatureConfig.CODEC); +// ConfiguredFeature SULFORPAD_FEATURE_CONFIGURED = new ConfiguredFeature<>( +// (SulforpadFeature) SULFORPAD_FEATURE, +// new SulforpadFeatureConfig(new Identifier(QUICKIEFABRIC, "sulforpad"))); +// PlacedFeature SULFORPAD_FEATURE_PLACED = new PlacedFeature(RegistryEntry.of(SULFORPAD_FEATURE_CONFIGURED), List.of(SquarePlacementModifier.of())); +// Registry.register(Registries.FEATURE, new Identifier(QUICKIEFABRIC, "sulforpad"), new SulforpadFeature(SulforpadFeatureConfig.CODEC)); +// Registry.register(Registries.CONFIGURED_FEATURE, SULFORPAD_FEATURE_ID, SULFORPAD_FEATURE_CONFIGURED); +// Registry.register(RegistryKeys.PLACED_FEATURE, SULFORPAD_FEATURE_ID, SULFORPAD_FEATURE_PLACED); // BiomeModifications.addFeature(BiomeSelectors.foundInTheNether(),GenerationStep.Feature.VEGETAL_DECORATION, // RegistryKey.of(RegistryKeys.PLACED_FEATURE, SULFORPAD_FEATURE_ID)); } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/world/gen/feature/SulforpadFeature.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/world/gen/feature/SulforpadFeature.java index 158e76a..6c66a3f 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/world/gen/feature/SulforpadFeature.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/world/gen/feature/SulforpadFeature.java @@ -15,6 +15,7 @@ import net.minecraft.world.gen.feature.util.FeatureContext; * @author jotty * */ +@Deprecated public class SulforpadFeature extends Feature { public SulforpadFeature(Codec configCodec) { diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/world/gen/feature/SulforpadFeatureConfig.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/world/gen/feature/SulforpadFeatureConfig.java index 57d0774..2ba7e55 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/world/gen/feature/SulforpadFeatureConfig.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/world/gen/feature/SulforpadFeatureConfig.java @@ -11,6 +11,7 @@ import net.minecraft.world.gen.feature.FeatureConfig; * @author jotty * */ +@Deprecated public record SulforpadFeatureConfig(Identifier blockId) implements FeatureConfig { public static Codec CODEC = RecordCodecBuilder .create(o -> o.group(Identifier.CODEC.fieldOf("blockID").forGetter(SulforpadFeatureConfig::blockId)).apply(o, diff --git a/src/main/resources/assets/quickiefabric/models/item/sulphorpad.json b/src/main/resources/assets/quickiefabric/models/item/sulforpad.json similarity index 50% rename from src/main/resources/assets/quickiefabric/models/item/sulphorpad.json rename to src/main/resources/assets/quickiefabric/models/item/sulforpad.json index d95f4ed..839f9b3 100644 --- a/src/main/resources/assets/quickiefabric/models/item/sulphorpad.json +++ b/src/main/resources/assets/quickiefabric/models/item/sulforpad.json @@ -1,6 +1,6 @@ { "parent": "item/coal", "textures": { - "layer0": "quickiefabric:item/sulphorpad2" + "layer0": "quickiefabric:block/sulforpad2" } } \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/worldgen/configured_feature/sulforpad.json b/src/main/resources/data/quickiefabric/worldgen/configured_feature/sulforpad.json new file mode 100644 index 0000000..eff6a30 --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/configured_feature/sulforpad.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "discard_chance_on_air_exposure": 0.0, + "size": 3, + "targets": [ + { + "state": { + "Name": "quickiefabric:sulforpad" + }, + "target": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:lava" + } + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/worldgen/placed_feature/sulforpad.json b/src/main/resources/data/quickiefabric/worldgen/placed_feature/sulforpad.json new file mode 100644 index 0000000..c226464 --- /dev/null +++ b/src/main/resources/data/quickiefabric/worldgen/placed_feature/sulforpad.json @@ -0,0 +1,19 @@ +{ + "feature": "quickiefabric:sulforpad", + "placement": [ + { + "type": "minecraft:environment_scan", + "direction_of_search": "up", + "max_steps": 1, + "target_condition": { + "type": "minecraft:matching_blocks", + "offset": [ + 0, + 1, + 0 + ], + "blocks": "minecraft:air" + } + } + ] +} \ No newline at end of file