From 3b73bf6cb83b6d2e6e46e035d3b6206e6f6d0049 Mon Sep 17 00:00:00 2001 From: Markil3 <75867393+Markil3@users.noreply.github.com> Date: Fri, 18 Jun 2021 08:27:59 -0600 Subject: [PATCH] Updates for Minecraft 1.17 Still needs a bit of tweaking --- .github/workflows/build.yml | 0 .gitignore | 2 ++ LICENSE | 0 README.md | 0 build.gradle | 15 +++++---------- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 0 .../java/markil3/immersive_hud/ConfigManager.java | 0 .../markil3/immersive_hud/ConfigManagerCloth.java | 0 src/main/java/markil3/immersive_hud/Main.java | 0 src/main/java/markil3/immersive_hud/ModMenu.java | 0 .../java/markil3/immersive_hud/TimerUtils.java | 12 ++++++------ .../immersive_hud/mixin/ClientPlayerHook.java | 0 .../markil3/immersive_hud/mixin/HeldItemHook.java | 0 .../java/markil3/immersive_hud/mixin/HudHook.java | 3 +-- src/main/resources/fabric.mod.json | 5 +++-- src/main/resources/immersive_hud.mixins.json | 2 +- 18 files changed, 24 insertions(+), 27 deletions(-) mode change 100644 => 100755 .github/workflows/build.yml mode change 100644 => 100755 .gitignore mode change 100644 => 100755 LICENSE mode change 100644 => 100755 README.md mode change 100644 => 100755 build.gradle mode change 100644 => 100755 gradle.properties mode change 100644 => 100755 settings.gradle mode change 100644 => 100755 src/main/java/markil3/immersive_hud/ConfigManager.java mode change 100644 => 100755 src/main/java/markil3/immersive_hud/ConfigManagerCloth.java mode change 100644 => 100755 src/main/java/markil3/immersive_hud/Main.java mode change 100644 => 100755 src/main/java/markil3/immersive_hud/ModMenu.java mode change 100644 => 100755 src/main/java/markil3/immersive_hud/TimerUtils.java mode change 100644 => 100755 src/main/java/markil3/immersive_hud/mixin/ClientPlayerHook.java mode change 100644 => 100755 src/main/java/markil3/immersive_hud/mixin/HeldItemHook.java mode change 100644 => 100755 src/main/java/markil3/immersive_hud/mixin/HudHook.java diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index d615ba1..9c39476 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ bin/ run/ /logs/ +local.properties +remappedSrc/ diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/build.gradle b/build.gradle old mode 100644 new mode 100755 index 13bf703..8e60776 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { - id 'fabric-loom' version '0.5-SNAPSHOT' + id 'fabric-loom' version '0.8-SNAPSHOT' id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 +sourceCompatibility = JavaVersion.VERSION_16 +targetCompatibility = JavaVersion.VERSION_16 archivesBaseName = project.archives_base_name version = project.mod_version + "-" + project.minecraft_version + "-fabric" @@ -43,13 +43,8 @@ tasks.withType(JavaCompile).configureEach { // If Javadoc is generated, this must be specified in that task too. it.options.encoding = "UTF-8" - // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too - // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used. - // We'll use that if it's available, but otherwise we'll use the older option. - def targetVersion = 8 - if (JavaVersion.current().isJava9Compatible()) { - it.options.release = targetVersion - } + // Minecraft 1.17 (21w19a) upwards uses Java 16. + it.options.release = 16 } java { diff --git a/gradle.properties b/gradle.properties old mode 100644 new mode 100755 index 2559d28..e59c464 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.16.4 - yarn_mappings=1.16.4+build.9 - loader_version=0.11.1 + minecraft_version=1.17 + yarn_mappings=1.17+build.1 + loader_version=0.11.3 -cloth_version=4.11.14 -modmenu_version=1.16.8 +cloth_version=5.0.34 +modmenu_version=2.0.2 # Mod Properties mod_version = 1.1.1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da9702f..0f80bbf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle old mode 100644 new mode 100755 diff --git a/src/main/java/markil3/immersive_hud/ConfigManager.java b/src/main/java/markil3/immersive_hud/ConfigManager.java old mode 100644 new mode 100755 diff --git a/src/main/java/markil3/immersive_hud/ConfigManagerCloth.java b/src/main/java/markil3/immersive_hud/ConfigManagerCloth.java old mode 100644 new mode 100755 diff --git a/src/main/java/markil3/immersive_hud/Main.java b/src/main/java/markil3/immersive_hud/Main.java old mode 100644 new mode 100755 diff --git a/src/main/java/markil3/immersive_hud/ModMenu.java b/src/main/java/markil3/immersive_hud/ModMenu.java old mode 100644 new mode 100755 diff --git a/src/main/java/markil3/immersive_hud/TimerUtils.java b/src/main/java/markil3/immersive_hud/TimerUtils.java old mode 100644 new mode 100755 index 4915f43..6135f2e --- a/src/main/java/markil3/immersive_hud/TimerUtils.java +++ b/src/main/java/markil3/immersive_hud/TimerUtils.java @@ -173,7 +173,7 @@ public class TimerUtils */ public static void setAlpha(float alpha) { - RenderSystem.color4f(1.0F, 1.0F, 1.0F, alpha); + RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, alpha); } /** @@ -847,7 +847,7 @@ public class TimerUtils return true; } - if (entity.method_3151() > 0) + if (entity.getMountJumpStrength() > 0) { jumpTime = jump.getMaxTime() - (jumpTime > 0 ? jump.getFadeInTime() : @@ -1125,9 +1125,9 @@ public class TimerUtils /* * Checks for a change in what slot is used. */ - if (selectedHotbarSlot != entity.inventory.selectedSlot) + if (selectedHotbarSlot != entity.getInventory().selectedSlot) { - selectedHotbarSlot = entity.inventory.selectedSlot; + selectedHotbarSlot = entity.getInventory().selectedSlot; mainHandTime = handTime; changed = true; } @@ -1158,9 +1158,9 @@ public class TimerUtils { ConfigManager.TimeValues hotbar = ConfigManager.getInstance().getHotbarTime(); - RenderSystem.pushMatrix(); +// RenderSystem.pushMatrix(); stack.push(); - RenderSystem.translatef(0F, TimerUtils.getHotbarTranslation(), 0F); + stack.translate(0F, TimerUtils.getHotbarTranslation(), 0F); setAlpha(Main.getAlpha(hotbarTime, hotbar.getMaxTime(), hotbar.getFadeInTime(), diff --git a/src/main/java/markil3/immersive_hud/mixin/ClientPlayerHook.java b/src/main/java/markil3/immersive_hud/mixin/ClientPlayerHook.java old mode 100644 new mode 100755 diff --git a/src/main/java/markil3/immersive_hud/mixin/HeldItemHook.java b/src/main/java/markil3/immersive_hud/mixin/HeldItemHook.java old mode 100644 new mode 100755 diff --git a/src/main/java/markil3/immersive_hud/mixin/HudHook.java b/src/main/java/markil3/immersive_hud/mixin/HudHook.java old mode 100644 new mode 100755 index 35c0f2f..0c73970 --- a/src/main/java/markil3/immersive_hud/mixin/HudHook.java +++ b/src/main/java/markil3/immersive_hud/mixin/HudHook.java @@ -634,7 +634,7 @@ public class HudHook * @since 0.1-1.16.4-fabric */ @Inject(method = "renderHotbar", at = @At(value = "INVOKE", target = - "Lcom/mojang/blaze3d/systems/RenderSystem;color4f(FFFF)V", shift + "Lcom/mojang/blaze3d/systems/RenderSystem;setShaderColor(FFFF)V", shift = At.Shift.AFTER)) public void adjustHotbar(float tickDelta, MatrixStack matrices, @@ -671,7 +671,6 @@ public class HudHook { try { - RenderSystem.popMatrix(); stack.pop(); /* * Resets the color so that nothing else is bothered. diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 33060ed..5cf885c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -34,8 +34,9 @@ ], "depends": { - "fabricloader": ">=0.7.4", - "minecraft": "1.16.x" + "fabricloader": ">=0.11.3", + "minecraft": "1.17.x", + "java": ">=16" }, "suggests": { "modmenu": "*", diff --git a/src/main/resources/immersive_hud.mixins.json b/src/main/resources/immersive_hud.mixins.json index d3bdb4e..3c10c58 100644 --- a/src/main/resources/immersive_hud.mixins.json +++ b/src/main/resources/immersive_hud.mixins.json @@ -2,7 +2,7 @@ "required": true, "minVersion": "0.8", "package": "markil3.immersive_hud.mixin", - "compatibilityLevel": "JAVA_8", + "compatibilityLevel": "JAVA_16", "mixins": [ ], "client": [