From 30d871e41a9219fee04f29d02895589a4540c2f8 Mon Sep 17 00:00:00 2001 From: nelle Date: Sun, 22 Dec 2024 12:17:26 -0700 Subject: [PATCH] disable items for potted flowers --- MC20-20.4/gradle.properties | 2 +- .../.cache/d73c6179e9d7fe5e2663060287dab5406b02367a | 11 ----------- .../main/kotlin/observer/nelle/roses/RosesBlocks.kt | 4 ++-- .../main/kotlin/observer/nelle/roses/RosesBlocks.kt | 4 ++-- .../main/kotlin/observer/nelle/roses/RosesBlocks.kt | 4 ++-- README.md | 4 ++++ 6 files changed, 11 insertions(+), 18 deletions(-) delete mode 100644 MC20-20.4/src/main/generated/.cache/d73c6179e9d7fe5e2663060287dab5406b02367a diff --git a/MC20-20.4/gradle.properties b/MC20-20.4/gradle.properties index fcea176..0bb1887 100644 --- a/MC20-20.4/gradle.properties +++ b/MC20-20.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 = 1.0+1.20-1.20.4 + mod_version = 1.1+1.20-1.20.4 maven_group = observer.nelle archives_base_name = roses_mod diff --git a/MC20-20.4/src/main/generated/.cache/d73c6179e9d7fe5e2663060287dab5406b02367a b/MC20-20.4/src/main/generated/.cache/d73c6179e9d7fe5e2663060287dab5406b02367a deleted file mode 100644 index 8b6f1e6..0000000 --- a/MC20-20.4/src/main/generated/.cache/d73c6179e9d7fe5e2663060287dab5406b02367a +++ /dev/null @@ -1,11 +0,0 @@ -// 1.20.4 2024-12-22T02:13:48.60704575 Roses Mod/ -b5132e15afd18ca7cfbde9bece704d9979cc0618 data/roses_mod/worldgen/placed_feature/rose_placed.json -15c2ae2a52afeb92492c0a969eb6a834ee792028 data/roses_mod/worldgen/placed_feature/cyan_rose_common_placed.json -68d13c6af6006b41d01201c517ecde01ae19f29e data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json -677e07b8d113f53c1702e801c4425096b607df9c data/roses_mod/worldgen/placed_feature/cyan_rose_rare_placed.json -619f111dc2852139adb5c9ef798fe53fdae6d3c7 data/roses_mod/worldgen/placed_feature/cyan_rose_placed.json -6507e65a9e72c7bc6a97c3e996ceb82967b59311 data/roses_mod/worldgen/placed_feature/rose_common_placed.json -3f9e7faece178de35182469614527751f7447cd5 data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json -134908f348dd2d85f329150816bf4cf5b8a1cfa9 data/roses_mod/worldgen/placed_feature/cyan_rose_bush_placed.json -1f0dac393835039f9ebe2a4c14c0b43fc62c5512 data/roses_mod/worldgen/configured_feature/rose_flower.json -5b0a542bdd658c02ee5ab5ed428997a6204165f1 data/roses_mod/worldgen/placed_feature/rose_rare_placed.json diff --git a/MC20-20.4/src/main/kotlin/observer/nelle/roses/RosesBlocks.kt b/MC20-20.4/src/main/kotlin/observer/nelle/roses/RosesBlocks.kt index a40a621..dc6b2ff 100644 --- a/MC20-20.4/src/main/kotlin/observer/nelle/roses/RosesBlocks.kt +++ b/MC20-20.4/src/main/kotlin/observer/nelle/roses/RosesBlocks.kt @@ -30,7 +30,7 @@ object RosesBlocks { AbstractBlock.Settings.copy(Blocks.POTTED_POPPY), ), "potted_rose", - true, + false, ) val cyanRoseFlower: Block? = register( @@ -49,7 +49,7 @@ object RosesBlocks { AbstractBlock.Settings.copy(Blocks.POTTED_POPPY), ), "potted_cyan", - true, + false, ) val cyanRoseBush: Block? = register( diff --git a/MC20.5-21.1/src/main/kotlin/observer/nelle/roses/RosesBlocks.kt b/MC20.5-21.1/src/main/kotlin/observer/nelle/roses/RosesBlocks.kt index 31a32b2..daf3e36 100644 --- a/MC20.5-21.1/src/main/kotlin/observer/nelle/roses/RosesBlocks.kt +++ b/MC20.5-21.1/src/main/kotlin/observer/nelle/roses/RosesBlocks.kt @@ -30,7 +30,7 @@ object RosesBlocks { AbstractBlock.Settings.copy(Blocks.POTTED_POPPY), ), "potted_rose", - true, + false, ) val cyanRoseFlower: Block? = register( @@ -49,7 +49,7 @@ object RosesBlocks { AbstractBlock.Settings.copy(Blocks.POTTED_POPPY), ), "potted_cyan", - true, + false, ) val cyanRoseBush: Block? = register( diff --git a/MC21.2-21.4/src/main/kotlin/observer/nelle/roses/RosesBlocks.kt b/MC21.2-21.4/src/main/kotlin/observer/nelle/roses/RosesBlocks.kt index b50b9d6..5a60e3c 100644 --- a/MC21.2-21.4/src/main/kotlin/observer/nelle/roses/RosesBlocks.kt +++ b/MC21.2-21.4/src/main/kotlin/observer/nelle/roses/RosesBlocks.kt @@ -36,7 +36,7 @@ object RosesBlocks { .registryKey(RegistryKey.of(RegistryKeys.BLOCK, Identifier.of(MOD_ID, "potted_rose"))), ), "potted_rose", - true, + false, ) val cyanRoseFlower: Block = register( @@ -59,7 +59,7 @@ object RosesBlocks { .registryKey(RegistryKey.of(RegistryKeys.BLOCK, Identifier.of(MOD_ID, "potted_cyan"))), ), "potted_cyan", - true, + false, ) val cyanRoseBush: Block = register( diff --git a/README.md b/README.md index fe6f165..7805102 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,10 @@ This mod brings back the classic roses and other classic flowers to minecraft, w - Bees can pollinate all flowers +## 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 + ## Building This is a multi-module gradle project, each version set has its own submodule,