By order from [message has deleted]

This commit is contained in:
TheVitya2127 2026-07-20 10:57:25 +04:00
parent 34cc10d7a0
commit cd1455cebc
4 changed files with 50 additions and 44 deletions

View File

@ -162,7 +162,7 @@ public class RefineryRecipeHandler extends TemplateRecipeHandler implements ICom
guiGui = new LinkedList<Class<? extends GuiContainer>>(); guiGui = new LinkedList<Class<? extends GuiContainer>>();
transferRects.add(new RecipeTransferRect(new Rectangle(138 - 1 - 36 - 27, 23, 36, 18), "refinery")); transferRects.add(new RecipeTransferRect(new Rectangle(138 - 1 - 36 - 27, 23, 36, 18), "refinery"));
transferRectsGui.add(new RecipeTransferRect(new Rectangle(24, 16, 31, 36), "refinery")); transferRectsGui.add(new RecipeTransferRect(new Rectangle(48, 5, 31, 101), "refinery"));
guiGui.add(GUIMachineRefinery.class); guiGui.add(GUIMachineRefinery.class);
RecipeTransferRectHandler.registerRectsToGuis(getRecipeTransferRectGuis(), transferRects); RecipeTransferRectHandler.registerRectsToGuis(getRecipeTransferRectGuis(), transferRects);
RecipeTransferRectHandler.registerRectsToGuis(guiGui, transferRectsGui); RecipeTransferRectHandler.registerRectsToGuis(guiGui, transferRectsGui);

View File

@ -19,40 +19,40 @@ public class ContainerMachineRefinery extends Container {
testNuke = tedf; testNuke = tedf;
//Battery //Battery
this.addSlotToContainer(new Slot(tedf, 0, 160, 90)); this.addSlotToContainer(new Slot(tedf, 0, 186, 72));
//Canister Input //Canister Input
this.addSlotToContainer(new Slot(tedf, 1, 12, 72)); this.addSlotToContainer(new Slot(tedf, 1, 8, 99));
//Canister Output //Canister Output
this.addSlotToContainer(new SlotTakeOnly(tedf, 2, 12, 90)); this.addSlotToContainer(new SlotTakeOnly(tedf, 2, 8, 119));
//Heavy Oil Input //Heavy Oil Input
this.addSlotToContainer(new Slot(tedf, 3, 66, 72)); this.addSlotToContainer(new Slot(tedf, 3, 86, 99));
//Heavy Oil Output //Heavy Oil Output
this.addSlotToContainer(new SlotTakeOnly(tedf, 4, 66, 90)); this.addSlotToContainer(new SlotTakeOnly(tedf, 4, 86, 119));
//Naphtha Input //Naphtha Input
this.addSlotToContainer(new Slot(tedf, 5, 84, 72)); this.addSlotToContainer(new Slot(tedf, 5, 106, 99));
//Naphtha Output //Naphtha Output
this.addSlotToContainer(new SlotTakeOnly(tedf, 6, 84, 90)); this.addSlotToContainer(new SlotTakeOnly(tedf, 6, 106, 119));
//Light Oil Input //Light Oil Input
this.addSlotToContainer(new Slot(tedf, 7, 102, 72)); this.addSlotToContainer(new Slot(tedf, 7, 126, 99));
//Light Oil Output //Light Oil Output
this.addSlotToContainer(new SlotTakeOnly(tedf, 8, 102, 90)); this.addSlotToContainer(new SlotTakeOnly(tedf, 8, 126, 119));
//Petroleum Input //Petroleum Input
this.addSlotToContainer(new Slot(tedf, 9, 120, 72)); this.addSlotToContainer(new Slot(tedf, 9, 146, 99));
//Petroleum Output //Petroleum Output
this.addSlotToContainer(new SlotTakeOnly(tedf, 10, 120, 90)); this.addSlotToContainer(new SlotTakeOnly(tedf, 10, 146, 119));
//Sulfur Output //Sulfur Output
this.addSlotToContainer(new SlotTakeOnly(tedf, 11, 38, 72)); this.addSlotToContainer(new SlotTakeOnly(tedf, 11, 58, 119));
//Fluid ID //Fluid ID
this.addSlotToContainer(new Slot(tedf, 12, 38, 90)); this.addSlotToContainer(new Slot(tedf, 12, 186, 106));
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, 12 + j * 18, 140 + i * 18)); this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 150 + i * 18));
} }
} }
for(int i = 0; i < 9; i++) { for(int i = 0; i < 9; i++) {
this.addSlotToContainer(new Slot(invPlayer, i, 12 + i * 18, 198)); this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 208));
} }
} }

View File

@ -26,47 +26,53 @@ public class GUIMachineRefinery extends GuiInfoContainer {
super(new ContainerMachineRefinery(invPlayer, tedf)); super(new ContainerMachineRefinery(invPlayer, tedf));
refinery = tedf; refinery = tedf;
this.xSize = 184; this.xSize = 210;
this.ySize = 222; this.ySize = 231;
} }
@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);
refinery.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 12, guiTop + 17, 16, 52); // Render tooltip for column. refinery.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 30, guiTop + 27, 21, 104); // Render tooltip for column.
refinery.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 66, guiTop + 17, 16, 52); refinery.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 86, guiTop + 42, 16, 52);
refinery.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 84, guiTop + 17, 16, 52); refinery.tanks[2].renderTankInfo(this, mouseX, mouseY, guiLeft + 106, guiTop + 42, 16, 52);
refinery.tanks[3].renderTankInfo(this, mouseX, mouseY, guiLeft + 102, guiTop + 17, 16, 52); refinery.tanks[3].renderTankInfo(this, mouseX, mouseY, guiLeft + 126, guiTop + 42, 16, 52);
refinery.tanks[4].renderTankInfo(this, mouseX, mouseY, guiLeft + 120, guiTop + 17, 16, 52); refinery.tanks[4].renderTankInfo(this, mouseX, mouseY, guiLeft + 146, guiTop + 42, 16, 52);
this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 160, guiTop + 18, 16, 70, refinery.power, refinery.maxPower); this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 186, guiTop + 18, 16, 52, refinery.power, refinery.maxPower);
} }
@Override @Override
protected void drawGuiContainerForegroundLayer(int i, int j) { protected void drawGuiContainerForegroundLayer(int i, int j) {
String name = this.refinery.hasCustomInventoryName() ? this.refinery.getInventoryName() : I18n.format(this.refinery.getInventoryName()); String name = this.refinery.hasCustomInventoryName() ? this.refinery.getInventoryName() : I18n.format(this.refinery.getInventoryName());
this.fontRendererObj.drawString(name, this.xSize / 2 - 36 / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752); this.fontRendererObj.drawString(name, this.xSize / 2 - 34/2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
this.fontRendererObj.drawString(I18n.format("container.inventory"), 12, this.ySize - 96 + 4, 4210752); this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 4, 4210752);
} }
@Override @Override
protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
Minecraft.getMinecraft().getTextureManager().bindTexture(texture); Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); func_146110_a(guiLeft, guiTop, 0, 0, xSize, ySize, 350, 256);
// power // power
int j = (int)refinery.getPowerScaled(70); int j = (int)refinery.getPowerScaled(50);
drawTexturedModalRect(guiLeft + 160, guiTop + 88 - j, 184, 70 - j, 16, j); func_146110_a(guiLeft + 186, guiTop + 69 - j, 210, 52 - j, 16, j, 350, 256);
OpenGlHelper.glBlendFunc(770, 771, 1, 0); // default OpenGlHelper.glBlendFunc(770, 771, 1, 0); // default
// input tank // input tank
FluidTank inputOil = refinery.tanks[0]; FluidTank inputOil = refinery.tanks[0];
if (inputOil.getFill() != 0) { if (inputOil.getFill() != 0) {
refinery.tanks[0].renderTank(guiLeft + 12, guiTop + 70, this.zLevel, 16, 52);
Minecraft.getMinecraft().getTextureManager().bindTexture(texture); int targetHeight = inputOil.getFill() * 101 / inputOil.getMaxFill();
Color color = new Color(inputOil.getTankType().getColor());
GL11.glEnable(GL11.GL_BLEND);
GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F);
func_146110_a(guiLeft + 33, guiTop + 130 - targetHeight, 226, 101 - targetHeight, 16, targetHeight, 350, 256);
GL11.glDisable(GL11.GL_BLEND);
} }
// fucking kgjhgdfjgdhjfg // fucking kgjhgdfjgdhjfg
@ -74,14 +80,14 @@ public class GUIMachineRefinery extends GuiInfoContainer {
// 350x256 texture by behated (the pipes wouldn't fit) // 350x256 texture by behated (the pipes wouldn't fit)
// pipes // pipes
RefineryRecipe recipe = RefineryRecipes.getRefinery(inputOil.getTankType()); RefineryRecipe recipe = RefineryRecipes.getRefinery(inputOil.getTankType());
if(recipe == null) { if(recipe == null) {
func_146110_a(guiLeft + 60, guiTop + 54, 184, 104, 6, 2, 256, 256); func_146110_a(guiLeft + 52, guiTop + 63, 247, 1, 33, 48, 350, 256);
func_146110_a(guiLeft + 60, guiTop + 47, 184, 97, 24, 2, 256, 256); func_146110_a(guiLeft + 52, guiTop + 32, 247, 50, 66, 52, 350, 256);
func_146110_a(guiLeft + 60, guiTop + 40, 184, 90, 42, 2, 256, 256); func_146110_a(guiLeft + 52, guiTop + 24, 247, 145, 86, 35, 350, 256);
func_146110_a(guiLeft + 60, guiTop + 33, 184, 83, 60, 2, 256, 256); func_146110_a(guiLeft + 36, guiTop + 16, 211, 119, 122, 25, 350, 256);
} else { } else {
// Heavy Oil Products // Heavy Oil Products
@ -89,31 +95,31 @@ public class GUIMachineRefinery extends GuiInfoContainer {
GL11.glEnable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_BLEND);
GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F);
func_146110_a(guiLeft + 60, guiTop + 54, 184, 104, 6, 2, 256, 256); func_146110_a(guiLeft + 52, guiTop + 63, 247, 1, 33, 48, 350, 256);
// Naphtha Oil Products // Naphtha Oil Products
color = new Color(recipe.outputs[1].type.getColor()); color = new Color(recipe.outputs[1].type.getColor());
GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F);
func_146110_a(guiLeft + 60, guiTop + 47, 184, 97, 24, 2, 256, 256); func_146110_a(guiLeft + 52, guiTop + 32, 247, 50, 66, 52, 350, 256);
// Light Oil Products // Light Oil Products
color = new Color(recipe.outputs[2].type.getColor()); color = new Color(recipe.outputs[2].type.getColor());
GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F);
func_146110_a(guiLeft + 60, guiTop + 40, 184, 90, 42, 2, 256, 256); func_146110_a(guiLeft + 52, guiTop + 24, 247, 145, 86, 35, 350, 256);
// Gaseous Products // Gaseous Products
color = new Color(recipe.outputs[3].type.getColor()); color = new Color(recipe.outputs[3].type.getColor());
GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F); GL11.glColor4f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, 1F);
func_146110_a(guiLeft + 60, guiTop + 33, 184, 83, 60, 2, 256, 256); func_146110_a(guiLeft + 36, guiTop + 16, 211, 119, 122, 25, 350, 256);
GL11.glDisable(GL11.GL_BLEND); GL11.glDisable(GL11.GL_BLEND);
GL11.glColor4f(1F, 1F, 1F, 1F); GL11.glColor4f(1F, 1F, 1F, 1F);
} }
// output tanks // output tanks
refinery.tanks[1].renderTank(guiLeft + 66, guiTop + 70, this.zLevel, 16, 52); refinery.tanks[1].renderTank(guiLeft + 86, guiTop + 95, this.zLevel, 16, 52);
refinery.tanks[2].renderTank(guiLeft + 84, guiTop + 70, this.zLevel, 16, 52); refinery.tanks[2].renderTank(guiLeft + 106, guiTop + 95, this.zLevel, 16, 52);
refinery.tanks[3].renderTank(guiLeft + 102, guiTop + 70, this.zLevel, 16, 52); refinery.tanks[3].renderTank(guiLeft + 126, guiTop + 95, this.zLevel, 16, 52);
refinery.tanks[4].renderTank(guiLeft + 120, guiTop + 70, this.zLevel, 16, 52); refinery.tanks[4].renderTank(guiLeft + 146, guiTop + 95, this.zLevel, 16, 52);
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB