Add new flowers part4, remove crimson clover...

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

@@ -142,13 +142,13 @@ public static void onWandererTrades(WandererTradesEvent event)
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.SNOWDROP.get()), 12, 1, 0.05F));
 			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.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_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.STURTS_DESERT_PEA.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

@@ -6,7 +6,7 @@
 import com.github.mechalopa.jafohana.world.level.block.BadlandsFlowerBlock;
 import com.github.mechalopa.jafohana.world.level.block.BadlandsTallFlowerBlock;
 import com.github.mechalopa.jafohana.world.level.block.BeachSpiderLilyBlock;
-import com.github.mechalopa.jafohana.world.level.block.CrimsonCloverBlock;
+import com.github.mechalopa.jafohana.world.level.block.DesertFlowerBlock;
 import com.github.mechalopa.jafohana.world.level.block.FasciatedDandelionBlock;
 import com.github.mechalopa.jafohana.world.level.block.FasciatedOxeyeDaisyBlock;
 import com.github.mechalopa.jafohana.world.level.block.JadeVineBlock;
@@ -52,13 +52,13 @@ public class ModBlocks
 	public static final Supplier<Block> SNOWDROP = REGISTRY.register("snowdrop", () -> new ModFlowerBlock(MobEffects.POISON, 12.0F));
 	public static final Supplier<Block> WINTER_HEATH = REGISTRY.register("winter_heath", () -> new ModFlowerBlock(MobEffects.WEAKNESS, 9.0F));
 	public static final Supplier<Block> BLUE_DAISY = REGISTRY.register("blue_daisy", () -> new ModFlowerBlock(MobEffects.MOVEMENT_SPEED, 5.0F));
-	public static final Supplier<Block> CRIMSON_CLOVER = REGISTRY.register("crimson_clover", () -> new CrimsonCloverBlock(MobEffects.FIRE_RESISTANCE, 4.0F));
 	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_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> STURTS_DESERT_PEA = REGISTRY.register("sturts_desert_pea", () -> new DesertFlowerBlock(MobEffects.FIRE_RESISTANCE, 4.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));
@@ -113,13 +113,13 @@ public class ModBlocks
 	public static final Supplier<Block> POTTED_SNOWDROP = REGISTRY.register("potted_snowdrop", () -> new ModFlowerPotBlock(SNOWDROP.get()));
 	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_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_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_STURTS_DESERT_PEA = REGISTRY.register("potted_sturts_desert_pea", () -> new ModFlowerPotBlock(STURTS_DESERT_PEA.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

@@ -41,13 +41,13 @@ public class ModItems
 	public static final Supplier<Item> SNOWDROP = REGISTRY.register("snowdrop", () -> new BlockItem(ModBlocks.SNOWDROP.get(), new Item.Properties()));
 	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> 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_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> STURTS_DESERT_PEA = REGISTRY.register("sturts_desert_pea", () -> new BlockItem(ModBlocks.STURTS_DESERT_PEA.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/java/com/github/mechalopa/jafohana/util/ModTags.java

@@ -18,7 +18,7 @@ public static final class BlockTags
 		public static final TagKey<Block> CONVERTABLE_TO_CREEPANSY = createBlockTag("convertable_to_creepansy");
 		public static final TagKey<Block> CONVERTABLE_TO_FASCIATED_DANDELION = createBlockTag("convertable_to_fasciated_dandelion");
 		public static final TagKey<Block> CONVERTABLE_TO_FASCIATED_OXEYE_DAISY = createBlockTag("convertable_to_fasciated_oxeye_daisy");
-		public static final TagKey<Block> CRIMSON_CLOVER_PLANTABLE_ON = createBlockTag("crimson_clover_plantable_on");
+		public static final TagKey<Block> DESERT_FLOWER_PLANTABLE_ON = createBlockTag("desert_flower_plantable_on");
 		public static final TagKey<Block> RED_SPIDER_LILY_PLANTABLE_ON = createBlockTag("red_spider_lily_plantable_on");
 		public static final TagKey<Block> VINE_FLOWER_PLANTABLE_ON = createBlockTag("vine_flower_plantable_on");
 	}

src/main/java/com/github/mechalopa/jafohana/world/level/block/DesertFlowerBlock.java

@@ -0,0 +1,23 @@
+package com.github.mechalopa.jafohana.world.level.block;
+
+import com.github.mechalopa.jafohana.util.ModTags;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Holder;
+import net.minecraft.world.effect.MobEffect;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.block.state.BlockState;
+
+public class DesertFlowerBlock extends ModFlowerBlock
+{
+	public DesertFlowerBlock(Holder<MobEffect> effect, float seconds)
+	{
+		super(effect, seconds);
+	}
+
+	@Override
+	protected boolean mayPlaceOn(BlockState state, BlockGetter world, BlockPos pos)
+	{
+		return state.is(ModTags.BlockTags.DESERT_FLOWER_PLANTABLE_ON);
+	}
+}

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

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

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

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

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

@@ -24,13 +24,13 @@
   "block.jafohana.snowdrop": "Snowdrop",
   "block.jafohana.winter_heath": "Winter Heath",
   "block.jafohana.blue_daisy": "Blue Daisy",
-  "block.jafohana.crimson_clover": "Crimson Clovers",
   "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_kidneywort": "Magenta Kidneywort",
   "block.jafohana.purple_kidneywort": "Purple Kidneywort",
   "block.jafohana.white_kidneywort": "White Kidneywort",
+  "block.jafohana.sturts_desert_pea": "Sturt's Desert Pea",
   "block.jafohana.apricot_mallow": "Apricot Mallow",
   "block.jafohana.blue_penstemon": "Blue Penstemon",
   "block.jafohana.firecracker_penstemon": "Firecracker Penstemon",
@@ -85,13 +85,13 @@
   "block.jafohana.potted_snowdrop": "Potted Snowdrop",
   "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_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_kidneywort": "Potted Magenta Kidneywort",
   "block.jafohana.potted_purple_kidneywort": "Potted Purple Kidneywort",
   "block.jafohana.potted_white_kidneywort": "Potted White Kidneywort",
+  "block.jafohana.potted_sturts_desert_pea": "Potted Sturt's Desert Pea",
   "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

@@ -24,13 +24,13 @@
   "block.jafohana.snowdrop": "スノードロップ",
   "block.jafohana.winter_heath": "ウィンターヒース",
   "block.jafohana.blue_daisy": "ブルーデイジー",
-  "block.jafohana.crimson_clover": "ベニバナツメクサ",
   "block.jafohana.fox_and_cubs": "コウリンタンポポ",
   "block.jafohana.pink_hawks_beard": "モモイロタンポポ",
   "block.jafohana.ladies_tresses": "ネジバナ",
   "block.jafohana.magenta_kidneywort": "赤紫色の三角草",
   "block.jafohana.purple_kidneywort": "紫色の三角草",
   "block.jafohana.white_kidneywort": "白色の三角草",
+  "block.jafohana.sturts_desert_pea": "スターツデザートピー",
   "block.jafohana.apricot_mallow": "アプリコットマロー",
   "block.jafohana.blue_penstemon": "ブルーペンステモン",
   "block.jafohana.firecracker_penstemon": "ファイヤークラッカーペンステモン",
@@ -85,13 +85,13 @@
   "block.jafohana.potted_snowdrop": "植えられたスノードロップ",
   "block.jafohana.potted_winter_heath": "植えられたウィンターヒース",
   "block.jafohana.potted_blue_daisy": "植えられたブルーデイジー",
-  "block.jafohana.potted_crimson_clover": "植えられたベニバナツメクサ",
   "block.jafohana.potted_fox_and_cubs": "植えられたコウリンタンポポ",
   "block.jafohana.potted_pink_hawks_beard": "植えられたモモイロタンポポ",
   "block.jafohana.potted_ladies_tresses": "植えられたネジバナ",
   "block.jafohana.potted_magenta_kidneywort": "植えられた赤紫色の三角草",
   "block.jafohana.potted_purple_kidneywort": "植えられた紫色の三角草",
   "block.jafohana.potted_white_kidneywort": "植えられた白色の三角草",
+  "block.jafohana.potted_sturts_desert_pea": "植えられたスターツデザートピー",
   "block.jafohana.potted_apricot_mallow": "植えられたアプリコットマロー",
   "block.jafohana.potted_potted_blue_penstemon": "植えられたブルーペンステモン",
   "block.jafohana.potted_firecracker_penstemon": "植えられたファイヤークラッカーペンステモン",

src/main/resources/assets/jafohana/models/block/potted_crimson_clover.json → src/main/resources/assets/jafohana/models/block/potted_sturts_desert_pea.json

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

src/main/resources/assets/jafohana/models/block/crimson_clover.json → src/main/resources/assets/jafohana/models/block/sturts_desert_pea.json

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

src/main/resources/assets/jafohana/models/item/crimson_clover.json → src/main/resources/assets/jafohana/models/item/sturts_desert_pea.json

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

src/main/resources/data/jafohana/loot_modifiers/chests/desert_pyramid.json

@@ -0,0 +1,10 @@
+{
+  "type": "neoforge:add_table",
+  "conditions": [
+    {
+      "condition": "neoforge:loot_table_id",
+      "loot_table_id": "minecraft:chests/desert_pyramid"
+    }
+  ],
+  "table": "jafohana:additions/chests/desert_pyramid"
+}

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

@@ -11,7 +11,7 @@
               "add": false,
               "count": {
                 "type": "minecraft:uniform",
-                "max": 3.0,
+                "max": 5.0,
                 "min": 1.0
               },
               "function": "minecraft:set_count"

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

@@ -0,0 +1,35 @@
+{
+  "type": "minecraft:chest",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "add": false,
+              "count": {
+                "type": "minecraft:uniform",
+                "max": 5.0,
+                "min": 1.0
+              },
+              "function": "minecraft:set_count"
+            }
+          ],
+          "name": "jafohana:sturts_desert_pea"
+        },
+        {
+          "type": "minecraft:empty",
+          "weight": 15
+        }
+      ],
+      "rolls": {
+        "type": "minecraft:uniform",
+        "max": 3.0,
+        "min": 0.0
+      }
+    }
+  ],
+  "random_sequence": "jafohana:additions/chests/desert_pyramid"
+}