cleanup comments

Author: juancarloscp52

src/main/java/me/juancarloscp52/bedrockify/common/block/entity/WaterCauldronBlockEntity.java

@@ -155,25 +155,6 @@ protected void writeData(WriteView view) {
 
         super.writeData(view);
     }
-//    @Override
-//    protected void readNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
-//        super.readNbt(nbt, registryLookup);
-//
-//        this.tintColor = nbt.getInt(KEY_FLUID_TINT).get();
-//        this.fluidId = Identifier.tryParse(nbt.getString(KEY_FLUID_ITEM).get());
-//        this.potionTypeId = Identifier.tryParse(nbt.getString(KEY_POTION_TYPE).get());
-//        this.checkExactIds();
-//        this.updateListeners();
-//    }
-//
-//    @Override
-//    protected void writeNbt(NbtCompound nbt, RegistryWrapper.WrapperLookup registryLookup) {
-//        nbt.putInt(KEY_FLUID_TINT, this.tintColor);
-//        nbt.putString(KEY_FLUID_ITEM, (this.fluidId == null) ? "<NULL>" : this.fluidId.toString());
-//        nbt.putString(KEY_POTION_TYPE, (this.potionTypeId == null) ? "<NULL>" : this.potionTypeId.toString());
-//
-//        super.writeNbt(nbt, registryLookup);
-//    }
 
     @Nullable
     @Override

src/main/java/me/juancarloscp52/bedrockify/mixin/client/features/loadingScreens/LevelLoadingScreenMixin.java

@@ -32,7 +32,7 @@ protected LevelLoadingScreenMixin(Text title) {
     public void render(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo info) {
         if(!BedrockifyClient.getInstance().settings.isLoadingScreenEnabled())
             return;
-//        this.renderBackground(context, mouseX, mouseY, delta);
+
         int xPosition = this.width / 2;
         int yPosition = this.height / 2;
         LoadingScreenWidget.getInstance().render(context, xPosition, yPosition, Text.translatable("narrator.loading", Text.translatable("loading.progress", this.progressProvider.getProgressPercentage()).getString()), null, this.progressProvider.getProgressPercentage());

src/main/java/me/juancarloscp52/bedrockify/mixin/client/features/screenSafeArea/BarMixin.java

@@ -11,7 +11,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 
-@Mixin(Bar.class)
+@Mixin(value = Bar.class, priority = 500)
 public interface BarMixin {
     @WrapOperation(method = "drawExperienceLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawText(Lnet/minecraft/client/font/TextRenderer;Lnet/minecraft/text/Text;IIIZ)V"))
     private static void drawExperienceBar(DrawContext drawContext, TextRenderer textRenderer, Text text, int x, int y, int color, boolean shadow, Operation<Void> original) {

src/main/java/me/juancarloscp52/bedrockify/mixin/client/features/screenSafeArea/InGameHudMixin.java

@@ -21,7 +21,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Environment(EnvType.CLIENT)
-@Mixin(InGameHud.class)
+@Mixin(value = InGameHud.class, priority = 500)
 public abstract class InGameHudMixin {
     @Unique
     private int screenBorder;
@@ -51,11 +51,9 @@ private void drawTextureHotbar(DrawContext drawContext, RenderPipeline pipeline,
     private void drawTextureHotbar(DrawContext drawContext, RenderPipeline pipeline, Identifier texture, int i, int j, int k, int l, int x, int y, int width, int height, Operation<Void> original) {
         if((width ==29 && height == 24) || width == 182){
             drawContext.drawGuiTexture(pipeline, texture, i, j, k, l, x, y - screenBorder, width, height, ColorHelper.withAlpha(BedrockifyClient.getInstance().hudOpacity.getHudOpacity(true), -1));
-//            original.call(drawContext, pipeline, texture, i, j, k, l, x, y - screenBorder, width, height);
         }else{
             boolean raisedEnabled = FabricLoader.getInstance().isModLoaded("raised");
             drawContext.drawGuiTexture(pipeline, texture, i, j, k, l, x, y - screenBorder, width, (width  == 24 && !raisedEnabled) ? height+2 : height, ColorHelper.withAlpha(BedrockifyClient.getInstance().hudOpacity.getHudOpacity(true), -1));
-//            original.call(drawContext, pipeline, texture, i, j, k, l, x, y - screenBorder, width, (width  == 24 && !raisedEnabled) ? height+2 : height);
         }
     }
 

src/main/java/me/juancarloscp52/bedrockify/mixin/client/features/screenSafeArea/LocatorBarMixin.java

@@ -0,0 +1,24 @@
+package me.juancarloscp52.bedrockify.mixin.client.features.screenSafeArea;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import me.juancarloscp52.bedrockify.client.BedrockifyClient;
+import net.minecraft.client.gui.hud.bar.LocatorBar;
+import net.minecraft.client.util.Window;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+@Mixin(LocatorBar.class)
+public class LocatorBarMixin {
+
+    @ModifyArg(method = "renderBar", at = @At(value = "INVOKE",target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIII)V"),index = 3)
+    public int modifyTextureLocatorBar(int y){
+        return y - BedrockifyClient.getInstance().settings.getScreenSafeArea();
+    }
+
+    @WrapOperation(method = "renderAddons", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/bar/LocatorBar;getCenterY(Lnet/minecraft/client/util/Window;)I"))
+    private int modfiyLocator(LocatorBar instance, Window window, Operation<Integer> original){
+        return original.call(instance, window) - BedrockifyClient.getInstance().settings.getScreenSafeArea();
+    }
+}

src/main/resources/bedrockify.mixins.json

@@ -48,6 +48,7 @@
     "client.features.screenSafeArea.ExperienceBarMixin",
     "client.features.screenSafeArea.InGameHudMixin",
     "client.features.screenSafeArea.JumpBarMixin",
+    "client.features.screenSafeArea.LocatorBarMixin",
     "client.features.screenSafeArea.SubtitlesHudMixin",
     "client.features.screenSafeArea.detailArmorBar.ArmorBarRendererMixin",
     "client.features.slotHighlight.HandledScreenMixin",