From ae21012d216df71f31aed6fbc9d76215fc24ceed Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 4 Mar 2017 12:58:47 +1000 Subject: + New texture for the slow builders ring. + Added the Alkalus Disk. $ Fixed Frame Box Assembler Recipes. $ Fixed Missing 7Li material. $ Fixed Tiered Tanks not showing their capacity in the tooltip. $ Fixed tooltips for alloys containing Bronze or Steel. $ Fixed Clay Pipe Extruder Recipes. - Removed a handful of Plasma cells for misc. materials. % Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements. % Cleaned up The Entire Project. --- .../bees/alveary/gui/CONTAINER_FrameHousing.java | 38 ++++++------ .../bees/alveary/gui/GUI_FrameHousing.java | 70 +++++++++++----------- .../bees/alveary/gui/InventoryFrameHousing.java | 51 ++++++++-------- 3 files changed, 79 insertions(+), 80 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui') diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java index 5e218667f6..b1c94ddc47 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/CONTAINER_FrameHousing.java @@ -13,7 +13,7 @@ import net.minecraft.util.ResourceLocation; public class CONTAINER_FrameHousing extends Container { - private TileAlvearyFrameHousing te; + private final TileAlvearyFrameHousing te; public static final int INPUT_1 = 0; private final ResourceLocation beeFrameIcon = new ResourceLocation(CORE.MODID, "textures/items/machine_Charger.png"); @@ -22,58 +22,58 @@ public class CONTAINER_FrameHousing extends Container private int slotID = 0; - public CONTAINER_FrameHousing(TileAlvearyFrameHousing te, EntityPlayer player) + public CONTAINER_FrameHousing(final TileAlvearyFrameHousing te, final EntityPlayer player) { this.te = te; - this.beeFrameSlot = new SlotFrame(te, slotID++, 80, 35); + this.beeFrameSlot = new SlotFrame(te, this.slotID++, 80, 35); //Fuel Slot A - beeFrameSlot.setBackgroundIconTexture(beeFrameIcon); - - addSlotToContainer(beeFrameSlot); + this.beeFrameSlot.setBackgroundIconTexture(this.beeFrameIcon); + + this.addSlotToContainer(this.beeFrameSlot); //Inventory for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + this.addSlotToContainer(new Slot(player.inventory, j + (i * 9) + 9, 8 + (j * 18), 84 + (i * 18))); } } // Hotbar for (int i = 0; i < 9; i++) { - addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142)); + this.addSlotToContainer(new Slot(player.inventory, i, 8 + (i * 18), 142)); } } @Override - public ItemStack transferStackInSlot(EntityPlayer player, int slotRaw) + public ItemStack transferStackInSlot(final EntityPlayer player, final int slotRaw) { ItemStack stack = null; - Slot slot = (Slot)inventorySlots.get(slotRaw); + final Slot slot = (Slot)this.inventorySlots.get(slotRaw); - if (slot != null && slot.getHasStack()) + if ((slot != null) && slot.getHasStack()) { - ItemStack stackInSlot = slot.getStack(); + final ItemStack stackInSlot = slot.getStack(); stack = stackInSlot.copy(); - - + + //If your inventory only stores certain instances of Items, //you can implement shift-clicking to your inventory like this: // Check that the item is the right type if (!(stack.getItem() instanceof IHiveFrame)){ - return null; + return null; } if (slotRaw < 1) { - if (!mergeItemStack(stackInSlot, 3 * 9, inventorySlots.size(), true)) + if (!this.mergeItemStack(stackInSlot, 3 * 9, this.inventorySlots.size(), true)) { return null; } } - else if (!mergeItemStack(stackInSlot, 0, 3 * 9, false)) + else if (!this.mergeItemStack(stackInSlot, 0, 3 * 9, false)) { return null; } @@ -91,8 +91,8 @@ public class CONTAINER_FrameHousing extends Container } @Override - public boolean canInteractWith(EntityPlayer player) + public boolean canInteractWith(final EntityPlayer player) { - return te.isUseableByPlayer(player); + return this.te.isUseableByPlayer(player); } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/GUI_FrameHousing.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/GUI_FrameHousing.java index dcf8da3a1a..869a77f92d 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/GUI_FrameHousing.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/GUI_FrameHousing.java @@ -1,5 +1,7 @@ package gtPlusPlus.xmod.forestry.bees.alveary.gui; +import org.lwjgl.opengl.GL11; + import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.forestry.bees.alveary.TileAlvearyFrameHousing; import net.minecraft.client.Minecraft; @@ -9,41 +11,39 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - public class GUI_FrameHousing extends GuiContainer { - private ResourceLocation texture = new ResourceLocation(CORE.MODID, "textures/gui/machine_Charger.png"); - - private InventoryPlayer inventory; - private TileAlvearyFrameHousing te; - - public GUI_FrameHousing(TileAlvearyFrameHousing te, EntityPlayer player) - { - super(new CONTAINER_FrameHousing(te, player)); - inventory = player.inventory; - this.te = te; - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) - { - Minecraft.getMinecraft().renderEngine.bindTexture(texture); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - int x = (width - xSize) / 2; - int y = (height - ySize) / 2; - - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); - } - - @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) - { - fontRendererObj.drawString(I18n.format("Alveary Frame Housing"), (xSize / 2) - (fontRendererObj.getStringWidth(I18n.format("Alveary Frame Housing")) / 2), 6, 4210752, false); - fontRendererObj.drawString(I18n.format(inventory.getInventoryName()), 8, ySize - 96 + 2, 4210752); - //fontRendererObj.drawString(I18n.format("Charge:"+te.getCharge()+"~"), 8, ySize - 96 + 2, 4210752); - //fontRendererObj.drawString(I18n.format("Progress:"+te.getProgress()+"ticks"), 80, ySize - 96 + 2, 4210752); - } + private final ResourceLocation texture = new ResourceLocation(CORE.MODID, "textures/gui/machine_Charger.png"); + + private final InventoryPlayer inventory; + private final TileAlvearyFrameHousing te; + + public GUI_FrameHousing(final TileAlvearyFrameHousing te, final EntityPlayer player) + { + super(new CONTAINER_FrameHousing(te, player)); + this.inventory = player.inventory; + this.te = te; + } + + @Override + protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) + { + Minecraft.getMinecraft().renderEngine.bindTexture(this.texture); + + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + + final int x = (this.width - this.xSize) / 2; + final int y = (this.height - this.ySize) / 2; + + this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); + } + + @Override + protected void drawGuiContainerForegroundLayer(final int par1, final int par2) + { + this.fontRendererObj.drawString(I18n.format("Alveary Frame Housing"), (this.xSize / 2) - (this.fontRendererObj.getStringWidth(I18n.format("Alveary Frame Housing")) / 2), 6, 4210752, false); + this.fontRendererObj.drawString(I18n.format(this.inventory.getInventoryName()), 8, (this.ySize - 96) + 2, 4210752); + //fontRendererObj.drawString(I18n.format("Charge:"+te.getCharge()+"~"), 8, ySize - 96 + 2, 4210752); + //fontRendererObj.drawString(I18n.format("Progress:"+te.getProgress()+"ticks"), 80, ySize - 96 + 2, 4210752); + } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/InventoryFrameHousing.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/InventoryFrameHousing.java index 9139c52b37..cde673e952 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/InventoryFrameHousing.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/gui/InventoryFrameHousing.java @@ -1,11 +1,5 @@ package gtPlusPlus.xmod.forestry.bees.alveary.gui; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; - import com.mojang.authlib.GameProfile; import forestry.api.apiculture.*; @@ -14,92 +8,97 @@ import forestry.core.inventory.InventoryAdapterTile; import forestry.core.utils.ItemStackUtil; import gtPlusPlus.xmod.forestry.bees.alveary.IAlvearyFrameHousing; import gtPlusPlus.xmod.forestry.bees.alveary.TileAlvearyFrameHousing; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; public class InventoryFrameHousing extends InventoryAdapterTile implements IAlvearyFrameHousing { - + TileAlvearyFrameHousing alvearyFrame; - - public InventoryFrameHousing(TileAlvearyFrameHousing alvearyFrame) + + public InventoryFrameHousing(final TileAlvearyFrameHousing alvearyFrame) { super(alvearyFrame, 1, "FrameHousingInv"); this.alvearyFrame = alvearyFrame; } @Override - public boolean canSlotAccept(int slotIndex, ItemStack itemStack) + public boolean canSlotAccept(final int slotIndex, final ItemStack itemStack) { return ItemStackUtil.containsItemStack(BeeManager.inducers.keySet(), itemStack); } @Override public boolean canBlockSeeTheSky() { - return alvearyFrame.canBlockSeeTheSky(); + return this.alvearyFrame.canBlockSeeTheSky(); } @Override public Vec3 getBeeFXCoordinates() { - return alvearyFrame.getBeeFXCoordinates(); + return this.alvearyFrame.getBeeFXCoordinates(); } @Override public IBeeHousingInventory getBeeInventory() { - return alvearyFrame.getBeeInventory(); + return this.alvearyFrame.getBeeInventory(); } @Override public Iterable getBeeListeners() { - return alvearyFrame.getBeeListeners(); + return this.alvearyFrame.getBeeListeners(); } @Override public Iterable getBeeModifiers() { - return alvearyFrame.getBeeModifiers(); + return this.alvearyFrame.getBeeModifiers(); } @Override public IBeekeepingLogic getBeekeepingLogic() { - return alvearyFrame.getBeekeepingLogic(); + return this.alvearyFrame.getBeekeepingLogic(); } @Override public BiomeGenBase getBiome() { - return alvearyFrame.getBiome(); + return this.alvearyFrame.getBiome(); } @Override public int getBlockLightValue() { - return alvearyFrame.getBlockLightValue(); + return this.alvearyFrame.getBlockLightValue(); } @Override public EnumHumidity getHumidity() { - return alvearyFrame.getHumidity(); + return this.alvearyFrame.getHumidity(); } @Override public GameProfile getOwner() { - return alvearyFrame.getOwner(); + return this.alvearyFrame.getOwner(); } @Override public EnumTemperature getTemperature() { - return alvearyFrame.getTemperature(); + return this.alvearyFrame.getTemperature(); } @Override public World getWorld() { - return alvearyFrame.getWorld(); + return this.alvearyFrame.getWorld(); } @Override public ChunkCoordinates getCoordinates() { - return alvearyFrame.getCoordinates(); + return this.alvearyFrame.getCoordinates(); } @Override public IErrorLogic getErrorLogic() { - return alvearyFrame.getErrorLogic(); + return this.alvearyFrame.getErrorLogic(); } @Override @@ -108,7 +107,7 @@ public class InventoryFrameHousing extends InventoryAdapterTile