nelle/roses-mod
1
0
Fork 0
Code Issues Pull requests Releases 2 Activity

Compare commits

base: nelle:main
Branches Tags
nelle:main
nelle:3.0
nelle:2.0
..
compare: nelle:2.0
Branches Tags
nelle:main
nelle:3.0
nelle:2.0

No commits in common. "main" and "2.0" have entirely different histories.
main ... 2.0

10 changed files with 156 additions and 31 deletions
Show stats Expand all files Collapse all files

2
MC19.3-19.4/gradle.properties
View file

@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
kotlin_loader_version=1.13.0+kotlin.2.1.0
# Mod Properties
mod_version = 3.0+1.19.3-1.19.4
mod_version = 2.0+1.19.3-1.19.4
maven_group = observer.nelle
archives_base_name = roses_mod

16
MC19.3-19.4/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java
View file

@ -23,6 +23,9 @@ 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);
@ -58,6 +61,19 @@ 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) {

29
MC19.3-19.4/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt
View file

@ -90,12 +90,6 @@ 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,
@ -119,6 +113,14 @@ object RosesVegetationGeneration {
BiomeKeys.ICE_SPIKES,
BiomeKeys.DRIPSTONE_CAVES,
BiomeKeys.DEEP_DARK,
),
GenerationStep.Feature.VEGETAL_DECORATION,
RosesPlacedFeatures.roseRarerPlacedKey,
)
// more common
BiomeModifications.addFeature(
BiomeSelectors.includeByKey(
BiomeKeys.JUNGLE,
BiomeKeys.BAMBOO_JUNGLE,
BiomeKeys.SPARSE_JUNGLE,
@ -127,7 +129,20 @@ object RosesVegetationGeneration {
BiomeKeys.WINDSWEPT_SAVANNA,
),
GenerationStep.Feature.VEGETAL_DECORATION,
RosesPlacedFeatures.roseRarerPlacedKey,
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,
)
}
}

16
MC20-20.4/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java
View file

@ -23,6 +23,9 @@ 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);
@ -58,6 +61,19 @@ 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) {

29
MC20-20.4/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt
View file

@ -90,12 +90,6 @@ 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,
@ -119,6 +113,14 @@ object RosesVegetationGeneration {
BiomeKeys.ICE_SPIKES,
BiomeKeys.DRIPSTONE_CAVES,
BiomeKeys.DEEP_DARK,
),
GenerationStep.Feature.VEGETAL_DECORATION,
RosesPlacedFeatures.roseRarerPlacedKey,
)
// more common
BiomeModifications.addFeature(
BiomeSelectors.includeByKey(
BiomeKeys.JUNGLE,
BiomeKeys.BAMBOO_JUNGLE,
BiomeKeys.SPARSE_JUNGLE,
@ -127,7 +129,20 @@ object RosesVegetationGeneration {
BiomeKeys.WINDSWEPT_SAVANNA,
),
GenerationStep.Feature.VEGETAL_DECORATION,
RosesPlacedFeatures.roseRarerPlacedKey,
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,
)
}
}

16
MC20.5-21.1/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java
View file

@ -8,6 +8,7 @@ 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;
@ -23,6 +24,8 @@ 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);
@ -59,6 +62,19 @@ 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) {

29
MC20.5-21.1/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt
View file

@ -90,12 +90,6 @@ 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,
@ -119,6 +113,14 @@ object RosesVegetationGeneration {
BiomeKeys.ICE_SPIKES,
BiomeKeys.DRIPSTONE_CAVES,
BiomeKeys.DEEP_DARK,
),
GenerationStep.Feature.VEGETAL_DECORATION,
RosesPlacedFeatures.roseRarerPlacedKey,
)
// more common
BiomeModifications.addFeature(
BiomeSelectors.includeByKey(
BiomeKeys.JUNGLE,
BiomeKeys.BAMBOO_JUNGLE,
BiomeKeys.SPARSE_JUNGLE,
@ -127,7 +129,20 @@ object RosesVegetationGeneration {
BiomeKeys.WINDSWEPT_SAVANNA,
),
GenerationStep.Feature.VEGETAL_DECORATION,
RosesPlacedFeatures.roseRarerPlacedKey,
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,
)
}
}

13
MC21.2-21.4/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java
View file

@ -61,6 +61,19 @@ 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) {

29
MC21.2-21.4/src/main/kotlin/observer/nelle/roses/world/gen/RosesVegetationGeneration.kt
View file

@ -90,12 +90,6 @@ 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,
@ -119,6 +113,14 @@ object RosesVegetationGeneration {
BiomeKeys.ICE_SPIKES,
BiomeKeys.DRIPSTONE_CAVES,
BiomeKeys.DEEP_DARK,
),
GenerationStep.Feature.VEGETAL_DECORATION,
RosesPlacedFeatures.roseRarerPlacedKey,
)
// more common
BiomeModifications.addFeature(
BiomeSelectors.includeByKey(
BiomeKeys.JUNGLE,
BiomeKeys.BAMBOO_JUNGLE,
BiomeKeys.SPARSE_JUNGLE,
@ -127,7 +129,20 @@ object RosesVegetationGeneration {
BiomeKeys.WINDSWEPT_SAVANNA,
),
GenerationStep.Feature.VEGETAL_DECORATION,
RosesPlacedFeatures.roseRarerPlacedKey,
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,
)
}
}

8
README.md
View file

@ -1,6 +1,11 @@
# Roses Mod
![made with fabric 88x31 badge](https://cdn.modrinth.com/data/cached_images/566134d54a0d603a50b616650bc189ef3f3ed9b8.png)
> **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
This mod brings back the classic roses and other classic flowers to minecraft, without replacing any newer flower types.
@ -12,7 +17,6 @@ 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