Updates for Minecraft 1.17

Still needs a bit of tweaking
This commit is contained in:
Markil3
2021-06-18 08:27:59 -06:00
parent cf4ed2d4af
commit 3b73bf6cb8
18 changed files with 24 additions and 27 deletions

0
src/main/java/markil3/immersive_hud/ConfigManager.java Normal file → Executable file
View File

View File

0
src/main/java/markil3/immersive_hud/Main.java Normal file → Executable file
View File

0
src/main/java/markil3/immersive_hud/ModMenu.java Normal file → Executable file
View File

12
src/main/java/markil3/immersive_hud/TimerUtils.java Normal file → Executable file
View File

@@ -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(),

View File

View File

3
src/main/java/markil3/immersive_hud/mixin/HudHook.java Normal file → Executable file
View File

@@ -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.

View File

@@ -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": "*",

View File

@@ -2,7 +2,7 @@
"required": true,
"minVersion": "0.8",
"package": "markil3.immersive_hud.mixin",
"compatibilityLevel": "JAVA_8",
"compatibilityLevel": "JAVA_16",
"mixins": [
],
"client": [