Backport 2.4.6

CHANGELOG.md

@@ -3,15 +3,12 @@ Thank you!
 Put the changelog BELOW the dashes. ANYTHING ABOVE IS IGNORED
 
 -----------------
-- Crabs will no longer become permanently stuck when walking into a ceiling.
-- Crabs will once again emerge naturally.
-- The Tumbleweed entity's loot table is now impacted by the Looting enchantment.
-- Removed the Palm Crown, replacing it entirely with the Palm Log.
-- Fixed items from naturally-generated Stone Chests not stacking with other items.
-- The Stone Chest item now renders as a Block Entity like other Chests.
-- Datura now yields two Light Gray Dye opposed to one.
-- Revamped Wilder Wild's music pools thanks to Rebel459!
-- Fixed Jellyfish, Ostrich, and Scorched loot tables not parsing in 1.21+.
-- Fixed some Abandoned Cabin loot tables always giving the same loot.
-- Fixed the `Empty or non-existent pool: wilderwild:abandoned_cabin/cabin` error.
-- Added compatability with Continuity and Wilder Wild's snowlogging through a new mixin on Indium. ([#337](https://github.com/FrozenBlock/WilderWild/issues/377))
+- Added dynamic stone chest replacement
+  - Rather than replacing Anicent City nbt, stone chests are dynamically added into ancient cities
+  - Adds support for custom ancient cities
+- Removed changes to the center building in Ancient Cities
+- Fixed conversion of palm crown blocks (removed in 2.4.5) to palm logs
+- Snowlogged double-tall plants will no longer remove the bottom half of the plant when Snow Layers on the top half are broken.
+- Bumped protocol version to 8
+- Changed version scheme to (mod version)-mc(minecraft version)
+- Renamed `WilderSharedConstants` to `WilderConstants`

build.gradle.kts

@@ -18,7 +18,7 @@ buildscript {
 }
 
 plugins {
-    id("fabric-loom") version("1.6.+")
+    id("fabric-loom") version("+")
     id("org.quiltmc.gradle.licenser") version("+")
     id("org.ajoberstar.grgit") version("+")
     id("com.modrinth.minotaur") version("+")
@@ -40,7 +40,6 @@ val loader_version: String by project
 val mod_id: String by project
 val mod_version: String by project
 val protocol_version: String by project
-val mod_loader: String by project
 val maven_group: String by project
 val archives_base_name: String by project
 
@@ -188,7 +187,7 @@ dependencies {
     mappings(loom.layered {
         // please annoy treetrain if this doesnt work
         mappings("org.quiltmc:quilt-mappings:$quilt_mappings:intermediary-v2")
-        parchment("org.parchmentmc.data:parchment-$parchment_mappings@zip")
+        //parchment("org.parchmentmc.data:parchment-$parchment_mappings@zip")
         officialMojangMappings {
             nameSyntheticMembers = false
         }
@@ -340,7 +339,7 @@ artifacts {
 }
 
 fun getModVersion(): String {
-    var version = "$mod_version-$mod_loader+$minecraft_version"
+    var version = "$mod_version-mc$minecraft_version"
 
     if (release != null && !release) {
         //version += "-unstable"

gradle.properties

@@ -6,29 +6,26 @@
 	org.gradle.parallel=true
 # Caches Dependencies for faster build times.
 	org.gradle.caching=true
-# Use Tiny Remapper for Mixins
-    loom.mixin.useLegacyMixinAp=false
 
 # Fabric Properties
 	# Get new versions at https://fabricmc.net/develop and https://lambdaurora.dev/tools/import_quilt.html
 	minecraft_version=1.20.4
     quilt_mappings=1.20.4+build.3
     parchment_mappings=1.20.4:2024.04.14
-	loader_version=0.15.11
+	loader_version=0.16.0
 
 # Mod Properties
 	mod_id = wilderwild
-	mod_version = 2.4.5
+	mod_version = 2.4.6
     # protocol version must be changed after each update with dual env changes
-    protocol_version = 7
-	mod_loader = Fabric
+    protocol_version = 8
 	maven_group = net.frozenblock
 	archives_base_name = WilderWild
 
 # Dependencies
 	fabric_api_version=0.97.0+1.20.4
 	fabric_asm_version=v2.3
-	frozenlib_version=1.7.4-mc1.20.4
+	frozenlib_version=1.8-mc1.20.4
 
 # External Mods
     betterend_version=3.1.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/datagen/java/net/frozenblock/wilderwild/datagen/WWDataGenerator.java

@@ -18,9 +18,12 @@
 
 package net.frozenblock.wilderwild.datagen;
 
+import java.util.List;
 import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
 import net.frozenblock.lib.feature_flag.api.FrozenFeatureFlags;
+import net.frozenblock.wilderwild.WilderFeatureFlags;
+import net.frozenblock.wilderwild.WilderConstants;
 import net.frozenblock.wilderwild.datagen.advancement.WWAdvancementProvider;
 import net.frozenblock.wilderwild.datagen.loot.WWBlockLootProvider;
 import net.frozenblock.wilderwild.datagen.loot.WWEntityLootProvider;
@@ -32,16 +35,28 @@
 import net.frozenblock.wilderwild.datagen.tag.WWEntityTagProvider;
 import net.frozenblock.wilderwild.datagen.tag.WWGameEventTagProvider;
 import net.frozenblock.wilderwild.datagen.tag.WWItemTagProvider;
-import net.frozenblock.wilderwild.WilderFeatureFlags;
-import net.frozenblock.wilderwild.WilderSharedConstants;
 import net.frozenblock.wilderwild.registry.RegisterDamageTypes;
 import net.frozenblock.wilderwild.registry.RegisterStructureProcessors;
 import net.frozenblock.wilderwild.registry.RegisterStructures;
 import net.frozenblock.wilderwild.registry.RegisterWorldgen;
 import net.frozenblock.wilderwild.world.impl.WilderFeatureBootstrap;
 import net.frozenblock.wilderwild.world.impl.noise.WilderNoise;
+import net.minecraft.advancements.critereon.EnchantmentPredicate;
+import net.minecraft.advancements.critereon.EntityEquipmentPredicate;
+import net.minecraft.advancements.critereon.EntityFlagsPredicate;
+import net.minecraft.advancements.critereon.EntityPredicate;
+import net.minecraft.advancements.critereon.ItemEnchantmentsPredicate;
+import net.minecraft.advancements.critereon.ItemPredicate;
+import net.minecraft.advancements.critereon.ItemSubPredicates;
+import net.minecraft.advancements.critereon.MinMaxBounds;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.core.RegistrySetBuilder;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.tags.EnchantmentTags;
+import net.minecraft.world.item.enchantment.Enchantment;
+import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.world.level.storage.loot.predicates.AnyOfCondition;
+import net.minecraft.world.level.storage.loot.predicates.LootItemEntityPropertyCondition;
 import org.jetbrains.annotations.NotNull;
 
 public final class WWDataGenerator implements DataGeneratorEntrypoint {
@@ -73,7 +88,7 @@ public void onInitializeDataGenerator(@NotNull FabricDataGenerator dataGenerator
 
 	@Override
 	public void buildRegistry(@NotNull RegistrySetBuilder registryBuilder) {
-		WilderSharedConstants.logWithModId("Registering Biomes for", WilderSharedConstants.UNSTABLE_LOGGING);
+		WilderConstants.logWithModId("Registering Biomes for", WilderConstants.UNSTABLE_LOGGING);
 
 		registryBuilder.add(Registries.DAMAGE_TYPE, RegisterDamageTypes::bootstrap);
 		registryBuilder.add(Registries.CONFIGURED_FEATURE, WilderFeatureBootstrap::bootstrapConfigured);

src/datagen/java/net/frozenblock/wilderwild/datagen/advancement/WWAdvancementProvider.java

@@ -19,10 +19,11 @@
 package net.frozenblock.wilderwild.datagen.advancement;
 
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricAdvancementProvider;
-import net.frozenblock.wilderwild.WilderSharedConstants;
+import net.frozenblock.wilderwild.WilderConstants;
 import net.frozenblock.wilderwild.advancement.FireflyBottleTrigger;
 import net.frozenblock.wilderwild.registry.RegisterBlocks;
 import net.frozenblock.wilderwild.registry.RegisterItems;
@@ -34,6 +35,7 @@
 import net.minecraft.advancements.critereon.InventoryChangeTrigger;
 import net.minecraft.advancements.critereon.ItemPredicate;
 import net.minecraft.advancements.critereon.UsingItemTrigger;
+import net.minecraft.core.HolderLookup;
 import net.minecraft.network.chat.Component;
 
 public class WWAdvancementProvider extends FabricAdvancementProvider {
@@ -43,8 +45,8 @@ public WWAdvancementProvider(FabricDataOutput output) {
 
 	@Override
 	public void generateAdvancement(Consumer<AdvancementHolder> writer) {
-		AdvancementHolder adventure = Advancement.Builder.advancement().build(WilderSharedConstants.vanillaId("adventure/root"));
-		AdvancementHolder husbandry = Advancement.Builder.advancement().build(WilderSharedConstants.vanillaId("husbandry/root"));
+		AdvancementHolder adventure = Advancement.Builder.advancement().build(WilderConstants.vanillaId("adventure/root"));
+		AdvancementHolder husbandry = Advancement.Builder.advancement().build(WilderConstants.vanillaId("husbandry/root"));
 
 		Advancement.Builder.advancement()
 			.parent(husbandry)
@@ -59,7 +61,7 @@ public void generateAdvancement(Consumer<AdvancementHolder> writer) {
 				false
 			)
 			.addCriterion("crab_bucket", FilledBucketTrigger.TriggerInstance.filledBucket(ItemPredicate.Builder.item().of(RegisterItems.CRAB_BUCKET)))
-			.save(writer, WilderSharedConstants.string("husbandry/crab_in_a_bucket"));
+			.save(writer, WilderConstants.string("husbandry/crab_in_a_bucket"));
 
 		Advancement.Builder.advancement()
 			.parent(husbandry)
@@ -74,7 +76,7 @@ public void generateAdvancement(Consumer<AdvancementHolder> writer) {
 				false
 			)
 			.addCriterion("firefly_bottled", FireflyBottleTrigger.TriggerInstance.fireflyBottle())
-			.save(writer, WilderSharedConstants.string("husbandry/firefly_in_a_bottle"));
+			.save(writer, WilderConstants.string("husbandry/firefly_in_a_bottle"));
 
 		Advancement.Builder.advancement()
 			.parent(husbandry)
@@ -89,7 +91,7 @@ public void generateAdvancement(Consumer<AdvancementHolder> writer) {
 				false
 			)
 			.addCriterion("jellyfish_bucket", FilledBucketTrigger.TriggerInstance.filledBucket(ItemPredicate.Builder.item().of(RegisterItems.JELLYFISH_BUCKET)))
-			.save(writer, WilderSharedConstants.string("husbandry/jellyfish_in_a_bucket"));
+			.save(writer, WilderConstants.string("husbandry/jellyfish_in_a_bucket"));
 
 		Advancement.Builder.advancement()
 			.parent(adventure)
@@ -104,7 +106,7 @@ public void generateAdvancement(Consumer<AdvancementHolder> writer) {
 				false
 			)
 			.addCriterion("obtain_null_block", InventoryChangeTrigger.TriggerInstance.hasItems(RegisterBlocks.NULL_BLOCK))
-			.save(writer, WilderSharedConstants.string("adventure/obtain_null_block"));
+			.save(writer, WilderConstants.string("adventure/obtain_null_block"));
 
 		Advancement.Builder.advancement()
 			.parent(adventure)
@@ -122,6 +124,6 @@ public void generateAdvancement(Consumer<AdvancementHolder> writer) {
 				CriteriaTriggers.USING_ITEM
 					.createCriterion(new UsingItemTrigger.TriggerInstance(Optional.empty(), Optional.of(ItemPredicate.Builder.item().of(RegisterItems.ANCIENT_HORN).build())))
 			)
-			.save(writer, WilderSharedConstants.string("adventure/use_ancient_horn"));
+			.save(writer, WilderConstants.string("adventure/use_ancient_horn"));
 	}
 }

src/datagen/java/net/frozenblock/wilderwild/datagen/recipe/CopperHornRecipeProvider.java

@@ -20,7 +20,7 @@
 
 import net.fabricmc.fabric.api.recipe.v1.ingredient.DefaultCustomIngredients;
 import net.frozenblock.lib.recipe.api.ShapedRecipeBuilderExtension;
-import net.frozenblock.wilderwild.WilderSharedConstants;
+import net.frozenblock.wilderwild.WilderConstants;
 import net.frozenblock.wilderwild.registry.RegisterItems;
 import net.minecraft.advancements.critereon.InventoryChangeTrigger;
 import net.minecraft.data.recipes.RecipeCategory;
@@ -57,7 +57,7 @@ private static void copperHorn(RecipeOutput exporter, String name, ResourceKey<I
 			.pattern(" C ")
 			.unlockedBy("has_horn", InventoryChangeTrigger.TriggerInstance.hasItems(Items.GOAT_HORN))
 		).frozenLib$tag(new CompoundTag() {{ put("instrument", StringTag.valueOf(copperHornInstrument.location().toString())); }})
-			.save(exporter, WilderSharedConstants.id(name + "_copper_horn"));
+			.save(exporter, WilderConstants.id(name + "_copper_horn"));
 	}
 
 }

src/datagen/java/net/frozenblock/wilderwild/datagen/recipe/FireflyBottleRecipeProvider.java

@@ -20,7 +20,7 @@
 
 import com.google.common.collect.ImmutableList;
 import net.frozenblock.lib.recipe.api.FrozenRecipeProvider;
-import net.frozenblock.wilderwild.WilderSharedConstants;
+import net.frozenblock.wilderwild.WilderConstants;
 import net.frozenblock.wilderwild.registry.RegisterItems;
 import net.minecraft.data.recipes.RecipeCategory;
 import net.minecraft.data.recipes.RecipeOutput;
@@ -73,7 +73,7 @@ static void buildRecipes(RecipeOutput exporter) {
 			),
 			"firefly_bottle",
 			RecipeCategory.MISC,
-			WilderSharedConstants.MOD_ID
+			WilderConstants.MOD_ID
 		);
 
 		fireflyBottle(RegisterItems.BLACK_FIREFLY_BOTTLE, Items.BLACK_DYE, exporter);

src/datagen/java/net/frozenblock/wilderwild/datagen/recipe/HollowedLogRecipeProvider.java

@@ -18,7 +18,7 @@
 
 package net.frozenblock.wilderwild.datagen.recipe;
 
-import net.frozenblock.wilderwild.WilderSharedConstants;
+import net.frozenblock.wilderwild.WilderConstants;
 import net.frozenblock.wilderwild.registry.RegisterBlocks;
 import net.frozenblock.wilderwild.tag.WilderItemTags;
 import net.minecraft.data.recipes.RecipeCategory;
@@ -93,7 +93,7 @@ public static void planksFromHollowed(TagKey<Item> input, ItemLike output, Recip
 			.group("planks")
 			.requires(input)
 			.unlockedBy("has_log", RecipeProvider.has(input))
-			.save(exporter, WilderSharedConstants.id(name + "_planks_from_hollowed"));
+			.save(exporter, WilderConstants.id(name + "_planks_from_hollowed"));
 	}
 
 	public static void woodFromHollowed(ItemLike hollowedLog, ItemLike output, RecipeOutput exporter, String name) {
@@ -103,7 +103,7 @@ public static void woodFromHollowed(ItemLike hollowedLog, ItemLike output, Recip
 			.pattern("##")
 			.pattern("##")
 			.unlockedBy("has_log", RecipeProvider.has(hollowedLog))
-		.save(exporter, WilderSharedConstants.id(name + "_wood_from_hollowed"));
+		.save(exporter, WilderConstants.id(name + "_wood_from_hollowed"));
 	}
 
 	public static void strippedWoodFromHollowed(ItemLike hollowedLog, ItemLike output, RecipeOutput exporter, String name) {
@@ -115,7 +115,7 @@ public static void planksFromHollowedStem(TagKey<Item> input, ItemLike output, R
 			.group("planks")
 			.requires(input)
 			.unlockedBy("has_stem", RecipeProvider.has(input))
-			.save(exporter, WilderSharedConstants.id(name + "_planks_from_hollowed"));
+			.save(exporter, WilderConstants.id(name + "_planks_from_hollowed"));
 	}
 
 	public static void hyphaeFromHollowed(ItemLike hollowedStem, ItemLike output, RecipeOutput exporter, String name) {
@@ -125,7 +125,7 @@ public static void hyphaeFromHollowed(ItemLike hollowedStem, ItemLike output, Re
 			.pattern("##")
 			.pattern("##")
 			.unlockedBy("has_stem", RecipeProvider.has(hollowedStem))
-			.save(exporter, WilderSharedConstants.id(name + "_hyphae_from_hollowed"));
+			.save(exporter, WilderConstants.id(name + "_hyphae_from_hollowed"));
 	}
 
 	public static void strippedHyphaeFromHollowed(ItemLike hollowedStem, ItemLike output, RecipeOutput exporter, String name) {

src/datagen/java/net/frozenblock/wilderwild/datagen/recipe/WWCookRecipeProvider.java

@@ -18,7 +18,7 @@
 
 package net.frozenblock.wilderwild.datagen.recipe;
 
-import net.frozenblock.wilderwild.WilderSharedConstants;
+import net.frozenblock.wilderwild.WilderConstants;
 import net.frozenblock.wilderwild.registry.RegisterItems;
 import net.minecraft.data.recipes.RecipeCategory;
 import net.minecraft.data.recipes.RecipeOutput;
@@ -59,6 +59,6 @@ private static <T extends AbstractCookingRecipe> void simpleCookingRecipe(
 	) {
 		SimpleCookingRecipeBuilder.generic(Ingredient.of(input), RecipeCategory.FOOD, output, experience, cookingTime, serializer, recipe)
 			.unlockedBy(RecipeProvider.getHasName(input), RecipeProvider.has(input))
-			.save(exporter, WilderSharedConstants.id(RecipeProvider.getItemName(output) + "_from_" + cooker));
+			.save(exporter, WilderConstants.id(RecipeProvider.getItemName(output) + "_from_" + cooker));
 	}
 }

src/datagen/java/net/frozenblock/wilderwild/datagen/recipe/WWNaturalRecipeProvider.java

@@ -18,7 +18,7 @@
 
 package net.frozenblock.wilderwild.datagen.recipe;
 
-import net.frozenblock.wilderwild.WilderSharedConstants;
+import net.frozenblock.wilderwild.WilderConstants;
 import net.frozenblock.wilderwild.registry.RegisterBlocks;
 import net.frozenblock.wilderwild.registry.RegisterItems;
 import net.minecraft.data.recipes.RecipeCategory;
@@ -50,7 +50,7 @@ static void buildRecipes(RecipeOutput exporter) {
 			.requires(RegisterItems.SPLIT_COCONUT, 2)
 			.group("bowl")
 			.unlockedBy(RecipeProvider.getHasName(RegisterItems.SPLIT_COCONUT), RecipeProvider.has(RegisterItems.SPLIT_COCONUT))
-			.save(exporter, WilderSharedConstants.id(RecipeProvider.getConversionRecipeName(Items.BOWL, RegisterItems.SPLIT_COCONUT)));
+			.save(exporter, WilderConstants.id(RecipeProvider.getConversionRecipeName(Items.BOWL, RegisterItems.SPLIT_COCONUT)));
 
 		ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, RegisterItems.PEELED_PRICKLY_PEAR, 1)
 			.requires(RegisterItems.PRICKLY_PEAR)
@@ -66,15 +66,15 @@ static void buildRecipes(RecipeOutput exporter) {
 			.pattern("###")
 			.pattern("###")
 			.unlockedBy(RecipeProvider.getHasName(RegisterItems.MILKWEED_POD), RecipeProvider.has(RegisterItems.MILKWEED_POD))
-			.save(exporter, WilderSharedConstants.id(RecipeProvider.getConversionRecipeName(Items.STRING, RegisterItems.MILKWEED_POD)));
+			.save(exporter, WilderConstants.id(RecipeProvider.getConversionRecipeName(Items.STRING, RegisterItems.MILKWEED_POD)));
 
 		ShapedRecipeBuilder.shaped(RecipeCategory.MISC, Items.STRING)
 			.define('#', Ingredient.of(RegisterBlocks.CATTAIL))
 			.group("string")
 			.pattern("##")
 			.pattern("##")
 			.unlockedBy(RecipeProvider.getHasName(RegisterBlocks.CATTAIL), RecipeProvider.has(RegisterBlocks.CATTAIL))
-			.save(exporter, WilderSharedConstants.id(RecipeProvider.getConversionRecipeName(Items.STRING, RegisterBlocks.CATTAIL)));
+			.save(exporter, WilderConstants.id(RecipeProvider.getConversionRecipeName(Items.STRING, RegisterBlocks.CATTAIL)));
 	}
 
 	private static void oneToOneConversionRecipe(RecipeOutput recipeOutput, ItemLike result, ItemLike ingredient, @Nullable String group) {