Strict and consistent typing for GUI's Container and Inventory

This commit is contained in:
mezz committed 2015-03-02 23:55:52 -08:00
1 parent 7362286ead
commit f4e9c61e3a
42 files changed
+131 -218

No files matched your search

@@ -18,7 +18,7 @@ import forestry.core.gui.GuiForestryTitled;
import forestry.core.utils.EnumTankLevel;
import forestry.core.utils.Utils;
public class GuiAlveary extends GuiForestryTitled<TileAlvearyPlain> {
public class GuiAlveary extends GuiForestryTitled<ContainerAlveary, TileAlvearyPlain> {
public GuiAlveary(InventoryPlayer inventory, TileAlvearyPlain tile) {
super(Defaults.TEXTURE_PATH_GUI + "/alveary.png", new ContainerAlveary(inventory, tile), tile);
@@ -30,7 +30,7 @@ public class GuiAlveary extends GuiForestryTitled<TileAlvearyPlain> {
protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
TileAlvearyPlain machine = tile;
TileAlvearyPlain machine = inventory;
drawHealthMeter(guiLeft + 20, guiTop + 37, machine.getHealthScaled(46), Utils.rateTankLevel(machine.getHealthScaled(100)));
}
@@ -17,7 +17,7 @@ import forestry.core.config.Defaults;
import forestry.core.gui.GuiForestryTitled;
import forestry.core.gui.widgets.TankWidget;
public class GuiAlvearyHygroregulator extends GuiForestryTitled<TileAlvearyHygroregulator> {
public class GuiAlvearyHygroregulator extends GuiForestryTitled<ContainerAlvearyHygroregulator, TileAlvearyHygroregulator> {
public GuiAlvearyHygroregulator(InventoryPlayer inventory, TileAlvearyHygroregulator tile) {
super(Defaults.TEXTURE_PATH_GUI + "/hygroregulator.png", new ContainerAlvearyHygroregulator(inventory, tile), tile);
@@ -16,11 +16,10 @@ import forestry.apiculture.gadgets.TileAlvearySieve;
import forestry.core.config.Defaults;
import forestry.core.gui.GuiForestry;
public class GuiAlvearySieve extends GuiForestry<TileAlvearySieve> {
public class GuiAlvearySieve extends GuiForestry<ContainerAlvearySieve, TileAlvearySieve> {
public GuiAlvearySieve(InventoryPlayer inventory, TileAlvearySieve tile) {
super(Defaults.TEXTURE_PATH_GUI + "/sieve.png", new ContainerAlvearySieve(inventory, tile));
super(Defaults.TEXTURE_PATH_GUI + "/sieve.png", new ContainerAlvearySieve(inventory, tile), tile);
}
}
@@ -16,10 +16,10 @@ import forestry.apiculture.gadgets.TileAlvearySwarmer;
import forestry.core.config.Defaults;
import forestry.core.gui.GuiForestry;
public class GuiAlvearySwarmer extends GuiForestry<TileAlvearySwarmer> {
public class GuiAlvearySwarmer extends GuiForestry<ContainerAlvearySwarmer, TileAlvearySwarmer> {
public GuiAlvearySwarmer(InventoryPlayer inventory, TileAlvearySwarmer tile) {
super(Defaults.TEXTURE_PATH_GUI + "/swarmer.png", new ContainerAlvearySwarmer(inventory, tile));
super(Defaults.TEXTURE_PATH_GUI + "/swarmer.png", new ContainerAlvearySwarmer(inventory, tile), tile);
}
}
@@ -19,7 +19,7 @@ import forestry.core.gui.GuiForestryTitled;
import forestry.core.utils.EnumTankLevel;
import forestry.core.utils.Utils;
public class GuiApiary extends GuiForestryTitled<TileBeehouse> {
public class GuiApiary extends GuiForestryTitled<ContainerApiary, TileBeehouse> {
public GuiApiary(InventoryPlayer inventory, TileApiary tile) {
super(Defaults.TEXTURE_PATH_GUI + "/apiary.png", new ContainerApiary(inventory, tile, true), tile);
@@ -37,7 +37,7 @@ public class GuiApiary extends GuiForestryTitled<TileBeehouse> {
protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
TileBeehouse machine = tile;
TileBeehouse machine = inventory;
drawHealthMeter(guiLeft + 20, guiTop + 37, machine.getHealthScaled(46), Utils.rateTankLevel(machine.getHealthScaled(100)));
}
@@ -29,14 +29,13 @@ import org.lwjgl.opengl.GL11;
import forestry.apiculture.items.ItemHabitatLocator.HabitatLocatorInventory;
import forestry.core.config.Defaults;
import forestry.core.gadgets.TileForestry;
import forestry.core.gui.GuiForestry;
import forestry.core.gui.widgets.Widget;
import forestry.core.proxy.Proxies;
import forestry.core.render.SpriteSheet;
import forestry.core.render.TextureManager;
public class GuiHabitatLocator extends GuiForestry<TileForestry> {
public class GuiHabitatLocator extends GuiForestry<ContainerHabitatLocator, HabitatLocatorInventory> {
public class HabitatSlot extends Widget {
@@ -103,12 +102,10 @@ public class GuiHabitatLocator extends GuiForestry<TileForestry> {
private int startX;
private int startY;
private final HabitatLocatorInventory inventory;
public GuiHabitatLocator(InventoryPlayer inventory, HabitatLocatorInventory item) {
super(Defaults.TEXTURE_PATH_GUI + "/biomefinder.png", new ContainerHabitatLocator(inventory, item), item);
this.inventory = item;
this.inventory.tryAnalyze();
xSize = 176;
ySize = 184;
@@ -25,15 +25,11 @@ import forestry.apiculture.items.ItemBeeGE;
import forestry.apiculture.items.ItemImprinter.ImprinterInventory;
import forestry.core.config.Defaults;
import forestry.core.config.ForestryItem;
import forestry.core.gadgets.TileForestry;
import forestry.core.gui.GuiForestry;
import forestry.core.proxy.Proxies;
import forestry.core.utils.StringUtil;
public class GuiImprinter extends GuiForestry<TileForestry> {
private final ImprinterInventory inventory;
private final ContainerImprinter container;
public class GuiImprinter extends GuiForestry<ContainerImprinter, ImprinterInventory> {
private int startX;
private int startY;
@@ -43,9 +39,6 @@ public class GuiImprinter extends GuiForestry<TileForestry> {
public GuiImprinter(InventoryPlayer inventoryplayer, ImprinterInventory inventory) {
super(Defaults.TEXTURE_PATH_GUI + "/imprinter.png", new ContainerImprinter(inventoryplayer, inventory), inventory);
this.inventory = inventory;
this.container = (ContainerImprinter) inventorySlots;
xSize = 176;
ySize = 185;
@@ -12,26 +12,20 @@ package forestry.core.circuits;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.IInventory;
import forestry.api.circuits.ICircuitLayout;
import forestry.core.circuits.ItemSolderingIron.CircuitRecipe;
import forestry.core.circuits.ItemSolderingIron.SolderingInventory;
import forestry.core.config.Defaults;
import forestry.core.gadgets.TileForestry;
import forestry.core.gui.GuiForestry;
import forestry.core.proxy.Proxies;
import forestry.core.utils.StringUtil;
public class GuiSolderingIron extends GuiForestry<TileForestry> {
private final IInventory inventory;
public class GuiSolderingIron extends GuiForestry<ContainerSolderingIron, SolderingInventory> {
public GuiSolderingIron(InventoryPlayer inventoryplayer, SolderingInventory inventory) {
super(Defaults.TEXTURE_PATH_GUI + "/solder.png", new ContainerSolderingIron(inventoryplayer, inventory), inventory);
this.inventory = inventory;
xSize = 176;
ySize = 205;
}
@@ -38,18 +38,16 @@ import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.ISpeciesRoot;
import forestry.core.config.Defaults;
import forestry.core.gadgets.TileForestry;
import forestry.core.genetics.EnumMutateChance;
import forestry.core.proxy.Proxies;
import forestry.core.utils.StringUtil;
public abstract class GuiAlyzer extends GuiForestry<TileForestry> {
public abstract class GuiAlyzer extends GuiForestry<ContainerAlyzer, IInventory> {
protected static final int COLUMN_0 = 12;
protected static final int COLUMN_1 = 85;
protected static final int COLUMN_2 = 150;
protected final IInventory inventory;
protected final ISpeciesRoot speciesRoot;
protected final IBreedingTracker breedingTracker;
@@ -57,15 +55,14 @@ public abstract class GuiAlyzer extends GuiForestry<TileForestry> {
protected HashMap<String, ItemStack> iconStacks = new HashMap<String, ItemStack>();
public GuiAlyzer(String speciesRoot, EntityPlayer player, ContainerForestry container, IInventory inventory, String guiName) {
super(Defaults.TEXTURE_PATH_GUI + "/beealyzer2.png", container);
public GuiAlyzer(String speciesRoot, EntityPlayer player, ContainerAlyzer container, IInventory inventory, String guiName) {
super(Defaults.TEXTURE_PATH_GUI + "/beealyzer2.png", container, inventory);
this.xSize = 246;
this.ySize = 238;
this.guiName = guiName;
this.inventory = inventory;
this.speciesRoot = AlleleManager.alleleRegistry.getSpeciesRoot(speciesRoot);
this.breedingTracker = this.speciesRoot.getBreedingTracker(player.worldObj, player.getGameProfile());
}
@@ -18,7 +18,7 @@ import forestry.core.gui.widgets.TankWidget;
import forestry.core.utils.EnumTankLevel;
import forestry.core.utils.Utils;
public class GuiAnalyzer extends GuiForestryTitled<TileAnalyzer> {
public class GuiAnalyzer extends GuiForestryTitled<ContainerAnalyzer, TileAnalyzer> {
public GuiAnalyzer(InventoryPlayer inventory, TileAnalyzer tile) {
super(Defaults.TEXTURE_PATH_GUI + "/alyzer.png", new ContainerAnalyzer(inventory, tile), tile);
@@ -29,7 +29,7 @@ public class GuiAnalyzer extends GuiForestryTitled<TileAnalyzer> {
@Override
protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
TileAnalyzer machine = tile;
TileAnalyzer machine = inventory;
drawAnalyzeMeter(guiLeft + 64, guiTop + 30, machine.getProgressScaled(46), Utils.rateTankLevel(machine.getProgressScaled(100)));
}
@@ -33,7 +33,7 @@ import forestry.core.render.SpriteSheet;
import forestry.core.render.TextureManager;
import forestry.core.utils.StringUtil;
public class GuiEscritoire extends GuiForestry<TileEscritoire> {
public class GuiEscritoire extends GuiForestry<ContainerEscritoire, TileEscritoire> {
private static enum Notes {
level1, level2, level3, level4, success, failure
@@ -65,11 +65,11 @@ public class GuiEscritoire extends GuiForestry<TileEscritoire> {
}
private boolean hasToken() {
return tile.getGame().getToken(index) != null;
return inventory.getGame().getToken(index) != null;
}
private GameToken getToken() {
return tile.getGame().getToken(index);
return inventory.getGame().getToken(index);
}
@Override
@@ -168,22 +168,17 @@ public class GuiEscritoire extends GuiForestry<TileEscritoire> {
}
private final ItemStack LEVEL_ITEM;
protected ContainerEscritoire container;
private final TileEscritoire tile;
private String researchNote = "";
private long lastUpdate;
public GuiEscritoire(EntityPlayer player, TileEscritoire tile) {
super(Defaults.TEXTURE_PATH_GUI + "/escritoire.png", new ContainerEscritoire(player, tile));
super(Defaults.TEXTURE_PATH_GUI + "/escritoire.png", new ContainerEscritoire(player, tile), tile);
LEVEL_ITEM = new ItemStack(Items.paper);
xSize = 228;
ySize = 235;
this.container = (ContainerEscritoire) inventorySlots;
this.tile = tile;
widgetManager.add(new ProbeButton(widgetManager, 14, 16));
// Inner ring
@@ -222,7 +217,7 @@ public class GuiEscritoire extends GuiForestry<TileEscritoire> {
protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
for (int i = 0; i <= tile.getGame().getBountyLevel() / 4; i++) {
for (int i = 0; i <= inventory.getGame().getBountyLevel() / 4; i++) {
RenderHelper.enableGUIStandardItemLighting();
GuiForestry.itemRender.renderItemAndEffectIntoGUI(mc.fontRenderer,
mc.renderEngine, LEVEL_ITEM, guiLeft + 170 + i * 8, guiTop + 7);
@@ -235,7 +230,7 @@ public class GuiEscritoire extends GuiForestry<TileEscritoire> {
newLine();
newLine();
String format = EnumChatFormatting.UNDERLINE + EnumChatFormatting.ITALIC.toString();
drawLine(format + "Attempt No. " + (NaturalistGame.BOUNTY_MAX - tile.getGame().getBountyLevel()), 171, fontColor.get("gui.mail.lettertext"));
drawLine(format + "Attempt No. " + (NaturalistGame.BOUNTY_MAX - inventory.getGame().getBountyLevel()), 171, fontColor.get("gui.mail.lettertext"));
newLine();
drawSplitLine(getResearchNote(), 171, 46, fontColor.get("gui.mail.lettertext"));
@@ -243,19 +238,19 @@ public class GuiEscritoire extends GuiForestry<TileEscritoire> {
}
private String getResearchNote() {
if (lastUpdate == tile.getGame().getLastUpdate()) {
if (lastUpdate == inventory.getGame().getLastUpdate()) {
return researchNote;
}
if (!tile.getGame().isInited()) {
if (!inventory.getGame().isInited()) {
researchNote = StringUtil.localize("gui.escritoire.instructions");
} else {
if (tile.getGame().isWon()) {
if (inventory.getGame().isWon()) {
researchNote = getRandomNote(researchNotes.get(Notes.success));
} else if (tile.getGame().isEnded()) {
} else if (inventory.getGame().isEnded()) {
researchNote = getRandomNote(researchNotes.get(Notes.failure));
} else {
int bounty = tile.getGame().getBountyLevel();
int bounty = inventory.getGame().getBountyLevel();
if (bounty >= NaturalistGame.BOUNTY_MAX) {
researchNote = getRandomNote(researchNotes.get(Notes.level1));
} else if (bounty > NaturalistGame.BOUNTY_MAX / 2) {
@@ -268,7 +263,7 @@ public class GuiEscritoire extends GuiForestry<TileEscritoire> {
}
}
lastUpdate = tile.getGame().getLastUpdate();
lastUpdate = inventory.getGame().getLastUpdate();
return researchNote;
}
@@ -23,6 +23,7 @@ import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
@@ -34,7 +35,6 @@ import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import forestry.core.config.Config;
import forestry.core.gadgets.TileForestry;
import forestry.core.gui.tooltips.IToolTipProvider;
import forestry.core.gui.tooltips.ToolTip;
import forestry.core.gui.tooltips.ToolTipLine;
@@ -52,49 +52,35 @@ import codechicken.nei.api.INEIGuiHandler;
import codechicken.nei.api.TaggedInventoryArea;
@Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems")
public abstract class GuiForestry<T extends TileForestry> extends GuiContainer implements INEIGuiHandler {
public abstract class GuiForestry<C extends Container, I extends IInventory> extends GuiContainer implements INEIGuiHandler {
/* WIDGETS */
protected final WidgetManager widgetManager;
/* LEDGERS */
protected final LedgerManager ledgerManager;
protected final T tile;
protected final I inventory;
protected final C container;
protected final FontColour fontColor;
public final ResourceLocation textureFile;
public GuiForestry(String texture, Container container) {
this(new ResourceLocation("forestry", texture), container, null);
}
public GuiForestry(String texture, Container container, Object inventory) {
public GuiForestry(String texture, C container, I inventory) {
this(new ResourceLocation("forestry", texture), container, inventory);
}
public GuiForestry(ResourceLocation texture, Container container) {
this(texture, container, null);
}
@SuppressWarnings("unchecked")
public GuiForestry(ResourceLocation texture, Container container, Object inventory) {
public GuiForestry(ResourceLocation texture, C container, I inventory) {
super(container);
this.widgetManager = new WidgetManager(this);
this.ledgerManager = new LedgerManager(this);
this.textureFile = texture;
this.inventorySlots = container;
if (inventory instanceof TileForestry) {
this.tile = (T) inventory;
} else {
this.tile = null;
}
this.inventory = inventory;
this.container = container;
fontColor = new FontColour(Proxies.common.getSelectedTexturePack(Proxies.common.getClientInstance()));
initLedgers(inventory);
initLedgers();
}
/* LEDGERS */
protected void initLedgers(Object inventory) {
protected void initLedgers() {
if (inventory instanceof IErrorSource && ((IErrorSource) inventory).throwsErrors()) {
ledgerManager.add(new ErrorLedger(ledgerManager, (IErrorSource) inventory));
@@ -10,24 +10,25 @@
******************************************************************************/
package forestry.core.gui;
import net.minecraft.inventory.Container;
import net.minecraft.util.ResourceLocation;
import forestry.core.gadgets.TileForestry;
import forestry.core.utils.StringUtil;
public abstract class GuiForestryTitled<T extends TileForestry> extends GuiForestry<T> {
public abstract class GuiForestryTitled<C extends Container, I extends TileForestry> extends GuiForestry<C, I> {
public GuiForestryTitled(String texture, ContainerForestry container, Object inventory) {
public GuiForestryTitled(String texture, C container, I inventory) {
super(texture, container, inventory);
}
public GuiForestryTitled(ResourceLocation texture, ContainerForestry container, Object inventory) {
public GuiForestryTitled(ResourceLocation texture, C container, I inventory) {
super(texture, container, inventory);
}
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
String name = StringUtil.localizeTile(tile.getUnlocalizedName());
String name = StringUtil.localizeTile(inventory.getUnlocalizedName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.title"));
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
}
@@ -15,6 +15,7 @@ import java.util.HashMap;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
@@ -26,7 +27,6 @@ import forestry.api.genetics.IIndividual;
import forestry.api.genetics.IMutation;
import forestry.api.genetics.ISpeciesRoot;
import forestry.core.config.Defaults;
import forestry.core.gadgets.TileForestry;
import forestry.core.genetics.EnumMutateChance;
import forestry.core.gui.buttons.GuiBetterButton;
import forestry.core.gui.buttons.StandardButtonTextureSets;
@@ -36,13 +36,13 @@ import forestry.core.network.PacketUpdate;
import forestry.core.proxy.Proxies;
import forestry.core.utils.StringUtil;
public class GuiNaturalistInventory extends GuiForestry<TileForestry> {
public class GuiNaturalistInventory extends GuiForestry<Container, IPagedInventory> {
private final ISpeciesRoot speciesRoot;
private final IBreedingTracker breedingTracker;
private final HashMap<String, ItemStack> iconStacks = new HashMap<String, ItemStack>();
private final int pageCurrent, pageMax;
public GuiNaturalistInventory(ISpeciesRoot speciesRoot, EntityPlayer player, ContainerForestry container, IPagedInventory inventory, int page, int maxPages) {
public GuiNaturalistInventory(ISpeciesRoot speciesRoot, EntityPlayer player, Container container, IPagedInventory inventory, int page, int maxPages) {
super(Defaults.TEXTURE_PATH_GUI + "/apiaristinventory.png", container, inventory);
this.speciesRoot = speciesRoot;
@@ -17,17 +17,16 @@ import net.minecraft.client.Minecraft;
import org.lwjgl.opengl.GL11;
import forestry.core.config.SessionVars;
import forestry.core.gadgets.TileForestry;
import forestry.core.proxy.Proxies;
public class LedgerManager {
public final GuiForestry<? extends TileForestry> gui;
public final GuiForestry gui;
public final Minecraft minecraft;
protected final ArrayList<Ledger> ledgers = new ArrayList<Ledger>();
public LedgerManager(GuiForestry<? extends TileForestry> gui) {
public LedgerManager(GuiForestry gui) {
this.gui = gui;
this.minecraft = Proxies.common.getClientInstance();
}
@@ -16,17 +16,16 @@ import net.minecraft.client.Minecraft;
import org.lwjgl.opengl.GL11;
import forestry.core.gadgets.TileForestry;
import forestry.core.gui.widgets.Widget;
import forestry.core.proxy.Proxies;
public class WidgetManager {
public final GuiForestry<? extends TileForestry> gui;
public final GuiForestry gui;
public final Minecraft minecraft;
protected final ArrayList<Widget> widgets = new ArrayList<Widget>();
public WidgetManager(GuiForestry<? extends TileForestry> gui) {
public WidgetManager(GuiForestry gui) {
this.gui = gui;
this.minecraft = Proxies.common.getClientInstance();
}
@@ -13,22 +13,20 @@
*/
package forestry.energy.gui;
import net.minecraft.inventory.Container;
import forestry.core.gadgets.Engine;
import forestry.core.gui.ContainerForestry;
import forestry.core.gui.GuiForestryTitled;
import forestry.core.gui.Ledger;
import forestry.core.render.TextureManager;
import forestry.core.utils.StringUtil;
public abstract class GuiEngine extends GuiForestryTitled<Engine> {
public abstract class GuiEngine<C extends Container, I extends Engine> extends GuiForestryTitled<C, I> {
protected class EngineLedger extends Ledger {
private final Engine engine;
public EngineLedger(Engine engine) {
public EngineLedger() {
super(ledgerManager);
this.engine = engine;
maxHeight = 94;
overlayColor = fontColor.get("ledger.power.background");
}
@@ -48,27 +46,26 @@ public abstract class GuiEngine extends GuiForestryTitled<Engine> {
fontRendererObj.drawStringWithShadow(StringUtil.localize("gui.energy"), x + 22, y + 8, fontColor.get("ledger.power.header"));
fontRendererObj.drawStringWithShadow(StringUtil.localize("gui.currentOutput") + ":", x + 22, y + 20, fontColor.get("ledger.power.subheader"));
fontRendererObj.drawString(engine.getCurrentOutput() + " RF/t", x + 22, y + 32, fontColor.get("ledger.power.text"));
fontRendererObj.drawString(inventory.getCurrentOutput() + " RF/t", x + 22, y + 32, fontColor.get("ledger.power.text"));
fontRendererObj.drawStringWithShadow(StringUtil.localize("gui.stored") + ":", x + 22, y + 44, fontColor.get("ledger.power.subheader"));
fontRendererObj.drawString(engine.getEnergyManager().getEnergyStored(engine.getOrientation()) + " RF", x + 22, y + 56, fontColor.get("ledger.power.text"));
fontRendererObj.drawString(inventory.getEnergyManager().getEnergyStored(inventory.getOrientation()) + " RF", x + 22, y + 56, fontColor.get("ledger.power.text"));
fontRendererObj.drawStringWithShadow(StringUtil.localize("gui.heat") + ":", x + 22, y + 68, fontColor.get("ledger.power.subheader"));
fontRendererObj.drawString((((double) engine.getHeat() / (double) 10) + 20.0) + " C", x + 22, y + 80, fontColor.get("ledger.power.text"));
fontRendererObj.drawString((((double) inventory.getHeat() / (double) 10) + 20.0) + " C", x + 22, y + 80, fontColor.get("ledger.power.text"));
}
@Override
public String getTooltip() {
return engine.getCurrentOutput() + " RF/t";
return inventory.getCurrentOutput() + " RF/t";
}
}
public GuiEngine(String texture, ContainerForestry container, Engine tile) {
public GuiEngine(String texture, C container, I tile) {
super(texture, container, tile);
}
@Override
protected void initLedgers(Object inventory) {
super.initLedgers(inventory);
ledgerManager.insert(new EngineLedger(tile));
protected void initLedgers() {
super.initLedgers();
ledgerManager.insert(new EngineLedger());
}
}
@@ -29,26 +29,23 @@ import forestry.core.render.SpriteSheet;
import forestry.core.utils.StringUtil;
import forestry.energy.gadgets.EngineBronze;
public class GuiEngineBronze extends GuiEngine {
public class GuiEngineBronze extends GuiEngine<ContainerEngineBronze, EngineBronze> {
protected class BiogasSlot extends Widget {
private final EngineBronze engine;
public BiogasSlot(WidgetManager manager, int xPos, int yPos, EngineBronze engine) {
super(manager, xPos, yPos);
this.engine = engine;
this.height = 16;
}
@Override
public void draw(int startX, int startY) {
if (engine == null || engine.totalTime <= 0) {
if (inventory == null || inventory.totalTime <= 0) {
return;
}
Fluid fluid = FluidRegistry.getFluid(engine.currentFluidId);
Fluid fluid = FluidRegistry.getFluid(inventory.currentFluidId);
if (fluid == null) {
return;
}
@@ -57,7 +54,7 @@ public class GuiEngineBronze extends GuiEngine {
return;
}
int squaled = (engine.burnTime * height) / engine.totalTime;
int squaled = (inventory.burnTime * height) / inventory.totalTime;
if (squaled > height) {
squaled = height;
}
@@ -91,7 +88,7 @@ public class GuiEngineBronze extends GuiEngine {
@Override
public String getLegacyTooltip(EntityPlayer player) {
Fluid fluid = FluidRegistry.getFluid(engine.currentFluidId);
Fluid fluid = FluidRegistry.getFluid(inventory.currentFluidId);
if (fluid == null) {
return StringUtil.localize("gui.empty");
}
@@ -108,15 +105,11 @@ public class GuiEngineBronze extends GuiEngine {
widgetManager.add(new BiogasSlot(this.widgetManager, 30, 47, tile));
}
protected EngineBronze getEngine() {
return (EngineBronze) tile;
}
@Override
protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
int temp = getEngine().getOperatingTemperatureScaled(16);
int temp = inventory.getOperatingTemperatureScaled(16);
if (temp > 16) {
temp = 16;
}
@@ -15,21 +15,17 @@ import net.minecraft.entity.player.InventoryPlayer;
import forestry.core.config.Defaults;
import forestry.energy.gadgets.EngineCopper;
public class GuiEngineCopper extends GuiEngine {
public class GuiEngineCopper extends GuiEngine<ContainerEngineCopper, EngineCopper> {
public GuiEngineCopper(InventoryPlayer inventory, EngineCopper tile) {
super(Defaults.TEXTURE_PATH_GUI + "/peatengine.png", new ContainerEngineCopper(inventory, tile), tile);
}
protected EngineCopper getEngine() {
return (EngineCopper) tile;
}
@Override
protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
EngineCopper engine = getEngine();
EngineCopper engine = inventory;
int progress;
if (engine.isBurning()) {
progress = engine.getBurnTimeRemainingScaled(12);
@@ -17,22 +17,18 @@ import forestry.core.gui.widgets.SocketWidget;
import forestry.core.utils.EnumTankLevel;
import forestry.energy.gadgets.EngineTin;
public class GuiEngineTin extends GuiEngine {
public class GuiEngineTin extends GuiEngine<ContainerEngineTin, EngineTin> {
public GuiEngineTin(InventoryPlayer inventory, EngineTin tile) {
super(Defaults.TEXTURE_PATH_GUI + "/electricalengine.png", new ContainerEngineTin(inventory, tile), tile);
widgetManager.add(new SocketWidget(this.widgetManager, 30, 40, tile, 0));
}
protected EngineTin getEngine() {
return (EngineTin) tile;
}
@Override
protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
EngineTin engine = getEngine();
EngineTin engine = inventory;
int storageHeight = engine.getStorageScaled(46);
int storageMaxHeight = engine.getStorageScaled(100);
EnumTankLevel rated = engine.rateLevel(storageMaxHeight);
@@ -17,7 +17,7 @@ import forestry.core.gui.GuiForestryTitled;
import forestry.core.gui.widgets.TankWidget;
import forestry.energy.gadgets.MachineGenerator;
public class GuiGenerator extends GuiForestryTitled<MachineGenerator> {
public class GuiGenerator extends GuiForestryTitled<ContainerGenerator, MachineGenerator> {
public GuiGenerator(InventoryPlayer inventory, MachineGenerator tile) {
super(Defaults.TEXTURE_PATH_GUI + "/generator.png", new ContainerGenerator(inventory, tile), tile);
@@ -27,9 +27,8 @@ public class GuiGenerator extends GuiForestryTitled<MachineGenerator> {
@Override
protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
MachineGenerator boiler = tile;
int progress = boiler.getStoredScaled(49);
int progress = inventory.getStoredScaled(49);
if (progress > 0) {
drawTexturedModalRect(guiLeft + 108, guiTop + 38, 176, 91, progress, 18);
}
@@ -17,7 +17,7 @@ import forestry.core.gui.GuiForestryTitled;
import forestry.core.gui.widgets.TankWidget;
import forestry.factory.gadgets.MachineBottler;
public class GuiBottler extends GuiForestryTitled<MachineBottler> {
public class GuiBottler extends GuiForestryTitled<ContainerBottler, MachineBottler> {
public GuiBottler(InventoryPlayer inventory, MachineBottler processor) {
super(Defaults.TEXTURE_PATH_GUI + "/bottler.png", new ContainerBottler(inventory, processor), processor);
@@ -27,10 +27,10 @@ public class GuiBottler extends GuiForestryTitled<MachineBottler> {
@Override
protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
MachineBottler boiler = tile;
MachineBottler bottler = inventory;
if (boiler.isWorking()) {
int i1 = boiler.getFillProgressScaled(24);
if (bottler.isWorking()) {
int i1 = bottler.getFillProgressScaled(24);
drawTexturedModalRect(guiLeft + 80, guiTop + 39, 176, 74, 24 - i1, 16);
}
}
@@ -17,7 +17,7 @@ import forestry.core.gui.GuiForestryTitled;
import forestry.core.gui.widgets.TankWidget;
import forestry.factory.gadgets.MachineCarpenter;
public class GuiCarpenter extends GuiForestryTitled<MachineCarpenter> {
public class GuiCarpenter extends GuiForestryTitled<ContainerCarpenter, MachineCarpenter> {
public GuiCarpenter(InventoryPlayer inventory, MachineCarpenter tile) {
super(Defaults.TEXTURE_PATH_GUI + "/carpenter.png", new ContainerCarpenter(inventory, tile), tile);
@@ -29,7 +29,7 @@ public class GuiCarpenter extends GuiForestryTitled<MachineCarpenter> {
@Override
protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
MachineCarpenter machine = tile;
MachineCarpenter machine = inventory;
if (machine.isWorking()) {
int progressScaled = 16 - machine.getCraftingProgressScaled(16);
@@ -16,7 +16,7 @@ import forestry.core.config.Defaults;
import forestry.core.gui.GuiForestryTitled;
import forestry.factory.gadgets.MachineCentrifuge;
public class GuiCentrifuge extends GuiForestryTitled<MachineCentrifuge> {
public class GuiCentrifuge extends GuiForestryTitled<ContainerCentrifuge, MachineCentrifuge> {
public GuiCentrifuge(InventoryPlayer inventory, MachineCentrifuge tile) {
super(Defaults.TEXTURE_PATH_GUI + "/centrifuge.png", new ContainerCentrifuge(inventory, tile), tile);
@@ -25,7 +25,7 @@ public class GuiCentrifuge extends GuiForestryTitled<MachineCentrifuge> {
@Override
protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
MachineCentrifuge machine = tile;
MachineCentrifuge machine = inventory;
int progress = 16 - machine.getProgressScaled(16);
drawTexturedModalRect(guiLeft + 62, guiTop + 36 + 17 - progress, 176, 17 - progress, 4, progress);
@@ -17,7 +17,7 @@ import forestry.core.gui.GuiForestryTitled;
import forestry.core.gui.widgets.ReservoirWidget;
import forestry.factory.gadgets.MachineFabricator;
public class GuiFabricator extends GuiForestryTitled<MachineFabricator> {
public class GuiFabricator extends GuiForestryTitled<ContainerFabricator, MachineFabricator> {
public GuiFabricator(InventoryPlayer player, MachineFabricator tile) {
super(Defaults.TEXTURE_PATH_GUI + "/fabricator.png", new ContainerFabricator(player, tile), tile);
@@ -29,7 +29,7 @@ public class GuiFabricator extends GuiForestryTitled<MachineFabricator> {
protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
MachineFabricator fabricator = tile;
MachineFabricator fabricator = inventory;
int heatScaled = fabricator.getHeatScaled(52);
if (heatScaled > 0) {
drawTexturedModalRect(guiLeft + 55, guiTop + 17 + 52 - heatScaled, 192, 52 - heatScaled, 4, heatScaled);
@@ -17,7 +17,7 @@ import forestry.core.gui.GuiForestryTitled;
import forestry.core.gui.widgets.TankWidget;
import forestry.factory.gadgets.MachineFermenter;
public class GuiFermenter extends GuiForestryTitled<MachineFermenter> {
public class GuiFermenter extends GuiForestryTitled<ContainerFermenter, MachineFermenter> {
public GuiFermenter(InventoryPlayer inventory, MachineFermenter tile) {
super(Defaults.TEXTURE_PATH_GUI + "/fermenter.png", new ContainerFermenter(inventory, tile), tile);
@@ -28,7 +28,7 @@ public class GuiFermenter extends GuiForestryTitled<MachineFermenter> {
@Override
protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
MachineFermenter machine = tile;
MachineFermenter machine = inventory;
// Fuel remaining
int fuelRemain = machine.getBurnTimeRemainingScaled(16);
@@ -17,7 +17,7 @@ import forestry.core.gui.GuiForestryTitled;
import forestry.core.gui.widgets.TankWidget;
import forestry.factory.gadgets.MachineMoistener;
public class GuiMoistener extends GuiForestryTitled<MachineMoistener> {
public class GuiMoistener extends GuiForestryTitled<ContainerMoistener, MachineMoistener> {
public GuiMoistener(InventoryPlayer inventory, MachineMoistener tile) {
super(Defaults.TEXTURE_PATH_GUI + "/moistener.png", new ContainerMoistener(inventory, tile), tile);
@@ -27,7 +27,7 @@ public class GuiMoistener extends GuiForestryTitled<MachineMoistener> {
@Override
protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
MachineMoistener machine = tile;
MachineMoistener machine = inventory;
// Mycelium production progress
if (machine.isProducing()) {
@@ -17,7 +17,7 @@ import forestry.core.gui.GuiForestryTitled;
import forestry.core.gui.widgets.TankWidget;
import forestry.factory.gadgets.MachineRaintank;
public class GuiRaintank extends GuiForestryTitled<MachineRaintank> {
public class GuiRaintank extends GuiForestryTitled<ContainerRaintank, MachineRaintank> {
public GuiRaintank(InventoryPlayer inventory, MachineRaintank tile) {
super(Defaults.TEXTURE_PATH_GUI + "/raintank.png", new ContainerRaintank(inventory, tile), tile);
@@ -27,7 +27,7 @@ public class GuiRaintank extends GuiForestryTitled<MachineRaintank> {
@Override
protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
MachineRaintank machine = tile;
MachineRaintank machine = inventory;
if (machine.isFilling()) {
int progress = machine.getFillProgressScaled(24);
@@ -17,7 +17,7 @@ import forestry.core.gui.GuiForestryTitled;
import forestry.core.gui.widgets.TankWidget;
import forestry.factory.gadgets.MachineSqueezer;
public class GuiSqueezer extends GuiForestryTitled<MachineSqueezer> {
public class GuiSqueezer extends GuiForestryTitled<ContainerSqueezer, MachineSqueezer> {
public GuiSqueezer(InventoryPlayer inventory, MachineSqueezer tile) {
super(Defaults.TEXTURE_PATH_GUI + "/squeezer.png", new ContainerSqueezer(inventory, tile), tile);
@@ -26,7 +26,7 @@ public class GuiSqueezer extends GuiForestryTitled<MachineSqueezer> {
@Override
protected void drawWidgets() {
int progress = tile.getProgressScaled(43);
int progress = inventory.getProgressScaled(43);
drawTexturedModalRect(75, 20, 176, 60, 43 - progress, 18);
super.drawWidgets();
@@ -17,7 +17,7 @@ import forestry.core.gui.GuiForestryTitled;
import forestry.core.gui.widgets.TankWidget;
import forestry.factory.gadgets.MachineStill;
public class GuiStill extends GuiForestryTitled<MachineStill> {
public class GuiStill extends GuiForestryTitled<ContainerStill, MachineStill> {
public GuiStill(InventoryPlayer inventory, MachineStill tile) {
super(Defaults.TEXTURE_PATH_GUI + "/still.png", new ContainerStill(inventory, tile), tile);
@@ -28,13 +28,13 @@ public class GuiStill extends GuiForestryTitled<MachineStill> {
@Override
protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
MachineStill boiler = tile;
MachineStill still = inventory;
if (boiler.isWorking()) {
if (still.isWorking()) {
drawTexturedModalRect(guiLeft + 81, guiTop + 57, 176, 60, 14, 14);
}
int massRemaining = boiler.getDistillationProgressScaled(16);
int massRemaining = still.getDistillationProgressScaled(16);
if (massRemaining > 0) {
drawTexturedModalRect(guiLeft + 84, guiTop + 17 + 17 - massRemaining, 176, 74 + 17 - massRemaining, 4, massRemaining);
}
@@ -25,7 +25,7 @@ import forestry.core.render.SpriteSheet;
import forestry.core.render.TextureManager;
import forestry.factory.gadgets.TileWorktable;
public class GuiWorktable extends GuiForestryTitled<TileWorktable> {
public class GuiWorktable extends GuiForestryTitled<ContainerWorktable, TileWorktable> {
private class MemorizedSlot extends Widget {
@@ -39,7 +39,7 @@ public class GuiWorktable extends GuiForestryTitled<TileWorktable> {
}
private ItemStack getOutputStack() {
return worktable.getMemory().getRecipeOutput(world, slotNumber);
return inventory.getMemory().getRecipeOutput(world, slotNumber);
}
@Override
@@ -54,7 +54,7 @@ public class GuiWorktable extends GuiForestryTitled<TileWorktable> {
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
if (worktable.getMemory().isLocked(slotNumber)) {
if (inventory.getMemory().isLocked(slotNumber)) {
manager.gui.setZLevel(110f);
Proxies.common.bindTexture(SpriteSheet.ITEMS);
manager.gui.drawTexturedModelRectFromIcon(startX + xPos, startY + yPos, TextureManager.getInstance().getDefault("slots/locked"), 16, 16);
@@ -94,15 +94,10 @@ public class GuiWorktable extends GuiForestryTitled<TileWorktable> {
}
}
private final TileWorktable worktable;
protected final ContainerWorktable container;
public GuiWorktable(EntityPlayer player, TileWorktable tile) {
super(Defaults.TEXTURE_PATH_GUI + "/worktable2.png", new ContainerWorktable(player, tile), tile);
ySize = 218;
worktable = tile;
container = (ContainerWorktable) inventorySlots;
final int spacing = 18;
int slot = 0;
+11 -14
View File
@@ -29,7 +29,7 @@ import forestry.core.proxy.Proxies;
import forestry.core.utils.StringUtil;
import forestry.farming.gadgets.TileFarmPlain;
public class GuiFarm extends GuiForestry<TileFarmPlain> {
public class GuiFarm extends GuiForestry<ContainerFarm, TileFarmPlain> {
protected class FarmLedger extends Ledger {
@@ -54,20 +54,20 @@ public class GuiFarm extends GuiForestry<TileFarmPlain> {
fontRendererObj.drawStringWithShadow(StringUtil.localize("gui.hydration"), x + 22, y + 8, fontColor.get("ledger.power.header"));
fontRendererObj.drawStringWithShadow(StringUtil.localize("gui.hydr.heat") + ":", x + 22, y + 20, fontColor.get("ledger.power.subheader"));
fontRendererObj.drawString(StringUtil.floatAsPercent(farm.getHydrationTempModifier()), x + 22, y + 32, fontColor.get("ledger.power.text"));
fontRendererObj.drawString(StringUtil.floatAsPercent(inventory.getHydrationTempModifier()), x + 22, y + 32, fontColor.get("ledger.power.text"));
fontRendererObj.drawStringWithShadow(StringUtil.localize("gui.hydr.humid") + ":", x + 22, y + 44, fontColor.get("ledger.power.subheader"));
fontRendererObj.drawString(StringUtil.floatAsPercent(farm.getHydrationHumidModifier()), x + 22, y + 56, fontColor.get("ledger.power.text"));
fontRendererObj.drawString(StringUtil.floatAsPercent(inventory.getHydrationHumidModifier()), x + 22, y + 56, fontColor.get("ledger.power.text"));
fontRendererObj.drawStringWithShadow(StringUtil.localize("gui.hydr.rainfall") + ":", x + 22, y + 68, fontColor.get("ledger.power.subheader"));
fontRendererObj.drawString(StringUtil.floatAsPercent(farm.getHydrationRainfallModifier()) + " (" + farm.getDrought() + " d)", x + 22, y + 80,
fontRendererObj.drawString(StringUtil.floatAsPercent(inventory.getHydrationRainfallModifier()) + " (" + inventory.getDrought() + " d)", x + 22, y + 80,
fontColor.get("ledger.power.text"));
fontRendererObj.drawStringWithShadow(StringUtil.localize("gui.hydr.overall") + ":", x + 22, y + 92, fontColor.get("ledger.power.subheader"));
fontRendererObj.drawString(StringUtil.floatAsPercent(farm.getHydrationModifier()), x + 22, y + 104, fontColor.get("ledger.power.text"));
fontRendererObj.drawString(StringUtil.floatAsPercent(inventory.getHydrationModifier()), x + 22, y + 104, fontColor.get("ledger.power.text"));
}
@Override
public String getTooltip() {
return StringUtil.floatAsPercent(farm.getHydrationModifier()) + " " + StringUtil.localize("gui.hydration");
return StringUtil.floatAsPercent(inventory.getHydrationModifier()) + " " + StringUtil.localize("gui.hydration");
}
}
@@ -81,7 +81,7 @@ public class GuiFarm extends GuiForestry<TileFarmPlain> {
}
private IFarmLogic getLogic() {
return farm.getFarmLogics()[slot];
return inventory.getFarmLogics()[slot];
}
private IIcon getIconIndex() {
@@ -120,13 +120,11 @@ public class GuiFarm extends GuiForestry<TileFarmPlain> {
}
toolTip.add(getLogic().getName());
toolTip.add("Fertilizer: " + getLogic().getFertilizerConsumption());
toolTip.add("Water: " + getLogic().getWaterConsumption(farm.getHydrationModifier()));
toolTip.add("Water: " + getLogic().getWaterConsumption(inventory.getHydrationModifier()));
}
};
}
private final TileFarmPlain farm;
public GuiFarm(EntityPlayer player, TileFarmPlain tile) {
super(Defaults.TEXTURE_PATH_GUI + "/mfarm.png", new ContainerFarm(player.inventory, tile), tile);
@@ -141,12 +139,11 @@ public class GuiFarm extends GuiForestry<TileFarmPlain> {
this.xSize = 216;
this.ySize = 220;
this.farm = tile;
}
@Override
protected void initLedgers(Object inventory) {
super.initLedgers(inventory);
protected void initLedgers() {
super.initLedgers();
ledgerManager.insert(new FarmLedger());
}
@@ -162,7 +159,7 @@ public class GuiFarm extends GuiForestry<TileFarmPlain> {
super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY);
// Fuel remaining
int fertilizerRemain = tile.getStoredFertilizerScaled(16);
int fertilizerRemain = inventory.getStoredFertilizerScaled(16);
if (fertilizerRemain > 0) {
drawTexturedModalRect(guiLeft + 81, guiTop + 94 + 17 - fertilizerRemain, xSize, 17 - fertilizerRemain, 4, fertilizerRemain);
}
@@ -11,25 +11,20 @@
package forestry.food.gui;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.IInventory;
import forestry.api.food.BeverageManager;
import forestry.core.config.Defaults;
import forestry.core.gadgets.TileForestry;
import forestry.core.gui.GuiForestry;
import forestry.food.items.ItemInfuser.InfuserInventory;
public class GuiInfuser extends GuiForestry<TileForestry> {
public class GuiInfuser extends GuiForestry<ContainerInfuser, InfuserInventory> {
private final IInventory inventory;
private int startX;
private int startY;
public GuiInfuser(InventoryPlayer inventoryplayer, InfuserInventory inventory) {
super(Defaults.TEXTURE_PATH_GUI + "/infuser.png", new ContainerInfuser(inventoryplayer, inventory), inventory);
this.inventory = inventory;
xSize = 176;
ySize = 185;
}
@@ -15,6 +15,7 @@ import java.util.List;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.ResourceLocation;
@@ -23,12 +24,11 @@ import org.lwjgl.input.Keyboard;
import forestry.api.mail.EnumAddressee;
import forestry.api.mail.TradeStationInfo;
import forestry.core.config.SessionVars;
import forestry.core.gadgets.TileForestry;
import forestry.core.gui.GuiForestry;
import forestry.core.gui.widgets.Widget;
import forestry.core.utils.StringUtil;
public class GuiCatalogue extends GuiForestry<TileForestry> {
public class GuiCatalogue extends GuiForestry<ContainerCatalogue, IInventory> {
private static final String boldUnderline = EnumChatFormatting.BOLD.toString() + EnumChatFormatting.UNDERLINE;
@@ -39,13 +39,11 @@ public class GuiCatalogue extends GuiForestry<TileForestry> {
private GuiButton buttonCopy;
private final List<ItemStackWidget> tradeInfoWidgets = new ArrayList<ItemStackWidget>();
private final ContainerCatalogue container;
public GuiCatalogue(EntityPlayer player) {
super(new ResourceLocation("textures/gui/book.png"), new ContainerCatalogue(player));
super(new ResourceLocation("textures/gui/book.png"), new ContainerCatalogue(player), null);
this.xSize = 192;
this.ySize = 192;
container = (ContainerCatalogue) inventorySlots;
}
@SuppressWarnings("unchecked")
@@ -26,7 +26,6 @@ import forestry.api.mail.IPostalCarrier;
import forestry.api.mail.PostManager;
import forestry.core.config.Defaults;
import forestry.core.config.SessionVars;
import forestry.core.gadgets.TileForestry;
import forestry.core.gui.GuiForestry;
import forestry.core.gui.GuiTextBox;
import forestry.core.gui.widgets.Widget;
@@ -34,7 +33,7 @@ import forestry.core.proxy.Proxies;
import forestry.core.utils.StringUtil;
import forestry.mail.items.ItemLetter.LetterInventory;
public class GuiLetter extends GuiForestry<TileForestry> {
public class GuiLetter extends GuiForestry<ContainerLetter, LetterInventory> {
protected class AddresseeSlot extends Widget {
@@ -80,14 +79,12 @@ public class GuiLetter extends GuiForestry<TileForestry> {
private boolean textFocus;
private final ArrayList<Widget> tradeInfoWidgets;
private final ContainerLetter container;
public GuiLetter(EntityPlayer player, LetterInventory inventory) {
super(Defaults.TEXTURE_PATH_GUI + "/letter.png", new ContainerLetter(player, inventory), inventory);
this.xSize = 194;
this.ySize = 227;
this.container = (ContainerLetter) inventorySlots;
this.isProcessedLetter = container.getLetter().isProcessed();
this.widgetManager.add(new AddresseeSlot(16, 12));
this.tradeInfoWidgets = new ArrayList<Widget>();
@@ -16,7 +16,7 @@ import forestry.core.config.Defaults;
import forestry.core.gui.GuiForestry;
import forestry.mail.gadgets.MachineMailbox;
public class GuiMailbox extends GuiForestry<MachineMailbox> {
public class GuiMailbox extends GuiForestry<ContainerMailbox, MachineMailbox> {
public GuiMailbox(InventoryPlayer player, MachineMailbox tile) {
super(Defaults.TEXTURE_PATH_GUI + "/mailbox.png", new ContainerMailbox(player, tile), tile);
@@ -16,7 +16,7 @@ import forestry.core.config.Defaults;
import forestry.core.gui.GuiForestry;
import forestry.mail.gadgets.MachinePhilatelist;
public class GuiPhilatelist extends GuiForestry<MachinePhilatelist> {
public class GuiPhilatelist extends GuiForestry<ContainerPhilatelist, MachinePhilatelist> {
public GuiPhilatelist(InventoryPlayer player, MachinePhilatelist tile) {
super(Defaults.TEXTURE_PATH_GUI + "/philatelist.png", new ContainerPhilatelist(player, tile), tile);
@@ -22,20 +22,16 @@ import forestry.core.gui.GuiForestry;
import forestry.core.utils.StringUtil;
import forestry.mail.gadgets.MachineTrader;
public class GuiTradeName extends GuiForestry<MachineTrader> {
public class GuiTradeName extends GuiForestry<ContainerTradeName, MachineTrader> {
private GuiTextField addressNameField;
private boolean addressNameFocus;
private final ContainerTradeName container;
public GuiTradeName(InventoryPlayer inventoryplayer, MachineTrader tile) {
super(Defaults.TEXTURE_PATH_GUI + "/tradername.png", new ContainerTradeName(inventoryplayer, tile), tile);
this.xSize = 176;
this.ySize = 90;
this.container = (ContainerTradeName) inventorySlots;
}
@Override
@@ -17,22 +17,18 @@ import forestry.core.gui.GuiForestry;
import forestry.core.utils.StringUtil;
import forestry.mail.gadgets.MachineTrader;
public class GuiTrader extends GuiForestry<MachineTrader> {
private final ContainerTrader container;
public class GuiTrader extends GuiForestry<ContainerTrader, MachineTrader> {
public GuiTrader(InventoryPlayer inventoryplayer, MachineTrader tile) {
super(Defaults.TEXTURE_PATH_GUI + "/mailtrader2.png", new ContainerTrader(inventoryplayer, tile), tile);
this.xSize = 226;
this.ySize = 220;
this.container = (ContainerTrader) inventorySlots;
}
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
super.drawGuiContainerForegroundLayer(mouseX, mouseY);
String name = StringUtil.localizeTile(tile.getUnlocalizedName());
String name = StringUtil.localizeTile(inventory.getUnlocalizedName());
this.fontRendererObj.drawString(name, getCenteredOffset(name), 6, fontColor.get("gui.mail.text"));
String receive = StringUtil.localize("gui.mail.receive");
@@ -12,6 +12,7 @@ import java.util.Locale;
import java.util.Map.Entry;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.util.IIcon;
import net.minecraftforge.common.util.ForgeDirection;
@@ -27,7 +28,6 @@ import forestry.apiculture.items.ItemBeeGE;
import forestry.core.config.Config;
import forestry.core.config.Defaults;
import forestry.core.config.ForestryItem;
import forestry.core.gadgets.TileForestry;
import forestry.core.genetics.ItemGE;
import forestry.core.gui.GuiForestry;
import forestry.core.gui.widgets.Widget;
@@ -44,7 +44,7 @@ import forestry.plugins.PluginApiculture;
*
* @author SirSengir
*/
public class GuiPropolisPipe<T extends TileForestry> extends GuiForestry<T> {
public class GuiPropolisPipe extends GuiForestry<ContainerPropolisPipe, IInventory> {
class TypeFilterSlot extends Widget {
@@ -218,7 +218,7 @@ public class GuiPropolisPipe<T extends TileForestry> extends GuiForestry<T> {
private final PipeLogicPropolis pipeLogic;
public GuiPropolisPipe(EntityPlayer player, PipeItemsPropolis pipe) {
super(Defaults.TEXTURE_PATH_GUI + "/analyzer.png", new ContainerPropolisPipe(player.inventory, pipe));
super(Defaults.TEXTURE_PATH_GUI + "/analyzer.png", new ContainerPropolisPipe(player.inventory, pipe), null);
pipeLogic = pipe.pipeLogic;
// Request filter set update if on client
@@ -10,19 +10,19 @@
******************************************************************************/
package forestry.storage.gui;
import net.minecraft.inventory.IInventory;
import forestry.core.config.Defaults;
import forestry.core.gadgets.TileForestry;
import forestry.core.gui.ContainerForestry;
import forestry.core.gui.GuiForestry;
public class GuiBackpack extends GuiForestry<TileForestry> {
public class GuiBackpack extends GuiForestry<ContainerBackpack, IInventory> {
public GuiBackpack(ContainerForestry container) {
public GuiBackpack(ContainerBackpack container) {
this(Defaults.TEXTURE_PATH_GUI + "/backpack.png", container);
}
protected GuiBackpack(String texture, ContainerForestry container) {
super(texture, container);
protected GuiBackpack(String texture, ContainerBackpack container) {
super(texture, container, null);
}
@Override
@@ -10,13 +10,11 @@
******************************************************************************/
package forestry.storage.gui;
import forestry.core.config.Defaults;
import forestry.core.gui.ContainerForestry;
public class GuiBackpackT2 extends GuiBackpack {
public GuiBackpackT2(ContainerForestry container) {
public GuiBackpackT2(ContainerBackpack container) {
super(Defaults.TEXTURE_PATH_GUI + "/backpackT2.png", container);
xSize = 176;