Merge pull request #19 from ShadowCat117/1.21

Update to 1.21

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          17,    # Current Java LTS & minimum supported by Minecraft
+          21,    # Current Java LTS & minimum supported by Minecraft
         ]
         # and run on both Linux and Windows
         os: [ubuntu-20.04, windows-2022]
@@ -32,7 +32,7 @@ jobs:
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
+        if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
         uses: actions/upload-artifact@v2
         with:
           name: Artifacts

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '1.0-SNAPSHOT'
+	id 'fabric-loom' version '1.7-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -53,8 +53,8 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 17
+	// Minecraft 1.20.5 (24w14a) upwards uses Java 21.
+	it.options.release = 21
 }
 
 java {

gradle.properties

@@ -4,17 +4,17 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
 
-	minecraft_version=1.20.4
-	yarn_mappings=1.20.4+build.3
-	loader_version=0.15.3
+	minecraft_version=1.21
+	yarn_mappings=1.21+build.4
+	loader_version=0.15.11
 
 
 # Mod Properties
-	mod_version = 1.3b4
+	mod_version = 1.4b1
 	maven_group = ca.blutopia
 	archives_base_name = removehud
 
 # Dependencies
-	fabric_version=0.93.1+1.20.4
-	modmenu_version=9.0.0
-	clothconfig_version=13.0.121
+	fabric_version=0.100.4+1.21
+	modmenu_version=11.0.1
+	clothconfig_version=15.0.127

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/ca/blutopia/removehud/ModConfig.java

@@ -56,6 +56,14 @@ public static void init() {
     @ConfigEntry.Category("HUD")
     public boolean HeldItemTooltip = true;
 
+    @ConfigEntry.Category("OFFSETS")
+    @Comment("Held item tooltip X offset")
+    public int HeldItemTooltipXOffset = 0;
+
+    @ConfigEntry.Category("OFFSETS")
+    @Comment("Held item tooltip Y offset")
+    public int HeldItemTooltipYOffset = 0;
+
     @ConfigEntry.Category("HUD")
     public boolean MountJumpbar = true;
 
@@ -119,7 +127,7 @@ public static void init() {
 
     @ConfigEntry.Category("HUD")
     @Comment("Hunger bar")
-    public boolean HungerBar;
+    public boolean HungerBar = true;
 
     @ConfigEntry.Category("OFFSETS")
     @Comment("Hunger bar X offset")
@@ -136,7 +144,7 @@ public static void init() {
     public boolean PortalOverlay = true;
 
     @ConfigEntry.Category("Overlays")
-    @Comment("Frost Overlay, Pumkin head, etc...")
+    @Comment("Frost Overlay, Pumpkin head, etc...")
     public boolean OtherOverlays = true;
 
     @ConfigEntry.Category("Overlays")
@@ -145,10 +153,37 @@ public static void init() {
     @ConfigEntry.Category("HUD")
     public boolean ExpBar = true;
 
+    @ConfigEntry.Category("OFFSETS")
+    @Comment("Exp bar X offset")
+    public int ExpBarXOffset = 0;
+
+    @ConfigEntry.Category("OFFSETS")
+    @Comment("Exp Tooltip Y offset")
+    public int ExpBarYOffset = 0;
+
     @ConfigEntry.Category("HUD")
     public boolean Crosshairs = true;
 
     @ConfigEntry.Category("HUD")
     public boolean HotBar = true;
 
+    @ConfigEntry.Category("OFFSETS")
+    @Comment("Hotbar X offset")
+    public int HotBarXOffset = 0;
+
+    @ConfigEntry.Category("OFFSETS")
+    @Comment("Hotbar Y offset")
+    public int HotBarYOffset = 0;
+
+    @ConfigEntry.Category("HUD")
+    public boolean OverlayMessage = true;
+
+    @ConfigEntry.Category("OFFSETS")
+    @Comment("Overlay Message X offset")
+    public int OverlayMessageXOffset = 0;
+
+    @ConfigEntry.Category("OFFSETS")
+    @Comment("Overlay Message Y offset")
+    public int OverlayMessageYOffset = 0;
+
 }

src/main/java/ca/blutopia/removehud/mixin/RemoveBossBar.java

@@ -0,0 +1,19 @@
+package ca.blutopia.removehud.mixin;
+
+import ca.blutopia.removehud.ModConfig;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.hud.BossBarHud;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(BossBarHud.class)
+public abstract class RemoveBossBar {
+    @Inject(method = "render(Lnet/minecraft/client/gui/DrawContext;)V", at = @At("HEAD"), cancellable = true)
+    public void renderBossBars(DrawContext context, CallbackInfo ci) {
+        if (!ModConfig.INSTANCE.BossBar) {
+            ci.cancel();
+        }
+    }
+}

src/main/java/ca/blutopia/removehud/mixin/RemoveDebugHud.java

@@ -0,0 +1,19 @@
+package ca.blutopia.removehud.mixin;
+
+import ca.blutopia.removehud.ModConfig;
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.hud.DebugHud;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(DebugHud.class)
+public abstract class RemoveDebugHud {
+    @Inject(method = "render(Lnet/minecraft/client/gui/DrawContext;)V", at = @At("HEAD"), cancellable = true)
+    public void renderBossBars(DrawContext context, CallbackInfo ci) {
+        if (!ModConfig.INSTANCE.DebugHud) {
+            ci.cancel();
+        }
+    }
+}