xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-08-10 17:55:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3022 from TheVitya2127/welloni

Browse Source 
New Oil Derrick GUI
This commit is contained in:
HbmMods 2026-07-17 08:06:15 +02:00 committed by GitHub
commit a285d8e1b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/hbm/inventory/container/ContainerMachineOilWell.java
View File

@ -19,28 +19,27 @@ public class ContainerMachineOilWell extends Container {
well = tedf; well = tedf;
// Battery // Battery
this.addSlotToContainer(new Slot(tedf, 0, 8, 53)); this.addSlotToContainer(new Slot(tedf, 0, 8, 58));
// Canister Input // Canister Input
this.addSlotToContainer(new Slot(tedf, 1, 80, 17)); this.addSlotToContainer(new Slot(tedf, 1, 94, 22));
// Canister Output // Canister Output
this.addSlotToContainer(new SlotTakeOnly(tedf, 2, 80, 53)); this.addSlotToContainer(new SlotTakeOnly(tedf, 2, 94, 58));
// Gas Input // Gas Input
this.addSlotToContainer(new Slot(tedf, 3, 125, 17)); this.addSlotToContainer(new Slot(tedf, 3, 130, 22));
// Gas Output // Gas Output
this.addSlotToContainer(new SlotTakeOnly(tedf, 4, 125, 53)); this.addSlotToContainer(new SlotTakeOnly(tedf, 4, 130, 58));
//Upgrades //Upgrades
this.addSlotToContainer(new Slot(tedf, 5, 152, 17)); this.addSlotToContainer(new Slot(tedf, 5, 156, 36));
this.addSlotToContainer(new Slot(tedf, 6, 152, 35)); this.addSlotToContainer(new Slot(tedf, 6, 156, 54));
this.addSlotToContainer(new Slot(tedf, 7, 152, 53));
for(int i = 0; i < 3; i++) { for(int i = 0; i < 3; i++) {
for(int j = 0; j < 9; j++) { for(int j = 0; j < 9; j++) {
this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 12 + j * 18, 108 + i * 18));
} }
} }
for(int i = 0; i < 9; i++) { for(int i = 0; i < 9; i++) {
this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142)); this.addSlotToContainer(new Slot(invPlayer, i, 12 + i * 18, 166));
} }
} }

2
src/main/java/com/hbm/inventory/gui/GUIMachineElectricFurnace.java
View File

@ -36,7 +36,7 @@ public class GUIMachineElectricFurnace extends GuiInfoContainer {
upgradeText[0] = I18nUtil.resolveKey("desc.gui.upgrade"); upgradeText[0] = I18nUtil.resolveKey("desc.gui.upgrade");
upgradeText[1] = I18nUtil.resolveKey("desc.gui.upgrade.speed"); upgradeText[1] = I18nUtil.resolveKey("desc.gui.upgrade.speed");
upgradeText[2] = I18nUtil.resolveKey("desc.gui.upgrade.power"); upgradeText[2] = I18nUtil.resolveKey("desc.gui.upgrade.power");
this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 116, guiTop + 20, 8, 8, mouseX, mouseY, upgradeText); this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 115, guiTop + 19, 8, 8, mouseX, mouseY, upgradeText);
} }
@Override @Override

32
src/main/java/com/hbm/inventory/gui/GUIMachineOilWell.java
View File

@ -21,19 +21,19 @@ public class GUIMachineOilWell extends GuiInfoContainer {
super(new ContainerMachineOilWell(invPlayer, tedf)); super(new ContainerMachineOilWell(invPlayer, tedf));
derrick = tedf; derrick = tedf;
this.xSize = 176; this.xSize = 184;
this.ySize = 166; this.ySize = 190;
} }
@Override @Override
public void drawScreen(int mouseX, int mouseY, float f) { public void drawScreen(int mouseX, int mouseY, float f) {
super.drawScreen(mouseX, mouseY, f); super.drawScreen(mouseX, mouseY, f);
derrick.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 62, guiTop + 69 - 52, 16, 52); derrick.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 76, guiTop + 74 - 52, 16, 52);
derrick.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 107, guiTop + 69 - 52, 16, 52); derrick.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 112, guiTop + 74 - 52, 16, 52);
if(derrick.tanks.length >= 3) { if(derrick.tanks.length >= 3) {
derrick.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 40, guiTop + 37, 6, 32); derrick.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 54, guiTop + 45, 6, 32);
} }
String[] upgradeText = new String[4]; String[] upgradeText = new String[4];
@ -41,17 +41,17 @@ public class GUIMachineOilWell extends GuiInfoContainer {
upgradeText[1] = I18nUtil.resolveKey("desc.gui.upgrade.speed"); upgradeText[1] = I18nUtil.resolveKey("desc.gui.upgrade.speed");
upgradeText[2] = I18nUtil.resolveKey("desc.gui.upgrade.power"); upgradeText[2] = I18nUtil.resolveKey("desc.gui.upgrade.power");
upgradeText[3] = I18nUtil.resolveKey("desc.gui.upgrade.afterburner"); upgradeText[3] = I18nUtil.resolveKey("desc.gui.upgrade.afterburner");
this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 156, guiTop + 3, 8, 8, mouseX, mouseY, upgradeText); this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 160, guiTop + 21, 8, 8, mouseX, mouseY, upgradeText);
this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 17, 16, 34, derrick.power, derrick.getMaxPower()); this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 22, 16, 34, derrick.power, derrick.getMaxPower());
} }
@Override @Override
protected void drawGuiContainerForegroundLayer( int i, int j) { protected void drawGuiContainerForegroundLayer( int i, int j) {
String name = this.derrick.hasCustomInventoryName() ? this.derrick.getInventoryName() : I18n.format(this.derrick.getInventoryName()); String name = this.derrick.hasCustomInventoryName() ? this.derrick.getInventoryName() : I18n.format(this.derrick.getInventoryName());
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); this.fontRendererObj.drawString(name, 126 - this.fontRendererObj.getStringWidth(name) / 2, 10, 4210752);
this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory"), 12, this.ySize - 96 + 2, 4210752);
} }
@Override @Override
@ -61,24 +61,24 @@ public class GUIMachineOilWell extends GuiInfoContainer {
drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
int i = (int)(derrick.getPower() * 34 / derrick.getMaxPower()); int i = (int)(derrick.getPower() * 34 / derrick.getMaxPower());
drawTexturedModalRect(guiLeft + 8, guiTop + 51 - i, 176, 34 - i, 16, i); drawTexturedModalRect(guiLeft + 8, guiTop + 56 - i, 184, 34 - i, 16, i);
int k = derrick.indicator; int k = derrick.indicator;
if(k != 0) if(k != 0)
drawTexturedModalRect(guiLeft + 35, guiTop + 17, 176 + (k - 1) * 16, 52, 16, 16); drawTexturedModalRect(guiLeft + 50, guiTop + 19, 184 + (k - 1) * 14, 34, 14, 14);
if(derrick.tanks.length < 3) { if(derrick.tanks.length < 3) {
drawTexturedModalRect(guiLeft + 34, guiTop + 36, 192, 0, 18, 34); drawTexturedModalRect(guiLeft + 48, guiTop + 44, 200, 0, 18, 34);
} }
derrick.tanks[0].renderTank(guiLeft + 62, guiTop + 69, this.zLevel, 16, 52); derrick.tanks[0].renderTank(guiLeft + 76, guiTop + 74, this.zLevel, 16, 52);
derrick.tanks[1].renderTank(guiLeft + 107, guiTop + 69, this.zLevel, 16, 52); derrick.tanks[1].renderTank(guiLeft + 112, guiTop + 74, this.zLevel, 16, 52);
if(derrick.tanks.length > 2) { if(derrick.tanks.length > 2) {
derrick.tanks[2].renderTank(guiLeft + 40, guiTop + 69, this.zLevel, 6, 32); derrick.tanks[2].renderTank(guiLeft + 54, guiTop + 77, this.zLevel, 6, 32);
} }
this.drawInfoPanel(guiLeft + 156, guiTop + 3, 8, 8, 8); this.drawInfoPanel(guiLeft + 160, guiTop + 21, 8, 8, 8);
} }
} }

2
src/main/resources/assets/hbm/lang/en_US.lang
View File

@ -669,7 +669,7 @@ container.factoryTitanium=Basic Factory
container.fluidtank=Tank container.fluidtank=Tank
container.fileCabinet=Filing Cabinet container.fileCabinet=Filing Cabinet
container.forceField=Forcefield Emitter container.forceField=Forcefield Emitter
container.frackingTower=Hydraulic Fracking Tower container.frackingTower=H.F.T.
container.furnaceBrick=Bricked Furnace container.furnaceBrick=Bricked Furnace
container.furnaceCombination=Combination Oven container.furnaceCombination=Combination Oven
container.furnaceIron=Iron Furnace container.furnaceIron=Iron Furnace

BIN
src/main/resources/assets/hbm/textures/gui/machine/gui_well.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB