Merge pull request #387 from lonefelidae16/port/1.21.4

Port to 1.21.4

Author: juancarloscp52

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.7-SNAPSHOT'
+	id 'fabric-loom' version '1.9-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -1,20 +1,20 @@
 org.gradle.jvmargs=-Xmx2048m
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-	minecraft_version=1.21
-	yarn_mappings=1.21+build.9
-	loader_version=0.15.11
+	minecraft_version=1.21.4
+	yarn_mappings=1.21.4+build.1
+	loader_version=0.16.9
 
 # Mod Properties
 	mod_version = 1.10.1
 	maven_group = me.juancarloscp52
 	archives_base_name = bedrockify
 
 # Dependencies
-	fabric_version=0.102.0+1.21
-  	modmenu_version=11.0.1
-	cloth_config_version=15.0.128
-	apple_skin=mc1.21-3.0.5
-	dab_version=2.6.3+1.21-fabric
+	fabric_version=0.111.0+1.21.4
+  	modmenu_version=13.0.0-beta.1
+	cloth_config_version=17.0.142
+	apple_skin=mc1.21.3-3.0.6
+	dab_version=2.6.3+1.21.3-fabric
 	iris_version=1.7.1+1.21
 	sodium_version=mc1.20.1-0.5.10

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

gradlew.bat

@@ -0,0 +1,64 @@
+#!/usr/bin/python3
+
+""" Recipe Replacer for Minecraft 1.21.4
+Created at Dec 12, 2024 by lonefelidae16 <[email protected]>
+
+Usage:
+> recipeReplacer1_21_4.py [--help | -h] [--test | -t] /path/to/target/recipe.json
+
+"""
+
+import json
+import sys
+import argparse
+
+parser = argparse.ArgumentParser(
+         prog='RecipeReplacer',
+         description='Make recipe.json compatible with MC1.21.4')
+parser.add_argument('filename')
+parser.add_argument('-t', '--test', action='store_true', help='show result JSON to STDOUT, no changes to the specified file')
+args = parser.parse_args()
+
+if __name__ == '__main__':
+
+    struct = {}
+    replaced = False
+    with open(args.filename, 'r') as target_file:
+        struct = json.load(target_file)
+        if not 'type' in struct or not 'result' in struct:
+            exit()
+        if struct['type'] == 'minecraft:crafting_shapeless':
+            ingredient_arr = []
+            for ing in struct['ingredients']:
+                if 'item' in ing:
+                    ingredient_arr.append(ing['item'])
+                elif 'tag' in ing:
+                    ingredient_arr.append('#' + ing['tag'])
+            struct['ingredients'] = ingredient_arr
+            replaced = True
+        elif struct['type'] == 'minecraft:crafting_shaped':
+            if not 'key' in struct:
+                exit()
+            for k in struct['key']:
+                if 'item' in struct['key'][k]:
+                    _item = struct['key'][k]['item']
+                    del struct['key'][k]['item']
+                    struct['key'][k] = _item
+                    replaced = True
+                elif 'tag' in struct['key'][k]:
+                    _tag = '#' + struct['key'][k]['tag']
+                    del struct['key'][k]['tag']
+                    struct['key'][k] = _tag
+                    replaced = True
+        if type(struct['result']) is not str and not 'count' in struct['result']:
+            struct['result']['count'] = 1
+            replaced = True
+
+    if replaced:
+        if args.test:
+            print(json.dumps(struct, indent=2))
+        else:
+            with open(args.filename, 'w') as target_file:
+                json.dump(struct, target_file, indent=2)
+    else:
+        print(args.filename + ": no changes made")

recipeReplacer1_21_4.py

@@ -31,6 +31,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.util.InputUtil;
+import net.minecraft.entity.EntityPose;
 import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket;
 import net.minecraft.resource.ResourceType;
 import org.apache.logging.log4j.LogManager;
@@ -129,11 +130,12 @@ public void onInitializeClient() {
             }
 
             // Stop elytra flying by pressing space
-            if(null != client.player && settings.elytraStop && client.player.isFallFlying() && timeFlying > 10 && client.options.jumpKey.isPressed()){
-                client.player.stopFallFlying();
+            if(null != client.player && settings.elytraStop && client.player.getPose().equals(EntityPose.GLIDING) && timeFlying > 10 && client.options.jumpKey.isPressed()){
+                client.player.getAbilities().flying = false;
+                client.player.sendAbilitiesUpdate();
                 client.player.networkHandler.sendPacket(new ClientCommandC2SPacket(client.player, ClientCommandC2SPacket.Mode.START_FALL_FLYING));
             }
-            if(null != client.player && client.player.isFallFlying() && !client.options.jumpKey.isPressed())
+            if(null != client.player && client.player.getPose().equals(EntityPose.GLIDING) && !client.options.jumpKey.isPressed())
                 timeFlying++;
             else
                 timeFlying = 0;

src/main/java/me/juancarloscp52/bedrockify/client/BedrockifyClient.java

@@ -41,7 +41,6 @@ public final class BedrockSunGlareShading {
     private final MinecraftClient client;
 
     public BedrockSunGlareShading() {
-        onSunlightIntensityChanged();
         this.sunVector3f = new Vector3f();
         this.client = MinecraftClient.getInstance();
     }
@@ -265,10 +264,11 @@ public float getSunAngleDiff() {
     }
 
     public float getSkyAttenuation() {
-        return this.skyAttenuation;
+        return getSkyAttenuation(false);
     }
 
-    public void onSunlightIntensityChanged() {
-        this.skyAttenuation = MathHelper.clampedLerp(1f, 0.60f, BedrockifyClient.getInstance().settings.sunlightIntensity / 100f);
+    public float getSkyAttenuation(boolean darker) {
+        this.skyAttenuation = MathHelper.clampedLerp(1f, darker? 0.40f:0.60f, BedrockifyClient.getInstance().settings.sunlightIntensity / 100f);
+        return this.skyAttenuation;
     }
 }

src/main/java/me/juancarloscp52/bedrockify/client/features/bedrockShading/BedrockSunGlareShading.java

@@ -0,0 +1,14 @@
+package me.juancarloscp52.bedrockify.client.features.eatingAnimations;
+
+import net.minecraft.util.Hand;
+
+import java.util.Optional;
+
+public interface IEatingState {
+    default void setEatingHand(Hand hand) {
+    }
+
+    default Optional<Hand> getEatingHand() {
+        return Optional.empty();
+    }
+}