From 4024249becc8678339ec47bcb145bfd15aec91da Mon Sep 17 00:00:00 2001 From: Boblet Date: Tue, 21 Jan 2025 16:44:09 +0100 Subject: [PATCH] deplorable gollompus --- changelog | 3 +- .../container/ContainerPASource.java | 77 ++++++++++++++++++ .../com/hbm/inventory/gui/GUIPADipole.java | 6 +- .../com/hbm/inventory/gui/GUIPASource.java | 65 +++++++++++++++ src/main/java/com/hbm/qmaw/QMAWLoader.java | 2 - .../machine/albion/TileEntityPASource.java | 6 +- .../machine/storage/TileEntityCrateBase.java | 2 + .../gui/particleaccelerator/gui_detector.png | Bin 3383 -> 3373 bytes 8 files changed, 153 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/hbm/inventory/container/ContainerPASource.java create mode 100644 src/main/java/com/hbm/inventory/gui/GUIPASource.java diff --git a/changelog b/changelog index 58d91a5fb..438300216 100644 --- a/changelog +++ b/changelog @@ -14,4 +14,5 @@ * Fixed incorrect tooltip in the automatic control rod's GUI * Fixed recipe autogen creating recipes for nonexistant thorium bedrock ore * Fixed FBI agents spawning both the old and new bullet entities when firing -* Fixed dupe concerning one of the weapon abilities \ No newline at end of file +* Fixed dupe concerning one of the weapon abilities +* Fixed crates not sending a block update when the contents change, breaking redstone comparator functionality \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/container/ContainerPASource.java b/src/main/java/com/hbm/inventory/container/ContainerPASource.java new file mode 100644 index 000000000..90e01d5c4 --- /dev/null +++ b/src/main/java/com/hbm/inventory/container/ContainerPASource.java @@ -0,0 +1,77 @@ +package com.hbm.inventory.container; + +import com.hbm.inventory.SlotTakeOnly; +import com.hbm.items.ModItems; +import com.hbm.tileentity.machine.albion.TileEntityPASource; + +import api.hbm.energymk2.IBatteryItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerPASource extends Container { + + private TileEntityPASource source; + + public ContainerPASource(InventoryPlayer playerInv, TileEntityPASource tile) { + source = tile; + + //Battery + this.addSlotToContainer(new Slot(tile, 0, 8, 72)); + //Inouts + this.addSlotToContainer(new Slot(tile, 1, 62, 18)); + this.addSlotToContainer(new Slot(tile, 2, 80, 18)); + //Containers + this.addSlotToContainer(new SlotTakeOnly(tile, 3, 62, 45)); + this.addSlotToContainer(new SlotTakeOnly(tile, 4, 80, 45)); + + for(int i = 0; i < 3; i++) { + for(int j = 0; j < 9; j++) { + this.addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, 8 + j * 18, 122 + i * 18)); + } + } + + for(int i = 0; i < 9; i++) { + this.addSlotToContainer(new Slot(playerInv, i, 8 + i * 18, 180)); + } + } + + @Override + public boolean canInteractWith(EntityPlayer player) { + return source.isUseableByPlayer(player); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack rStack = null; + Slot slot = (Slot) this.inventorySlots.get(index); + + if(slot != null && slot.getHasStack()) { + ItemStack stack = slot.getStack(); + rStack = stack.copy(); + + if(index <= 5) { + if(!this.mergeItemStack(stack, 6, this.inventorySlots.size(), true)) { + return null; + } + } else { + + if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) { + if(!this.mergeItemStack(stack, 0, 1, false)) return null; + } else { + if(!this.mergeItemStack(stack, 1, 3, false)) return null; + } + } + + if(stack.stackSize == 0) { + slot.putStack((ItemStack) null); + } else { + slot.onSlotChanged(); + } + } + + return rStack; + } +} diff --git a/src/main/java/com/hbm/inventory/gui/GUIPADipole.java b/src/main/java/com/hbm/inventory/gui/GUIPADipole.java index 09920e519..ae4650f2f 100644 --- a/src/main/java/com/hbm/inventory/gui/GUIPADipole.java +++ b/src/main/java/com/hbm/inventory/gui/GUIPADipole.java @@ -18,9 +18,9 @@ public class GUIPADipole extends GuiInfoContainer { private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/particleaccelerator/gui_dipole.png"); private TileEntityPADipole dipole; - public GUIPADipole(InventoryPlayer player, TileEntityPADipole slopper) { - super(new ContainerPADipole(player, slopper)); - this.dipole = slopper; + public GUIPADipole(InventoryPlayer player, TileEntityPADipole dipole) { + super(new ContainerPADipole(player, dipole)); + this.dipole = dipole; this.xSize = 176; this.ySize = 204; diff --git a/src/main/java/com/hbm/inventory/gui/GUIPASource.java b/src/main/java/com/hbm/inventory/gui/GUIPASource.java new file mode 100644 index 000000000..667950c4f --- /dev/null +++ b/src/main/java/com/hbm/inventory/gui/GUIPASource.java @@ -0,0 +1,65 @@ + package com.hbm.inventory.gui; + +import org.lwjgl.opengl.GL11; + +import com.hbm.inventory.container.ContainerPASource; +import com.hbm.lib.RefStrings; +import com.hbm.tileentity.machine.albion.TileEntityPASource; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; + +public class GUIPASource extends GuiInfoContainer { + + private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/particleaccelerator/gui_source.png"); + private TileEntityPASource source; + + public GUIPASource(InventoryPlayer player, TileEntityPASource source) { + super(new ContainerPASource(player, source)); + this.source = source; + + this.xSize = 176; + this.ySize = 204; + } + + @Override + public void drawScreen(int mouseX, int mouseY, float f) { + super.drawScreen(mouseX, mouseY, f); + + source.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 36, 16, 52); + source.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 152, guiTop + 36, 16, 52); + this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 8, guiTop + 18, 16, 52, source.power, source.getMaxPower()); + } + + @Override + protected void drawGuiContainerForegroundLayer( int i, int j) { + + String name = this.source.hasCustomInventoryName() ? this.source.getInventoryName() : I18n.format(this.source.getInventoryName()); + this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2 - 9, 6, 4210752); + this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752); + + this.fontRendererObj.drawString(EnumChatFormatting.AQUA + "/123K", 136, 22, 4210752); + int heat = (int) Math.ceil(source.temperature); + String label = (heat > 123 ? EnumChatFormatting.RED : EnumChatFormatting.AQUA) + "" + heat + "K"; + this.fontRendererObj.drawString(label, 166 - this.fontRendererObj.getStringWidth(label), 12, 4210752); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float interp, int x, int y) { + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + Minecraft.getMinecraft().getTextureManager().bindTexture(texture); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + + int j = (int) (source.power * 52 / source.getMaxPower()); + drawTexturedModalRect(guiLeft + 8, guiTop + 70 - j, 184, 52 - j, 16, j); + + int heat = (int) Math.ceil(source.temperature); + if(heat <= 123) drawTexturedModalRect(guiLeft + 44, guiTop + 18, 176, 8, 8, 8); + + source.tanks[0].renderTank(guiLeft + 134, guiTop + 88, this.zLevel, 16, 52); + source.tanks[1].renderTank(guiLeft + 152, guiTop + 88, this.zLevel, 16, 52); + } +} diff --git a/src/main/java/com/hbm/qmaw/QMAWLoader.java b/src/main/java/com/hbm/qmaw/QMAWLoader.java index c181bb29f..955873a66 100644 --- a/src/main/java/com/hbm/qmaw/QMAWLoader.java +++ b/src/main/java/com/hbm/qmaw/QMAWLoader.java @@ -3,8 +3,6 @@ package com.hbm.qmaw; import java.io.File; import java.io.InputStream; import java.io.InputStreamReader; -import java.net.URL; -import java.security.CodeSource; import java.util.HashMap; import java.util.HashSet; import java.util.zip.ZipEntry; diff --git a/src/main/java/com/hbm/tileentity/machine/albion/TileEntityPASource.java b/src/main/java/com/hbm/tileentity/machine/albion/TileEntityPASource.java index c4937c86b..6a4f5fe30 100644 --- a/src/main/java/com/hbm/tileentity/machine/albion/TileEntityPASource.java +++ b/src/main/java/com/hbm/tileentity/machine/albion/TileEntityPASource.java @@ -1,5 +1,7 @@ package com.hbm.tileentity.machine.albion; +import com.hbm.inventory.container.ContainerPASource; +import com.hbm.inventory.gui.GUIPASource; import com.hbm.tileentity.IGUIProvider; import com.hbm.util.fauxpointtwelve.DirPos; @@ -60,11 +62,11 @@ public class TileEntityPASource extends TileEntityCooledBase implements IGUIProv @Override public Container provideContainer(int ID, EntityPlayer player, World world, int x, int y, int z) { - return null; + return new ContainerPASource(player.inventory, this); } @Override public Object provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) { - return null; + return new GUIPASource(player.inventory, this); } } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateBase.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateBase.java index 3bdf405c2..5e40a51c5 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateBase.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityCrateBase.java @@ -45,6 +45,7 @@ public abstract class TileEntityCrateBase extends TileEntityLockableBase impleme if (itemStack != null && itemStack.stackSize > getInventoryStackLimit()) { itemStack.stackSize = getInventoryStackLimit(); } + this.markDirty(); } @Override @@ -98,6 +99,7 @@ public abstract class TileEntityCrateBase extends TileEntityLockableBase impleme slots[i] = null; } + this.markDirty(); return itemStack1; } else { return null; diff --git a/src/main/resources/assets/hbm/textures/gui/particleaccelerator/gui_detector.png b/src/main/resources/assets/hbm/textures/gui/particleaccelerator/gui_detector.png index dad73a5535a8f941658ef849642044fd2956c05b..db202f440ad100d190a4016b8a96313fc212b069 100644 GIT binary patch literal 3373 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 I8xn5*4Goj}QUCw|