From c45acb2e99269c554cb23d652a5373d5952dbebb Mon Sep 17 00:00:00 2001 From: nelle Date: Tue, 31 Dec 2024 12:38:29 -0700 Subject: [PATCH] oopsies --- MC19.3-19.4/gradle.properties | 2 +- .../roses/world/RosesPlacedFeatures.java | 16 -------- .../world/gen/RosesVegetationGeneration.kt | 39 ++++++------------- .../roses/world/RosesPlacedFeatures.java | 16 -------- .../world/gen/RosesVegetationGeneration.kt | 39 ++++++------------- .../roses/world/RosesPlacedFeatures.java | 16 -------- .../world/gen/RosesVegetationGeneration.kt | 39 ++++++------------- .../roses/world/RosesPlacedFeatures.java | 13 ------- .../world/gen/RosesVegetationGeneration.kt | 39 ++++++------------- 9 files changed, 49 insertions(+), 170 deletions(-) diff --git a/MC19.3-19.4/gradle.properties b/MC19.3-19.4/gradle.properties index dd3af2c..518c4db 100644 --- a/MC19.3-19.4/gradle.properties +++ b/MC19.3-19.4/gradle.properties @@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G kotlin_loader_version=1.13.0+kotlin.2.1.0 # Mod Properties - mod_version = 2.0+1.19.3-1.19.4 + mod_version = 3.0+1.19.3-1.19.4 maven_group = observer.nelle archives_base_name = roses_mod diff --git a/MC19.3-19.4/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java b/MC19.3-19.4/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java index 3460343..57092a6 100644 --- a/MC19.3-19.4/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java +++ b/MC19.3-19.4/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java @@ -23,9 +23,6 @@ public class RosesPlacedFeatures { public static final RegistryKey cyanRoseRarerPlacedKey = registerKey("cyan_rose_rare_placed"); public static final RegistryKey roseRarerPlacedKey = registerKey("rose_rare_placed"); - public static final RegistryKey cyanRoseCommonPlacedKey = registerKey("cyan_rose_common_placed"); - public static final RegistryKey roseCommonPlacedKey = registerKey("rose_common_placed"); - public static void bootstrap(Registerable context) { var configuredFeatures = context.getRegistryLookup(RegistryKeys.CONFIGURED_FEATURE); @@ -61,19 +58,6 @@ public class RosesPlacedFeatures { SquarePlacementModifier.of(), PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, BiomePlacementModifier.of()); - - // more common - register(context, cyanRoseCommonPlacedKey, configuredFeatures.getOrThrow(RosesConfiguredFeatures.cyanRoseKey), - RarityFilterPlacementModifier.of(45), - SquarePlacementModifier.of(), - PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, - BiomePlacementModifier.of()); - - register(context, roseCommonPlacedKey, configuredFeatures.getOrThrow(RosesConfiguredFeatures.roseKey), - RarityFilterPlacementModifier.of(4), - SquarePlacementModifier.of(), - PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, - BiomePlacementModifier.of()); } public static RegistryKey registerKey(String name) { diff --git a/MC19.3-19.4/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt b/MC19.3-19.4/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt index 8b41fd2..26b8655 100644 --- a/MC19.3-19.4/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt +++ b/MC19.3-19.4/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt @@ -90,6 +90,12 @@ object RosesVegetationGeneration { BiomeKeys.ICE_SPIKES, BiomeKeys.DRIPSTONE_CAVES, BiomeKeys.DEEP_DARK, + BiomeKeys.JUNGLE, + BiomeKeys.BAMBOO_JUNGLE, + BiomeKeys.SPARSE_JUNGLE, + BiomeKeys.SAVANNA, + BiomeKeys.SAVANNA_PLATEAU, + BiomeKeys.WINDSWEPT_SAVANNA, ), GenerationStep.Feature.VEGETAL_DECORATION, RosesPlacedFeatures.cyanRoseRarerPlacedKey, @@ -113,36 +119,15 @@ object RosesVegetationGeneration { BiomeKeys.ICE_SPIKES, BiomeKeys.DRIPSTONE_CAVES, BiomeKeys.DEEP_DARK, + BiomeKeys.JUNGLE, + BiomeKeys.BAMBOO_JUNGLE, + BiomeKeys.SPARSE_JUNGLE, + BiomeKeys.SAVANNA, + BiomeKeys.SAVANNA_PLATEAU, + BiomeKeys.WINDSWEPT_SAVANNA, ), GenerationStep.Feature.VEGETAL_DECORATION, RosesPlacedFeatures.roseRarerPlacedKey, ) - - // more common - BiomeModifications.addFeature( - BiomeSelectors.includeByKey( - BiomeKeys.JUNGLE, - BiomeKeys.BAMBOO_JUNGLE, - BiomeKeys.SPARSE_JUNGLE, - BiomeKeys.SAVANNA, - BiomeKeys.SAVANNA_PLATEAU, - BiomeKeys.WINDSWEPT_SAVANNA, - ), - GenerationStep.Feature.VEGETAL_DECORATION, - RosesPlacedFeatures.cyanRoseCommonPlacedKey, - ) - - BiomeModifications.addFeature( - BiomeSelectors.includeByKey( - BiomeKeys.JUNGLE, - BiomeKeys.BAMBOO_JUNGLE, - BiomeKeys.SPARSE_JUNGLE, - BiomeKeys.SAVANNA, - BiomeKeys.SAVANNA_PLATEAU, - BiomeKeys.WINDSWEPT_SAVANNA, - ), - GenerationStep.Feature.VEGETAL_DECORATION, - RosesPlacedFeatures.roseCommonPlacedKey, - ) } } diff --git a/MC20-20.4/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java b/MC20-20.4/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java index 3460343..57092a6 100644 --- a/MC20-20.4/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java +++ b/MC20-20.4/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java @@ -23,9 +23,6 @@ public class RosesPlacedFeatures { public static final RegistryKey cyanRoseRarerPlacedKey = registerKey("cyan_rose_rare_placed"); public static final RegistryKey roseRarerPlacedKey = registerKey("rose_rare_placed"); - public static final RegistryKey cyanRoseCommonPlacedKey = registerKey("cyan_rose_common_placed"); - public static final RegistryKey roseCommonPlacedKey = registerKey("rose_common_placed"); - public static void bootstrap(Registerable context) { var configuredFeatures = context.getRegistryLookup(RegistryKeys.CONFIGURED_FEATURE); @@ -61,19 +58,6 @@ public class RosesPlacedFeatures { SquarePlacementModifier.of(), PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, BiomePlacementModifier.of()); - - // more common - register(context, cyanRoseCommonPlacedKey, configuredFeatures.getOrThrow(RosesConfiguredFeatures.cyanRoseKey), - RarityFilterPlacementModifier.of(45), - SquarePlacementModifier.of(), - PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, - BiomePlacementModifier.of()); - - register(context, roseCommonPlacedKey, configuredFeatures.getOrThrow(RosesConfiguredFeatures.roseKey), - RarityFilterPlacementModifier.of(4), - SquarePlacementModifier.of(), - PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, - BiomePlacementModifier.of()); } public static RegistryKey registerKey(String name) { diff --git a/MC20-20.4/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt b/MC20-20.4/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt index 8b41fd2..26b8655 100644 --- a/MC20-20.4/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt +++ b/MC20-20.4/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt @@ -90,6 +90,12 @@ object RosesVegetationGeneration { BiomeKeys.ICE_SPIKES, BiomeKeys.DRIPSTONE_CAVES, BiomeKeys.DEEP_DARK, + BiomeKeys.JUNGLE, + BiomeKeys.BAMBOO_JUNGLE, + BiomeKeys.SPARSE_JUNGLE, + BiomeKeys.SAVANNA, + BiomeKeys.SAVANNA_PLATEAU, + BiomeKeys.WINDSWEPT_SAVANNA, ), GenerationStep.Feature.VEGETAL_DECORATION, RosesPlacedFeatures.cyanRoseRarerPlacedKey, @@ -113,36 +119,15 @@ object RosesVegetationGeneration { BiomeKeys.ICE_SPIKES, BiomeKeys.DRIPSTONE_CAVES, BiomeKeys.DEEP_DARK, + BiomeKeys.JUNGLE, + BiomeKeys.BAMBOO_JUNGLE, + BiomeKeys.SPARSE_JUNGLE, + BiomeKeys.SAVANNA, + BiomeKeys.SAVANNA_PLATEAU, + BiomeKeys.WINDSWEPT_SAVANNA, ), GenerationStep.Feature.VEGETAL_DECORATION, RosesPlacedFeatures.roseRarerPlacedKey, ) - - // more common - BiomeModifications.addFeature( - BiomeSelectors.includeByKey( - BiomeKeys.JUNGLE, - BiomeKeys.BAMBOO_JUNGLE, - BiomeKeys.SPARSE_JUNGLE, - BiomeKeys.SAVANNA, - BiomeKeys.SAVANNA_PLATEAU, - BiomeKeys.WINDSWEPT_SAVANNA, - ), - GenerationStep.Feature.VEGETAL_DECORATION, - RosesPlacedFeatures.cyanRoseCommonPlacedKey, - ) - - BiomeModifications.addFeature( - BiomeSelectors.includeByKey( - BiomeKeys.JUNGLE, - BiomeKeys.BAMBOO_JUNGLE, - BiomeKeys.SPARSE_JUNGLE, - BiomeKeys.SAVANNA, - BiomeKeys.SAVANNA_PLATEAU, - BiomeKeys.WINDSWEPT_SAVANNA, - ), - GenerationStep.Feature.VEGETAL_DECORATION, - RosesPlacedFeatures.roseCommonPlacedKey, - ) } } diff --git a/MC20.5-21.1/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java b/MC20.5-21.1/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java index 24c9b4d..949afe8 100644 --- a/MC20.5-21.1/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java +++ b/MC20.5-21.1/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java @@ -8,7 +8,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.math.intprovider.ClampedIntProvider; import net.minecraft.util.math.intprovider.UniformIntProvider; import net.minecraft.world.gen.feature.*; -import net.minecraft.world.gen.placementmodifier.PlacementModifier; import net.minecraft.world.gen.placementmodifier.*; import observer.nelle.roses.RosesModKt; @@ -24,8 +23,6 @@ public class RosesPlacedFeatures { public static final RegistryKey cyanRoseRarerPlacedKey = registerKey("cyan_rose_rare_placed"); public static final RegistryKey roseRarerPlacedKey = registerKey("rose_rare_placed"); - public static final RegistryKey cyanRoseCommonPlacedKey = registerKey("cyan_rose_common_placed"); - public static final RegistryKey roseCommonPlacedKey = registerKey("rose_common_placed"); public static void bootstrap(Registerable context) { var configuredFeatures = context.getRegistryLookup(RegistryKeys.CONFIGURED_FEATURE); @@ -62,19 +59,6 @@ public class RosesPlacedFeatures { SquarePlacementModifier.of(), PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, BiomePlacementModifier.of()); - - // more common - register(context, cyanRoseCommonPlacedKey, configuredFeatures.getOrThrow(RosesConfiguredFeatures.cyanRoseKey), - RarityFilterPlacementModifier.of(45), - SquarePlacementModifier.of(), - PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, - BiomePlacementModifier.of()); - - register(context, roseCommonPlacedKey, configuredFeatures.getOrThrow(RosesConfiguredFeatures.roseKey), - RarityFilterPlacementModifier.of(4), - SquarePlacementModifier.of(), - PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, - BiomePlacementModifier.of()); } public static RegistryKey registerKey(String name) { diff --git a/MC20.5-21.1/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt b/MC20.5-21.1/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt index 8b41fd2..26b8655 100644 --- a/MC20.5-21.1/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt +++ b/MC20.5-21.1/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt @@ -90,6 +90,12 @@ object RosesVegetationGeneration { BiomeKeys.ICE_SPIKES, BiomeKeys.DRIPSTONE_CAVES, BiomeKeys.DEEP_DARK, + BiomeKeys.JUNGLE, + BiomeKeys.BAMBOO_JUNGLE, + BiomeKeys.SPARSE_JUNGLE, + BiomeKeys.SAVANNA, + BiomeKeys.SAVANNA_PLATEAU, + BiomeKeys.WINDSWEPT_SAVANNA, ), GenerationStep.Feature.VEGETAL_DECORATION, RosesPlacedFeatures.cyanRoseRarerPlacedKey, @@ -113,36 +119,15 @@ object RosesVegetationGeneration { BiomeKeys.ICE_SPIKES, BiomeKeys.DRIPSTONE_CAVES, BiomeKeys.DEEP_DARK, + BiomeKeys.JUNGLE, + BiomeKeys.BAMBOO_JUNGLE, + BiomeKeys.SPARSE_JUNGLE, + BiomeKeys.SAVANNA, + BiomeKeys.SAVANNA_PLATEAU, + BiomeKeys.WINDSWEPT_SAVANNA, ), GenerationStep.Feature.VEGETAL_DECORATION, RosesPlacedFeatures.roseRarerPlacedKey, ) - - // more common - BiomeModifications.addFeature( - BiomeSelectors.includeByKey( - BiomeKeys.JUNGLE, - BiomeKeys.BAMBOO_JUNGLE, - BiomeKeys.SPARSE_JUNGLE, - BiomeKeys.SAVANNA, - BiomeKeys.SAVANNA_PLATEAU, - BiomeKeys.WINDSWEPT_SAVANNA, - ), - GenerationStep.Feature.VEGETAL_DECORATION, - RosesPlacedFeatures.cyanRoseCommonPlacedKey, - ) - - BiomeModifications.addFeature( - BiomeSelectors.includeByKey( - BiomeKeys.JUNGLE, - BiomeKeys.BAMBOO_JUNGLE, - BiomeKeys.SPARSE_JUNGLE, - BiomeKeys.SAVANNA, - BiomeKeys.SAVANNA_PLATEAU, - BiomeKeys.WINDSWEPT_SAVANNA, - ), - GenerationStep.Feature.VEGETAL_DECORATION, - RosesPlacedFeatures.roseCommonPlacedKey, - ) } } diff --git a/MC21.2-21.4/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java b/MC21.2-21.4/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java index 3460343..fd99f87 100644 --- a/MC21.2-21.4/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java +++ b/MC21.2-21.4/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java @@ -61,19 +61,6 @@ public class RosesPlacedFeatures { SquarePlacementModifier.of(), PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, BiomePlacementModifier.of()); - - // more common - register(context, cyanRoseCommonPlacedKey, configuredFeatures.getOrThrow(RosesConfiguredFeatures.cyanRoseKey), - RarityFilterPlacementModifier.of(45), - SquarePlacementModifier.of(), - PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, - BiomePlacementModifier.of()); - - register(context, roseCommonPlacedKey, configuredFeatures.getOrThrow(RosesConfiguredFeatures.roseKey), - RarityFilterPlacementModifier.of(4), - SquarePlacementModifier.of(), - PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, - BiomePlacementModifier.of()); } public static RegistryKey registerKey(String name) { diff --git a/MC21.2-21.4/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt b/MC21.2-21.4/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt index 8b41fd2..26b8655 100644 --- a/MC21.2-21.4/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt +++ b/MC21.2-21.4/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt @@ -90,6 +90,12 @@ object RosesVegetationGeneration { BiomeKeys.ICE_SPIKES, BiomeKeys.DRIPSTONE_CAVES, BiomeKeys.DEEP_DARK, + BiomeKeys.JUNGLE, + BiomeKeys.BAMBOO_JUNGLE, + BiomeKeys.SPARSE_JUNGLE, + BiomeKeys.SAVANNA, + BiomeKeys.SAVANNA_PLATEAU, + BiomeKeys.WINDSWEPT_SAVANNA, ), GenerationStep.Feature.VEGETAL_DECORATION, RosesPlacedFeatures.cyanRoseRarerPlacedKey, @@ -113,36 +119,15 @@ object RosesVegetationGeneration { BiomeKeys.ICE_SPIKES, BiomeKeys.DRIPSTONE_CAVES, BiomeKeys.DEEP_DARK, + BiomeKeys.JUNGLE, + BiomeKeys.BAMBOO_JUNGLE, + BiomeKeys.SPARSE_JUNGLE, + BiomeKeys.SAVANNA, + BiomeKeys.SAVANNA_PLATEAU, + BiomeKeys.WINDSWEPT_SAVANNA, ), GenerationStep.Feature.VEGETAL_DECORATION, RosesPlacedFeatures.roseRarerPlacedKey, ) - - // more common - BiomeModifications.addFeature( - BiomeSelectors.includeByKey( - BiomeKeys.JUNGLE, - BiomeKeys.BAMBOO_JUNGLE, - BiomeKeys.SPARSE_JUNGLE, - BiomeKeys.SAVANNA, - BiomeKeys.SAVANNA_PLATEAU, - BiomeKeys.WINDSWEPT_SAVANNA, - ), - GenerationStep.Feature.VEGETAL_DECORATION, - RosesPlacedFeatures.cyanRoseCommonPlacedKey, - ) - - BiomeModifications.addFeature( - BiomeSelectors.includeByKey( - BiomeKeys.JUNGLE, - BiomeKeys.BAMBOO_JUNGLE, - BiomeKeys.SPARSE_JUNGLE, - BiomeKeys.SAVANNA, - BiomeKeys.SAVANNA_PLATEAU, - BiomeKeys.WINDSWEPT_SAVANNA, - ), - GenerationStep.Feature.VEGETAL_DECORATION, - RosesPlacedFeatures.roseCommonPlacedKey, - ) } }