From e8d1ddb3577b5e4cce4cf4848149c1f37728897f Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:20:00 +0200 Subject: [PATCH 01/28] Typo IConfigurableObject --- client/gui/implementations/GuiMEMonitorable.java | 4 ++-- container/implementations/ContainerMEMonitorable.java | 6 +++--- core/AEConfig.java | 4 ++-- core/sync/packets/PacketConfigButton.java | 6 +++--- core/sync/packets/PacketValueConfig.java | 10 +++++----- helpers/DualityInterface.java | 4 ++-- parts/AEBasePart.java | 8 ++++---- tile/AEBaseTile.java | 10 +++++----- tile/misc/TileCellWorkbench.java | 4 ++-- tile/misc/TileCondenser.java | 4 ++-- tile/misc/TileInterface.java | 4 ++-- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/client/gui/implementations/GuiMEMonitorable.java b/client/gui/implementations/GuiMEMonitorable.java index c95c59775..c2cdbde9a 100644 --- a/client/gui/implementations/GuiMEMonitorable.java +++ b/client/gui/implementations/GuiMEMonitorable.java @@ -19,7 +19,7 @@ import appeng.api.implementations.tiles.IViewCellStorage; import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEItemStack; import appeng.api.util.IConfigManager; -import appeng.api.util.IConfigureableObject; +import appeng.api.util.IConfigurableObject; import appeng.client.gui.AEBaseMEGui; import appeng.client.gui.widgets.GuiImgButton; import appeng.client.gui.widgets.GuiScrollbar; @@ -103,7 +103,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi standardSize = xSize; - configSrc = ((IConfigureableObject) inventorySlots).getConfigManager(); + configSrc = ((IConfigurableObject) inventorySlots).getConfigManager(); (mecontainer = (ContainerMEMonitorable) inventorySlots).gui = this; viewCell = te instanceof IViewCellStorage; diff --git a/container/implementations/ContainerMEMonitorable.java b/container/implementations/ContainerMEMonitorable.java index fefbb4832..d5c674d7d 100644 --- a/container/implementations/ContainerMEMonitorable.java +++ b/container/implementations/ContainerMEMonitorable.java @@ -34,7 +34,7 @@ import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.api.util.IConfigManager; -import appeng.api.util.IConfigureableObject; +import appeng.api.util.IConfigurableObject; import appeng.container.AEBaseContainer; import appeng.container.guisync.GuiSync; import appeng.container.slot.SlotRestrictedInput; @@ -48,7 +48,7 @@ import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; import appeng.util.Platform; -public class ContainerMEMonitorable extends AEBaseContainer implements IConfigManagerHost, IConfigureableObject, IMEMonitorHandlerReceiver +public class ContainerMEMonitorable extends AEBaseContainer implements IConfigManagerHost, IConfigurableObject, IMEMonitorHandlerReceiver { final IMEMonitor monitor; @@ -73,7 +73,7 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa 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 ); clientCM = new ConfigManager( this ); diff --git a/core/AEConfig.java b/core/AEConfig.java index 1993ae431..0a898cadf 100644 --- a/core/AEConfig.java +++ b/core/AEConfig.java @@ -15,7 +15,7 @@ import appeng.api.config.Settings; import appeng.api.config.TerminalStyle; import appeng.api.config.YesNo; import appeng.api.util.IConfigManager; -import appeng.api.util.IConfigureableObject; +import appeng.api.util.IConfigurableObject; import appeng.core.features.AEFeature; import appeng.core.settings.TickRates; 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.eventhandler.SubscribeEvent; -public class AEConfig extends Configuration implements IConfigureableObject, IConfigManagerHost +public class AEConfig extends Configuration implements IConfigurableObject, IConfigManagerHost { public static AEConfig instance; diff --git a/core/sync/packets/PacketConfigButton.java b/core/sync/packets/PacketConfigButton.java index cd1e883ae..4f416b917 100644 --- a/core/sync/packets/PacketConfigButton.java +++ b/core/sync/packets/PacketConfigButton.java @@ -9,7 +9,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import appeng.api.config.Settings; import appeng.api.util.IConfigManager; -import appeng.api.util.IConfigureableObject; +import appeng.api.util.IConfigurableObject; import appeng.container.AEBaseContainer; import appeng.core.sync.AppEngPacket; import appeng.core.sync.network.INetworkInfo; @@ -32,9 +32,9 @@ public class PacketConfigButton extends AppEngPacket { EntityPlayerMP sender = (EntityPlayerMP) player; 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() ); cm.putSetting( option, newState ); } diff --git a/core/sync/packets/PacketValueConfig.java b/core/sync/packets/PacketValueConfig.java index 400687067..fb4ffba83 100644 --- a/core/sync/packets/PacketValueConfig.java +++ b/core/sync/packets/PacketValueConfig.java @@ -16,7 +16,7 @@ import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import appeng.api.config.FuzzyMode; import appeng.api.util.IConfigManager; -import appeng.api.util.IConfigureableObject; +import appeng.api.util.IConfigurableObject; import appeng.client.gui.implementations.GuiCraftingCPU; import appeng.container.AEBaseContainer; import appeng.container.implementations.ContainerCellWorkbench; @@ -169,9 +169,9 @@ public class PacketValueConfig extends AppEngPacket ((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()) { @@ -215,9 +215,9 @@ public class PacketValueConfig extends AppEngPacket ((GuiCraftingCPU) gs).clearItems(); 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()) { diff --git a/helpers/DualityInterface.java b/helpers/DualityInterface.java index 57afcbf0d..ede02f876 100644 --- a/helpers/DualityInterface.java +++ b/helpers/DualityInterface.java @@ -53,7 +53,7 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.util.AECableType; import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; -import appeng.api.util.IConfigureableObject; +import appeng.api.util.IConfigurableObject; import appeng.core.settings.TickRates; import appeng.me.GridAccessException; import appeng.me.helpers.AENetworkProxy; @@ -77,7 +77,7 @@ import appeng.util.item.AEItemStack; import com.google.common.collect.ImmutableSet; 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 }; diff --git a/parts/AEBasePart.java b/parts/AEBasePart.java index b7ac2f799..1d45a4028 100644 --- a/parts/AEBasePart.java +++ b/parts/AEBasePart.java @@ -40,7 +40,7 @@ import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; -import appeng.api.util.IConfigureableObject; +import appeng.api.util.IConfigurableObject; import appeng.helpers.ICustomNameObject; import appeng.helpers.IPriorityHost; import appeng.me.helpers.AENetworkProxy; @@ -299,9 +299,9 @@ public class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradea */ 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 ) cm.readFromNBT( compound ); } @@ -336,7 +336,7 @@ public class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradea { NBTTagCompound output = new NBTTagCompound(); - if ( this instanceof IConfigureableObject ) + if ( this instanceof IConfigurableObject ) { IConfigManager cm = this.getConfigManager(); if ( cm != null ) diff --git a/tile/AEBaseTile.java b/tile/AEBaseTile.java index 5ae96bebf..5d0d84c6d 100644 --- a/tile/AEBaseTile.java +++ b/tile/AEBaseTile.java @@ -24,7 +24,7 @@ import net.minecraftforge.common.util.ForgeDirection; import appeng.api.implementations.tiles.ISegmentedInventory; import appeng.api.util.ICommonTile; import appeng.api.util.IConfigManager; -import appeng.api.util.IConfigureableObject; +import appeng.api.util.IConfigurableObject; import appeng.api.util.IOrientable; import appeng.core.AELog; import appeng.core.features.ItemStackSrc; @@ -398,9 +398,9 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, */ 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 ) cm.readFromNBT( compound ); } @@ -442,9 +442,9 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, 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 ) cm.writeToNBT( output ); } diff --git a/tile/misc/TileCellWorkbench.java b/tile/misc/TileCellWorkbench.java index 8b93f215d..954f7aab5 100644 --- a/tile/misc/TileCellWorkbench.java +++ b/tile/misc/TileCellWorkbench.java @@ -12,7 +12,7 @@ import appeng.api.config.Upgrades; import appeng.api.implementations.IUpgradeableHost; import appeng.api.storage.ICellWorkbenchItem; import appeng.api.util.IConfigManager; -import appeng.api.util.IConfigureableObject; +import appeng.api.util.IConfigurableObject; import appeng.tile.AEBaseTile; import appeng.tile.TileEvent; import appeng.tile.events.TileEventType; @@ -23,7 +23,7 @@ import appeng.tile.inventory.InvOperation; import appeng.util.ConfigManager; 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 ); diff --git a/tile/misc/TileCondenser.java b/tile/misc/TileCondenser.java index 8e6434ab4..7071e1d38 100644 --- a/tile/misc/TileCondenser.java +++ b/tile/misc/TileCondenser.java @@ -13,7 +13,7 @@ import appeng.api.config.CondenserOuput; import appeng.api.config.Settings; import appeng.api.implementations.items.IStorageComponent; import appeng.api.util.IConfigManager; -import appeng.api.util.IConfigureableObject; +import appeng.api.util.IConfigurableObject; import appeng.tile.AEBaseInvTile; import appeng.tile.TileEvent; import appeng.tile.events.TileEventType; @@ -24,7 +24,7 @@ import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; 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 }; diff --git a/tile/misc/TileInterface.java b/tile/misc/TileInterface.java index 4742d1829..96c053f1e 100644 --- a/tile/misc/TileInterface.java +++ b/tile/misc/TileInterface.java @@ -32,7 +32,7 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.util.AECableType; import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; -import appeng.api.util.IConfigureableObject; +import appeng.api.util.IConfigurableObject; import appeng.helpers.DualityInterface; import appeng.helpers.IInterfaceHost; import appeng.helpers.IPriorityHost; @@ -46,7 +46,7 @@ import appeng.util.inv.IInventoryDestination; import com.google.common.collect.ImmutableSet; public class TileInterface extends AENetworkInvTile implements IGridTickable, ISegmentedInventory, ITileStorageMonitorable, IStorageMonitorable, - IInventoryDestination, IInterfaceHost, IConfigureableObject, IPriorityHost + IInventoryDestination, IInterfaceHost, IConfigurableObject, IPriorityHost { ForgeDirection pointAt = ForgeDirection.UNKNOWN; From d5223e56eaf7ca565a85cade2e3a3389050dc175 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:20:53 +0200 Subject: [PATCH 02/28] Typo IPartCollsionHelper --- client/render/BusRenderHelper.java | 4 ++-- client/render/blocks/RenderBlockAssembler.java | 4 ++-- facade/FacadePart.java | 6 +++--- fmp/CableBusPart.java | 6 +++--- parts/AEBasePart.java | 4 ++-- parts/BusCollisionHelper.java | 4 ++-- parts/CableBusContainer.java | 8 ++++---- parts/automation/PartAnnihilationPlane.java | 4 ++-- parts/automation/PartExportBus.java | 4 ++-- parts/automation/PartFormationPlane.java | 4 ++-- parts/automation/PartImportBus.java | 4 ++-- parts/automation/PartLevelEmitter.java | 4 ++-- parts/misc/PartCableAnchor.java | 4 ++-- parts/misc/PartInterface.java | 4 ++-- parts/misc/PartStorageBus.java | 4 ++-- parts/misc/PartToggleBus.java | 4 ++-- parts/networking/PartCable.java | 4 ++-- parts/networking/PartCableCovered.java | 4 ++-- parts/networking/PartCableSmart.java | 4 ++-- parts/networking/PartDenseCable.java | 4 ++-- parts/networking/PartQuartzFiber.java | 4 ++-- parts/p2p/PartP2PTunnel.java | 4 ++-- parts/reporting/PartMonitor.java | 4 ++-- 23 files changed, 50 insertions(+), 50 deletions(-) diff --git a/client/render/BusRenderHelper.java b/client/render/BusRenderHelper.java index 82652a2e5..3294d75bc 100644 --- a/client/render/BusRenderHelper.java +++ b/client/render/BusRenderHelper.java @@ -9,7 +9,7 @@ import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; import appeng.api.AEApi; import appeng.api.parts.IBoxProvider; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.ISimplifiedBundle; import appeng.block.AEBaseBlock; @@ -41,7 +41,7 @@ public class BusRenderHelper implements IPartRenderHelper int color = 0xffffff; - class BoundBoxCalculator implements IPartCollsionHelper + class BoundBoxCalculator implements IPartCollisionHelper { public boolean started = false; diff --git a/client/render/blocks/RenderBlockAssembler.java b/client/render/blocks/RenderBlockAssembler.java index 972217a4c..1b5284414 100644 --- a/client/render/blocks/RenderBlockAssembler.java +++ b/client/render/blocks/RenderBlockAssembler.java @@ -13,7 +13,7 @@ import net.minecraftforge.common.util.ForgeDirection; import appeng.api.networking.IGridHost; import appeng.api.parts.IBoxProvider; import appeng.api.parts.IPart; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.util.IOrientable; import appeng.block.AEBaseBlock; @@ -251,7 +251,7 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { bch.addBox( 0, 0, 0, 16, 16, 16 ); } diff --git a/facade/FacadePart.java b/facade/FacadePart.java index 8ba033754..57ce4fe91 100644 --- a/facade/FacadePart.java +++ b/facade/FacadePart.java @@ -22,7 +22,7 @@ import appeng.api.AEApi; import appeng.api.parts.IBoxProvider; import appeng.api.parts.IFacadeContainer; import appeng.api.parts.IFacadePart; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.ISimplifiedBundle; @@ -61,7 +61,7 @@ public class FacadePart implements IFacadePart, IBoxProvider } @Override - public void getBoxes(IPartCollsionHelper ch, Entity e) + public void getBoxes(IPartCollisionHelper ch, Entity e) { if ( e instanceof EntityLivingBase ) { @@ -76,7 +76,7 @@ public class FacadePart implements IFacadePart, IBoxProvider } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { getBoxes( bch, null ); diff --git a/fmp/CableBusPart.java b/fmp/CableBusPart.java index a59cc7857..0592730ad 100644 --- a/fmp/CableBusPart.java +++ b/fmp/CableBusPart.java @@ -24,7 +24,7 @@ import appeng.api.networking.IGridNode; import appeng.api.parts.IFacadeContainer; import appeng.api.parts.IFacadePart; import appeng.api.parts.IPart; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartItem; import appeng.api.parts.LayerFlags; @@ -315,7 +315,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds if ( !(side == null || side == ForgeDirection.UNKNOWN || tile() == null) ) { List boxes = new ArrayList(); - IPartCollsionHelper bch = new BusCollisionHelper( boxes, side, null, true ); + IPartCollisionHelper bch = new BusCollisionHelper( boxes, side, null, true ); fp.getBoxes( bch, null ); for (AxisAlignedBB bb : boxes) { @@ -342,7 +342,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds if ( !(side == null || side == ForgeDirection.UNKNOWN || tile() == null) ) { List boxes = new ArrayList(); - IPartCollsionHelper bch = new BusCollisionHelper( boxes, side, null, true ); + IPartCollisionHelper bch = new BusCollisionHelper( boxes, side, null, true ); bp.getBoxes( bch ); for (AxisAlignedBB bb : boxes) { diff --git a/parts/AEBasePart.java b/parts/AEBasePart.java index 1d45a4028..1831f5080 100644 --- a/parts/AEBasePart.java +++ b/parts/AEBasePart.java @@ -31,7 +31,7 @@ import appeng.api.networking.IGridNode; import appeng.api.networking.security.IActionHost; import appeng.api.parts.BusSupport; import appeng.api.parts.IPart; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.ISimplifiedBundle; @@ -225,7 +225,7 @@ public class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradea } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { } diff --git a/parts/BusCollisionHelper.java b/parts/BusCollisionHelper.java index ef5dee411..451dfbf64 100644 --- a/parts/BusCollisionHelper.java +++ b/parts/BusCollisionHelper.java @@ -5,9 +5,9 @@ import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.util.ForgeDirection; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; -public class BusCollisionHelper implements IPartCollsionHelper +public class BusCollisionHelper implements IPartCollisionHelper { final List boxes; diff --git a/parts/CableBusContainer.java b/parts/CableBusContainer.java index 6fdc6acb4..c38adca66 100644 --- a/parts/CableBusContainer.java +++ b/parts/CableBusContainer.java @@ -29,7 +29,7 @@ import appeng.api.networking.IGridNode; import appeng.api.parts.IFacadeContainer; import appeng.api.parts.IFacadePart; import appeng.api.parts.IPart; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartItem; import appeng.api.parts.LayerFlags; @@ -438,7 +438,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I IFacadeContainer fc = getFacadeContainer(); for (ForgeDirection s : ForgeDirection.values()) { - IPartCollsionHelper bch = new BusCollisionHelper( boxes, s, e, visual ); + IPartCollisionHelper bch = new BusCollisionHelper( boxes, s, e, visual ); IPart part = getPart( s ); if ( part != null ) @@ -863,7 +863,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I { List boxes = new LinkedList(); - IPartCollsionHelper bch = new BusCollisionHelper( boxes, side, null, true ); + IPartCollisionHelper bch = new BusCollisionHelper( boxes, side, null, true ); p.getBoxes( bch ); for (AxisAlignedBB bb : boxes) { @@ -886,7 +886,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I { List boxes = new LinkedList(); - IPartCollsionHelper bch = new BusCollisionHelper( boxes, side, null, true ); + IPartCollisionHelper bch = new BusCollisionHelper( boxes, side, null, true ); p.getBoxes( bch, null ); for (AxisAlignedBB bb : boxes) { diff --git a/parts/automation/PartAnnihilationPlane.java b/parts/automation/PartAnnihilationPlane.java index a2add866b..a883e9824 100644 --- a/parts/automation/PartAnnihilationPlane.java +++ b/parts/automation/PartAnnihilationPlane.java @@ -31,7 +31,7 @@ import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickingRequest; import appeng.api.parts.IPart; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.storage.data.IAEItemStack; @@ -127,7 +127,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { int minX = 1; int minY = 1; diff --git a/parts/automation/PartExportBus.java b/parts/automation/PartExportBus.java index 736129c9f..6149facd3 100644 --- a/parts/automation/PartExportBus.java +++ b/parts/automation/PartExportBus.java @@ -22,7 +22,7 @@ import appeng.api.networking.security.MachineSource; import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickingRequest; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartRenderHelper; import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEMonitor; @@ -138,7 +138,7 @@ public class PartExportBus extends PartSharedItemBus implements IGridTickable, I } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { bch.addBox( 4, 4, 12, 12, 12, 14 ); bch.addBox( 5, 5, 14, 11, 11, 15 ); diff --git a/parts/automation/PartFormationPlane.java b/parts/automation/PartFormationPlane.java index c2de9e345..081b949ee 100644 --- a/parts/automation/PartFormationPlane.java +++ b/parts/automation/PartFormationPlane.java @@ -35,7 +35,7 @@ import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.networking.security.BaseActionSource; import appeng.api.parts.IPart; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartItem; import appeng.api.parts.IPartRenderHelper; @@ -200,7 +200,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { int minX = 1; int minY = 1; diff --git a/parts/automation/PartImportBus.java b/parts/automation/PartImportBus.java index 41805bf04..7a7a2b6a0 100644 --- a/parts/automation/PartImportBus.java +++ b/parts/automation/PartImportBus.java @@ -19,7 +19,7 @@ import appeng.api.networking.security.MachineSource; import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickingRequest; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartRenderHelper; import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEMonitor; @@ -125,7 +125,7 @@ public class PartImportBus extends PartSharedItemBus implements IGridTickable, I } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { bch.addBox( 6, 6, 11, 10, 10, 13 ); bch.addBox( 5, 5, 13, 11, 11, 14 ); diff --git a/parts/automation/PartLevelEmitter.java b/parts/automation/PartLevelEmitter.java index 8ffe4be61..0b684b52d 100644 --- a/parts/automation/PartLevelEmitter.java +++ b/parts/automation/PartLevelEmitter.java @@ -38,7 +38,7 @@ import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.storage.IBaseMonitor; import appeng.api.networking.storage.IStackWatcher; import appeng.api.networking.storage.IStackWatcherHost; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartRenderHelper; import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitorHandlerReceiver; @@ -602,7 +602,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { bch.addBox( 7, 7, 11, 9, 9, 16 ); } diff --git a/parts/misc/PartCableAnchor.java b/parts/misc/PartCableAnchor.java index c8acf2eb6..e542c4d4b 100644 --- a/parts/misc/PartCableAnchor.java +++ b/parts/misc/PartCableAnchor.java @@ -20,7 +20,7 @@ import net.minecraftforge.common.util.ForgeDirection; import appeng.api.networking.IGridNode; import appeng.api.parts.BusSupport; import appeng.api.parts.IPart; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.ISimplifiedBundle; @@ -73,7 +73,7 @@ public class PartCableAnchor implements IPart } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { if ( host != null && host.getFacadeContainer().getFacade( mySide ) != null ) bch.addBox( 7, 7, 10, 9, 9, 14 ); diff --git a/parts/misc/PartInterface.java b/parts/misc/PartInterface.java index e1fdcfeee..67610aa38 100644 --- a/parts/misc/PartInterface.java +++ b/parts/misc/PartInterface.java @@ -29,7 +29,7 @@ import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickingRequest; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartRenderHelper; import appeng.api.storage.IMEMonitor; import appeng.api.storage.IStorageMonitorable; @@ -158,7 +158,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISeg } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { bch.addBox( 2, 2, 14, 14, 14, 16 ); bch.addBox( 5, 5, 12, 11, 11, 14 ); diff --git a/parts/misc/PartStorageBus.java b/parts/misc/PartStorageBus.java index 0c4f2cc81..f970f3587 100644 --- a/parts/misc/PartStorageBus.java +++ b/parts/misc/PartStorageBus.java @@ -30,7 +30,7 @@ import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.ITickManager; import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickingRequest; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.storage.ICellContainer; @@ -407,7 +407,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { bch.addBox( 3, 3, 15, 13, 13, 16 ); bch.addBox( 2, 2, 14, 14, 14, 15 ); diff --git a/parts/misc/PartToggleBus.java b/parts/misc/PartToggleBus.java index 06ec0d15e..575dd040e 100644 --- a/parts/misc/PartToggleBus.java +++ b/parts/misc/PartToggleBus.java @@ -18,7 +18,7 @@ import appeng.api.AEApi; import appeng.api.exceptions.FailedConnection; import appeng.api.networking.IGridConnection; import appeng.api.networking.IGridNode; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.util.AECableType; @@ -195,7 +195,7 @@ public class PartToggleBus extends PartBasicState } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { bch.addBox( 6, 6, 11, 10, 10, 16 ); } diff --git a/parts/networking/PartCable.java b/parts/networking/PartCable.java index 4dcb7c3c6..adfd46be3 100644 --- a/parts/networking/PartCable.java +++ b/parts/networking/PartCable.java @@ -25,7 +25,7 @@ import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; import appeng.api.parts.BusSupport; import appeng.api.parts.IPart; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.util.AECableType; @@ -346,7 +346,7 @@ public class PartCable extends AEBasePart implements IPartCable } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { bch.addBox( 6.0, 6.0, 6.0, 10.0, 10.0, 10.0 ); diff --git a/parts/networking/PartCableCovered.java b/parts/networking/PartCableCovered.java index 7e3f67ea4..d990e92f0 100644 --- a/parts/networking/PartCableCovered.java +++ b/parts/networking/PartCableCovered.java @@ -15,7 +15,7 @@ import appeng.api.networking.events.MENetworkChannelsChanged; import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.parts.IPart; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.util.AECableType; @@ -61,7 +61,7 @@ public class PartCableCovered extends PartCable } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { bch.addBox( 5.0, 5.0, 5.0, 11.0, 11.0, 11.0 ); diff --git a/parts/networking/PartCableSmart.java b/parts/networking/PartCableSmart.java index c67bc4cfa..32e089230 100644 --- a/parts/networking/PartCableSmart.java +++ b/parts/networking/PartCableSmart.java @@ -16,7 +16,7 @@ import appeng.api.networking.events.MENetworkChannelsChanged; import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.parts.IPart; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.util.AECableType; @@ -115,7 +115,7 @@ public class PartCableSmart extends PartCable } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { bch.addBox( 5.0, 5.0, 5.0, 11.0, 11.0, 11.0 ); diff --git a/parts/networking/PartDenseCable.java b/parts/networking/PartDenseCable.java index a83a93a11..73bd5ef58 100644 --- a/parts/networking/PartDenseCable.java +++ b/parts/networking/PartDenseCable.java @@ -19,7 +19,7 @@ import appeng.api.networking.events.MENetworkChannelsChanged; import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.parts.BusSupport; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.util.AECableType; @@ -127,7 +127,7 @@ public class PartDenseCable extends PartCable } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { boolean noLadder = !bch.isBBCollision(); double min = noLadder ? 3.0 : 4.9; diff --git a/parts/networking/PartQuartzFiber.java b/parts/networking/PartQuartzFiber.java index 1570cb390..87fd0a6c5 100644 --- a/parts/networking/PartQuartzFiber.java +++ b/parts/networking/PartQuartzFiber.java @@ -18,7 +18,7 @@ import appeng.api.networking.GridFlags; import appeng.api.networking.IGridNode; import appeng.api.networking.energy.IEnergyGrid; import appeng.api.networking.energy.IEnergyGridProvider; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartRenderHelper; import appeng.api.util.AECableType; @@ -107,7 +107,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { bch.addBox( 6, 6, 10, 10, 10, 16 ); } diff --git a/parts/p2p/PartP2PTunnel.java b/parts/p2p/PartP2PTunnel.java index 7a5c32c25..3bae7ffc1 100644 --- a/parts/p2p/PartP2PTunnel.java +++ b/parts/p2p/PartP2PTunnel.java @@ -18,7 +18,7 @@ import appeng.api.config.TunnelType; import appeng.api.implementations.items.IMemoryCard; import appeng.api.implementations.items.MemoryCardMessages; import appeng.api.parts.IPart; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartItem; import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.PartItemStack; @@ -373,7 +373,7 @@ public class PartP2PTunnel extends PartBasicState } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { bch.addBox( 5, 5, 12, 11, 11, 13 ); bch.addBox( 3, 3, 13, 13, 13, 14 ); diff --git a/parts/reporting/PartMonitor.java b/parts/reporting/PartMonitor.java index 1cb3fe83a..6cd51a9b9 100644 --- a/parts/reporting/PartMonitor.java +++ b/parts/reporting/PartMonitor.java @@ -19,7 +19,7 @@ import appeng.api.networking.GridFlags; import appeng.api.networking.events.MENetworkBootingStatusChange; import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkPowerStatusChange; -import appeng.api.parts.IPartCollsionHelper; +import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartRenderHelper; import appeng.client.texture.CableBusTextures; import appeng.me.GridAccessException; @@ -316,7 +316,7 @@ public class PartMonitor extends AEBasePart implements IPartMonitor, IPowerChann } @Override - public void getBoxes(IPartCollsionHelper bch) + public void getBoxes(IPartCollisionHelper bch) { bch.addBox( 2, 2, 14, 14, 14, 16 ); bch.addBox( 4, 4, 13, 12, 12, 14 ); From cea7b17699e5b6abb95a3ba62101f38447c1c358 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:21:47 +0200 Subject: [PATCH 03/28] Typo CondenserOuput --- client/gui/widgets/GuiImgButton.java | 8 ++++---- container/implementations/ContainerCondenser.java | 6 +++--- core/AEConfig.java | 6 +++--- tile/misc/TileCondenser.java | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/client/gui/widgets/GuiImgButton.java b/client/gui/widgets/GuiImgButton.java index 2e9088ffe..02f75e503 100644 --- a/client/gui/widgets/GuiImgButton.java +++ b/client/gui/widgets/GuiImgButton.java @@ -11,7 +11,7 @@ import org.lwjgl.opengl.GL11; import appeng.api.config.AccessRestriction; import appeng.api.config.ActionItems; -import appeng.api.config.CondenserOuput; +import appeng.api.config.CondenserOutput; import appeng.api.config.FullnessMode; import appeng.api.config.FuzzyMode; import appeng.api.config.LevelType; @@ -102,9 +102,9 @@ public class GuiImgButton extends GuiButton implements ITooltip if ( Appearances == null ) { Appearances = new HashMap(); - registerApp( 16 * 7 + 0, Settings.CONDENSER_OUTPUT, CondenserOuput.TRASH, ButtonToolTips.CondenserOutput, ButtonToolTips.Trash ); - registerApp( 16 * 7 + 1, Settings.CONDENSER_OUTPUT, CondenserOuput.MATTER_BALLS, ButtonToolTips.CondenserOutput, ButtonToolTips.MatterBalls ); - registerApp( 16 * 7 + 2, Settings.CONDENSER_OUTPUT, CondenserOuput.SINGULARITY, ButtonToolTips.CondenserOutput, ButtonToolTips.Singularity ); + registerApp( 16 * 7 + 0, Settings.CONDENSER_OUTPUT, CondenserOutput.TRASH, ButtonToolTips.CondenserOutput, ButtonToolTips.Trash ); + registerApp( 16 * 7 + 1, Settings.CONDENSER_OUTPUT, CondenserOutput.MATTER_BALLS, ButtonToolTips.CondenserOutput, ButtonToolTips.MatterBalls ); + registerApp( 16 * 7 + 2, Settings.CONDENSER_OUTPUT, CondenserOutput.SINGULARITY, ButtonToolTips.CondenserOutput, ButtonToolTips.Singularity ); registerApp( 16 * 9 + 1, Settings.ACCESS, AccessRestriction.READ, ButtonToolTips.IOMode, ButtonToolTips.Read ); registerApp( 16 * 9 + 0, Settings.ACCESS, AccessRestriction.WRITE, ButtonToolTips.IOMode, ButtonToolTips.Write ); diff --git a/container/implementations/ContainerCondenser.java b/container/implementations/ContainerCondenser.java index 87c59a027..ba11eb060 100644 --- a/container/implementations/ContainerCondenser.java +++ b/container/implementations/ContainerCondenser.java @@ -1,7 +1,7 @@ package appeng.container.implementations; import net.minecraft.entity.player.InventoryPlayer; -import appeng.api.config.CondenserOuput; +import appeng.api.config.CondenserOutput; import appeng.api.config.Settings; import appeng.container.AEBaseContainer; import appeng.container.guisync.GuiSync; @@ -38,7 +38,7 @@ public class ContainerCondenser extends AEBaseContainer this.requiredEnergy = (int) maxDisplay; this.storedPower = (int) this.myte.storedPower; - this.output = (CondenserOuput) this.myte.getConfigManager().getSetting( Settings.CONDENSER_OUTPUT ); + this.output = (CondenserOutput) this.myte.getConfigManager().getSetting( Settings.CONDENSER_OUTPUT ); } super.detectAndSendChanges(); @@ -51,6 +51,6 @@ public class ContainerCondenser extends AEBaseContainer public long storedPower = 0; @GuiSync(2) - public CondenserOuput output = CondenserOuput.TRASH; + public CondenserOutput output = CondenserOutput.TRASH; } diff --git a/core/AEConfig.java b/core/AEConfig.java index 0a898cadf..a419e6aa6 100644 --- a/core/AEConfig.java +++ b/core/AEConfig.java @@ -7,7 +7,7 @@ import java.util.List; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import appeng.api.config.CondenserOuput; +import appeng.api.config.CondenserOutput; import appeng.api.config.PowerMultiplier; import appeng.api.config.PowerUnits; import appeng.api.config.SearchBoxMode; @@ -223,8 +223,8 @@ public class AEConfig extends Configuration implements IConfigurableObject, ICon double usageEffective = get( "PowerRatios", "UsageMultiplier", 1.0 ).getDouble( 1.0 ); PowerMultiplier.CONFIG.multiplier = Math.max( 0.01, usageEffective ); - CondenserOuput.MATTER_BALLS.requiredPower = get( "Condenser", "MatterBalls", 256 ).getInt( 256 ); - CondenserOuput.SINGULARITY.requiredPower = get( "Condenser", "Singularity", 256000 ).getInt( 256000 ); + CondenserOutput.MATTER_BALLS.requiredPower = get( "Condenser", "MatterBalls", 256 ).getInt( 256 ); + CondenserOutput.SINGULARITY.requiredPower = get( "Condenser", "Singularity", 256000 ).getInt( 256000 ); grinderOres = get( "GrindStone", "grinderOres", grinderOres ).getStringList(); oreDoublePercentage = get( "GrindStone", "oreDoublePercentage", oreDoublePercentage ).getDouble( oreDoublePercentage ); diff --git a/tile/misc/TileCondenser.java b/tile/misc/TileCondenser.java index 7071e1d38..bd7991da0 100644 --- a/tile/misc/TileCondenser.java +++ b/tile/misc/TileCondenser.java @@ -9,7 +9,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import appeng.api.AEApi; -import appeng.api.config.CondenserOuput; +import appeng.api.config.CondenserOutput; import appeng.api.config.Settings; import appeng.api.implementations.items.IStorageComponent; import appeng.api.util.IConfigManager; @@ -49,7 +49,7 @@ public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory, } public TileCondenser() { - cm.registerSetting( Settings.CONDENSER_OUTPUT, CondenserOuput.TRASH ); + cm.registerSetting( Settings.CONDENSER_OUTPUT, CondenserOutput.TRASH ); } public double getStorage() @@ -112,7 +112,7 @@ public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory, private ItemStack getOutput() { - switch ((CondenserOuput) cm.getSetting( Settings.CONDENSER_OUTPUT )) + switch ((CondenserOutput) cm.getSetting( Settings.CONDENSER_OUTPUT )) { case MATTER_BALLS: return AEApi.instance().materials().materialMatterBall.stack( 1 ); @@ -126,7 +126,7 @@ public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory, public double getRequiredPower() { - return ((CondenserOuput) cm.getSetting( Settings.CONDENSER_OUTPUT )).requiredPower; + return ((CondenserOutput) cm.getSetting( Settings.CONDENSER_OUTPUT )).requiredPower; } @Override From c566e0e3b631981ddeaf9d206222703c7ab522a1 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:24:40 +0200 Subject: [PATCH 04/28] Typo IGridConnecitonVisitor --- me/GridNode.java | 6 +++--- me/pathfinding/AdHocChannelUpdater.java | 4 ++-- me/pathfinding/ControllerChannelUpdater.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/me/GridNode.java b/me/GridNode.java index 1c3974949..167dd97ec 100644 --- a/me/GridNode.java +++ b/me/GridNode.java @@ -17,7 +17,7 @@ import appeng.api.networking.GridNotification; import appeng.api.networking.IGrid; import appeng.api.networking.IGridBlock; import appeng.api.networking.IGridCache; -import appeng.api.networking.IGridConnecitonVisitor; +import appeng.api.networking.IGridConnectionVisitor; import appeng.api.networking.IGridConnection; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; @@ -172,10 +172,10 @@ public class GridNode implements IGridNode, IPathItem visitorIterationNumber = tracker; - if ( g instanceof IGridConnecitonVisitor ) + if ( g instanceof IGridConnectionVisitor ) { LinkedList nextConn = new LinkedList(); - IGridConnecitonVisitor gcv = (IGridConnecitonVisitor) g; + IGridConnectionVisitor gcv = (IGridConnectionVisitor) g; while (!nextRun.isEmpty()) { diff --git a/me/pathfinding/AdHocChannelUpdater.java b/me/pathfinding/AdHocChannelUpdater.java index 0d6936ff8..4ed91a39a 100644 --- a/me/pathfinding/AdHocChannelUpdater.java +++ b/me/pathfinding/AdHocChannelUpdater.java @@ -1,12 +1,12 @@ package appeng.me.pathfinding; -import appeng.api.networking.IGridConnecitonVisitor; +import appeng.api.networking.IGridConnectionVisitor; import appeng.api.networking.IGridConnection; import appeng.api.networking.IGridNode; import appeng.me.GridConnection; import appeng.me.GridNode; -public class AdHocChannelUpdater implements IGridConnecitonVisitor +public class AdHocChannelUpdater implements IGridConnectionVisitor { final private int usedChannels; diff --git a/me/pathfinding/ControllerChannelUpdater.java b/me/pathfinding/ControllerChannelUpdater.java index c916d9f3b..a9d0b5a34 100644 --- a/me/pathfinding/ControllerChannelUpdater.java +++ b/me/pathfinding/ControllerChannelUpdater.java @@ -1,12 +1,12 @@ package appeng.me.pathfinding; -import appeng.api.networking.IGridConnecitonVisitor; +import appeng.api.networking.IGridConnectionVisitor; import appeng.api.networking.IGridConnection; import appeng.api.networking.IGridNode; import appeng.me.GridConnection; import appeng.me.GridNode; -public class ControllerChannelUpdater implements IGridConnecitonVisitor +public class ControllerChannelUpdater implements IGridConnectionVisitor { @Override From fce96ec08b7098c07cdf034caf904a2a76923d40 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:25:14 +0200 Subject: [PATCH 05/28] Typo IWirelessTermRegistery --- core/features/registries/RegistryContainer.java | 4 ++-- core/features/registries/WirelessRegistry.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/features/registries/RegistryContainer.java b/core/features/registries/RegistryContainer.java index 0f68c1240..f0ff3c2da 100644 --- a/core/features/registries/RegistryContainer.java +++ b/core/features/registries/RegistryContainer.java @@ -8,7 +8,7 @@ import appeng.api.features.IPlayerRegistry; import appeng.api.features.IRecipeHandlerRegistry; import appeng.api.features.IRegistryContainer; import appeng.api.features.ISpecialComparisonRegistry; -import appeng.api.features.IWirelessTermRegistery; +import appeng.api.features.IWirelessTermRegistry; import appeng.api.features.IWorldGen; import appeng.api.movable.IMovableRegistry; import appeng.api.networking.IGridCacheRegistry; @@ -32,7 +32,7 @@ public class RegistryContainer implements IRegistryContainer private IRecipeHandlerRegistry recipeReg = new RecipeHandlerRegistry(); @Override - public IWirelessTermRegistery wireless() + public IWirelessTermRegistry wireless() { return WirelessRegistery; } diff --git a/core/features/registries/WirelessRegistry.java b/core/features/registries/WirelessRegistry.java index 4296a146b..f797ae778 100644 --- a/core/features/registries/WirelessRegistry.java +++ b/core/features/registries/WirelessRegistry.java @@ -8,12 +8,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; import appeng.api.features.IWirelessTermHandler; -import appeng.api.features.IWirelessTermRegistery; +import appeng.api.features.IWirelessTermRegistry; import appeng.core.localization.PlayerMessages; import appeng.core.sync.GuiBridge; import appeng.util.Platform; -public class WirelessRegistry implements IWirelessTermRegistery +public class WirelessRegistry implements IWirelessTermRegistry { List handlers; From 0885f340e24aaedde2a29c4cbd3401f30dad46ef Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:26:10 +0200 Subject: [PATCH 06/28] use ignore instead of _ because of Java8 --- client/gui/AEBaseMEGui.java | 4 ++-- client/gui/implementations/GuiNetworkStatus.java | 4 ++-- client/me/ItemRepo.java | 4 ++-- parts/p2p/PartP2PItems.java | 4 ++-- util/Platform.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/gui/AEBaseMEGui.java b/client/gui/AEBaseMEGui.java index d538fb347..34eaec812 100644 --- a/client/gui/AEBaseMEGui.java +++ b/client/gui/AEBaseMEGui.java @@ -34,7 +34,7 @@ public abstract class AEBaseMEGui extends AEBaseGui SlotME theSlotField = (SlotME) s; myStack = theSlotField.getAEStack(); } - catch (Throwable _) + catch (Throwable ignore) { } @@ -72,7 +72,7 @@ public abstract class AEBaseMEGui extends AEBaseGui SlotME theSlotField = (SlotME) s; myStack = theSlotField.getAEStack(); } - catch (Throwable _) + catch (Throwable ignore) { } diff --git a/client/gui/implementations/GuiNetworkStatus.java b/client/gui/implementations/GuiNetworkStatus.java index fa944775a..a04bc11d3 100644 --- a/client/gui/implementations/GuiNetworkStatus.java +++ b/client/gui/implementations/GuiNetworkStatus.java @@ -227,7 +227,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource SlotME theSlotField = (SlotME) s; myStack = theSlotField.getAEStack(); } - catch (Throwable _) + catch (Throwable ignore) { } @@ -255,7 +255,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource SlotME theSlotField = (SlotME) s; myStack = theSlotField.getAEStack(); } - catch (Throwable _) + catch (Throwable ignore) { } diff --git a/client/me/ItemRepo.java b/client/me/ItemRepo.java index 1549d330d..3c2b8b81a 100644 --- a/client/me/ItemRepo.java +++ b/client/me/ItemRepo.java @@ -108,7 +108,7 @@ public class ItemRepo b.invoke( searchField, "" ); } } - catch (Throwable _) + catch (Throwable ignore) { } @@ -143,7 +143,7 @@ public class ItemRepo { m = Pattern.compile( innerSearch.toLowerCase(), Pattern.CASE_INSENSITIVE ); } - catch (Throwable _) + catch (Throwable ignore) { try { diff --git a/parts/p2p/PartP2PItems.java b/parts/p2p/PartP2PItems.java index bd6ddc84c..1fb9f5ff7 100644 --- a/parts/p2p/PartP2PItems.java +++ b/parts/p2p/PartP2PItems.java @@ -82,7 +82,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo { output = new WrapperBCPipe( te, side.getOpposite() ); } - catch (Throwable _) + catch (Throwable ignore) { } } @@ -92,7 +92,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo /* * if ( AppEng.instance.isIntegrationEnabled( "TE" ) ) { ITE thermal = (ITE) AppEng.instance.getIntegration( * "TE" ); if ( thermal != null ) { if ( thermal.isPipe( te, side.getOpposite() ) ) { try { output = new - * WrapperTEPipe( te, side.getOpposite() ); } catch (Throwable _) { } } } } + * WrapperTEPipe( te, side.getOpposite() ); } catch (Throwable ignore) { } } } } */ if ( output == null ) diff --git a/util/Platform.java b/util/Platform.java index 4a1ecd4ad..220dd3a8c 100644 --- a/util/Platform.java +++ b/util/Platform.java @@ -884,7 +884,7 @@ public class Platform return wrench.canWrench( player, x, y, z ); } } - catch (Throwable _) + catch (Throwable ignore) { // explodes without BC } From accc7f83c3cf0fec9137bb34af2a2399eaf1a549 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:27:09 +0200 Subject: [PATCH 07/28] Typo ISecurityRegister --- helpers/PlayerSecuirtyWrapper.java | 4 ++-- items/tools/ToolBiometricCard.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helpers/PlayerSecuirtyWrapper.java b/helpers/PlayerSecuirtyWrapper.java index da31fd794..9cace5ab4 100644 --- a/helpers/PlayerSecuirtyWrapper.java +++ b/helpers/PlayerSecuirtyWrapper.java @@ -4,9 +4,9 @@ import java.util.EnumSet; import java.util.HashMap; import appeng.api.config.SecurityPermissions; -import appeng.api.networking.security.ISecurityRegister; +import appeng.api.networking.security.ISecurityRegistry; -public class PlayerSecuirtyWrapper implements ISecurityRegister +public class PlayerSecuirtyWrapper implements ISecurityRegistry { final HashMap> target; diff --git a/items/tools/ToolBiometricCard.java b/items/tools/ToolBiometricCard.java index 5f0bfd996..f2bd643cf 100644 --- a/items/tools/ToolBiometricCard.java +++ b/items/tools/ToolBiometricCard.java @@ -13,7 +13,7 @@ import net.minecraftforge.client.MinecraftForgeClient; import appeng.api.config.SecurityPermissions; import appeng.api.features.IPlayerRegistry; import appeng.api.implementations.items.IBiometricCard; -import appeng.api.networking.security.ISecurityRegister; +import appeng.api.networking.security.ISecurityRegistry; import appeng.client.render.items.ToolBiometricCardRender; import appeng.core.features.AEFeature; import appeng.core.localization.GuiText; @@ -161,7 +161,7 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard } @Override - public void registerPermissions(ISecurityRegister register, IPlayerRegistry pr, ItemStack is) + public void registerPermissions(ISecurityRegistry register, IPlayerRegistry pr, ItemStack is) { register.addPlayer( pr.getID( getProfile( is ) ), getPermissions( is ) ); } From 5aab62405b686e9cbb3fdb2a11711aa67f23140c Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:27:56 +0200 Subject: [PATCH 08/28] Typo IItemComparisionProvider --- .../features/registries/SpecialComparisonRegistry.java | 10 +++++----- integration/abstraction/IForestry.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/features/registries/SpecialComparisonRegistry.java b/core/features/registries/SpecialComparisonRegistry.java index 6bd33935b..a403d3bfa 100644 --- a/core/features/registries/SpecialComparisonRegistry.java +++ b/core/features/registries/SpecialComparisonRegistry.java @@ -4,23 +4,23 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.item.ItemStack; -import appeng.api.features.IItemComparisionProvider; +import appeng.api.features.IItemComparisonProvider; import appeng.api.features.IItemComparison; import appeng.api.features.ISpecialComparisonRegistry; public class SpecialComparisonRegistry implements ISpecialComparisonRegistry { - private List CompRegistry; + private List CompRegistry; public SpecialComparisonRegistry() { - CompRegistry = new ArrayList(); + CompRegistry = new ArrayList(); } @Override public IItemComparison getSpecialComparion(ItemStack stack) { - for (IItemComparisionProvider i : CompRegistry) + for (IItemComparisonProvider i : CompRegistry) { IItemComparison comp = i.getComparison( stack ); if ( comp != null ) @@ -33,7 +33,7 @@ public class SpecialComparisonRegistry implements ISpecialComparisonRegistry } @Override - public void addComparisonProvider(IItemComparisionProvider prov) + public void addComparisonProvider(IItemComparisonProvider prov) { CompRegistry.add( prov ); } diff --git a/integration/abstraction/IForestry.java b/integration/abstraction/IForestry.java index 86b95b14c..50b6ab64d 100644 --- a/integration/abstraction/IForestry.java +++ b/integration/abstraction/IForestry.java @@ -1,10 +1,10 @@ package appeng.integration.abstraction; -import appeng.api.features.IItemComparisionProvider; +import appeng.api.features.IItemComparisonProvider; public interface IForestry { - IItemComparisionProvider getGeneticsComparisonProvider(); + IItemComparisonProvider getGeneticsComparisonProvider(); } \ No newline at end of file From 3df08b0366d98f05f1c6faac456ef13497c777c8 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:28:41 +0200 Subject: [PATCH 09/28] Typo getSpecialComparion --- core/features/registries/SpecialComparisonRegistry.java | 2 +- util/item/AESharedNBT.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/features/registries/SpecialComparisonRegistry.java b/core/features/registries/SpecialComparisonRegistry.java index a403d3bfa..78a6c9cb8 100644 --- a/core/features/registries/SpecialComparisonRegistry.java +++ b/core/features/registries/SpecialComparisonRegistry.java @@ -18,7 +18,7 @@ public class SpecialComparisonRegistry implements ISpecialComparisonRegistry } @Override - public IItemComparison getSpecialComparion(ItemStack stack) + public IItemComparison getSpecialComparison(ItemStack stack) { for (IItemComparisonProvider i : CompRegistry) { diff --git a/util/item/AESharedNBT.java b/util/item/AESharedNBT.java index ddaf200e7..b3627ae92 100644 --- a/util/item/AESharedNBT.java +++ b/util/item/AESharedNBT.java @@ -70,7 +70,7 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound ItemStack isc = new ItemStack( itemID, 1, damageValue ); isc.setTagCompound( c ); - x.comp = AEApi.instance().registries().specialComparson().getSpecialComparion( isc ); + x.comp = AEApi.instance().registries().specialComparson().getSpecialComparison( isc ); return x; } From 7117fe44b3285b86dea1cfd9a71b81bbf226ca67 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:29:30 +0200 Subject: [PATCH 10/28] Typo useSimpliedRendering --- client/render/BusRenderHelper.java | 2 +- client/render/blocks/RenderBlockAssembler.java | 2 +- client/render/blocks/RenderBlockCraftingCPU.java | 2 +- parts/automation/PartAnnihilationPlane.java | 2 +- parts/automation/PartExportBus.java | 2 +- parts/automation/PartFormationPlane.java | 2 +- parts/automation/PartImportBus.java | 2 +- parts/misc/PartCableAnchor.java | 2 +- parts/misc/PartInterface.java | 2 +- parts/misc/PartStorageBus.java | 2 +- parts/misc/PartToggleBus.java | 2 +- parts/networking/PartCable.java | 2 +- parts/networking/PartCableCovered.java | 2 +- parts/networking/PartCableSmart.java | 2 +- parts/networking/PartDenseCable.java | 2 +- parts/p2p/PartP2PTunnel.java | 2 +- parts/reporting/PartMonitor.java | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/client/render/BusRenderHelper.java b/client/render/BusRenderHelper.java index 3294d75bc..f9c8b6815 100644 --- a/client/render/BusRenderHelper.java +++ b/client/render/BusRenderHelper.java @@ -149,7 +149,7 @@ public class BusRenderHelper implements IPartRenderHelper } @Override - public ISimplifiedBundle useSimpliedRendering(int x, int y, int z, IBoxProvider p, ISimplifiedBundle sim) + public ISimplifiedBundle useSimplifiedRendering(int x, int y, int z, IBoxProvider p, ISimplifiedBundle sim) { RenderBlocksWorkaround rbw = BusRenderer.instance.renderer; diff --git a/client/render/blocks/RenderBlockAssembler.java b/client/render/blocks/RenderBlockAssembler.java index 1b5284414..687ae307f 100644 --- a/client/render/blocks/RenderBlockAssembler.java +++ b/client/render/blocks/RenderBlockAssembler.java @@ -182,7 +182,7 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide preRenderInWorld( block, world, x, y, z, renderer ); - tma.lightCache = BusRenderHelper.instance.useSimpliedRendering( x, y, z, this, tma.lightCache ); + tma.lightCache = BusRenderHelper.instance.useSimplifiedRendering( x, y, z, this, tma.lightCache ); BusRenderer.instance.renderer.isFacade = true; IOrientable te = getOrientable( block, world, x, y, z ); diff --git a/client/render/blocks/RenderBlockCraftingCPU.java b/client/render/blocks/RenderBlockCraftingCPU.java index 23b0ac34d..91bc487c9 100644 --- a/client/render/blocks/RenderBlockCraftingCPU.java +++ b/client/render/blocks/RenderBlockCraftingCPU.java @@ -72,7 +72,7 @@ public class RenderBlockCraftingCPU extends BaseBlockRender try { - ct.lightCache = i.useSimpliedRendering( x, y, z, null, ct.lightCache ); + ct.lightCache = i.useSimplifiedRendering( x, y, z, null, ct.lightCache ); } catch (Throwable t) { diff --git a/parts/automation/PartAnnihilationPlane.java b/parts/automation/PartAnnihilationPlane.java index a883e9824..cd3a0d3a8 100644 --- a/parts/automation/PartAnnihilationPlane.java +++ b/parts/automation/PartAnnihilationPlane.java @@ -98,7 +98,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab boolean isActive = (clientFlags & (POWERED_FLAG | CHANNEL_FLAG)) == (POWERED_FLAG | CHANNEL_FLAG); - renderCache = rh.useSimpliedRendering( x, y, z, this, renderCache ); + renderCache = rh.useSimplifiedRendering( x, y, z, this, renderCache ); rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockAnnihilationPlaneOn.getIcon() : is.getIconIndex(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() ); diff --git a/parts/automation/PartExportBus.java b/parts/automation/PartExportBus.java index 6149facd3..906707533 100644 --- a/parts/automation/PartExportBus.java +++ b/parts/automation/PartExportBus.java @@ -108,7 +108,7 @@ public class PartExportBus extends PartSharedItemBus implements IGridTickable, I @SideOnly(Side.CLIENT) public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) { - renderCache = rh.useSimpliedRendering( x, y, z, this, renderCache ); + renderCache = rh.useSimplifiedRendering( x, y, z, this, renderCache ); rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), is.getIconIndex(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() ); diff --git a/parts/automation/PartFormationPlane.java b/parts/automation/PartFormationPlane.java index 081b949ee..f668c3821 100644 --- a/parts/automation/PartFormationPlane.java +++ b/parts/automation/PartFormationPlane.java @@ -171,7 +171,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine boolean isActive = (clientFlags & (POWERED_FLAG | CHANNEL_FLAG)) == (POWERED_FLAG | CHANNEL_FLAG); - renderCache = rh.useSimpliedRendering( x, y, z, this, renderCache ); + renderCache = rh.useSimplifiedRendering( x, y, z, this, renderCache ); rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : is.getIconIndex(), CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() ); diff --git a/parts/automation/PartImportBus.java b/parts/automation/PartImportBus.java index 7a7a2b6a0..ee1163d9d 100644 --- a/parts/automation/PartImportBus.java +++ b/parts/automation/PartImportBus.java @@ -102,7 +102,7 @@ public class PartImportBus extends PartSharedItemBus implements IGridTickable, I @SideOnly(Side.CLIENT) public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) { - renderCache = rh.useSimpliedRendering( x, y, z, this, renderCache ); + renderCache = rh.useSimplifiedRendering( x, y, z, this, renderCache ); rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), is.getIconIndex(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() ); diff --git a/parts/misc/PartCableAnchor.java b/parts/misc/PartCableAnchor.java index e542c4d4b..d7ede9f12 100644 --- a/parts/misc/PartCableAnchor.java +++ b/parts/misc/PartCableAnchor.java @@ -44,7 +44,7 @@ public class PartCableAnchor implements IPart @SideOnly(Side.CLIENT) public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) { - renderCache = rh.useSimpliedRendering( x, y, z, this, renderCache ); + renderCache = rh.useSimplifiedRendering( x, y, z, this, renderCache ); IIcon myIcon = is.getIconIndex(); rh.setTexture( myIcon ); if ( host != null && host.getFacadeContainer().getFacade( mySide ) != null ) diff --git a/parts/misc/PartInterface.java b/parts/misc/PartInterface.java index 67610aa38..d8b4a1638 100644 --- a/parts/misc/PartInterface.java +++ b/parts/misc/PartInterface.java @@ -128,7 +128,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISeg @SideOnly(Side.CLIENT) public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) { - renderCache = rh.useSimpliedRendering( x, y, z, this, renderCache ); + renderCache = rh.useSimplifiedRendering( x, y, z, this, renderCache ); rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), is.getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); diff --git a/parts/misc/PartStorageBus.java b/parts/misc/PartStorageBus.java index f970f3587..574d48f15 100644 --- a/parts/misc/PartStorageBus.java +++ b/parts/misc/PartStorageBus.java @@ -380,7 +380,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC @SideOnly(Side.CLIENT) public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) { - renderCache = rh.useSimpliedRendering( x, y, z, this, renderCache ); + renderCache = rh.useSimplifiedRendering( x, y, z, this, renderCache ); rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(), is.getIconIndex(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); diff --git a/parts/misc/PartToggleBus.java b/parts/misc/PartToggleBus.java index 575dd040e..666f60e0e 100644 --- a/parts/misc/PartToggleBus.java +++ b/parts/misc/PartToggleBus.java @@ -169,7 +169,7 @@ public class PartToggleBus extends PartBasicState @SideOnly(Side.CLIENT) public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) { - renderCache = rh.useSimpliedRendering( x, y, z, this, renderCache ); + renderCache = rh.useSimplifiedRendering( x, y, z, this, renderCache ); rh.setTexture( is.getIconIndex() ); rh.setBounds( 6, 6, 14, 10, 10, 16 ); diff --git a/parts/networking/PartCable.java b/parts/networking/PartCable.java index adfd46be3..6316843a4 100644 --- a/parts/networking/PartCable.java +++ b/parts/networking/PartCable.java @@ -847,7 +847,7 @@ public class PartCable extends AEBasePart implements IPartCable @SideOnly(Side.CLIENT) public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) { - renderCache = rh.useSimpliedRendering( x, y, z, this, renderCache ); + renderCache = rh.useSimplifiedRendering( x, y, z, this, renderCache ); boolean useCovered = false; boolean requireDetailed = false; diff --git a/parts/networking/PartCableCovered.java b/parts/networking/PartCableCovered.java index d990e92f0..a3aae56ac 100644 --- a/parts/networking/PartCableCovered.java +++ b/parts/networking/PartCableCovered.java @@ -142,7 +142,7 @@ public class PartCableCovered extends PartCable @SideOnly(Side.CLIENT) public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) { - renderCache = rh.useSimpliedRendering( x, y, z, this, renderCache ); + renderCache = rh.useSimplifiedRendering( x, y, z, this, renderCache ); rh.setTexture( getTexture( getCableColor() ) ); EnumSet sides = connections.clone(); diff --git a/parts/networking/PartCableSmart.java b/parts/networking/PartCableSmart.java index 32e089230..27320269a 100644 --- a/parts/networking/PartCableSmart.java +++ b/parts/networking/PartCableSmart.java @@ -160,7 +160,7 @@ public class PartCableSmart extends PartCable @SideOnly(Side.CLIENT) public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) { - renderCache = rh.useSimpliedRendering( x, y, z, this, renderCache ); + renderCache = rh.useSimplifiedRendering( x, y, z, this, renderCache ); rh.setTexture( getTexture( getCableColor() ) ); EnumSet sides = connections.clone(); diff --git a/parts/networking/PartDenseCable.java b/parts/networking/PartDenseCable.java index 73bd5ef58..b1b793919 100644 --- a/parts/networking/PartDenseCable.java +++ b/parts/networking/PartDenseCable.java @@ -320,7 +320,7 @@ public class PartDenseCable extends PartCable @SideOnly(Side.CLIENT) public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) { - renderCache = rh.useSimpliedRendering( x, y, z, this, renderCache ); + renderCache = rh.useSimplifiedRendering( x, y, z, this, renderCache ); rh.setTexture( getTexture( getCableColor() ) ); EnumSet sides = connections.clone(); diff --git a/parts/p2p/PartP2PTunnel.java b/parts/p2p/PartP2PTunnel.java index 3bae7ffc1..97f9ac2b1 100644 --- a/parts/p2p/PartP2PTunnel.java +++ b/parts/p2p/PartP2PTunnel.java @@ -319,7 +319,7 @@ public class PartP2PTunnel extends PartBasicState @SideOnly(Side.CLIENT) public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) { - renderCache = rh.useSimpliedRendering( x, y, z, this, renderCache ); + renderCache = rh.useSimplifiedRendering( x, y, z, this, renderCache ); rh.setTexture( getTypeTexture() ); rh.setBounds( 2, 2, 14, 14, 14, 16 ); diff --git a/parts/reporting/PartMonitor.java b/parts/reporting/PartMonitor.java index 6cd51a9b9..6a1b4da12 100644 --- a/parts/reporting/PartMonitor.java +++ b/parts/reporting/PartMonitor.java @@ -247,7 +247,7 @@ public class PartMonitor extends AEBasePart implements IPartMonitor, IPowerChann @SideOnly(Side.CLIENT) public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) { - renderCache = rh.useSimpliedRendering( x, y, z, this, renderCache ); + renderCache = rh.useSimplifiedRendering( x, y, z, this, renderCache ); rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(), is.getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); From f5e39e4cb798a92aed339294c1d846829aa589d7 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:30:12 +0200 Subject: [PATCH 11/28] Typo getCondencedOutputs --- crafting/CraftingTreeNode.java | 2 +- crafting/CraftingTreeProcess.java | 10 +++++----- helpers/PatternHelper.java | 2 +- items/misc/ItemEncodedPattern.java | 4 ++-- me/cluster/implementations/CraftingCPUCluster.java | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/crafting/CraftingTreeNode.java b/crafting/CraftingTreeNode.java index 55dbe6129..f36d7dff0 100644 --- a/crafting/CraftingTreeNode.java +++ b/crafting/CraftingTreeNode.java @@ -75,7 +75,7 @@ public class CraftingTreeNode boolean notRecurive(ICraftingPatternDetails details) { - IAEItemStack[] o = details.getCondencedOutputs(); + IAEItemStack[] o = details.getCondensedOutputs(); for (IAEItemStack i : o) if ( i.equals( what ) ) return false; diff --git a/crafting/CraftingTreeProcess.java b/crafting/CraftingTreeProcess.java index 1de6b5f9e..3519481bf 100644 --- a/crafting/CraftingTreeProcess.java +++ b/crafting/CraftingTreeProcess.java @@ -69,7 +69,7 @@ public class CraftingTreeProcess ItemStack g = part.getItemStack(); boolean isAnInput = false; - for ( IAEItemStack a : details.getCondencedOutputs() ) + for ( IAEItemStack a : details.getCondensedOutputs() ) { if ( g != null && a != null && a.equals( g ) ) isAnInput = true; @@ -118,7 +118,7 @@ public class CraftingTreeProcess ItemStack g = part.getItemStack(); boolean isAnInput = false; - for (IAEItemStack a : details.getCondencedOutputs()) + for (IAEItemStack a : details.getCondensedOutputs()) { if ( g != null && a != null && a.equals( g ) ) isAnInput = true; @@ -149,7 +149,7 @@ public class CraftingTreeProcess IAEItemStack getAmountCrafted(IAEItemStack what2) { - for (IAEItemStack is : details.getCondencedOutputs()) + for (IAEItemStack is : details.getCondensedOutputs()) { if ( is.equals( what2 ) ) { @@ -160,7 +160,7 @@ public class CraftingTreeProcess } // more fuzzy! - for (IAEItemStack is : details.getCondencedOutputs()) + for (IAEItemStack is : details.getCondensedOutputs()) { if ( is.getItem() == what2.getItem() && (is.getItem().isDamageable() || is.getItemDamage() == what2.getItemDamage()) ) { @@ -228,7 +228,7 @@ public class CraftingTreeProcess // assume its possible. // add crafting results.. - for (IAEItemStack out : details.getCondencedOutputs()) + for (IAEItemStack out : details.getCondensedOutputs()) { IAEItemStack o = out.copy(); o.setStackSize( o.getStackSize() * i ); diff --git a/helpers/PatternHelper.java b/helpers/PatternHelper.java index a1bbebc35..78e488bab 100644 --- a/helpers/PatternHelper.java +++ b/helpers/PatternHelper.java @@ -317,7 +317,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable t : tasks.entrySet()) { - for (IAEItemStack ais : t.getKey().getCondencedOutputs()) + for (IAEItemStack ais : t.getKey().getCondensedOutputs()) { ais = ais.copy(); ais.setStackSize( ais.getStackSize() * t.getValue().value ); @@ -175,7 +175,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU for (Entry t : tasks.entrySet()) { - for (IAEItemStack ais : t.getKey().getCondencedOutputs()) + for (IAEItemStack ais : t.getKey().getCondensedOutputs()) { ais = ais.copy(); ais.setStackSize( ais.getStackSize() * t.getValue().value ); @@ -680,7 +680,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU didsomething = true; remainingOperations--; - for (IAEItemStack out : details.getCondencedOutputs()) + for (IAEItemStack out : details.getCondensedOutputs()) { postChange( out, machineSrc ); waitingFor.add( out.copy() ); @@ -925,7 +925,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU for (Entry t : tasks.entrySet()) { - for (IAEItemStack ais : t.getKey().getCondencedOutputs()) + for (IAEItemStack ais : t.getKey().getCondensedOutputs()) { if ( ais.equals( is ) ) is.setStackSize( is.getStackSize() + ais.getStackSize() * t.getValue().value ); From f76e87c9a533245c9b6722b5e6a37ed03df381db Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:30:31 +0200 Subject: [PATCH 12/28] Typo getCondencedInputs --- crafting/CraftingTreeNode.java | 2 +- crafting/CraftingTreeProcess.java | 8 ++++---- helpers/PatternHelper.java | 2 +- items/misc/ItemEncodedPattern.java | 2 +- me/cluster/implementations/CraftingCPUCluster.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crafting/CraftingTreeNode.java b/crafting/CraftingTreeNode.java index f36d7dff0..fff611400 100644 --- a/crafting/CraftingTreeNode.java +++ b/crafting/CraftingTreeNode.java @@ -80,7 +80,7 @@ public class CraftingTreeNode if ( i.equals( what ) ) return false; - o = details.getCondencedInputs(); + o = details.getCondensedInputs(); for (IAEItemStack i : o) if ( i.equals( what ) ) return false; diff --git a/crafting/CraftingTreeProcess.java b/crafting/CraftingTreeProcess.java index 3519481bf..9d425ebfb 100644 --- a/crafting/CraftingTreeProcess.java +++ b/crafting/CraftingTreeProcess.java @@ -64,7 +64,7 @@ public class CraftingTreeProcess fullsimulation = true; } - for ( IAEItemStack part : details.getCondencedInputs() ) + for ( IAEItemStack part : details.getCondensedInputs() ) { ItemStack g = part.getItemStack(); @@ -96,7 +96,7 @@ public class CraftingTreeProcess else { // this is minorly different then below, this slot uses the pattern, but kinda fudges it. - for (IAEItemStack part : details.getCondencedInputs()) + for (IAEItemStack part : details.getCondensedInputs()) { for (int x = 0; x < list.length; x++) { @@ -113,7 +113,7 @@ public class CraftingTreeProcess } else { - for ( IAEItemStack part : details.getCondencedInputs() ) + for ( IAEItemStack part : details.getCondensedInputs() ) { ItemStack g = part.getItemStack(); @@ -128,7 +128,7 @@ public class CraftingTreeProcess limitQty = true; } - for (IAEItemStack part : details.getCondencedInputs()) + for (IAEItemStack part : details.getCondensedInputs()) { nodes.put( new CraftingTreeNode( cc, job, part.copy(), this, -1, depth + 1 ), part.getStackSize() ); } diff --git a/helpers/PatternHelper.java b/helpers/PatternHelper.java index 78e488bab..62ea5458d 100644 --- a/helpers/PatternHelper.java +++ b/helpers/PatternHelper.java @@ -311,7 +311,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable Date: Sat, 20 Sep 2014 22:36:48 +0200 Subject: [PATCH 13/28] injectCratedItems --- core/Registration.java | 2 +- crafting/CraftingLink.java | 2 +- helpers/DualityInterface.java | 2 +- integration/modules/BC.java | 2 +- integration/modules/FMP.java | 2 +- parts/automation/PartExportBus.java | 2 +- parts/misc/PartInterface.java | 4 ++-- tile/misc/TileInterface.java | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/Registration.java b/core/Registration.java index 7d5cce15b..b574cf184 100644 --- a/core/Registration.java +++ b/core/Registration.java @@ -324,7 +324,7 @@ public class Registration blocks.blockQuartzGlass = addFeature( BlockQuartzGlass.class ); blocks.blockQuartzVibrantGlass = addFeature( BlockQuartzLamp.class ); - blocks.blockQuartzPiller = addFeature( BlockQuartzPillar.class ); + blocks.blockQuartzPillar = addFeature( BlockQuartzPillar.class ); blocks.blockQuartzChiseled = addFeature( BlockQuartzChiseled.class ); blocks.blockQuartzTorch = addFeature( BlockQuartzTorch.class ); blocks.blockLightDetector = addFeature( BlockLightDetector.class ); diff --git a/crafting/CraftingLink.java b/crafting/CraftingLink.java index 70cc9af89..1dacb2d85 100644 --- a/crafting/CraftingLink.java +++ b/crafting/CraftingLink.java @@ -136,7 +136,7 @@ public class CraftingLink implements ICraftingLink if ( tie == null || tie.req == null || tie.req.req == null ) return input; - return tie.req.req.injectCratedItems( tie.req, input, mode ); + return tie.req.req.injectCraftedItems( tie.req, input, mode ); } public void markDone() diff --git a/helpers/DualityInterface.java b/helpers/DualityInterface.java index ede02f876..e6d588144 100644 --- a/helpers/DualityInterface.java +++ b/helpers/DualityInterface.java @@ -970,7 +970,7 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt return craftingTracker.getRequestedJobs(); } - public IAEItemStack injectCratedItems(ICraftingLink link, IAEItemStack aquired, Actionable mode) + public IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack aquired, Actionable mode) { int slot = craftingTracker.getSlot( link ); diff --git a/integration/modules/BC.java b/integration/modules/BC.java index 0e0f9f6c6..8a365f541 100644 --- a/integration/modules/BC.java +++ b/integration/modules/BC.java @@ -212,7 +212,7 @@ public class BC extends BaseModule implements IBC addFacade( b.blockFluix.stack( 1 ) ); addFacade( b.blockQuartz.stack( 1 ) ); addFacade( b.blockQuartzChiseled.stack( 1 ) ); - addFacade( b.blockQuartzPiller.stack( 1 ) ); + addFacade( b.blockQuartzPillar.stack( 1 ) ); try { diff --git a/integration/modules/FMP.java b/integration/modules/FMP.java index dfe360c9f..1186e6c16 100644 --- a/integration/modules/FMP.java +++ b/integration/modules/FMP.java @@ -66,7 +66,7 @@ public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IF public void Init() throws Throwable { createAndRegister( AEApi.instance().blocks().blockQuartz.block(), 0 ); - createAndRegister( AEApi.instance().blocks().blockQuartzPiller.block(), 0 ); + createAndRegister( AEApi.instance().blocks().blockQuartzPillar.block(), 0 ); createAndRegister( AEApi.instance().blocks().blockQuartzChiseled.block(), 0 ); createAndRegister( AEApi.instance().blocks().blockSkyStone.block(), 0 ); createAndRegister( AEApi.instance().blocks().blockSkyStone.block(), 1 ); diff --git a/parts/automation/PartExportBus.java b/parts/automation/PartExportBus.java index 906707533..e4108fbef 100644 --- a/parts/automation/PartExportBus.java +++ b/parts/automation/PartExportBus.java @@ -270,7 +270,7 @@ public class PartExportBus extends PartSharedItemBus implements IGridTickable, I } @Override - public IAEItemStack injectCratedItems(ICraftingLink link, IAEItemStack items, Actionable mode) + public IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack items, Actionable mode) { InventoryAdaptor d = getHandler(); diff --git a/parts/misc/PartInterface.java b/parts/misc/PartInterface.java index d8b4a1638..94eddab76 100644 --- a/parts/misc/PartInterface.java +++ b/parts/misc/PartInterface.java @@ -381,9 +381,9 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISeg } @Override - public IAEItemStack injectCratedItems(ICraftingLink link, IAEItemStack items, Actionable mode) + public IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack items, Actionable mode) { - return duality.injectCratedItems( link, items, mode ); + return duality.injectCraftedItems( link, items, mode ); } @Override diff --git a/tile/misc/TileInterface.java b/tile/misc/TileInterface.java index 96c053f1e..8dce9064f 100644 --- a/tile/misc/TileInterface.java +++ b/tile/misc/TileInterface.java @@ -263,9 +263,9 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IS } @Override - public IAEItemStack injectCratedItems(ICraftingLink link, IAEItemStack items, Actionable mode) + public IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack items, Actionable mode) { - return duality.injectCratedItems( link, items, mode ); + return duality.injectCraftedItems( link, items, mode ); } @Override From 8a3739d9bd6ddf38c60b1bf8c6055b8682152e7e Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:37:36 +0200 Subject: [PATCH 14/28] Typo beginVisition --- me/GridConnection.java | 8 ++++---- me/GridNode.java | 6 +++--- me/cache/PathGridCache.java | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/me/GridConnection.java b/me/GridConnection.java index 8e6a11be7..dc44ac5cb 100644 --- a/me/GridConnection.java +++ b/me/GridConnection.java @@ -66,22 +66,22 @@ public class GridConnection implements IGridConnection, IPathItem if ( a.myGrid == null ) { GridPropagator gp = new GridPropagator( b.getInternalGrid() ); - a.beginVisition( gp ); + a.beginVisit( gp ); } else if ( b.myGrid == null ) { GridPropagator gp = new GridPropagator( a.getInternalGrid() ); - b.beginVisition( gp ); + b.beginVisit( gp ); } else if ( isNetworkABetter( a, b ) ) { GridPropagator gp = new GridPropagator( a.getInternalGrid() ); - b.beginVisition( gp ); + b.beginVisit( gp ); } else { GridPropagator gp = new GridPropagator( b.getInternalGrid() ); - a.beginVisition( gp ); + a.beginVisit( gp ); } } diff --git a/me/GridNode.java b/me/GridNode.java index 167dd97ec..5578bbe13 100644 --- a/me/GridNode.java +++ b/me/GridNode.java @@ -163,7 +163,7 @@ public class GridNode implements IGridNode, IPathItem } @Override - public void beginVisition(IGridVisitor g) + public void beginVisit(IGridVisitor g) { Object tracker = new Object(); @@ -461,11 +461,11 @@ public class GridNode implements IGridNode, IPathItem public void validateGrid() { GridSplitDetector gsd = new GridSplitDetector( getInternalGrid().getPivot() ); - beginVisition( gsd ); + beginVisit( gsd ); if ( !gsd.pivotFound ) { GridPropagator gp = new GridPropagator( new Grid( this ) ); - beginVisition( gp ); + beginVisit( gp ); } } diff --git a/me/cache/PathGridCache.java b/me/cache/PathGridCache.java index c8aa7d8fc..c7f2bb090 100644 --- a/me/cache/PathGridCache.java +++ b/me/cache/PathGridCache.java @@ -96,7 +96,7 @@ public class PathGridCache implements IPathingGrid channelsByBlocks = nodes * used; channelPowerUsage = (double) channelsByBlocks / 128.0; - myGrid.getPivot().beginVisition( new AdHocChannelUpdater( used ) ); + myGrid.getPivot().beginVisit( new AdHocChannelUpdater( used ) ); } else if ( controllerState == ControllerState.NO_CONTROLLER ) { @@ -112,12 +112,12 @@ public class PathGridCache implements IPathingGrid channelsByBlocks = nodes * used; channelPowerUsage = (double) channelsByBlocks / 128.0; - myGrid.getPivot().beginVisition( new AdHocChannelUpdater( used ) ); + myGrid.getPivot().beginVisit( new AdHocChannelUpdater( used ) ); } else if ( controllerState == ControllerState.CONTROLLER_CONFLICT ) { ticksUntilReady = 20; - myGrid.getPivot().beginVisition( new AdHocChannelUpdater( 0 ) ); + myGrid.getPivot().beginVisit( new AdHocChannelUpdater( 0 ) ); } else { @@ -126,7 +126,7 @@ public class PathGridCache implements IPathingGrid closedList = new HashSet(); semiOpen = new HashSet(); - // myGrid.getPivot().beginVisition( new AdHocChannelUpdater( 0 ) + // myGrid.getPivot().beginVisit( new AdHocChannelUpdater( 0 ) // ); for (IGridNode node : myGrid.getMachines( TileController.class )) { @@ -168,7 +168,7 @@ public class PathGridCache implements IPathingGrid { for (TileController tc : controllers) { - tc.getGridNode( ForgeDirection.UNKNOWN ).beginVisition( new ControllerChannelUpdater() ); + tc.getGridNode( ForgeDirection.UNKNOWN ).beginVisit( new ControllerChannelUpdater() ); break; } } @@ -332,7 +332,7 @@ public class PathGridCache implements IPathingGrid DimensionalCoord dc = startingNode.getGridBlock().getLocation(); ControllerValidator cv = new ControllerValidator( dc.x, dc.y, dc.z ); - startingNode.beginVisition( cv ); + startingNode.beginVisit( cv ); if ( cv.isValid && cv.found == controllers.size() ) controllerState = ControllerState.CONTROLLER_ONLINE; From 2d5b15b461d0b9082546634d983e4f4cedcd7883 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:37:58 +0200 Subject: [PATCH 15/28] Typo moveable --- core/Registration.java | 2 +- core/api/imc/IMCBlackListSpatial.java | 2 +- core/api/imc/IMCSpatial.java | 2 +- core/features/registries/RegistryContainer.java | 2 +- spatial/CachedPlane.java | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/Registration.java b/core/Registration.java index b574cf184..2d9481f90 100644 --- a/core/Registration.java +++ b/core/Registration.java @@ -679,7 +679,7 @@ public class Registration if ( AEConfig.instance.isFeatureEnabled( AEFeature.MeteoriteWorldGen ) ) GameRegistry.registerWorldGenerator( new MeteoriteWorldGen(), 0 ); - IMovableRegistry mr = AEApi.instance().registries().moveable(); + IMovableRegistry mr = AEApi.instance().registries().movable(); /** * You can't move bed rock. diff --git a/core/api/imc/IMCBlackListSpatial.java b/core/api/imc/IMCBlackListSpatial.java index e2e78e403..bd0e04b60 100644 --- a/core/api/imc/IMCBlackListSpatial.java +++ b/core/api/imc/IMCBlackListSpatial.java @@ -20,7 +20,7 @@ public class IMCBlackListSpatial implements IIMCHandler Block blk = Block.getBlockFromItem( is.getItem() ); if ( blk != null ) { - AEApi.instance().registries().moveable().blacklistBlock( blk ); + AEApi.instance().registries().movable().blacklistBlock( blk ); return; } } diff --git a/core/api/imc/IMCSpatial.java b/core/api/imc/IMCSpatial.java index bc6eb6995..d7dd631bf 100644 --- a/core/api/imc/IMCSpatial.java +++ b/core/api/imc/IMCSpatial.java @@ -20,7 +20,7 @@ public class IMCSpatial implements IIMCHandler try { Class classInstance = Class.forName( m.getStringValue() ); - AEApi.instance().registries().moveable().whiteListTileEntity( classInstance ); + AEApi.instance().registries().movable().whiteListTileEntity( classInstance ); } catch (ClassNotFoundException e) { diff --git a/core/features/registries/RegistryContainer.java b/core/features/registries/RegistryContainer.java index f0ff3c2da..e70104775 100644 --- a/core/features/registries/RegistryContainer.java +++ b/core/features/registries/RegistryContainer.java @@ -74,7 +74,7 @@ public class RegistryContainer implements IRegistryContainer } @Override - public IMovableRegistry moveable() + public IMovableRegistry movable() { return MoveableReg; } diff --git a/spatial/CachedPlane.java b/spatial/CachedPlane.java index d8892b39a..df3939d88 100644 --- a/spatial/CachedPlane.java +++ b/spatial/CachedPlane.java @@ -112,7 +112,7 @@ public class CachedPlane World wrld; Block matrixFrame = AEApi.instance().blocks().blockMatrixFrame.block(); - IMovableRegistry reg = AEApi.instance().registries().moveable(); + IMovableRegistry reg = AEApi.instance().registries().movable(); LinkedList updates = new LinkedList(); @@ -154,7 +154,7 @@ public class CachedPlane myColumns[x][z] = new Column( w.getChunkFromChunkCoords( (minx + x) >> 4, (minz + z) >> 4 ), (minx + x) & 0xF, (minz + z) & 0xF, minCY, cy_size ); } - IMovableRegistry mr = AEApi.instance().registries().moveable(); + IMovableRegistry mr = AEApi.instance().registries().movable(); for (int cx = 0; cx < cx_size; cx++) for (int cz = 0; cz < cz_size; cz++) @@ -234,13 +234,13 @@ public class CachedPlane private IMovableHandler getHandler(TileEntity te) { - IMovableRegistry mr = AEApi.instance().registries().moveable(); + IMovableRegistry mr = AEApi.instance().registries().movable(); return mr.getHandler( te ); } void Swap(CachedPlane dst) { - IMovableRegistry mr = AEApi.instance().registries().moveable(); + IMovableRegistry mr = AEApi.instance().registries().movable(); if ( dst.x_size == x_size && dst.y_size == y_size && dst.z_size == z_size ) { From 03499f2f3acc94c416923c108b784b5dd98af035 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:38:56 +0200 Subject: [PATCH 16/28] Typo StorageFilter.EXTACTABLE_ONLY --- client/gui/implementations/GuiStorageBus.java | 2 +- client/gui/widgets/GuiImgButton.java | 2 +- container/implementations/ContainerStorageBus.java | 2 +- me/storage/MEMonitorIInventory.java | 4 ++-- parts/misc/PartStorageBus.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/gui/implementations/GuiStorageBus.java b/client/gui/implementations/GuiStorageBus.java index 28e9a4a90..d26812593 100644 --- a/client/gui/implementations/GuiStorageBus.java +++ b/client/gui/implementations/GuiStorageBus.java @@ -66,7 +66,7 @@ public class GuiStorageBus extends GuiUpgradeable clear = new GuiImgButton( this.guiLeft - 18, guiTop + 8, Settings.ACTIONS, ActionItems.CLOSE ); partition = new GuiImgButton( this.guiLeft - 18, guiTop + 28, Settings.ACTIONS, ActionItems.WRENCH ); rwMode = new GuiImgButton( this.guiLeft - 18, guiTop + 48, Settings.ACCESS, AccessRestriction.READ_WRITE ); - storageFilter = new GuiImgButton( this.guiLeft - 18, guiTop + 68, Settings.STORAGE_FILTER, StorageFilter.EXTACTABLE_ONLY ); + storageFilter = new GuiImgButton( this.guiLeft - 18, guiTop + 68, Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY ); fuzzyMode = new GuiImgButton( this.guiLeft - 18, guiTop + 88, Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL ); buttonList.add( priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender ) ); diff --git a/client/gui/widgets/GuiImgButton.java b/client/gui/widgets/GuiImgButton.java index 02f75e503..f9a9c0485 100644 --- a/client/gui/widgets/GuiImgButton.java +++ b/client/gui/widgets/GuiImgButton.java @@ -181,7 +181,7 @@ public class GuiImgButton extends GuiButton implements ITooltip registerApp( 16 * 11 + 2, Settings.CRAFT_VIA_REDSTONE, YesNo.YES, ButtonToolTips.EmitterMode, ButtonToolTips.CraftViaRedstone ); registerApp( 16 * 11 + 1, Settings.CRAFT_VIA_REDSTONE, YesNo.NO, ButtonToolTips.EmitterMode, ButtonToolTips.EmitWhenCrafing ); - registerApp( 16 * 3 + 5, Settings.STORAGE_FILTER, StorageFilter.EXTACTABLE_ONLY, ButtonToolTips.ReportInaccessibleItems, + registerApp( 16 * 3 + 5, Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY, ButtonToolTips.ReportInaccessibleItems, ButtonToolTips.ReportInaccessibleItemsNo ); registerApp( 16 * 3 + 6, Settings.STORAGE_FILTER, StorageFilter.NONE, ButtonToolTips.ReportInaccessibleItems, ButtonToolTips.ReportInaccessibleItemsYes ); diff --git a/container/implementations/ContainerStorageBus.java b/container/implementations/ContainerStorageBus.java index daf868685..9a19e86d7 100644 --- a/container/implementations/ContainerStorageBus.java +++ b/container/implementations/ContainerStorageBus.java @@ -33,7 +33,7 @@ public class ContainerStorageBus extends ContainerUpgradeable public AccessRestriction rwMode = AccessRestriction.READ_WRITE; @GuiSync(4) - public StorageFilter storageFilter = StorageFilter.EXTACTABLE_ONLY; + public StorageFilter storageFilter = StorageFilter.EXTRACTABLE_ONLY; public ContainerStorageBus(InventoryPlayer ip, PartStorageBus te) { super( ip, te ); diff --git a/me/storage/MEMonitorIInventory.java b/me/storage/MEMonitorIInventory.java index 979025cb8..7ae60178f 100644 --- a/me/storage/MEMonitorIInventory.java +++ b/me/storage/MEMonitorIInventory.java @@ -55,7 +55,7 @@ public class MEMonitorIInventory implements IMEInventory, IMEMonit final HashMap, Object> listeners = new HashMap(); public BaseActionSource mySource; - public StorageFilter mode = StorageFilter.EXTACTABLE_ONLY; + public StorageFilter mode = StorageFilter.EXTRACTABLE_ONLY; @Override public void addListener(IMEMonitorHandlerReceiver l, Object verificationToken) @@ -176,7 +176,7 @@ public class MEMonitorIInventory implements IMEInventory, IMEMonit CachedItemStack old = memory.get( is.slot ); high = Math.max( high, is.slot ); - ItemStack newIS = is == null || is.isExtractable == false && mode == StorageFilter.EXTACTABLE_ONLY ? null : is.getItemStack(); + ItemStack newIS = is == null || is.isExtractable == false && mode == StorageFilter.EXTRACTABLE_ONLY ? null : is.getItemStack(); ItemStack oldIS = old == null ? null : old.itemStack; if ( isDiffrent( newIS, oldIS ) ) diff --git a/parts/misc/PartStorageBus.java b/parts/misc/PartStorageBus.java index 574d48f15..74809577d 100644 --- a/parts/misc/PartStorageBus.java +++ b/parts/misc/PartStorageBus.java @@ -80,7 +80,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC super( PartStorageBus.class, is ); getConfigManager().registerSetting( Settings.ACCESS, AccessRestriction.READ_WRITE ); getConfigManager().registerSetting( Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL ); - getConfigManager().registerSetting( Settings.STORAGE_FILTER, StorageFilter.EXTACTABLE_ONLY ); + getConfigManager().registerSetting( Settings.STORAGE_FILTER, StorageFilter.EXTRACTABLE_ONLY ); mySrc = new MachineSource( this ); } From d2326de512477ce73556f71bfd41686ff381f9e7 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:39:37 +0200 Subject: [PATCH 17/28] Typo GridFlags.PREFERED --- me/GridNode.java | 4 ++-- parts/networking/PartCable.java | 2 +- parts/networking/PartDenseCable.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/me/GridNode.java b/me/GridNode.java index 5578bbe13..1e5f31868 100644 --- a/me/GridNode.java +++ b/me/GridNode.java @@ -379,8 +379,8 @@ public class GridNode implements IGridNode, IPathItem @Override public int compare(IGridConnection o1, IGridConnection o2) { - boolean preferedA = o1.getOtherSide( gn ).hasFlag( GridFlags.PREFERED ); - boolean preferedB = o2.getOtherSide( gn ).hasFlag( GridFlags.PREFERED ); + boolean preferedA = o1.getOtherSide( gn ).hasFlag( GridFlags.PREFERRED ); + boolean preferedB = o2.getOtherSide( gn ).hasFlag( GridFlags.PREFERRED ); return preferedA == preferedB ? 0 : (preferedA ? -1 : 1); } diff --git a/parts/networking/PartCable.java b/parts/networking/PartCable.java index 6316843a4..9fb402671 100644 --- a/parts/networking/PartCable.java +++ b/parts/networking/PartCable.java @@ -53,7 +53,7 @@ public class PartCable extends AEBasePart implements IPartCable public PartCable(Class c, ItemStack is) { super( c, is ); - proxy.setFlags( GridFlags.PREFERED ); + proxy.setFlags( GridFlags.PREFERRED ); proxy.setIdlePowerUsage( 0.0 ); proxy.myColor = AEColor.values()[((ItemMultiPart) is.getItem()).varientOf( is.getItemDamage() )]; } diff --git a/parts/networking/PartDenseCable.java b/parts/networking/PartDenseCable.java index b1b793919..12c8d789b 100644 --- a/parts/networking/PartDenseCable.java +++ b/parts/networking/PartDenseCable.java @@ -56,7 +56,7 @@ public class PartDenseCable extends PartCable public PartDenseCable(Class c, ItemStack is) { super( c, is ); - proxy.setFlags( GridFlags.DENSE_CAPACITY, GridFlags.PREFERED ); + proxy.setFlags( GridFlags.DENSE_CAPACITY, GridFlags.PREFERRED ); } public PartDenseCable(ItemStack is) { From dd4471947d082038ef17d1504bc44410345d7647 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:40:10 +0200 Subject: [PATCH 18/28] Typo isWorldAccessable --- me/GridNode.java | 2 +- me/helpers/AENetworkProxy.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/me/GridNode.java b/me/GridNode.java index 1e5f31868..3c76c78c9 100644 --- a/me/GridNode.java +++ b/me/GridNode.java @@ -247,7 +247,7 @@ public class GridNode implements IGridNode, IPathItem public void FindConnections() { - if ( !gridProxy.isWorldAccessable() ) + if ( !gridProxy.isWorldAccessible() ) return; EnumSet newSecurityConnections = EnumSet.noneOf( ForgeDirection.class ); diff --git a/me/helpers/AENetworkProxy.java b/me/helpers/AENetworkProxy.java index 7dcf94d8f..a7f78cabb 100644 --- a/me/helpers/AENetworkProxy.java +++ b/me/helpers/AENetworkProxy.java @@ -292,7 +292,7 @@ public class AENetworkProxy implements IGridBlock } @Override - public boolean isWorldAccessable() + public boolean isWorldAccessible() { return worldNode; } From 9fb6ae404741ccf39c345b10a8b55a3ed23b9910 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:40:57 +0200 Subject: [PATCH 19/28] Typo locateable --- core/features/registries/RegistryContainer.java | 2 +- helpers/WirelessTerminalGuiObject.java | 2 +- me/cluster/implementations/QuantumCluster.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/features/registries/RegistryContainer.java b/core/features/registries/RegistryContainer.java index e70104775..26f2ed981 100644 --- a/core/features/registries/RegistryContainer.java +++ b/core/features/registries/RegistryContainer.java @@ -62,7 +62,7 @@ public class RegistryContainer implements IRegistryContainer } @Override - public ILocatableRegistry locateable() + public ILocatableRegistry locatable() { return LocateableRegistry; } diff --git a/helpers/WirelessTerminalGuiObject.java b/helpers/WirelessTerminalGuiObject.java index c527a08d6..17b6b410b 100644 --- a/helpers/WirelessTerminalGuiObject.java +++ b/helpers/WirelessTerminalGuiObject.java @@ -62,7 +62,7 @@ public class WirelessTerminalGuiObject implements IPortableCell, IActionHost try { long encKey = Long.parseLong( encryptionKey ); - obj = AEApi.instance().registries().locateable().findLocateableBySerial( encKey ); + obj = AEApi.instance().registries().locatable().findLocateableBySerial( encKey ); } catch (NumberFormatException err) { diff --git a/me/cluster/implementations/QuantumCluster.java b/me/cluster/implementations/QuantumCluster.java index d222ec5b1..9aecc5eee 100644 --- a/me/cluster/implementations/QuantumCluster.java +++ b/me/cluster/implementations/QuantumCluster.java @@ -61,7 +61,7 @@ public class QuantumCluster implements ILocatable, IAECluster public boolean canUseNode(long qe) { - QuantumCluster qc = (QuantumCluster) AEApi.instance().registries().locateable().findLocateableBySerial( qe ); + QuantumCluster qc = (QuantumCluster) AEApi.instance().registries().locatable().findLocateableBySerial( qe ); if ( qc != null && qc.center instanceof TileQuantumBridge ) { World theWorld = qc.getCenter().getWorldObj(); @@ -127,7 +127,7 @@ public class QuantumCluster implements ILocatable, IAECluster } } - Object myOtherSide = otherSide == 0 ? null : AEApi.instance().registries().locateable().findLocateableBySerial( otherSide ); + Object myOtherSide = otherSide == 0 ? null : AEApi.instance().registries().locatable().findLocateableBySerial( otherSide ); boolean shutdown = false; From c3891054c9fd2239cdf3179e3bd315ecd0c638f4 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:41:19 +0200 Subject: [PATCH 20/28] Typo specialComparson --- core/features/registries/RegistryContainer.java | 2 +- util/item/AESharedNBT.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/features/registries/RegistryContainer.java b/core/features/registries/RegistryContainer.java index 26f2ed981..2a8cbf649 100644 --- a/core/features/registries/RegistryContainer.java +++ b/core/features/registries/RegistryContainer.java @@ -50,7 +50,7 @@ public class RegistryContainer implements IRegistryContainer } @Override - public ISpecialComparisonRegistry specialComparson() + public ISpecialComparisonRegistry specialComparison() { return SpecialComparsonRegistry; } diff --git a/util/item/AESharedNBT.java b/util/item/AESharedNBT.java index b3627ae92..4563a7d33 100644 --- a/util/item/AESharedNBT.java +++ b/util/item/AESharedNBT.java @@ -70,7 +70,7 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound ItemStack isc = new ItemStack( itemID, 1, damageValue ); isc.setTagCompound( c ); - x.comp = AEApi.instance().registries().specialComparson().getSpecialComparison( isc ); + x.comp = AEApi.instance().registries().specialComparison().getSpecialComparison( isc ); return x; } From e9ff5bcd2157f903a28eccb7078d660169c0fb75 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:41:45 +0200 Subject: [PATCH 21/28] Typo findLocateableBySerial --- core/features/registries/LocateableRegistry.java | 2 +- helpers/WirelessTerminalGuiObject.java | 2 +- me/cluster/implementations/QuantumCluster.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/features/registries/LocateableRegistry.java b/core/features/registries/LocateableRegistry.java index 8cdbb9f49..b8d7a6b19 100644 --- a/core/features/registries/LocateableRegistry.java +++ b/core/features/registries/LocateableRegistry.java @@ -40,7 +40,7 @@ public class LocateableRegistry implements ILocatableRegistry * Find a locate-able object by its serial. */ @Override - public Object findLocateableBySerial(long ser) + public Object findLocatableBySerial(long ser) { return set.get( ser ); } diff --git a/helpers/WirelessTerminalGuiObject.java b/helpers/WirelessTerminalGuiObject.java index 17b6b410b..0338c326c 100644 --- a/helpers/WirelessTerminalGuiObject.java +++ b/helpers/WirelessTerminalGuiObject.java @@ -62,7 +62,7 @@ public class WirelessTerminalGuiObject implements IPortableCell, IActionHost try { long encKey = Long.parseLong( encryptionKey ); - obj = AEApi.instance().registries().locatable().findLocateableBySerial( encKey ); + obj = AEApi.instance().registries().locatable().findLocatableBySerial( encKey ); } catch (NumberFormatException err) { diff --git a/me/cluster/implementations/QuantumCluster.java b/me/cluster/implementations/QuantumCluster.java index 9aecc5eee..0f4859d7c 100644 --- a/me/cluster/implementations/QuantumCluster.java +++ b/me/cluster/implementations/QuantumCluster.java @@ -61,7 +61,7 @@ public class QuantumCluster implements ILocatable, IAECluster public boolean canUseNode(long qe) { - QuantumCluster qc = (QuantumCluster) AEApi.instance().registries().locatable().findLocateableBySerial( qe ); + QuantumCluster qc = (QuantumCluster) AEApi.instance().registries().locatable().findLocatableBySerial( qe ); if ( qc != null && qc.center instanceof TileQuantumBridge ) { World theWorld = qc.getCenter().getWorldObj(); @@ -127,7 +127,7 @@ public class QuantumCluster implements ILocatable, IAECluster } } - Object myOtherSide = otherSide == 0 ? null : AEApi.instance().registries().locatable().findLocateableBySerial( otherSide ); + Object myOtherSide = otherSide == 0 ? null : AEApi.instance().registries().locatable().findLocatableBySerial( otherSide ); boolean shutdown = false; From b7c1c7c60278f026a881dbf24d741621cb46526e Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:42:09 +0200 Subject: [PATCH 22/28] Typo isMeaninful --- me/storage/SecurityInventory.java | 2 +- util/item/AEStack.java | 2 +- util/item/ItemList.java | 2 +- util/item/MeanfulIterator.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/me/storage/SecurityInventory.java b/me/storage/SecurityInventory.java index 5c72ccd62..ecefe733d 100644 --- a/me/storage/SecurityInventory.java +++ b/me/storage/SecurityInventory.java @@ -122,7 +122,7 @@ public class SecurityInventory implements IMEInventoryHandler for (IAEItemStack ais : storedItems) { - if ( ais.isMeaninful() ) + if ( ais.isMeaningful() ) { GameProfile thisUser = tbc.getProfile( ais.getItemStack() ); if ( thisUser == newUser ) diff --git a/util/item/AEStack.java b/util/item/AEStack.java index a40002e7a..405250559 100644 --- a/util/item/AEStack.java +++ b/util/item/AEStack.java @@ -14,7 +14,7 @@ public abstract class AEStack implements IAEStack 0 || isCraftable(); } diff --git a/util/item/ItemList.java b/util/item/ItemList.java index 31b3b4114..023196129 100644 --- a/util/item/ItemList.java +++ b/util/item/ItemList.java @@ -150,7 +150,7 @@ public final class ItemList implements IItemList i = iterator(); while (i.hasNext()) { StackType AEI = - * i.next(); if ( !AEI.isMeaninful() ) i.remove(); } } + * i.next(); if ( !AEI.isMeaningful() ) i.remove(); } } */ @Override diff --git a/util/item/MeanfulIterator.java b/util/item/MeanfulIterator.java index 671583ee9..420dd6ba8 100644 --- a/util/item/MeanfulIterator.java +++ b/util/item/MeanfulIterator.java @@ -20,7 +20,7 @@ public class MeanfulIterator implements Iterator while (parent.hasNext()) { next = parent.next(); - if ( next.isMeaninful() ) + if ( next.isMeaningful() ) return true; else parent.remove(); // self cleaning :3 From f087ef16ebeebaf7db5515fb08d21f037d1682f0 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:42:47 +0200 Subject: [PATCH 23/28] Typo materialPureified --- integration/modules/NEIHelpers/NEIWorldCraftingHandler.java | 6 +++--- items/misc/ItemCrystalSeed.java | 6 +++--- util/Platform.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java b/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java index d56ef0dc5..b60069d36 100644 --- a/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java +++ b/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java @@ -69,9 +69,9 @@ public class NEIWorldCraftingHandler implements ICraftingHandler, IUsageHandler if ( AEConfig.instance.isFeatureEnabled( AEFeature.inWorldPurification ) ) { - addRecipe( AEApi.instance().materials().materialPureifiedCertusQuartzCrystal, GuiText.inWorldPurificationCertus.getLocal() ); - addRecipe( AEApi.instance().materials().materialPureifiedNetherQuartzCrystal, GuiText.inWorldPurificationNether.getLocal() ); - addRecipe( AEApi.instance().materials().materialPureifiedFluixCrystal, GuiText.inWorldPurificationFluix.getLocal() ); + addRecipe( AEApi.instance().materials().materialPurifiedCertusQuartzCrystal, GuiText.inWorldPurificationCertus.getLocal() ); + addRecipe( AEApi.instance().materials().materialPurifiedNetherQuartzCrystal, GuiText.inWorldPurificationNether.getLocal() ); + addRecipe( AEApi.instance().materials().materialPurifiedFluixCrystal, GuiText.inWorldPurificationFluix.getLocal() ); } } diff --git a/items/misc/ItemCrystalSeed.java b/items/misc/ItemCrystalSeed.java index 8b9ed0c8d..f2a4f6f1d 100644 --- a/items/misc/ItemCrystalSeed.java +++ b/items/misc/ItemCrystalSeed.java @@ -104,11 +104,11 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal int newDamage = getProgress( is ) + 1; if ( newDamage == Certus + SINGLE_OFFSET ) - return AEApi.instance().materials().materialPureifiedCertusQuartzCrystal.stack( is.stackSize ); + return AEApi.instance().materials().materialPurifiedCertusQuartzCrystal.stack( is.stackSize ); if ( newDamage == Nether + SINGLE_OFFSET ) - return AEApi.instance().materials().materialPureifiedNetherQuartzCrystal.stack( is.stackSize ); + return AEApi.instance().materials().materialPurifiedNetherQuartzCrystal.stack( is.stackSize ); if ( newDamage == Fluix + SINGLE_OFFSET ) - return AEApi.instance().materials().materialPureifiedFluixCrystal.stack( is.stackSize ); + return AEApi.instance().materials().materialPurifiedFluixCrystal.stack( is.stackSize ); if ( newDamage > END ) return null; diff --git a/util/Platform.java b/util/Platform.java index 220dd3a8c..e34fffab0 100644 --- a/util/Platform.java +++ b/util/Platform.java @@ -1847,8 +1847,8 @@ public class Platform public static boolean isRecipePrioritized(ItemStack what) { - return AEApi.instance().materials().materialPureifiedCertusQuartzCrystal.sameAsStack( what ) - || AEApi.instance().materials().materialPureifiedFluixCrystal.sameAsStack( what ) - || AEApi.instance().materials().materialPureifiedNetherQuartzCrystal.sameAsStack( what ); + return AEApi.instance().materials().materialPurifiedCertusQuartzCrystal.sameAsStack( what ) + || AEApi.instance().materials().materialPurifiedFluixCrystal.sameAsStack( what ) + || AEApi.instance().materials().materialPurifiedNetherQuartzCrystal.sameAsStack( what ); } } From f8e3b8f22436ef4ce5500fe63c9ea4b17ecbe931 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:43:42 +0200 Subject: [PATCH 24/28] Typo Pureified --- items/materials/MaterialType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items/materials/MaterialType.java b/items/materials/MaterialType.java index 4dd65a194..2b38ae6c7 100644 --- a/items/materials/MaterialType.java +++ b/items/materials/MaterialType.java @@ -29,7 +29,7 @@ public enum MaterialType FluixCrystal(7, AEFeature.Core, "crystalFluix"), FluixDust(8, AEFeature.Core, "dustFluix"), FluixPearl(9, AEFeature.Core, "pearlFluix"), - PureifiedCertusQuartzCrystal(10), PureifiedNetherQuartzCrystal(11), PureifiedFluixCrystal(12), + PurifiedCertusQuartzCrystal(10), PurifiedNetherQuartzCrystal(11), PurifiedFluixCrystal(12), CalcProcessorPress(13), EngProcessorPress(14), LogicProcessorPress(15), From 31886d7f72515f977af2f2a4bbf61d7ce6737542 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:44:43 +0200 Subject: [PATCH 25/28] Typo OpenWirelessTermainlGui --- core/features/registries/WirelessRegistry.java | 2 +- items/tools/powered/ToolWirelessTerminal.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/features/registries/WirelessRegistry.java b/core/features/registries/WirelessRegistry.java index f797ae778..b6a6b6556 100644 --- a/core/features/registries/WirelessRegistry.java +++ b/core/features/registries/WirelessRegistry.java @@ -52,7 +52,7 @@ public class WirelessRegistry implements IWirelessTermRegistry } @Override - public void OpenWirelessTermainlGui(ItemStack item, World w, EntityPlayer player) + public void openWirelessTerminalGui(ItemStack item, World w, EntityPlayer player) { if ( Platform.isClient() ) return; diff --git a/items/tools/powered/ToolWirelessTerminal.java b/items/tools/powered/ToolWirelessTerminal.java index a40f9e99c..bee983979 100644 --- a/items/tools/powered/ToolWirelessTerminal.java +++ b/items/tools/powered/ToolWirelessTerminal.java @@ -35,7 +35,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless @Override public ItemStack onItemRightClick(ItemStack item, World w, EntityPlayer player) { - AEApi.instance().registries().wireless().OpenWirelessTermainlGui( item, w, player ); + AEApi.instance().registries().wireless().openWirelessTerminalGui( item, w, player ); return item; } From 2b78573dd3f4643bb65d6fe6da670a2261f6572b Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:45:48 +0200 Subject: [PATCH 26/28] Typo onThreshholdPass --- me/energy/EnergyWatcher.java | 2 +- parts/automation/PartLevelEmitter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/me/energy/EnergyWatcher.java b/me/energy/EnergyWatcher.java index aeff76012..56aadd27a 100644 --- a/me/energy/EnergyWatcher.java +++ b/me/energy/EnergyWatcher.java @@ -54,7 +54,7 @@ public class EnergyWatcher implements IEnergyWatcher public void post(EnergyGridCache energyGridCache) { - myObject.onThreshholdPass( energyGridCache ); + myObject.onThresholdPass( energyGridCache ); } public EnergyWatcher(EnergyGridCache cache, IEnergyWatcherHost host) { diff --git a/parts/automation/PartLevelEmitter.java b/parts/automation/PartLevelEmitter.java index 0b684b52d..b1afd81d6 100644 --- a/parts/automation/PartLevelEmitter.java +++ b/parts/automation/PartLevelEmitter.java @@ -327,7 +327,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH } @Override - public void onThreshholdPass(IEnergyGrid energyGrid) + public void onThresholdPass(IEnergyGrid energyGrid) { lastReportedValue = (long) energyGrid.getStoredPower(); updateState(); From 88ff766eef8147eb65f48dbff006c0075df99410 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:46:41 +0200 Subject: [PATCH 27/28] Typo currentEffiency --- container/implementations/ContainerSpatialIOPort.java | 2 +- me/cache/SpatialPylonCache.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/container/implementations/ContainerSpatialIOPort.java b/container/implementations/ContainerSpatialIOPort.java index ffcfb2b64..4d4a615f3 100644 --- a/container/implementations/ContainerSpatialIOPort.java +++ b/container/implementations/ContainerSpatialIOPort.java @@ -64,7 +64,7 @@ public class ContainerSpatialIOPort extends AEBaseContainer currentPower = (long) (100.0 * eg.getStoredPower()); maxPower = (long) (100.0 * eg.getMaxStoredPower()); reqPower = (long) (100.0 * sc.requiredPower()); - eff = (long) (100.0f * sc.currentEffiency()); + eff = (long) (100.0f * sc.currentEfficiency()); } } } diff --git a/me/cache/SpatialPylonCache.java b/me/cache/SpatialPylonCache.java index 5913a0499..8277f15a1 100644 --- a/me/cache/SpatialPylonCache.java +++ b/me/cache/SpatialPylonCache.java @@ -183,7 +183,7 @@ public class SpatialPylonCache implements IGridCache, ISpatialCache } @Override - public float currentEffiency() + public float currentEfficiency() { return (float) effiency * 100; } From c698274e11b6c9501655acfbb50de113a9cf1140 Mon Sep 17 00:00:00 2001 From: thatsIch Date: Sat, 20 Sep 2014 22:47:08 +0200 Subject: [PATCH 28/28] Typo WorldGenType.Metorites --- hooks/MeteoriteWorldGen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hooks/MeteoriteWorldGen.java b/hooks/MeteoriteWorldGen.java index f58de2594..68621fc84 100644 --- a/hooks/MeteoriteWorldGen.java +++ b/hooks/MeteoriteWorldGen.java @@ -38,7 +38,7 @@ final public class MeteoriteWorldGen implements IWorldGenerator @Override public void generate(Random r, int chunkX, int chunkZ, World w, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { - if ( WorldGenRegistry.instance.isWorldGenEnabled( WorldGenType.Metorites, w ) ) + if ( WorldGenRegistry.instance.isWorldGenEnabled( WorldGenType.Meteorites, w ) ) { // add new metorites? if ( r.nextFloat() < AEConfig.instance.metoriteSpawnChance )