diff options
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java')
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java index d977a400..e1ac3c5f 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java @@ -1,6 +1,7 @@ package me.xmrvizzy.skyblocker.skyblock.quicknav; import com.mojang.blaze3d.systems.RenderSystem; + import me.xmrvizzy.skyblocker.mixin.HandledScreenAccessor; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -11,7 +12,6 @@ import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.item.ItemStack; -import net.minecraft.text.LiteralTextContent; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -20,11 +20,6 @@ public class QuickNavButton extends ClickableWidget { private static final MinecraftClient CLIENT = MinecraftClient.getInstance(); private static final Identifier BUTTON_TEXTURE = new Identifier("textures/gui/container/creative_inventory/tabs.png"); - @Override - public void appendNarrations(NarrationMessageBuilder builder) { - - } - private int index; private boolean toggled; private int u; @@ -33,7 +28,7 @@ public class QuickNavButton extends ClickableWidget { private final ItemStack icon; public QuickNavButton(int index, boolean toggled, String command, ItemStack icon) { - super(0, 0, 28, 32, Text.empty()); + super(0, 0, 26, 32, Text.empty()); this.index = index; this.toggled = toggled; this.command = command; @@ -50,10 +45,10 @@ public class QuickNavButton extends ClickableWidget { int h = ((HandledScreenAccessor)handledScreen).getBackgroundHeight(); if (h > 166) --h; // why is this even a thing // this.x = x + this.index % 6 * 28 + 4; - this.setX(x + this.index % 6 * 28 + 4); + this.setX(x + this.index % 6 * 26 + 4); // this.y = this.index < 6 ? y - 28 : y + h - 4; - this.setY(this.index < 6 ? y - 28 : y + h - 4); - this.u = 28; + this.setY(this.index < 6 ? y - 26 : y + h - 4); + this.u = 26; this.v = (index < 6 ? 0 : 64) + (toggled ? 32 : 0); } } @@ -62,8 +57,7 @@ public class QuickNavButton extends ClickableWidget { public void onClick(double mouseX, double mouseY) { if (!this.toggled) { this.toggled = true; - // CLIENT.player.sendChatMessage(command, Text.of(command)); - CLIENT.player.sendMessage(Text.of(command)); + CLIENT.player.networkHandler.sendCommand(command.replace("/", "")); // TODO : add null check with log error } } @@ -75,6 +69,9 @@ public class QuickNavButton extends ClickableWidget { RenderSystem.disableDepthTest(); // render button background if (!this.toggled) { + //Move buttons 1 pixel up if they aren't selected + matrices.push(); + matrices.translate(0f, -1f, 0f); if (this.index >= 6) // this.drawTexture(matrices, this.x, this.y + 4, this.u, this.v + 4, this.width, this.height - 4); this.drawTexture(matrices, this.getX(), this.getY() + 4, this.u, this.v + 4, this.width, this.height - 4); @@ -82,23 +79,36 @@ public class QuickNavButton extends ClickableWidget { // this.drawTexture(matrices, this.x, this.y, this.u, this.v, this.width, this.height - 4); this.drawTexture(matrices, this.getX(), this.getY(), this.u, this.v, this.width, this.height - 4); // } else this.drawTexture(matrices, this.x, this.y, this.u, this.v, this.width, this.height); - } else this.drawTexture(matrices, this.getX(), this.getY(), this.u, this.v, this.width, this.height); + matrices.pop(); + } else { + matrices.push(); + //Move the top buttons 2 pixels up if they're selected + if (this.index < 6) matrices.translate(0f, -2f, 0f); + this.drawTexture(matrices, this.getX(), this.getY(), this.u, this.v, this.width, this.height); + matrices.pop(); + } // render button icon if (!this.toggled) { if (this.index >= 6) // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6); - CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 6, this.getY() + 6); + CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 5, this.getY() + 5); else // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9); - CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 6, this.getY() + 9); + CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 5, this.getY() + 8); } else { if (this.index >= 6) // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9); - CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 6, this.getY() + 9); + CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 5, this.getY() + 8); else // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6); - CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 6, this.getY() + 6); + CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 5, this.getY() + 5); } RenderSystem.enableDepthTest(); } + + @Override + protected void appendClickableNarrations(NarrationMessageBuilder builder) { + // TODO Auto-generated method stub + + } } |