diff --git a/src/api/java/appeng/api/config/Upgrades.java b/src/api/java/appeng/api/config/Upgrades.java index 8a3303ec1..228b7b5c8 100644 --- a/src/api/java/appeng/api/config/Upgrades.java +++ b/src/api/java/appeng/api/config/Upgrades.java @@ -37,12 +37,16 @@ public enum Upgrades /** * Gold Tier Upgrades. */ - CAPACITY( 0 ), REDSTONE( 0 ), CRAFTING( 0 ), + CAPACITY( 0 ), + REDSTONE( 0 ), + CRAFTING( 0 ), /** * Diamond Tier Upgrades. */ - FUZZY( 1 ), SPEED( 1 ), INVERTER( 1 ); + FUZZY( 1 ), + SPEED( 1 ), + INVERTER( 1 ); private final int tier; private final Map supportedMax = new HashMap<>(); diff --git a/src/api/java/appeng/api/definitions/IParts.java b/src/api/java/appeng/api/definitions/IParts.java index 392d381f9..3b58f9c66 100644 --- a/src/api/java/appeng/api/definitions/IParts.java +++ b/src/api/java/appeng/api/definitions/IParts.java @@ -121,6 +121,6 @@ public interface IParts IItemDefinition fluidLevelEmitter(); IItemDefinition fluidAnnihilationPlane(); - + IItemDefinition fluidFormationnPlane(); } diff --git a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java index a44eb77d8..4f50b54d2 100644 --- a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java +++ b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java @@ -47,7 +47,9 @@ public interface IP2PTunnelRegistry * @param type - the type of tunnel. Nullable, but then ignored */ void addNewAttunement( @Nonnull ItemStack trigger, @Nullable TunnelType type ); + void addNewAttunement( @Nonnull String ModId, @Nullable TunnelType type ); + void addNewAttunement( @Nonnull Capability cap, @Nullable TunnelType type ); /** diff --git a/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java b/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java index 078ac8e96..ea0a2e774 100644 --- a/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java +++ b/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java @@ -35,6 +35,6 @@ import appeng.api.networking.IGridHost; public interface INetworkTool extends IGuiItemObject { IGridHost getGridHost(); // null for most purposes. - + IItemHandler getInventory(); } diff --git a/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java b/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java index 50ee03974..3f034b33e 100644 --- a/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java +++ b/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java @@ -23,6 +23,7 @@ package appeng.api.implementations.tiles; + import net.minecraftforge.items.IItemHandler; diff --git a/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java b/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java index 3a932a5ff..d3aa6582f 100644 --- a/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java +++ b/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java @@ -23,6 +23,7 @@ package appeng.api.implementations.tiles; + import net.minecraftforge.items.IItemHandler; diff --git a/src/api/java/appeng/api/package-info.java b/src/api/java/appeng/api/package-info.java index a703183e5..e00d75a70 100644 --- a/src/api/java/appeng/api/package-info.java +++ b/src/api/java/appeng/api/package-info.java @@ -1,3 +1,4 @@ + /* * The MIT License (MIT) * diff --git a/src/api/java/appeng/api/parts/IPartHost.java b/src/api/java/appeng/api/parts/IPartHost.java index 0f8c26e4a..a8e0c8581 100644 --- a/src/api/java/appeng/api/parts/IPartHost.java +++ b/src/api/java/appeng/api/parts/IPartHost.java @@ -72,7 +72,7 @@ public interface IPartHost extends ICustomCableConnection * @return null if the item failed to add, the side it was placed on other wise ( may different for cables, * {@link AEPartLocation}.UNKNOWN ) */ - AEPartLocation addPart( ItemStack is, AEPartLocation side, EntityPlayer owner, EnumHand hand ); + AEPartLocation addPart( ItemStack is, AEPartLocation side, EntityPlayer owner, EnumHand hand ); /** * Get part by side ( center is {@link AEPartLocation}.UNKNOWN ) diff --git a/src/api/java/appeng/api/parts/LayerFlags.java b/src/api/java/appeng/api/parts/LayerFlags.java index 89e635933..1995a5aa9 100644 --- a/src/api/java/appeng/api/parts/LayerFlags.java +++ b/src/api/java/appeng/api/parts/LayerFlags.java @@ -23,6 +23,7 @@ package appeng.api.parts; + /** * TODO: Consider removing and replacing with capabilities. */ diff --git a/src/api/java/appeng/api/recipes/ICraftHandler.java b/src/api/java/appeng/api/recipes/ICraftHandler.java index 6e9554f27..4f57f958c 100644 --- a/src/api/java/appeng/api/recipes/ICraftHandler.java +++ b/src/api/java/appeng/api/recipes/ICraftHandler.java @@ -30,6 +30,7 @@ import appeng.api.exceptions.MissingIngredientException; import appeng.api.exceptions.RecipeException; import appeng.api.exceptions.RegistrationException; + @Deprecated public interface ICraftHandler { diff --git a/src/api/java/appeng/api/recipes/IIngredient.java b/src/api/java/appeng/api/recipes/IIngredient.java index 0cca74d0d..f95782362 100644 --- a/src/api/java/appeng/api/recipes/IIngredient.java +++ b/src/api/java/appeng/api/recipes/IIngredient.java @@ -29,6 +29,7 @@ import net.minecraft.item.ItemStack; import appeng.api.exceptions.MissingIngredientException; import appeng.api.exceptions.RegistrationException; + @Deprecated public interface IIngredient { diff --git a/src/api/java/appeng/api/recipes/IRecipeLoader.java b/src/api/java/appeng/api/recipes/IRecipeLoader.java index b51e507dd..a150741cc 100644 --- a/src/api/java/appeng/api/recipes/IRecipeLoader.java +++ b/src/api/java/appeng/api/recipes/IRecipeLoader.java @@ -28,6 +28,7 @@ import java.io.BufferedReader; import javax.annotation.Nonnull; + @Deprecated public interface IRecipeLoader { diff --git a/src/api/java/appeng/api/util/AEColor.java b/src/api/java/appeng/api/util/AEColor.java index 025540b06..30167df5d 100644 --- a/src/api/java/appeng/api/util/AEColor.java +++ b/src/api/java/appeng/api/util/AEColor.java @@ -74,25 +74,30 @@ public enum AEColor TRANSPARENT( "gui.appliedenergistics2.Fluix", null, 0x1B2344, 0x895CA8, 0xD7BBEC ); - public static final List VALID_COLORS = Arrays.asList( WHITE, ORANGE, MAGENTA, LIGHT_BLUE, YELLOW, LIME, PINK, GRAY, LIGHT_GRAY, CYAN, PURPLE, BLUE, BROWN, GREEN, RED, BLACK ); + public static final List VALID_COLORS = Arrays.asList( WHITE, ORANGE, MAGENTA, LIGHT_BLUE, YELLOW, LIME, PINK, GRAY, LIGHT_GRAY, CYAN, PURPLE, + BLUE, BROWN, GREEN, RED, BLACK ); /** - * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get the {@link #blackVariant dark variant} of the apprioriate AE color. + * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get the {@link #blackVariant dark + * variant} of the apprioriate AE color. */ public static final int TINTINDEX_DARK = 1; /** - * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get the {@link #mediumVariant medium variant} of the apprioriate AE color. + * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get the {@link #mediumVariant medium + * variant} of the apprioriate AE color. */ public static final int TINTINDEX_MEDIUM = 2; /** - * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get the {@link #whiteVariant bright variant} of the apprioriate AE color. + * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get the {@link #whiteVariant bright + * variant} of the apprioriate AE color. */ public static final int TINTINDEX_BRIGHT = 3; /** - * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get a color between the {@link #mediumVariant medium} + * The {@link BakedQuad#getTintIndex() tint index} that can normally be used to get a color between the + * {@link #mediumVariant medium} * and {@link #whiteVariant bright variant} of the apprioriate AE color. */ public static final int TINTINDEX_MEDIUM_BRIGHT = 4; @@ -141,7 +146,8 @@ public enum AEColor { switch( tintIndex ) { - // Please note that tintindex 0 is hardcoded for the block breaking particles. Returning anything other than -1 for tintindex=0 here + // Please note that tintindex 0 is hardcoded for the block breaking particles. Returning anything other than + // -1 for tintindex=0 here // will cause issues with those particles case 0: return -1; diff --git a/src/api/java/appeng/api/util/INetworkToolAgent.java b/src/api/java/appeng/api/util/INetworkToolAgent.java index 01a280831..3c56060f8 100644 --- a/src/api/java/appeng/api/util/INetworkToolAgent.java +++ b/src/api/java/appeng/api/util/INetworkToolAgent.java @@ -23,8 +23,10 @@ package appeng.api.util; + import net.minecraft.util.math.RayTraceResult; + /** * Implement on Tile or part to customize if the info gui opens, or an action is preformed. */ diff --git a/src/main/java/appeng/bootstrap/components/IEntityRegistrationComponent.java b/src/main/java/appeng/bootstrap/components/IEntityRegistrationComponent.java index 14bf4fb5f..9fe17b436 100644 --- a/src/main/java/appeng/bootstrap/components/IEntityRegistrationComponent.java +++ b/src/main/java/appeng/bootstrap/components/IEntityRegistrationComponent.java @@ -1,10 +1,13 @@ + package appeng.bootstrap.components; + import net.minecraftforge.fml.common.registry.EntityEntry; import net.minecraftforge.registries.IForgeRegistry; import appeng.bootstrap.IBootstrapComponent; + @FunctionalInterface public interface IEntityRegistrationComponent extends IBootstrapComponent { diff --git a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java index 548582a76..1bcee7ae8 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java @@ -78,8 +78,9 @@ public class GuiPatternTerm extends GuiMEMonitorable if( this.tabCraftButton == btn || this.tabProcessButton == btn ) { - NetworkHandler.instance().sendToServer( - new PacketValueConfig( "PatternTerminal.CraftMode", this.tabProcessButton == btn ? CRAFTMODE_CRFTING : CRAFTMODE_PROCESSING ) ); + NetworkHandler.instance() + .sendToServer( + new PacketValueConfig( "PatternTerminal.CraftMode", this.tabProcessButton == btn ? CRAFTMODE_CRFTING : CRAFTMODE_PROCESSING ) ); } if( this.encodeBtn == btn ) @@ -94,8 +95,9 @@ public class GuiPatternTerm extends GuiMEMonitorable if( this.substitutionsEnabledBtn == btn || this.substitutionsDisabledBtn == btn ) { - NetworkHandler.instance().sendToServer( - new PacketValueConfig( "PatternTerminal.Substitute", this.substitutionsEnabledBtn == btn ? SUBSITUTION_DISABLE : SUBSITUTION_ENABLE ) ); + NetworkHandler.instance() + .sendToServer( + new PacketValueConfig( "PatternTerminal.Substitute", this.substitutionsEnabledBtn == btn ? SUBSITUTION_DISABLE : SUBSITUTION_ENABLE ) ); } } catch( final IOException e ) diff --git a/src/main/java/appeng/client/render/DummyFluidBakedModel.java b/src/main/java/appeng/client/render/DummyFluidBakedModel.java index 4ad226914..d058c2131 100644 --- a/src/main/java/appeng/client/render/DummyFluidBakedModel.java +++ b/src/main/java/appeng/client/render/DummyFluidBakedModel.java @@ -41,6 +41,7 @@ import net.minecraft.util.EnumFacing; public class DummyFluidBakedModel implements IBakedModel { private final ImmutableList quads; + public DummyFluidBakedModel( ImmutableList quads ) { this.quads = quads; diff --git a/src/main/java/appeng/client/render/DummyFluidItemModel.java b/src/main/java/appeng/client/render/DummyFluidItemModel.java index 80f952e29..a573e1bf8 100644 --- a/src/main/java/appeng/client/render/DummyFluidItemModel.java +++ b/src/main/java/appeng/client/render/DummyFluidItemModel.java @@ -78,7 +78,7 @@ public class DummyFluidItemModel implements IModel { IBakedModel bakedBaseModel = this.getBaseModel().bake( state, format, bakedTextureGetter ); - return new DummyFluidDispatcherBakedModel( bakedBaseModel, format, bakedTextureGetter ); + return new DummyFluidDispatcherBakedModel( bakedBaseModel, format, bakedTextureGetter ); } @Override diff --git a/src/main/java/appeng/client/render/model/UVLModelLoader.java b/src/main/java/appeng/client/render/model/UVLModelLoader.java index 610d02bc4..fea28c85b 100644 --- a/src/main/java/appeng/client/render/model/UVLModelLoader.java +++ b/src/main/java/appeng/client/render/model/UVLModelLoader.java @@ -247,8 +247,10 @@ public enum UVLModelLoader implements ICustomModelLoader { String s = modelLocation.getResourcePath(); - iresource = Minecraft.getMinecraft().getResourceManager().getResource( - new ResourceLocation( modelLocation.getResourceDomain(), "models/" + modelPath + ".json" ) ); + iresource = Minecraft.getMinecraft() + .getResourceManager() + .getResource( + new ResourceLocation( modelLocation.getResourceDomain(), "models/" + modelPath + ".json" ) ); reader = new InputStreamReader( iresource.getInputStream(), Charsets.UTF_8 ); lvt_5_1_ = JsonUtils.gsonDeserialize( this.UVLSERIALIZER, reader, ModelBlock.class, false ); diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java index f6269580b..8f94368c5 100644 --- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java @@ -468,8 +468,9 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA final ItemStack failed = real.getStackInSlot( x ); if( !failed.isEmpty() ) { - this.getCellInventory().injectItems( AEItemStack.fromItemStack( failed ), Actionable.MODULATE, - new MachineSource( this.getPatternTerminal() ) ); + this.getCellInventory() + .injectItems( AEItemStack.fromItemStack( failed ), Actionable.MODULATE, + new MachineSource( this.getPatternTerminal() ) ); } } } diff --git a/src/main/java/appeng/container/implementations/ContainerPriority.java b/src/main/java/appeng/container/implementations/ContainerPriority.java index 61ce9595f..e9d9112cc 100644 --- a/src/main/java/appeng/container/implementations/ContainerPriority.java +++ b/src/main/java/appeng/container/implementations/ContainerPriority.java @@ -88,7 +88,7 @@ public class ContainerPriority extends AEBaseContainer super.onUpdate( field, oldValue, newValue ); } - + public IPriorityHost getPriorityHost() { return this.priHost; diff --git a/src/main/java/appeng/core/api/definitions/ApiMaterials.java b/src/main/java/appeng/core/api/definitions/ApiMaterials.java index ff9c6fdc2..292848510 100644 --- a/src/main/java/appeng/core/api/definitions/ApiMaterials.java +++ b/src/main/java/appeng/core/api/definitions/ApiMaterials.java @@ -151,7 +151,7 @@ public final class ApiMaterials implements IMaterials .entity( EntityChargedQuartz.class ) .id( new ResourceLocation( "appliedenergistics2", EntityChargedQuartz.class.getName() ), EntityIds.get( EntityChargedQuartz.class ) ) - .name( EntityChargedQuartz.class.getSimpleName() ) + .name( EntityChargedQuartz.class.getSimpleName() ) .tracker( 16, 4, true ) .build() ); } ) diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java index 95665a534..b4ef20b1e 100644 --- a/src/main/java/appeng/core/api/definitions/ApiParts.java +++ b/src/main/java/appeng/core/api/definitions/ApiParts.java @@ -438,7 +438,7 @@ public final class ApiParts implements IParts { return this.fluidAnnihilationPlane; } - + @Override public IItemDefinition fluidFormationnPlane() { diff --git a/src/main/java/appeng/fluids/client/gui/GuiFluidFormationPlane.java b/src/main/java/appeng/fluids/client/gui/GuiFluidFormationPlane.java index d69d8b6de..6be00d3d6 100644 --- a/src/main/java/appeng/fluids/client/gui/GuiFluidFormationPlane.java +++ b/src/main/java/appeng/fluids/client/gui/GuiFluidFormationPlane.java @@ -81,7 +81,7 @@ public class GuiFluidFormationPlane extends GuiUpgradeable NetworkHandler.instance().sendToServer( new PacketSwitchGuis( GuiBridge.GUI_PRIORITY ) ); } } - + @Override protected GuiText getName() { diff --git a/src/main/java/appeng/fluids/helper/IFluidInterfaceHost.java b/src/main/java/appeng/fluids/helper/IFluidInterfaceHost.java index bbba850fc..c17d8a720 100644 --- a/src/main/java/appeng/fluids/helper/IFluidInterfaceHost.java +++ b/src/main/java/appeng/fluids/helper/IFluidInterfaceHost.java @@ -36,6 +36,6 @@ public interface IFluidInterfaceHost extends IActionHost, IGridProxyable, IUpgra EnumSet getTargets(); TileEntity getTileEntity(); - + void saveChanges(); } diff --git a/src/main/java/appeng/fluids/tile/TileFluidInterface.java b/src/main/java/appeng/fluids/tile/TileFluidInterface.java index d2b8d8ab4..2968b65c8 100644 --- a/src/main/java/appeng/fluids/tile/TileFluidInterface.java +++ b/src/main/java/appeng/fluids/tile/TileFluidInterface.java @@ -175,7 +175,7 @@ public class TileFluidInterface extends AENetworkTile implements IGridTickable, { return this.duality.getInventoryByName( name ); } - + @Override public ItemStack getItemStackRepresentation() { diff --git a/src/main/java/appeng/fluids/util/AEFluidTank.java b/src/main/java/appeng/fluids/util/AEFluidTank.java index 8dc434535..a03d5bc45 100644 --- a/src/main/java/appeng/fluids/util/AEFluidTank.java +++ b/src/main/java/appeng/fluids/util/AEFluidTank.java @@ -34,7 +34,7 @@ public class AEFluidTank extends FluidTank implements IAEFluidTank { super( capacity ); this.host = host; - if (host instanceof TileEntity) + if( host instanceof TileEntity ) { this.setTileEntity( (TileEntity) host ); } diff --git a/src/main/java/appeng/fluids/util/FluidSorters.java b/src/main/java/appeng/fluids/util/FluidSorters.java index ec98c7b58..e086a270b 100644 --- a/src/main/java/appeng/fluids/util/FluidSorters.java +++ b/src/main/java/appeng/fluids/util/FluidSorters.java @@ -90,7 +90,6 @@ public class FluidSorters } }; - private static SortDir getDirection() { return Direction; diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index ce5fd369b..3c1791bca 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -1243,7 +1243,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn { this.priority = newValue; this.iHost.saveChanges(); - + try { this.gridProxy.getGrid().postEvent( new MENetworkCraftingPatternChange( this, this.gridProxy.getNode() ) ); diff --git a/src/main/java/appeng/helpers/IPriorityHost.java b/src/main/java/appeng/helpers/IPriorityHost.java index cdff4d6ac..641e36a6b 100644 --- a/src/main/java/appeng/helpers/IPriorityHost.java +++ b/src/main/java/appeng/helpers/IPriorityHost.java @@ -18,10 +18,12 @@ package appeng.helpers; + import net.minecraft.item.ItemStack; import appeng.core.sync.GuiBridge; + public interface IPriorityHost { @@ -34,8 +36,8 @@ public interface IPriorityHost * set new priority */ void setPriority( int newValue ); - + ItemStack getItemStackRepresentation(); - + GuiBridge getGuiBridge(); } diff --git a/src/main/java/appeng/integration/IntegrationNode.java b/src/main/java/appeng/integration/IntegrationNode.java index ffcd6e814..271936202 100644 --- a/src/main/java/appeng/integration/IntegrationNode.java +++ b/src/main/java/appeng/integration/IntegrationNode.java @@ -77,8 +77,9 @@ final class IntegrationNode final ModAPIManager apiManager = ModAPIManager.INSTANCE; boolean enabled = this.modID == null || Loader.isModLoaded( this.modID ) || apiManager.hasAPI( this.modID ); - AEConfig.instance().addCustomCategoryComment( "ModIntegration", - "Valid Values are 'AUTO', 'ON', or 'OFF' - defaults to 'AUTO' ; Suggested that you leave this alone unless your experiencing an issue, or wish to disable the integration for a reason." ); + AEConfig.instance() + .addCustomCategoryComment( "ModIntegration", + "Valid Values are 'AUTO', 'ON', or 'OFF' - defaults to 'AUTO' ; Suggested that you leave this alone unless your experiencing an issue, or wish to disable the integration for a reason." ); final String mode = AEConfig.instance().get( "ModIntegration", this.displayName.replace( " ", "" ), "AUTO" ).getString(); if( mode.toUpperCase().equals( "ON" ) ) diff --git a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java index 09d1b1dfd..dfaaf7cd8 100644 --- a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java +++ b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java @@ -79,10 +79,12 @@ public class JEIPlugin implements IModPlugin this.registerDescriptions( definitions, registry ); // Allow recipe transfer from JEI to crafting and pattern terminal - registry.getRecipeTransferRegistry().addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerCraftingTerm.class ), - VanillaRecipeCategoryUid.CRAFTING ); - registry.getRecipeTransferRegistry().addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerPatternTerm.class ), - VanillaRecipeCategoryUid.CRAFTING ); + registry.getRecipeTransferRegistry() + .addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerCraftingTerm.class ), + VanillaRecipeCategoryUid.CRAFTING ); + registry.getRecipeTransferRegistry() + .addRecipeTransferHandler( new RecipeTransferHandler<>( ContainerPatternTerm.class ), + VanillaRecipeCategoryUid.CRAFTING ); } private void registerDescriptions( IDefinitions definitions, IModRegistry registry ) diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index d14a01783..75838da0a 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -225,7 +225,8 @@ public enum PartType FORMATION_PLANE( 320, "formation_plane", EnumSet.of( AEFeature.FORMATION_PLANE ), EnumSet.noneOf( IntegrationType.class ), PartFormationPlane.class ), - FLUID_FORMATION_PLANE( 321, "fluid_formation_plane", EnumSet.of( AEFeature.FLUID_FORMATION_PLANE ), EnumSet.noneOf( IntegrationType.class ), PartFluidFormationPlane.class ), + FLUID_FORMATION_PLANE( 321, "fluid_formation_plane", EnumSet.of( AEFeature.FLUID_FORMATION_PLANE ), EnumSet + .noneOf( IntegrationType.class ), PartFluidFormationPlane.class ), PATTERN_TERMINAL( 340, "pattern_terminal", EnumSet.of( AEFeature.PATTERNS ), EnumSet.noneOf( IntegrationType.class ), PartPatternTerminal.class ), diff --git a/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java b/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java index f73ea5d2c..f3468bdb6 100644 --- a/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemCreativeStorageCell.java @@ -80,8 +80,11 @@ public class ItemCreativeStorageCell extends AEBaseItem implements ICellWorkbenc @Override public void addCheckedInformation( final ItemStack stack, final World world, final List lines, final ITooltipFlag advancedTooltips ) { - final IMEInventoryHandler inventory = AEApi.instance().registries().cell().getCellInventory( stack, null, - AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); + final IMEInventoryHandler inventory = AEApi.instance() + .registries() + .cell() + .getCellInventory( stack, null, + AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); if( inventory instanceof ICellInventoryHandler ) { diff --git a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java b/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java index 32f868d1c..b2a9e80b8 100644 --- a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java @@ -157,9 +157,10 @@ public class ItemSpatialStorageCell extends AEBaseItem implements ISpatialStorag BlockPos offset = manager.getCellDimensionOrigin( cellid ); this.setStorageCell( is, cellid, targetSize ); - StorageHelper.getInstance().swapRegions( w, min.x + 1, min.y + 1, min.z + 1, manager.getWorld(), offset.getX(), offset.getY(), - offset.getZ(), targetX - 1, targetY - 1, - targetZ - 1 ); + StorageHelper.getInstance() + .swapRegions( w, min.x + 1, min.y + 1, min.z + 1, manager.getWorld(), offset.getX(), offset.getY(), + offset.getZ(), targetX - 1, targetY - 1, + targetZ - 1 ); return new TransitionResult( true, 0 ); } diff --git a/src/main/java/appeng/loot/ChestLoot.java b/src/main/java/appeng/loot/ChestLoot.java index dec22e403..f7422cf02 100644 --- a/src/main/java/appeng/loot/ChestLoot.java +++ b/src/main/java/appeng/loot/ChestLoot.java @@ -47,20 +47,22 @@ public class ChestLoot final IMaterials materials = AEApi.instance().definitions().materials(); materials.certusQuartzCrystal().maybeStack( 1 ).ifPresent( is -> { - event.getTable().addPool( new LootPool( new LootEntry[] { - new LootEntryItem( is.getItem(), 2, 3, new LootFunction[] { - new SetMetadata( null, new RandomValueRange( is.getItemDamage() ) ) }, new LootCondition[] { - new RandomChance( 1 ) }, "AE2 Crystal_" + is.getItemDamage() ) - }, new LootCondition[0], new RandomValueRange( 1, 4 ), new RandomValueRange( 0, 2 ), "AE2 Crystals" ) ); + event.getTable() + .addPool( new LootPool( new LootEntry[] { + new LootEntryItem( is.getItem(), 2, 3, new LootFunction[] { + new SetMetadata( null, new RandomValueRange( is.getItemDamage() ) ) }, new LootCondition[] { + new RandomChance( 1 ) }, "AE2 Crystal_" + is.getItemDamage() ) + }, new LootCondition[0], new RandomValueRange( 1, 4 ), new RandomValueRange( 0, 2 ), "AE2 Crystals" ) ); } ); materials.certusQuartzDust().maybeStack( 1 ).ifPresent( is -> { - event.getTable().addPool( new LootPool( new LootEntryItem[] { - new LootEntryItem( is.getItem(), 2, 3, new LootFunction[] { - new SetMetadata( null, new RandomValueRange( is.getItemDamage() ) ) }, new LootCondition[] { - new RandomChance( 1 ) }, "AE2 Dust_" + is.getItemDamage() ) - }, new LootCondition[0], new RandomValueRange( 1, 4 ), new RandomValueRange( 0, 2 ), "AE2 DUSTS" ) ); + event.getTable() + .addPool( new LootPool( new LootEntryItem[] { + new LootEntryItem( is.getItem(), 2, 3, new LootFunction[] { + new SetMetadata( null, new RandomValueRange( is.getItemDamage() ) ) }, new LootCondition[] { + new RandomChance( 1 ) }, "AE2 Dust_" + is.getItemDamage() ) + }, new LootCondition[0], new RandomValueRange( 1, 4 ), new RandomValueRange( 0, 2 ), "AE2 DUSTS" ) ); } ); } diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index b298967a0..6ebd260e3 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -777,8 +777,9 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU if( details.isCraftable() ) { - FMLCommonHandler.instance().firePlayerCraftingEvent( Platform.getPlayer( (WorldServer) this.getWorld() ), - details.getOutput( ic, this.getWorld() ), ic ); + FMLCommonHandler.instance() + .firePlayerCraftingEvent( Platform.getPlayer( (WorldServer) this.getWorld() ), + details.getOutput( ic, this.getWorld() ), ic ); for( int x = 0; x < ic.getSizeInventory(); x++ ) { diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index 1b26e4d32..b9fa26a74 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -156,8 +156,10 @@ public class QuantumCluster implements ILocatable, IAECluster } } - sideA.connection = sideB.connection = new ConnectionWrapper( AEApi.instance().grid().createGridConnection( sideA.getNode(), - sideB.getNode() ) ); + sideA.connection = sideB.connection = new ConnectionWrapper( AEApi.instance() + .grid() + .createGridConnection( sideA.getNode(), + sideB.getNode() ) ); } catch( final FailedConnectionException e ) { diff --git a/src/main/java/appeng/parts/automation/PartAbstractFormationPlane.java b/src/main/java/appeng/parts/automation/PartAbstractFormationPlane.java index 496efc3a2..ca2429bb6 100644 --- a/src/main/java/appeng/parts/automation/PartAbstractFormationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAbstractFormationPlane.java @@ -222,7 +222,7 @@ public abstract class PartAbstractFormationPlane> extends { return out; } - + @Override public void readFromNBT( final NBTTagCompound data ) { diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java index e42dd630b..f7a335900 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java @@ -239,9 +239,12 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I { try { - connections.getConnections().put( me.getGridNode(), - new TunnelConnection( me, AEApi.instance().grid().createGridConnection( this.outerProxy.getNode(), - me.outerProxy.getNode() ) ) ); + connections.getConnections() + .put( me.getGridNode(), + new TunnelConnection( me, AEApi.instance() + .grid() + .createGridConnection( this.outerProxy.getNode(), + me.outerProxy.getNode() ) ) ); } catch( final FailedConnectionException e ) { diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index ea83a4d8a..eb179001c 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -105,8 +105,11 @@ public final class DisassembleRecipe extends net.minecraftforge.registries.IForg { ItemStack storageCellStack = maybeCellOutput.get(); // make sure the storage cell stackInSlot empty... - final IMEInventory cellInv = AEApi.instance().registries().cell().getCellInventory( stackInSlot, null, - AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); + final IMEInventory cellInv = AEApi.instance() + .registries() + .cell() + .getCellInventory( stackInSlot, null, + AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ) ); if( cellInv != null ) { final IItemList list = cellInv diff --git a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java index 74921a9ae..c41231bec 100644 --- a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java +++ b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java @@ -521,8 +521,10 @@ public class TileMolecularAssembler extends AENetworkInvTile implements IUpgrade { try { - return (int) ( this.getProxy().getEnergy().extractAEPower( ticksPassed * bonusValue * acceleratorTax, Actionable.MODULATE, - PowerMultiplier.CONFIG ) / acceleratorTax ); + return (int) ( this.getProxy() + .getEnergy() + .extractAEPower( ticksPassed * bonusValue * acceleratorTax, Actionable.MODULATE, + PowerMultiplier.CONFIG ) / acceleratorTax ); } catch( final GridAccessException e ) { diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java index 95fe51e8e..d1c41713c 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java @@ -177,8 +177,11 @@ public class AppEngInternalAEInventory implements IInternalItemHandler, Iterable { if( existing.isEmpty() ) { - this.inv[slot] = AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createStack( - reachedLimit ? ItemHandlerHelper.copyStackWithSize( stack, limit ) : stack ); + this.inv[slot] = AEApi.instance() + .storage() + .getStorageChannel( IItemStorageChannel.class ) + .createStack( + reachedLimit ? ItemHandlerHelper.copyStackWithSize( stack, limit ) : stack ); } else { diff --git a/src/main/java/appeng/tile/misc/TileCellWorkbench.java b/src/main/java/appeng/tile/misc/TileCellWorkbench.java index 9a06094c4..8e102df0f 100644 --- a/src/main/java/appeng/tile/misc/TileCellWorkbench.java +++ b/src/main/java/appeng/tile/misc/TileCellWorkbench.java @@ -197,7 +197,7 @@ public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, I if( c != null ) { ItemHandlerUtil.copy( this.config, c, false ); - //copy items back. The ConfigInventory may changed the items on insert + // copy items back. The ConfigInventory may changed the items on insert ItemHandlerUtil.copy( c, this.config, false ); } this.locked = false; diff --git a/src/main/java/appeng/tile/misc/TileInterface.java b/src/main/java/appeng/tile/misc/TileInterface.java index 5aa20114e..6a945c307 100644 --- a/src/main/java/appeng/tile/misc/TileInterface.java +++ b/src/main/java/appeng/tile/misc/TileInterface.java @@ -354,7 +354,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II } return super.getCapability( capability, facing ); } - + @Override public ItemStack getItemStackRepresentation() { diff --git a/src/main/java/appeng/tile/storage/TileDrive.java b/src/main/java/appeng/tile/storage/TileDrive.java index c06cf8328..c57d8cd01 100644 --- a/src/main/java/appeng/tile/storage/TileDrive.java +++ b/src/main/java/appeng/tile/storage/TileDrive.java @@ -398,7 +398,7 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior } } - + @Override public ItemStack getItemStackRepresentation() { diff --git a/src/main/java/appeng/tile/storage/TileSkyChest.java b/src/main/java/appeng/tile/storage/TileSkyChest.java index 3308af83f..2ea8923f5 100644 --- a/src/main/java/appeng/tile/storage/TileSkyChest.java +++ b/src/main/java/appeng/tile/storage/TileSkyChest.java @@ -97,8 +97,9 @@ public class TileSkyChest extends AEBaseInvTile implements ITickable if( this.getPlayerOpen() == 1 ) { - this.getWorld().playSound( player, this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D, SoundEvents.BLOCK_CHEST_OPEN, - SoundCategory.BLOCKS, 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F ); + this.getWorld() + .playSound( player, this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D, SoundEvents.BLOCK_CHEST_OPEN, + SoundCategory.BLOCKS, 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F ); this.markForUpdate(); } } @@ -120,8 +121,9 @@ public class TileSkyChest extends AEBaseInvTile implements ITickable if( this.getPlayerOpen() == 0 ) { - this.getWorld().playSound( player, this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D, SoundEvents.BLOCK_CHEST_CLOSE, - SoundCategory.BLOCKS, 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F ); + this.getWorld() + .playSound( player, this.pos.getX() + 0.5D, this.pos.getY() + 0.5D, this.pos.getZ() + 0.5D, SoundEvents.BLOCK_CHEST_CLOSE, + SoundCategory.BLOCKS, 0.5F, this.getWorld().rand.nextFloat() * 0.1F + 0.9F ); this.markForUpdate(); } } diff --git a/src/main/java/appeng/worldgen/MeteoritePlacer.java b/src/main/java/appeng/worldgen/MeteoritePlacer.java index d4c401fcb..d2a57d0a7 100644 --- a/src/main/java/appeng/worldgen/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/MeteoritePlacer.java @@ -203,8 +203,9 @@ public final class MeteoritePlacer } } - for( final Object o : w.getWorld().getEntitiesWithinAABB( EntityItem.class, - new AxisAlignedBB( w.minX( x - 30 ), y - 5, w.minZ( z - 30 ), w.maxX( x + 30 ), y + 30, w.maxZ( z + 30 ) ) ) ) + for( final Object o : w.getWorld() + .getEntitiesWithinAABB( EntityItem.class, + new AxisAlignedBB( w.minX( x - 30 ), y - 5, w.minZ( z - 30 ), w.maxX( x + 30 ), y + 30, w.maxZ( z + 30 ) ) ) ) { final Entity e = (Entity) o; e.setDead(); diff --git a/src/test/java/appeng/client/render/UVLightmapJsonTest.java b/src/test/java/appeng/client/render/UVLightmapJsonTest.java index 5cb151e68..f8e5a2597 100644 --- a/src/test/java/appeng/client/render/UVLightmapJsonTest.java +++ b/src/test/java/appeng/client/render/UVLightmapJsonTest.java @@ -83,13 +83,13 @@ public class UVLightmapJsonTest } }.setLightLevel( 0.2f ).setCreativeTab( CreativeTabs.DECORATIONS ).setRegistryName( uvlblockR ); - + final Item uvlblockItem = new ItemBlock( uvlblock ).setRegistryName( uvlblockR ); - + FeatureFactory fact = Api.INSTANCE.definitions().getRegistry(); fact.addBootstrapComponent( (IBlockRegistrationComponent) ( side, registry ) -> registry.register( uvlblock ) ); fact.addBootstrapComponent( (IItemRegistrationComponent) ( side, registry ) -> registry.register( uvlblockItem ) ); - fact.addBootstrapComponent( new ItemVariantsComponent( uvlblockItem, Arrays.asList( uvlblockR ) )); + fact.addBootstrapComponent( new ItemVariantsComponent( uvlblockItem, Arrays.asList( uvlblockR ) ) ); fact.addBootstrapComponent( new ItemModelComponent( uvlblockItem, ImmutableMap.of( 0, new ModelResourceLocation( uvlblockR, "inventory" ) ) ) ); } } diff --git a/src/test/java/appeng/core/worlddata/SpatialDimensionManagerTest.java b/src/test/java/appeng/core/worlddata/SpatialDimensionManagerTest.java index 564ad14b8..d68a14a5c 100644 --- a/src/test/java/appeng/core/worlddata/SpatialDimensionManagerTest.java +++ b/src/test/java/appeng/core/worlddata/SpatialDimensionManagerTest.java @@ -1,14 +1,17 @@ + package appeng.core.worlddata; + import org.junit.Assert; import org.junit.Test; import net.minecraft.util.math.BlockPos; + public class SpatialDimensionManagerTest { - private static final BlockPos CONTENT = new BlockPos(1, 1, 1); - + private static final BlockPos CONTENT = new BlockPos( 1, 1, 1 ); + private static final int ID_1 = 0; private static final int ID_2 = 1; private static final int ID_3 = 2; @@ -21,42 +24,40 @@ public class SpatialDimensionManagerTest private static final int ID_A = 9; private static final int ID_B = 10; private static final int ID_C = 11; - - private static final BlockPos POS_1 = new BlockPos( -320, 64, -320); - private static final BlockPos POS_2 = new BlockPos( 192, 64, -320); - private static final BlockPos POS_3 = new BlockPos( -320, 64, 192); - private static final BlockPos POS_4 = new BlockPos( 192, 64, 192); - - private static final BlockPos POS_5 = new BlockPos( -832, 64, -320); - private static final BlockPos POS_6 = new BlockPos( 704, 64, -320); - private static final BlockPos POS_7 = new BlockPos( -832, 64, 192); - private static final BlockPos POS_8 = new BlockPos( 704, 64, 192); + private static final BlockPos POS_1 = new BlockPos( -320, 64, -320 ); + private static final BlockPos POS_2 = new BlockPos( 192, 64, -320 ); + private static final BlockPos POS_3 = new BlockPos( -320, 64, 192 ); + private static final BlockPos POS_4 = new BlockPos( 192, 64, 192 ); + + private static final BlockPos POS_5 = new BlockPos( -832, 64, -320 ); + private static final BlockPos POS_6 = new BlockPos( 704, 64, -320 ); + private static final BlockPos POS_7 = new BlockPos( -832, 64, 192 ); + private static final BlockPos POS_8 = new BlockPos( 704, 64, 192 ); + + private static final BlockPos POS_9 = new BlockPos( -320, 64, -832 ); + private static final BlockPos POS_A = new BlockPos( 192, 64, -832 ); + private static final BlockPos POS_B = new BlockPos( -320, 64, 704 ); + private static final BlockPos POS_C = new BlockPos( 192, 64, 704 ); - private static final BlockPos POS_9 = new BlockPos( -320, 64, -832); - private static final BlockPos POS_A = new BlockPos( 192, 64, -832); - private static final BlockPos POS_B = new BlockPos( -320, 64, 704); - private static final BlockPos POS_C = new BlockPos( 192, 64, 704); - - @Test public void testBlockPosGeneration() { SpatialDimensionManager manager = new SpatialDimensionManager( null ); - - Assert.assertEquals( ID_1, manager.createNewCellDimension( CONTENT, -1 )); - Assert.assertEquals( ID_2, manager.createNewCellDimension( CONTENT, -1 )); - Assert.assertEquals( ID_3, manager.createNewCellDimension( CONTENT, -1 )); - Assert.assertEquals( ID_4, manager.createNewCellDimension( CONTENT, -1 )); - Assert.assertEquals( ID_5, manager.createNewCellDimension( CONTENT, -1 )); - Assert.assertEquals( ID_6, manager.createNewCellDimension( CONTENT, -1 )); - Assert.assertEquals( ID_7, manager.createNewCellDimension( CONTENT, -1 )); - Assert.assertEquals( ID_8, manager.createNewCellDimension( CONTENT, -1 )); - Assert.assertEquals( ID_9, manager.createNewCellDimension( CONTENT, -1 )); - Assert.assertEquals( ID_A, manager.createNewCellDimension( CONTENT, -1 )); - Assert.assertEquals( ID_B, manager.createNewCellDimension( CONTENT, -1 )); - Assert.assertEquals( ID_C, manager.createNewCellDimension( CONTENT, -1 )); - + + Assert.assertEquals( ID_1, manager.createNewCellDimension( CONTENT, -1 ) ); + Assert.assertEquals( ID_2, manager.createNewCellDimension( CONTENT, -1 ) ); + Assert.assertEquals( ID_3, manager.createNewCellDimension( CONTENT, -1 ) ); + Assert.assertEquals( ID_4, manager.createNewCellDimension( CONTENT, -1 ) ); + Assert.assertEquals( ID_5, manager.createNewCellDimension( CONTENT, -1 ) ); + Assert.assertEquals( ID_6, manager.createNewCellDimension( CONTENT, -1 ) ); + Assert.assertEquals( ID_7, manager.createNewCellDimension( CONTENT, -1 ) ); + Assert.assertEquals( ID_8, manager.createNewCellDimension( CONTENT, -1 ) ); + Assert.assertEquals( ID_9, manager.createNewCellDimension( CONTENT, -1 ) ); + Assert.assertEquals( ID_A, manager.createNewCellDimension( CONTENT, -1 ) ); + Assert.assertEquals( ID_B, manager.createNewCellDimension( CONTENT, -1 ) ); + Assert.assertEquals( ID_C, manager.createNewCellDimension( CONTENT, -1 ) ); + Assert.assertEquals( POS_1, manager.getCellDimensionOrigin( ID_1 ) ); Assert.assertEquals( POS_2, manager.getCellDimensionOrigin( ID_2 ) ); Assert.assertEquals( POS_3, manager.getCellDimensionOrigin( ID_3 ) );