working project i think

build.gradle.kts

@@ -21,8 +21,6 @@ repositories {
 }
 
 java {
-	withSourcesJar()
-	withJavadocJar()
 	toolchain {
 		when(platform.mcVersion) {
 			in 12001..12004 -> {

src/main/java/dev/microcontrollers/overlaytweaks/mixin/InGameHudMixin.java

@@ -1,6 +1,5 @@
 package dev.microcontrollers.overlaytweaks.mixin;
 
-import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.mojang.blaze3d.systems.RenderSystem;
 import dev.microcontrollers.overlaytweaks.config.OverlayTweaksConfig;
 import net.minecraft.client.MinecraftClient;
@@ -13,15 +12,10 @@
 import org.spongepowered.asm.mixin.injection.*;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-// BetterF3 has a priority of 1100. This is to prevent a crash with cancelDebugCrosshair.
-@Mixin(value = InGameHud.class, priority = 1200)
+@Mixin(InGameHud.class)
 public class InGameHudMixin {
     @Shadow
     public float vignetteDarkness;
-    @Shadow
-    private Text title;
-    @Shadow
-    private Text subtitle;
     @Mutable
     @Final
     @Shadow
@@ -87,63 +81,4 @@ private void removeScoreboardInDebug(CallbackInfo ci) {
         }
     }
 
-    /*
-        The following methods were taken from Easeify under LGPLV3
-        https://github.com/Polyfrost/Easeify/blob/main/LICENSE
-        The code has been updated to 1.20 and with several fixes
-     */
-
-    //#if MC >= 1.20.6
-    @ModifyExpressionValue(method = "renderTitleAndSubtitle", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/MathHelper;clamp(III)I"))
-    //#else
-    //$$ @ModifyExpressionValue(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/MathHelper;clamp(III)I"))
-    //#endif
-    private int disableTitles(int value) {
-        if (OverlayTweaksConfig.CONFIG.instance().disableTitles) return 0;
-        else return value;
-    }
-
-    //#if MC >= 1.20.6
-    @Inject(method = "renderTitleAndSubtitle", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;scale(FFF)V", ordinal = 0, shift = At.Shift.AFTER))
-    //#else
-    //$$ @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;scale(FFF)V", ordinal = 0, shift = At.Shift.AFTER))
-    //#endif
-    private void modifyTitleScale(DrawContext context, float tickDelta, CallbackInfo ci) {
-        float titleScale = OverlayTweaksConfig.CONFIG.instance().titleScale / 100;
-        // TODO: MCCIsland uses a giant title to black out your screen when switching worlds, so let's keep that. Find a better way to only keep black out
-        if (OverlayTweaksConfig.CONFIG.instance().autoTitleScale && (MinecraftClient.getInstance().getCurrentServerEntry() != null && !MinecraftClient.getInstance().getCurrentServerEntry().address.contains("mccisland.net"))) {
-            final float width = MinecraftClient.getInstance().textRenderer.getWidth(title) * 4.0F;
-            if (width > context.getScaledWindowWidth()) {
-                titleScale = (context.getScaledWindowWidth() / width) * OverlayTweaksConfig.CONFIG.instance().titleScale / 100;
-            }
-        }
-        context.getMatrices().scale(titleScale, titleScale, titleScale);
-    }
-
-    //#if MC >= 1.20.6
-    @Inject(method = "renderTitleAndSubtitle", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;scale(FFF)V", ordinal = 1, shift = At.Shift.AFTER))
-    //#else
-    //$$ @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;scale(FFF)V", ordinal = 1, shift = At.Shift.AFTER))
-    //#endif
-    private void modifySubtitleScale(DrawContext context, float tickDelta, CallbackInfo ci) {
-        float titleScale = OverlayTweaksConfig.CONFIG.instance().titleScale / 100;
-        // TODO: MCCIsland uses a giant title to black out your screen when switching worlds, so let's keep that. Find a better way to only keep black out
-        if (OverlayTweaksConfig.CONFIG.instance().autoTitleScale && (MinecraftClient.getInstance().getCurrentServerEntry() != null && !MinecraftClient.getInstance().getCurrentServerEntry().address.contains("mccisland.net"))) {
-            final float width = MinecraftClient.getInstance().textRenderer.getWidth(subtitle) * 2.0F;
-            if (width > context.getScaledWindowWidth()) {
-                titleScale = (context.getScaledWindowWidth() / width) * OverlayTweaksConfig.CONFIG.instance().titleScale / 100;
-            }
-        }
-        context.getMatrices().scale(titleScale, titleScale, titleScale);
-    }
-
-    //#if MC >= 1.20.6
-    @ModifyConstant(method = "renderTitleAndSubtitle", constant = @Constant(intValue = 255, ordinal = 0))
-    //#else
-    //$$ @ModifyConstant(method = "render", constant = @Constant(intValue = 255, ordinal = 3))
-    //#endif
-    private int modifyOpacity(int constant) {
-        return (int) (OverlayTweaksConfig.CONFIG.instance().titleOpacity / 100 * 255);
-    }
-
 }

src/main/java/dev/microcontrollers/overlaytweaks/mixin/PotionItemMixin.java

@@ -27,5 +27,4 @@ public boolean hasGlint(ItemStack stack) {
         //$$ return OverlayTweaksConfig.CONFIG.instance().potionGlint && !PotionUtil.getPotionEffects(stack).isEmpty();
         //#endif
     }
-
 }

src/main/java/dev/microcontrollers/overlaytweaks/mixin/SubtitlesHudMixin.java

@@ -12,4 +12,5 @@ public class SubtitlesHudMixin {
     private int modifySubtitleColor(int original) {
         return OverlayTweaksConfig.CONFIG.instance().subtitleColor.getRGB();
     }
+
 }

src/main/java/dev/microcontrollers/overlaytweaks/mixin/screenopacity/AnvilScreenMixin.java

@@ -11,25 +11,41 @@
 
 @Mixin(AnvilScreen.class)
 public class AnvilScreenMixin {
+    //#if MC >= 1.20.4
     @Inject(method = "drawBackground", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"))
+    //#else
+    //$$ @Inject(method = "drawBackground", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTexture(Lnet/minecraft/util/Identifier;IIIIII)V"))
+    //#endif
     private void buttonOpacityStart(DrawContext context, float delta, int mouseX, int mouseY, CallbackInfo ci) {
         RenderSystem.enableBlend();
         RenderSystem.setShaderColor(1F, 1F, 1F, OverlayTweaksConfig.CONFIG.instance().containerTextureOpacity / 100F);
     }
 
+    //#if MC >= 1.20.4
     @Inject(method = "drawBackground", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V", shift = At.Shift.AFTER))
+    //#else
+    //$$ @Inject(method = "drawBackground", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTexture(Lnet/minecraft/util/Identifier;IIIIII)V", shift = At.Shift.AFTER))
+    //#endif
     private void buttonOpacityEnd(DrawContext context, float delta, int mouseX, int mouseY, CallbackInfo ci) {
         RenderSystem.disableBlend();
         RenderSystem.setShaderColor(1F, 1F, 1F, 1F);
     }
 
+    //#if MC >= 1.20.4
     @Inject(method = "drawInvalidRecipeArrow", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"))
+    //#else
+    //$$ @Inject(method = "drawInvalidRecipeArrow", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTexture(Lnet/minecraft/util/Identifier;IIIIII)V"))
+    //#endif
     private void invalidArrowOpacityStart(DrawContext context, int x, int y, CallbackInfo ci) {
         RenderSystem.enableBlend();
         RenderSystem.setShaderColor(1F, 1F, 1F, OverlayTweaksConfig.CONFIG.instance().containerTextureOpacity / 100F);
     }
 
+    //#if MC >= 1.20.4
     @Inject(method = "drawInvalidRecipeArrow", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V", shift = At.Shift.AFTER))
+    //#else
+    //$$ @Inject(method = "drawInvalidRecipeArrow", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTexture(Lnet/minecraft/util/Identifier;IIIIII)V", shift = At.Shift.AFTER))
+    //#endif
     private void invalidArrowOpacityEnd(DrawContext context, int x, int y, CallbackInfo ci) {
         RenderSystem.disableBlend();
         RenderSystem.setShaderColor(1F, 1F, 1F, 1F);

src/main/java/dev/microcontrollers/overlaytweaks/mixin/screenopacity/CrafterScreenMixin.java

@@ -1,6 +1,6 @@
 package dev.microcontrollers.overlaytweaks.mixin.screenopacity;
 
-//#if MC >= 1.20.6
+//#if MC >= 1.20.4
 import com.mojang.blaze3d.systems.RenderSystem;
 import dev.microcontrollers.overlaytweaks.config.OverlayTweaksConfig;
 import net.minecraft.client.gui.DrawContext;

src/main/java/dev/microcontrollers/overlaytweaks/mixin/screenopacity/CreativeInventoryScreenMixin.java

@@ -24,13 +24,21 @@ private void containerOpacityEnd(DrawContext context, float delta, int mouseX, i
         RenderSystem.setShaderColor(1F, 1F, 1F, 1F);
     }
 
+    //#if MC >= 1.20.4
     @Inject(method = "renderTabIcon", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"))
+    //#else
+    //$$ @Inject(method = "renderTabIcon", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTexture(Lnet/minecraft/util/Identifier;IIIIII)V"))
+    //#endif
     private void containerOpacityStartTab(DrawContext context, ItemGroup group, CallbackInfo ci) {
         RenderSystem.enableBlend();
         RenderSystem.setShaderColor(1F, 1F, 1F, OverlayTweaksConfig.CONFIG.instance().containerTextureOpacity / 100F);
     }
 
+    //#if MC >= 1.20.4
     @Inject(method = "renderTabIcon", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V", shift = At.Shift.AFTER))
+    //#else
+    //$$ @Inject(method = "renderTabIcon", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTexture(Lnet/minecraft/util/Identifier;IIIIII)V", shift = At.Shift.AFTER))
+    //#endif
     private void containerOpacityEndTab(DrawContext context, ItemGroup group, CallbackInfo ci) {
         RenderSystem.disableBlend();
         RenderSystem.setShaderColor(1F, 1F, 1F, 1F);

src/main/java/dev/microcontrollers/overlaytweaks/mixin/screenopacity/HorseScreenMixin.java

@@ -23,6 +23,7 @@ private void containerOpacityEnd(DrawContext context, float delta, int mouseX, i
         RenderSystem.setShaderColor(1F, 1F, 1F, 1F);
     }
 
+    //#if MC >= 1.20.4
     @Inject(method = "drawBackground", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"))
     private void invalidArrowOpacityStart(DrawContext context, float delta, int mouseX, int mouseY, CallbackInfo ci) {
         RenderSystem.enableBlend();
@@ -34,4 +35,5 @@ private void invalidArrowOpacityEnd(DrawContext context, float delta, int mouseX
         RenderSystem.disableBlend();
         RenderSystem.setShaderColor(1F, 1F, 1F, 1F);
     }
+    //#endif
 }

src/main/java/dev/microcontrollers/overlaytweaks/mixin/screenopacity/LoomScreenMixin.java

@@ -7,9 +7,10 @@
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ingame.LoomScreen;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtList;
+//#if MC <= 1.20.4
+//$$ import net.minecraft.item.ItemStack;
+//$$ import net.minecraft.nbt.NbtCompound;
+//$$ import net.minecraft.nbt.NbtList;
 import net.minecraft.registry.entry.RegistryEntry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -37,7 +38,11 @@ private void containerOpacityEnd(DrawContext context, float delta, int mouseX, i
         No changes of note have been made other than adapting to this project
      */
     @Inject(method = "drawBanner", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/util/math/MatrixStack;push()V", shift = At.Shift.AFTER), locals = LocalCapture.CAPTURE_FAILHARD)
-    public void onCreateMatrix(DrawContext context, RegistryEntry<BannerPattern> pattern, int x, int y, CallbackInfo ci, NbtCompound nbtCompound, NbtList nbtList, ItemStack itemStack, MatrixStack matrixStack) {
+    //#if MC >= 1.20.6
+    public void onCreateMatrix(DrawContext context, RegistryEntry<BannerPattern> pattern, int x, int y, CallbackInfo ci, MatrixStack matrixStack) {
+    //#else
+    //$$ public void onCreateMatrix(DrawContext context, RegistryEntry<BannerPattern> pattern, int x, int y, CallbackInfo ci, NbtCompound nbtCompound, NbtList nbtList, ItemStack itemStack, MatrixStack matrixStack) {
+    //#endif
         matrixStack.scale(InvScale.getScale(), InvScale.getScale(), 1F);
     }
 

src/main/resources/overlaytweaks.mixins.json

@@ -3,7 +3,6 @@
   "package": "dev.microcontrollers.overlaytweaks.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "BossBarHudMixin",
     "BuiltinItemModelRendererMixin",
     "ClientWorldMixin",
     "DebugHudMixin",
@@ -16,7 +15,6 @@
     "LightningEntityRendererMixin",
     "LivingEntityRendererMixin",
     "MouseMixin",
-    "PlayerListHudMixin",
     "PotionItemMixin",
     "ScreenMixin",
     "SubtitlesHudMixin",