start 25w08a port

gradle.properties

@@ -9,7 +9,7 @@
 
 # Fabric Properties
 	# Get new versions at https://fabricmc.net/develop and https://lambdaurora.dev/tools/import_quilt.html
-	minecraft_version=25w07a
+	minecraft_version=25w08a
     quilt_mappings=1.21+build.18
     parchment_mappings=1.21:2024.07.28
 	loader_version=0.16.10
@@ -23,7 +23,7 @@
 	archives_base_name = WilderWild
 
 # Dependencies
-	fabric_api_version=0.116.1+1.21.5
+	fabric_api_version=0.117.4+1.21.5
 	frozenlib_version=1.9.14-mc25w04a
 
 # External Mods

src/main/generated/assets/wilderwild/items/butterfly_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -11263997
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -12448
-      }
-    ]
+    "model": "wilderwild:item/butterfly_spawn_egg"
   }
 }

src/main/generated/assets/wilderwild/items/crab_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -425164
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -408730
-      }
-    ]
+    "model": "wilderwild:item/crab_spawn_egg"
   }
 }

src/main/generated/assets/wilderwild/items/firefly_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -14013653
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -31
-      }
-    ]
+    "model": "wilderwild:item/firefly_spawn_egg"
   }
 }

src/main/generated/assets/wilderwild/items/jellyfish_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -1800988
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -2133540
-      }
-    ]
+    "model": "wilderwild:item/jellyfish_spawn_egg"
   }
 }

src/main/generated/assets/wilderwild/items/moobloom_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -76231
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -528959
-      }
-    ]
+    "model": "wilderwild:item/moobloom_spawn_egg"
   }
 }

src/main/generated/assets/wilderwild/items/ostrich_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -335664
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -10797020
-      }
-    ]
+    "model": "wilderwild:item/ostrich_spawn_egg"
   }
 }

src/main/generated/assets/wilderwild/items/penguin_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -13751232
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -2050507
-      }
-    ]
+    "model": "wilderwild:item/penguin_spawn_egg"
   }
 }

src/main/generated/assets/wilderwild/items/scorched_spawn_egg.json

@@ -1,16 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "minecraft:item/template_spawn_egg",
-    "tints": [
-      {
-        "type": "minecraft:constant",
-        "value": -11786986
-      },
-      {
-        "type": "minecraft:constant",
-        "value": -18432
-      }
-    ]
+    "model": "wilderwild:item/scorched_spawn_egg"
   }
 }

src/main/generated/assets/wilderwild/models/item/butterfly_spawn_egg.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "wilderwild:item/butterfly_spawn_egg"
+  }
+}

src/main/generated/assets/wilderwild/models/item/crab_spawn_egg.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "wilderwild:item/crab_spawn_egg"
+  }
+}

src/main/generated/assets/wilderwild/models/item/firefly_spawn_egg.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "wilderwild:item/firefly_spawn_egg"
+  }
+}

src/main/generated/assets/wilderwild/models/item/jellyfish_spawn_egg.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "wilderwild:item/jellyfish_spawn_egg"
+  }
+}

src/main/generated/assets/wilderwild/models/item/moobloom_spawn_egg.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "wilderwild:item/moobloom_spawn_egg"
+  }
+}

src/main/generated/assets/wilderwild/models/item/orange_maple_leaf_litter.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "wilderwild:block/orange_maple_leaf_litter"
+    "layer0": "wilderwild:item/orange_maple_leaf_litter"
   }
 }

src/main/generated/assets/wilderwild/models/item/ostrich_spawn_egg.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "wilderwild:item/ostrich_spawn_egg"
+  }
+}

src/main/generated/assets/wilderwild/models/item/penguin_spawn_egg.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "wilderwild:item/penguin_spawn_egg"
+  }
+}

src/main/generated/assets/wilderwild/models/item/red_maple_leaf_litter.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "wilderwild:block/red_maple_leaf_litter"
+    "layer0": "wilderwild:item/red_maple_leaf_litter"
   }
 }

src/main/generated/assets/wilderwild/models/item/scorched_spawn_egg.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "wilderwild:item/scorched_spawn_egg"
+  }
+}

src/main/generated/assets/wilderwild/models/item/yellow_maple_leaf_litter.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "wilderwild:block/yellow_maple_leaf_litter"
+    "layer0": "wilderwild:item/yellow_maple_leaf_litter"
   }
 }

src/main/java/net/frozenblock/wilderwild/datagen/model/WWModelProvider.java

@@ -236,14 +236,14 @@ public void generateItemModels(@NotNull ItemModelGenerators generator) {
 		WWModelHelper.generateEchoGlass(generator, WWItems.ECHO_GLASS);
 
 		// Spawn Eggs
-		generator.generateSpawnEgg(WWItems.FIREFLY_SPAWN_EGG, Integer.parseInt("2A2B2B", 16), Integer.parseInt("FFFFE1", 16));
-		generator.generateSpawnEgg(WWItems.JELLYFISH_SPAWN_EGG, Integer.parseInt("E484E4", 16), Integer.parseInt("DF71DC", 16));
-		generator.generateSpawnEgg(WWItems.CRAB_SPAWN_EGG, Integer.parseInt("F98334", 16), Integer.parseInt("F9C366", 16));
-		generator.generateSpawnEgg(WWItems.OSTRICH_SPAWN_EGG, Integer.parseInt("FAE0D0", 16), Integer.parseInt("5B4024", 16));
-		generator.generateSpawnEgg(WWItems.SCORCHED_SPAWN_EGG, Integer.parseInt("4C2516", 16), Integer.parseInt("FFB800", 16));
-		generator.generateSpawnEgg(WWItems.BUTTERFLY_SPAWN_EGG, Integer.parseInt("542003", 16), Integer.parseInt("FFCF60", 16));
-		generator.generateSpawnEgg(WWItems.MOOBLOOM_SPAWN_EGG, Integer.parseInt("FED639", 16), Integer.parseInt("F7EDC1", 16));
-		generator.generateSpawnEgg(WWItems.PENGUIN_SPAWN_EGG, Integer.parseInt("2E2C40", 16), Integer.parseInt("E0B635", 16));
+		generator.generateFlatItem(WWItems.FIREFLY_SPAWN_EGG, ModelTemplates.FLAT_ITEM);
+		generator.generateFlatItem(WWItems.JELLYFISH_SPAWN_EGG, ModelTemplates.FLAT_ITEM);
+		generator.generateFlatItem(WWItems.CRAB_SPAWN_EGG, ModelTemplates.FLAT_ITEM);
+		generator.generateFlatItem(WWItems.OSTRICH_SPAWN_EGG, ModelTemplates.FLAT_ITEM);
+		generator.generateFlatItem(WWItems.SCORCHED_SPAWN_EGG, ModelTemplates.FLAT_ITEM);
+		generator.generateFlatItem(WWItems.BUTTERFLY_SPAWN_EGG, ModelTemplates.FLAT_ITEM);
+		generator.generateFlatItem(WWItems.MOOBLOOM_SPAWN_EGG, ModelTemplates.FLAT_ITEM);
+		generator.generateFlatItem(WWItems.PENGUIN_SPAWN_EGG, ModelTemplates.FLAT_ITEM);
 
 		// Firefly Bottles
 		WWModelHelper.generateFireflyBottles(generator);

src/main/java/net/frozenblock/wilderwild/mod_compat/FrozenLibIntegration.java

@@ -89,7 +89,7 @@
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.animal.WolfVariants;
+import net.minecraft.world.entity.animal.wolf.WolfVariants;
 import net.minecraft.world.entity.monster.EnderMan;
 import net.minecraft.world.item.InstrumentItem;
 import net.minecraft.world.item.Item;
@@ -108,7 +108,6 @@
 import net.minecraft.world.level.levelgen.structure.templatesystem.ProcessorRule;
 import net.minecraft.world.level.levelgen.structure.templatesystem.RandomBlockMatchTest;
 import net.minecraft.world.level.levelgen.structure.templatesystem.RuleProcessor;
-import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessor;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;

src/main/java/net/frozenblock/wilderwild/worldgen/biome/AridForest.java

@@ -109,6 +109,11 @@ public int waterFogColor() {
 		return null;
 	}
 
+	@Override
+	public @Nullable Integer dryFoliageColorOverride() {
+		return null;
+	}
+
 	@Override
 	public @Nullable Integer grassColorOverride() {
 		return null;

src/main/java/net/frozenblock/wilderwild/worldgen/biome/AridSavanna.java

@@ -108,6 +108,11 @@ public int waterFogColor() {
 		return null;
 	}
 
+	@Override
+	public @Nullable Integer dryFoliageColorOverride() {
+		return null;
+	}
+
 	@Override
 	public @Nullable Integer grassColorOverride() {
 		return null;

src/main/java/net/frozenblock/wilderwild/worldgen/biome/BirchJungle.java

@@ -108,6 +108,11 @@ public int waterFogColor() {
 		return null;
 	}
 
+	@Override
+	public @Nullable Integer dryFoliageColorOverride() {
+		return null;
+	}
+
 	@Override
 	public @Nullable Integer grassColorOverride() {
 		return null;

src/main/java/net/frozenblock/wilderwild/worldgen/biome/BirchTaiga.java

@@ -109,6 +109,11 @@ public int waterFogColor() {
 		return null;
 	}
 
+	@Override
+	public @Nullable Integer dryFoliageColorOverride() {
+		return null;
+	}
+
 	@Override
 	public @Nullable Integer grassColorOverride() {
 		return null;

src/main/java/net/frozenblock/wilderwild/worldgen/biome/CypressWetlands.java

@@ -128,6 +128,11 @@ public int waterFogColor() {
 		return FOLIAGE_COLOR;
 	}
 
+	@Override
+	public @Nullable Integer dryFoliageColorOverride() {
+		return null;
+	}
+
 	@Override
 	public @NotNull Integer grassColorOverride() {
 		return GRASS_COLOR;

src/main/java/net/frozenblock/wilderwild/worldgen/biome/DarkBirchForest.java

@@ -109,6 +109,11 @@ public int waterFogColor() {
 		return null;
 	}
 
+	@Override
+	public @Nullable Integer dryFoliageColorOverride() {
+		return null;
+	}
+
 	@Override
 	public @Nullable Integer grassColorOverride() {
 		return null;

src/main/java/net/frozenblock/wilderwild/worldgen/biome/DarkTaiga.java

@@ -109,6 +109,11 @@ public int waterFogColor() {
 		return null;
 	}
 
+	@Override
+	public @Nullable Integer dryFoliageColorOverride() {
+		return null;
+	}
+
 	@Override
 	public @Nullable Integer grassColorOverride() {
 		return null;

src/main/java/net/frozenblock/wilderwild/worldgen/biome/DyingForest.java

@@ -112,6 +112,11 @@ public int waterFogColor() {
 		return FOLIAGE_COLOR;
 	}
 
+	@Override
+	public @Nullable Integer dryFoliageColorOverride() {
+		return null;
+	}
+
 	@Override
 	public @Nullable Integer grassColorOverride() {
 		return GRASS_COLOR;