Add new flowers part3, add kidneyworts instead of wishbone flowers...

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

@@ -146,9 +146,9 @@ public static void onWandererTrades(WandererTradesEvent event)
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.FOX_AND_CUBS.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.PINK_HAWKS_BEARD.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.LADIES_TRESSES.get()), 12, 1, 0.05F));
-			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.MAGENTA_WISHBONE_FLOWER.get()), 12, 1, 0.05F));
-			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.PURPLE_WISHBONE_FLOWER.get()), 12, 1, 0.05F));
-			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.WHITE_WISHBONE_FLOWER.get()), 12, 1, 0.05F));
+			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.MAGENTA_KIDNEYWORT.get()), 12, 1, 0.05F));
+			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.PURPLE_KIDNEYWORT.get()), 12, 1, 0.05F));
+			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.WHITE_KIDNEYWORT.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.APRICOT_MALLOW.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.BLUE_PENSTEMON.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.FIRECRACKER_PENSTEMON.get()), 12, 1, 0.05F));

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

@@ -56,9 +56,9 @@ public class ModBlocks
 	public static final Supplier<Block> FOX_AND_CUBS = REGISTRY.register("fox_and_cubs", () -> new ModFlowerBlock(MobEffects.REGENERATION, 8.0F));
 	public static final Supplier<Block> PINK_HAWKS_BEARD = REGISTRY.register("pink_hawks_beard", () -> new ModFlowerBlock(MobEffects.SATURATION, 0.35F));
 	public static final Supplier<Block> LADIES_TRESSES = REGISTRY.register("ladies_tresses", () -> new ModFlowerBlock(MobEffects.DIG_SPEED, 5.0F));
-	public static final Supplier<Block> MAGENTA_WISHBONE_FLOWER = REGISTRY.register("magenta_wishbone_flower", () -> new ModFlowerBlock(MobEffects.SLOW_FALLING, 5.0F));
-	public static final Supplier<Block> PURPLE_WISHBONE_FLOWER = REGISTRY.register("purple_wishbone_flower", () -> new ModFlowerBlock(MobEffects.SLOW_FALLING, 5.0F));
-	public static final Supplier<Block> WHITE_WISHBONE_FLOWER = REGISTRY.register("white_wishbone_flower", () -> new ModFlowerBlock(MobEffects.SLOW_FALLING, 5.0F));
+	public static final Supplier<Block> MAGENTA_KIDNEYWORT = REGISTRY.register("magenta_kidneywort", () -> new ModFlowerBlock(MobEffects.CONFUSION, 9.0F));
+	public static final Supplier<Block> PURPLE_KIDNEYWORT = REGISTRY.register("purple_kidneywort", () -> new ModFlowerBlock(MobEffects.CONFUSION, 9.0F));
+	public static final Supplier<Block> WHITE_KIDNEYWORT = REGISTRY.register("white_kidneywort", () -> new ModFlowerBlock(MobEffects.CONFUSION, 9.0F));
 	public static final Supplier<Block> APRICOT_MALLOW = REGISTRY.register("apricot_mallow", () -> new BadlandsFlowerBlock(MobEffects.DAMAGE_RESISTANCE, 4.0F));
 	public static final Supplier<Block> BLUE_PENSTEMON = REGISTRY.register("blue_penstemon", () -> new BadlandsFlowerBlock(MobEffects.DIG_SPEED, 5.0F));
 	public static final Supplier<Block> FIRECRACKER_PENSTEMON = REGISTRY.register("firecracker_penstemon", () -> new BadlandsFlowerBlock(MobEffects.DIG_SPEED, 5.0F));
@@ -117,9 +117,9 @@ public class ModBlocks
 	public static final Supplier<Block> POTTED_FOX_AND_CUBS = REGISTRY.register("potted_fox_and_cubs", () -> new ModFlowerPotBlock(FOX_AND_CUBS.get()));
 	public static final Supplier<Block> POTTED_PINK_HAWKS_BEARD = REGISTRY.register("potted_pink_hawks_beard", () -> new ModFlowerPotBlock(PINK_HAWKS_BEARD.get()));
 	public static final Supplier<Block> POTTED_LADIES_TRESSES = REGISTRY.register("potted_ladies_tresses", () -> new ModFlowerPotBlock(LADIES_TRESSES.get()));
-	public static final Supplier<Block> POTTED_MAGENTA_WISHBONE_FLOWER = REGISTRY.register("potted_magenta_wishbone_flower", () -> new ModFlowerPotBlock(MAGENTA_WISHBONE_FLOWER.get()));
-	public static final Supplier<Block> POTTED_PURPLE_WISHBONE_FLOWER = REGISTRY.register("potted_purple_wishbone_flower", () -> new ModFlowerPotBlock(PURPLE_WISHBONE_FLOWER.get()));
-	public static final Supplier<Block> POTTED_WHITE_WISHBONE_FLOWER = REGISTRY.register("potted_white_wishbone_flower", () -> new ModFlowerPotBlock(WHITE_WISHBONE_FLOWER.get()));
+	public static final Supplier<Block> POTTED_MAGENTA_KIDNEYWORT = REGISTRY.register("potted_magenta_kidneywort", () -> new ModFlowerPotBlock(MAGENTA_KIDNEYWORT.get()));
+	public static final Supplier<Block> POTTED_PURPLE_KIDNEYWORT = REGISTRY.register("potted_purple_kidneywort", () -> new ModFlowerPotBlock(PURPLE_KIDNEYWORT.get()));
+	public static final Supplier<Block> POTTED_WHITE_KIDNEYWORT = REGISTRY.register("potted_white_kidneywort", () -> new ModFlowerPotBlock(WHITE_KIDNEYWORT.get()));
 	public static final Supplier<Block> POTTED_APRICOT_MALLOW = REGISTRY.register("potted_apricot_mallow", () -> new ModFlowerPotBlock(APRICOT_MALLOW.get()));
 	public static final Supplier<Block> POTTED_BLUE_PENSTEMON = REGISTRY.register("potted_blue_penstemon", () -> new ModFlowerPotBlock(BLUE_PENSTEMON.get()));
 	public static final Supplier<Block> POTTED_FIRECRACKER_PENSTEMON = REGISTRY.register("potted_firecracker_penstemon", () -> new ModFlowerPotBlock(FIRECRACKER_PENSTEMON.get()));

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

@@ -45,9 +45,9 @@ public class ModItems
 	public static final Supplier<Item> FOX_AND_CUBS = REGISTRY.register("fox_and_cubs", () -> new BlockItem(ModBlocks.FOX_AND_CUBS.get(), new Item.Properties()));
 	public static final Supplier<Item> PINK_HAWKS_BEARD = REGISTRY.register("pink_hawks_beard", () -> new BlockItem(ModBlocks.PINK_HAWKS_BEARD.get(), new Item.Properties()));
 	public static final Supplier<Item> LADIES_TRESSES = REGISTRY.register("ladies_tresses", () -> new BlockItem(ModBlocks.LADIES_TRESSES.get(), new Item.Properties()));
-	public static final Supplier<Item> MAGENTA_WISHBONE_FLOWER = REGISTRY.register("magenta_wishbone_flower", () -> new BlockItem(ModBlocks.MAGENTA_WISHBONE_FLOWER.get(), new Item.Properties()));
-	public static final Supplier<Item> PURPLE_WISHBONE_FLOWER = REGISTRY.register("purple_wishbone_flower", () -> new BlockItem(ModBlocks.PURPLE_WISHBONE_FLOWER.get(), new Item.Properties()));
-	public static final Supplier<Item> WHITE_WISHBONE_FLOWER = REGISTRY.register("white_wishbone_flower", () -> new BlockItem(ModBlocks.WHITE_WISHBONE_FLOWER.get(), new Item.Properties()));
+	public static final Supplier<Item> MAGENTA_KIDNEYWORT = REGISTRY.register("magenta_kidneywort", () -> new BlockItem(ModBlocks.MAGENTA_KIDNEYWORT.get(), new Item.Properties()));
+	public static final Supplier<Item> PURPLE_KIDNEYWORT = REGISTRY.register("purple_kidneywort", () -> new BlockItem(ModBlocks.PURPLE_KIDNEYWORT.get(), new Item.Properties()));
+	public static final Supplier<Item> WHITE_KIDNEYWORT = REGISTRY.register("white_kidneywort", () -> new BlockItem(ModBlocks.WHITE_KIDNEYWORT.get(), new Item.Properties()));
 	public static final Supplier<Item> APRICOT_MALLOW = REGISTRY.register("apricot_mallow", () -> new BlockItem(ModBlocks.APRICOT_MALLOW.get(), new Item.Properties()));
 	public static final Supplier<Item> BLUE_PENSTEMON = REGISTRY.register("blue_penstemon", () -> new BlockItem(ModBlocks.BLUE_PENSTEMON.get(), new Item.Properties()));
 	public static final Supplier<Item> FIRECRACKER_PENSTEMON = REGISTRY.register("firecracker_penstemon", () -> new BlockItem(ModBlocks.FIRECRACKER_PENSTEMON.get(), new Item.Properties()));

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -28,9 +28,9 @@
   "block.jafohana.fox_and_cubs": "Fox-and-Cubs",
   "block.jafohana.pink_hawks_beard": "Pink Hawk's-Beard",
   "block.jafohana.ladies_tresses": "Austral Ladies' Tresses",
-  "block.jafohana.magenta_wishbone_flower": "Magenta Wishbone Flower",
-  "block.jafohana.purple_wishbone_flower": "Purple Wishbone Flower",
-  "block.jafohana.white_wishbone_flower": "White Wishbone Flower",
+  "block.jafohana.magenta_kidneywort": "Magenta Kidneywort",
+  "block.jafohana.purple_kidneywort": "Purple Kidneywort",
+  "block.jafohana.white_kidneywort": "White Kidneywort",
   "block.jafohana.apricot_mallow": "Apricot Mallow",
   "block.jafohana.blue_penstemon": "Blue Penstemon",
   "block.jafohana.firecracker_penstemon": "Firecracker Penstemon",
@@ -89,9 +89,9 @@
   "block.jafohana.potted_fox_and_cubs": "Potted Fox-and-Cubs",
   "block.jafohana.potted_pink_hawks_beard": "Potted Pink Hawk's-Beard",
   "block.jafohana.potted_ladies_tresses": "Potted Austral Ladies' Tresses",
-  "block.jafohana.potted_magenta_wishbone_flower": "Potted Magenta Wishbone Flower",
-  "block.jafohana.potted_purple_wishbone_flower": "Potted Purple Wishbone Flower",
-  "block.jafohana.potted_white_wishbone_flower": "Potted White Wishbone Flower",
+  "block.jafohana.potted_magenta_kidneywort": "Potted Magenta Kidneywort",
+  "block.jafohana.potted_purple_kidneywort": "Potted Purple Kidneywort",
+  "block.jafohana.potted_white_kidneywort": "Potted White Kidneywort",
   "block.jafohana.potted_apricot_mallow": "Potted Apricot Mallow",
   "block.jafohana.potted_blue_penstemon": "Potted Blue Penstemon",
   "block.jafohana.potted_firecracker_penstemon": "Potted Firecracker Penstemon",

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

@@ -28,9 +28,9 @@
   "block.jafohana.fox_and_cubs": "コウリンタンポポ",
   "block.jafohana.pink_hawks_beard": "モモイロタンポポ",
   "block.jafohana.ladies_tresses": "ネジバナ",
-  "block.jafohana.magenta_wishbone_flower": "赤紫色のトレニア",
-  "block.jafohana.purple_wishbone_flower": "紫色のトレニア",
-  "block.jafohana.white_wishbone_flower": "白色のトレニア",
+  "block.jafohana.magenta_kidneywort": "赤紫色の三角草",
+  "block.jafohana.purple_kidneywort": "紫色の三角草",
+  "block.jafohana.white_kidneywort": "白色の三角草",
   "block.jafohana.apricot_mallow": "アプリコットマロー",
   "block.jafohana.blue_penstemon": "ブルーペンステモン",
   "block.jafohana.firecracker_penstemon": "ファイヤークラッカーペンステモン",
@@ -89,9 +89,9 @@
   "block.jafohana.potted_fox_and_cubs": "植えられたコウリンタンポポ",
   "block.jafohana.potted_pink_hawks_beard": "植えられたモモイロタンポポ",
   "block.jafohana.potted_ladies_tresses": "植えられたネジバナ",
-  "block.jafohana.potted_magenta_wishbone_flower": "植えられた赤紫色のトレニア",
-  "block.jafohana.potted_purple_wishbone_flower": "植えられた紫色のトレニア",
-  "block.jafohana.potted_white_wishbone_flower": "植えられた白色のトレニア",
+  "block.jafohana.potted_magenta_kidneywort": "植えられた赤紫色の三角草",
+  "block.jafohana.potted_purple_kidneywort": "植えられた紫色の三角草",
+  "block.jafohana.potted_white_kidneywort": "植えられた白色の三角草",
   "block.jafohana.potted_apricot_mallow": "植えられたアプリコットマロー",
   "block.jafohana.potted_potted_blue_penstemon": "植えられたブルーペンステモン",
   "block.jafohana.potted_firecracker_penstemon": "植えられたファイヤークラッカーペンステモン",

src/main/resources/assets/jafohana/models/block/white_wishbone_flower.json → src/main/resources/assets/jafohana/models/block/magenta_kidneywort.json

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

src/main/resources/assets/jafohana/models/block/potted_white_wishbone_flower.json → src/main/resources/assets/jafohana/models/block/potted_magenta_kidneywort.json

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

src/main/resources/assets/jafohana/models/block/potted_purple_wishbone_flower.json → src/main/resources/assets/jafohana/models/block/potted_purple_kidneywort.json

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

src/main/resources/assets/jafohana/models/block/potted_magenta_wishbone_flower.json → src/main/resources/assets/jafohana/models/block/potted_white_kidneywort.json

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

src/main/resources/assets/jafohana/models/block/purple_wishbone_flower.json → src/main/resources/assets/jafohana/models/block/purple_kidneywort.json

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

src/main/resources/assets/jafohana/models/block/magenta_wishbone_flower.json → src/main/resources/assets/jafohana/models/block/white_kidneywort.json

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

src/main/resources/assets/jafohana/models/item/white_wishbone_flower.json → src/main/resources/assets/jafohana/models/item/magenta_kidneywort.json

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

src/main/resources/assets/jafohana/models/item/purple_wishbone_flower.json → src/main/resources/assets/jafohana/models/item/purple_kidneywort.json

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

src/main/resources/assets/jafohana/models/item/magenta_wishbone_flower.json → src/main/resources/assets/jafohana/models/item/white_kidneywort.json

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

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

@@ -17,8 +17,7 @@
               "function": "minecraft:set_count"
             }
           ],
-          "name": "jafohana:dancing_ladies_ginger",
-          "weight": 3
+          "name": "jafohana:dancing_ladies_ginger"
         },
         {
           "type": "minecraft:item",
@@ -33,8 +32,7 @@
               "function": "minecraft:set_count"
             }
           ],
-          "name": "jafohana:fireball_lily",
-          "weight": 3
+          "name": "jafohana:fireball_lily"
         },
         {
           "type": "minecraft:item",
@@ -49,53 +47,7 @@
               "function": "minecraft:set_count"
             }
           ],
-          "name": "jafohana:spathiphyllum",
-          "weight": 3
-        },
-        {
-          "type": "minecraft:item",
-          "functions": [
-            {
-              "add": false,
-              "count": {
-                "type": "minecraft:uniform",
-                "max": 3.0,
-                "min": 1.0
-              },
-              "function": "minecraft:set_count"
-            }
-          ],
-          "name": "jafohana:magenta_wishbone_flower"
-        },
-        {
-          "type": "minecraft:item",
-          "functions": [
-            {
-              "add": false,
-              "count": {
-                "type": "minecraft:uniform",
-                "max": 3.0,
-                "min": 1.0
-              },
-              "function": "minecraft:set_count"
-            }
-          ],
-          "name": "jafohana:purple_wishbone_flower"
-        },
-        {
-          "type": "minecraft:item",
-          "functions": [
-            {
-              "add": false,
-              "count": {
-                "type": "minecraft:uniform",
-                "max": 3.0,
-                "min": 1.0
-              },
-              "function": "minecraft:set_count"
-            }
-          ],
-          "name": "jafohana:white_wishbone_flower"
+          "name": "jafohana:spathiphyllum"
         },
         {
           "type": "minecraft:item",
@@ -110,12 +62,11 @@
               "function": "minecraft:set_count"
             }
           ],
-          "name": "jafohana:jade_vine",
-          "weight": 3
+          "name": "jafohana:jade_vine"
         },
         {
           "type": "minecraft:empty",
-          "weight": 9
+          "weight": 4
         }
       ],
       "rolls": {