tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Merged Typo into rv2

Browse source
This commit is contained in:
AlgorithmX2 2014-09-20 15:58:48 -05:00
commit fd674f2c51
84 changed files with 237 additions and 237 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/gui/AEBaseMEGui.java
View file

@ -34,7 +34,7 @@ public abstract class AEBaseMEGui extends AEBaseGui
SlotME theSlotField = (SlotME) s; SlotME theSlotField = (SlotME) s;
myStack = theSlotField.getAEStack(); myStack = theSlotField.getAEStack();
} }
catch (Throwable _) catch (Throwable ignore)
{ {
} }
@ -72,7 +72,7 @@ public abstract class AEBaseMEGui extends AEBaseGui
SlotME theSlotField = (SlotME) s; SlotME theSlotField = (SlotME) s;
myStack = theSlotField.getAEStack(); myStack = theSlotField.getAEStack();
} }
catch (Throwable _) catch (Throwable ignore)
{ {
} }

4
client/gui/implementations/GuiMEMonitorable.java
View file

@ -19,7 +19,7 @@ import appeng.api.implementations.tiles.IViewCellStorage;
import appeng.api.storage.ITerminalHost; import appeng.api.storage.ITerminalHost;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.client.gui.AEBaseMEGui; import appeng.client.gui.AEBaseMEGui;
import appeng.client.gui.widgets.GuiImgButton; import appeng.client.gui.widgets.GuiImgButton;
import appeng.client.gui.widgets.GuiScrollbar; import appeng.client.gui.widgets.GuiScrollbar;
@ -103,7 +103,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
standardSize = xSize; standardSize = xSize;
configSrc = ((IConfigureableObject) inventorySlots).getConfigManager(); configSrc = ((IConfigurableObject) inventorySlots).getConfigManager();
(mecontainer = (ContainerMEMonitorable) inventorySlots).gui = this; (mecontainer = (ContainerMEMonitorable) inventorySlots).gui = this;
viewCell = te instanceof IViewCellStorage; viewCell = te instanceof IViewCellStorage;

4
client/gui/implementations/GuiNetworkStatus.java
View file

@ -227,7 +227,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
SlotME theSlotField = (SlotME) s; SlotME theSlotField = (SlotME) s;
myStack = theSlotField.getAEStack(); myStack = theSlotField.getAEStack();
} }
catch (Throwable _) catch (Throwable ignore)
{ {
} }
@ -255,7 +255,7 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
SlotME theSlotField = (SlotME) s; SlotME theSlotField = (SlotME) s;
myStack = theSlotField.getAEStack(); myStack = theSlotField.getAEStack();
} }
catch (Throwable _) catch (Throwable ignore)
{ {
} }

2
client/gui/implementations/GuiStorageBus.java
View file

@ -66,7 +66,7 @@ public class GuiStorageBus extends GuiUpgradeable
clear = new GuiImgButton( this.guiLeft - 18, guiTop + 8, Settings.ACTIONS, ActionItems.CLOSE ); clear = new GuiImgButton( this.guiLeft - 18, guiTop + 8, Settings.ACTIONS, ActionItems.CLOSE );
partition = new GuiImgButton( this.guiLeft - 18, guiTop + 28, Settings.ACTIONS, ActionItems.WRENCH ); 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 ); 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 ); 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 ) ); buttonList.add( priority = new GuiTabButton( this.guiLeft + 154, this.guiTop, 2 + 4 * 16, GuiText.Priority.getLocal(), itemRender ) );

10
client/gui/widgets/GuiImgButton.java
View file

@ -11,7 +11,7 @@ import org.lwjgl.opengl.GL11;
import appeng.api.config.AccessRestriction; import appeng.api.config.AccessRestriction;
import appeng.api.config.ActionItems; import appeng.api.config.ActionItems;
import appeng.api.config.CondenserOuput; import appeng.api.config.CondenserOutput;
import appeng.api.config.FullnessMode; import appeng.api.config.FullnessMode;
import appeng.api.config.FuzzyMode; import appeng.api.config.FuzzyMode;
import appeng.api.config.LevelType; import appeng.api.config.LevelType;
@ -102,9 +102,9 @@ public class GuiImgButton extends GuiButton implements ITooltip
if ( Appearances == null ) if ( Appearances == null )
{ {
Appearances = new HashMap(); Appearances = new HashMap();
registerApp( 16 * 7 + 0, Settings.CONDENSER_OUTPUT, CondenserOuput.TRASH, ButtonToolTips.CondenserOutput, ButtonToolTips.Trash ); registerApp( 16 * 7 + 0, Settings.CONDENSER_OUTPUT, CondenserOutput.TRASH, ButtonToolTips.CondenserOutput, ButtonToolTips.Trash );
registerApp( 16 * 7 + 1, Settings.CONDENSER_OUTPUT, CondenserOuput.MATTER_BALLS, ButtonToolTips.CondenserOutput, ButtonToolTips.MatterBalls ); registerApp( 16 * 7 + 1, Settings.CONDENSER_OUTPUT, CondenserOutput.MATTER_BALLS, ButtonToolTips.CondenserOutput, ButtonToolTips.MatterBalls );
registerApp( 16 * 7 + 2, Settings.CONDENSER_OUTPUT, CondenserOuput.SINGULARITY, ButtonToolTips.CondenserOutput, ButtonToolTips.Singularity ); 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 + 1, Settings.ACCESS, AccessRestriction.READ, ButtonToolTips.IOMode, ButtonToolTips.Read );
registerApp( 16 * 9 + 0, Settings.ACCESS, AccessRestriction.WRITE, ButtonToolTips.IOMode, ButtonToolTips.Write ); registerApp( 16 * 9 + 0, Settings.ACCESS, AccessRestriction.WRITE, ButtonToolTips.IOMode, ButtonToolTips.Write );
@ -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 + 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 * 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 ); ButtonToolTips.ReportInaccessibleItemsNo );
registerApp( 16 * 3 + 6, Settings.STORAGE_FILTER, StorageFilter.NONE, ButtonToolTips.ReportInaccessibleItems, registerApp( 16 * 3 + 6, Settings.STORAGE_FILTER, StorageFilter.NONE, ButtonToolTips.ReportInaccessibleItems,
ButtonToolTips.ReportInaccessibleItemsYes ); ButtonToolTips.ReportInaccessibleItemsYes );

4
client/me/ItemRepo.java
View file

@ -108,7 +108,7 @@ public class ItemRepo
b.invoke( searchField, "" ); b.invoke( searchField, "" );
} }
} }
catch (Throwable _) catch (Throwable ignore)
{ {
} }
@ -143,7 +143,7 @@ public class ItemRepo
{ {
m = Pattern.compile( innerSearch.toLowerCase(), Pattern.CASE_INSENSITIVE ); m = Pattern.compile( innerSearch.toLowerCase(), Pattern.CASE_INSENSITIVE );
} }
catch (Throwable _) catch (Throwable ignore)
{ {
try try
{ {

6
client/render/BusRenderHelper.java
View file

@ -9,7 +9,7 @@ import net.minecraft.util.IIcon;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.parts.IBoxProvider; import appeng.api.parts.IBoxProvider;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.parts.ISimplifiedBundle; import appeng.api.parts.ISimplifiedBundle;
import appeng.block.AEBaseBlock; import appeng.block.AEBaseBlock;
@ -41,7 +41,7 @@ public class BusRenderHelper implements IPartRenderHelper
int color = 0xffffff; int color = 0xffffff;
class BoundBoxCalculator implements IPartCollsionHelper class BoundBoxCalculator implements IPartCollisionHelper
{ {
public boolean started = false; public boolean started = false;
@ -149,7 +149,7 @@ public class BusRenderHelper implements IPartRenderHelper
} }
@Override @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; RenderBlocksWorkaround rbw = BusRenderer.instance.renderer;

6
client/render/blocks/RenderBlockAssembler.java
View file

@ -13,7 +13,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.networking.IGridHost; import appeng.api.networking.IGridHost;
import appeng.api.parts.IBoxProvider; import appeng.api.parts.IBoxProvider;
import appeng.api.parts.IPart; import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost; import appeng.api.parts.IPartHost;
import appeng.api.util.IOrientable; import appeng.api.util.IOrientable;
import appeng.block.AEBaseBlock; import appeng.block.AEBaseBlock;
@ -182,7 +182,7 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide
preRenderInWorld( block, world, x, y, z, renderer ); 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; BusRenderer.instance.renderer.isFacade = true;
IOrientable te = getOrientable( block, world, x, y, z ); IOrientable te = getOrientable( block, world, x, y, z );
@ -251,7 +251,7 @@ public class RenderBlockAssembler extends BaseBlockRender implements IBoxProvide
} }
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollisionHelper bch)
{ {
bch.addBox( 0, 0, 0, 16, 16, 16 ); bch.addBox( 0, 0, 0, 16, 16, 16 );
} }

2
client/render/blocks/RenderBlockCraftingCPU.java
View file

@ -72,7 +72,7 @@ public class RenderBlockCraftingCPU extends BaseBlockRender
try try
{ {
ct.lightCache = i.useSimpliedRendering( x, y, z, null, ct.lightCache ); ct.lightCache = i.useSimplifiedRendering( x, y, z, null, ct.lightCache );
} }
catch (Throwable t) catch (Throwable t)
{ {

6
container/implementations/ContainerCondenser.java
View file

@ -1,7 +1,7 @@
package appeng.container.implementations; package appeng.container.implementations;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import appeng.api.config.CondenserOuput; import appeng.api.config.CondenserOutput;
import appeng.api.config.Settings; import appeng.api.config.Settings;
import appeng.container.AEBaseContainer; import appeng.container.AEBaseContainer;
import appeng.container.guisync.GuiSync; import appeng.container.guisync.GuiSync;
@ -38,7 +38,7 @@ public class ContainerCondenser extends AEBaseContainer
this.requiredEnergy = (int) maxDisplay; this.requiredEnergy = (int) maxDisplay;
this.storedPower = (int) this.myte.storedPower; 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(); super.detectAndSendChanges();
@ -51,6 +51,6 @@ public class ContainerCondenser extends AEBaseContainer
public long storedPower = 0; public long storedPower = 0;
@GuiSync(2) @GuiSync(2)
public CondenserOuput output = CondenserOuput.TRASH; public CondenserOutput output = CondenserOutput.TRASH;
} }

4
container/implementations/ContainerMEMonitorable.java
View file

@ -34,7 +34,7 @@ import appeng.api.storage.ITerminalHost;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList; import appeng.api.storage.data.IItemList;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.container.AEBaseContainer; import appeng.container.AEBaseContainer;
import appeng.container.guisync.GuiSync; import appeng.container.guisync.GuiSync;
import appeng.container.slot.SlotRestrictedInput; import appeng.container.slot.SlotRestrictedInput;
@ -48,7 +48,7 @@ import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost; import appeng.util.IConfigManagerHost;
import appeng.util.Platform; import appeng.util.Platform;
public class ContainerMEMonitorable extends AEBaseContainer implements IConfigManagerHost, IConfigureableObject, IMEMonitorHandlerReceiver<IAEItemStack> public class ContainerMEMonitorable extends AEBaseContainer implements IConfigManagerHost, IConfigurableObject, IMEMonitorHandlerReceiver<IAEItemStack>
{ {
final IMEMonitor<IAEItemStack> monitor; final IMEMonitor<IAEItemStack> monitor;

2
container/implementations/ContainerSpatialIOPort.java
View file

@ -64,7 +64,7 @@ public class ContainerSpatialIOPort extends AEBaseContainer
currentPower = (long) (100.0 * eg.getStoredPower()); currentPower = (long) (100.0 * eg.getStoredPower());
maxPower = (long) (100.0 * eg.getMaxStoredPower()); maxPower = (long) (100.0 * eg.getMaxStoredPower());
reqPower = (long) (100.0 * sc.requiredPower()); reqPower = (long) (100.0 * sc.requiredPower());
eff = (long) (100.0f * sc.currentEffiency()); eff = (long) (100.0f * sc.currentEfficiency());
} }
} }
} }

2
container/implementations/ContainerStorageBus.java
View file

@ -33,7 +33,7 @@ public class ContainerStorageBus extends ContainerUpgradeable
public AccessRestriction rwMode = AccessRestriction.READ_WRITE; public AccessRestriction rwMode = AccessRestriction.READ_WRITE;
@GuiSync(4) @GuiSync(4)
public StorageFilter storageFilter = StorageFilter.EXTACTABLE_ONLY; public StorageFilter storageFilter = StorageFilter.EXTRACTABLE_ONLY;
public ContainerStorageBus(InventoryPlayer ip, PartStorageBus te) { public ContainerStorageBus(InventoryPlayer ip, PartStorageBus te) {
super( ip, te ); super( ip, te );

10
core/AEConfig.java
View file

@ -7,7 +7,7 @@ import java.util.List;
import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property; 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.PowerMultiplier;
import appeng.api.config.PowerUnits; import appeng.api.config.PowerUnits;
import appeng.api.config.SearchBoxMode; import appeng.api.config.SearchBoxMode;
@ -15,7 +15,7 @@ import appeng.api.config.Settings;
import appeng.api.config.TerminalStyle; import appeng.api.config.TerminalStyle;
import appeng.api.config.YesNo; import appeng.api.config.YesNo;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.core.features.AEFeature; import appeng.core.features.AEFeature;
import appeng.core.settings.TickRates; import appeng.core.settings.TickRates;
import appeng.items.materials.MaterialType; import appeng.items.materials.MaterialType;
@ -27,7 +27,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent;
public class AEConfig extends Configuration implements IConfigureableObject, IConfigManagerHost public class AEConfig extends Configuration implements IConfigurableObject, IConfigManagerHost
{ {
public static AEConfig instance; public static AEConfig instance;
@ -223,8 +223,8 @@ public class AEConfig extends Configuration implements IConfigureableObject, ICo
double usageEffective = get( "PowerRatios", "UsageMultiplier", 1.0 ).getDouble( 1.0 ); double usageEffective = get( "PowerRatios", "UsageMultiplier", 1.0 ).getDouble( 1.0 );
PowerMultiplier.CONFIG.multiplier = Math.max( 0.01, usageEffective ); PowerMultiplier.CONFIG.multiplier = Math.max( 0.01, usageEffective );
CondenserOuput.MATTER_BALLS.requiredPower = get( "Condenser", "MatterBalls", 256 ).getInt( 256 ); CondenserOutput.MATTER_BALLS.requiredPower = get( "Condenser", "MatterBalls", 256 ).getInt( 256 );
CondenserOuput.SINGULARITY.requiredPower = get( "Condenser", "Singularity", 256000 ).getInt( 256000 ); CondenserOutput.SINGULARITY.requiredPower = get( "Condenser", "Singularity", 256000 ).getInt( 256000 );
grinderOres = get( "GrindStone", "grinderOres", grinderOres ).getStringList(); grinderOres = get( "GrindStone", "grinderOres", grinderOres ).getStringList();
oreDoublePercentage = get( "GrindStone", "oreDoublePercentage", oreDoublePercentage ).getDouble( oreDoublePercentage ); oreDoublePercentage = get( "GrindStone", "oreDoublePercentage", oreDoublePercentage ).getDouble( oreDoublePercentage );

4
core/Registration.java
View file

@ -324,7 +324,7 @@ public class Registration
blocks.blockQuartzGlass = addFeature( BlockQuartzGlass.class ); blocks.blockQuartzGlass = addFeature( BlockQuartzGlass.class );
blocks.blockQuartzVibrantGlass = addFeature( BlockQuartzLamp.class ); blocks.blockQuartzVibrantGlass = addFeature( BlockQuartzLamp.class );
blocks.blockQuartzPiller = addFeature( BlockQuartzPillar.class ); blocks.blockQuartzPillar = addFeature( BlockQuartzPillar.class );
blocks.blockQuartzChiseled = addFeature( BlockQuartzChiseled.class ); blocks.blockQuartzChiseled = addFeature( BlockQuartzChiseled.class );
blocks.blockQuartzTorch = addFeature( BlockQuartzTorch.class ); blocks.blockQuartzTorch = addFeature( BlockQuartzTorch.class );
blocks.blockLightDetector = addFeature( BlockLightDetector.class ); blocks.blockLightDetector = addFeature( BlockLightDetector.class );
@ -679,7 +679,7 @@ public class Registration
if ( AEConfig.instance.isFeatureEnabled( AEFeature.MeteoriteWorldGen ) ) if ( AEConfig.instance.isFeatureEnabled( AEFeature.MeteoriteWorldGen ) )
GameRegistry.registerWorldGenerator( new MeteoriteWorldGen(), 0 ); GameRegistry.registerWorldGenerator( new MeteoriteWorldGen(), 0 );
IMovableRegistry mr = AEApi.instance().registries().moveable(); IMovableRegistry mr = AEApi.instance().registries().movable();
/** /**
* You can't move bed rock. * You can't move bed rock.

2
core/api/imc/IMCBlackListSpatial.java
View file

@ -20,7 +20,7 @@ public class IMCBlackListSpatial implements IIMCHandler
Block blk = Block.getBlockFromItem( is.getItem() ); Block blk = Block.getBlockFromItem( is.getItem() );
if ( blk != null ) if ( blk != null )
{ {
AEApi.instance().registries().moveable().blacklistBlock( blk ); AEApi.instance().registries().movable().blacklistBlock( blk );
return; return;
} }
} }

2
core/api/imc/IMCSpatial.java
View file

@ -20,7 +20,7 @@ public class IMCSpatial implements IIMCHandler
try try
{ {
Class classInstance = Class.forName( m.getStringValue() ); Class classInstance = Class.forName( m.getStringValue() );
AEApi.instance().registries().moveable().whiteListTileEntity( classInstance ); AEApi.instance().registries().movable().whiteListTileEntity( classInstance );
} }
catch (ClassNotFoundException e) catch (ClassNotFoundException e)
{ {

2
core/features/registries/LocateableRegistry.java
View file

@ -40,7 +40,7 @@ public class LocateableRegistry implements ILocatableRegistry
* Find a locate-able object by its serial. * Find a locate-able object by its serial.
*/ */
@Override @Override
public Object findLocateableBySerial(long ser) public Object findLocatableBySerial(long ser)
{ {
return set.get( ser ); return set.get( ser );
} }

10
core/features/registries/RegistryContainer.java
View file

@ -8,7 +8,7 @@ import appeng.api.features.IPlayerRegistry;
import appeng.api.features.IRecipeHandlerRegistry; import appeng.api.features.IRecipeHandlerRegistry;
import appeng.api.features.IRegistryContainer; import appeng.api.features.IRegistryContainer;
import appeng.api.features.ISpecialComparisonRegistry; import appeng.api.features.ISpecialComparisonRegistry;
import appeng.api.features.IWirelessTermRegistery; import appeng.api.features.IWirelessTermRegistry;
import appeng.api.features.IWorldGen; import appeng.api.features.IWorldGen;
import appeng.api.movable.IMovableRegistry; import appeng.api.movable.IMovableRegistry;
import appeng.api.networking.IGridCacheRegistry; import appeng.api.networking.IGridCacheRegistry;
@ -32,7 +32,7 @@ public class RegistryContainer implements IRegistryContainer
private IRecipeHandlerRegistry recipeReg = new RecipeHandlerRegistry(); private IRecipeHandlerRegistry recipeReg = new RecipeHandlerRegistry();
@Override @Override
public IWirelessTermRegistery wireless() public IWirelessTermRegistry wireless()
{ {
return WirelessRegistery; return WirelessRegistery;
} }
@ -50,7 +50,7 @@ public class RegistryContainer implements IRegistryContainer
} }
@Override @Override
public ISpecialComparisonRegistry specialComparson() public ISpecialComparisonRegistry specialComparison()
{ {
return SpecialComparsonRegistry; return SpecialComparsonRegistry;
} }
@ -62,7 +62,7 @@ public class RegistryContainer implements IRegistryContainer
} }
@Override @Override
public ILocatableRegistry locateable() public ILocatableRegistry locatable()
{ {
return LocateableRegistry; return LocateableRegistry;
} }
@ -74,7 +74,7 @@ public class RegistryContainer implements IRegistryContainer
} }
@Override @Override
public IMovableRegistry moveable() public IMovableRegistry movable()
{ {
return MoveableReg; return MoveableReg;
} }

12
core/features/registries/SpecialComparisonRegistry.java
View file

@ -4,23 +4,23 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.features.IItemComparisionProvider; import appeng.api.features.IItemComparisonProvider;
import appeng.api.features.IItemComparison; import appeng.api.features.IItemComparison;
import appeng.api.features.ISpecialComparisonRegistry; import appeng.api.features.ISpecialComparisonRegistry;
public class SpecialComparisonRegistry implements ISpecialComparisonRegistry public class SpecialComparisonRegistry implements ISpecialComparisonRegistry
{ {
private List<IItemComparisionProvider> CompRegistry; private List<IItemComparisonProvider> CompRegistry;
public SpecialComparisonRegistry() { public SpecialComparisonRegistry() {
CompRegistry = new ArrayList<IItemComparisionProvider>(); CompRegistry = new ArrayList<IItemComparisonProvider>();
} }
@Override @Override
public IItemComparison getSpecialComparion(ItemStack stack) public IItemComparison getSpecialComparison(ItemStack stack)
{ {
for (IItemComparisionProvider i : CompRegistry) for (IItemComparisonProvider i : CompRegistry)
{ {
IItemComparison comp = i.getComparison( stack ); IItemComparison comp = i.getComparison( stack );
if ( comp != null ) if ( comp != null )
@ -33,7 +33,7 @@ public class SpecialComparisonRegistry implements ISpecialComparisonRegistry
} }
@Override @Override
public void addComparisonProvider(IItemComparisionProvider prov) public void addComparisonProvider(IItemComparisonProvider prov)
{ {
CompRegistry.add( prov ); CompRegistry.add( prov );
} }

6
core/features/registries/WirelessRegistry.java
View file

@ -8,12 +8,12 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.ChatComponentText; import net.minecraft.util.ChatComponentText;
import net.minecraft.world.World; import net.minecraft.world.World;
import appeng.api.features.IWirelessTermHandler; import appeng.api.features.IWirelessTermHandler;
import appeng.api.features.IWirelessTermRegistery; import appeng.api.features.IWirelessTermRegistry;
import appeng.core.localization.PlayerMessages; import appeng.core.localization.PlayerMessages;
import appeng.core.sync.GuiBridge; import appeng.core.sync.GuiBridge;
import appeng.util.Platform; import appeng.util.Platform;
public class WirelessRegistry implements IWirelessTermRegistery public class WirelessRegistry implements IWirelessTermRegistry
{ {
List<IWirelessTermHandler> handlers; List<IWirelessTermHandler> handlers;
@ -52,7 +52,7 @@ public class WirelessRegistry implements IWirelessTermRegistery
} }
@Override @Override
public void OpenWirelessTermainlGui(ItemStack item, World w, EntityPlayer player) public void openWirelessTerminalGui(ItemStack item, World w, EntityPlayer player)
{ {
if ( Platform.isClient() ) if ( Platform.isClient() )
return; return;

6
core/sync/packets/PacketConfigButton.java
View file

@ -9,7 +9,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import appeng.api.config.Settings; import appeng.api.config.Settings;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.container.AEBaseContainer; import appeng.container.AEBaseContainer;
import appeng.core.sync.AppEngPacket; import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.INetworkInfo; import appeng.core.sync.network.INetworkInfo;
@ -32,9 +32,9 @@ public class PacketConfigButton extends AppEngPacket
{ {
EntityPlayerMP sender = (EntityPlayerMP) player; EntityPlayerMP sender = (EntityPlayerMP) player;
AEBaseContainer aebc = (AEBaseContainer) sender.openContainer; AEBaseContainer aebc = (AEBaseContainer) sender.openContainer;
if ( aebc.getTarget() instanceof IConfigureableObject ) if ( aebc.getTarget() instanceof IConfigurableObject )
{ {
IConfigManager cm = ((IConfigureableObject) aebc.getTarget()).getConfigManager(); IConfigManager cm = ((IConfigurableObject) aebc.getTarget()).getConfigManager();
Enum newState = Platform.rotateEnum( cm.getSetting( option ), rotationDirection, option.getPossibleValues() ); Enum newState = Platform.rotateEnum( cm.getSetting( option ), rotationDirection, option.getPossibleValues() );
cm.putSetting( option, newState ); cm.putSetting( option, newState );
} }

10
core/sync/packets/PacketValueConfig.java
View file

@ -16,7 +16,7 @@ import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import appeng.api.config.FuzzyMode; import appeng.api.config.FuzzyMode;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.client.gui.implementations.GuiCraftingCPU; import appeng.client.gui.implementations.GuiCraftingCPU;
import appeng.container.AEBaseContainer; import appeng.container.AEBaseContainer;
import appeng.container.implementations.ContainerCellWorkbench; import appeng.container.implementations.ContainerCellWorkbench;
@ -169,9 +169,9 @@ public class PacketValueConfig extends AppEngPacket
((ContainerNetworkTool) c).toggleFacadeMode(); ((ContainerNetworkTool) c).toggleFacadeMode();
} }
} }
else if ( c instanceof IConfigureableObject ) else if ( c instanceof IConfigurableObject )
{ {
IConfigManager cm = ((IConfigureableObject) c).getConfigManager(); IConfigManager cm = ((IConfigurableObject) c).getConfigManager();
for (Enum e : cm.getSettings()) for (Enum e : cm.getSettings())
{ {
@ -215,9 +215,9 @@ public class PacketValueConfig extends AppEngPacket
((GuiCraftingCPU) gs).clearItems(); ((GuiCraftingCPU) gs).clearItems();
return; return;
} }
else if ( c instanceof IConfigureableObject ) else if ( c instanceof IConfigurableObject )
{ {
IConfigManager cm = ((IConfigureableObject) c).getConfigManager(); IConfigManager cm = ((IConfigurableObject) c).getConfigManager();
for (Enum e : cm.getSettings()) for (Enum e : cm.getSettings())
{ {

2
crafting/CraftingLink.java
View file

@ -136,7 +136,7 @@ public class CraftingLink implements ICraftingLink
if ( tie == null || tie.req == null || tie.req.req == null ) if ( tie == null || tie.req == null || tie.req.req == null )
return input; return input;
return tie.req.req.injectCratedItems( tie.req, input, mode ); return tie.req.req.injectCraftedItems( tie.req, input, mode );
} }
public void markDone() public void markDone()

4
crafting/CraftingTreeNode.java
View file

@ -75,12 +75,12 @@ public class CraftingTreeNode
boolean notRecurive(ICraftingPatternDetails details) boolean notRecurive(ICraftingPatternDetails details)
{ {
IAEItemStack[] o = details.getCondencedOutputs(); IAEItemStack[] o = details.getCondensedOutputs();
for (IAEItemStack i : o) for (IAEItemStack i : o)
if ( i.equals( what ) ) if ( i.equals( what ) )
return false; return false;
o = details.getCondencedInputs(); o = details.getCondensedInputs();
for (IAEItemStack i : o) for (IAEItemStack i : o)
if ( i.equals( what ) ) if ( i.equals( what ) )
return false; return false;

18
crafting/CraftingTreeProcess.java
View file

@ -64,12 +64,12 @@ public class CraftingTreeProcess
fullsimulation = true; fullsimulation = true;
} }
for ( IAEItemStack part : details.getCondencedInputs() ) for ( IAEItemStack part : details.getCondensedInputs() )
{ {
ItemStack g = part.getItemStack(); ItemStack g = part.getItemStack();
boolean isAnInput = false; boolean isAnInput = false;
for ( IAEItemStack a : details.getCondencedOutputs() ) for ( IAEItemStack a : details.getCondensedOutputs() )
{ {
if ( g != null && a != null && a.equals( g ) ) if ( g != null && a != null && a.equals( g ) )
isAnInput = true; isAnInput = true;
@ -96,7 +96,7 @@ public class CraftingTreeProcess
else else
{ {
// this is minorly different then below, this slot uses the pattern, but kinda fudges it. // 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++) for (int x = 0; x < list.length; x++)
{ {
@ -113,12 +113,12 @@ public class CraftingTreeProcess
} }
else else
{ {
for ( IAEItemStack part : details.getCondencedInputs() ) for ( IAEItemStack part : details.getCondensedInputs() )
{ {
ItemStack g = part.getItemStack(); ItemStack g = part.getItemStack();
boolean isAnInput = false; boolean isAnInput = false;
for (IAEItemStack a : details.getCondencedOutputs()) for (IAEItemStack a : details.getCondensedOutputs())
{ {
if ( g != null && a != null && a.equals( g ) ) if ( g != null && a != null && a.equals( g ) )
isAnInput = true; isAnInput = true;
@ -128,7 +128,7 @@ public class CraftingTreeProcess
limitQty = true; 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() ); nodes.put( new CraftingTreeNode( cc, job, part.copy(), this, -1, depth + 1 ), part.getStackSize() );
} }
@ -149,7 +149,7 @@ public class CraftingTreeProcess
IAEItemStack getAmountCrafted(IAEItemStack what2) IAEItemStack getAmountCrafted(IAEItemStack what2)
{ {
for (IAEItemStack is : details.getCondencedOutputs()) for (IAEItemStack is : details.getCondensedOutputs())
{ {
if ( is.equals( what2 ) ) if ( is.equals( what2 ) )
{ {
@ -160,7 +160,7 @@ public class CraftingTreeProcess
} }
// more fuzzy! // more fuzzy!
for (IAEItemStack is : details.getCondencedOutputs()) for (IAEItemStack is : details.getCondensedOutputs())
{ {
if ( is.getItem() == what2.getItem() && (is.getItem().isDamageable() || is.getItemDamage() == what2.getItemDamage()) ) if ( is.getItem() == what2.getItem() && (is.getItem().isDamageable() || is.getItemDamage() == what2.getItemDamage()) )
{ {
@ -228,7 +228,7 @@ public class CraftingTreeProcess
// assume its possible. // assume its possible.
// add crafting results.. // add crafting results..
for (IAEItemStack out : details.getCondencedOutputs()) for (IAEItemStack out : details.getCondensedOutputs())
{ {
IAEItemStack o = out.copy(); IAEItemStack o = out.copy();
o.setStackSize( o.getStackSize() * i ); o.setStackSize( o.getStackSize() * i );

6
facade/FacadePart.java
View file

@ -22,7 +22,7 @@ import appeng.api.AEApi;
import appeng.api.parts.IBoxProvider; import appeng.api.parts.IBoxProvider;
import appeng.api.parts.IFacadeContainer; import appeng.api.parts.IFacadeContainer;
import appeng.api.parts.IFacadePart; import appeng.api.parts.IFacadePart;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost; import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.parts.ISimplifiedBundle; import appeng.api.parts.ISimplifiedBundle;
@ -61,7 +61,7 @@ public class FacadePart implements IFacadePart, IBoxProvider
} }
@Override @Override
public void getBoxes(IPartCollsionHelper ch, Entity e) public void getBoxes(IPartCollisionHelper ch, Entity e)
{ {
if ( e instanceof EntityLivingBase ) if ( e instanceof EntityLivingBase )
{ {
@ -76,7 +76,7 @@ public class FacadePart implements IFacadePart, IBoxProvider
} }
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollisionHelper bch)
{ {
getBoxes( bch, null ); getBoxes( bch, null );

6
fmp/CableBusPart.java
View file

@ -24,7 +24,7 @@ import appeng.api.networking.IGridNode;
import appeng.api.parts.IFacadeContainer; import appeng.api.parts.IFacadeContainer;
import appeng.api.parts.IFacadePart; import appeng.api.parts.IFacadePart;
import appeng.api.parts.IPart; import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost; import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartItem; import appeng.api.parts.IPartItem;
import appeng.api.parts.LayerFlags; 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) ) if ( !(side == null || side == ForgeDirection.UNKNOWN || tile() == null) )
{ {
List<AxisAlignedBB> boxes = new ArrayList(); List<AxisAlignedBB> boxes = new ArrayList();
IPartCollsionHelper bch = new BusCollisionHelper( boxes, side, null, true ); IPartCollisionHelper bch = new BusCollisionHelper( boxes, side, null, true );
fp.getBoxes( bch, null ); fp.getBoxes( bch, null );
for (AxisAlignedBB bb : boxes) for (AxisAlignedBB bb : boxes)
{ {
@ -342,7 +342,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IReds
if ( !(side == null || side == ForgeDirection.UNKNOWN || tile() == null) ) if ( !(side == null || side == ForgeDirection.UNKNOWN || tile() == null) )
{ {
List<AxisAlignedBB> boxes = new ArrayList(); List<AxisAlignedBB> boxes = new ArrayList();
IPartCollsionHelper bch = new BusCollisionHelper( boxes, side, null, true ); IPartCollisionHelper bch = new BusCollisionHelper( boxes, side, null, true );
bp.getBoxes( bch ); bp.getBoxes( bch );
for (AxisAlignedBB bb : boxes) for (AxisAlignedBB bb : boxes)
{ {

6
helpers/DualityInterface.java
View file

@ -53,7 +53,7 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.AECableType; import appeng.api.util.AECableType;
import appeng.api.util.DimensionalCoord; import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.core.settings.TickRates; import appeng.core.settings.TickRates;
import appeng.me.GridAccessException; import appeng.me.GridAccessException;
import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.AENetworkProxy;
@ -77,7 +77,7 @@ import appeng.util.item.AEItemStack;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
public class DualityInterface implements IGridTickable, ISegmentedInventory, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, public class DualityInterface implements IGridTickable, ISegmentedInventory, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory,
IConfigureableObject, IConfigManagerHost, ICraftingProvider, IUpgradeableHost, IPriorityHost IConfigurableObject, IConfigManagerHost, ICraftingProvider, IUpgradeableHost, IPriorityHost
{ {
final int sides[] = new int[] { 0, 1, 2, 3, 4, 5, 6, 7 }; final int sides[] = new int[] { 0, 1, 2, 3, 4, 5, 6, 7 };
@ -970,7 +970,7 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt
return craftingTracker.getRequestedJobs(); 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 ); int slot = craftingTracker.getSlot( link );

4
helpers/PatternHelper.java
View file

@ -311,13 +311,13 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
} }
@Override @Override
public IAEItemStack[] getCondencedInputs() public IAEItemStack[] getCondensedInputs()
{ {
return condencedInputs; return condencedInputs;
} }
@Override @Override
public IAEItemStack[] getCondencedOutputs() public IAEItemStack[] getCondensedOutputs()
{ {
return condencedOutputs; return condencedOutputs;
} }

4
helpers/PlayerSecuirtyWrapper.java
View file

@ -4,9 +4,9 @@ import java.util.EnumSet;
import java.util.HashMap; import java.util.HashMap;
import appeng.api.config.SecurityPermissions; 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<Integer, EnumSet<SecurityPermissions>> target; final HashMap<Integer, EnumSet<SecurityPermissions>> target;

2
helpers/WirelessTerminalGuiObject.java
View file

@ -62,7 +62,7 @@ public class WirelessTerminalGuiObject implements IPortableCell, IActionHost
try try
{ {
long encKey = Long.parseLong( encryptionKey ); long encKey = Long.parseLong( encryptionKey );
obj = AEApi.instance().registries().locateable().findLocateableBySerial( encKey ); obj = AEApi.instance().registries().locatable().findLocatableBySerial( encKey );
} }
catch (NumberFormatException err) catch (NumberFormatException err)
{ {

2
hooks/MeteoriteWorldGen.java
View file

@ -38,7 +38,7 @@ final public class MeteoriteWorldGen implements IWorldGenerator
@Override @Override
public void generate(Random r, int chunkX, int chunkZ, World w, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) 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? // add new metorites?
if ( r.nextFloat() < AEConfig.instance.metoriteSpawnChance ) if ( r.nextFloat() < AEConfig.instance.metoriteSpawnChance )

4
integration/abstraction/IForestry.java
View file

@ -1,10 +1,10 @@
package appeng.integration.abstraction; package appeng.integration.abstraction;
import appeng.api.features.IItemComparisionProvider; import appeng.api.features.IItemComparisonProvider;
public interface IForestry public interface IForestry
{ {
IItemComparisionProvider getGeneticsComparisonProvider(); IItemComparisonProvider getGeneticsComparisonProvider();
} }

2
integration/modules/BC.java
View file

@ -212,7 +212,7 @@ public class BC extends BaseModule implements IBC
addFacade( b.blockFluix.stack( 1 ) ); addFacade( b.blockFluix.stack( 1 ) );
addFacade( b.blockQuartz.stack( 1 ) ); addFacade( b.blockQuartz.stack( 1 ) );
addFacade( b.blockQuartzChiseled.stack( 1 ) ); addFacade( b.blockQuartzChiseled.stack( 1 ) );
addFacade( b.blockQuartzPiller.stack( 1 ) ); addFacade( b.blockQuartzPillar.stack( 1 ) );
try try
{ {

2
integration/modules/FMP.java
View file

@ -66,7 +66,7 @@ public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IF
public void Init() throws Throwable public void Init() throws Throwable
{ {
createAndRegister( AEApi.instance().blocks().blockQuartz.block(), 0 ); 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().blockQuartzChiseled.block(), 0 );
createAndRegister( AEApi.instance().blocks().blockSkyStone.block(), 0 ); createAndRegister( AEApi.instance().blocks().blockSkyStone.block(), 0 );
createAndRegister( AEApi.instance().blocks().blockSkyStone.block(), 1 ); createAndRegister( AEApi.instance().blocks().blockSkyStone.block(), 1 );

6
integration/modules/NEIHelpers/NEIWorldCraftingHandler.java
View file

@ -69,9 +69,9 @@ public class NEIWorldCraftingHandler implements ICraftingHandler, IUsageHandler
if ( AEConfig.instance.isFeatureEnabled( AEFeature.inWorldPurification ) ) if ( AEConfig.instance.isFeatureEnabled( AEFeature.inWorldPurification ) )
{ {
addRecipe( AEApi.instance().materials().materialPureifiedCertusQuartzCrystal, GuiText.inWorldPurificationCertus.getLocal() ); addRecipe( AEApi.instance().materials().materialPurifiedCertusQuartzCrystal, GuiText.inWorldPurificationCertus.getLocal() );
addRecipe( AEApi.instance().materials().materialPureifiedNetherQuartzCrystal, GuiText.inWorldPurificationNether.getLocal() ); addRecipe( AEApi.instance().materials().materialPurifiedNetherQuartzCrystal, GuiText.inWorldPurificationNether.getLocal() );
addRecipe( AEApi.instance().materials().materialPureifiedFluixCrystal, GuiText.inWorldPurificationFluix.getLocal() ); addRecipe( AEApi.instance().materials().materialPurifiedFluixCrystal, GuiText.inWorldPurificationFluix.getLocal() );
} }
} }

2
items/materials/MaterialType.java
View file

@ -29,7 +29,7 @@ public enum MaterialType
FluixCrystal(7, AEFeature.Core, "crystalFluix"), FluixDust(8, AEFeature.Core, "dustFluix"), FluixPearl(9, AEFeature.Core, "pearlFluix"), 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), CalcProcessorPress(13), EngProcessorPress(14), LogicProcessorPress(15),

6
items/misc/ItemCrystalSeed.java
View file

@ -104,11 +104,11 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal
int newDamage = getProgress( is ) + 1; int newDamage = getProgress( is ) + 1;
if ( newDamage == Certus + SINGLE_OFFSET ) 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 ) 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 ) if ( newDamage == Fluix + SINGLE_OFFSET )
return AEApi.instance().materials().materialPureifiedFluixCrystal.stack( is.stackSize ); return AEApi.instance().materials().materialPurifiedFluixCrystal.stack( is.stackSize );
if ( newDamage > END ) if ( newDamage > END )
return null; return null;

6
items/misc/ItemEncodedPattern.java
View file

@ -81,8 +81,8 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
boolean isCrafting = details.isCraftable(); boolean isCrafting = details.isCraftable();
IAEItemStack[] in = details.getCondencedInputs(); IAEItemStack[] in = details.getCondensedInputs();
IAEItemStack[] out = details.getCondencedOutputs(); IAEItemStack[] out = details.getCondensedOutputs();
String label = (isCrafting ? GuiText.Crafts.getLocal() : GuiText.Creates.getLocal()) + ": "; String label = (isCrafting ? GuiText.Crafts.getLocal() : GuiText.Creates.getLocal()) + ": ";
String and = " " + GuiText.And.getLocal() + " "; String and = " " + GuiText.And.getLocal() + " ";
@ -127,7 +127,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
if ( details == null ) if ( details == null )
return null; return null;
simpleCache.put( item, out = details.getCondencedOutputs()[0].getItemStack() ); simpleCache.put( item, out = details.getCondensedOutputs()[0].getItemStack() );
return out; return out;
} }

4
items/tools/ToolBiometricCard.java
View file

@ -13,7 +13,7 @@ import net.minecraftforge.client.MinecraftForgeClient;
import appeng.api.config.SecurityPermissions; import appeng.api.config.SecurityPermissions;
import appeng.api.features.IPlayerRegistry; import appeng.api.features.IPlayerRegistry;
import appeng.api.implementations.items.IBiometricCard; 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.client.render.items.ToolBiometricCardRender;
import appeng.core.features.AEFeature; import appeng.core.features.AEFeature;
import appeng.core.localization.GuiText; import appeng.core.localization.GuiText;
@ -161,7 +161,7 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard
} }
@Override @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 ) ); register.addPlayer( pr.getID( getProfile( is ) ), getPermissions( is ) );
} }

2
items/tools/powered/ToolWirelessTerminal.java
View file

@ -35,7 +35,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
@Override @Override
public ItemStack onItemRightClick(ItemStack item, World w, EntityPlayer player) 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; return item;
} }

8
me/GridConnection.java
View file

@ -66,22 +66,22 @@ public class GridConnection implements IGridConnection, IPathItem
if ( a.myGrid == null ) if ( a.myGrid == null )
{ {
GridPropagator gp = new GridPropagator( b.getInternalGrid() ); GridPropagator gp = new GridPropagator( b.getInternalGrid() );
a.beginVisition( gp ); a.beginVisit( gp );
} }
else if ( b.myGrid == null ) else if ( b.myGrid == null )
{ {
GridPropagator gp = new GridPropagator( a.getInternalGrid() ); GridPropagator gp = new GridPropagator( a.getInternalGrid() );
b.beginVisition( gp ); b.beginVisit( gp );
} }
else if ( isNetworkABetter( a, b ) ) else if ( isNetworkABetter( a, b ) )
{ {
GridPropagator gp = new GridPropagator( a.getInternalGrid() ); GridPropagator gp = new GridPropagator( a.getInternalGrid() );
b.beginVisition( gp ); b.beginVisit( gp );
} }
else else
{ {
GridPropagator gp = new GridPropagator( b.getInternalGrid() ); GridPropagator gp = new GridPropagator( b.getInternalGrid() );
a.beginVisition( gp ); a.beginVisit( gp );
} }
} }

18
me/GridNode.java
View file

@ -17,7 +17,7 @@ import appeng.api.networking.GridNotification;
import appeng.api.networking.IGrid; import appeng.api.networking.IGrid;
import appeng.api.networking.IGridBlock; import appeng.api.networking.IGridBlock;
import appeng.api.networking.IGridCache; import appeng.api.networking.IGridCache;
import appeng.api.networking.IGridConnecitonVisitor; import appeng.api.networking.IGridConnectionVisitor;
import appeng.api.networking.IGridConnection; import appeng.api.networking.IGridConnection;
import appeng.api.networking.IGridHost; import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode; import appeng.api.networking.IGridNode;
@ -163,7 +163,7 @@ public class GridNode implements IGridNode, IPathItem
} }
@Override @Override
public void beginVisition(IGridVisitor g) public void beginVisit(IGridVisitor g)
{ {
Object tracker = new Object(); Object tracker = new Object();
@ -172,10 +172,10 @@ public class GridNode implements IGridNode, IPathItem
visitorIterationNumber = tracker; visitorIterationNumber = tracker;
if ( g instanceof IGridConnecitonVisitor ) if ( g instanceof IGridConnectionVisitor )
{ {
LinkedList<IGridConnection> nextConn = new LinkedList(); LinkedList<IGridConnection> nextConn = new LinkedList();
IGridConnecitonVisitor gcv = (IGridConnecitonVisitor) g; IGridConnectionVisitor gcv = (IGridConnectionVisitor) g;
while (!nextRun.isEmpty()) while (!nextRun.isEmpty())
{ {
@ -247,7 +247,7 @@ public class GridNode implements IGridNode, IPathItem
public void FindConnections() public void FindConnections()
{ {
if ( !gridProxy.isWorldAccessable() ) if ( !gridProxy.isWorldAccessible() )
return; return;
EnumSet<ForgeDirection> newSecurityConnections = EnumSet.noneOf( ForgeDirection.class ); EnumSet<ForgeDirection> newSecurityConnections = EnumSet.noneOf( ForgeDirection.class );
@ -379,8 +379,8 @@ public class GridNode implements IGridNode, IPathItem
@Override @Override
public int compare(IGridConnection o1, IGridConnection o2) public int compare(IGridConnection o1, IGridConnection o2)
{ {
boolean preferedA = o1.getOtherSide( gn ).hasFlag( GridFlags.PREFERED ); boolean preferedA = o1.getOtherSide( gn ).hasFlag( GridFlags.PREFERRED );
boolean preferedB = o2.getOtherSide( gn ).hasFlag( GridFlags.PREFERED ); boolean preferedB = o2.getOtherSide( gn ).hasFlag( GridFlags.PREFERRED );
return preferedA == preferedB ? 0 : (preferedA ? -1 : 1); return preferedA == preferedB ? 0 : (preferedA ? -1 : 1);
} }
@ -461,11 +461,11 @@ public class GridNode implements IGridNode, IPathItem
public void validateGrid() public void validateGrid()
{ {
GridSplitDetector gsd = new GridSplitDetector( getInternalGrid().getPivot() ); GridSplitDetector gsd = new GridSplitDetector( getInternalGrid().getPivot() );
beginVisition( gsd ); beginVisit( gsd );
if ( !gsd.pivotFound ) if ( !gsd.pivotFound )
{ {
GridPropagator gp = new GridPropagator( new Grid( this ) ); GridPropagator gp = new GridPropagator( new Grid( this ) );
beginVisition( gp ); beginVisit( gp );
} }
} }

12
me/cache/PathGridCache.java vendored
View file

@ -96,7 +96,7 @@ public class PathGridCache implements IPathingGrid
channelsByBlocks = nodes * used; channelsByBlocks = nodes * used;
channelPowerUsage = (double) channelsByBlocks / 128.0; channelPowerUsage = (double) channelsByBlocks / 128.0;
myGrid.getPivot().beginVisition( new AdHocChannelUpdater( used ) ); myGrid.getPivot().beginVisit( new AdHocChannelUpdater( used ) );
} }
else if ( controllerState == ControllerState.NO_CONTROLLER ) else if ( controllerState == ControllerState.NO_CONTROLLER )
{ {
@ -112,12 +112,12 @@ public class PathGridCache implements IPathingGrid
channelsByBlocks = nodes * used; channelsByBlocks = nodes * used;
channelPowerUsage = (double) channelsByBlocks / 128.0; channelPowerUsage = (double) channelsByBlocks / 128.0;
myGrid.getPivot().beginVisition( new AdHocChannelUpdater( used ) ); myGrid.getPivot().beginVisit( new AdHocChannelUpdater( used ) );
} }
else if ( controllerState == ControllerState.CONTROLLER_CONFLICT ) else if ( controllerState == ControllerState.CONTROLLER_CONFLICT )
{ {
ticksUntilReady = 20; ticksUntilReady = 20;
myGrid.getPivot().beginVisition( new AdHocChannelUpdater( 0 ) ); myGrid.getPivot().beginVisit( new AdHocChannelUpdater( 0 ) );
} }
else else
{ {
@ -126,7 +126,7 @@ public class PathGridCache implements IPathingGrid
closedList = new HashSet(); closedList = new HashSet();
semiOpen = new HashSet(); semiOpen = new HashSet();
// myGrid.getPivot().beginVisition( new AdHocChannelUpdater( 0 ) // myGrid.getPivot().beginVisit( new AdHocChannelUpdater( 0 )
// ); // );
for (IGridNode node : myGrid.getMachines( TileController.class )) for (IGridNode node : myGrid.getMachines( TileController.class ))
{ {
@ -168,7 +168,7 @@ public class PathGridCache implements IPathingGrid
{ {
for (TileController tc : controllers) for (TileController tc : controllers)
{ {
tc.getGridNode( ForgeDirection.UNKNOWN ).beginVisition( new ControllerChannelUpdater() ); tc.getGridNode( ForgeDirection.UNKNOWN ).beginVisit( new ControllerChannelUpdater() );
break; break;
} }
} }
@ -332,7 +332,7 @@ public class PathGridCache implements IPathingGrid
DimensionalCoord dc = startingNode.getGridBlock().getLocation(); DimensionalCoord dc = startingNode.getGridBlock().getLocation();
ControllerValidator cv = new ControllerValidator( dc.x, dc.y, dc.z ); ControllerValidator cv = new ControllerValidator( dc.x, dc.y, dc.z );
startingNode.beginVisition( cv ); startingNode.beginVisit( cv );
if ( cv.isValid && cv.found == controllers.size() ) if ( cv.isValid && cv.found == controllers.size() )
controllerState = ControllerState.CONTROLLER_ONLINE; controllerState = ControllerState.CONTROLLER_ONLINE;

2
me/cache/SpatialPylonCache.java vendored
View file

@ -183,7 +183,7 @@ public class SpatialPylonCache implements IGridCache, ISpatialCache
} }
@Override @Override
public float currentEffiency() public float currentEfficiency()
{ {
return (float) effiency * 100; return (float) effiency * 100;
} }

10
me/cluster/implementations/CraftingCPUCluster.java
View file

@ -155,7 +155,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
case PENDING: case PENDING:
for (Entry<ICraftingPatternDetails, TaskProgress> t : tasks.entrySet()) for (Entry<ICraftingPatternDetails, TaskProgress> t : tasks.entrySet())
{ {
for (IAEItemStack ais : t.getKey().getCondencedOutputs()) for (IAEItemStack ais : t.getKey().getCondensedOutputs())
{ {
ais = ais.copy(); ais = ais.copy();
ais.setStackSize( ais.getStackSize() * t.getValue().value ); ais.setStackSize( ais.getStackSize() * t.getValue().value );
@ -175,7 +175,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
for (Entry<ICraftingPatternDetails, TaskProgress> t : tasks.entrySet()) for (Entry<ICraftingPatternDetails, TaskProgress> t : tasks.entrySet())
{ {
for (IAEItemStack ais : t.getKey().getCondencedOutputs()) for (IAEItemStack ais : t.getKey().getCondensedOutputs())
{ {
ais = ais.copy(); ais = ais.copy();
ais.setStackSize( ais.getStackSize() * t.getValue().value ); ais.setStackSize( ais.getStackSize() * t.getValue().value );
@ -581,7 +581,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
} }
ICraftingPatternDetails details = e.getKey(); ICraftingPatternDetails details = e.getKey();
if ( canCraft( details, details.getCondencedInputs() ) ) if ( canCraft( details, details.getCondensedInputs() ) )
{ {
InventoryCrafting ic = null; InventoryCrafting ic = null;
@ -680,7 +680,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
didsomething = true; didsomething = true;
remainingOperations--; remainingOperations--;
for (IAEItemStack out : details.getCondencedOutputs()) for (IAEItemStack out : details.getCondensedOutputs())
{ {
postChange( out, machineSrc ); postChange( out, machineSrc );
waitingFor.add( out.copy() ); waitingFor.add( out.copy() );
@ -925,7 +925,7 @@ public class CraftingCPUCluster implements IAECluster, ICraftingCPU
for (Entry<ICraftingPatternDetails, TaskProgress> t : tasks.entrySet()) for (Entry<ICraftingPatternDetails, TaskProgress> t : tasks.entrySet())
{ {
for (IAEItemStack ais : t.getKey().getCondencedOutputs()) for (IAEItemStack ais : t.getKey().getCondensedOutputs())
{ {
if ( ais.equals( is ) ) if ( ais.equals( is ) )
is.setStackSize( is.getStackSize() + ais.getStackSize() * t.getValue().value ); is.setStackSize( is.getStackSize() + ais.getStackSize() * t.getValue().value );

4
me/cluster/implementations/QuantumCluster.java
View file

@ -61,7 +61,7 @@ public class QuantumCluster implements ILocatable, IAECluster
public boolean canUseNode(long qe) public boolean canUseNode(long qe)
{ {
QuantumCluster qc = (QuantumCluster) AEApi.instance().registries().locateable().findLocateableBySerial( qe ); QuantumCluster qc = (QuantumCluster) AEApi.instance().registries().locatable().findLocatableBySerial( qe );
if ( qc != null && qc.center instanceof TileQuantumBridge ) if ( qc != null && qc.center instanceof TileQuantumBridge )
{ {
World theWorld = qc.getCenter().getWorldObj(); 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().findLocatableBySerial( otherSide );
boolean shutdown = false; boolean shutdown = false;

2
me/energy/EnergyWatcher.java
View file

@ -54,7 +54,7 @@ public class EnergyWatcher implements IEnergyWatcher
public void post(EnergyGridCache energyGridCache) public void post(EnergyGridCache energyGridCache)
{ {
myObject.onThreshholdPass( energyGridCache ); myObject.onThresholdPass( energyGridCache );
} }
public EnergyWatcher(EnergyGridCache cache, IEnergyWatcherHost host) { public EnergyWatcher(EnergyGridCache cache, IEnergyWatcherHost host) {

2
me/helpers/AENetworkProxy.java
View file

@ -292,7 +292,7 @@ public class AENetworkProxy implements IGridBlock
} }
@Override @Override
public boolean isWorldAccessable() public boolean isWorldAccessible()
{ {
return worldNode; return worldNode;
} }

4
me/pathfinding/AdHocChannelUpdater.java
View file

@ -1,12 +1,12 @@
package appeng.me.pathfinding; package appeng.me.pathfinding;
import appeng.api.networking.IGridConnecitonVisitor; import appeng.api.networking.IGridConnectionVisitor;
import appeng.api.networking.IGridConnection; import appeng.api.networking.IGridConnection;
import appeng.api.networking.IGridNode; import appeng.api.networking.IGridNode;
import appeng.me.GridConnection; import appeng.me.GridConnection;
import appeng.me.GridNode; import appeng.me.GridNode;
public class AdHocChannelUpdater implements IGridConnecitonVisitor public class AdHocChannelUpdater implements IGridConnectionVisitor
{ {
final private int usedChannels; final private int usedChannels;

4
me/pathfinding/ControllerChannelUpdater.java
View file

@ -1,12 +1,12 @@
package appeng.me.pathfinding; package appeng.me.pathfinding;
import appeng.api.networking.IGridConnecitonVisitor; import appeng.api.networking.IGridConnectionVisitor;
import appeng.api.networking.IGridConnection; import appeng.api.networking.IGridConnection;
import appeng.api.networking.IGridNode; import appeng.api.networking.IGridNode;
import appeng.me.GridConnection; import appeng.me.GridConnection;
import appeng.me.GridNode; import appeng.me.GridNode;
public class ControllerChannelUpdater implements IGridConnecitonVisitor public class ControllerChannelUpdater implements IGridConnectionVisitor
{ {
@Override @Override

4
me/storage/MEMonitorIInventory.java
View file

@ -55,7 +55,7 @@ public class MEMonitorIInventory implements IMEInventory<IAEItemStack>, IMEMonit
final HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap(); final HashMap<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = new HashMap();
public BaseActionSource mySource; public BaseActionSource mySource;
public StorageFilter mode = StorageFilter.EXTACTABLE_ONLY; public StorageFilter mode = StorageFilter.EXTRACTABLE_ONLY;
@Override @Override
public void addListener(IMEMonitorHandlerReceiver<IAEItemStack> l, Object verificationToken) public void addListener(IMEMonitorHandlerReceiver<IAEItemStack> l, Object verificationToken)
@ -176,7 +176,7 @@ public class MEMonitorIInventory implements IMEInventory<IAEItemStack>, IMEMonit
CachedItemStack old = memory.get( is.slot ); CachedItemStack old = memory.get( is.slot );
high = Math.max( high, 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; ItemStack oldIS = old == null ? null : old.itemStack;
if ( isDiffrent( newIS, oldIS ) ) if ( isDiffrent( newIS, oldIS ) )

2
me/storage/SecurityInventory.java
View file

@ -122,7 +122,7 @@ public class SecurityInventory implements IMEInventoryHandler<IAEItemStack>
for (IAEItemStack ais : storedItems) for (IAEItemStack ais : storedItems)
{ {
if ( ais.isMeaninful() ) if ( ais.isMeaningful() )
{ {
GameProfile thisUser = tbc.getProfile( ais.getItemStack() ); GameProfile thisUser = tbc.getProfile( ais.getItemStack() );
if ( thisUser == newUser ) if ( thisUser == newUser )

12
parts/AEBasePart.java
View file

@ -31,7 +31,7 @@ import appeng.api.networking.IGridNode;
import appeng.api.networking.security.IActionHost; import appeng.api.networking.security.IActionHost;
import appeng.api.parts.BusSupport; import appeng.api.parts.BusSupport;
import appeng.api.parts.IPart; import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost; import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.parts.ISimplifiedBundle; import appeng.api.parts.ISimplifiedBundle;
@ -40,7 +40,7 @@ import appeng.api.util.AECableType;
import appeng.api.util.AEColor; import appeng.api.util.AEColor;
import appeng.api.util.DimensionalCoord; import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.helpers.ICustomNameObject; import appeng.helpers.ICustomNameObject;
import appeng.helpers.IPriorityHost; import appeng.helpers.IPriorityHost;
import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.AENetworkProxy;
@ -225,7 +225,7 @@ public class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradea
} }
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollisionHelper bch)
{ {
} }
@ -299,9 +299,9 @@ public class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradea
*/ */
public void uploadSettings(SettingsFrom from, NBTTagCompound compound) public void uploadSettings(SettingsFrom from, NBTTagCompound compound)
{ {
if ( compound != null && this instanceof IConfigureableObject ) if ( compound != null && this instanceof IConfigurableObject )
{ {
IConfigManager cm = ((IConfigureableObject) this).getConfigManager(); IConfigManager cm = ((IConfigurableObject) this).getConfigManager();
if ( cm != null ) if ( cm != null )
cm.readFromNBT( compound ); cm.readFromNBT( compound );
} }
@ -336,7 +336,7 @@ public class AEBasePart implements IPart, IGridProxyable, IActionHost, IUpgradea
{ {
NBTTagCompound output = new NBTTagCompound(); NBTTagCompound output = new NBTTagCompound();
if ( this instanceof IConfigureableObject ) if ( this instanceof IConfigurableObject )
{ {
IConfigManager cm = this.getConfigManager(); IConfigManager cm = this.getConfigManager();
if ( cm != null ) if ( cm != null )

4
parts/BusCollisionHelper.java
View file

@ -5,9 +5,9 @@ import java.util.List;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.util.ForgeDirection; 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<AxisAlignedBB> boxes; final List<AxisAlignedBB> boxes;

8
parts/CableBusContainer.java
View file

@ -29,7 +29,7 @@ import appeng.api.networking.IGridNode;
import appeng.api.parts.IFacadeContainer; import appeng.api.parts.IFacadeContainer;
import appeng.api.parts.IFacadePart; import appeng.api.parts.IFacadePart;
import appeng.api.parts.IPart; import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost; import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartItem; import appeng.api.parts.IPartItem;
import appeng.api.parts.LayerFlags; import appeng.api.parts.LayerFlags;
@ -438,7 +438,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
IFacadeContainer fc = getFacadeContainer(); IFacadeContainer fc = getFacadeContainer();
for (ForgeDirection s : ForgeDirection.values()) 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 ); IPart part = getPart( s );
if ( part != null ) if ( part != null )
@ -863,7 +863,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
{ {
List<AxisAlignedBB> boxes = new LinkedList<AxisAlignedBB>(); List<AxisAlignedBB> boxes = new LinkedList<AxisAlignedBB>();
IPartCollsionHelper bch = new BusCollisionHelper( boxes, side, null, true ); IPartCollisionHelper bch = new BusCollisionHelper( boxes, side, null, true );
p.getBoxes( bch ); p.getBoxes( bch );
for (AxisAlignedBB bb : boxes) for (AxisAlignedBB bb : boxes)
{ {
@ -886,7 +886,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
{ {
List<AxisAlignedBB> boxes = new LinkedList<AxisAlignedBB>(); List<AxisAlignedBB> boxes = new LinkedList<AxisAlignedBB>();
IPartCollsionHelper bch = new BusCollisionHelper( boxes, side, null, true ); IPartCollisionHelper bch = new BusCollisionHelper( boxes, side, null, true );
p.getBoxes( bch, null ); p.getBoxes( bch, null );
for (AxisAlignedBB bb : boxes) for (AxisAlignedBB bb : boxes)
{ {

6
parts/automation/PartAnnihilationPlane.java
View file

@ -31,7 +31,7 @@ import appeng.api.networking.ticking.IGridTickable;
import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickRateModulation;
import appeng.api.networking.ticking.TickingRequest; import appeng.api.networking.ticking.TickingRequest;
import appeng.api.parts.IPart; import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost; import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEItemStack;
@ -98,7 +98,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
boolean isActive = (clientFlags & (POWERED_FLAG | CHANNEL_FLAG)) == (POWERED_FLAG | CHANNEL_FLAG); 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(), rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(),
CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockAnnihilationPlaneOn.getIcon() : is.getIconIndex(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockAnnihilationPlaneOn.getIcon() : is.getIconIndex(),
CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() ); CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() );
@ -127,7 +127,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
} }
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollisionHelper bch)
{ {
int minX = 1; int minX = 1;
int minY = 1; int minY = 1;

8
parts/automation/PartExportBus.java
View file

@ -22,7 +22,7 @@ import appeng.api.networking.security.MachineSource;
import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.IGridTickable;
import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickRateModulation;
import appeng.api.networking.ticking.TickingRequest; import appeng.api.networking.ticking.TickingRequest;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitor;
@ -108,7 +108,7 @@ public class PartExportBus extends PartSharedItemBus implements IGridTickable, I
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) 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(), rh.setTexture( CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(),
is.getIconIndex(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() ); is.getIconIndex(), CableBusTextures.PartExportSides.getIcon(), CableBusTextures.PartExportSides.getIcon() );
@ -138,7 +138,7 @@ public class PartExportBus extends PartSharedItemBus implements IGridTickable, I
} }
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollisionHelper bch)
{ {
bch.addBox( 4, 4, 12, 12, 12, 14 ); bch.addBox( 4, 4, 12, 12, 12, 14 );
bch.addBox( 5, 5, 14, 11, 11, 15 ); bch.addBox( 5, 5, 14, 11, 11, 15 );
@ -270,7 +270,7 @@ public class PartExportBus extends PartSharedItemBus implements IGridTickable, I
} }
@Override @Override
public IAEItemStack injectCratedItems(ICraftingLink link, IAEItemStack items, Actionable mode) public IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack items, Actionable mode)
{ {
InventoryAdaptor d = getHandler(); InventoryAdaptor d = getHandler();

6
parts/automation/PartFormationPlane.java
View file

@ -35,7 +35,7 @@ import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.security.BaseActionSource;
import appeng.api.parts.IPart; import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost; import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartItem; import appeng.api.parts.IPartItem;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
@ -171,7 +171,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
boolean isActive = (clientFlags & (POWERED_FLAG | CHANNEL_FLAG)) == (POWERED_FLAG | CHANNEL_FLAG); 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(), rh.setTexture( CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon(),
CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : is.getIconIndex(), CableBusTextures.PartTransitionPlaneBack.getIcon(), isActive ? CableBusTextures.BlockFormPlaneOn.getIcon() : is.getIconIndex(),
CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() ); CableBusTextures.PartPlaneSides.getIcon(), CableBusTextures.PartPlaneSides.getIcon() );
@ -200,7 +200,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
} }
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollisionHelper bch)
{ {
int minX = 1; int minX = 1;
int minY = 1; int minY = 1;

6
parts/automation/PartImportBus.java
View file

@ -19,7 +19,7 @@ import appeng.api.networking.security.MachineSource;
import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.IGridTickable;
import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickRateModulation;
import appeng.api.networking.ticking.TickingRequest; import appeng.api.networking.ticking.TickingRequest;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEInventory;
import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitor;
@ -102,7 +102,7 @@ public class PartImportBus extends PartSharedItemBus implements IGridTickable, I
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) 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(), rh.setTexture( CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(),
is.getIconIndex(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() ); is.getIconIndex(), CableBusTextures.PartImportSides.getIcon(), CableBusTextures.PartImportSides.getIcon() );
@ -125,7 +125,7 @@ public class PartImportBus extends PartSharedItemBus implements IGridTickable, I
} }
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollisionHelper bch)
{ {
bch.addBox( 6, 6, 11, 10, 10, 13 ); bch.addBox( 6, 6, 11, 10, 10, 13 );
bch.addBox( 5, 5, 13, 11, 11, 14 ); bch.addBox( 5, 5, 13, 11, 11, 14 );

6
parts/automation/PartLevelEmitter.java
View file

@ -38,7 +38,7 @@ import appeng.api.networking.security.BaseActionSource;
import appeng.api.networking.storage.IBaseMonitor; import appeng.api.networking.storage.IBaseMonitor;
import appeng.api.networking.storage.IStackWatcher; import appeng.api.networking.storage.IStackWatcher;
import appeng.api.networking.storage.IStackWatcherHost; import appeng.api.networking.storage.IStackWatcherHost;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.IMEMonitorHandlerReceiver;
@ -327,7 +327,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
} }
@Override @Override
public void onThreshholdPass(IEnergyGrid energyGrid) public void onThresholdPass(IEnergyGrid energyGrid)
{ {
lastReportedValue = (long) energyGrid.getStoredPower(); lastReportedValue = (long) energyGrid.getStoredPower();
updateState(); updateState();
@ -602,7 +602,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
} }
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollisionHelper bch)
{ {
bch.addBox( 7, 7, 11, 9, 9, 16 ); bch.addBox( 7, 7, 11, 9, 9, 16 );
} }

6
parts/misc/PartCableAnchor.java
View file

@ -20,7 +20,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.networking.IGridNode; import appeng.api.networking.IGridNode;
import appeng.api.parts.BusSupport; import appeng.api.parts.BusSupport;
import appeng.api.parts.IPart; import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost; import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.parts.ISimplifiedBundle; import appeng.api.parts.ISimplifiedBundle;
@ -44,7 +44,7 @@ public class PartCableAnchor implements IPart
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) 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(); IIcon myIcon = is.getIconIndex();
rh.setTexture( myIcon ); rh.setTexture( myIcon );
if ( host != null && host.getFacadeContainer().getFacade( mySide ) != null ) if ( host != null && host.getFacadeContainer().getFacade( mySide ) != null )
@ -73,7 +73,7 @@ public class PartCableAnchor implements IPart
} }
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollisionHelper bch)
{ {
if ( host != null && host.getFacadeContainer().getFacade( mySide ) != null ) if ( host != null && host.getFacadeContainer().getFacade( mySide ) != null )
bch.addBox( 7, 7, 10, 9, 9, 14 ); bch.addBox( 7, 7, 10, 9, 9, 14 );

10
parts/misc/PartInterface.java
View file

@ -29,7 +29,7 @@ import appeng.api.networking.security.BaseActionSource;
import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.IGridTickable;
import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickRateModulation;
import appeng.api.networking.ticking.TickingRequest; import appeng.api.networking.ticking.TickingRequest;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitor;
import appeng.api.storage.IStorageMonitorable; import appeng.api.storage.IStorageMonitorable;
@ -128,7 +128,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISeg
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) 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(), rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(),
is.getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); is.getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
@ -158,7 +158,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISeg
} }
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollisionHelper bch)
{ {
bch.addBox( 2, 2, 14, 14, 14, 16 ); bch.addBox( 2, 2, 14, 14, 14, 16 );
bch.addBox( 5, 5, 12, 11, 11, 14 ); bch.addBox( 5, 5, 12, 11, 11, 14 );
@ -381,9 +381,9 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISeg
} }
@Override @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 @Override

8
parts/misc/PartStorageBus.java
View file

@ -30,7 +30,7 @@ import appeng.api.networking.ticking.IGridTickable;
import appeng.api.networking.ticking.ITickManager; import appeng.api.networking.ticking.ITickManager;
import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickRateModulation;
import appeng.api.networking.ticking.TickingRequest; 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.IPartHost;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.storage.ICellContainer; import appeng.api.storage.ICellContainer;
@ -80,7 +80,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
super( PartStorageBus.class, is ); super( PartStorageBus.class, is );
getConfigManager().registerSetting( Settings.ACCESS, AccessRestriction.READ_WRITE ); getConfigManager().registerSetting( Settings.ACCESS, AccessRestriction.READ_WRITE );
getConfigManager().registerSetting( Settings.FUZZY_MODE, FuzzyMode.IGNORE_ALL ); 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 ); mySrc = new MachineSource( this );
} }
@ -380,7 +380,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) 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(), rh.setTexture( CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageBack.getIcon(),
is.getIconIndex(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() ); is.getIconIndex(), CableBusTextures.PartStorageSides.getIcon(), CableBusTextures.PartStorageSides.getIcon() );
@ -407,7 +407,7 @@ public class PartStorageBus extends PartUpgradeable implements IGridTickable, IC
} }
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollisionHelper bch)
{ {
bch.addBox( 3, 3, 15, 13, 13, 16 ); bch.addBox( 3, 3, 15, 13, 13, 16 );
bch.addBox( 2, 2, 14, 14, 14, 15 ); bch.addBox( 2, 2, 14, 14, 14, 15 );

6
parts/misc/PartToggleBus.java
View file

@ -18,7 +18,7 @@ import appeng.api.AEApi;
import appeng.api.exceptions.FailedConnection; import appeng.api.exceptions.FailedConnection;
import appeng.api.networking.IGridConnection; import appeng.api.networking.IGridConnection;
import appeng.api.networking.IGridNode; import appeng.api.networking.IGridNode;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost; import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType; import appeng.api.util.AECableType;
@ -169,7 +169,7 @@ public class PartToggleBus extends PartBasicState
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) 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.setTexture( is.getIconIndex() );
rh.setBounds( 6, 6, 14, 10, 10, 16 ); rh.setBounds( 6, 6, 14, 10, 10, 16 );
@ -195,7 +195,7 @@ public class PartToggleBus extends PartBasicState
} }
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollisionHelper bch)
{ {
bch.addBox( 6, 6, 11, 10, 10, 16 ); bch.addBox( 6, 6, 11, 10, 10, 16 );
} }

8
parts/networking/PartCable.java
View file

@ -25,7 +25,7 @@ import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode; import appeng.api.networking.IGridNode;
import appeng.api.parts.BusSupport; import appeng.api.parts.BusSupport;
import appeng.api.parts.IPart; import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost; import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType; import appeng.api.util.AECableType;
@ -53,7 +53,7 @@ public class PartCable extends AEBasePart implements IPartCable
public PartCable(Class c, ItemStack is) { public PartCable(Class c, ItemStack is) {
super( c, is ); super( c, is );
proxy.setFlags( GridFlags.PREFERED ); proxy.setFlags( GridFlags.PREFERRED );
proxy.setIdlePowerUsage( 0.0 ); proxy.setIdlePowerUsage( 0.0 );
proxy.myColor = AEColor.values()[((ItemMultiPart) is.getItem()).varientOf( is.getItemDamage() )]; proxy.myColor = AEColor.values()[((ItemMultiPart) is.getItem()).varientOf( is.getItemDamage() )];
} }
@ -346,7 +346,7 @@ public class PartCable extends AEBasePart implements IPartCable
} }
@Override @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 ); bch.addBox( 6.0, 6.0, 6.0, 10.0, 10.0, 10.0 );
@ -847,7 +847,7 @@ public class PartCable extends AEBasePart implements IPartCable
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) 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 useCovered = false;
boolean requireDetailed = false; boolean requireDetailed = false;

6
parts/networking/PartCableCovered.java
View file

@ -15,7 +15,7 @@ import appeng.api.networking.events.MENetworkChannelsChanged;
import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.parts.IPart; import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost; import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType; import appeng.api.util.AECableType;
@ -61,7 +61,7 @@ public class PartCableCovered extends PartCable
} }
@Override @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 ); bch.addBox( 5.0, 5.0, 5.0, 11.0, 11.0, 11.0 );
@ -142,7 +142,7 @@ public class PartCableCovered extends PartCable
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) 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() ) ); rh.setTexture( getTexture( getCableColor() ) );
EnumSet<ForgeDirection> sides = connections.clone(); EnumSet<ForgeDirection> sides = connections.clone();

6
parts/networking/PartCableSmart.java
View file

@ -16,7 +16,7 @@ import appeng.api.networking.events.MENetworkChannelsChanged;
import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.parts.IPart; import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost; import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType; import appeng.api.util.AECableType;
@ -115,7 +115,7 @@ public class PartCableSmart extends PartCable
} }
@Override @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 ); bch.addBox( 5.0, 5.0, 5.0, 11.0, 11.0, 11.0 );
@ -160,7 +160,7 @@ public class PartCableSmart extends PartCable
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) 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() ) ); rh.setTexture( getTexture( getCableColor() ) );
EnumSet<ForgeDirection> sides = connections.clone(); EnumSet<ForgeDirection> sides = connections.clone();

8
parts/networking/PartDenseCable.java
View file

@ -19,7 +19,7 @@ import appeng.api.networking.events.MENetworkChannelsChanged;
import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.parts.BusSupport; import appeng.api.parts.BusSupport;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartHost; import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType; import appeng.api.util.AECableType;
@ -56,7 +56,7 @@ public class PartDenseCable extends PartCable
public PartDenseCable(Class c, ItemStack is) { public PartDenseCable(Class c, ItemStack is) {
super( c, is ); super( c, is );
proxy.setFlags( GridFlags.DENSE_CAPACITY, GridFlags.PREFERED ); proxy.setFlags( GridFlags.DENSE_CAPACITY, GridFlags.PREFERRED );
} }
public PartDenseCable(ItemStack is) { public PartDenseCable(ItemStack is) {
@ -127,7 +127,7 @@ public class PartDenseCable extends PartCable
} }
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollisionHelper bch)
{ {
boolean noLadder = !bch.isBBCollision(); boolean noLadder = !bch.isBBCollision();
double min = noLadder ? 3.0 : 4.9; double min = noLadder ? 3.0 : 4.9;
@ -320,7 +320,7 @@ public class PartDenseCable extends PartCable
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) 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() ) ); rh.setTexture( getTexture( getCableColor() ) );
EnumSet<ForgeDirection> sides = connections.clone(); EnumSet<ForgeDirection> sides = connections.clone();

4
parts/networking/PartQuartzFiber.java
View file

@ -18,7 +18,7 @@ import appeng.api.networking.GridFlags;
import appeng.api.networking.IGridNode; import appeng.api.networking.IGridNode;
import appeng.api.networking.energy.IEnergyGrid; import appeng.api.networking.energy.IEnergyGrid;
import appeng.api.networking.energy.IEnergyGridProvider; 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.IPartHost;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.util.AECableType; import appeng.api.util.AECableType;
@ -107,7 +107,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider
} }
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollisionHelper bch)
{ {
bch.addBox( 6, 6, 10, 10, 10, 16 ); bch.addBox( 6, 6, 10, 10, 10, 16 );
} }

4
parts/p2p/PartP2PItems.java
View file

@ -82,7 +82,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
{ {
output = new WrapperBCPipe( te, side.getOpposite() ); output = new WrapperBCPipe( te, side.getOpposite() );
} }
catch (Throwable _) catch (Throwable ignore)
{ {
} }
} }
@ -92,7 +92,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
/* /*
* if ( AppEng.instance.isIntegrationEnabled( "TE" ) ) { ITE thermal = (ITE) AppEng.instance.getIntegration( * if ( AppEng.instance.isIntegrationEnabled( "TE" ) ) { ITE thermal = (ITE) AppEng.instance.getIntegration(
* "TE" ); if ( thermal != null ) { if ( thermal.isPipe( te, side.getOpposite() ) ) { try { output = new * "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 ) if ( output == null )

6
parts/p2p/PartP2PTunnel.java
View file

@ -18,7 +18,7 @@ import appeng.api.config.TunnelType;
import appeng.api.implementations.items.IMemoryCard; import appeng.api.implementations.items.IMemoryCard;
import appeng.api.implementations.items.MemoryCardMessages; import appeng.api.implementations.items.MemoryCardMessages;
import appeng.api.parts.IPart; import appeng.api.parts.IPart;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartItem; import appeng.api.parts.IPartItem;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.api.parts.PartItemStack; import appeng.api.parts.PartItemStack;
@ -319,7 +319,7 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) 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.setTexture( getTypeTexture() );
rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.setBounds( 2, 2, 14, 14, 14, 16 );
@ -373,7 +373,7 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
} }
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollisionHelper bch)
{ {
bch.addBox( 5, 5, 12, 11, 11, 13 ); bch.addBox( 5, 5, 12, 11, 11, 13 );
bch.addBox( 3, 3, 13, 13, 13, 14 ); bch.addBox( 3, 3, 13, 13, 13, 14 );

6
parts/reporting/PartMonitor.java
View file

@ -19,7 +19,7 @@ import appeng.api.networking.GridFlags;
import appeng.api.networking.events.MENetworkBootingStatusChange; import appeng.api.networking.events.MENetworkBootingStatusChange;
import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkEventSubscribe;
import appeng.api.networking.events.MENetworkPowerStatusChange; import appeng.api.networking.events.MENetworkPowerStatusChange;
import appeng.api.parts.IPartCollsionHelper; import appeng.api.parts.IPartCollisionHelper;
import appeng.api.parts.IPartRenderHelper; import appeng.api.parts.IPartRenderHelper;
import appeng.client.texture.CableBusTextures; import appeng.client.texture.CableBusTextures;
import appeng.me.GridAccessException; import appeng.me.GridAccessException;
@ -247,7 +247,7 @@ public class PartMonitor extends AEBasePart implements IPartMonitor, IPowerChann
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer) 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(), rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorBack.getIcon(),
is.getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); is.getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
@ -316,7 +316,7 @@ public class PartMonitor extends AEBasePart implements IPartMonitor, IPowerChann
} }
@Override @Override
public void getBoxes(IPartCollsionHelper bch) public void getBoxes(IPartCollisionHelper bch)
{ {
bch.addBox( 2, 2, 14, 14, 14, 16 ); bch.addBox( 2, 2, 14, 14, 14, 16 );
bch.addBox( 4, 4, 13, 12, 12, 14 ); bch.addBox( 4, 4, 13, 12, 12, 14 );

8
spatial/CachedPlane.java
View file

@ -112,7 +112,7 @@ public class CachedPlane
World wrld; World wrld;
Block matrixFrame = AEApi.instance().blocks().blockMatrixFrame.block(); Block matrixFrame = AEApi.instance().blocks().blockMatrixFrame.block();
IMovableRegistry reg = AEApi.instance().registries().moveable(); IMovableRegistry reg = AEApi.instance().registries().movable();
LinkedList<WorldCoord> updates = new LinkedList<WorldCoord>(); LinkedList<WorldCoord> updates = new LinkedList<WorldCoord>();
@ -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 ); 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 cx = 0; cx < cx_size; cx++)
for (int cz = 0; cz < cz_size; cz++) for (int cz = 0; cz < cz_size; cz++)
@ -234,13 +234,13 @@ public class CachedPlane
private IMovableHandler getHandler(TileEntity te) private IMovableHandler getHandler(TileEntity te)
{ {
IMovableRegistry mr = AEApi.instance().registries().moveable(); IMovableRegistry mr = AEApi.instance().registries().movable();
return mr.getHandler( te ); return mr.getHandler( te );
} }
void Swap(CachedPlane dst) 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 ) if ( dst.x_size == x_size && dst.y_size == y_size && dst.z_size == z_size )
{ {

10
tile/AEBaseTile.java
View file

@ -24,7 +24,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.implementations.tiles.ISegmentedInventory; import appeng.api.implementations.tiles.ISegmentedInventory;
import appeng.api.util.ICommonTile; import appeng.api.util.ICommonTile;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.api.util.IOrientable; import appeng.api.util.IOrientable;
import appeng.core.AELog; import appeng.core.AELog;
import appeng.core.features.ItemStackSrc; import appeng.core.features.ItemStackSrc;
@ -398,9 +398,9 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
*/ */
public void uploadSettings(SettingsFrom from, NBTTagCompound compound) public void uploadSettings(SettingsFrom from, NBTTagCompound compound)
{ {
if ( compound != null && this instanceof IConfigureableObject ) if ( compound != null && this instanceof IConfigurableObject )
{ {
IConfigManager cm = ((IConfigureableObject) this).getConfigManager(); IConfigManager cm = ((IConfigurableObject) this).getConfigManager();
if ( cm != null ) if ( cm != null )
cm.readFromNBT( compound ); cm.readFromNBT( compound );
} }
@ -442,9 +442,9 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile,
output.setTag( "display", dsp ); output.setTag( "display", dsp );
} }
if ( this instanceof IConfigureableObject ) if ( this instanceof IConfigurableObject )
{ {
IConfigManager cm = ((IConfigureableObject) this).getConfigManager(); IConfigManager cm = ((IConfigurableObject) this).getConfigManager();
if ( cm != null ) if ( cm != null )
cm.writeToNBT( output ); cm.writeToNBT( output );
} }

4
tile/misc/TileCellWorkbench.java
View file

@ -12,7 +12,7 @@ import appeng.api.config.Upgrades;
import appeng.api.implementations.IUpgradeableHost; import appeng.api.implementations.IUpgradeableHost;
import appeng.api.storage.ICellWorkbenchItem; import appeng.api.storage.ICellWorkbenchItem;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.tile.AEBaseTile; import appeng.tile.AEBaseTile;
import appeng.tile.TileEvent; import appeng.tile.TileEvent;
import appeng.tile.events.TileEventType; import appeng.tile.events.TileEventType;
@ -23,7 +23,7 @@ import appeng.tile.inventory.InvOperation;
import appeng.util.ConfigManager; import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost; import appeng.util.IConfigManagerHost;
public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, IAEAppEngInventory, IConfigureableObject, IConfigManagerHost public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, IAEAppEngInventory, IConfigurableObject, IConfigManagerHost
{ {
AppEngInternalInventory cell = new AppEngInternalInventory( this, 1 ); AppEngInternalInventory cell = new AppEngInternalInventory( this, 1 );

12
tile/misc/TileCondenser.java
View file

@ -9,11 +9,11 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidHandler;
import appeng.api.AEApi; import appeng.api.AEApi;
import appeng.api.config.CondenserOuput; import appeng.api.config.CondenserOutput;
import appeng.api.config.Settings; import appeng.api.config.Settings;
import appeng.api.implementations.items.IStorageComponent; import appeng.api.implementations.items.IStorageComponent;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.tile.AEBaseInvTile; import appeng.tile.AEBaseInvTile;
import appeng.tile.TileEvent; import appeng.tile.TileEvent;
import appeng.tile.events.TileEventType; import appeng.tile.events.TileEventType;
@ -24,7 +24,7 @@ import appeng.util.ConfigManager;
import appeng.util.IConfigManagerHost; import appeng.util.IConfigManagerHost;
import appeng.util.Platform; import appeng.util.Platform;
public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory, IFluidHandler, IConfigManagerHost, IConfigureableObject public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory, IFluidHandler, IConfigManagerHost, IConfigurableObject
{ {
int sides[] = new int[] { 0, 1 }; int sides[] = new int[] { 0, 1 };
@ -49,7 +49,7 @@ public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory,
} }
public TileCondenser() { public TileCondenser() {
cm.registerSetting( Settings.CONDENSER_OUTPUT, CondenserOuput.TRASH ); cm.registerSetting( Settings.CONDENSER_OUTPUT, CondenserOutput.TRASH );
} }
public double getStorage() public double getStorage()
@ -112,7 +112,7 @@ public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory,
private ItemStack getOutput() private ItemStack getOutput()
{ {
switch ((CondenserOuput) cm.getSetting( Settings.CONDENSER_OUTPUT )) switch ((CondenserOutput) cm.getSetting( Settings.CONDENSER_OUTPUT ))
{ {
case MATTER_BALLS: case MATTER_BALLS:
return AEApi.instance().materials().materialMatterBall.stack( 1 ); return AEApi.instance().materials().materialMatterBall.stack( 1 );
@ -126,7 +126,7 @@ public class TileCondenser extends AEBaseInvTile implements IAEAppEngInventory,
public double getRequiredPower() public double getRequiredPower()
{ {
return ((CondenserOuput) cm.getSetting( Settings.CONDENSER_OUTPUT )).requiredPower; return ((CondenserOutput) cm.getSetting( Settings.CONDENSER_OUTPUT )).requiredPower;
} }
@Override @Override

8
tile/misc/TileInterface.java
View file

@ -32,7 +32,7 @@ import appeng.api.storage.data.IAEItemStack;
import appeng.api.util.AECableType; import appeng.api.util.AECableType;
import appeng.api.util.DimensionalCoord; import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager; import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject; import appeng.api.util.IConfigurableObject;
import appeng.helpers.DualityInterface; import appeng.helpers.DualityInterface;
import appeng.helpers.IInterfaceHost; import appeng.helpers.IInterfaceHost;
import appeng.helpers.IPriorityHost; import appeng.helpers.IPriorityHost;
@ -46,7 +46,7 @@ import appeng.util.inv.IInventoryDestination;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
public class TileInterface extends AENetworkInvTile implements IGridTickable, ISegmentedInventory, ITileStorageMonitorable, IStorageMonitorable, public class TileInterface extends AENetworkInvTile implements IGridTickable, ISegmentedInventory, ITileStorageMonitorable, IStorageMonitorable,
IInventoryDestination, IInterfaceHost, IConfigureableObject, IPriorityHost IInventoryDestination, IInterfaceHost, IConfigurableObject, IPriorityHost
{ {
ForgeDirection pointAt = ForgeDirection.UNKNOWN; ForgeDirection pointAt = ForgeDirection.UNKNOWN;
@ -263,9 +263,9 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, IS
} }
@Override @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 @Override

8
util/Platform.java
View file

@ -884,7 +884,7 @@ public class Platform
return wrench.canWrench( player, x, y, z ); return wrench.canWrench( player, x, y, z );
} }
} }
catch (Throwable _) catch (Throwable ignore)
{ // explodes without BC { // explodes without BC
} }
@ -1847,8 +1847,8 @@ public class Platform
public static boolean isRecipePrioritized(ItemStack what) public static boolean isRecipePrioritized(ItemStack what)
{ {
return AEApi.instance().materials().materialPureifiedCertusQuartzCrystal.sameAsStack( what ) return AEApi.instance().materials().materialPurifiedCertusQuartzCrystal.sameAsStack( what )
|| AEApi.instance().materials().materialPureifiedFluixCrystal.sameAsStack( what ) || AEApi.instance().materials().materialPurifiedFluixCrystal.sameAsStack( what )
|| AEApi.instance().materials().materialPureifiedNetherQuartzCrystal.sameAsStack( what ); || AEApi.instance().materials().materialPurifiedNetherQuartzCrystal.sameAsStack( what );
} }
} }

2
util/item/AESharedNBT.java
View file

@ -70,7 +70,7 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound
ItemStack isc = new ItemStack( itemID, 1, damageValue ); ItemStack isc = new ItemStack( itemID, 1, damageValue );
isc.setTagCompound( c ); isc.setTagCompound( c );
x.comp = AEApi.instance().registries().specialComparson().getSpecialComparion( isc ); x.comp = AEApi.instance().registries().specialComparison().getSpecialComparison( isc );
return x; return x;
} }

2
util/item/AEStack.java
View file

@ -14,7 +14,7 @@ public abstract class AEStack<StackType extends IAEStack> implements IAEStack<St
protected long countRequestable; protected long countRequestable;
@Override @Override
public boolean isMeaninful() public boolean isMeaningful()
{ {
return stackSize != 0 || getCountRequestable() > 0 || isCraftable(); return stackSize != 0 || getCountRequestable() > 0 || isCraftable();
} }

2
util/item/ItemList.java
View file

@ -150,7 +150,7 @@ public final class ItemList<StackType extends IAEStack> implements IItemList<Sta
/* /*
* synchronized public void clean() { Iterator<StackType> i = iterator(); while (i.hasNext()) { StackType AEI = * synchronized public void clean() { Iterator<StackType> i = iterator(); while (i.hasNext()) { StackType AEI =
* i.next(); if ( !AEI.isMeaninful() ) i.remove(); } } * i.next(); if ( !AEI.isMeaningful() ) i.remove(); } }
*/ */
@Override @Override

2
util/item/MeanfulIterator.java
View file

@ -20,7 +20,7 @@ public class MeanfulIterator<StackType extends IAEStack> implements Iterator
while (parent.hasNext()) while (parent.hasNext())
{ {
next = parent.next(); next = parent.next();
if ( next.isMeaninful() ) if ( next.isMeaningful() )
return true; return true;
else else
parent.remove(); // self cleaning :3 parent.remove(); // self cleaning :3