diff --git a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt index d77d34c..b7e1283 100644 --- a/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt +++ b/MC1.20.6/src/main/kotlin/observer/nelle/roses_mod/client/roses_modClient.kt @@ -1,9 +1,10 @@ +@file:Suppress("ktlint:standard:filename", "ktlint:standard:package-name", "ktlint:standard:class-naming") + package observer.nelle.roses_mod.client import net.fabricmc.api.ClientModInitializer class roses_modClient : ClientModInitializer { - override fun onInitializeClient() { } } diff --git a/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/flower_pots.json b/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/flower_pots.json new file mode 100644 index 0000000..6ca60b7 --- /dev/null +++ b/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/flower_pots.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "roses_mod:potted_rose", + "roses_mod:cyan_rose" + ] +} diff --git a/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/small_flowers.json b/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/small_flowers.json new file mode 100644 index 0000000..fdecf80 --- /dev/null +++ b/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/small_flowers.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "roses_mod:rose_flower", + "roses_mod:cyan_rose" + ] +} diff --git a/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json b/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json new file mode 100644 index 0000000..ad83bf8 --- /dev/null +++ b/MC1.20.6/src/main/resources/data/minecraft/tags/blocks/tall_flowers.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "roses_mod:cyan_rose_bush" + ] +} diff --git a/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json b/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json new file mode 100644 index 0000000..308ea91 --- /dev/null +++ b/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "roses_mod:cyan_rose" + } + ] + } + ] +} diff --git a/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json b/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json new file mode 100644 index 0000000..9e19db2 --- /dev/null +++ b/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/cyan_rose_bush.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 2, + "entries": [ + { + "type": "minecraft:item", + "name": "roses_mod:cyan_rose" + } + ] + } + ] +} diff --git a/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json b/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json new file mode 100644 index 0000000..e015922 --- /dev/null +++ b/MC1.20.6/src/main/resources/data/roses_mod/loot_tables/blocks/rose_flower.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "roses_mod:rose_flower" + } + ] + } + ] +} diff --git a/MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_dye.json b/MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_dye.json new file mode 100644 index 0000000..6994a61 --- /dev/null +++ b/MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_dye.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + [ + { + "item": "roses_mod:cyan_rose_bush" + }, + { + "item": "roses_mod:cyan_rose" + } + ] + ], + "result": { + "item": "minecraft:cyan_dye", + "count": 2 + } +} diff --git a/MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json b/MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json new file mode 100644 index 0000000..20a5789 --- /dev/null +++ b/MC1.20.6/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " WW", + " WW" + ], + "key": { + "W": { + "item": "roses_mod:cyan_rose" + } + }, + "result": { + "item": "roses_mod:cyan_rose_bush", + "count": 1 + } +} diff --git a/MC1.20.6/src/main/resources/data/roses_mod/recipes/red_dye.json b/MC1.20.6/src/main/resources/data/roses_mod/recipes/red_dye.json new file mode 100644 index 0000000..38111c3 --- /dev/null +++ b/MC1.20.6/src/main/resources/data/roses_mod/recipes/red_dye.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + [ + { + "item": "roses_mod:rose_flower" + } + ] + ], + "result": { + "item": "minecraft:red_dye", + "count": 1 + } +} diff --git a/MC1.20.6/src/main/resources/data/roses_mod/recipes/rose_bush.json b/MC1.20.6/src/main/resources/data/roses_mod/recipes/rose_bush.json new file mode 100644 index 0000000..e02ef06 --- /dev/null +++ b/MC1.20.6/src/main/resources/data/roses_mod/recipes/rose_bush.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " WW", + " WW" + ], + "key": { + "W": { + "item": "roses_mod:rose_flower" + } + }, + "result": { + "item": "minecraft:rose_bush", + "count": 1 + } +} diff --git a/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json new file mode 100644 index 0000000..bd23660 --- /dev/null +++ b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:random_patch", + "config": { + "tries": 1, + "xz_spread": 7, + "y_spread": 3, + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:simple_state_provider", + "state": { + "Name": "roses_mod:cyan_rose_bush", + "Properties": { + "half": "lower" + } + } + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + } + ] + } + } +} diff --git a/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json new file mode 100644 index 0000000..4a7ecb1 --- /dev/null +++ b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_flower.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:flower", + "config": { + "tries": 2, + "xz_spread": 2, + "y_spread": 1, + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 2, + "data": { + "Name": "roses_mod:cyan_rose_flower" + } + } + ] + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + } + ] + } + } +} diff --git a/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json new file mode 100644 index 0000000..eee2d69 --- /dev/null +++ b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/configured_feature/rose_flower.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:flower", + "config": { + "tries": 6, + "xz_spread": 5, + "y_spread": 5, + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "weight": 5, + "data": { + "Name": "roses_mod:rose_flower" + } + } + ] + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + } + ] + } + } +} diff --git a/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json new file mode 100644 index 0000000..4449e17 --- /dev/null +++ b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json @@ -0,0 +1,19 @@ +{ + "feature": "roses_mod:cyan_rose_bush", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 1 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:biome" + } + ] +} diff --git a/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json new file mode 100644 index 0000000..5aa23d1 --- /dev/null +++ b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_flower.json @@ -0,0 +1,19 @@ +{ + "feature": "roses_mod:cyan_rose_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 1 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:biome" + } + ] +} diff --git a/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json new file mode 100644 index 0000000..8d06035 --- /dev/null +++ b/MC1.20.6/src/main/resources/data/roses_mod/worldgen/placed_feature/rose_flower.json @@ -0,0 +1,19 @@ +{ + "feature": "roses_mod:rose_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 1 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:biome" + } + ] +} diff --git a/MC1.20.6/src/main/resources/fabric.mod.json b/MC1.20.6/src/main/resources/fabric.mod.json index 12c38da..d3d81b0 100644 --- a/MC1.20.6/src/main/resources/fabric.mod.json +++ b/MC1.20.6/src/main/resources/fabric.mod.json @@ -18,7 +18,6 @@ }, "mixins": [ - "roses_mod.mixins.json" ], "depends": { diff --git a/MC1.20.6/src/main/resources/roses_mod.mixins.json b/MC1.20.6/src/main/resources/roses_mod.mixins.json deleted file mode 100644 index 9bb0d36..0000000 --- a/MC1.20.6/src/main/resources/roses_mod.mixins.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "observer.nelle.roses_mod.mixin", - "compatibilityLevel": "JAVA_21", - "mixins": [ - ], - "client": [ - ], - "injectors": { - "defaultRequire": 1 - } -} diff --git a/MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose.json b/MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose.json new file mode 100644 index 0000000..6be127f --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/cyan_rose"} + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose_bush.json b/MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose_bush.json new file mode 100644 index 0000000..eaf06c4 --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/blockstates/cyan_rose_bush.json @@ -0,0 +1,10 @@ +{ + "variants": { + "half=lower": { + "model": "roses_mod:block/cyan_rose_bush_bottom" + }, + "half=upper": { + "model": "roses_mod:block/cyan_rose_bush_top" + } + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_cyan.json b/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_cyan.json new file mode 100644 index 0000000..dedd97a --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_cyan.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/potted_cyan"} + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_rose.json b/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_rose.json new file mode 100644 index 0000000..4f5619d --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/blockstates/potted_rose.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/potted_rose"} + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/blockstates/rose_flower.json b/MC1.20.6/src/main/resources/roses_mod/blockstates/rose_flower.json new file mode 100644 index 0000000..66aeb91 --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/blockstates/rose_flower.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/rose_flower"} + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/icon.png b/MC1.20.6/src/main/resources/roses_mod/icon.png new file mode 100644 index 0000000..38fcde9 Binary files /dev/null and b/MC1.20.6/src/main/resources/roses_mod/icon.png differ diff --git a/MC1.20.6/src/main/resources/roses_mod/lang/en_us.json b/MC1.20.6/src/main/resources/roses_mod/lang/en_us.json new file mode 100644 index 0000000..3c022ca --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/lang/en_us.json @@ -0,0 +1,7 @@ +{ + "block.roses_mod.rose_flower": "Rose", + "block.roses_mod.potted_rose": "Potted Rose", + "block.roses_mod.cyan_rose": "Cyan Rose", + "block.roses_mod.potted_cyan": "Potted Cyan Rose", + "block.roses_mod.cyan_rose_bush": "Cyan Rose Bush" +} diff --git a/MC1.20.6/src/main/resources/roses_mod/models/block/cyan_rose.json b/MC1.20.6/src/main/resources/roses_mod/models/block/cyan_rose.json new file mode 100644 index 0000000..4b02866 --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/models/block/cyan_rose.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "roses_mod:block/cyan_rose" + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/models/block/cyan_rose_bush_bottom.json b/MC1.20.6/src/main/resources/roses_mod/models/block/cyan_rose_bush_bottom.json new file mode 100644 index 0000000..95d7c86 --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/models/block/cyan_rose_bush_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "roses_mod:block/cyan_rose_bush_bottom" + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/models/block/cyan_rose_bush_top.json b/MC1.20.6/src/main/resources/roses_mod/models/block/cyan_rose_bush_top.json new file mode 100644 index 0000000..24e8cb0 --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/models/block/cyan_rose_bush_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "roses_mod:block/cyan_rose_bush_top" + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/models/block/potted_cyan.json b/MC1.20.6/src/main/resources/roses_mod/models/block/potted_cyan.json new file mode 100644 index 0000000..8626450 --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/models/block/potted_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "roses_mod:block/cyan_rose" + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/models/block/potted_rose.json b/MC1.20.6/src/main/resources/roses_mod/models/block/potted_rose.json new file mode 100644 index 0000000..fe3887b --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/models/block/potted_rose.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/flower_pot_cross", + "textures": { + "plant": "roses_mod:block/rose_flower" + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/models/block/rose_flower.json b/MC1.20.6/src/main/resources/roses_mod/models/block/rose_flower.json new file mode 100644 index 0000000..ba4e661 --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/models/block/rose_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "roses_mod:block/rose_flower" + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/models/item/cyan_rose.json b/MC1.20.6/src/main/resources/roses_mod/models/item/cyan_rose.json new file mode 100644 index 0000000..90d07d1 --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/models/item/cyan_rose.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "roses_mod:block/cyan_rose" + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/models/item/cyan_rose_bush.json b/MC1.20.6/src/main/resources/roses_mod/models/item/cyan_rose_bush.json new file mode 100644 index 0000000..423fb79 --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/models/item/cyan_rose_bush.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "roses_mod:block/cyan_rose_bush_top" + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/models/item/rose_flower.json b/MC1.20.6/src/main/resources/roses_mod/models/item/rose_flower.json new file mode 100644 index 0000000..11dc496 --- /dev/null +++ b/MC1.20.6/src/main/resources/roses_mod/models/item/rose_flower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "roses_mod:block/rose_flower" + } +} diff --git a/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose.png b/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose.png new file mode 100644 index 0000000..b466404 Binary files /dev/null and b/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose.png differ diff --git a/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_bottom.png b/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_bottom.png new file mode 100644 index 0000000..882a660 Binary files /dev/null and b/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_bottom.png differ diff --git a/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_top.png b/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_top.png new file mode 100644 index 0000000..cfe9caa Binary files /dev/null and b/MC1.20.6/src/main/resources/roses_mod/textures/block/cyan_rose_bush_top.png differ diff --git a/MC1.20.6/src/main/resources/roses_mod/textures/block/rose_flower.png b/MC1.20.6/src/main/resources/roses_mod/textures/block/rose_flower.png new file mode 100644 index 0000000..51d9847 Binary files /dev/null and b/MC1.20.6/src/main/resources/roses_mod/textures/block/rose_flower.png differ diff --git a/settings.gradle.kts b/settings.gradle.kts index 073f82f..3594bfb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,6 +2,7 @@ // Its primary purpose is to define the subprojects. // It is also used for some aspects of project-wide configuration, like managing plugins, dependencies, etc. // https://docs.gradle.org/current/userguide/settings_file_basics.html +rootProject.name = "roses_mod" dependencyResolutionManagement { // Use Maven Central as the default repository (where Gradle will download dependencies) in all subprojects. @@ -34,6 +35,4 @@ plugins { // include(":app") // include(":utils") include(":MC1.20.6") - -rootProject.name = "roses_mod" include("legacy")