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

here i come sanfrandisco

Browse Source
This commit is contained in:
Boblet 2026-07-08 15:15:31 +02:00
parent 93a3c91a5b
commit aff1d337ca
7 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/hbm/inventory/container/ContainerElectricFurnace.java
View File

@ -22,20 +22,20 @@ public class ContainerElectricFurnace extends Container {
diFurnace = tedf;
this.addSlotToContainer(new Slot(tedf, 0, 56, 53));
this.addSlotToContainer(new Slot(tedf, 1, 56, 17));
this.addSlotToContainer(new SlotSmelting(invPlayer.player, tedf, 2, 116, 35));
this.addSlotToContainer(new Slot(tedf, 0, 152, 54));
this.addSlotToContainer(new Slot(tedf, 1, 20, 35));
this.addSlotToContainer(new SlotSmelting(invPlayer.player, tedf, 2, 80, 35));
//Upgrades
this.addSlotToContainer(new SlotUpgrade(tedf, 3, 147, 34));
this.addSlotToContainer(new SlotUpgrade(tedf, 3, 111, 34));
for(int i = 0; i < 3; i++) {
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, 8 + j * 18, 104 + i * 18));
}
}
for(int i = 0; i < 9; i++) {
this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142));
this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 162));
}
}

2
src/main/java/com/hbm/inventory/container/ContainerPneumoStorageAccess.java
View File

@ -225,7 +225,7 @@ public class ContainerPneumoStorageAccess extends Container implements ICustomPa
held = slot.getStack().copy();
held.stackSize = 1;
}
if(held.stackSize <= 0) held = null;
if(held != null && held.stackSize <= 0) held = null;
this.player.inventory.setItemStack(held);
sendClickToServer(ClickType.RIGHT_CLICK, hash);
return null;

1
src/main/java/com/hbm/inventory/container/ContainerPneumoStorageMono.java
View File

@ -36,7 +36,6 @@ public class ContainerPneumoStorageMono extends ContainerBase {
if(index < 0 || index >= 3) {
return super.slotClick(index, button, mode, player);
}
Slot slot = this.getSlot(index);
TileEntityPneumoStorageMono mono = (TileEntityPneumoStorageMono) this.tile;

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

@ -23,7 +23,7 @@ public class GUIMachineElectricFurnace extends GuiInfoContainer {
diFurnace = tedf;
this.xSize = 176;
this.ySize = 166;
this.ySize = 186;
}
@Override
@ -62,18 +62,19 @@ public class GUIMachineElectricFurnace extends GuiInfoContainer {
diFurnace = (TileEntityMachineElectricFurnace) diFurnace.getWorldObj().getTileEntity(diFurnace.xCoord, diFurnace.yCoord, diFurnace.zCoord);
if(diFurnace.hasPower()) {
int i = (int)diFurnace.getPowerScaled(52);
drawTexturedModalRect(guiLeft + 20, guiTop + 69 - i, 200, 52 - i, 16, i);
int i = (int)diFurnace.getPowerScaled(34);
drawTexturedModalRect(guiLeft + 152, guiTop + 52 - i, 176, 64 - i, 16, i);
}
if(diFurnace.getWorldObj().getBlock(diFurnace.xCoord, diFurnace.yCoord, diFurnace.zCoord) == ModBlocks.machine_electric_furnace_on) {
drawTexturedModalRect(guiLeft + 56, guiTop + 35, 176, 0, 16, 16);
drawTexturedModalRect(guiLeft + 45, guiTop + 20, 192, 12, 18, 16);
drawTexturedModalRect(guiLeft + 45, guiTop + 47, 192, 36, 18, 16);
}
int j1 = diFurnace.getProgressScaled(24);
drawTexturedModalRect(guiLeft + 79, guiTop + 34, 176, 17, j1 + 1, 17);
int j1 = diFurnace.getProgressScaled(28);
drawTexturedModalRect(guiLeft + 43, guiTop + 36, 176, 0, j1, 12);
this.drawInfoPanel(guiLeft + 151, guiTop + 19, 8, 8, 8);
this.drawInfoPanel(guiLeft + 116, guiTop + 20, 8, 8, 8);
}
}

15
src/main/java/com/hbm/inventory/gui/GUIScreenRadioAUTOCAL.java
View File

@ -103,7 +103,7 @@ public class GUIScreenRadioAUTOCAL extends GuiScreen {
if(checkClick(x, y, 144, 36, 18, 18)) {
try {
File uploadFolder = new File(MainRegistry.configDir.getParentFile(), "hbmComputerUpload");
File doc = new File(uploadFolder, "documentation.md");
File doc = new File(uploadFolder, "documentation_v1.1.md");
if(!uploadFolder.exists()) uploadFolder.mkdir();
if(!doc.exists()) {
doc.createNewFile();
@ -127,18 +127,7 @@ public class GUIScreenRadioAUTOCAL extends GuiScreen {
script.setExecutable(false);
return;
}
/*FileReader reader = new FileReader(script);
BufferedReader buffer = new BufferedReader(reader);
String[] lines = buffer.lines().toArray(String[]::new);
buffer.close();
// this is going to blow the fuck up once we hit the max packet size, but let's ignore that for now
data = new NBTTagCompound();
StringBuilder builder = new StringBuilder();
for(int l = 0; l < lines.length; l++) {
builder.append(lines[i]);
if(l < lines.length - 1) builder.append("\n"); // yeah why the fuck not
}
data.setString("payload", builder.toString());*/
byte[] bytes = Files.readAllBytes(Paths.get(script.toURI()));
data = new NBTTagCompound();
data.setString("payload", new String(bytes, StandardCharsets.UTF_8));

2
src/main/java/com/hbm/render/tileentity/RenderLandmine.java
View File

@ -51,8 +51,10 @@ public class RenderLandmine extends TileEntitySpecialRenderer {
}
if(block == ModBlocks.mine_fat) {
GL11.glScaled(0.25D, 0.25D, 0.25D);
GL11.glShadeModel(GL11.GL_SMOOTH);
bindTexture(ResourceManager.mine_fat_tex);
ResourceManager.mine_fat.renderAll();
GL11.glShadeModel(GL11.GL_FLAT);
}
if(block == ModBlocks.mine_naval) {
GL11.glScaled(1D, 1D, 1D);

1
src/main/java/com/hbm/tileentity/network/TileEntityCraneExtractor.java
View File

@ -294,4 +294,3 @@ public class TileEntityCraneExtractor extends TileEntityCraneBase implements IGU
return new int[] {0, 9};
}
}