Updated for 1.21.4

Glitchfiend · Dec 7, 2024 · c0b1200 · c0b1200
1 parent 3ebfad5
commit c0b1200
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/Common/src/main/java/terrablender/worldgen/TBSurfaceRuleData.java b/Common/src/main/java/terrablender/worldgen/TBSurfaceRuleData.java
@@ -76,6 +76,7 @@ public static SurfaceRules.RuleSource overworld()
         return overworldLike(true, false, true);
     }
 
+    // Up-to-date as of 1.21.4
     public static SurfaceRules.RuleSource overworldLike(boolean checkAbovePreliminarySurface, boolean bedrockRoof, boolean bedrockFloor)
     {
         SurfaceRules.ConditionSource isBlockAboveY97WithVariationAbove = SurfaceRules.yBlockCheck(VerticalAnchor.absolute(97), 2);
@@ -515,7 +516,7 @@ public static SurfaceRules.RuleSource overworldLike(boolean checkAbovePreliminar
     public static SurfaceRules.RuleSource nether()
     {
         SurfaceRules.ConditionSource isAbove31 = SurfaceRules.yBlockCheck(VerticalAnchor.absolute(31), 0);
-        SurfaceRules.ConditionSource surfacerules$conditionsource1 = SurfaceRules.yBlockCheck(VerticalAnchor.absolute(32), 0);
+        SurfaceRules.ConditionSource isAbove32 = SurfaceRules.yBlockCheck(VerticalAnchor.absolute(32), 0);
         SurfaceRules.ConditionSource yStart30 = SurfaceRules.yStartCheck(VerticalAnchor.absolute(30), 0);
         SurfaceRules.ConditionSource isBelow35 = SurfaceRules.not(SurfaceRules.yStartCheck(VerticalAnchor.absolute(35), 0));
         SurfaceRules.ConditionSource isTop5Blocks = SurfaceRules.yBlockCheck(VerticalAnchor.belowTop(5), 0);
@@ -575,7 +576,7 @@ public static SurfaceRules.RuleSource nether()
                 SurfaceRules.ON_FLOOR,
                 SurfaceRules.sequence(
                     SurfaceRules.ifTrue(
-                        SurfaceRules.not(surfacerules$conditionsource1),
+                        SurfaceRules.not(isAbove32),
                         SurfaceRules.ifTrue(isHole, LAVA)
                     ),
                     SurfaceRules.ifTrue(
@@ -630,7 +631,7 @@ public static SurfaceRules.RuleSource nether()
                                 SurfaceRules.ifTrue(
                                     surfacerules$conditionsource7,
                                     SurfaceRules.sequence(
-                                        SurfaceRules.ifTrue(surfacerules$conditionsource1, GRAVEL),
+                                        SurfaceRules.ifTrue(isAbove32, GRAVEL),
                                         SurfaceRules.ifTrue(SurfaceRules.not(isHole), GRAVEL)
                                     )
                                 )

diff --git a/gradle.properties b/gradle.properties
@@ -3,20 +3,20 @@ group=com.github.glitchfiend
 release_channel=beta
 
 # Common
-minecraft_version=1.21.3
+minecraft_version=1.21.4
 common_runs_enabled=false
 common_client_run_name=Common Client
 common_server_run_name=Common Server
 
 # Forge
-forge_version=53.0.2
+forge_version=54.0.6
 
 # NeoForge
-neoforge_version=21.3.3-beta
+neoforge_version=21.4.9-beta
 
 # Fabric
-fabric_version=0.107.0+1.21.3
-fabric_loader_version=0.16.8
+fabric_version=0.111.0+1.21.4
+fabric_loader_version=0.16.9
 
 # Mod options
 mod_name=TerraBlender