Merge pull request #409 from lonefelidae16/port/1.21.6

Port to 1.21.6

Author: juancarloscp52

gradle.properties

@@ -1,20 +1,20 @@
 org.gradle.jvmargs=-Xmx2048m
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-	minecraft_version=1.21.5
-	yarn_mappings=1.21.5+build.1
-	loader_version=0.16.10
+	minecraft_version=1.21.6
+	yarn_mappings=1.21.6+build.1
+	loader_version=0.16.14
 
 # Mod Properties
 	mod_version = 1.11.1
 	maven_group = me.juancarloscp52
 	archives_base_name = bedrockify
 
 # Dependencies
-	fabric_version=0.119.5+1.21.5
-  	modmenu_version=14.0.0-rc.2
-	cloth_config_version=18.0.145
-	apple_skin=mc1.21.3-3.0.6
+	fabric_version=0.127.0+1.21.6
+  	modmenu_version=15.0.0-beta.3
+	cloth_config_version=19.0.147
+	apple_skin=mc1.21.6-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.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -86,8 +86,7 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

gradlew.bat

@@ -24,12 +24,13 @@
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
 import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry;
-import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
+import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElementRegistry;
 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.util.Identifier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.glfw.GLFW;
@@ -100,7 +101,7 @@ public void onInitializeClient() {
 
         ClientPlayNetworking.registerGlobalReceiver(Bedrockify.CAULDRON_PARTICLE_PAYLOAD.getId(), new CauldronParticlePayload.CauldronParticleHandler());
 
-        HudRenderCallback.EVENT.register((drawContext, tickDelta) -> BedrockifyClient.getInstance().overlay.renderOverlay(drawContext));
+        HudElementRegistry.addLast(Identifier.of(Bedrockify.MOD_ID, "overlay"), (context, tickCounter) -> BedrockifyClient.getInstance().overlay.renderOverlay(context));
         ClientTickEvents.END_CLIENT_TICK.register(client-> {
             while (keyBinding.wasPressed()){
                 client.setScreen(settingsGUI.getConfigScreen(client.currentScreen));

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

@@ -32,15 +32,18 @@ public final class BedrockSunGlareShading {
         }));
     });
     private static final List<ClassMethodHolder> METHOD_INVOCATION_FAILED_LIST = new ArrayList<>();
+    private static final float DELTA_CLAMP_MIN = 0f;
+    private static final float DELTA_CLAMP_MAX = 1f;
 
     private ShaderState shaderState = ShaderState.UNSPECIFIED;
-    private float skyAttenuation;
+    private float sunIntensityDelta;
     private float sunAngleDiff;
-    private float sunRadiusDelta;
+    private float sunBrightnessDelta;
     private final Vector3f sunVector3f;
     private final MinecraftClient client;
 
     public BedrockSunGlareShading() {
+        this.onSunlightIntensityChanged();
         this.sunVector3f = new Vector3f();
         this.client = MinecraftClient.getInstance();
     }
@@ -111,7 +114,7 @@ protected ClassMethodHolder(String cName, String mName, @NotNull Object[] mArgs,
     public boolean shouldApplyShading() {
         return this.shaderState == ShaderState.VANILLA &&
                 BedrockifyClient.getInstance().settings.bedrockShading &&
-                this.skyAttenuation < 1f;
+                this.sunIntensityDelta > 0f;
     }
 
     public void reloadCustomShaderState() {
@@ -217,16 +220,13 @@ public void tick(float tickDelta) {
     /**
      * Helper method that updates the angle difference between Camera and Sun.<br>
      * The result will be stored to {@link BedrockSunGlareShading#sunAngleDiff};
-     * a dot product of camera vector and sun vector including some factors, clamped between <code>0.0 - 1.0</code>.
-     *
-     * @see BedrockSunGlareShading#getSunAngleDiff
+     * a dot product of camera vector and sun vector including some factors, clamped between <code>0.0 - 1.0</code>.<br><br>
+     * 0.0 -&gt; Closest.<br>
+     * 1.0 -&gt; Farthest.
      */
-    public void updateAngleDiff() {
-        final float clampMax = 1f;
-        final float clampMin = 0f;
-
+    private void updateAngleDiff() {
         if (this.client == null || this.client.world == null || this.client.gameRenderer == null || !this.shouldApplyShading()) {
-            this.sunAngleDiff = clampMax;
+            this.sunAngleDiff = DELTA_CLAMP_MAX;
             return;
         }
 
@@ -238,37 +238,43 @@ public void updateAngleDiff() {
         final Camera camera = this.client.gameRenderer.getCamera();
         final Vector3f cameraVec3f = new Vector3f(0, 0, -1).rotate(camera.getRotation()).normalize();
 
-        this.sunAngleDiff = Math.clamp(clampMin, clampMax, (Math.safeAcos(cameraVec3f.dot(this.sunVector3f)) - 0.15f) * 2.f + sunSetRiseFactor);
+        this.sunAngleDiff = Math.clamp(DELTA_CLAMP_MIN, DELTA_CLAMP_MAX, (Math.safeAcos(cameraVec3f.dot(this.sunVector3f)) - 0.15f) * 2.f + sunSetRiseFactor);
     }
 
-    public void updateSunRadiusDelta(float tickDelta){
+    /**
+     * Calculates the angle difference between Camera and Sun, and Stores the delta including the rain factor.<br><br>
+     * 0.0 -&gt; Bright.<br>
+     * 1.0 -&gt; Normal.
+     */
+    public void updateSunBrightnessDelta(float tickProgress){
         if(MinecraftClient.getInstance().world == null)
             return;
 
-        final float rainGradient = MinecraftClient.getInstance().world.getRainGradient(tickDelta);
+        final float rainGradient = MinecraftClient.getInstance().world.getRainGradient(tickProgress);
         if (MathHelper.approximatelyEquals(rainGradient, 1f) || !this.shouldApplyShading()) {
-            this.sunRadiusDelta = 1f;
+            this.sunBrightnessDelta = DELTA_CLAMP_MAX;
             return;
         }
 
         this.updateAngleDiff();
-        this.sunRadiusDelta = this.getSunAngleDiff() + rainGradient;
-    }
-
-    public float getSunRadiusDelta() {
-        return this.sunRadiusDelta;
+        this.sunBrightnessDelta = Math.clamp(DELTA_CLAMP_MIN, DELTA_CLAMP_MAX, this.sunAngleDiff + rainGradient);
     }
 
-    public float getSunAngleDiff() {
-        return this.sunAngleDiff;
+    /**
+     * @see BedrockSunGlareShading#updateSunBrightnessDelta(float)
+     */
+    public float getSunBrightnessDelta() {
+        return this.sunBrightnessDelta;
     }
 
-    public float getSkyAttenuation() {
-        return getSkyAttenuation(false);
+    public float getSunIntensityDelta() {
+        return this.sunIntensityDelta;
     }
 
-    public float getSkyAttenuation(boolean darker) {
-        this.skyAttenuation = MathHelper.clampedLerp(1f, darker? 0.40f:0.60f, BedrockifyClient.getInstance().settings.sunlightIntensity / 100f);
-        return this.skyAttenuation;
+    /**
+     * Recalculates intensity to detect if shading should be applied.
+     */
+    public void onSunlightIntensityChanged() {
+        this.sunIntensityDelta = Math.clamp(DELTA_CLAMP_MIN, DELTA_CLAMP_MAX, BedrockifyClient.getInstance().settings.sunlightIntensity / 100f);
     }
 }

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

@@ -38,15 +38,15 @@ public class HeldItemTooltips {
 
     private static final boolean B_DAB_LOADED = FabricLoader.getInstance().isModLoaded("detailab");
 
-    public int drawItemWithCustomTooltips(DrawContext drawContext, TextRenderer fontRenderer, Text text, float x, float y, int color, ItemStack currentStack) {
+    public void drawItemWithCustomTooltips(DrawContext drawContext, TextRenderer fontRenderer, Text text, float x, float y, int color, ItemStack currentStack) {
         final BedrockifyClientSettings settings = BedrockifyClient.getInstance().settings;
         final int screenBorder = settings.getScreenSafeArea();
         int tooltipOffset = 0;
 
         //Set tooltip position depending on hotbar displayed information
         ClientPlayerEntity player = MinecraftClient.getInstance().player;
         if(null ==player || null==MinecraftClient.getInstance().interactionManager)
-            return 0;
+            return;
         if(MinecraftClient.getInstance().interactionManager.hasStatusBars()){
             y-=16;
             if(player.getArmor()>0 || (B_DAB_LOADED && PlayerInventory.EQUIPMENT_SLOTS.keySet().intStream().anyMatch(value -> player.getInventory().getStack(value).contains(DataComponentTypes.GLIDER)))){
@@ -92,7 +92,7 @@ public int drawItemWithCustomTooltips(DrawContext drawContext, TextRenderer font
         }
 
         // Render the item name.
-        return drawContext.drawTextWithShadow(fontRenderer, text, (int)x, (int)(y - tooltipOffset - screenBorder), color);
+        drawContext.drawTextWithShadow(fontRenderer, text, (int)x, (int)(y - tooltipOffset - screenBorder), color);
     }
 
     /**

src/main/java/me/juancarloscp52/bedrockify/client/features/heldItemTooltips/HeldItemTooltips.java

@@ -1,20 +1,28 @@
 package me.juancarloscp52.bedrockify.client.features.heldItemTooltips.tooltip;
 
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.PotionItem;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 
 public class ContainerTooltip extends Tooltip {
-    String translationKey;
+    Text itemName;
 
-    public ContainerTooltip(ItemStack item){
-        this.translationKey = item.getItem().getTranslationKey();
-        this.primaryValue = item.getCount();
+    public ContainerTooltip(ItemStack itemStack){
+        this.primaryValue = itemStack.getCount();
+
+        Item item = itemStack.getItem();
+        if (item instanceof PotionItem potionItem) {
+            this.itemName = potionItem.getName(itemStack);
+        } else {
+            this.itemName = Text.translatable(item.getTranslationKey());
+        }
     }
 
     @Override
     public MutableText getTooltipText() {
-        MutableText tooltip = Text.translatable(translationKey);
+        MutableText tooltip = this.itemName.copy();
         tooltip.append(" x").append(String.valueOf(primaryValue));
         return tooltip;
     }

src/main/java/me/juancarloscp52/bedrockify/client/features/heldItemTooltips/tooltip/ContainerTooltip.java

@@ -3,13 +3,14 @@
 import com.google.common.collect.Sets;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gl.RenderPipelines;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.LogoDrawer;
-import net.minecraft.client.render.RenderLayer;
 import net.minecraft.server.integrated.IntegratedServer;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.math.ColorHelper;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.GameMode;
 
@@ -106,7 +107,7 @@ public void render(DrawContext drawContext, int width, int height, Text title, T
         renderLoadingWidget(drawContext, width, height);
 
         TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
-        drawContext.drawText(textRenderer, title, width - textRenderer.getWidth(title) / 2, height - 9 / 2 - 32, 76 + (76 << 8) + (76 << 16),false);
+        drawContext.drawText(textRenderer, title, width - textRenderer.getWidth(title) / 2, height - 9 / 2 - 32, ColorHelper.fullAlpha(76 | (76 << 8) | (76 << 16)),false);
         renderTextBody(drawContext, width, height, message, textRenderer);
 
         if (progress >= 0) {
@@ -115,7 +116,7 @@ public void render(DrawContext drawContext, int width, int height, Text title, T
     }
 
     private void renderLoadingWidget(DrawContext drawContext, int x, int y) {
-        drawContext.drawTexture(RenderLayer::getGuiTextured, WIDGET_TEXTURE, x - 256 / 2, y - 89 / 2, 0, 0, 256, 89, 256, 256);
+        drawContext.drawTexture(RenderPipelines.GUI_TEXTURED, WIDGET_TEXTURE, x - 256 / 2, y - 89 / 2, 0, 0, 256, 89, 256, 256);
     }
 
 
@@ -125,7 +126,7 @@ private void renderTextBody(DrawContext drawContext, int x, int y, Text message,
         List<OrderedText> text = textRenderer.wrapLines(message, 230);
         int maxLineWidth = getMaxLineWidth(textRenderer, text);
         for (int i = 0; i < 4 && i < text.size(); i++) {
-            drawContext.drawText(textRenderer, text.get(i), x - maxLineWidth / 2, y - 15 + (i * 9), 16777215,false);
+            drawContext.drawText(textRenderer, text.get(i), x - maxLineWidth / 2, y - 15 + (i * 9), -1,false);
         }
 
     }
@@ -143,9 +144,9 @@ private int getMaxLineWidth(TextRenderer textRenderer, List<OrderedText> text) {
 
     private void renderLoadingBar(DrawContext drawContext, int x, int y, int progress) {
         int barProgress = (int) ((MathHelper.clamp(progress,0,100)/100.0f) * 223.0f);
-        drawContext.drawTexture(RenderLayer::getGuiTextured, WIDGET_TEXTURE, x - 111, y + 26, 0, 89, 222, 5, 256, 256);
+        drawContext.drawTexture(RenderPipelines.GUI_TEXTURED, WIDGET_TEXTURE, x - 111, y + 26, 0, 89, 222, 5, 256, 256);
         if (barProgress > 0)
-            drawContext.drawTexture(RenderLayer::getGuiTextured, WIDGET_TEXTURE, x - 111, y + 26, 0, 94, barProgress, 5, 256, 256);
+            drawContext.drawTexture(RenderPipelines.GUI_TEXTURED, WIDGET_TEXTURE, x - 111, y + 26, 0, 94, barProgress, 5, 256, 256);
     }
 
 }