diff --git a/api/forestry b/api/forestry index 6beb57384..22a2117ad 160000 --- a/api/forestry +++ b/api/forestry @@ -1 +1 @@ -Subproject commit 6beb5738405eb089ae5e82e3792e0b024e1ff4e8 +Subproject commit 22a2117adf9dfb8ef4af665ce79d42503c3fa4f4 diff --git a/src/main/java/forestry/apiculture/gui/GuiAlveary.java b/src/main/java/forestry/apiculture/gui/GuiAlveary.java index 438fd6fc3..5821c90dc 100755 --- a/src/main/java/forestry/apiculture/gui/GuiAlveary.java +++ b/src/main/java/forestry/apiculture/gui/GuiAlveary.java @@ -16,7 +16,6 @@ import forestry.apiculture.multiblock.IAlvearyControllerInternal; import forestry.apiculture.multiblock.TileAlvearyPlain; import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; -import forestry.core.gui.ledgers.OwnerLedger; import forestry.core.render.EnumTankLevel; public class GuiAlveary extends GuiForestryTitled { @@ -41,13 +40,4 @@ public class GuiAlveary extends GuiForestryTitled ext int maxLedgerWidth = (this.width - this.xSize) / 2; this.ledgerManager = new LedgerManager(this, maxLedgerWidth); + addLedgers(); + } + + protected void addLedgers() { if (inventory instanceof IErrorSource) { ledgerManager.add((IErrorSource) inventory); } diff --git a/src/main/java/forestry/core/multiblock/FakeMultiblockController.java b/src/main/java/forestry/core/multiblock/FakeMultiblockController.java index f35af3aca..515ab7a48 100644 --- a/src/main/java/forestry/core/multiblock/FakeMultiblockController.java +++ b/src/main/java/forestry/core/multiblock/FakeMultiblockController.java @@ -11,6 +11,7 @@ package forestry.core.multiblock; import javax.annotation.Nonnull; +import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.Set; @@ -19,7 +20,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.core.IErrorLogic; import forestry.api.multiblock.IMultiblockComponent; +import forestry.core.access.EnumAccess; +import forestry.core.access.FakeAccessHandler; +import forestry.core.access.IAccessHandler; +import forestry.core.errors.FakeErrorLogic; +import forestry.core.network.DataInputStreamForestry; +import forestry.core.network.DataOutputStreamForestry; public abstract class FakeMultiblockController implements IMultiblockControllerInternal { @Override @@ -144,4 +154,49 @@ public abstract class FakeMultiblockController implements IMultiblockControllerI public void writeToNBT(NBTTagCompound nbttagcompound) { } + + @Override + public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess) { + + } + + @Override + public IAccessHandler getAccessHandler() { + return FakeAccessHandler.getInstance(); + } + + @Override + public EnumTemperature getTemperature() { + return EnumTemperature.NORMAL; + } + + @Override + public EnumHumidity getHumidity() { + return EnumHumidity.NORMAL; + } + + @Override + public float getExactTemperature() { + return 0.5f; + } + + @Override + public float getExactHumidity() { + return 0.5f; + } + + @Override + public IErrorLogic getErrorLogic() { + return FakeErrorLogic.instance; + } + + @Override + public void writeGuiData(DataOutputStreamForestry data) throws IOException { + + } + + @Override + public void readGuiData(DataInputStreamForestry data) throws IOException { + + } } diff --git a/src/main/java/forestry/core/multiblock/IMultiblockControllerInternal.java b/src/main/java/forestry/core/multiblock/IMultiblockControllerInternal.java index 5d0fca327..540fb75ab 100644 --- a/src/main/java/forestry/core/multiblock/IMultiblockControllerInternal.java +++ b/src/main/java/forestry/core/multiblock/IMultiblockControllerInternal.java @@ -17,12 +17,16 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; +import forestry.api.core.IErrorLogicSource; import forestry.api.core.INBTTagable; import forestry.api.multiblock.IMultiblockComponent; import forestry.api.multiblock.IMultiblockController; +import forestry.core.access.IRestrictedAccess; +import forestry.core.network.IStreamableGui; +import forestry.core.tiles.IClimatised; // internal implementation of IMultiblockController -public interface IMultiblockControllerInternal extends IMultiblockController, INBTTagable { +public interface IMultiblockControllerInternal extends IMultiblockController, INBTTagable, IRestrictedAccess, IErrorLogicSource, IClimatised, IStreamableGui { /** * Attach a new part to this machine. * @param part The part to add. diff --git a/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java b/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java index 9e71ec94c..61d3da004 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java +++ b/src/main/java/forestry/core/multiblock/MultiblockControllerBase.java @@ -807,6 +807,7 @@ public abstract class MultiblockControllerBase implements IMultiblockControllerI /** * @return True if this multiblock machine is considered assembled and ready to go. */ + @Override public boolean isAssembled() { return this.assemblyState == AssemblyState.Assembled; } diff --git a/src/main/java/forestry/core/multiblock/MultiblockControllerForestry.java b/src/main/java/forestry/core/multiblock/MultiblockControllerForestry.java index c92d1fb58..879be8d47 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockControllerForestry.java +++ b/src/main/java/forestry/core/multiblock/MultiblockControllerForestry.java @@ -27,7 +27,6 @@ import forestry.api.core.IErrorLogicSource; import forestry.api.multiblock.IMultiblockComponent; import forestry.core.access.AccessHandler; import forestry.core.access.IAccessHandler; -import forestry.core.access.IOwnable; import forestry.core.access.IRestrictedAccess; import forestry.core.inventory.FakeInventoryAdapter; import forestry.core.inventory.IInventoryAdapter; @@ -66,18 +65,9 @@ public abstract class MultiblockControllerForestry extends MultiblockControllerB Multiset owners = HashMultiset.create(); for (IMultiblockComponent part : connectedParts) { - if (part instanceof IRestrictedAccess) { - IAccessHandler accessHandler = ((IRestrictedAccess) part).getAccessHandler(); - GameProfile owner = accessHandler.getOwner(); - if (owner != null) { - owners.add(owner); - } - } else if (part instanceof IOwnable) { - IOwnable ownable = (IOwnable) part; - GameProfile owner = ownable.getOwner(); - if (owner != null) { - owners.add(owner); - } + GameProfile owner = part.getOwner(); + if (owner != null) { + owners.add(owner); } } diff --git a/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java b/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java index fe213e3da..0a939997c 100644 --- a/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java +++ b/src/main/java/forestry/core/multiblock/MultiblockTileEntityForestry.java @@ -21,15 +21,13 @@ import com.mojang.authlib.GameProfile; import forestry.api.multiblock.IMultiblockLogic; import forestry.api.multiblock.MultiblockTileEntityBase; -import forestry.core.access.IOwnable; import forestry.core.config.Constants; import forestry.core.inventory.FakeInventoryAdapter; import forestry.core.inventory.IInventoryAdapter; import forestry.core.tiles.IFilterSlotDelegate; import forestry.core.tiles.ILocatable; -import forestry.core.utils.PlayerUtil; -public abstract class MultiblockTileEntityForestry extends MultiblockTileEntityBase implements ISidedInventory, IFilterSlotDelegate, IOwnable, ILocatable { +public abstract class MultiblockTileEntityForestry extends MultiblockTileEntityBase implements ISidedInventory, IFilterSlotDelegate, ILocatable { private GameProfile owner; public MultiblockTileEntityForestry(T multiblockLogic) { @@ -67,27 +65,6 @@ public abstract class MultiblockTileEntityForestry e getInternalInventory().writeToNBT(data); } - /* IOwnable */ - @Override - public boolean isOwned() { - return owner != null; - } - - @Override - public GameProfile getOwner() { - return owner; - } - - @Override - public void setOwner(GameProfile owner) { - this.owner = owner; - } - - @Override - public boolean isOwner(EntityPlayer player) { - return PlayerUtil.isSameGameProfile(owner, player.getGameProfile()); - } - /* INVENTORY */ public IInventoryAdapter getInternalInventory() { return FakeInventoryAdapter.instance(); @@ -199,4 +176,14 @@ public abstract class MultiblockTileEntityForestry e public final World getWorld() { return worldObj; } + + /* IMultiblockComponent */ + @Override + public final GameProfile getOwner() { + return owner; + } + + public final void setOwner(GameProfile owner) { + this.owner = owner; + } } diff --git a/src/main/java/forestry/farming/gui/GuiFarm.java b/src/main/java/forestry/farming/gui/GuiFarm.java index 91ff5c750..1bf15fe14 100755 --- a/src/main/java/forestry/farming/gui/GuiFarm.java +++ b/src/main/java/forestry/farming/gui/GuiFarm.java @@ -16,7 +16,6 @@ import forestry.api.farming.FarmDirection; import forestry.core.config.Constants; import forestry.core.gui.GuiForestryTitled; import forestry.core.gui.ledgers.ClimateLedger; -import forestry.core.gui.ledgers.OwnerLedger; import forestry.core.gui.widgets.SocketWidget; import forestry.core.gui.widgets.TankWidget; import forestry.farming.gui.widgets.FarmLogicSlot; @@ -44,12 +43,11 @@ public class GuiFarm extends GuiForestryTitled { } @Override - public void initGui() { - super.initGui(); + protected void addLedgers() { IFarmControllerInternal farmController = inventory.getMultiblockLogic().getController(); ledgerManager.add(new ClimateLedger(ledgerManager, farmController)); ledgerManager.add(new FarmLedger(ledgerManager, farmController.getFarmLedgerDelegate())); - ledgerManager.add(new OwnerLedger(ledgerManager, farmController)); + super.addLedgers(); } @Override @@ -62,5 +60,4 @@ public class GuiFarm extends GuiForestryTitled { drawTexturedModalRect(guiLeft + 81, guiTop + 94 + 17 - fertilizerRemain, xSize, 17 - fertilizerRemain, 4, fertilizerRemain); } } - } diff --git a/src/main/java/forestry/farming/multiblock/FakeFarmController.java b/src/main/java/forestry/farming/multiblock/FakeFarmController.java index 9b23de5dc..3c786ab73 100644 --- a/src/main/java/forestry/farming/multiblock/FakeFarmController.java +++ b/src/main/java/forestry/farming/multiblock/FakeFarmController.java @@ -10,8 +10,6 @@ ******************************************************************************/ package forestry.farming.multiblock; -import java.io.IOException; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -20,24 +18,15 @@ import net.minecraftforge.fluids.FluidStack; import forestry.api.circuits.CircuitSocketType; import forestry.api.circuits.ICircuitSocketType; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; -import forestry.api.core.IErrorLogic; import forestry.api.farming.FarmDirection; import forestry.api.farming.IFarmInventory; import forestry.api.farming.IFarmLogic; import forestry.api.farming.IFarmable; -import forestry.core.access.EnumAccess; -import forestry.core.access.FakeAccessHandler; -import forestry.core.access.IAccessHandler; -import forestry.core.errors.FakeErrorLogic; import forestry.core.fluids.FakeTankManager; import forestry.core.fluids.ITankManager; import forestry.core.inventory.FakeInventoryAdapter; import forestry.core.inventory.IInventoryAdapter; import forestry.core.multiblock.FakeMultiblockController; -import forestry.core.network.DataInputStreamForestry; -import forestry.core.network.DataOutputStreamForestry; import forestry.farming.gui.IFarmLedgerDelegate; import io.netty.util.internal.EmptyArrays; @@ -49,26 +38,6 @@ public class FakeFarmController extends FakeMultiblockController implements IFar } - @Override - public EnumTemperature getTemperature() { - return EnumTemperature.NORMAL; - } - - @Override - public EnumHumidity getHumidity() { - return EnumHumidity.NORMAL; - } - - @Override - public float getExactTemperature() { - return 0.5f; - } - - @Override - public float getExactHumidity() { - return 0.5f; - } - @Override public int[] getCoords() { return EmptyArrays.EMPTY_INTS; @@ -129,11 +98,6 @@ public class FakeFarmController extends FakeMultiblockController implements IFar return 0; } - @Override - public IAccessHandler getAccessHandler() { - return FakeAccessHandler.getInstance(); - } - @Override public int getSocketCount() { return 0; @@ -154,11 +118,6 @@ public class FakeFarmController extends FakeMultiblockController implements IFar return CircuitSocketType.NONE; } - @Override - public IErrorLogic getErrorLogic() { - return FakeErrorLogic.instance; - } - @Override public IFarmLedgerDelegate getFarmLedgerDelegate() { return FakeFarmLedgerDelegate.instance; @@ -174,21 +133,6 @@ public class FakeFarmController extends FakeMultiblockController implements IFar return FakeTankManager.instance; } - @Override - public void onSwitchAccess(EnumAccess oldAccess, EnumAccess newAccess) { - - } - - @Override - public void writeGuiData(DataOutputStreamForestry data) throws IOException { - - } - - @Override - public void readGuiData(DataInputStreamForestry data) throws IOException { - - } - private static class FakeFarmInventory implements IFarmInventory { public static final FakeFarmInventory instance = new FakeFarmInventory();