diff --git a/gradle.properties b/gradle.properties index 0ab63ef..3948772 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx1G org.gradle.parallel = true # Mod Properties -version = 2.3.0-SNAPSHOT-2 +version = 2.3.0 maven_group = xyz.limepot archives_base_name = roses_mod diff --git a/src/main/java/xyz/limepot/roses_mod/RosesMod.java b/src/main/java/xyz/limepot/roses_mod/RosesMod.java index 208bc9a..db8b5e1 100644 --- a/src/main/java/xyz/limepot/roses_mod/RosesMod.java +++ b/src/main/java/xyz/limepot/roses_mod/RosesMod.java @@ -20,6 +20,8 @@ import org.quiltmc.qsl.item.setting.api.QuiltItemSettings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import xyz.limepot.roses_mod.world.gen.ModWorldGen; + +import java.util.Random; //import xyz.limepot.roses_mod.world.feature.ModConfiguredFeatures; public class RosesMod implements ModInitializer { @@ -59,16 +61,16 @@ public class RosesMod implements ModInitializer { Registry.register(Registries.ITEM, new Identifier(MOD_ID, "cyan_rose_bush"), new BlockItem(CYAN_ROSE_BUSH, new QuiltItemSettings())); //CREATIVE TABS - /* - ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(content -> { + + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL_BLOCKS).register(content -> { content.addAfter(Items.POPPY, ROSE_FLOWER); }); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(content -> { + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL_BLOCKS).register(content -> { content.addAfter(Items.BLUE_ORCHID, CYAN_ROSE); }); - ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(content -> { + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL_BLOCKS).register(content -> { content.addAfter(Items.ROSE_BUSH, CYAN_ROSE_BUSH); - });*/ + }); //LOOT TABLES diff --git a/src/main/java/xyz/limepot/roses_mod/world/gen/ModFlowerGeneration.java b/src/main/java/xyz/limepot/roses_mod/world/gen/ModFlowerGeneration.java index d985c57..64b95c2 100644 --- a/src/main/java/xyz/limepot/roses_mod/world/gen/ModFlowerGeneration.java +++ b/src/main/java/xyz/limepot/roses_mod/world/gen/ModFlowerGeneration.java @@ -4,7 +4,7 @@ package xyz.limepot.roses_mod.world.gen; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; -//import net.minecraft.world.biome.BiomeKeys; +import net.minecraft.world.biome.Biomes; import net.minecraft.world.gen.GenerationStep; import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.PlacedFeature; @@ -28,10 +28,10 @@ public class ModFlowerGeneration { BiomeModifications.addFeature(BiomeSelectors.includeByKey(BiomeKeys.PLAINS), GenerationStep.Feature.VEGETAL_DECORATION, cyanRoseBushTag); } */ - public static void generateFlowers() { - /*RegistryKey> cyanRoseBushTag = RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, new Identifier(MOD_ID, "cyan_rose_bush")); + public static void generateFlowers() {/* + RegistryKey> cyanRoseBushTag = RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, new Identifier(MOD_ID, "cyan_rose_bush")); RegistryKey cyanRoseBushTagKey = RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier(MOD_ID, "cyan_rose_bushes")); - BiomeModifications.addFeature(BiomeSelectors.includeByKey(BiomeKeys.FOREST), + BiomeModifications.addFeature(BiomeSelectors.includeByKey(Biomes.FOREST), GenerationStep.Feature.VEGETAL_DECORATION, RegistryKey.of(RegistryKeys.PLACED_FEATURE, new Identifier(MOD_ID, "cyan_rose_bush")));*/ } diff --git a/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json b/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json deleted file mode 100644 index 0e8d141..0000000 --- a/src/main/resources/data/roses_mod/worldgen/configured_feature/cyan_rose_bush.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:vegetation_patch", - "config": { - "surface": "floor", - "depth": 1, - "vertical_range": 1, - "extra_bottom_block_chance": 0, - "extra_edge_column_chance": 0, - "vegetation_chance": 0.2, - "xz_radius": 0, - "replaceable": "#minecraft:tall_flowers", - "ground_state": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:grass_block" - } - }, - "vegetation_feature": "roses_mod:cyan_rose_bush" - } -} diff --git a/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json b/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json deleted file mode 100644 index 310cbbe..0000000 --- a/src/main/resources/data/roses_mod/worldgen/placed_feature/cyan_rose_bush.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "feature": { - "type": "minecraft:vegetation_patch", - "config": { - "surface": "floor", - "depth": 1, - "vertical_range": 1, - "extra_bottom_block_chance": 0, - "extra_edge_column_chance": 0, - "vegetation_chance": 0.2, - "xz_radius": 0, - "replaceable": "#minecraft:tall_flowers", - "ground_state": { - "type": "minecraft:simple_state_provider", - "state": { - "Name": "minecraft:grass_block" - } - }, - "vegetation_feature": "roses_mod:cyan_rose_bush" - } -}, - "placement": [ - { - "type": "minecraft:count", - "count": 4 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - } - ] -}