diff --git a/src/main/java/appeng/block/AEBaseItemBlockSlab.java b/src/main/java/appeng/block/AEBaseItemBlockSlab.java index 20bb1a4de..2be3b662b 100644 --- a/src/main/java/appeng/block/AEBaseItemBlockSlab.java +++ b/src/main/java/appeng/block/AEBaseItemBlockSlab.java @@ -1,11 +1,15 @@ + package appeng.block; + import net.minecraft.block.Block; import net.minecraft.item.ItemSlab; -public class AEBaseItemBlockSlab extends ItemSlab { - public AEBaseItemBlockSlab(Block block, AEBaseSlabBlock singleSlab, AEBaseSlabBlock doubleSlab, Boolean isDoubleSlab) +public class AEBaseItemBlockSlab extends ItemSlab +{ + + public AEBaseItemBlockSlab( Block block, AEBaseSlabBlock singleSlab, AEBaseSlabBlock doubleSlab, Boolean isDoubleSlab ) { super( block, singleSlab, doubleSlab, isDoubleSlab ); } diff --git a/src/main/java/appeng/block/AEBaseSlabBlock.java b/src/main/java/appeng/block/AEBaseSlabBlock.java index 5eec676de..cd104c8c8 100644 --- a/src/main/java/appeng/block/AEBaseSlabBlock.java +++ b/src/main/java/appeng/block/AEBaseSlabBlock.java @@ -56,21 +56,22 @@ public class AEBaseSlabBlock extends BlockSlab implements IAEFeature this.setResistance( block.getExplosionResistance( null ) * 5.0F / 3.0F ); this.setStepSound( block.stepSound ); this.useNeighborBrightness = true; - if (!field_150004_a) this.doubleSlabs = new AEBaseSlabBlock( block, meta, features, true, name + ".double" ).setSlabs(this); + if( !field_150004_a ) + this.doubleSlabs = new AEBaseSlabBlock( block, meta, features, true, name + ".double" ).setSlabs( this ); this.features = !field_150004_a ? new SlabBlockFeatureHandler( features, this ) : null; } - public AEBaseSlabBlock setSlabs(AEBaseSlabBlock slabs) + public AEBaseSlabBlock setSlabs( AEBaseSlabBlock slabs ) { this.slabs = slabs; return this; } - + public AEBaseSlabBlock slabs() { return slabs; } - + public AEBaseSlabBlock doubleSlabs() { return doubleSlabs; @@ -89,36 +90,40 @@ public class AEBaseSlabBlock extends BlockSlab implements IAEFeature } @Override - public IIcon getIcon(int dir, int meta) + public IIcon getIcon( int dir, int meta ) { return block.getIcon( dir, this.meta ); } @Override - public String func_150002_b(int p_150002_1_) + public String func_150002_b( int p_150002_1_ ) { return this.getUnlocalizedName(); } @Override - public void registerBlockIcons(IIconRegister reg) { } - - @Override - public Item getItemDropped(int meta, Random rand, int fortune) + public void registerBlockIcons( IIconRegister reg ) { - return this.field_150004_a ? Item.getItemFromBlock(this.slabs) : Item.getItemFromBlock(this); } @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) + public Item getItemDropped( int meta, Random rand, int fortune ) { - AEBaseSlabBlock block = (AEBaseSlabBlock) world.getBlock(x, y, z); + return this.field_150004_a ? Item.getItemFromBlock( this.slabs ) : Item.getItemFromBlock( this ); + } - if (block == null) return null; - if (block.field_150004_a) block = this.slabs; + @Override + public ItemStack getPickBlock( MovingObjectPosition target, World world, int x, int y, int z ) + { + AEBaseSlabBlock block = (AEBaseSlabBlock) world.getBlock( x, y, z ); - int meta = world.getBlockMetadata(x, y, z) & 7; - return new ItemStack(block, 1, meta); + if( block == null ) + return null; + if( block.field_150004_a ) + block = this.slabs; + + int meta = world.getBlockMetadata( x, y, z ) & 7; + return new ItemStack( block, 1, meta ); } public String name() diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index 5d5b2ec20..557e0a312 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -455,7 +455,8 @@ public class BlockCableBus extends AEBaseTileBlock implements IRedNetConnection return this.cb( world, x, y, z ).recolourBlock( side, AEColor.values()[colour], who ); } catch( Throwable ignored ) - {} + { + } return false; } diff --git a/src/main/java/appeng/block/solids/OreQuartzCharged.java b/src/main/java/appeng/block/solids/OreQuartzCharged.java index 6f357bc0d..1b805e382 100644 --- a/src/main/java/appeng/block/solids/OreQuartzCharged.java +++ b/src/main/java/appeng/block/solids/OreQuartzCharged.java @@ -62,7 +62,7 @@ public class OreQuartzCharged extends OreQuartz @Override public int damageDropped( int id ) { - for ( ItemStack crystalStack : AEApi.instance().definitions().materials().certusQuartzCrystalCharged().maybeStack( 1 ).asSet() ) + for( ItemStack crystalStack : AEApi.instance().definitions().materials().certusQuartzCrystalCharged().maybeStack( 1 ).asSet() ) { return crystalStack.getItemDamage(); } @@ -74,7 +74,7 @@ public class OreQuartzCharged extends OreQuartz @SideOnly( Side.CLIENT ) public void randomDisplayTick( World w, int x, int y, int z, Random r ) { - if ( !AEConfig.instance.enableEffects ) + if( !AEConfig.instance.enableEffects ) { return; } diff --git a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java index 2747b96d8..9b15078fc 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java @@ -394,7 +394,6 @@ public class GuiImgButton extends GuiButton implements ITooltip } } - private static class ButtonAppearance { public int index; diff --git a/src/main/java/appeng/client/gui/widgets/GuiTabButton.java b/src/main/java/appeng/client/gui/widgets/GuiTabButton.java index ef10a2500..8d5578569 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiTabButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiTabButton.java @@ -56,11 +56,11 @@ public class GuiTabButton extends GuiButton implements ITooltip /** * Using itemstack as an icon * - * @param x x pos of button - * @param y y pos of button - * @param ico used icon + * @param x x pos of button + * @param y y pos of button + * @param ico used icon * @param message mouse over message - * @param ir renderer + * @param ir renderer */ public GuiTabButton( int x, int y, ItemStack ico, String message, RenderItem ir ) { diff --git a/src/main/java/appeng/client/gui/widgets/MEGuiTextField.java b/src/main/java/appeng/client/gui/widgets/MEGuiTextField.java index 8e09092f7..a0aeddf82 100644 --- a/src/main/java/appeng/client/gui/widgets/MEGuiTextField.java +++ b/src/main/java/appeng/client/gui/widgets/MEGuiTextField.java @@ -45,10 +45,10 @@ public class MEGuiTextField extends GuiTextField * Pays attention to the '_' caret. * * @param fontRenderer renderer for the strings - * @param xPos absolute left position - * @param yPos absolute top position - * @param width absolute width - * @param height absolute height + * @param xPos absolute left position + * @param yPos absolute top position + * @param width absolute width + * @param height absolute height */ public MEGuiTextField( FontRenderer fontRenderer, int xPos, int yPos, int width, int height ) { diff --git a/src/main/java/appeng/container/implementations/ContainerInscriber.java b/src/main/java/appeng/container/implementations/ContainerInscriber.java index d7eeab639..10f87d4a9 100644 --- a/src/main/java/appeng/container/implementations/ContainerInscriber.java +++ b/src/main/java/appeng/container/implementations/ContainerInscriber.java @@ -76,7 +76,7 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres @Override /** * Overridden super.setupConfig to prevent setting up the fake slots - */ protected void setupConfig() + */protected void setupConfig() { this.setupUpgrades(); } @@ -127,10 +127,10 @@ public class ContainerInscriber extends ContainerUpgradeable implements IProgres for( IInscriberRecipe recipe : AEApi.instance().registries().inscriber().getRecipes() ) { boolean matchA = ( top == null && !recipe.getTopOptional().isPresent() ) || ( Platform.isSameItemPrecise( top, recipe.getTopOptional().orNull() ) ) && // and... - ( bot == null && !recipe.getBottomOptional().isPresent() ) | ( Platform.isSameItemPrecise( bot, recipe.getBottomOptional().orNull() ) ); + ( bot == null && !recipe.getBottomOptional().isPresent() ) | ( Platform.isSameItemPrecise( bot, recipe.getBottomOptional().orNull() ) ); boolean matchB = ( bot == null && !recipe.getTopOptional().isPresent() ) || ( Platform.isSameItemPrecise( bot, recipe.getTopOptional().orNull() ) ) && // and... - ( top == null && !recipe.getBottomOptional().isPresent() ) | ( Platform.isSameItemPrecise( top, recipe.getBottomOptional().orNull() ) ); + ( top == null && !recipe.getBottomOptional().isPresent() ) | ( Platform.isSameItemPrecise( top, recipe.getBottomOptional().orNull() ) ); if( matchA || matchB ) { diff --git a/src/main/java/appeng/container/slot/SlotPlayerInv.java b/src/main/java/appeng/container/slot/SlotPlayerInv.java index 5fd366217..2e694b3de 100644 --- a/src/main/java/appeng/container/slot/SlotPlayerInv.java +++ b/src/main/java/appeng/container/slot/SlotPlayerInv.java @@ -21,8 +21,8 @@ package appeng.container.slot; import net.minecraft.inventory.IInventory; -// there is nothing special about this slot, its simply used to represent the players inventory, vs a container slot. +// there is nothing special about this slot, its simply used to represent the players inventory, vs a container slot. public class SlotPlayerInv extends AppEngSlot { diff --git a/src/main/java/appeng/container/slot/SlotRestrictedInput.java b/src/main/java/appeng/container/slot/SlotRestrictedInput.java index eafe6a32d..5e9c58918 100644 --- a/src/main/java/appeng/container/slot/SlotRestrictedInput.java +++ b/src/main/java/appeng/container/slot/SlotRestrictedInput.java @@ -145,7 +145,8 @@ public class SlotRestrictedInput extends AppEngSlot { return true; } - // ICraftingPatternDetails pattern = i.getItem() instanceof ICraftingPatternItem ? ((ICraftingPatternItem) + // ICraftingPatternDetails pattern = i.getItem() instanceof ICraftingPatternItem ? + // ((ICraftingPatternItem) // i.getItem()).getPatternForItem( i ) : null; return false;// pattern != null; } @@ -179,8 +180,8 @@ public class SlotRestrictedInput extends AppEngSlot case INSCRIBER_INPUT: return true;/* - * for (ItemStack is : Inscribe.inputs) if ( Platform.isSameItemPrecise( is, i ) ) return true; - * + * for (ItemStack is : Inscribe.inputs) if ( Platform.isSameItemPrecise( is, i ) ) return + * true; * return false; */ diff --git a/src/main/java/appeng/core/Api.java b/src/main/java/appeng/core/Api.java index ed4ba2969..4668caace 100644 --- a/src/main/java/appeng/core/Api.java +++ b/src/main/java/appeng/core/Api.java @@ -118,7 +118,7 @@ public final class Api implements IAppEngApi @Override public IGridNode createGridNode( IGridBlock blk ) { - if ( Platform.isClient() ) + if( Platform.isClient() ) { throw new IllegalStateException( "Grid features for " + blk + " are server side only." ); } diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 94468ffac..b70dceb19 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -343,10 +343,10 @@ public final class Registration target.partCableCovered = source.cableCovered(); target.partCableGlass = source.cableGlass(); target.partCableDense = source.cableDense(); - // target.partLumenCableSmart = source.lumenCableSmart(); - // target.partLumenCableCovered = source.lumenCableCovered(); - // target.partLumenCableGlass = source.lumenCableGlass(); - // target.partLumenCableDense = source.lumenCableDense(); + // target.partLumenCableSmart = source.lumenCableSmart(); + // target.partLumenCableCovered = source.lumenCableCovered(); + // target.partLumenCableGlass = source.lumenCableGlass(); + // target.partLumenCableDense = source.lumenCableDense(); target.partQuartzFiber = this.converter.of( source.quartzFiber() ); target.partToggleBus = this.converter.of( source.toggleBus() ); target.partInvertedToggleBus = this.converter.of( source.invertedToggleBus() ); @@ -532,7 +532,7 @@ public final class Registration partHelper.registerNewLayer( "appeng.parts.layers.LayerIEnergyHandler", "cofh.api.energy.IEnergyReceiver" ); } - if ( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.OpenComputers ) ) + if( IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.OpenComputers ) ) { partHelper.registerNewLayer( "appeng.parts.layers.LayerSidedEnvironment", "li.cil.oc.api.network.SidedEnvironment" ); } diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 115c0bf35..729461732 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -241,14 +241,15 @@ public final class ApiBlocks implements IBlocks this.quartzPillarStair = constructor.registerBlockDefinition( new QuartzPillarStairBlock( quartzPillar ) ); - this.skyStoneSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone, 0, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneSlabBlock" ) ); - this.skyStoneBlockSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone, 1, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneBlockSlabBlock" ) ); - this.skyStoneBrickSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone, 2, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneBrickSlabBlock" ) ); - this.skyStoneSmallBrickSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone, 3, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "SkyStoneSmallBrickSlabBlock" ) ); - this.fluixSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( fluixBlock, 0, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "FluixSlabBlock" ) ); - this.quartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzBlock, 0, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "QuartzSlabBlock" ) ); - this.chiseledQuartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( chiseledQuartz, 0, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "ChiseledQuartzSlabBlock" ) );; - this.quartzPillarSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzPillar, 0, EnumSet.of(AEFeature.DecorativeQuartzBlocks), false, "QuartzPillarSlabBlock" ) ); + this.skyStoneSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "SkyStoneSlabBlock" ) ); + this.skyStoneBlockSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone, 1, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "SkyStoneBlockSlabBlock" ) ); + this.skyStoneBrickSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone, 2, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "SkyStoneBrickSlabBlock" ) ); + this.skyStoneSmallBrickSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( skyStone, 3, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "SkyStoneSmallBrickSlabBlock" ) ); + this.fluixSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( fluixBlock, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "FluixSlabBlock" ) ); + this.quartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzBlock, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "QuartzSlabBlock" ) ); + this.chiseledQuartzSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( chiseledQuartz, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "ChiseledQuartzSlabBlock" ) ); + ; + this.quartzPillarSlab = constructor.registerBlockDefinition( new AEBaseSlabBlock( quartzPillar, 0, EnumSet.of( AEFeature.DecorativeQuartzBlocks ), false, "QuartzPillarSlabBlock" ) ); this.itemGen = constructor.registerBlockDefinition( new BlockItemGen() ); this.chunkLoader = constructor.registerBlockDefinition( new BlockChunkloader() ); diff --git a/src/main/java/appeng/core/api/definitions/DefinitionConstructor.java b/src/main/java/appeng/core/api/definitions/DefinitionConstructor.java index 6b69eb768..68923b8ce 100644 --- a/src/main/java/appeng/core/api/definitions/DefinitionConstructor.java +++ b/src/main/java/appeng/core/api/definitions/DefinitionConstructor.java @@ -54,7 +54,7 @@ public class DefinitionConstructor if( definition instanceof ITileDefinition ) { - return ( (ITileDefinition) definition ); + return( (ITileDefinition) definition ); } throw new IllegalStateException( "No tile definition for " + feature ); @@ -66,7 +66,7 @@ public class DefinitionConstructor if( definition instanceof IBlockDefinition ) { - return ( (IBlockDefinition) definition ); + return( (IBlockDefinition) definition ); } throw new IllegalStateException( "No block definition for " + feature ); diff --git a/src/main/java/appeng/core/api/imc/IMCGrinder.java b/src/main/java/appeng/core/api/imc/IMCGrinder.java index d8c0284c1..c289d8902 100644 --- a/src/main/java/appeng/core/api/imc/IMCGrinder.java +++ b/src/main/java/appeng/core/api/imc/IMCGrinder.java @@ -18,35 +18,35 @@ /* Example: -NBTTagCompound msg = new NBTTagCompound(); -NBTTagCompound in = new NBTTagCompound(); -NBTTagCompound out = new NBTTagCompound(); + NBTTagCompound msg = new NBTTagCompound(); + NBTTagCompound in = new NBTTagCompound(); + NBTTagCompound out = new NBTTagCompound(); -new ItemStack( Blocks.iron_ore ).writeToNBT( in ); -new ItemStack( Items.iron_ingot ).writeToNBT( out ); -msg.setTag( "in", in ); -msg.setTag( "out", out ); -msg.setInteger( "turns", 8 ); + new ItemStack( Blocks.iron_ore ).writeToNBT( in ); + new ItemStack( Items.iron_ingot ).writeToNBT( out ); + msg.setTag( "in", in ); + msg.setTag( "out", out ); + msg.setInteger( "turns", 8 ); -FMLInterModComms.sendMessage( "appliedenergistics2", "add-grindable", msg ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-grindable", msg ); -- or -- -NBTTagCompound msg = new NBTTagCompound(); -NBTTagCompound in = new NBTTagCompound(); -NBTTagCompound out = new NBTTagCompound(); -NBTTagCompound optional = new NBTTagCompound(); + NBTTagCompound msg = new NBTTagCompound(); + NBTTagCompound in = new NBTTagCompound(); + NBTTagCompound out = new NBTTagCompound(); + NBTTagCompound optional = new NBTTagCompound(); -new ItemStack( Blocks.iron_ore ).writeToNBT( in ); -new ItemStack( Items.iron_ingot ).writeToNBT( out ); -new ItemStack( Blocks.gravel ).writeToNBT( optional ); -msg.setTag( "in", in ); -msg.setTag( "out", out ); -msg.setTag( "optional", optional ); -msg.setFloat( "chance", 0.5 ); -msg.setInteger( "turns", 8 ); + new ItemStack( Blocks.iron_ore ).writeToNBT( in ); + new ItemStack( Items.iron_ingot ).writeToNBT( out ); + new ItemStack( Blocks.gravel ).writeToNBT( optional ); + msg.setTag( "in", in ); + msg.setTag( "out", out ); + msg.setTag( "optional", optional ); + msg.setFloat( "chance", 0.5 ); + msg.setInteger( "turns", 8 ); -FMLInterModComms.sendMessage( "appliedenergistics2", "add-grindable", msg ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-grindable", msg ); */ diff --git a/src/main/java/appeng/core/api/imc/IMCMatterCannon.java b/src/main/java/appeng/core/api/imc/IMCMatterCannon.java index 958363c49..c99e6e88b 100644 --- a/src/main/java/appeng/core/api/imc/IMCMatterCannon.java +++ b/src/main/java/appeng/core/api/imc/IMCMatterCannon.java @@ -18,14 +18,14 @@ /* Example: -NBTTagCompound msg = new NBTTagCompound(); -NBTTagCompound item = new NBTTagCompound(); + NBTTagCompound msg = new NBTTagCompound(); + NBTTagCompound item = new NBTTagCompound(); -new ItemStack( Blocks.anvil ).writeToNBT( item ); -msg.setTag( "item", item ); -msg.setDouble( "weight", 32.0 ); + new ItemStack( Blocks.anvil ).writeToNBT( item ); + msg.setTag( "item", item ); + msg.setDouble( "weight", 32.0 ); -FMLInterModComms.sendMessage( "appliedenergistics2", "add-mattercannon-ammo", msg ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-mattercannon-ammo", msg ); */ diff --git a/src/main/java/appeng/core/api/imc/IMCP2PAttunement.java b/src/main/java/appeng/core/api/imc/IMCP2PAttunement.java index 59f1b5b0d..96f41a6da 100644 --- a/src/main/java/appeng/core/api/imc/IMCP2PAttunement.java +++ b/src/main/java/appeng/core/api/imc/IMCP2PAttunement.java @@ -18,12 +18,12 @@ /* Example: -FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-me", new ItemStack( myBlockOrItem ) ); -FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-bc-power", new ItemStack( myBlockOrItem ) ); -FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-ic2-power", new ItemStack( myBlockOrItem ) ); -FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-redstone", new ItemStack( myBlockOrItem ) ); -FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-fluid", new ItemStack( myBlockOrItem ) ); -FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-item", new ItemStack( myBlockOrItem ) ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-me", new ItemStack( myBlockOrItem ) ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-bc-power", new ItemStack( myBlockOrItem ) ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-ic2-power", new ItemStack( myBlockOrItem ) ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-redstone", new ItemStack( myBlockOrItem ) ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-fluid", new ItemStack( myBlockOrItem ) ); + FMLInterModComms.sendMessage( "appliedenergistics2", "add-p2p-attunement-item", new ItemStack( myBlockOrItem ) ); */ diff --git a/src/main/java/appeng/core/api/imc/IMCSpatial.java b/src/main/java/appeng/core/api/imc/IMCSpatial.java index fb82b7737..ba8a1fd74 100644 --- a/src/main/java/appeng/core/api/imc/IMCSpatial.java +++ b/src/main/java/appeng/core/api/imc/IMCSpatial.java @@ -18,7 +18,7 @@ /* Example: -FMLInterModComms.sendMessage( "appliedenergistics2", "whitelist-spatial", "mymod.tileentities.MyTileEntity" ); + FMLInterModComms.sendMessage( "appliedenergistics2", "whitelist-spatial", "mymod.tileentities.MyTileEntity" ); */ diff --git a/src/main/java/appeng/core/crash/IntegrationCrashEnhancement.java b/src/main/java/appeng/core/crash/IntegrationCrashEnhancement.java index 72cbde527..0abec3e32 100644 --- a/src/main/java/appeng/core/crash/IntegrationCrashEnhancement.java +++ b/src/main/java/appeng/core/crash/IntegrationCrashEnhancement.java @@ -1,3 +1,4 @@ + package appeng.core.crash; diff --git a/src/main/java/appeng/core/crash/ModCrashEnhancement.java b/src/main/java/appeng/core/crash/ModCrashEnhancement.java index 951d8ad2e..274b77513 100644 --- a/src/main/java/appeng/core/crash/ModCrashEnhancement.java +++ b/src/main/java/appeng/core/crash/ModCrashEnhancement.java @@ -1,3 +1,4 @@ + package appeng.core.crash; @@ -7,7 +8,7 @@ import appeng.core.AEConfig; public class ModCrashEnhancement extends BaseCrashEnhancement { private static final String MOD_VERSION = AEConfig.CHANNEL + ' ' + AEConfig.VERSION + " for Forge " + // WHAT? - net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion + net.minecraftforge.common.ForgeVersion.majorVersion + '.' // majorVersion + net.minecraftforge.common.ForgeVersion.minorVersion + '.' // minorVersion + net.minecraftforge.common.ForgeVersion.revisionVersion + '.' // revisionVersion + net.minecraftforge.common.ForgeVersion.buildVersion; diff --git a/src/main/java/appeng/core/features/AEFeature.java b/src/main/java/appeng/core/features/AEFeature.java index 95c81b57e..a27da5744 100644 --- a/src/main/java/appeng/core/features/AEFeature.java +++ b/src/main/java/appeng/core/features/AEFeature.java @@ -79,7 +79,7 @@ public enum AEFeature AEFeature( String cat ) { - this(cat, true); + this( cat, true ); } AEFeature( String cat, boolean defaultValue ) diff --git a/src/main/java/appeng/core/features/DefinitionConverter.java b/src/main/java/appeng/core/features/DefinitionConverter.java index 8f022955a..0dc79c340 100644 --- a/src/main/java/appeng/core/features/DefinitionConverter.java +++ b/src/main/java/appeng/core/features/DefinitionConverter.java @@ -1,3 +1,4 @@ + package appeng.core.features; @@ -92,7 +93,6 @@ public final class DefinitionConverter } } - private static class AEItem extends AEComparable { private final IItemDefinition definition; @@ -119,7 +119,6 @@ public final class DefinitionConverter } } - private static class AEBlock extends AEItem { private final IBlockDefinition definition; @@ -145,7 +144,6 @@ public final class DefinitionConverter } } - private static class AETile extends AEBlock { private final ITileDefinition definition; diff --git a/src/main/java/appeng/core/features/SlabBlockFeatureHandler.java b/src/main/java/appeng/core/features/SlabBlockFeatureHandler.java index 6cb8f56e4..01e1f2dd6 100644 --- a/src/main/java/appeng/core/features/SlabBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/SlabBlockFeatureHandler.java @@ -42,7 +42,7 @@ public class SlabBlockFeatureHandler implements IFeatureHandler { final ActivityState state = new FeaturedActiveChecker( features ).getActivityState(); this.slabs = slabs; - this.extractor = new FeatureNameExtractor( slabs.getClass(), Optional.absent()); + this.extractor = new FeatureNameExtractor( slabs.getClass(), Optional.absent() ); this.enabled = state == ActivityState.Enabled; this.definition = new BlockDefinition( slabs, state ); } @@ -65,8 +65,8 @@ public class SlabBlockFeatureHandler implements IFeatureHandler if( this.enabled ) { this.slabs.setCreativeTab( CreativeTab.instance ); - GameRegistry.registerBlock( slabs, AEBaseItemBlockSlab.class, "tile." + slabs.name(), slabs, slabs.doubleSlabs(), false); - GameRegistry.registerBlock( slabs.doubleSlabs(), AEBaseItemBlockSlab.class, "tile." + slabs.name() + ".double", slabs, slabs.doubleSlabs(), true); + GameRegistry.registerBlock( slabs, AEBaseItemBlockSlab.class, "tile." + slabs.name(), slabs, slabs.doubleSlabs(), false ); + GameRegistry.registerBlock( slabs.doubleSlabs(), AEBaseItemBlockSlab.class, "tile." + slabs.name() + ".double", slabs, slabs.doubleSlabs(), true ); } } } diff --git a/src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java b/src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java index 775209f46..9e02cd7ea 100644 --- a/src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java +++ b/src/main/java/appeng/core/features/registries/entries/InscriberInscribeRecipe.java @@ -1,3 +1,4 @@ + package appeng.core.features.registries.entries; diff --git a/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java b/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java index 2467b8c8c..4619bc167 100644 --- a/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java +++ b/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java @@ -1,3 +1,4 @@ + package appeng.core.features.registries.entries; @@ -94,7 +95,7 @@ public class InscriberRecipe implements IInscriberRecipe { return true; } - if( !(o instanceof IInscriberRecipe) ) + if( !( o instanceof IInscriberRecipe ) ) { return false; } @@ -113,7 +114,7 @@ public class InscriberRecipe implements IInscriberRecipe { return false; } - if( !this.maybeBot.equals( that.getBottomOptional()) ) + if( !this.maybeBot.equals( that.getBottomOptional() ) ) { return false; } diff --git a/src/main/java/appeng/core/localization/PlayerMessages.java b/src/main/java/appeng/core/localization/PlayerMessages.java index 412a8e61e..0f685678f 100644 --- a/src/main/java/appeng/core/localization/PlayerMessages.java +++ b/src/main/java/appeng/core/localization/PlayerMessages.java @@ -30,7 +30,7 @@ public enum PlayerMessages isNowLocked, isNowUnlocked, AmmoDepleted, CommunicationError, OutOfRange, DeviceNotPowered, DeviceNotWirelessTerminal, DeviceNotLinked, StationCanNotBeLocated, - SettingCleared,; + SettingCleared, ; public IChatComponent get() { diff --git a/src/main/java/appeng/core/stats/PlayerStatsRegistration.java b/src/main/java/appeng/core/stats/PlayerStatsRegistration.java index dca4192a8..9395c092d 100644 --- a/src/main/java/appeng/core/stats/PlayerStatsRegistration.java +++ b/src/main/java/appeng/core/stats/PlayerStatsRegistration.java @@ -38,20 +38,24 @@ import appeng.core.features.AEFeature; public class PlayerStatsRegistration { /** - * {@link cpw.mods.fml.common.eventhandler.EventBus} to which the handlers might get posted to depending if the feature is enabled + * {@link cpw.mods.fml.common.eventhandler.EventBus} to which the handlers might get posted to depending if the + * feature is enabled */ private final EventBus bus; /** - * is true if the {@link appeng.core.features.AEFeature#Achievements} is enabled in the {@param config} + * is true if the {@link appeng.core.features.AEFeature#Achievements} is enabled in the + * + * @param config} */ private final boolean isAchievementFeatureEnabled; /** * Constructs this with an {@link cpw.mods.fml.common.eventhandler.EventBus} and {@link appeng.core.AEConfig}. * - * @param bus {@see #bus} - * @param config {@link appeng.core.AEConfig} which is used to determine if the {@link appeng.core.features.AEFeature#Achievements} is enabled + * @param bus {@see #bus} + * @param config {@link appeng.core.AEConfig} which is used to determine if the + * {@link appeng.core.features.AEFeature#Achievements} is enabled */ public PlayerStatsRegistration( EventBus bus, AEConfig config ) { @@ -60,7 +64,9 @@ public class PlayerStatsRegistration } /** - * Registers the {@link appeng.core.stats.AchievementCraftingHandler} and {@link appeng.core.stats.AchievementPickupHandler} to the {@link #bus} if {@link #isAchievementFeatureEnabled} is true. + * Registers the {@link appeng.core.stats.AchievementCraftingHandler} and + * {@link appeng.core.stats.AchievementPickupHandler} to the {@link #bus} if {@link #isAchievementFeatureEnabled} is + * true. */ public void registerAchievementHandlers() { @@ -76,7 +82,8 @@ public class PlayerStatsRegistration } /** - * Registers the {@link appeng.core.stats.AchievementHierarchy} and adds all {@link appeng.core.stats.Achievements} to a new {@link net.minecraftforge.common.AchievementPage}. + * Registers the {@link appeng.core.stats.AchievementHierarchy} and adds all {@link appeng.core.stats.Achievements} + * to a new {@link net.minecraftforge.common.AchievementPage}. */ public void registerAchievements() { diff --git a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java index 7c4521d5d..237786829 100644 --- a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java +++ b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java @@ -56,7 +56,6 @@ public class AppEngPacketHandlerBase { private static final Map, PacketTypes> REVERSE_LOOKUP = new HashMap, AppEngPacketHandlerBase.PacketTypes>(); - public enum PacketTypes { PACKET_COMPASS_REQUEST( PacketCompassRequest.class ), diff --git a/src/main/java/appeng/core/sync/packets/PacketConfigButton.java b/src/main/java/appeng/core/sync/packets/PacketConfigButton.java index 2bd7834d6..77c4cf9dc 100644 --- a/src/main/java/appeng/core/sync/packets/PacketConfigButton.java +++ b/src/main/java/appeng/core/sync/packets/PacketConfigButton.java @@ -67,7 +67,7 @@ public final class PacketConfigButton extends AppEngPacket public void serverPacketData( INetworkInfo manager, AppEngPacket packet, EntityPlayer player ) { EntityPlayerMP sender = (EntityPlayerMP) player; - if ( sender.openContainer instanceof AEBaseContainer ) + if( sender.openContainer instanceof AEBaseContainer ) { final AEBaseContainer baseContainer = (AEBaseContainer) sender.openContainer; if( baseContainer.getTarget() instanceof IConfigurableObject ) diff --git a/src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java b/src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java index 53b35cd97..b755fc867 100644 --- a/src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java +++ b/src/main/java/appeng/core/worlddata/IWorldPlayerMapping.java @@ -48,7 +48,7 @@ public interface IWorldPlayerMapping /** * Put in new players when they join the server * - * @param id id of new player + * @param id id of new player * @param uuid UUID of new player */ void put( int id, @Nonnull UUID uuid ); diff --git a/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java b/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java index f5aa6d748..a5f92a53e 100644 --- a/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java +++ b/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java @@ -65,10 +65,11 @@ public class MeteorDataNameEncoder /** * @param dimension ID of the processed dimension. Can be any integer - * @param chunkX X coordinate of the chunk. Can be any integer - * @param chunkZ Z coordinate of the chunk. Can be any integer + * @param chunkX X coordinate of the chunk. Can be any integer + * @param chunkZ Z coordinate of the chunk. Can be any integer * - * @return encoded file name suggestion in form of dim_x_y.dat where x and y will be shifted to stay conform with the vanilla chunk system + * @return encoded file name suggestion in form of dim_x_y.dat where x and y will be + * shifted to stay conform with the vanilla chunk system * * @since rv3 05.06.2015 */ diff --git a/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java b/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java index 16e8d1457..788af63b2 100644 --- a/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java +++ b/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java @@ -51,7 +51,7 @@ class PlayerMappingsInitializer * where the UUIDs were introduced. * * @param playerList the category for the player list, generally extracted using the "players" tag - * @param log the logger used to warn the server or user of faulty entries + * @param log the logger used to warn the server or user of faulty entries */ PlayerMappingsInitializer( ConfigCategory playerList, FMLRelaunchLog log ) { diff --git a/src/main/java/appeng/core/worlddata/SpawnData.java b/src/main/java/appeng/core/worlddata/SpawnData.java index 35f01790c..9af52b306 100644 --- a/src/main/java/appeng/core/worlddata/SpawnData.java +++ b/src/main/java/appeng/core/worlddata/SpawnData.java @@ -57,7 +57,8 @@ final class SpawnData implements IWorldSpawnData } @Override - public void setGenerated( int dim, int chunkX, int chunkZ ) { + public void setGenerated( int dim, int chunkX, int chunkZ ) + { synchronized( SpawnData.class ) { NBTTagCompound data = this.loadSpawnData( dim, chunkX, chunkZ ); diff --git a/src/main/java/appeng/facade/FacadePart.java b/src/main/java/appeng/facade/FacadePart.java index 214344366..a3c75b551 100644 --- a/src/main/java/appeng/facade/FacadePart.java +++ b/src/main/java/appeng/facade/FacadePart.java @@ -536,23 +536,18 @@ public class FacadePart implements IFacadePart, IBoxProvider * if ( out.contains( ForgeDirection.EAST ) && (side.offsetZ != 0) ) { IFacadePart fp = fc.getFacade( * ForgeDirection.EAST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove( * ForgeDirection.EAST ); } - * * if ( out.contains( ForgeDirection.WEST ) && (side.offsetZ != 0) ) { IFacadePart fp = fc.getFacade( * ForgeDirection.WEST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove( * ForgeDirection.WEST ); } - * * if ( out.contains( ForgeDirection.NORTH ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade( * ForgeDirection.NORTH ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove( * ForgeDirection.NORTH ); } - * * if ( out.contains( ForgeDirection.SOUTH ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade( * ForgeDirection.SOUTH ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove( * ForgeDirection.SOUTH ); } - * * if ( out.contains( ForgeDirection.EAST ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade( * ForgeDirection.EAST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove( * ForgeDirection.EAST ); } - * * if ( out.contains( ForgeDirection.WEST ) && (side.offsetY != 0) ) { IFacadePart fp = fc.getFacade( * ForgeDirection.WEST ); if ( fp != null && (fp.isTransparent() == facade.isTransparent()) ) out.remove( * ForgeDirection.WEST ); } diff --git a/src/main/java/appeng/fmp/CableBusPart.java b/src/main/java/appeng/fmp/CableBusPart.java index a1badadf2..ba2460e9c 100644 --- a/src/main/java/appeng/fmp/CableBusPart.java +++ b/src/main/java/appeng/fmp/CableBusPart.java @@ -453,7 +453,7 @@ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMask double r = Math.abs( a - 0.5 ); r = Math.max( Math.abs( b - 0.5 ), r ); r = Math.max( Math.abs( c - 0.5 ), r ); - return ( 8 * (int) Math.max( Math.abs( d - 0.5 ), r ) ); + return( 8 * (int) Math.max( Math.abs( d - 0.5 ), r ) ); } // @Override diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java index 50c6afdc0..0ec7556e3 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -373,7 +373,6 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable - * This is useful, when a player just started to look at a tile - * and thus just requested the new information from the server. + * This is useful, when a player just started to look at a tile and thus just requested the new information from the + * server. *

* The cache will be updated from the server. */ @@ -64,10 +64,10 @@ public final class ChannelWailaDataProvider extends BasePartWailaDataProvider /** * Adds the used and max channel to the tool tip * - * @param part being looked at part + * @param part being looked at part * @param currentToolTip current tool tip - * @param accessor wrapper for various world information - * @param config config to react to various settings + * @param accessor wrapper for various world information + * @param config config to react to various settings * * @return modified tool tip */ @@ -91,12 +91,11 @@ public final class ChannelWailaDataProvider extends BasePartWailaDataProvider /** * Determines the source of the channel. *

- * If the client received information of the channels on the server, they are used, - * else if the cache contains a previous stored value, this will be used. - * Default value is 0. + * If the client received information of the channels on the server, they are used, else if the cache contains a + * previous stored value, this will be used. Default value is 0. * - * @param part part to be looked at - * @param tag tag maybe containing the channel information + * @param part part to be looked at + * @param tag tag maybe containing the channel information * @param cache cache with previous knowledge * * @return used channels on the cable @@ -125,18 +124,17 @@ public final class ChannelWailaDataProvider extends BasePartWailaDataProvider /** * Called on server to transfer information from server to client. *

- * If the part is a cable, - * it writes the channel information in the {@code #tag} - * using the {@code ID_USED_CHANNELS} key. + * If the part is a cable, it writes the channel information in the {@code #tag} using the {@code ID_USED_CHANNELS} + * key. * * @param player player looking at the part - * @param part part being looked at - * @param te host of the part - * @param tag transferred tag which is send to the client - * @param world world of the part - * @param x x pos of the part - * @param y y pos of the part - * @param z z pos of the part + * @param part part being looked at + * @param te host of the part + * @param tag transferred tag which is send to the client + * @param world world of the part + * @param x x pos of the part + * @param y y pos of the part + * @param z z pos of the part * * @return tag send to the client */ diff --git a/src/main/java/appeng/integration/modules/waila/part/IPartWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/IPartWailaDataProvider.java index 0aeadf84a..b22c8b3f3 100644 --- a/src/main/java/appeng/integration/modules/waila/part/IPartWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/IPartWailaDataProvider.java @@ -34,7 +34,8 @@ import appeng.api.parts.IPart; /** - * An abstraction layer of the {@link appeng.integration.modules.waila.part.IPartWailaDataProvider} for {@link appeng.api.parts.IPart}. + * An abstraction layer of the {@link appeng.integration.modules.waila.part.IPartWailaDataProvider} for + * {@link appeng.api.parts.IPart}. * * @author thatsIch * @version rv2 diff --git a/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java b/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java index d78b5cfae..09ae6ef11 100644 --- a/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java +++ b/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java @@ -42,10 +42,10 @@ public final class PartAccessor /** * Hits a {@link appeng.api.parts.IPartHost} with {@link net.minecraft.util.MovingObjectPosition}. *

- * You can derive the looked at {@link appeng.api.parts.IPart} by doing that. - * If a facade is being looked at, it is defined as being absent. + * You can derive the looked at {@link appeng.api.parts.IPart} by doing that. If a facade is being looked at, it is + * defined as being absent. * - * @param te being looked at {@link net.minecraft.tileentity.TileEntity} + * @param te being looked at {@link net.minecraft.tileentity.TileEntity} * @param mop type of ray-trace * * @return maybe the looked at {@link appeng.api.parts.IPart} diff --git a/src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java index 027559106..12f7b3d01 100644 --- a/src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java @@ -18,6 +18,7 @@ package appeng.integration.modules.waila.part; + import net.minecraft.item.ItemStack; import mcp.mobius.waila.api.IWailaConfigHandler; @@ -25,14 +26,16 @@ import mcp.mobius.waila.api.IWailaConfigHandler; import appeng.api.parts.IPart; import appeng.api.parts.PartItemStack; + /** - * Part ItemStack provider for WAILA + * Part ItemStack provider for WAILA * * @author TheJulianJES * @version rv2 * @since rv2 */ -public class PartStackWailaDataProvider extends BasePartWailaDataProvider { +public class PartStackWailaDataProvider extends BasePartWailaDataProvider +{ @Override public ItemStack getWailaStack( IPart part, IWailaConfigHandler config, ItemStack partStack ) diff --git a/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java index ce976fad9..be55dd73e 100644 --- a/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java @@ -41,10 +41,10 @@ public final class PowerStateWailaDataProvider extends BasePartWailaDataProvider /** * Adds state to the tooltip * - * @param part part with state + * @param part part with state * @param currentToolTip to be added to tooltip - * @param accessor wrapper for various information - * @param config config settings + * @param accessor wrapper for various information + * @param config config settings * * @return modified tooltip */ @@ -64,7 +64,7 @@ public final class PowerStateWailaDataProvider extends BasePartWailaDataProvider /** * Gets the corresponding tool tip for different values of {@code #isActive} and {@code #isPowered} * - * @param isActive if part is active + * @param isActive if part is active * @param isPowered if part is powered * * @return tooltip of the state diff --git a/src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java index dfd96a9cf..c5c1aa857 100644 --- a/src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java @@ -45,10 +45,10 @@ public final class StorageMonitorWailaDataProvider extends BasePartWailaDataProv * Displays the stack if present and if the monitor is locked. * Can handle fluids and items. * - * @param part maybe storage monitor + * @param part maybe storage monitor * @param currentToolTip to be written to tooltip - * @param accessor information wrapper - * @param config config option + * @param accessor information wrapper + * @param config config option * * @return modified tooltip */ diff --git a/src/main/java/appeng/integration/modules/waila/part/Tracer.java b/src/main/java/appeng/integration/modules/waila/part/Tracer.java index 28dd595e6..304d2f125 100644 --- a/src/main/java/appeng/integration/modules/waila/part/Tracer.java +++ b/src/main/java/appeng/integration/modules/waila/part/Tracer.java @@ -40,11 +40,11 @@ public final class Tracer * Trace view of players to blocks. * Ignore all which are out of reach. * - * @param world word of block + * @param world word of block * @param player player viewing block - * @param x x pos of block - * @param y y pos of block - * @param z z pos of block + * @param x x pos of block + * @param y y pos of block + * @param z z pos of block * * @return trace movement. Can be null */ @@ -72,7 +72,7 @@ public final class Tracer Vec3 v = Vec3.createVectorHelper( player.posX, player.posY, player.posZ ); if( player.worldObj.isRemote ) { - //compatibility with eye height changing mods + // compatibility with eye height changing mods v.yCoord += player.getEyeHeight() - player.getDefaultEyeHeight(); } else diff --git a/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java index 047b05bc4..1168345d4 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java @@ -46,10 +46,10 @@ public final class ChargerWailaDataProvider extends BaseWailaDataProvider /** * Displays the holding item and its tooltip * - * @param itemStack stack of charger + * @param itemStack stack of charger * @param currentToolTip unmodified tooltip - * @param accessor wrapper information - * @param config config option + * @param accessor wrapper information + * @param config config option * * @return modified tooltip */ diff --git a/src/main/java/appeng/integration/modules/waila/tile/CraftingMonitorWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/CraftingMonitorWailaDataProvider.java index 2267c7f22..bf6425b91 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/CraftingMonitorWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/CraftingMonitorWailaDataProvider.java @@ -45,10 +45,10 @@ public final class CraftingMonitorWailaDataProvider extends BaseWailaDataProvide /** * Displays the item currently crafted by the CPU cluster * - * @param itemStack stack of crafting monitor + * @param itemStack stack of crafting monitor * @param currentToolTip unmodified tooltip - * @param accessor information wrapper - * @param config config option + * @param accessor information wrapper + * @param config config option * * @return modified tooltip */ diff --git a/src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.java index 9c74fd8b7..8fffa8b18 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.java @@ -44,10 +44,10 @@ public final class PowerStateWailaDataProvider extends BaseWailaDataProvider /** * Adds state to the tooltip * - * @param itemStack stack of power state + * @param itemStack stack of power state * @param currentToolTip to be added to tooltip - * @param accessor wrapper for various information - * @param config config settings + * @param accessor wrapper for various information + * @param config config settings * * @return modified tooltip */ diff --git a/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java index 7322c698e..3e4957cba 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java @@ -56,8 +56,8 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider /** * Used cache for power if the power was not transmitted through the server. *

- * This is useful, when a player just started to look at a tile - * and thus just requested the new information from the server. + * This is useful, when a player just started to look at a tile and thus just requested the new information from the + * server. *

* The cache will be updated from the server. */ @@ -67,18 +67,18 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider * Adds the current and max power to the tool tip * Will ignore if the tile has an energy buffer ( > 0 ) * - * @param itemStack stack of power storage + * @param itemStack stack of power storage * @param currentToolTip current tool tip - * @param accessor wrapper for various world information - * @param config config to react to various settings + * @param accessor wrapper for various world information + * @param config config to react to various settings * * @return modified tool tip */ @Override public List getWailaBody( ItemStack itemStack, List currentToolTip, IWailaDataAccessor accessor, IWailaConfigHandler config ) { - //Removes RF tooltip on WAILA 1.5.9+ - ((ITaggedList) currentToolTip).removeEntries("RFEnergyStorage"); + // Removes RF tooltip on WAILA 1.5.9+ + ( (ITaggedList) currentToolTip ).removeEntries( "RFEnergyStorage" ); final TileEntity te = accessor.getTileEntity(); if( te instanceof IAEPowerStorage ) @@ -106,17 +106,16 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider /** * Called on server to transfer information from server to client. *

- * If the {@link net.minecraft.tileentity.TileEntity} is a {@link appeng.api.networking.energy.IAEPowerStorage}, - * it writes the power information to the {@code #tag} - * using the {@code #ID_CURRENT_POWER} key. + * If the {@link net.minecraft.tileentity.TileEntity} is a {@link appeng.api.networking.energy.IAEPowerStorage}, it + * writes the power information to the {@code #tag} using the {@code #ID_CURRENT_POWER} key. * * @param player player looking at the power storage - * @param te power storage - * @param tag transferred tag which is send to the client - * @param world world of the power storage - * @param x x pos of the power storage - * @param y y pos of the power storage - * @param z z pos of the power storage + * @param te power storage + * @param tag transferred tag which is send to the client + * @param world world of the power storage + * @param x x pos of the power storage + * @param y y pos of the power storage + * @param z z pos of the power storage * * @return tag send to the client */ @@ -141,11 +140,10 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider /** * Determines the current power. *

- * If the client received power information on the server, they are used, - * else if the cache contains a previous stored value, this will be used. - * Default value is 0. + * If the client received power information on the server, they are used, else if the cache contains a previous + * stored value, this will be used. Default value is 0. * - * @param te te to be looked at + * @param te te to be looked at * @param tag tag maybe containing the channel information * * @return used channels on the cable diff --git a/src/main/java/appeng/items/materials/ItemMultiMaterial.java b/src/main/java/appeng/items/materials/ItemMultiMaterial.java index b071ef649..28945395a 100644 --- a/src/main/java/appeng/items/materials/ItemMultiMaterial.java +++ b/src/main/java/appeng/items/materials/ItemMultiMaterial.java @@ -176,7 +176,7 @@ public final class ItemMultiMaterial extends AEBaseItem implements IStorageCompo Preconditions.checkState( !mat.isRegistered(), "Cannot create the same material twice." ); boolean enabled = true; - + for( AEFeature f : mat.getFeature() ) { enabled = enabled && AEConfig.instance.isFeatureEnabled( f ); @@ -190,7 +190,6 @@ public final class ItemMultiMaterial extends AEBaseItem implements IStorageCompo mat.markReady(); int newMaterialNum = mat.damageValue; - if( this.dmgToMaterial.get( newMaterialNum ) == null ) { this.dmgToMaterial.put( newMaterialNum, mat ); diff --git a/src/main/java/appeng/items/tools/powered/powersink/UniversalElectricity.java b/src/main/java/appeng/items/tools/powered/powersink/UniversalElectricity.java index 632655844..53e4b3371 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/UniversalElectricity.java +++ b/src/main/java/appeng/items/tools/powered/powersink/UniversalElectricity.java @@ -18,6 +18,7 @@ package appeng.items.tools.powered.powersink; + /* @Interface(iface = "universalelectricity.core.item.IItemElectric", modid = "IC2") public class UniversalElectricity extends ThermalExpansion implements IItemElectric diff --git a/src/main/java/appeng/me/GridNodeIterator.java b/src/main/java/appeng/me/GridNodeIterator.java index ede346004..d4dda95da 100644 --- a/src/main/java/appeng/me/GridNodeIterator.java +++ b/src/main/java/appeng/me/GridNodeIterator.java @@ -29,8 +29,8 @@ import appeng.api.networking.IGridNode; /** * Nested iterator for {@link appeng.me.MachineSet} * - * Traverses first over the {@link appeng.me.MachineSet} - * and then over every containing {@link appeng.api.networking.IGridNode} + * Traverses first over the {@link appeng.me.MachineSet} and then over every containing + * {@link appeng.api.networking.IGridNode} */ public class GridNodeIterator implements Iterator { diff --git a/src/main/java/appeng/me/GridStorage.java b/src/main/java/appeng/me/GridStorage.java index 53d45a98d..a3edb7bcd 100644 --- a/src/main/java/appeng/me/GridStorage.java +++ b/src/main/java/appeng/me/GridStorage.java @@ -43,12 +43,13 @@ public class GridStorage implements IGridStorage private final WeakHashMap divided = new WeakHashMap(); public boolean isDirty = false; private WeakReference internalGrid = null; + // lost... /** * for use with world settings * - * @param id ID of grid storage + * @param id ID of grid storage * @param gss grid storage search */ public GridStorage( long id, GridStorageSearch gss ) @@ -62,8 +63,8 @@ public class GridStorage implements IGridStorage * for use with world settings * * @param input array of bytes string - * @param id ID of grid storage - * @param gss grid storage search + * @param id ID of grid storage + * @param gss grid storage search */ public GridStorage( String input, long id, GridStorageSearch gss ) { diff --git a/src/main/java/appeng/me/NetworkEventBus.java b/src/main/java/appeng/me/NetworkEventBus.java index c55b740b7..4fc15cc5c 100644 --- a/src/main/java/appeng/me/NetworkEventBus.java +++ b/src/main/java/appeng/me/NetworkEventBus.java @@ -162,7 +162,6 @@ public class NetworkEventBus private static final long serialVersionUID = -3079021487019171205L; } - class EventMethod { @@ -199,7 +198,6 @@ public class NetworkEventBus } } - class MENetworkEventInfo { diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java index 4eb76806d..60a69854a 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/src/main/java/appeng/me/cache/GridStorageCache.java @@ -380,7 +380,6 @@ public class GridStorageCache implements IStorageGrid } } - private class CellChangeTracker { diff --git a/src/main/java/appeng/me/cache/SecurityCache.java b/src/main/java/appeng/me/cache/SecurityCache.java index 1ef0df519..7ee8cb0b1 100644 --- a/src/main/java/appeng/me/cache/SecurityCache.java +++ b/src/main/java/appeng/me/cache/SecurityCache.java @@ -141,14 +141,14 @@ public class SecurityCache implements ISecurityGrid public void populateGridStorage( IGridStorage destinationStorage ) { - } @Override + } + + @Override public boolean isAvailable() { return this.securityProvider.size() == 1 && this.securityProvider.get( 0 ).isSecurityEnabled(); } - - @Override public boolean hasPermission( EntityPlayer player, SecurityPermissions perm ) { diff --git a/src/main/java/appeng/me/cache/helpers/TickTracker.java b/src/main/java/appeng/me/cache/helpers/TickTracker.java index f1aeb4926..a66b4a281 100644 --- a/src/main/java/appeng/me/cache/helpers/TickTracker.java +++ b/src/main/java/appeng/me/cache/helpers/TickTracker.java @@ -56,7 +56,7 @@ public class TickTracker implements Comparable public long getAvgNanos() { - return ( this.LastFiveTicksTime / 5 ); + return( this.LastFiveTicksTime / 5 ); } public void setRate( int rate ) diff --git a/src/main/java/appeng/me/cluster/MBCalculator.java b/src/main/java/appeng/me/cluster/MBCalculator.java index 775b5c6f3..0cface0ee 100644 --- a/src/main/java/appeng/me/cluster/MBCalculator.java +++ b/src/main/java/appeng/me/cluster/MBCalculator.java @@ -153,7 +153,7 @@ public abstract class MBCalculator /** * construct the correct cluster, usually very simple. * - * @param w world + * @param w world * @param min min world coord * @param max max world coord * @@ -171,8 +171,8 @@ public abstract class MBCalculator /** * configure the multi-block tiles, most of the important stuff is in here. * - * @param c updated cluster - * @param w in world + * @param c updated cluster + * @param w in world * @param min min world coord * @param max max world coord */ diff --git a/src/main/java/appeng/me/storage/CellInventory.java b/src/main/java/appeng/me/storage/CellInventory.java index fdd8916dd..37f7502bd 100644 --- a/src/main/java/appeng/me/storage/CellInventory.java +++ b/src/main/java/appeng/me/storage/CellInventory.java @@ -419,7 +419,7 @@ public class CellInventory implements ICellInventory } // clean any old crusty stuff... - for(; x < oldStoredItems && x < this.maxItemTypes; x++ ) + for( ; x < oldStoredItems && x < this.maxItemTypes; x++ ) { this.tagCompound.removeTag( itemSlots[x] ); this.tagCompound.removeTag( itemSlotCount[x] ); diff --git a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java index 247caa694..f816b56e0 100644 --- a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java +++ b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java @@ -69,7 +69,9 @@ public class NetworkInventoryHandler> implements IMEInvent { this.myChannel = chan; this.security = security; - this.priorityInventory = new TreeMap>>( PRIORITY_SORTER ); // TreeMultimap.create( prioritySorter, hashSorter ); + this.priorityInventory = new TreeMap>>( PRIORITY_SORTER ); // TreeMultimap.create( + // prioritySorter, + // hashSorter ); } public void addNewStorage( IMEInventoryHandler h ) diff --git a/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java b/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java index 08167930a..5577e1e3d 100644 --- a/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java +++ b/src/main/java/appeng/parts/automation/BlockUpgradeInventory.java @@ -1,3 +1,4 @@ + package appeng.parts.automation; diff --git a/src/main/java/appeng/parts/automation/DefinitionUpgradeInventory.java b/src/main/java/appeng/parts/automation/DefinitionUpgradeInventory.java index 35fbaf5ad..e6cb39ed5 100644 --- a/src/main/java/appeng/parts/automation/DefinitionUpgradeInventory.java +++ b/src/main/java/appeng/parts/automation/DefinitionUpgradeInventory.java @@ -1,3 +1,4 @@ + package appeng.parts.automation; diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/PartFormationPlane.java index c978c4f8f..4589bcfa9 100644 --- a/src/main/java/appeng/parts/automation/PartFormationPlane.java +++ b/src/main/java/appeng/parts/automation/PartFormationPlane.java @@ -508,10 +508,10 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine { is.stackSize = (int) maxStorage; - EntityItem ei = new EntityItem( w, // w - ( ( side.offsetX != 0 ? 0.0 : 0.7 ) * ( Platform.getRandomFloat() - 0.5f ) ) + 0.5 + side.offsetX * -0.3 + x, // spawn - ( ( side.offsetY != 0 ? 0.0 : 0.7 ) * ( Platform.getRandomFloat() - 0.5f ) ) + 0.5 + side.offsetY * -0.3 + y, // spawn - ( ( side.offsetZ != 0 ? 0.0 : 0.7 ) * ( Platform.getRandomFloat() - 0.5f ) ) + 0.5 + side.offsetZ * -0.3 + z, // spawn + EntityItem ei = new EntityItem( w, + ( ( side.offsetX != 0 ? 0.0 : 0.7 ) * ( Platform.getRandomFloat() - 0.5f ) ) + 0.5 + side.offsetX * -0.3 + x, + ( ( side.offsetY != 0 ? 0.0 : 0.7 ) * ( Platform.getRandomFloat() - 0.5f ) ) + 0.5 + side.offsetY * -0.3 + y, + ( ( side.offsetZ != 0 ? 0.0 : 0.7 ) * ( Platform.getRandomFloat() - 0.5f ) ) + 0.5 + side.offsetZ * -0.3 + z, is.copy() ); Entity result = ei; diff --git a/src/main/java/appeng/parts/automation/StackUpgradeInventory.java b/src/main/java/appeng/parts/automation/StackUpgradeInventory.java index 745161f04..fcf0418ed 100644 --- a/src/main/java/appeng/parts/automation/StackUpgradeInventory.java +++ b/src/main/java/appeng/parts/automation/StackUpgradeInventory.java @@ -1,3 +1,4 @@ + package appeng.parts.automation; diff --git a/src/main/java/appeng/parts/layers/LayerSidedEnvironment.java b/src/main/java/appeng/parts/layers/LayerSidedEnvironment.java index a6e279eb3..fdc35b672 100644 --- a/src/main/java/appeng/parts/layers/LayerSidedEnvironment.java +++ b/src/main/java/appeng/parts/layers/LayerSidedEnvironment.java @@ -18,6 +18,7 @@ package appeng.parts.layers; + import javax.annotation.Nullable; import net.minecraftforge.common.util.ForgeDirection; @@ -41,10 +42,10 @@ public class LayerSidedEnvironment extends LayerBase implements SidedEnvironment { @Nullable @Override - public Node sidedNode(ForgeDirection side) + public Node sidedNode( ForgeDirection side ) { final IPart part = this.getPart( side ); - if ( part instanceof SidedEnvironment ) + if( part instanceof SidedEnvironment ) { return ( (SidedEnvironment) part ).sidedNode( side ); } @@ -52,10 +53,10 @@ public class LayerSidedEnvironment extends LayerBase implements SidedEnvironment } @Override - public boolean canConnect(ForgeDirection side) + public boolean canConnect( ForgeDirection side ) { final IPart part = this.getPart( side ); - if ( part instanceof SidedEnvironment ) + if( part instanceof SidedEnvironment ) { return ( (SidedEnvironment) part ).canConnect( side ); } diff --git a/src/main/java/appeng/parts/networking/PartDenseCable.java b/src/main/java/appeng/parts/networking/PartDenseCable.java index a84f3de4b..9d767491b 100644 --- a/src/main/java/appeng/parts/networking/PartDenseCable.java +++ b/src/main/java/appeng/parts/networking/PartDenseCable.java @@ -368,33 +368,32 @@ public class PartDenseCable extends PartCable boolean isGlass = false; AEColor myColor = this.getCableColor(); /* - * ( ghh != null && partHost != null && ghh.getCableConnectionType( of ) == AECableType.GLASS && partHost.getPart( - * of.getOpposite() ) == null ) { isGlass = true; rh.setTexture( getGlassTexture( myColor = partHost.getColor() ) ); + * ( ghh != null && partHost != null && ghh.getCableConnectionType( of ) == AECableType.GLASS && + * partHost.getPart( + * of.getOpposite() ) == null ) { isGlass = true; rh.setTexture( getGlassTexture( myColor = partHost.getColor() + * ) ); * } else if ( partHost == null && ghh != null && ghh.getCableConnectionType( of ) != AECableType.GLASS ) { * rh.setTexture( getSmartTexture( myColor ) ); switch (of) { case DOWN: rh.setBounds( 3, 0, 3, 13, 4, 13 ); * break; case EAST: rh.setBounds( 12, 3, 3, 16, 13, 13 ); break; case NORTH: rh.setBounds( 3, 3, 0, 13, 13, 4 * ); break; case SOUTH: rh.setBounds( 3, 3, 12, 13, 13, 16 ); break; case UP: rh.setBounds( 3, 12, 3, 13, 16, * 13 ); break; case WEST: rh.setBounds( 0, 3, 3, 4, 13, 13 ); break; default: return; } rh.renderBlock( x, y, * z, renderer ); - * * if ( true ) { setSmartConnectionRotations( of, renderer ); IIcon firstIcon = new TaughtIcon( getChannelTex( - * channels, false ).getIcon(), -0.2f ); IIcon secondIcon = new TaughtIcon( getChannelTex( channels, true ).getIcon(), + * channels, false ).getIcon(), -0.2f ); IIcon secondIcon = new TaughtIcon( getChannelTex( channels, true + * ).getIcon(), * -0.2f ); - * * if ( of == ForgeDirection.EAST || of == ForgeDirection.WEST ) { AEBaseBlock blk = (AEBaseBlock) * rh.getBlock(); FlippableIcon ico = blk.getRendererInstance().getTexture( ForgeDirection.EAST ); ico.setFlip( * false, true ); } - * * Tessellator.INSTANCE.setBrightness( 15 << 20 | 15 << 5 ); Tessellator.INSTANCE.setColorOpaque_I( - * myColor.mediumVariant ); rh.setTexture( firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon ); renderAllFaces( (AEBaseBlock) + * myColor.mediumVariant ); rh.setTexture( firstIcon, firstIcon, firstIcon, firstIcon, firstIcon, firstIcon ); + * renderAllFaces( (AEBaseBlock) * rh.getBlock(), x, y, z, renderer ); - * - * Tessellator.INSTANCE.setColorOpaque_I( myColor.whiteVariant ); rh.setTexture( secondIcon, secondIcon, secondIcon, secondIcon, secondIcon, + * Tessellator.INSTANCE.setColorOpaque_I( myColor.whiteVariant ); rh.setTexture( secondIcon, secondIcon, + * secondIcon, secondIcon, secondIcon, * secondIcon ); renderAllFaces( (AEBaseBlock) rh.getBlock(), x, y, z, renderer ); - * * renderer.uvRotateBottom = renderer.uvRotateEast = renderer.uvRotateNorth = renderer.uvRotateSouth = * renderer.uvRotateTop = renderer.uvRotateWest = 0; } - * * rh.setTexture( getTexture( getCableColor() ) ); } */ diff --git a/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java b/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java index 5f002e7b7..87789beb9 100644 --- a/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java +++ b/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java @@ -54,7 +54,7 @@ import appeng.transformer.annotations.Integration.Interface; import appeng.transformer.annotations.Integration.InterfaceList; -@InterfaceList(value = { @Interface(iface = "li.cil.oc.api.network.Environment", iname = "OpenComputers"), @Interface(iface = "li.cil.oc.api.network.SidedEnvironment", iname = "OpenComputers") }) +@InterfaceList( value = { @Interface( iface = "li.cil.oc.api.network.Environment", iname = "OpenComputers" ), @Interface( iface = "li.cil.oc.api.network.SidedEnvironment", iname = "OpenComputers" ) } ) public final class PartP2POpenComputers extends PartP2PTunnel implements IGridTickable, Environment, SidedEnvironment { @Nullable @@ -62,17 +62,17 @@ public final class PartP2POpenComputers extends PartP2PTunnel updateCallback; - public PartP2POpenComputers(ItemStack is) + public PartP2POpenComputers( ItemStack is ) { super( is ); - if ( !IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.OpenComputers ) ) + if( !IntegrationRegistry.INSTANCE.isEnabled( IntegrationType.OpenComputers ) ) { throw new RuntimeException( "OpenComputers is not installed!" ); } // Avoid NPE when called in pre-init phase (part population). - if ( API.network != null ) + if( API.network != null ) { this.node = Network.newNode( this, Visibility.None ).create(); } @@ -85,7 +85,7 @@ public final class PartP2POpenComputers extends PartP2PTunnel itemMap = new HashMap(); - for(; idx < recipe.length; idx += 2 ) + for( ; idx < recipe.length; idx += 2 ) { Character chr = (Character) recipe[idx]; Object in = recipe[idx + 1]; @@ -271,7 +271,7 @@ public class ShapedRecipe implements IRecipe, IRecipeBakeable { return false; } - return ( target.getItem() == input.getItem() && ( target.getItemDamage() == OreDictionary.WILDCARD_VALUE || target.getItemDamage() == input.getItemDamage() ) ); + return( target.getItem() == input.getItem() && ( target.getItemDamage() == OreDictionary.WILDCARD_VALUE || target.getItemDamage() == input.getItemDamage() ) ); } public ShapedRecipe setMirrored( boolean mirror ) diff --git a/src/main/java/appeng/recipes/game/ShapelessRecipe.java b/src/main/java/appeng/recipes/game/ShapelessRecipe.java index 0d599994c..60c730f8a 100644 --- a/src/main/java/appeng/recipes/game/ShapelessRecipe.java +++ b/src/main/java/appeng/recipes/game/ShapelessRecipe.java @@ -146,7 +146,7 @@ public class ShapelessRecipe implements IRecipe, IRecipeBakeable private boolean checkItemEquals( ItemStack target, ItemStack input ) { - return ( target.getItem() == input.getItem() && ( target.getItemDamage() == OreDictionary.WILDCARD_VALUE || target.getItemDamage() == input.getItemDamage() ) ); + return( target.getItem() == input.getItem() && ( target.getItemDamage() == OreDictionary.WILDCARD_VALUE || target.getItemDamage() == input.getItemDamage() ) ); } /** diff --git a/src/main/java/appeng/recipes/handlers/Inscribe.java b/src/main/java/appeng/recipes/handlers/Inscribe.java index 46523b10e..a51bf9c98 100644 --- a/src/main/java/appeng/recipes/handlers/Inscribe.java +++ b/src/main/java/appeng/recipes/handlers/Inscribe.java @@ -46,11 +46,11 @@ public final class Inscribe extends InscriberProcess @Override public void register() throws RegistrationError, MissingIngredientError { - if ( this.getImprintable() == null ) + if( this.getImprintable() == null ) { return; } - if ( this.getOutput() == null ) + if( this.getOutput() == null ) { return; } @@ -58,8 +58,8 @@ public final class Inscribe extends InscriberProcess final ItemStack[] realInput = this.getImprintable().getItemStackSet(); final List inputs = new ArrayList( realInput.length ); Collections.addAll( inputs, realInput ); - final ItemStack top = (this.getTopOptional() == null) ? null : this.getTopOptional().getItemStack(); - final ItemStack bot = (this.getBotOptional() == null) ? null : this.getBotOptional().getItemStack(); + final ItemStack top = ( this.getTopOptional() == null ) ? null : this.getTopOptional().getItemStack(); + final ItemStack bot = ( this.getBotOptional() == null ) ? null : this.getBotOptional().getItemStack(); final ItemStack output = this.getOutput().getItemStack(); final InscriberProcessType type = InscriberProcessType.Inscribe; diff --git a/src/main/java/appeng/recipes/handlers/InscriberProcess.java b/src/main/java/appeng/recipes/handlers/InscriberProcess.java index 15068bb13..f04928ab1 100644 --- a/src/main/java/appeng/recipes/handlers/InscriberProcess.java +++ b/src/main/java/appeng/recipes/handlers/InscriberProcess.java @@ -1,3 +1,4 @@ + package appeng.recipes.handlers; @@ -78,7 +79,7 @@ public abstract class InscriberProcess implements ICraftHandler, IWebsiteSeriali { String pattern = "inscriber "; - if ( this.output != null ) + if( this.output != null ) { pattern += this.output.getQty() + '\n'; pattern += handler.getName( this.output ) + '\n'; @@ -89,7 +90,7 @@ public abstract class InscriberProcess implements ICraftHandler, IWebsiteSeriali pattern += handler.getName( this.topOptional ) + '\n'; } - if ( this.imprintable != null ) + if( this.imprintable != null ) { pattern += handler.getName( this.imprintable ); } diff --git a/src/main/java/appeng/recipes/handlers/Press.java b/src/main/java/appeng/recipes/handlers/Press.java index ccbdb530e..e07956e43 100644 --- a/src/main/java/appeng/recipes/handlers/Press.java +++ b/src/main/java/appeng/recipes/handlers/Press.java @@ -46,11 +46,11 @@ public final class Press extends InscriberProcess @Override public void register() throws RegistrationError, MissingIngredientError { - if ( this.getImprintable() == null ) + if( this.getImprintable() == null ) { return; } - if ( this.getOutput() == null ) + if( this.getOutput() == null ) { return; } diff --git a/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java b/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java index ffdbea6c1..80973c9b3 100644 --- a/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java +++ b/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java @@ -78,9 +78,9 @@ public class RecipeResourceCopier * * @param destination destination folder to which the recipes are copied to * - * @throws URISyntaxException {@see #getResourceListing} - * @throws IOException {@see #getResourceListing} and if copying the detected resource to file is not possible - * @throws NullPointerException if either parameter is null + * @throws URISyntaxException {@see #getResourceListing} + * @throws IOException {@see #getResourceListing} and if copying the detected resource to file is not possible + * @throws NullPointerException if either parameter is null * @throws IllegalArgumentException if destination is not a directory */ public void copyTo( @Nonnull File destination ) throws URISyntaxException, IOException @@ -113,12 +113,12 @@ public class RecipeResourceCopier * Works for regular files and also JARs. * * @param clazz Any java class that lives in the same place as the resources you want. - * @param path Should end with "/", but not start with one. + * @param path Should end with "/", but not start with one. * * @return Just the name of each member item, not the full paths. * - * @throws URISyntaxException if it is a file path and the URL can not be converted to URI - * @throws IOException if jar path can not be decoded + * @throws URISyntaxException if it is a file path and the URL can not be converted to URI + * @throws IOException if jar path can not be decoded * @throws UnsupportedOperationException if it is neither in jar nor in file path */ @Nonnull @@ -136,28 +136,31 @@ public class RecipeResourceCopier if( dirURL == null ) { - /* - * In case of a jar file, we can't actually find a directory. - * Have to assume the same jar as clazz. - */ + /* + * In case of a jar file, we can't actually find a directory. + * Have to assume the same jar as clazz. + */ final String me = DOT_COMPILE_PATTERN.matcher( clazz.getName() ).replaceAll( "/" ) + ".class"; dirURL = clazz.getClassLoader().getResource( me ); } if( dirURL != null && dirURL.getProtocol().equals( "jar" ) ) { - /* A JAR path */ - final String jarPath = dirURL.getPath().substring( 5, dirURL.getPath().indexOf( '!' ) ); //strip out only the JAR file + /* A JAR path */ + final String jarPath = dirURL.getPath().substring( 5, dirURL.getPath().indexOf( '!' ) ); // strip out only + // the JAR file final JarFile jar = new JarFile( URLDecoder.decode( jarPath, "UTF-8" ) ); try { - final Enumeration entries = jar.entries(); //gives ALL entries in jar - final Collection result = new HashSet( INITIAL_RESOURCE_CAPACITY ); //avoid duplicates in case it is a subdirectory + final Enumeration entries = jar.entries(); // gives ALL entries in jar + final Collection result = new HashSet( INITIAL_RESOURCE_CAPACITY ); // avoid duplicates + // in case it is a + // subdirectory while( entries.hasMoreElements() ) { final String name = entries.nextElement().getName(); if( name.startsWith( path ) ) - { //filter according to the path + { // filter according to the path String entry = name.substring( path.length() ); final int checkSubDir = entry.indexOf( '/' ); if( checkSubDir >= 0 ) diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 255049eeb..93bede4d2 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -220,7 +220,6 @@ public final class CompassService } } - private class CMDirectionRequest implements Runnable { diff --git a/src/main/java/appeng/services/VersionChecker.java b/src/main/java/appeng/services/VersionChecker.java index c6a37a2eb..2a1b09240 100644 --- a/src/main/java/appeng/services/VersionChecker.java +++ b/src/main/java/appeng/services/VersionChecker.java @@ -91,7 +91,7 @@ public final class VersionChecker implements Runnable /** * checks if enough time since last check has expired * - * @param nowInMs now in milli seconds + * @param nowInMs now in milli seconds * @param lastAfterInterval last version check including the interval defined in the config */ private void processInterval( long nowInMs, long lastAfterInterval ) @@ -118,7 +118,7 @@ public final class VersionChecker implements Runnable * Checks if the retrieved version is newer as the current mod version. * Will notify player if config is enabled. * - * @param modVersion version of mod + * @param modVersion version of mod * @param githubRelease release retrieved through github */ private void processVersions( Version modVersion, FormattedRelease githubRelease ) @@ -153,8 +153,8 @@ public final class VersionChecker implements Runnable * Checks if the version checker mod is installed and handles it depending on that information * * @param modFormatted mod version formatted as rv2-beta-8 - * @param ghFormatted retrieved github version formatted as rv2-beta-8 - * @param changelog retrieved github changelog + * @param ghFormatted retrieved github version formatted as rv2-beta-8 + * @param changelog retrieved github changelog */ private void interactWithVersionCheckerMod( String modFormatted, String ghFormatted, String changelog ) { diff --git a/src/main/java/appeng/services/compass/CompassRegion.java b/src/main/java/appeng/services/compass/CompassRegion.java index be51e99f6..bfbf7b290 100644 --- a/src/main/java/appeng/services/compass/CompassRegion.java +++ b/src/main/java/appeng/services/compass/CompassRegion.java @@ -87,7 +87,7 @@ public final class CompassRegion private File getFile() { - final String fileName = this.encoder.encode( this.world, this.lowX, this.lowZ); + final String fileName = this.encoder.encode( this.world, this.lowX, this.lowZ ); return new File( this.worldCompassFolder, fileName ); } diff --git a/src/main/java/appeng/services/compass/ICompassCallback.java b/src/main/java/appeng/services/compass/ICompassCallback.java index 8eb5d1500..06cf52d38 100644 --- a/src/main/java/appeng/services/compass/ICompassCallback.java +++ b/src/main/java/appeng/services/compass/ICompassCallback.java @@ -26,9 +26,9 @@ public interface ICompassCallback * Called from another thread. * * @param hasResult true if found a target - * @param spin true if should spin - * @param radians radians - * @param dist distance + * @param spin true if should spin + * @param radians radians + * @param dist distance */ void calculatedDirection( boolean hasResult, boolean spin, double radians, double dist ); } diff --git a/src/main/java/appeng/services/version/BaseVersion.java b/src/main/java/appeng/services/version/BaseVersion.java index 3384a3001..f174067a3 100644 --- a/src/main/java/appeng/services/version/BaseVersion.java +++ b/src/main/java/appeng/services/version/BaseVersion.java @@ -1,3 +1,4 @@ + package appeng.services.version; @@ -14,8 +15,8 @@ public abstract class BaseVersion implements Version /** * @param revision revision in natural number - * @param channel channel - * @param build build in natural number + * @param channel channel + * @param build build in natural number * * @throws AssertionError if assertion are enabled and revision or build are not natural numbers */ diff --git a/src/main/java/appeng/services/version/DefaultVersion.java b/src/main/java/appeng/services/version/DefaultVersion.java index 3c0ad5f3a..4d61b8b2e 100644 --- a/src/main/java/appeng/services/version/DefaultVersion.java +++ b/src/main/java/appeng/services/version/DefaultVersion.java @@ -1,3 +1,4 @@ + package appeng.services.version; @@ -9,8 +10,8 @@ public final class DefaultVersion extends BaseVersion { /** * @param revision natural number - * @param channel either alpha, beta or release - * @param build natural number + * @param channel either alpha, beta or release + * @param build natural number */ public DefaultVersion( int revision, Channel channel, int build ) { diff --git a/src/main/java/appeng/services/version/MissingVersion.java b/src/main/java/appeng/services/version/MissingVersion.java index bf0a62986..bf0d5e94d 100644 --- a/src/main/java/appeng/services/version/MissingVersion.java +++ b/src/main/java/appeng/services/version/MissingVersion.java @@ -1,3 +1,4 @@ + package appeng.services.version; diff --git a/src/main/java/appeng/services/version/ModVersionFetcher.java b/src/main/java/appeng/services/version/ModVersionFetcher.java index a687226a1..9594c657d 100644 --- a/src/main/java/appeng/services/version/ModVersionFetcher.java +++ b/src/main/java/appeng/services/version/ModVersionFetcher.java @@ -1,3 +1,4 @@ + package appeng.services.version; diff --git a/src/main/java/appeng/services/version/VersionFetcher.java b/src/main/java/appeng/services/version/VersionFetcher.java index d70fed83e..7eb7e6a2d 100644 --- a/src/main/java/appeng/services/version/VersionFetcher.java +++ b/src/main/java/appeng/services/version/VersionFetcher.java @@ -1,3 +1,4 @@ + package appeng.services.version; diff --git a/src/main/java/appeng/services/version/github/DefaultFormattedRelease.java b/src/main/java/appeng/services/version/github/DefaultFormattedRelease.java index 1d63a0e48..06aa4efee 100644 --- a/src/main/java/appeng/services/version/github/DefaultFormattedRelease.java +++ b/src/main/java/appeng/services/version/github/DefaultFormattedRelease.java @@ -1,3 +1,4 @@ + package appeng.services.version.github; diff --git a/src/main/java/appeng/services/version/github/FormattedRelease.java b/src/main/java/appeng/services/version/github/FormattedRelease.java index 3bf1a3332..31c75e9b5 100644 --- a/src/main/java/appeng/services/version/github/FormattedRelease.java +++ b/src/main/java/appeng/services/version/github/FormattedRelease.java @@ -1,3 +1,4 @@ + package appeng.services.version.github; diff --git a/src/main/java/appeng/services/version/github/MissingFormattedRelease.java b/src/main/java/appeng/services/version/github/MissingFormattedRelease.java index 941bdac53..318a73380 100644 --- a/src/main/java/appeng/services/version/github/MissingFormattedRelease.java +++ b/src/main/java/appeng/services/version/github/MissingFormattedRelease.java @@ -1,3 +1,4 @@ + package appeng.services.version.github; diff --git a/src/main/java/appeng/services/version/github/Release.java b/src/main/java/appeng/services/version/github/Release.java index 3d703b960..dec7ec5ec 100644 --- a/src/main/java/appeng/services/version/github/Release.java +++ b/src/main/java/appeng/services/version/github/Release.java @@ -1,3 +1,4 @@ + package appeng.services.version.github; diff --git a/src/main/java/appeng/services/version/github/ReleaseFetcher.java b/src/main/java/appeng/services/version/github/ReleaseFetcher.java index 8efee900d..b6ae47629 100644 --- a/src/main/java/appeng/services/version/github/ReleaseFetcher.java +++ b/src/main/java/appeng/services/version/github/ReleaseFetcher.java @@ -1,3 +1,4 @@ + package appeng.services.version.github; diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index 90d4ab059..ded65fcba 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/src/main/java/appeng/spatial/StorageHelper.java @@ -58,7 +58,7 @@ public class StorageHelper * Mostly from dimensional doors.. which mostly got it form X-Comp. * * @param entity to be teleported entity - * @param link destination + * @param link destination * * @return teleported entity */ @@ -207,7 +207,9 @@ public class StorageHelper } } - public void swapRegions( World src /** over world **/, World dst /** storage cell **/, int x, int y, int z, int i, int j, int k, int scaleX, int scaleY, int scaleZ ) + public void swapRegions( World src /** over world **/ + , World dst /** storage cell **/ + , int x, int y, int z, int i, int j, int k, int scaleX, int scaleY, int scaleZ ) { for( Block matrixFrameBlock : AEApi.instance().definitions().blocks().matrixFrame().maybeBlock().asSet() ) { @@ -254,9 +256,9 @@ public class StorageHelper this.transverseEdges( i, j, k, i + scaleX, j + scaleY, k + scaleZ, new TriggerUpdates( dst ) ); /* - * IChunkProvider cp = destination.getChunkProvider(); if ( cp instanceof ChunkProviderServer ) { ChunkProviderServer + * IChunkProvider cp = destination.getChunkProvider(); if ( cp instanceof ChunkProviderServer ) { + * ChunkProviderServer * srv = (ChunkProviderServer) cp; srv.unloadAllChunks(); } - * * cp.unloadQueuedChunks(); */ @@ -280,7 +282,6 @@ public class StorageHelper } } - static class WrapInMatrixFrame implements ISpatialVisitor { @@ -302,7 +303,6 @@ public class StorageHelper } } - static class TelDestination { @@ -326,7 +326,6 @@ public class StorageHelper } } - static class METeleporter extends Teleporter { diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index 0e96b1bd5..ffd73d828 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -349,7 +349,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, final Class clazz = this.getClass(); final Map> storedHandlers = HANDLERS.get( clazz ); - if ( storedHandlers == null ) + if( storedHandlers == null ) { final Map> newStoredHandlers = new EnumMap>( TileEventType.class ); @@ -373,7 +373,8 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, } @Nonnull - private List getHandlers( Map> eventToHandlers, TileEventType event ) { + private List getHandlers( Map> eventToHandlers, TileEventType event ) + { final List oldHandlers = eventToHandlers.get( event ); if( oldHandlers == null ) @@ -434,7 +435,7 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, /** * depending on the from, different settings will be accepted, don't call this with null * - * @param from source of settings + * @param from source of settings * @param compound compound of source */ public void uploadSettings( SettingsFrom from, NBTTagCompound compound ) @@ -473,10 +474,10 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, /** * returns the contents of the tile entity, into the world, defaults to dropping everything in the inventory. * - * @param w world - * @param x x pos of tile entity - * @param y y pos of tile entity - * @param z z pos of tile entity + * @param w world + * @param x x pos of tile entity + * @param y y pos of tile entity + * @param z z pos of tile entity * @param drops drops of tile entity */ @Override diff --git a/src/main/java/appeng/tile/misc/TileCellWorkbench.java b/src/main/java/appeng/tile/misc/TileCellWorkbench.java index b6001d89a..fdefc8ba2 100644 --- a/src/main/java/appeng/tile/misc/TileCellWorkbench.java +++ b/src/main/java/appeng/tile/misc/TileCellWorkbench.java @@ -96,7 +96,7 @@ public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, I if( this.cell.getStackInSlot( 0 ).getItem() instanceof ICellWorkbenchItem ) { - return ( (ICellWorkbenchItem) this.cell.getStackInSlot( 0 ).getItem() ); + return( (ICellWorkbenchItem) this.cell.getStackInSlot( 0 ).getItem() ); } return null; diff --git a/src/main/java/appeng/tile/misc/TileInscriber.java b/src/main/java/appeng/tile/misc/TileInscriber.java index c64cd0e05..ef1cf1e0a 100644 --- a/src/main/java/appeng/tile/misc/TileInscriber.java +++ b/src/main/java/appeng/tile/misc/TileInscriber.java @@ -398,10 +398,10 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable, { boolean matchA = ( plateA == null && !recipe.getTopOptional().isPresent() ) || ( Platform.isSameItemPrecise( plateA, recipe.getTopOptional().orNull() ) ) && // and... - ( plateB == null && !recipe.getBottomOptional().isPresent() ) | ( Platform.isSameItemPrecise( plateB, recipe.getBottomOptional().orNull() ) ); + ( plateB == null && !recipe.getBottomOptional().isPresent() ) | ( Platform.isSameItemPrecise( plateB, recipe.getBottomOptional().orNull() ) ); boolean matchB = ( plateB == null && !recipe.getTopOptional().isPresent() ) || ( Platform.isSameItemPrecise( plateB, recipe.getTopOptional().orNull() ) ) && // and... - ( plateA == null && !recipe.getBottomOptional().isPresent() ) | ( Platform.isSameItemPrecise( plateA, recipe.getBottomOptional().orNull() ) ); + ( plateA == null && !recipe.getBottomOptional().isPresent() ) | ( Platform.isSameItemPrecise( plateA, recipe.getBottomOptional().orNull() ) ); if( matchA || matchB ) { diff --git a/src/main/java/appeng/tile/misc/TileVibrationChamber.java b/src/main/java/appeng/tile/misc/TileVibrationChamber.java index 1e0830579..8922445ac 100644 --- a/src/main/java/appeng/tile/misc/TileVibrationChamber.java +++ b/src/main/java/appeng/tile/misc/TileVibrationChamber.java @@ -289,7 +289,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka this.isOn = this.burnTime > 0; this.markForUpdate(); - if ( this.hasWorldObj() ) + if( this.hasWorldObj() ) { Platform.notifyBlocksOfNeighbors( this.worldObj, this.xCoord, this.yCoord, this.zCoord ); } diff --git a/src/main/java/appeng/tile/networking/TileCableBus.java b/src/main/java/appeng/tile/networking/TileCableBus.java index a083ce179..6f9e2a8c4 100644 --- a/src/main/java/appeng/tile/networking/TileCableBus.java +++ b/src/main/java/appeng/tile/networking/TileCableBus.java @@ -279,7 +279,9 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl public boolean isBlocked( ForgeDirection side ) { return !this.ImmibisMicroblocks_isSideOpen( side.ordinal() ); - } @Override + } + + @Override public Iterable getSelectedBoundingBoxesFromPool( World w, int x, int y, int z, Entity e, boolean visual ) { return this.cb.getSelectedBoundingBoxesFromPool( false, true, e, visual ); @@ -334,7 +336,9 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl } this.getWorldObj().setBlock( this.xCoord, this.yCoord, this.zCoord, Platform.AIR_BLOCK ); - } @Override + } + + @Override public void addCollidingBlockToList( World w, int x, int y, int z, AxisAlignedBB bb, List out, Entity e ) { for( AxisAlignedBB bx : this.getSelectedBoundingBoxesFromPool( w, x, y, z, e, false ) ) @@ -374,7 +378,4 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl return this.cb.recolourBlock( side, colour, who ); } - - - } diff --git a/src/main/java/appeng/tile/powersink/RotaryCraft.java b/src/main/java/appeng/tile/powersink/RotaryCraft.java index 3a708168e..ececfaa84 100644 --- a/src/main/java/appeng/tile/powersink/RotaryCraft.java +++ b/src/main/java/appeng/tile/powersink/RotaryCraft.java @@ -34,7 +34,8 @@ import appeng.transformer.annotations.Integration.Interface; import appeng.transformer.annotations.Integration.InterfaceList; import appeng.transformer.annotations.Integration.Method; -@InterfaceList( value = { @Interface( iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.Power.AdvancedShaftPowerReceiver" ), @Interface( iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.Interfaces.Transducerable") } ) + +@InterfaceList( value = { @Interface( iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.Power.AdvancedShaftPowerReceiver" ), @Interface( iname = "RotaryCraft", iface = "Reika.RotaryCraft.API.Interfaces.Transducerable" ) } ) public abstract class RotaryCraft extends IC2 implements AdvancedShaftPowerReceiver, Transducerable { @@ -176,7 +177,6 @@ public abstract class RotaryCraft extends IC2 implements AdvancedShaftPowerRecei out = String.format( "Receiving %d W @ %d rad/s.", power, omega ); } - ArrayList messages = new ArrayList( 1 ); messages.add( out ); return messages; diff --git a/src/main/java/appeng/tile/powersink/UniversalElectricity.java b/src/main/java/appeng/tile/powersink/UniversalElectricity.java index a10579618..86f027735 100644 --- a/src/main/java/appeng/tile/powersink/UniversalElectricity.java +++ b/src/main/java/appeng/tile/powersink/UniversalElectricity.java @@ -18,66 +18,57 @@ package appeng.tile.powersink; + /* -import net.minecraftforge.common.util.ForgeDirection; -import universalelectricity.core.block.IElectrical; -import universalelectricity.core.electricity.ElectricityPack; -import appeng.api.config.PowerUnits; - -public abstract class UniversalElectricity extends ThermalExpansion implements IElectrical -{ - - @Override - public final boolean canConnect(ForgeDirection direction) - { - return internalCanAcceptPower && getPowerSides().contains( direction ); - } - - @Override - public final float receiveElectricity(ForgeDirection from, ElectricityPack receive, boolean doReceive) - { - float accepted = 0; - double receivedPower = receive.getWatts(); - - if ( doReceive ) - { - accepted = (float) (receivedPower - injectExternalPower( PowerUnits.KJ, receivedPower )); - } - else - { - double whatIWant = getExternalPowerDemand( PowerUnits.KJ ); - if ( whatIWant > receivedPower ) - accepted = (float) receivedPower; - else - accepted = (float) whatIWant; - } - - return accepted; - } - - @Override - public final float getRequest(ForgeDirection direction) - { - return (float) getExternalPowerDemand( PowerUnits.KJ ); - } - - @Override - public final float getVoltage() - { - return 120; - } - - @Override - public final ElectricityPack provideElectricity(ForgeDirection from, ElectricityPack request, boolean doProvide) - { - return null; // cannot be dis-charged - } - - @Override - public final float getProvide(ForgeDirection direction) - { - return 0; - } - -} -*/ \ No newline at end of file + * import net.minecraftforge.common.util.ForgeDirection; + * import universalelectricity.core.block.IElectrical; + * import universalelectricity.core.electricity.ElectricityPack; + * import appeng.api.config.PowerUnits; + * public abstract class UniversalElectricity extends ThermalExpansion implements IElectrical + * { + * @Override + * public final boolean canConnect(ForgeDirection direction) + * { + * return internalCanAcceptPower && getPowerSides().contains( direction ); + * } + * @Override + * public final float receiveElectricity(ForgeDirection from, ElectricityPack receive, boolean doReceive) + * { + * float accepted = 0; + * double receivedPower = receive.getWatts(); + * if ( doReceive ) + * { + * accepted = (float) (receivedPower - injectExternalPower( PowerUnits.KJ, receivedPower )); + * } + * else + * { + * double whatIWant = getExternalPowerDemand( PowerUnits.KJ ); + * if ( whatIWant > receivedPower ) + * accepted = (float) receivedPower; + * else + * accepted = (float) whatIWant; + * } + * return accepted; + * } + * @Override + * public final float getRequest(ForgeDirection direction) + * { + * return (float) getExternalPowerDemand( PowerUnits.KJ ); + * } + * @Override + * public final float getVoltage() + * { + * return 120; + * } + * @Override + * public final ElectricityPack provideElectricity(ForgeDirection from, ElectricityPack request, boolean doProvide) + * { + * return null; // cannot be dis-charged + * } + * @Override + * public final float getProvide(ForgeDirection direction) + * { + * return 0; + * } + * } + */ \ No newline at end of file diff --git a/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java b/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java index 105b5eeba..525eddb35 100644 --- a/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java +++ b/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java @@ -179,7 +179,7 @@ public class TileSpatialIOPort extends AENetworkInvTile implements Callable @Override public boolean isItemValidForSlot( int i, ItemStack itemstack ) { - return ( i == 0 && this.isSpatialCell( itemstack ) ); + return( i == 0 && this.isSpatialCell( itemstack ) ); } @Override diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index 1fb1bd090..41718fc35 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -866,7 +866,6 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan private static final long serialVersionUID = 7995805326136526631L; } - class ChestNetNotifier> implements IMEMonitorHandlerReceiver { @@ -919,7 +918,6 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan } } - class ChestMonitorHandler extends MEMonitorHandler { diff --git a/src/main/java/appeng/tile/storage/TileIOPort.java b/src/main/java/appeng/tile/storage/TileIOPort.java index 554161c36..9d5802425 100644 --- a/src/main/java/appeng/tile/storage/TileIOPort.java +++ b/src/main/java/appeng/tile/storage/TileIOPort.java @@ -555,10 +555,10 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC /** * Adds the items in the upgrade slots to the drop list. * - * @param w world - * @param x x pos of tile entity - * @param y y pos of tile entity - * @param z z pos of tile entity + * @param w world + * @param x x pos of tile entity + * @param y y pos of tile entity + * @param z z pos of tile entity * @param drops drops of tile entity */ @Override diff --git a/src/main/java/appeng/transformer/annotations/Integration.java b/src/main/java/appeng/transformer/annotations/Integration.java index 3410d42f9..654e2dac8 100644 --- a/src/main/java/appeng/transformer/annotations/Integration.java +++ b/src/main/java/appeng/transformer/annotations/Integration.java @@ -34,7 +34,6 @@ public @interface Integration Interface[] value(); } - @Retention( RetentionPolicy.RUNTIME ) @Target( ElementType.TYPE ) @interface Interface @@ -44,7 +43,6 @@ public @interface Integration String iname(); } - @Retention( RetentionPolicy.RUNTIME ) @Target( ElementType.METHOD ) @interface Method diff --git a/src/main/java/appeng/util/ISlimReadableNumberConverter.java b/src/main/java/appeng/util/ISlimReadableNumberConverter.java index 8c9a75d9a..6db905727 100644 --- a/src/main/java/appeng/util/ISlimReadableNumberConverter.java +++ b/src/main/java/appeng/util/ISlimReadableNumberConverter.java @@ -1,3 +1,4 @@ + package appeng.util; diff --git a/src/main/java/appeng/util/IWideReadableNumberConverter.java b/src/main/java/appeng/util/IWideReadableNumberConverter.java index b3fae6c2e..1ca7fd3fd 100644 --- a/src/main/java/appeng/util/IWideReadableNumberConverter.java +++ b/src/main/java/appeng/util/IWideReadableNumberConverter.java @@ -1,3 +1,4 @@ + package appeng.util; diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 44f7cbb73..d8c6baece 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -175,7 +175,7 @@ public class Platform /** * This displays the value for encoded longs ( double *100 ) * - * @param n to be formatted long value + * @param n to be formatted long value * @param isRate if true it adds a /t to the formatted string * * @return formatted long value @@ -1306,13 +1306,10 @@ public class Platform /* * // test ore dictionary.. int OreID = getOreID( a ); if ( OreID != -1 ) return OreID == getOreID( b ); - * * if ( Mode != FuzzyMode.IGNORE_ALL ) { if ( a.hasTagCompound() && !isShared( a.getTagCompound() ) ) { a = * Platform.getSharedItemStack( AEItemStack.create( a ) ); } - * * if ( b.hasTagCompound() && !isShared( b.getTagCompound() ) ) { b = Platform.getSharedItemStack( * AEItemStack.create( b ) ); } - * * // test regular items with damage values and what not... if ( isShared( a.getTagCompound() ) && isShared( * b.getTagCompound() ) && a.itemID == b.itemID ) { return ((AppEngSharedNBTTagCompound) * a.getTagCompound()).compareFuzzyWithRegistry( (AppEngSharedNBTTagCompound) b.getTagCompound() ); } } diff --git a/src/main/java/appeng/util/ReadableNumberConverter.java b/src/main/java/appeng/util/ReadableNumberConverter.java index 91ae1e19d..677873c2b 100644 --- a/src/main/java/appeng/util/ReadableNumberConverter.java +++ b/src/main/java/appeng/util/ReadableNumberConverter.java @@ -1,3 +1,4 @@ + package appeng.util; @@ -54,7 +55,7 @@ public enum ReadableNumberConverter implements ISlimReadableNumberConverter, IWi * restricts a string representation of a number to a specific width * * @param number to be formatted number - * @param width width limitation of the resulting number + * @param width width limitation of the resulting number * * @return formatted number restricted by the width limitation */ diff --git a/src/main/java/appeng/util/inv/AdaptorIInventory.java b/src/main/java/appeng/util/inv/AdaptorIInventory.java index 309255b16..355be0afc 100644 --- a/src/main/java/appeng/util/inv/AdaptorIInventory.java +++ b/src/main/java/appeng/util/inv/AdaptorIInventory.java @@ -254,7 +254,7 @@ public class AdaptorIInventory extends InventoryAdaptor * than the limit. * * @param itemsToAdd itemStack to add to the inventory - * @param modulate true to modulate, false for simulate + * @param modulate true to modulate, false for simulate * * @return the left itemstack, which could not be added */ diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java index 62e059f96..b2d57de84 100644 --- a/src/main/java/appeng/util/item/AEItemStack.java +++ b/src/main/java/appeng/util/item/AEItemStack.java @@ -87,7 +87,6 @@ public final class AEItemStack extends AEStack implements IAEItemS /* * Super hackery. - * * is.itemID = appeng.api.Materials.matQuartz.itemID; damageValue = is.getItemDamage(); is.itemID = itemID; */ @@ -478,7 +477,8 @@ public final class AEItemStack extends AEStack implements IAEItemS { if( ia instanceof AEItemStack ) { - return ( (AEItemStack) ia ).def.equals( this.def );// && def.tagCompound == ((AEItemStack) ia).def.tagCompound; + return ( (AEItemStack) ia ).def.equals( this.def );// && def.tagCompound == ((AEItemStack) + // ia).def.tagCompound; } else if( ia instanceof ItemStack ) { diff --git a/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java b/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java index 7ab8a636d..e783d74ef 100644 --- a/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java +++ b/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java @@ -1,3 +1,4 @@ + package appeng.worldgen.meteorite; diff --git a/src/main/java/appeng/worldgen/meteorite/Fallout.java b/src/main/java/appeng/worldgen/meteorite/Fallout.java index 12fca12d2..da61a172d 100644 --- a/src/main/java/appeng/worldgen/meteorite/Fallout.java +++ b/src/main/java/appeng/worldgen/meteorite/Fallout.java @@ -1,3 +1,4 @@ + package appeng.worldgen.meteorite; diff --git a/src/main/java/appeng/worldgen/meteorite/FalloutCopy.java b/src/main/java/appeng/worldgen/meteorite/FalloutCopy.java index 3e9e378df..33290a2db 100644 --- a/src/main/java/appeng/worldgen/meteorite/FalloutCopy.java +++ b/src/main/java/appeng/worldgen/meteorite/FalloutCopy.java @@ -1,3 +1,4 @@ + package appeng.worldgen.meteorite; diff --git a/src/main/java/appeng/worldgen/meteorite/FalloutSand.java b/src/main/java/appeng/worldgen/meteorite/FalloutSand.java index c9a08877b..290880a68 100644 --- a/src/main/java/appeng/worldgen/meteorite/FalloutSand.java +++ b/src/main/java/appeng/worldgen/meteorite/FalloutSand.java @@ -1,3 +1,4 @@ + package appeng.worldgen.meteorite; diff --git a/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java b/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java index a6e853022..6353f93a4 100644 --- a/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java +++ b/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java @@ -1,3 +1,4 @@ + package appeng.worldgen.meteorite; diff --git a/src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java b/src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java index 34eda3de2..8016c8d40 100644 --- a/src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java +++ b/src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java @@ -1,3 +1,4 @@ + package appeng.worldgen.meteorite; diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java index 7e3a679e3..f7278e00f 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java @@ -1,3 +1,4 @@ + package appeng.worldgen.meteorite; diff --git a/src/main/java/appeng/worldgen/meteorite/StandardWorld.java b/src/main/java/appeng/worldgen/meteorite/StandardWorld.java index 634942d33..7ca02b4a0 100644 --- a/src/main/java/appeng/worldgen/meteorite/StandardWorld.java +++ b/src/main/java/appeng/worldgen/meteorite/StandardWorld.java @@ -1,3 +1,4 @@ + package appeng.worldgen.meteorite;