fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Typo IConfigurableObject

Browse Source
This commit is contained in:
thatsIch
2014-09-20 22:20:00 +02:00
parent 8fbc6bbc67
commit e8d1ddb357
11 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/gui/implementations/GuiMEMonitorable.java
+2 -2
View File
@@ -19,7 +19,7 @@ import appeng.api.implementations.tiles.IViewCellStorage;
import appeng.api.storage.ITerminalHost; import appeng.api.storage.ITerminalHost;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.client.gui.AEBaseMEGui; import appeng.client.gui.AEBaseMEGui;
import appeng.client.gui.widgets.GuiImgButton; import appeng.client.gui.widgets.GuiImgButton;
import appeng.client.gui.widgets.GuiScrollbar; import appeng.client.gui.widgets.GuiScrollbar;
@@ -103,7 +103,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
standardSize = xSize; standardSize = xSize;
configSrc = ((IConfigureableObject) inventorySlots).getConfigManager(); configSrc = ((IConfigurableObject) inventorySlots).getConfigManager();
(mecontainer = (ContainerMEMonitorable) inventorySlots).gui = this; (mecontainer = (ContainerMEMonitorable) inventorySlots).gui = this;
viewCell = te instanceof IViewCellStorage; viewCell = te instanceof IViewCellStorage;
container/implementations/ContainerMEMonitorable.java
+3 -3
View File
@@ -34,7 +34,7 @@ import appeng.api.storage.ITerminalHost;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList; import appeng.api.storage.data.IItemList;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.container.AEBaseContainer; import appeng.container.AEBaseContainer;
import appeng.container.guisync.GuiSync; import appeng.container.guisync.GuiSync;
import appeng.container.slot.SlotRestrictedInput; import appeng.container.slot.SlotRestrictedInput;
@@ -48,7 +48,7 @@ import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost; import appeng.util.IConfigManagerHost;
import appeng.util.Platform; import appeng.util.Platform;
public class ContainerMEMonitorable extends AEBaseContainer implements IConfigManagerHost, IConfigureableObject, IMEMonitorHandlerReceiver<IAEItemStack> public class ContainerMEMonitorable extends AEBaseContainer implements IConfigManagerHost, IConfigurableObject, IMEMonitorHandlerReceiver<IAEItemStack>
{ {
final IMEMonitor<IAEItemStack> monitor; final IMEMonitor<IAEItemStack> monitor;
@@ -73,7 +73,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
return networkNode; return networkNode;
} }
protected ContainerMEMonitorable(InventoryPlayer ip, ITerminalHost montiorable, boolean bindInventory) { protected ContainerMEMonitorable(InventoryPlayer ip, ITerminalHost montiorable, boolean bindInventory) {
super( ip, montiorable instanceof TileEntity ? (TileEntity) montiorable : null, montiorable instanceof IPart ? (IPart) montiorable : null ); super( ip, montiorable instanceof TileEntity ? (TileEntity) montiorable : null, montiorable instanceof IPart ? (IPart) montiorable : null );
clientCM = new ConfigManager( this ); clientCM = new ConfigManager( this );
core/AEConfig.java
+2 -2
View File
@@ -15,7 +15,7 @@ import appeng.api.config.Settings;
import appeng.api.config.TerminalStyle; import appeng.api.config.TerminalStyle;
import appeng.api.config.YesNo; import appeng.api.config.YesNo;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.core.features.AEFeature; import appeng.core.features.AEFeature;
import appeng.core.settings.TickRates; import appeng.core.settings.TickRates;
import appeng.items.materials.MaterialType; import appeng.items.materials.MaterialType;
@@ -27,7 +27,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent;
public class AEConfig extends Configuration implements IConfigureableObject, IConfigManagerHost public class AEConfig extends Configuration implements IConfigurableObject, IConfigManagerHost
{ {
public static AEConfig instance; public static AEConfig instance;
core/sync/packets/PacketConfigButton.java
+3 -3
View File
@@ -9,7 +9,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import appeng.api.config.Settings; import appeng.api.config.Settings;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.container.AEBaseContainer; import appeng.container.AEBaseContainer;
import appeng.core.sync.AppEngPacket; import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.INetworkInfo; import appeng.core.sync.network.INetworkInfo;
@@ -32,9 +32,9 @@ public class PacketConfigButton extends AppEngPacket
{ {
EntityPlayerMP sender = (EntityPlayerMP) player; EntityPlayerMP sender = (EntityPlayerMP) player;
AEBaseContainer aebc = (AEBaseContainer) sender.openContainer; AEBaseContainer aebc = (AEBaseContainer) sender.openContainer;
if ( aebc.getTarget() instanceof IConfigureableObject ) if ( aebc.getTarget() instanceof IConfigurableObject )
{ {
IConfigManager cm = ((IConfigureableObject) aebc.getTarget()).getConfigManager(); IConfigManager cm = ((IConfigurableObject) aebc.getTarget()).getConfigManager();
Enum newState = Platform.rotateEnum( cm.getSetting( option ), rotationDirection, option.getPossibleValues() ); Enum newState = Platform.rotateEnum( cm.getSetting( option ), rotationDirection, option.getPossibleValues() );
cm.putSetting( option, newState ); cm.putSetting( option, newState );
} }
core/sync/packets/PacketValueConfig.java
+5 -5
View File
@@ -16,7 +16,7 @@ import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.config.FuzzyMode; import appeng.api.config.FuzzyMode;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.client.gui.implementations.GuiCraftingCPU; import appeng.client.gui.implementations.GuiCraftingCPU;
import appeng.container.AEBaseContainer; import appeng.container.AEBaseContainer;
import appeng.container.implementations.ContainerCellWorkbench; import appeng.container.implementations.ContainerCellWorkbench;
@@ -169,9 +169,9 @@ public class PacketValueConfig extends AppEngPacket
((ContainerNetworkTool) c).toggleFacadeMode(); ((ContainerNetworkTool) c).toggleFacadeMode();
} }
} }
else if ( c instanceof IConfigureableObject ) else if ( c instanceof IConfigurableObject )
{ {
IConfigManager cm = ((IConfigureableObject) c).getConfigManager(); IConfigManager cm = ((IConfigurableObject) c).getConfigManager();
for (Enum e : cm.getSettings()) for (Enum e : cm.getSettings())
{ {
@@ -215,9 +215,9 @@ public class PacketValueConfig extends AppEngPacket
((GuiCraftingCPU) gs).clearItems(); ((GuiCraftingCPU) gs).clearItems();
return; return;
} }
else if ( c instanceof IConfigureableObject ) else if ( c instanceof IConfigurableObject )
{ {
IConfigManager cm = ((IConfigureableObject) c).getConfigManager(); IConfigManager cm = ((IConfigurableObject) c).getConfigManager();
for (Enum e : cm.getSettings()) for (Enum e : cm.getSettings())
{ {
helpers/DualityInterface.java
+2 -2
View File
@@ -53,7 +53,7 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.AECableType; import appeng.api.util.AECableType;
import appeng.api.util.DimensionalCoord; import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.core.settings.TickRates; import appeng.core.settings.TickRates;
import appeng.me.GridAccessException; import appeng.me.GridAccessException;
import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.AENetworkProxy;
@@ -77,7 +77,7 @@ import appeng.util.item.AEItemStack;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
public class DualityInterface implements IGridTickable, ISegmentedInventory, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, public class DualityInterface implements IGridTickable, ISegmentedInventory, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory,
IConfigureableObject, IConfigManagerHost, ICraftingProvider, IUpgradeableHost, IPriorityHost IConfigurableObject, IConfigManagerHost, ICraftingProvider, IUpgradeableHost, IPriorityHost
{ {
final int sides[] = new int[] { 0, 1, 2, 3, 4, 5, 6, 7 }; final int sides[] = new int[] { 0, 1, 2, 3, 4, 5, 6, 7 };
parts/AEBasePart.java
+4 -4
View File
@@ -40,7 +40,7 @@ import appeng.api.util.AECableType;
import appeng.api.util.AEColor; import appeng.api.util.AEColor;
import appeng.api.util.DimensionalCoord; import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.helpers.ICustomNameObject; import appeng.helpers.ICustomNameObject;
import appeng.helpers.IPriorityHost; import appeng.helpers.IPriorityHost;
import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.AENetworkProxy;
@@ -299,9 +299,9 @@ public class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradea
*/ */
public void uploadSettings(SettingsFrom from, NBTTagCompound compound) public void uploadSettings(SettingsFrom from, NBTTagCompound compound)
{ {
if ( compound != null && this instanceof IConfigureableObject ) if ( compound != null && this instanceof IConfigurableObject )
{ {
IConfigManager cm = ((IConfigureableObject) this).getConfigManager(); IConfigManager cm = ((IConfigurableObject) this).getConfigManager();
if ( cm != null ) if ( cm != null )
cm.readFromNBT( compound ); cm.readFromNBT( compound );
} }
@@ -336,7 +336,7 @@ public class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradea
{ {
NBTTagCompound output = new NBTTagCompound(); NBTTagCompound output = new NBTTagCompound();
if ( this instanceof IConfigureableObject ) if ( this instanceof IConfigurableObject )
{ {
IConfigManager cm = this.getConfigManager(); IConfigManager cm = this.getConfigManager();
if ( cm != null ) if ( cm != null )
tile/AEBaseTile.java
+5 -5
View File
@@ -24,7 +24,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.implementations.tiles.ISegmentedInventory; import appeng.api.implementations.tiles.ISegmentedInventory;
import appeng.api.util.ICommonTile; import appeng.api.util.ICommonTile;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.api.util.IOrientable; import appeng.api.util.IOrientable;
import appeng.core.AELog; import appeng.core.AELog;
import appeng.core.features.ItemStackSrc; import appeng.core.features.ItemStackSrc;
@@ -398,9 +398,9 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
*/ */
public void uploadSettings(SettingsFrom from, NBTTagCompound compound) public void uploadSettings(SettingsFrom from, NBTTagCompound compound)
{ {
if ( compound != null && this instanceof IConfigureableObject ) if ( compound != null && this instanceof IConfigurableObject )
{ {
IConfigManager cm = ((IConfigureableObject) this).getConfigManager(); IConfigManager cm = ((IConfigurableObject) this).getConfigManager();
if ( cm != null ) if ( cm != null )
cm.readFromNBT( compound ); cm.readFromNBT( compound );
} }
@@ -442,9 +442,9 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
output.setTag( "display", dsp ); output.setTag( "display", dsp );
} }
if ( this instanceof IConfigureableObject ) if ( this instanceof IConfigurableObject )
{ {
IConfigManager cm = ((IConfigureableObject) this).getConfigManager(); IConfigManager cm = ((IConfigurableObject) this).getConfigManager();
if ( cm != null ) if ( cm != null )
cm.writeToNBT( output ); cm.writeToNBT( output );
} }
tile/misc/TileCellWorkbench.java
+2 -2
View File
@@ -12,7 +12,7 @@ import appeng.api.config.Upgrades;
import appeng.api.implementations.IUpgradeableHost; import appeng.api.implementations.IUpgradeableHost;
import appeng.api.storage.ICellWorkbenchItem; import appeng.api.storage.ICellWorkbenchItem;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.tile.AEBaseTile; import appeng.tile.AEBaseTile;
import appeng.tile.TileEvent; import appeng.tile.TileEvent;
import appeng.tile.events.TileEventType; import appeng.tile.events.TileEventType;
@@ -23,7 +23,7 @@ import appeng.tile.inventory.InvOperation;
import appeng.util.ConfigManager; import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost; import appeng.util.IConfigManagerHost;
public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, IAEAppEngInventory, IConfigureableObject, IConfigManagerHost public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, IAEAppEngInventory, IConfigurableObject, IConfigManagerHost
{ {
AppEngInternalInventory cell = new AppEngInternalInventory( this, 1 ); AppEngInternalInventory cell = new AppEngInternalInventory( this, 1 );
tile/misc/TileCondenser.java
+2 -2
View File
@@ -13,7 +13,7 @@ import appeng.api.config.CondenserOuput;
import appeng.api.config.Settings; import appeng.api.config.Settings;
import appeng.api.implementations.items.IStorageComponent; import appeng.api.implementations.items.IStorageComponent;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.tile.AEBaseInvTile; import appeng.tile.AEBaseInvTile;
import appeng.tile.TileEvent; import appeng.tile.TileEvent;
import appeng.tile.events.TileEventType; import appeng.tile.events.TileEventType;
@@ -24,7 +24,7 @@ import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost; import appeng.util.IConfigManagerHost;
import appeng.util.Platform; import appeng.util.Platform;
public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory, IFluidHandler, IConfigManagerHost, IConfigureableObject public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory, IFluidHandler, IConfigManagerHost, IConfigurableObject
{ {
int sides[] = new int[] { 0, 1 }; int sides[] = new int[] { 0, 1 };
tile/misc/TileInterface.java
+2 -2
View File
@@ -32,7 +32,7 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.AECableType; import appeng.api.util.AECableType;
import appeng.api.util.DimensionalCoord; import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.helpers.DualityInterface; import appeng.helpers.DualityInterface;
import appeng.helpers.IInterfaceHost; import appeng.helpers.IInterfaceHost;
import appeng.helpers.IPriorityHost; import appeng.helpers.IPriorityHost;
@@ -46,7 +46,7 @@ import appeng.util.inv.IInventoryDestination;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
public class TileInterface extends AENetworkInvTile implements IGridTickable, ISegmentedInventory, ITileStorageMonitorable, IStorageMonitorable, public class TileInterface extends AENetworkInvTile implements IGridTickable, ISegmentedInventory, ITileStorageMonitorable, IStorageMonitorable,
IInventoryDestination, IInterfaceHost, IConfigureableObject, IPriorityHost IInventoryDestination, IInterfaceHost, IConfigurableObject, IPriorityHost
{ {
ForgeDirection pointAt = ForgeDirection.UNKNOWN; ForgeDirection pointAt = ForgeDirection.UNKNOWN;