Add harebell instead of water hyacinth, etc.

src/main/java/com/github/mechalopa/jafohana/ModEvents.java

@@ -151,11 +151,12 @@ public static void onWandererTrades(WandererTradesEvent event)
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.BLUE_DAISY.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.WINTER_HEATH.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.CRIMSON_CLOVER.get()), 12, 1, 0.05F));
+			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.HAREBELL.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.WHEEL_LILY.get()), 12, 1, 0.05F));
+			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.JACK_IN_THE_PULPIT.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.RED_SPIDER_LILY.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.BELLS_OF_IRELAND.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.BEACH_SPIDER_LILY.get()), 12, 1, 0.05F));
-			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.WATER_HYACINTH.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(3, new ItemStack(ModItems.JADE_VINE.get(), 2), 5, 1, 0.05F));
 		}
 	}

src/main/java/com/github/mechalopa/jafohana/registry/ModBlocks.java

@@ -13,7 +13,6 @@
 import com.github.mechalopa.jafohana.world.level.block.ModFlowerPotBlock;
 import com.github.mechalopa.jafohana.world.level.block.ModTallFlowerBlock;
 import com.github.mechalopa.jafohana.world.level.block.RedSpiderLilyBlock;
-import com.github.mechalopa.jafohana.world.level.block.WaterFloatingFlowerBlock;
 
 import net.minecraft.core.registries.Registries;
 import net.minecraft.world.effect.MobEffects;
@@ -52,8 +51,7 @@ public class ModBlocks
 	public static final Supplier<Block> WINTER_HEATH = REGISTRY.register("winter_heath", () -> new ModFlowerBlock(MobEffects.WEAKNESS, 9));
 	public static final Supplier<Block> BLUE_DAISY = REGISTRY.register("blue_daisy", () -> new ModFlowerBlock(MobEffects.MOVEMENT_SPEED, 5));
 	public static final Supplier<Block> CRIMSON_CLOVER = REGISTRY.register("crimson_clover", () -> new CrimsonCloverBlock(MobEffects.FIRE_RESISTANCE, 4));
-//	public static final Supplier<Block> SHOOTING_STAR = REGISTRY.register("shooting_star", () -> new ModFlowerBlock(MobEffects.REGENERATION, 8));
-//	public static final Supplier<Block> KIDNEYWORT = REGISTRY.register("kidneywort", () -> new ModFlowerBlock(MobEffects.DAMAGE_BOOST, 4))
+	public static final Supplier<Block> HAREBELL = REGISTRY.register("harebell", () -> new ModFlowerBlock(MobEffects.JUMP, 5));
 	public static final Supplier<Block> WHEEL_LILY = REGISTRY.register("wheel_lily", () -> new MediumFlowerBlock(MobEffects.SATURATION, 7));
 	public static final Supplier<Block> JACK_IN_THE_PULPIT = REGISTRY.register("jack_in_the_pulpit", () -> new MediumFlowerBlock(MobEffects.POISON, 12));
 	public static final Supplier<Block> RED_SPIDER_LILY = REGISTRY.register("red_spider_lily", () -> new RedSpiderLilyBlock(MobEffects.POISON, 12));
@@ -74,7 +72,6 @@ public class ModBlocks
 	public static final Supplier<Block> YELLOWFLAG_IRIS = REGISTRY.register("yellowflag_iris", () -> new ModTallFlowerBlock());
 	public static final Supplier<Block> FASCIATED_DANDELION = REGISTRY.register("fasciated_dandelion", () -> new FasciatedDandelionBlock());
 	public static final Supplier<Block> FASCIATED_OXEYE_DAISY = REGISTRY.register("fasciated_oxeye_daisy", () -> new FasciatedOxeyeDaisyBlock());
-	public static final Supplier<Block> WATER_HYACINTH = REGISTRY.register("water_hyacinth", () -> new WaterFloatingFlowerBlock(MobEffects.WEAKNESS, 9));
 	public static final Supplier<Block> JADE_VINE = REGISTRY.register("jade_vine", () -> new JadeVineBlock());
 	public static final Supplier<Block> POTTED_DAYFLOWER = REGISTRY.register("potted_dayflower", () -> new ModFlowerPotBlock(DAYFLOWER.get()));
 	public static final Supplier<Block> POTTED_EVENING_PRIMROSE = REGISTRY.register("potted_evening_primrose", () -> new ModFlowerPotBlock(EVENING_PRIMROSE.get()));
@@ -102,12 +99,12 @@ public class ModBlocks
 	public static final Supplier<Block> POTTED_WINTER_HEATH = REGISTRY.register("potted_winter_heath", () -> new ModFlowerPotBlock(WINTER_HEATH.get()));
 	public static final Supplier<Block> POTTED_BLUE_DAISY = REGISTRY.register("potted_blue_daisy", () -> new ModFlowerPotBlock(BLUE_DAISY.get()));
 	public static final Supplier<Block> POTTED_CRIMSON_CLOVER = REGISTRY.register("potted_crimson_clover", () -> new ModFlowerPotBlock(CRIMSON_CLOVER.get()));
+	public static final Supplier<Block> POTTED_HAREBELL = REGISTRY.register("potted_harebell", () -> new ModFlowerPotBlock(HAREBELL.get()));
 	public static final Supplier<Block> POTTED_WHEEL_LILY = REGISTRY.register("potted_wheel_lily", () -> new ModFlowerPotBlock(WHEEL_LILY.get()));
 	public static final Supplier<Block> POTTED_JACK_IN_THE_PULPIT = REGISTRY.register("potted_jack_in_the_pulpit", () -> new ModFlowerPotBlock(JACK_IN_THE_PULPIT.get()));
 	public static final Supplier<Block> POTTED_RED_SPIDER_LILY = REGISTRY.register("potted_red_spider_lily", () -> new ModFlowerPotBlock(RED_SPIDER_LILY.get()));
 	public static final Supplier<Block> POTTED_BELLS_OF_IRELAND = REGISTRY.register("potted_bells_of_ireland", () -> new ModFlowerPotBlock(BELLS_OF_IRELAND.get()));
 	public static final Supplier<Block> POTTED_BEACH_SPIDER_LILY = REGISTRY.register("potted_beach_spider_lily", () -> new ModFlowerPotBlock(BEACH_SPIDER_LILY.get()));
-	public static final Supplier<Block> POTTED_WATER_HYACINTH = REGISTRY.register("potted_water_hyacinth", () -> new ModFlowerPotBlock(WATER_HYACINTH.get()));
 
 	@SubscribeEvent
 	public static void register(IEventBus eventBus)

src/main/java/com/github/mechalopa/jafohana/registry/ModItems.java

@@ -8,7 +8,6 @@
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.DoubleHighBlockItem;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.item.PlaceOnWaterBlockItem;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.registries.DeferredRegister;
@@ -43,6 +42,7 @@ public class ModItems
 	public static final Supplier<Item> WINTER_HEATH = REGISTRY.register("winter_heath", () -> new BlockItem(ModBlocks.WINTER_HEATH.get(), new Item.Properties()));
 	public static final Supplier<Item> BLUE_DAISY = REGISTRY.register("blue_daisy", () -> new BlockItem(ModBlocks.BLUE_DAISY.get(), new Item.Properties()));
 	public static final Supplier<Item> CRIMSON_CLOVER = REGISTRY.register("crimson_clover", () -> new BlockItem(ModBlocks.CRIMSON_CLOVER.get(), new Item.Properties()));
+	public static final Supplier<Item> HAREBELL = REGISTRY.register("harebell", () -> new BlockItem(ModBlocks.HAREBELL.get(), new Item.Properties()));
 	public static final Supplier<Item> WHEEL_LILY = REGISTRY.register("wheel_lily", () -> new BlockItem(ModBlocks.WHEEL_LILY.get(), new Item.Properties()));
 	public static final Supplier<Item> JACK_IN_THE_PULPIT = REGISTRY.register("jack_in_the_pulpit", () -> new BlockItem(ModBlocks.JACK_IN_THE_PULPIT.get(), new Item.Properties()));
 	public static final Supplier<Item> RED_SPIDER_LILY = REGISTRY.register("red_spider_lily", () -> new BlockItem(ModBlocks.RED_SPIDER_LILY.get(), new Item.Properties()));
@@ -63,7 +63,6 @@ public class ModItems
 	public static final Supplier<Item> YELLOWFLAG_IRIS = REGISTRY.register("yellowflag_iris", () -> new DoubleHighBlockItem(ModBlocks.YELLOWFLAG_IRIS.get(), new Item.Properties()));
 	public static final Supplier<Item> FASCIATED_DANDELION = REGISTRY.register("fasciated_dandelion", () -> new DoubleHighBlockItem(ModBlocks.FASCIATED_DANDELION.get(), new Item.Properties()));
 	public static final Supplier<Item> FASCIATED_OXEYE_DAISY = REGISTRY.register("fasciated_oxeye_daisy", () -> new DoubleHighBlockItem(ModBlocks.FASCIATED_OXEYE_DAISY.get(), new Item.Properties()));
-	public static final Supplier<Item> WATER_HYACINTH = REGISTRY.register("water_hyacinth", () -> new PlaceOnWaterBlockItem(ModBlocks.WATER_HYACINTH.get(), new Item.Properties()));
 	public static final Supplier<Item> JADE_VINE = REGISTRY.register("jade_vine", () -> new BlockItem(ModBlocks.JADE_VINE.get(), new Item.Properties()));
 
 	@SubscribeEvent

src/main/resources/assets/jafohana/blockstates/harebell.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "jafohana:block/harebell"
+    }
+  }
+}

src/main/resources/assets/jafohana/blockstates/potted_harebell.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "jafohana:block/potted_harebell"
+    }
+  }
+}

src/main/resources/assets/jafohana/lang/en_us.json

@@ -25,6 +25,7 @@
   "block.jafohana.winter_heath": "Winter Heath",
   "block.jafohana.blue_daisy": "Blue Daisy",
   "block.jafohana.crimson_clover": "Crimson Clovers",
+  "block.jafohana.harebell": "Harebell",
   "block.jafohana.wheel_lily": "Wheel Lily",
   "block.jafohana.jack_in_the_pulpit": "Jack-in-the-Pulpit",
   "block.jafohana.red_spider_lily": "Red Spider Lily",
@@ -45,7 +46,6 @@
   "block.jafohana.yellowflag_iris": "Yellowflag Iris",
   "block.jafohana.fasciated_dandelion": "Fasciated Dandelion",
   "block.jafohana.fasciated_oxeye_daisy": "Fasciated Oxeye Daisy",
-  "block.jafohana.water_hyacinth": "Water Hyacinth",
   "block.jafohana.jade_vine": "Jade Vine",
   "block.jafohana.potted_dayflower": "Potted Dayflower",
   "block.jafohana.potted_evening_primrose": "Potted Evening Primrose",
@@ -73,12 +73,12 @@
   "block.jafohana.potted_winter_heath": "Potted Winter Heath",
   "block.jafohana.potted_blue_daisy": "Potted Blue Daisy",
   "block.jafohana.potted_crimson_clover": "Potted Crimson Clovers",
+  "block.jafohana.potted_harebell": "Potted Harebell",
   "block.jafohana.potted_wheel_lily": "Potted Wheel Lily",
   "block.jafohana.potted_jack_in_the_pulpit": "Potted Jack-in-the-Pulpit",
   "block.jafohana.potted_red_spider_lily": "Potted Red Spider Lily",
   "block.jafohana.potted_bells_of_ireland": "Potted Bells of Ireland",
   "block.jafohana.potted_beach_spider_lily": "Potted Beach Spider Lily",
-  "block.jafohana.potted_water_hyacinth": "Potted Water Hyacinth",
   "item_group.jafohana.tab": "Just a Few Ohana",
   "jafohana.configuration.general": "General",
   "jafohana.configuration.fasciatedDandelionDropsNormalDandelionWhenUsingBoneMeal": "Fasciated dandelion drops normal dandelion when using bone meal",

src/main/resources/assets/jafohana/lang/ja_jp.json

@@ -25,6 +25,7 @@
   "block.jafohana.winter_heath": "ウィンターヒース",
   "block.jafohana.blue_daisy": "ブルーデイジー",
   "block.jafohana.crimson_clover": "ベニバナツメクサ",
+  "block.jafohana.harebell": "イトシャジン",
   "block.jafohana.wheel_lily": "クルマユリ",
   "block.jafohana.jack_in_the_pulpit": "テンナンショウ",
   "block.jafohana.red_spider_lily": "彼岸花",
@@ -45,7 +46,6 @@
   "block.jafohana.yellowflag_iris": "キショウブ",
   "block.jafohana.fasciated_dandelion": "帯化したタンポポ",
   "block.jafohana.fasciated_oxeye_daisy": "帯化したフランスギク",
-  "block.jafohana.water_hyacinth": "ホテイアオイ",
   "block.jafohana.jade_vine": "ヒスイカズラ",
   "block.jafohana.potted_dayflower": "植えられたツユクサ",
   "block.jafohana.potted_evening_primrose": "植えられた月見草",
@@ -73,11 +73,11 @@
   "block.jafohana.potted_winter_heath": "植えられたウィンターヒース",
   "block.jafohana.potted_blue_daisy": "植えられたブルーデイジー",
   "block.jafohana.potted_crimson_clover": "植えられたベニバナツメクサ",
+  "block.jafohana.potted_harebell": "植えられたイトシャジン",
   "block.jafohana.potted_wheel_lily": "植えられたクルマユリ",
   "block.jafohana.potted_jack_in_the_pulpit": "植えられたテンナンショウ",
   "block.jafohana.potted_red_spider_lily": "植えられた彼岸花",
   "block.jafohana.potted_bells_of_ireland": "植えられたカイガラサルビア",
   "block.jafohana.potted_beach_spider_lily": "植えられたビーチスパイダーリリー",
-  "block.jafohana.potted_water_hyacinth": "植えられたホテイアオイ",
   "item_group.jafohana.tab": "Just a Few Ohana"
 }

src/main/resources/assets/jafohana/models/block/water_hyacinth.json → src/main/resources/assets/jafohana/models/block/harebell.json

@@ -2,6 +2,6 @@
   "parent": "minecraft:block/cross",
   "render_type": "cutout",
   "textures": {
-    "cross": "jafohana:block/water_hyacinth"
+    "cross": "jafohana:block/harebell"
   }
 }

src/main/resources/assets/jafohana/models/block/potted_water_hyacinth.json → src/main/resources/assets/jafohana/models/block/potted_harebell.json

@@ -2,6 +2,6 @@
   "parent": "minecraft:block/flower_pot_cross",
   "render_type": "cutout",
   "textures": {
-    "plant": "jafohana:block/water_hyacinth"
+    "plant": "jafohana:block/harebell"
   }
 }

src/main/resources/assets/jafohana/models/item/water_hyacinth.json → src/main/resources/assets/jafohana/models/item/harebell.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "jafohana:block/water_hyacinth"
+    "layer0": "jafohana:block/harebell"
   }
 }

src/main/resources/data/jafohana/loot_table/additions/chests/buried_treasure.json

@@ -94,24 +94,9 @@
           ],
           "name": "jafohana:beach_spider_lily"
         },
-        {
-          "type": "minecraft:item",
-          "functions": [
-            {
-              "add": false,
-              "count": {
-                "type": "minecraft:uniform",
-                "max": 5.0,
-                "min": 1.0
-              },
-              "function": "minecraft:set_count"
-            }
-          ],
-          "name": "jafohana:water_hyacinth"
-        },
         {
           "type": "minecraft:empty",
-          "weight": 9
+          "weight": 10
         }
       ],
       "rolls": {

src/main/resources/data/jafohana/loot_table/additions/chests/pillager_outpost.json

@@ -62,7 +62,7 @@
               "function": "minecraft:set_count"
             }
           ],
-          "name": "jafohana:wheel_lily"
+          "name": "jafohana:harebell"
         },
         {
           "type": "minecraft:item",
@@ -77,7 +77,7 @@
               "function": "minecraft:set_count"
             }
           ],
-          "name": "jafohana:fireweed"
+          "name": "jafohana:wheel_lily"
         },
         {
           "type": "minecraft:item",
@@ -92,7 +92,7 @@
               "function": "minecraft:set_count"
             }
           ],
-          "name": "jafohana:jack_in_the_pulpit"
+          "name": "jafohana:fireweed"
         },
         {
           "type": "minecraft:empty",

src/main/resources/data/jafohana/loot_table/additions/chests/shipwreck_supply.json

@@ -19,24 +19,9 @@
           ],
           "name": "jafohana:beach_spider_lily"
         },
-        {
-          "type": "minecraft:item",
-          "functions": [
-            {
-              "add": false,
-              "count": {
-                "type": "minecraft:uniform",
-                "max": 5.0,
-                "min": 1.0
-              },
-              "function": "minecraft:set_count"
-            }
-          ],
-          "name": "jafohana:water_hyacinth"
-        },
         {
           "type": "minecraft:empty",
-          "weight": 14
+          "weight": 15
         }
       ],
       "rolls": {

src/main/resources/data/jafohana/loot_table/additions/chests/underwater_ruin_big.json

@@ -19,24 +19,9 @@
           ],
           "name": "jafohana:beach_spider_lily"
         },
-        {
-          "type": "minecraft:item",
-          "functions": [
-            {
-              "add": false,
-              "count": {
-                "type": "minecraft:uniform",
-                "max": 5.0,
-                "min": 1.0
-              },
-              "function": "minecraft:set_count"
-            }
-          ],
-          "name": "jafohana:water_hyacinth"
-        },
         {
           "type": "minecraft:empty",
-          "weight": 14
+          "weight": 15
         }
       ],
       "rolls": {

src/main/resources/data/jafohana/loot_table/additions/chests/underwater_ruin_small.json

@@ -19,24 +19,9 @@
           ],
           "name": "jafohana:beach_spider_lily"
         },
-        {
-          "type": "minecraft:item",
-          "functions": [
-            {
-              "add": false,
-              "count": {
-                "type": "minecraft:uniform",
-                "max": 5.0,
-                "min": 1.0
-              },
-              "function": "minecraft:set_count"
-            }
-          ],
-          "name": "jafohana:water_hyacinth"
-        },
         {
           "type": "minecraft:empty",
-          "weight": 14
+          "weight": 15
         }
       ],
       "rolls": {

src/main/resources/data/jafohana/loot_table/blocks/water_hyacinth.json → src/main/resources/data/jafohana/loot_table/blocks/harebell.json

@@ -11,11 +11,11 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "jafohana:water_hyacinth"
+          "name": "jafohana:harebell"
         }
       ],
       "rolls": 1.0
     }
   ],
-  "random_sequence": "jafohana:blocks/water_hyacinth"
+  "random_sequence": "jafohana:blocks/harebell"
 }