24w14potato

build.gradle

@@ -4,7 +4,7 @@ plugins {
 	id "idea"
 	id "maven-publish"
 	id 'jacoco'
-	id "fabric-loom" version "1.5.4" apply false
+	id "fabric-loom" version "1.5.8" apply false
 	id "com.diffplug.spotless" version "6.20.0"
 	id "org.ajoberstar.grgit" version "3.1.0"
 	id "me.modmuss50.remotesign" version "0.4.0" apply false
@@ -361,7 +361,7 @@ remapTestmodJar {
 
 // Apply auxiliary buildscripts to submodules
 // This must be done after all plugins are applied to subprojects
-apply from: "gradle/module-validation.gradle"
+//apply from: "gradle/module-validation.gradle"
 apply from: "gradle/module-versioning.gradle"
 
 loom {

fabric-biome-api-v1/src/testmod/generated/data/fabric-biome-api-v1-testmod/worldgen/biome/custom_plains.json

@@ -26,7 +26,8 @@
       "minecraft:lake_lava_surface"
     ],
     [
-      "minecraft:amethyst_geode"
+      "minecraft:amethyst_geode",
+      "minecraft:potato_geode"
     ],
     [
       "minecraft:monster_room",
@@ -49,6 +50,7 @@
       "minecraft:ore_iron_upper",
       "minecraft:ore_iron_middle",
       "minecraft:ore_iron_small",
+      "minecraft:ore_poisonous_potato",
       "minecraft:ore_gold",
       "minecraft:ore_gold_lower",
       "minecraft:ore_redstone",
@@ -94,6 +96,12 @@
         "maxCount": 8,
         "minCount": 8,
         "weight": 10
+      },
+      {
+        "type": "minecraft:batato",
+        "maxCount": 16,
+        "minCount": 8,
+        "weight": 13
       }
     ],
     "axolotls": [],
@@ -149,6 +157,12 @@
         "minCount": 4,
         "weight": 95
       },
+      {
+        "type": "minecraft:poisonous_potato_zombie",
+        "maxCount": 4,
+        "minCount": 1,
+        "weight": 25
+      },
       {
         "type": "minecraft:zombie_villager",
         "maxCount": 1,

fabric-biome-api-v1/src/testmod/generated/data/fabric-biome-api-v1-testmod/worldgen/biome/test_end_barrens.json

@@ -23,6 +23,12 @@
         "maxCount": 8,
         "minCount": 8,
         "weight": 10
+      },
+      {
+        "type": "minecraft:batato",
+        "maxCount": 16,
+        "minCount": 8,
+        "weight": 13
       }
     ],
     "axolotls": [],
@@ -78,6 +84,12 @@
         "minCount": 4,
         "weight": 95
       },
+      {
+        "type": "minecraft:poisonous_potato_zombie",
+        "maxCount": 4,
+        "minCount": 1,
+        "weight": 25
+      },
       {
         "type": "minecraft:zombie_villager",
         "maxCount": 1,

fabric-biome-api-v1/src/testmod/generated/data/fabric-biome-api-v1-testmod/worldgen/biome/test_end_highlands.json

@@ -31,6 +31,12 @@
         "maxCount": 8,
         "minCount": 8,
         "weight": 10
+      },
+      {
+        "type": "minecraft:batato",
+        "maxCount": 16,
+        "minCount": 8,
+        "weight": 13
       }
     ],
     "axolotls": [],
@@ -86,6 +92,12 @@
         "minCount": 4,
         "weight": 95
       },
+      {
+        "type": "minecraft:poisonous_potato_zombie",
+        "maxCount": 4,
+        "minCount": 1,
+        "weight": 25
+      },
       {
         "type": "minecraft:zombie_villager",
         "maxCount": 1,

fabric-biome-api-v1/src/testmod/generated/data/fabric-biome-api-v1-testmod/worldgen/biome/test_end_midlands.json

@@ -23,6 +23,12 @@
         "maxCount": 8,
         "minCount": 8,
         "weight": 10
+      },
+      {
+        "type": "minecraft:batato",
+        "maxCount": 16,
+        "minCount": 8,
+        "weight": 13
       }
     ],
     "axolotls": [],
@@ -78,6 +84,12 @@
         "minCount": 4,
         "weight": 95
       },
+      {
+        "type": "minecraft:poisonous_potato_zombie",
+        "maxCount": 4,
+        "minCount": 1,
+        "weight": 25
+      },
       {
         "type": "minecraft:zombie_villager",
         "maxCount": 1,

fabric-convention-tags-v1/src/generated/resources/data/c/tags/items/foods.json

@@ -1,12 +1,15 @@
 {
   "values": [
+    "minecraft:potato_fruit",
     "minecraft:apple",
     "minecraft:mushroom_stew",
     "minecraft:bread",
     "minecraft:porkchop",
     "minecraft:cooked_porkchop",
     "minecraft:golden_apple",
     "minecraft:enchanted_golden_apple",
+    "minecraft:golden_poisonous_potato",
+    "minecraft:enchanted_golden_poisonous_potato",
     "minecraft:cod",
     "minecraft:salmon",
     "minecraft:tropical_fish",
@@ -25,6 +28,11 @@
     "minecraft:carrot",
     "minecraft:potato",
     "minecraft:baked_potato",
+    "minecraft:hot_potato",
+    "minecraft:poisonous_potato_fries",
+    "minecraft:poisonous_potato_sticks",
+    "minecraft:poisonous_potato_slices",
+    "minecraft:poisonous_potato_chips",
     "minecraft:poisonous_potato",
     "minecraft:golden_carrot",
     "minecraft:pumpkin_pie",
@@ -39,6 +47,8 @@
     "minecraft:suspicious_stew",
     "minecraft:sweet_berries",
     "minecraft:glow_berries",
-    "minecraft:honey_bottle"
+    "minecraft:honey_bottle",
+    "minecraft:hash_browns",
+    "minecraft:poisonous_potato_plant"
   ]
 }

fabric-data-attachment-api-v1/src/testmod/java/net/fabricmc/fabric/test/attachment/gametest/AttachmentCopyTests.java

@@ -56,7 +56,7 @@ public void testCrossWorldTeleport(TestContext context) {
 		entity.setAttached(DUMMY, () -> 10);
 		entity.setAttached(COPY_ON_DEATH, () -> 10);
 
-		Entity moved = entity.moveToWorld(end);
+		Entity moved = entity.moveToWorld(end, false);
 		if (moved == null) throw new GameTestException("Cross-world teleportation failed");
 
 		IntSupplier attached1 = moved.getAttached(DUMMY);