Skip to content

Commit

Permalink
tweaked/fixed most gui textures
Browse files Browse the repository at this point in the history
the refinery gui is gonna need to be fixed by a dev, I updated the texture but the ui itself is now offset because of it
  • Loading branch information
DMgaming100 committed Oct 6, 2024
1 parent a76fdc5 commit 1b36a7c
Show file tree
Hide file tree
Showing 14 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@

@Environment(EnvType.CLIENT)
public class FuelLoaderScreen extends MachineScreen<FuelLoaderBlockEntity, FuelLoaderMenu> {
public static final int RED_X_U = 176;
public static final int RED_X_V = 40;
public static final int RED_X_U = 190;
public static final int RED_X_V = 49;
public static final int RED_X_WIDTH = 11;
public static final int RED_X_HEIGHT = 11;

Expand Down Expand Up @@ -77,21 +77,21 @@ protected void renderMachineBackground(GuiGraphics graphics, int mouseX, int mou
graphics.blit(Constant.ScreenTexture.FUEL_LOADER_SCREEN, this.leftPos + 158, this.topPos + 72, RED_X_U, RED_X_V, RED_X_WIDTH, RED_X_HEIGHT);
}

GraphicsUtil.drawFluid(graphics, this.leftPos + 145, this.topPos + 29, ROCKET_FACE_WIDTH, ROCKET_FACE_HEIGHT, this.menu.rocketCapacity, FluidVariant.of(GCFluids.FUEL), this.menu.rocketAmount);
GraphicsUtil.drawFluid(graphics, this.leftPos + 145, this.topPos + 28, ROCKET_FACE_WIDTH, ROCKET_FACE_HEIGHT, this.menu.rocketCapacity, FluidVariant.of(GCFluids.FUEL), this.menu.rocketAmount);

if (!DrawableUtil.isWithin(mouseX, mouseY, this.leftPos + 145, this.topPos + 37, ROCKET_FACE_WIDTH, ROCKET_FACE_HEIGHT)) {
graphics.blit(Constant.ScreenTexture.FUEL_LOADER_SCREEN, this.leftPos + 145, this.topPos + 29, ROCKET_FACE_U, ROCKET_FACE_V, ROCKET_FACE_WIDTH, ROCKET_FACE_HEIGHT);
if (!DrawableUtil.isWithin(mouseX, mouseY, this.leftPos + 145, this.topPos + 28, ROCKET_FACE_WIDTH, ROCKET_FACE_HEIGHT)) {
graphics.blit(Constant.ScreenTexture.FUEL_LOADER_SCREEN, this.leftPos + 145, this.topPos + 28, ROCKET_FACE_U, ROCKET_FACE_V, ROCKET_FACE_WIDTH, ROCKET_FACE_HEIGHT);
}
}

@Override
public void renderTooltip(GuiGraphics graphics, int mouseX, int mouseY) {
super.renderTooltip(graphics, mouseX, mouseY);
List<Component> list = new ArrayList<>();
if (DrawableUtil.isWithin(mouseX, mouseY, this.leftPos + 69, this.topPos + 17, TANK_OVERLAY_WIDTH, TANK_OVERLAY_HEIGHT)) {
if (DrawableUtil.isWithin(mouseX, mouseY, this.leftPos + 69, this.topPos + 8, TANK_OVERLAY_WIDTH, TANK_OVERLAY_HEIGHT)) {
FluidResourceSlot slot = this.menu.fluidStorage.slot(FuelLoaderBlockEntity.FUEL_TANK);
DisplayUtil.createFluidTooltip(list, slot.getResource(), slot.getComponents(), slot.getAmount(), slot.getCapacity());
} else if (DrawableUtil.isWithin(mouseX, mouseY, this.leftPos + 145, this.topPos + 37, ROCKET_FACE_WIDTH, ROCKET_FACE_HEIGHT)) {
} else if (DrawableUtil.isWithin(mouseX, mouseY, this.leftPos + 145, this.topPos + 28, ROCKET_FACE_WIDTH, ROCKET_FACE_HEIGHT)) {
DisplayUtil.createFluidTooltip(list, GCFluids.FUEL, null, this.menu.rocketAmount, this.menu.rocketCapacity);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class ElectricFurnaceBlockEntity extends BasicRecipeMachineBlockEntity<Si
public static final StorageSpec SPEC = StorageSpec.of(
MachineItemStorage.spec(
ItemResourceSlot.builder(TransferType.TRANSFER)
.pos(8, 61)
.pos(8, 62)
.filter(ResourceFilters.CAN_EXTRACT_ENERGY),
ItemResourceSlot.builder(TransferType.INPUT)
.pos(52, 35),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public class OxygenSealerBlockEntity extends MachineBlockEntity {
),
MachineFluidStorage.spec(
FluidResourceSlot.builder(TransferType.INPUT)
.pos(30, 8)
.pos(31, 8)
.capacity(OxygenSealerBlockEntity.MAX_OXYGEN)
.filter(ResourceFilters.ofResource(Gases.OXYGEN))
)
Expand Down
Binary file modified src/main/resources/assets/galacticraft/textures/gui/chest_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/assets/galacticraft/textures/gui/chest_18.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/assets/galacticraft/textures/gui/chest_36.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/assets/galacticraft/textures/gui/chest_54.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/assets/galacticraft/textures/gui/rocket.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1b36a7c

Please sign in to comment.