made with fabric

2025-01-05 16:59:34 -07:00 · 2025-01-05 16:56:22 -07:00 · 2025-01-05 16:55:30 -07:00 · 2024-12-31 12:38:29 -07:00
10 changed files with 51 additions and 176 deletions
--- 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

--- 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<PlacedFeature> cyanRoseRarerPlacedKey = registerKey("cyan_rose_rare_placed");
 	public static final RegistryKey<PlacedFeature> roseRarerPlacedKey = registerKey("rose_rare_placed");

-	public static final RegistryKey<PlacedFeature> cyanRoseCommonPlacedKey = registerKey("cyan_rose_common_placed");
-	public static final RegistryKey<PlacedFeature> roseCommonPlacedKey = registerKey("rose_common_placed");
-
 	public static void bootstrap(Registerable<PlacedFeature> 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<PlacedFeature> registerKey(String name) {
--- 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,
-        )
    }
 }
--- 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<PlacedFeature> cyanRoseRarerPlacedKey = registerKey("cyan_rose_rare_placed");
 	public static final RegistryKey<PlacedFeature> roseRarerPlacedKey = registerKey("rose_rare_placed");

-	public static final RegistryKey<PlacedFeature> cyanRoseCommonPlacedKey = registerKey("cyan_rose_common_placed");
-	public static final RegistryKey<PlacedFeature> roseCommonPlacedKey = registerKey("rose_common_placed");
-
 	public static void bootstrap(Registerable<PlacedFeature> 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<PlacedFeature> registerKey(String name) {
--- 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,
-        )
    }
 }
--- 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<PlacedFeature> cyanRoseRarerPlacedKey = registerKey("cyan_rose_rare_placed");
 	public static final RegistryKey<PlacedFeature> roseRarerPlacedKey = registerKey("rose_rare_placed");

-	public static final RegistryKey<PlacedFeature> cyanRoseCommonPlacedKey = registerKey("cyan_rose_common_placed");
-	public static final RegistryKey<PlacedFeature> roseCommonPlacedKey = registerKey("rose_common_placed");

 	public static void bootstrap(Registerable<PlacedFeature> 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<PlacedFeature> registerKey(String name) {
--- 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,
-        )
    }
 }
--- 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<PlacedFeature> registerKey(String name) {
--- 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,
-        )
    }
 }
--- a/README.md
+++ b/README.md
@ -1,11 +1,6 @@
 # Roses Mod

-> **Note**
-> The mod has been rewritten in kotlin and fabric, instead of java quilt,
-> previous versions have some bugs and not all bug fixes or features have been backported,
-> I will be backporting the mod after this rewrite back as far as I can while being sane.
->
-> I have removed all older versions from modrinth to prevent confusion
+![made with fabric 88x31 badge](https://cdn.modrinth.com/data/cached_images/566134d54a0d603a50b616650bc189ef3f3ed9b8.png)

 This mod brings back the classic roses and other classic flowers to minecraft, without replacing any newer flower types.

@ -17,6 +12,7 @@ This mod brings back the classic roses and other classic flowers to minecraft, w
 - Bees can pollinate all flowers

 <!-- modrinth_exclude.start -->
+
 ## Versioning
 1.0: where the first number is the grander version (all mc versions will have the same),
 second number is specific mc version patch
Author	SHA1	Message	Date
nelle	af3e0db95d	made with fabric	2025-01-05 16:59:34 -07:00
nelle	a6be8bbcac	made with fabric	2025-01-05 16:56:22 -07:00
nelle	6610ec420b	made with fabric	2025-01-05 16:55:30 -07:00
nelle	c45acb2e99	oopsies	2024-12-31 12:38:29 -07:00