Skip to content

Commit 904784c

Browse files
Madis0Madis0
committed
Port to 26.2
1 parent 059c8d8 commit 904784c

15 files changed

Lines changed: 57 additions & 59 deletions

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ repositories {
2828
}
2929

3030
loom {
31-
accessWidenerPath = file("src/main/resources/guicontextualinfo.accesswidener")
31+
accessWidenerPath = file("src/main/resources/hudcontextualinfo.accesswidener")
3232
}
3333

3434

‎gradle.properties‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ org.gradle.configuration-cache=false
77

88
# Fabric Properties
99
# check these on https://fabricmc.net/develop/
10-
minecraft_version=26.1
11-
loader_version=0.18.5
12-
loom_version=1.15-SNAPSHOT
10+
minecraft_version=26.2
11+
loader_version=0.19.3
12+
loom_version=1.17-SNAPSHOT
1313

1414
# Mod Properties
15-
mod_version = 5.2.1
15+
mod_version = 5.2.2
1616
maven_group = io.github.madis0
1717
archives_base_name = onebar
1818

1919
# Dependencies
20-
fabric_api_version=0.144.3+26.1
21-
modmenu_version=18.0.0-alpha.8
22-
cloth_config_version=26.1.154
20+
fabric_api_version=0.153.0+26.2
21+
modmenu_version=20.0.0-beta.4
22+
cloth_config_version=26.2.155

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
44
networkTimeout=10000
5+
retries=0
6+
retryBackOffMs=500
57
validateDistributionUrl=true
68
zipStoreBase=GRADLE_USER_HOME
7-
zipStorePath=wrapper/dists
9+
zipStorePath=wrapper/dists

‎src/main/java/io/github/madis0/ClientProperties.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ public ClientProperties(){
5656
boolean hasHotbarLocatorBar = MixinConfigQuery.isLocatorBarEnabled() && MixinConfigQuery.isLocatorBarMode(ModConfig.LocatorBarMode.HOTBAR);
5757
locatorBarHeightConst = 7;
5858

59-
boolean f3IsCovering = Minecraft.getInstance().gui.getDebugOverlay().showFpsCharts() ||
60-
Minecraft.getInstance().gui.getDebugOverlay().showNetworkCharts();
59+
boolean f3IsCovering = Minecraft.getInstance().getDebugOverlay().showFpsCharts() ||
60+
Minecraft.getInstance().getDebugOverlay().showNetworkCharts();
6161

6262
baseStartW = scaledWidth / 2 - 91;
6363
baseEndW = baseStartW + 182;

‎src/main/java/io/github/madis0/OneBar.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void onInitializeClient() {
5151
showState(client, config.disableHunger, "text.autoconfig.onebar.option.disableHunger");
5252
}
5353
while (configScreen.consumeClick()) {
54-
client.setScreen(AutoConfigClient.getConfigScreen(ModConfig.class, null).get());
54+
client.gui.setScreen(AutoConfigClient.getConfigScreen(ModConfig.class, null).get());
5555
}
5656
});
5757
}

‎src/main/java/io/github/madis0/OneBarElements.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public class OneBarElements {
3939
float armorBarTotalLength = armorBarBootsLength + playerProperties.bootsMaxArmor;
4040
float elytraDurability = playerProperties.getArmorElementDurability(Objects.requireNonNull(client.player), EquipmentSlot.CHEST, 8); //8 aka same full width as Diamond/Netherite
4141

42-
public OneBarElements(GuiGraphicsExtractor context){
43-
drawContext = context;
42+
public OneBarElements(GuiGraphicsExtractor graphics){
43+
drawContext = graphics;
4444
}
4545

4646
public void renderOneBar(){

‎src/main/java/io/github/madis0/PlayerProperties.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -430,12 +430,12 @@ else if (armorStack.is(Items.ELYTRA)) {
430430
(playerEntity.getInventory().countItem(Items.LAPIS_BLOCK) * 9);
431431

432432
Minecraft client = Minecraft.getInstance();
433-
if(client.screen instanceof EnchantmentScreen){
434-
lapisLazuli += ((EnchantmentScreen) client.screen).getMenu().getGoldCount();
433+
if(client.gui.screen() instanceof EnchantmentScreen){
434+
lapisLazuli += ((EnchantmentScreen) client.gui.screen()).getMenu().getGoldCount();
435435
}
436436

437-
if (client.screen instanceof AbstractContainerScreen<?>){
438-
var pickedUpItemInInventory = ((AbstractContainerScreen<?>) client.screen).getMenu().getCarried();
437+
if (client.gui.screen() instanceof AbstractContainerScreen<?>){
438+
var pickedUpItemInInventory = ((AbstractContainerScreen<?>) client.gui.screen()).getMenu().getCarried();
439439
if(pickedUpItemInInventory.is(Items.LAPIS_BLOCK)) lapisLazuli += pickedUpItemInInventory.getCount() * 9;
440440
if(pickedUpItemInInventory.is(Items.LAPIS_LAZULI)) lapisLazuli += pickedUpItemInInventory.getCount();
441441
if(pickedUpItemInInventory.is(Items.TOTEM_OF_UNDYING)) amountTotemOfUndying += pickedUpItemInInventory.getCount();

‎src/main/java/io/github/madis0/mixin/BarMixin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
import io.github.madis0.MixinConfigQuery;
44
import net.minecraft.client.gui.Font;
55
import net.minecraft.client.gui.GuiGraphicsExtractor;
6-
import net.minecraft.client.gui.contextualbar.ContextualBarRenderer;
6+
import net.minecraft.client.gui.contextualbar.ContextualBar;
77
import org.spongepowered.asm.mixin.Mixin;
88
import org.spongepowered.asm.mixin.injection.At;
99
import org.spongepowered.asm.mixin.injection.Inject;
1010
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1111

12-
@Mixin(value = ContextualBarRenderer.class)
12+
@Mixin(value = ContextualBar.class)
1313
public interface BarMixin {
1414
@Inject(method = "extractExperienceLevel", at = @At(value = "HEAD"), cancellable = true)
15-
private static void hideXpLevel(GuiGraphicsExtractor context, Font textRenderer, int level, CallbackInfo ci){
15+
private static void hideXpLevel(GuiGraphicsExtractor graphics, Font font, int experienceLevel, CallbackInfo ci){
1616
if(MixinConfigQuery.isOneBarEnabled() && !MixinConfigQuery.isCompatModeEnabled())
1717
ci.cancel();
1818
}

‎src/main/java/io/github/madis0/mixin/ExperienceBarMixin.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
import io.github.madis0.MixinConfigQuery;
44
import net.minecraft.client.DeltaTracker;
55
import net.minecraft.client.gui.GuiGraphicsExtractor;
6-
import net.minecraft.client.gui.contextualbar.ExperienceBarRenderer;
6+
import net.minecraft.client.gui.contextualbar.ExperienceBar;
77
import org.spongepowered.asm.mixin.Mixin;
88
import org.spongepowered.asm.mixin.injection.At;
99
import org.spongepowered.asm.mixin.injection.Inject;
1010
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1111

12-
@Mixin(value = ExperienceBarRenderer.class)
12+
@Mixin(value = ExperienceBar.class)
1313
public abstract class ExperienceBarMixin {
1414
@Inject(method = "extractRenderState", at = @At(value = "HEAD"), cancellable = true)
15-
private void hideBar(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci){
15+
private void hideBar(GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, CallbackInfo ci){
1616
if(!MixinConfigQuery.isCompatModeEnabled() && MixinConfigQuery.isOneBarEnabled())
1717
ci.cancel();
1818
}
1919

2020
@Inject(method = "extractRenderState", at = @At(value = "HEAD"), cancellable = true)
21-
private void hideAddons(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci){
21+
private void hideAddons(GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, CallbackInfo ci){
2222
if(!MixinConfigQuery.isCompatModeEnabled() && MixinConfigQuery.isOneBarEnabled())
2323
ci.cancel();
2424
}

‎src/main/java/io/github/madis0/mixin/InGameHudMixin.java‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.github.madis0.mixin;
22

33
import io.github.madis0.*;
4+
import net.minecraft.client.gui.Hud;
45
import org.spongepowered.asm.mixin.Final;
56
import org.spongepowered.asm.mixin.Mixin;
67
import org.spongepowered.asm.mixin.Shadow;
@@ -12,12 +13,10 @@
1213
import java.util.Objects;
1314
import net.minecraft.client.DeltaTracker;
1415
import net.minecraft.client.Minecraft;
15-
import net.minecraft.client.gui.Gui;
16-
import net.minecraft.client.gui.Gui.ContextualInfo;
1716
import net.minecraft.client.gui.GuiGraphicsExtractor;
1817
import net.minecraft.world.entity.LivingEntity;
1918

20-
@Mixin(value = Gui.class)
19+
@Mixin(value = Hud.class)
2120
public abstract class InGameHudMixin {
2221
@Final @Shadow private Minecraft minecraft;
2322
@Shadow protected abstract LivingEntity getPlayerVehicleWithHealth();
@@ -26,45 +25,45 @@ public abstract class InGameHudMixin {
2625
private boolean showOneBar = false;
2726

2827
@Inject(at = @At("HEAD"), method = "extractRenderState")
29-
public void render(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci) {
30-
oneBarElements = new OneBarElements(context);
28+
public void render(GuiGraphicsExtractor graphics, DeltaTracker deltaTracker, CallbackInfo ci) {
29+
oneBarElements = new OneBarElements(graphics);
3130
showOneBar = MixinConfigQuery.isOneBarEnabled(); // This var exists because it also shows whether oneBarElements is initialized
3231

33-
boolean barsVisible = !minecraft.options.hideGui && Objects.requireNonNull(minecraft.gameMode).canHurtPlayer();
32+
boolean barsVisible = !minecraft.gui.hud.isHidden() && Objects.requireNonNull(minecraft.gameMode).canHurtPlayer();
3433
if(showOneBar && barsVisible) oneBarElements.renderOneBar();
35-
if(showOneBar && MixinConfigQuery.showMountJump() && !minecraft.options.hideGui) oneBarElements.mountJumpBar();
34+
if(showOneBar && MixinConfigQuery.showMountJump() && !minecraft.gui.hud.isHidden()) oneBarElements.mountJumpBar();
3635

3736
PlayerProperties.setLocatorBarAvailable(minecraft.player.connection.getWaypointManager().hasWaypoints());
3837
}
3938

4039
@Inject(method = "extractPlayerHealth", at = @At(value = "HEAD"), cancellable = true)
41-
private void hideHud(GuiGraphicsExtractor context, CallbackInfo ci){
40+
private void hideHud(GuiGraphicsExtractor graphics, CallbackInfo ci){
4241
if(showOneBar && !MixinConfigQuery.isCompatModeEnabled())
4342
ci.cancel();
4443
}
4544

4645
@Inject(method = "extractVehicleHealth", at = @At(value = "HEAD"), cancellable = true)
47-
private void hideMountHealth(GuiGraphicsExtractor context, CallbackInfo ci) {
46+
private void hideMountHealth(GuiGraphicsExtractor graphics, CallbackInfo ci) {
4847
if(showOneBar && !MixinConfigQuery.isCompatModeEnabled())
4948
ci.cancel();
5049
oneBarElements.mountBar(getPlayerVehicleWithHealth());
5150
}
5251

5352
@Inject(method = "nextContextualInfoState", at = @At("HEAD"), cancellable = true)
54-
private void forceLocatorBar(CallbackInfoReturnable<ContextualInfo> cir) {
53+
private void forceLocatorBar(CallbackInfoReturnable<Hud.ContextualInfo> cir) {
5554
if (showOneBar && !MixinConfigQuery.isCompatModeEnabled()) {
56-
ContextualInfo barType = MixinConfigQuery.isLocatorBarEnabled()
57-
? ContextualInfo.LOCATOR
58-
: ContextualInfo.EMPTY;
55+
Hud.ContextualInfo barType = MixinConfigQuery.isLocatorBarEnabled()
56+
? Hud.ContextualInfo.LOCATOR
57+
: Hud.ContextualInfo.EMPTY;
5958
cir.setReturnValue(barType);
6059
cir.cancel();
6160
}
6261
}
6362

6463
@ModifyVariable(method = "extractSelectedItemName", at = @At(value = "STORE"), name = "y")
65-
private int renderHeldItemTooltip(int k) {
64+
private int renderHeldItemTooltip(int y) {
6665
if (!showOneBar || !MixinConfigQuery.isHotbarTooltipsDown()) {
67-
return k;
66+
return y;
6867
}
6968

7069
boolean creativeOrSpectator = PlayerProperties.isCreativeOrSpectator;

0 commit comments

Comments
 (0)