Compats

Mechalopa · Feb 9, 2025 · f15ae66 · f15ae66
1 parent 651a023
commit f15ae66
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/com/github/mechalopa/jafohana/ModEvents.java b/src/main/java/com/github/mechalopa/jafohana/ModEvents.java
@@ -139,8 +139,8 @@ public static void onWandererTrades(WandererTradesEvent event)
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.WHITE_PANSY.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.YELLOW_PANSY.get()), 12, 1, 0.05F));
 			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.BLUE_DAISY.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.MAGENTA_SPOTTED_BELLFLOWER.get()), 12, 1, 0.05F));
 			genericTrades.add(new BasicItemListing(1, new ItemStack(ModItems.WHITE_SPOTTED_BELLFLOWER.get()), 12, 1, 0.05F));

diff --git a/src/main/resources/data/jafohana/tags/worldgen/biome/is_wasteland.json b/src/main/resources/data/jafohana/tags/worldgen/biome/is_wasteland.json
@@ -4,10 +4,6 @@
     {
       "id": "#forge:is_wasteland",
       "required": false
-    },
-    {
-      "id": "blasted_barrens:blasted_barrens",
-      "required": false
     }
   ]
 }
diff --git a/src/main/resources/data/rediscovered/tags/items/tailor_unsellable_flowers.json b/src/main/resources/data/rediscovered/tags/items/tailor_unsellable_flowers.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "jafohana:creepansy"
+  ]
+}