From 32058b40f6f5d799c67623378b3750149aa25b3c Mon Sep 17 00:00:00 2001 From: LimePot Date: Mon, 9 Jan 2023 02:35:18 -0700 Subject: [PATCH] Fixed tags & Changed Stew Effect --- src/main/java/xyz/limepot/roses_mod/RosesMod.java | 12 +++++------- .../data/minecraft/tags/items/flower_pots.json | 7 ------- .../data/minecraft/tags/items/small_flowers.json | 8 -------- .../data/minecraft/tags/items/tall_flowers.json | 6 ------ .../data/roses_mod/recipes/cyan_rose_bush.json | 2 +- 5 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 src/main/resources/data/minecraft/tags/items/flower_pots.json delete mode 100644 src/main/resources/data/minecraft/tags/items/small_flowers.json delete mode 100644 src/main/resources/data/minecraft/tags/items/tall_flowers.json diff --git a/src/main/java/xyz/limepot/roses_mod/RosesMod.java b/src/main/java/xyz/limepot/roses_mod/RosesMod.java index 005f4df..ab1fe59 100644 --- a/src/main/java/xyz/limepot/roses_mod/RosesMod.java +++ b/src/main/java/xyz/limepot/roses_mod/RosesMod.java @@ -1,10 +1,8 @@ package xyz.limepot.roses_mod; -import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.fabricmc.fabric.api.loot.v2.LootTableEvents; import net.minecraft.block.*; -import net.minecraft.client.render.RenderLayer; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemGroups; @@ -14,9 +12,6 @@ import net.minecraft.loot.entry.ItemEntry; import net.minecraft.loot.provider.number.ConstantLootNumberProvider; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; -import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.RegistryKeys; -import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; import org.quiltmc.loader.api.ModContainer; import org.quiltmc.qsl.base.api.entrypoint.ModInitializer; @@ -24,16 +19,17 @@ import org.quiltmc.qsl.block.extensions.api.QuiltBlockSettings; import org.quiltmc.qsl.item.setting.api.QuiltItemSettings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +//import xyz.limepot.roses_mod.world.feature.ModConfiguredFeatures; public class RosesMod implements ModInitializer { public static final String MOD_ID = "roses_mod"; public static final Logger LOGGER = LoggerFactory.getLogger("Roses Mod"); //ROSE - public static final Block ROSE_FLOWER = new FlowerBlock(StatusEffects.HASTE, 8, QuiltBlockSettings.copyOf(Blocks.POPPY).nonOpaque()); + public static final Block ROSE_FLOWER = new FlowerBlock(StatusEffects.INSTANT_DAMAGE, 6, QuiltBlockSettings.copyOf(Blocks.POPPY).nonOpaque()); public static final Block POTTED_ROSE = new FlowerPotBlock(ROSE_FLOWER, QuiltBlockSettings.copyOf(Blocks.POTTED_POPPY)); //Cyan Rose - public static final Block CYAN_ROSE = new FlowerBlock(StatusEffects.NAUSEA, 8, QuiltBlockSettings.copyOf(Blocks.POPPY).nonOpaque()); + public static final Block CYAN_ROSE = new FlowerBlock(StatusEffects.INSTANT_HEALTH, 6, QuiltBlockSettings.copyOf(Blocks.POPPY).nonOpaque()); public static final Block POTTED_CYAN = new FlowerPotBlock(CYAN_ROSE, QuiltBlockSettings.copyOf(Blocks.POTTED_POPPY)); //Cyan Rose Bush public static final Block CYAN_ROSE_BUSH = new TallPlantBlock(QuiltBlockSettings.copyOf(Blocks.LARGE_FERN)); @@ -41,6 +37,8 @@ public class RosesMod implements ModInitializer { @Override public void onInitialize(ModContainer mod) { + //REGISTER CONFIGURED FEATURES + //ModConfiguredFeatures.registerConfiguredFeatures(); //REGISTER BLOCKS AND BLOCK ITEMS //TODO: ADD ITEMS TO CREATIVE TABS diff --git a/src/main/resources/data/minecraft/tags/items/flower_pots.json b/src/main/resources/data/minecraft/tags/items/flower_pots.json deleted file mode 100644 index a3d9bce..0000000 --- a/src/main/resources/data/minecraft/tags/items/flower_pots.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "roses_mod:potted_rose", - "roses_mod:potted_cyan" - ] -} diff --git a/src/main/resources/data/minecraft/tags/items/small_flowers.json b/src/main/resources/data/minecraft/tags/items/small_flowers.json deleted file mode 100644 index 60ff1c9..0000000 --- a/src/main/resources/data/minecraft/tags/items/small_flowers.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "roses_mod:potted_rose", - "roses_mod:potted_cyan" - ] -} - diff --git a/src/main/resources/data/minecraft/tags/items/tall_flowers.json b/src/main/resources/data/minecraft/tags/items/tall_flowers.json deleted file mode 100644 index ad83bf8..0000000 --- a/src/main/resources/data/minecraft/tags/items/tall_flowers.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "roses_mod:cyan_rose_bush" - ] -} diff --git a/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json b/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json index 3c87f19..20a5789 100644 --- a/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json +++ b/src/main/resources/data/roses_mod/recipes/cyan_rose_bush.json @@ -11,7 +11,7 @@ } }, "result": { - "item": "minecraft:cyan_rose_bush", + "item": "roses_mod:cyan_rose_bush", "count": 1 } }