Skip to content

Commit ed3a54a

Browse files
Madis0Madis0
committed
Migrate renames
1 parent c79f91b commit ed3a54a

7 files changed

Lines changed: 32 additions & 33 deletions

File tree

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import me.shedaniel.autoconfig.serializer.GsonConfigSerializer;
77
import net.fabricmc.api.ClientModInitializer;
88
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
9-
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
9+
import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper;
1010
import net.minecraft.client.KeyMapping;
1111
import net.minecraft.client.Minecraft;
1212
import net.minecraft.network.chat.Component;
@@ -58,10 +58,10 @@ public void onInitializeClient() {
5858

5959
private static void showState(Minecraft client, boolean variable, String translationKey){
6060
assert client.player != null;
61-
client.player.displayClientMessage(Component.translatable(variable ? "options.on.composed" : "options.off.composed", Component.translatable(translationKey).getString()), true);
61+
client.player.sendOverlayMessage(Component.translatable(variable ? "options.on.composed" : "options.off.composed", Component.translatable(translationKey).getString()));
6262
}
6363

6464
private static KeyMapping registerKeybind(String translationKey) {
65-
return KeyBindingHelper.registerKeyBinding(new KeyMapping(translationKey, InputConstants.Type.KEYSYM, InputConstants.UNKNOWN.getValue(), ONEBAR_MAIN));
65+
return KeyMappingHelper.registerKeyMapping(new KeyMapping(translationKey, InputConstants.Type.KEYSYM, InputConstants.UNKNOWN.getValue(), ONEBAR_MAIN));
6666
}
6767
}

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

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

33
import me.shedaniel.autoconfig.AutoConfig;
4-
import net.fabricmc.loader.api.FabricLoader;
54
import net.minecraft.client.Minecraft;
65
import net.minecraft.client.gui.Font;
7-
import net.minecraft.client.gui.GuiGraphics;
6+
import net.minecraft.client.gui.GuiGraphicsExtractor;
87
import net.minecraft.core.component.DataComponents;
98
import net.minecraft.network.chat.Component;
109
import net.minecraft.resources.ResourceKey;
@@ -29,7 +28,7 @@ public class OneBarElements {
2928
private final PlayerProperties playerProperties = new PlayerProperties();
3029
private final Minecraft client = Minecraft.getInstance();
3130
private final Difficulty difficulty = Objects.requireNonNull(client.getCameraEntity()).level().getDifficulty();
32-
private final GuiGraphics drawContext;
31+
private final GuiGraphicsExtractor drawContext;
3332
private final Font textRenderer = client.font;
3433

3534
boolean hasHunger = playerProperties.hasHunger && !config.disableHunger;
@@ -40,7 +39,7 @@ public class OneBarElements {
4039
float armorBarTotalLength = armorBarBootsLength + playerProperties.bootsMaxArmor;
4140
float elytraDurability = playerProperties.getArmorElementDurability(Objects.requireNonNull(client.player), EquipmentSlot.CHEST, 8); //8 aka same full width as Diamond/Netherite
4241

43-
public OneBarElements(GuiGraphics context){
42+
public OneBarElements(GuiGraphicsExtractor context){
4443
drawContext = context;
4544
}
4645

@@ -402,7 +401,7 @@ private void barText(){
402401
int textX = clientProperties.baseEndW - client.font.width(value);
403402
int textY = clientProperties.baseStartH + 1;
404403

405-
drawContext.drawString(textRenderer, value, textX, textY, config.textSettings.textColor, false);
404+
drawContext.text(textRenderer, value, textX, textY, config.textSettings.textColor, false);
406405
}
407406

408407
private void xpBar(){
@@ -431,13 +430,13 @@ private void xpBar(){
431430
int edgeAlignedConst = 13;
432431

433432
if(playerProperties.xpLevel >= 0 && playerProperties.xpLevel < sizeLimit){
434-
drawContext.drawCenteredString(textRenderer, String.valueOf(playerProperties.xpLevel), textX, textY, config.otherBars.xpColor);
433+
drawContext.centeredText(textRenderer, String.valueOf(playerProperties.xpLevel), textX, textY, config.otherBars.xpColor);
435434
}
436435
else if(playerProperties.xpLevel >= sizeLimit){
437436
if(client.options.mainHand().get() == HumanoidArm.RIGHT)
438-
drawContext.drawString(textRenderer, String.valueOf(playerProperties.xpLevel), textX - edgeAlignedConst, textY, config.otherBars.xpColor);
437+
drawContext.text(textRenderer, String.valueOf(playerProperties.xpLevel), textX - edgeAlignedConst, textY, config.otherBars.xpColor);
439438
else if(client.options.mainHand().get() == HumanoidArm.LEFT)
440-
drawContext.drawString(textRenderer, String.valueOf(playerProperties.xpLevel), textX + edgeAlignedConst - client.font.width(String.valueOf(playerProperties.xpLevel)), textY, config.otherBars.xpColor);
439+
drawContext.text(textRenderer, String.valueOf(playerProperties.xpLevel), textX + edgeAlignedConst - client.font.width(String.valueOf(playerProperties.xpLevel)), textY, config.otherBars.xpColor);
441440
}
442441

443442
var lapisTextX = clientProperties.xpEndW + 1;
@@ -449,11 +448,11 @@ else if(client.options.mainHand().get() == HumanoidArm.LEFT)
449448
}
450449

451450
if(config.otherBars.lapisCounter){
452-
drawContext.drawString(textRenderer, lapisText, lapisTextX, lapisTextY, config.otherBars.lapisColor);
451+
drawContext.text(textRenderer, lapisText, lapisTextX, lapisTextY, config.otherBars.lapisColor);
453452
}
454453

455454
if(config.otherBars.mendingIndicator && playerProperties.isMendingAnything){
456-
drawContext.drawCenteredString(textRenderer, Calculations.emojiOrText("text.onebar.mendingEmoji", "text.onebar.mending", false), textX, mendingTextY, config.otherBars.mendingColor);
455+
drawContext.centeredText(textRenderer, Calculations.emojiOrText("text.onebar.mendingEmoji", "text.onebar.mending", false), textX, mendingTextY, config.otherBars.mendingColor);
457456
}
458457
}
459458
if(!config.otherBars.adaptiveXpBar || playerProperties.xp > 0){
@@ -494,7 +493,7 @@ public void jumpBar(){
494493
int textY = clientProperties.jumpEndH - 10;
495494

496495
if(config.textSettings.showText && config.entity.showMountJumpText)
497-
drawContext.drawString(textRenderer, roundedHeightInBlocks, textX, textY, config.textSettings.textColor, false);
496+
drawContext.text(textRenderer, roundedHeightInBlocks, textX, textY, config.textSettings.textColor, false);
498497
}
499498

500499
public void dashBar(){
@@ -522,7 +521,7 @@ public void dashBar(){
522521
String roundedDistanceInBlocks = Calculations.getSubscriptNumber(Double.parseDouble(String.format(Locale.US, "%,.1f",(distanceInBlocks))));
523522
int textX = clientProperties.dashEndW - client.font.width(roundedDistanceInBlocks);
524523
int textY = clientProperties.dashEndH - 9;
525-
drawContext.drawString(textRenderer, roundedDistanceInBlocks, textX, textY, config.textSettings.textColor, false);
524+
drawContext.text(textRenderer, roundedDistanceInBlocks, textX, textY, config.textSettings.textColor, false);
526525
}
527526
}
528527
}
@@ -536,7 +535,7 @@ private void dashCooldownBar(int relativeEndW, int cooldownTimer){
536535
String text = Calculations.getSubscriptNumber(-1 - cooldownTimer);
537536
int textX = clientProperties.dashEndW - client.font.width(text);
538537
int textY = clientProperties.dashEndH - 9;
539-
drawContext.drawString(textRenderer, text, textX, textY, config.textSettings.textColor, false);
538+
drawContext.text(textRenderer, text, textX, textY, config.textSettings.textColor, false);
540539
}
541540
}
542541
}
@@ -570,7 +569,7 @@ public void mountBar(LivingEntity mountEntity){
570569
renderBar(clientProperties.baseStartW, clientProperties.mountStartH, clientProperties.baseEndW, clientProperties.mountEndH, config.backgroundColor);
571570
renderBar(clientProperties.baseStartW, clientProperties.mountStartH, clientProperties.baseRelativeEndW(Calculations.getPreciseInt(mountRawHealth), Calculations.getPreciseInt(mountMaxHealth)), clientProperties.mountEndH, config.entity.healthColor);
572571
if(config.armor.showArmorBar) renderBar(clientProperties.baseStartW, clientProperties.mountStartH - 1, clientProperties.baseRelativeEndW(mountArmor, mountMaxArmor), clientProperties.mountStartH, config.armor.armorColor);
573-
if(config.textSettings.showText) drawContext.drawString(textRenderer, value, textX, textY, config.textSettings.textColor, false);
572+
if(config.textSettings.showText) drawContext.text(textRenderer, value, textX, textY, config.textSettings.textColor, false);
574573

575574
if(mountEntity instanceof Camel){
576575
long standingUpMax = 52;
@@ -585,6 +584,6 @@ public void mountBar(LivingEntity mountEntity){
585584
}
586585

587586
private void debugText(String value){
588-
drawContext.drawString(textRenderer, value, clientProperties.baseEndW + 15, clientProperties.baseStartH + 1, config.textSettings.textColor);
587+
drawContext.text(textRenderer, value, clientProperties.baseEndW + 15, clientProperties.baseStartH + 1, config.textSettings.textColor);
589588
}
590589
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import io.github.madis0.MixinConfigQuery;
44
import net.minecraft.client.gui.Font;
5-
import net.minecraft.client.gui.GuiGraphics;
5+
import net.minecraft.client.gui.GuiGraphicsExtractor;
66
import net.minecraft.client.gui.contextualbar.ContextualBarRenderer;
77
import org.spongepowered.asm.mixin.Mixin;
88
import org.spongepowered.asm.mixin.injection.At;
@@ -12,7 +12,7 @@
1212
@Mixin(value = ContextualBarRenderer.class)
1313
public interface BarMixin {
1414
@Inject(method = "renderExperienceLevel", at = @At(value = "HEAD"), cancellable = true)
15-
private static void hideXpLevel(GuiGraphics context, Font textRenderer, int level, CallbackInfo ci){
15+
private static void hideXpLevel(GuiGraphicsExtractor context, Font textRenderer, int level, CallbackInfo ci){
1616
if(MixinConfigQuery.isOneBarEnabled() && !MixinConfigQuery.isCompatModeEnabled())
1717
ci.cancel();
1818
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import io.github.madis0.MixinConfigQuery;
44
import net.minecraft.client.DeltaTracker;
5-
import net.minecraft.client.gui.GuiGraphics;
5+
import net.minecraft.client.gui.GuiGraphicsExtractor;
66
import net.minecraft.client.gui.contextualbar.ExperienceBarRenderer;
77
import org.spongepowered.asm.mixin.Mixin;
88
import org.spongepowered.asm.mixin.injection.At;
@@ -12,13 +12,13 @@
1212
@Mixin(value = ExperienceBarRenderer.class)
1313
public abstract class ExperienceBarMixin {
1414
@Inject(method = "render", at = @At(value = "HEAD"), cancellable = true)
15-
private void hideBar(GuiGraphics context, DeltaTracker tickCounter, CallbackInfo ci){
15+
private void hideBar(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci){
1616
if(!MixinConfigQuery.isCompatModeEnabled() && MixinConfigQuery.isOneBarEnabled())
1717
ci.cancel();
1818
}
1919

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import net.minecraft.client.Minecraft;
1515
import net.minecraft.client.gui.Gui;
1616
import net.minecraft.client.gui.Gui.ContextualInfo;
17-
import net.minecraft.client.gui.GuiGraphics;
17+
import net.minecraft.client.gui.GuiGraphicsExtractor;
1818
import net.minecraft.world.entity.LivingEntity;
1919

2020
@Mixin(value = Gui.class)
@@ -26,7 +26,7 @@ public abstract class InGameHudMixin {
2626
private boolean showOneBar = false;
2727

2828
@Inject(at = @At("HEAD"), method = "render")
29-
public void render(GuiGraphics context, DeltaTracker tickCounter, CallbackInfo ci) {
29+
public void render(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci) {
3030
oneBarElements = new OneBarElements(context);
3131
showOneBar = MixinConfigQuery.isOneBarEnabled(); // This var exists because it also shows whether oneBarElements is initialized
3232

@@ -38,13 +38,13 @@ public void render(GuiGraphics context, DeltaTracker tickCounter, CallbackInfo c
3838
}
3939

4040
@Inject(method = "renderPlayerHealth", at = @At(value = "HEAD"), cancellable = true)
41-
private void hideHud(GuiGraphics context, CallbackInfo ci){
41+
private void hideHud(GuiGraphicsExtractor context, CallbackInfo ci){
4242
if(showOneBar && !MixinConfigQuery.isCompatModeEnabled())
4343
ci.cancel();
4444
}
4545

4646
@Inject(method = "renderVehicleHealth", at = @At(value = "HEAD"), cancellable = true)
47-
private void hideMountHealth(GuiGraphics context, CallbackInfo ci) {
47+
private void hideMountHealth(GuiGraphicsExtractor context, CallbackInfo ci) {
4848
if(showOneBar && !MixinConfigQuery.isCompatModeEnabled())
4949
ci.cancel();
5050
oneBarElements.mountBar(getPlayerVehicleWithHealth());

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import io.github.madis0.OneBarElements;
55
import io.github.madis0.accessor.DrawContextAccessor;
66
import net.minecraft.client.DeltaTracker;
7-
import net.minecraft.client.gui.GuiGraphics;
7+
import net.minecraft.client.gui.GuiGraphicsExtractor;
88
import net.minecraft.client.gui.contextualbar.JumpableVehicleBarRenderer;
99
import org.spongepowered.asm.mixin.Mixin;
1010
import org.spongepowered.asm.mixin.injection.At;
@@ -15,13 +15,13 @@
1515
public abstract class JumpBarMixin {
1616

1717
@Inject(method = "render", at = @At(value = "HEAD"), cancellable = true)
18-
private void hideBar(GuiGraphics context, DeltaTracker tickCounter, CallbackInfo ci){
18+
private void hideBar(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci){
1919
if(!MixinConfigQuery.isCompatModeEnabled() && MixinConfigQuery.isOneBarEnabled())
2020
ci.cancel();
2121
}
2222

2323
@Inject(method = "render", at = @At(value = "HEAD"), cancellable = true)
24-
private void hideAddons(GuiGraphics context, DeltaTracker tickCounter, CallbackInfo ci){
24+
private void hideAddons(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci){
2525
if(!MixinConfigQuery.isCompatModeEnabled() && MixinConfigQuery.isOneBarEnabled())
2626
ci.cancel();
2727
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import io.github.madis0.MixinConfigQuery;
44
import net.minecraft.client.DeltaTracker;
5-
import net.minecraft.client.gui.GuiGraphics;
5+
import net.minecraft.client.gui.GuiGraphicsExtractor;
66
import net.minecraft.client.gui.contextualbar.LocatorBarRenderer;
77
import org.spongepowered.asm.mixin.Mixin;
88
import org.spongepowered.asm.mixin.injection.At;
@@ -42,13 +42,13 @@ private int modifyHeightAddons(int original) {
4242
}
4343

4444
@Inject(method = "render", at = @At(value = "HEAD"), cancellable = true)
45-
private void hideBar(GuiGraphics context, DeltaTracker tickCounter, CallbackInfo ci){
45+
private void hideBar(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci){
4646
if(MixinConfigQuery.isOneBarEnabled() && !MixinConfigQuery.isLocatorBarEnabled())
4747
ci.cancel();
4848
}
4949

5050
@Inject(method = "render", at = @At(value = "HEAD"), cancellable = true)
51-
private void hideAddons(GuiGraphics context, DeltaTracker tickCounter, CallbackInfo ci){
51+
private void hideAddons(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci){
5252
if(MixinConfigQuery.isOneBarEnabled() && !MixinConfigQuery.isLocatorBarEnabled())
5353
ci.cancel();
5454
}

0 commit comments

Comments
 (0)