Updates to textures #48

Merged
BlakeRain merged 22 commits from Jah/utamacraft:main into main 2023-12-29 22:55:24 +00:00
19 changed files with 11 additions and 11 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 970 B

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 974 B

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -36,9 +36,9 @@ public class InsolatorMenu extends AbstractContainerMenu {
addPlayerInventory(inventory); addPlayerInventory(inventory);
this.blockEntity.getCapability(ForgeCapabilities.ITEM_HANDLER).ifPresent(handler -> { this.blockEntity.getCapability(ForgeCapabilities.ITEM_HANDLER).ifPresent(handler -> {
this.addSlot(new SlotItemHandler(handler, 0, 78, 14)); this.addSlot(new SlotItemHandler(handler, 0, 78, 10));
this.addSlot(new SlotItemHandler(handler, 1, 152, 14)); this.addSlot(new SlotItemHandler(handler, 1, 152, 10));
this.addSlot(new SlotItemHandler(handler, 2, 152, 59)); this.addSlot(new SlotItemHandler(handler, 2, 152, 55));
}); });
} else { } else {
throw new IllegalArgumentException("Block entity must be an InsolatorBlockEntity"); throw new IllegalArgumentException("Block entity must be an InsolatorBlockEntity");
@ -102,14 +102,14 @@ public class InsolatorMenu extends AbstractContainerMenu {
private void addPlayerInventory(Inventory inventory) { private void addPlayerInventory(Inventory inventory) {
for (int row = 0; row < PLAYER_INVENTORY_ROW_COUNT; ++row) { for (int row = 0; row < PLAYER_INVENTORY_ROW_COUNT; ++row) {
for (int col = 0; col < PLAYER_INVENTORY_COLUMN_COUNT; ++col) { for (int col = 0; col < PLAYER_INVENTORY_COLUMN_COUNT; ++col) {
this.addSlot(new Slot(inventory, col + row * 9 + 9, 8 + col * 18, 86 + row * 18)); this.addSlot(new Slot(inventory, col + row * 9 + 9, 8 + col * 18, 82 + row * 18));
} }
} }
} }
private void addPlayerHotbar(Inventory inventory) { private void addPlayerHotbar(Inventory inventory) {
for (int slot = 0; slot < HOTBAR_SLOT_COUNT; ++slot) { for (int slot = 0; slot < HOTBAR_SLOT_COUNT; ++slot) {
this.addSlot(new Slot(inventory, slot, 8 + slot * 18, 144)); this.addSlot(new Slot(inventory, slot, 8 + slot * 18, 140));
} }
} }
} }

View File

@ -48,7 +48,7 @@ public class InsolatorScreen extends AbstractContainerScreen<InsolatorMenu> {
topPos = (height - imageHeight) / 2; topPos = (height - imageHeight) / 2;
dumpButton = addRenderableWidget(new Button( dumpButton = addRenderableWidget(new Button(
leftPos + 8, topPos + 56, leftPos + 8, topPos + 52,
60, 20, DUMP_BUTTON, this::onDumpPress, 60, 20, DUMP_BUTTON, this::onDumpPress,
(button, stack, mouseX, mouseY) -> { (button, stack, mouseX, mouseY) -> {
if (menu.getBlockEntity().getFluidTank().getFluid().getAmount() <= 0) { if (menu.getBlockEntity().getFluidTank().getFluid().getAmount() <= 0) {
@ -68,8 +68,8 @@ public class InsolatorScreen extends AbstractContainerScreen<InsolatorMenu> {
blit(stack, leftPos, topPos, 0, 0, imageWidth, imageHeight); blit(stack, leftPos, topPos, 0, 0, imageWidth, imageHeight);
renderBulb(stack); renderBulb(stack);
renderProgressArrow(stack); renderProgressArrow(stack);
renderFluid(stack, leftPos + 99, topPos + 15); renderFluid(stack, leftPos + 99, topPos + 11);
renderEnergy(stack, leftPos + 112, topPos + 15); renderEnergy(stack, leftPos + 112, topPos + 11);
} }
@Override @Override
@ -78,14 +78,14 @@ public class InsolatorScreen extends AbstractContainerScreen<InsolatorMenu> {
int y = (height - imageHeight) / 2; int y = (height - imageHeight) / 2;
if (MouseUtils.isMouseOver(pMouseX, pMouseY, x + 98, y + 14, 11, 62)) { if (MouseUtils.isMouseOver(pMouseX, pMouseY, x + 98, y + 10, 11, 62)) {
FluidTank tank = menu.getBlockEntity().getFluidTank(); FluidTank tank = menu.getBlockEntity().getFluidTank();
List<Component> components = TooltipUtils.getFluidTooltip(tank.getFluid(), 64000); List<Component> components = TooltipUtils.getFluidTooltip(tank.getFluid(), 64000);
renderTooltip(pPoseStack, components, Optional.empty(), renderTooltip(pPoseStack, components, Optional.empty(),
pMouseX - x, pMouseY - y); pMouseX - x, pMouseY - y);
} }
if (MouseUtils.isMouseOver(pMouseX, pMouseY, x + 111, y + 14, 11, 62)) { if (MouseUtils.isMouseOver(pMouseX, pMouseY, x + 111, y + 10, 11, 62)) {
EnergyStorage energy = menu.getBlockEntity().getEnergy(); EnergyStorage energy = menu.getBlockEntity().getEnergy();
List<Component> components = TooltipUtils.getEnergyTooltip(energy.getEnergyStored(), energy.getMaxEnergyStored()); List<Component> components = TooltipUtils.getEnergyTooltip(energy.getEnergyStored(), energy.getMaxEnergyStored());
renderTooltip(pPoseStack, components, Optional.empty(), pMouseX - x, pMouseY - y); renderTooltip(pPoseStack, components, Optional.empty(), pMouseX - x, pMouseY - y);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 970 B

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 974 B

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB