diff options
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock')
4 files changed, 41 insertions, 24 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java index de4a25b6..29b8dd79 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/BackpackPreview.java @@ -68,7 +68,7 @@ public class BackpackPreview extends DrawableHelper { } public static void loadStorage() { - assert(save_dir != null); + assert (save_dir != null); for (int index = 0; index < STORAGE_SIZE; ++index) { storage[index] = null; dirty[index] = false; @@ -85,7 +85,7 @@ public class BackpackPreview extends DrawableHelper { } private static void saveStorage() { - assert(save_dir != null); + assert (save_dir != null); for (int index = 0; index < STORAGE_SIZE; ++index) { if (dirty[index]) { if (storage[index] != null) { @@ -121,7 +121,7 @@ public class BackpackPreview extends DrawableHelper { String title = screen.getTitle().getString(); int index = getStorageIndexFromTitle(title); if (index != -1) { - storage[index] = ((HandledScreen<?>)screen).getScreenHandler().slots.get(0).inventory; + storage[index] = ((HandledScreen<?>) screen).getScreenHandler().slots.get(0).inventory; dirty[index] = true; } } @@ -151,10 +151,11 @@ public class BackpackPreview extends DrawableHelper { for (int i = 9; i < storage[index].size(); ++i) { int itemX = x + (i - 9) % 9 * 18 + 8; int itemY = y + (i - 9) / 9 * 18 + 8; - itemRenderer.zOffset = 200.0F; - itemRenderer.renderInGui(storage[index].getStack(i), itemX, itemY); - itemRenderer.renderGuiItemOverlay(textRenderer, storage[index].getStack(i), itemX, itemY); - itemRenderer.zOffset = 0.0F; + matrices.push(); + matrices.translate(0, 0, 200); + itemRenderer.renderInGui(matrices, storage[index].getStack(i), itemX, itemY); + itemRenderer.renderGuiItemOverlay(matrices, textRenderer, storage[index].getStack(i), itemX, itemY); + matrices.pop(); } return true; @@ -189,34 +190,50 @@ class DummyInventory implements Inventory { stacks = new ArrayList<>(root.getInt("size") + 9); for (int i = 0; i < 9; ++i) stacks.add(ItemStack.EMPTY); root.getList("list", NbtCompound.COMPOUND_TYPE).forEach(item -> - stacks.add(ItemStack.fromNbt((NbtCompound)item)) + stacks.add(ItemStack.fromNbt((NbtCompound) item)) ); } @Override - public int size() { return stacks.size(); } + public int size() { + return stacks.size(); + } @Override - public boolean isEmpty() { return false; } + public boolean isEmpty() { + return false; + } @Override - public ItemStack getStack(int slot) { return stacks.get(slot); } + public ItemStack getStack(int slot) { + return stacks.get(slot); + } @Override - public ItemStack removeStack(int slot, int amount) { return null; } + public ItemStack removeStack(int slot, int amount) { + return null; + } @Override - public ItemStack removeStack(int slot) { return null; } + public ItemStack removeStack(int slot) { + return null; + } @Override - public void setStack(int slot, ItemStack stack) { stacks.set(slot, stack); } + public void setStack(int slot, ItemStack stack) { + stacks.set(slot, stack); + } @Override - public void markDirty() {} + public void markDirty() { + } @Override - public boolean canPlayerUse(PlayerEntity player) { return false; } + public boolean canPlayerUse(PlayerEntity player) { + return false; + } @Override - public void clear() {} + public void clear() { + } } diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java index 7dcb2b3b..2d0ba892 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/dwarven/DwarvenHudConfigScreen.java @@ -23,7 +23,7 @@ public class DwarvenHudConfigScreen extends Screen { super.render(matrices, mouseX, mouseY, delta); renderBackground(matrices); DwarvenHud.render(matrices, hudX, hudY, List.of(new DwarvenHud.Commission("Test Commission 1", "1%"), new DwarvenHud.Commission("Test Commission 2", "2%"))); - drawCenteredText(matrices, textRenderer, "Right Click To Reset Position", width / 2, height / 2, Color.GRAY.getRGB()); + drawCenteredTextWithShadow(matrices, textRenderer, "Right Click To Reset Position", width / 2, height / 2, Color.GRAY.getRGB()); } @Override diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java index 6d0d89e1..3d6409ef 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/itemlist/ResultButtonWidget.java @@ -42,9 +42,9 @@ public class ResultButtonWidget extends ClickableWidget { // this.drawTexture(matrices, this.x, this.y, 29, 206, this.width, this.height); this.drawTexture(matrices, this.getX(), this.getY(), 29, 206, this.getWidth(), this.getHeight()); // client.getItemRenderer().renderInGui(this.itemStack, this.x + 4, this.y + 4); - client.getItemRenderer().renderInGui(this.itemStack, this.getX() + 4, this.getY() + 4); + client.getItemRenderer().renderInGui(matrices, this.itemStack, this.getX() + 4, this.getY() + 4); // client.getItemRenderer().renderGuiItemOverlay(client.textRenderer, itemStack, this.x + 4, this.y + 4); - client.getItemRenderer().renderGuiItemOverlay(client.textRenderer, itemStack, this.getX() + 4, this.getY() + 4); + client.getItemRenderer().renderGuiItemOverlay(matrices, client.textRenderer, itemStack, this.getX() + 4, this.getY() + 4); } public void renderTooltip(MatrixStack matrices, int mouseX, int mouseY) { 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 f35e60b2..ef0f2d06 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/quicknav/QuickNavButton.java @@ -87,17 +87,17 @@ public class QuickNavButton extends ClickableWidget { 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() + 5, this.getY() + 6); + CLIENT.getItemRenderer().renderInGui(matrices, this.icon,this.getX() + 5, this.getY() + 6); else // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9); - CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 5, this.getY() + 7); + CLIENT.getItemRenderer().renderInGui(matrices, this.icon,this.getX() + 5, this.getY() + 7); } else { if (this.index >= 6) // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 9); - CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 5, this.getY() + 9); + CLIENT.getItemRenderer().renderInGui(matrices, this.icon,this.getX() + 5, this.getY() + 9); else // CLIENT.getItemRenderer().renderInGui(this.icon,this.x + 6, this.y + 6); - CLIENT.getItemRenderer().renderInGui(this.icon,this.getX() + 5, this.getY() + 6); + CLIENT.getItemRenderer().renderInGui(matrices, this.icon,this.getX() + 5, this.getY() + 6); } RenderSystem.enableDepthTest(); } |