Skip to content

Dev/1.21.5#495

Merged
duplexsystem merged 13 commits intomasterfrom
dev/1.21.5
Jun 4, 2025
Merged

Dev/1.21.5#495
duplexsystem merged 13 commits intomasterfrom
dev/1.21.5

Conversation

@duplexsystem
Copy link
Copy Markdown
Member

1.21.5

Ifiht and others added 2 commits March 25, 2025 16:25
* Bukkit Build Fix

* remove comments

* remove papermc repo from gradle settings

* add back gradle shasum

* fix formatting, update gradle hash
@duplexsystem duplexsystem marked this pull request as ready for review March 25, 2025 22:54
@ktunkiewicz
Copy link
Copy Markdown

Hi, I have no idea what I'm doing, but this change makes it compile for me. And it works fine with 1.21.5:

diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleBiomeUtil.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleBiomeUtil.java
index c86e71165..147411e18 100644
--- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleBiomeUtil.java
+++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleBiomeUtil.java
@@ -76,7 +76,7 @@ public final class LifecycleBiomeUtil {

             villagerMap.put(RegistryKey.of(RegistryKeys.BIOME, identifier),
                 Objects.requireNonNullElse(vanillaBiomeProperties.getVillagerType(),
-                    villagerMap.getOrDefault(vanilla, VillagerType.PLAINS)));
+                    villagerMap.getOrDefault(vanilla, new VillagerType())));

             BiomeUtil.TERRA_BIOME_MAP.computeIfAbsent(vanilla.getValue(), i -> new ArrayList<>()).add(identifier);
         }

I did get some errors during chunk generation, but didn't look like related to the above and the world actually generated fine.
I assume the above piece of code is for handling some edge-case situation default value, and I have no idea if it works in that edge-case.

@duplexsystem duplexsystem requested a review from astrsh as a code owner June 4, 2025 02:27
@duplexsystem duplexsystem merged commit b143c72 into master Jun 4, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants