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 );