diff --git a/addon.gradle b/addon.gradle index 3d4d4e07f6b..dd5034acb59 100644 --- a/addon.gradle +++ b/addon.gradle @@ -14,6 +14,7 @@ configurations { configs -> // Keep all dependencies from the main mod in the functional test mod named(functionalTestSet.compileClasspathConfigurationName).configure {it.extendsFrom(named("compileClasspath").get())} named(functionalTestSet.runtimeClasspathConfigurationName).configure {it.extendsFrom(named("runtimeClasspath").get())} + named(functionalTestSet.annotationProcessorConfigurationName).configure {it.extendsFrom(named("annotationProcessor").get())} } tasks.register(functionalTestSet.jarTaskName, Jar) { diff --git a/gradle.properties b/gradle.properties index a20fd8c8baa..f6a2af0626e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,16 +21,27 @@ forgeVersion = 10.13.4.1614 # Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty developmentEnvironmentUserName = Developer -# Define a source file of your project with: +# Enables using modern java syntax (up to version 17) via Jabel, while still targetting JVM 8. +# See https://github.com/bsideup/jabel for details on how this works. +enableModernJavaSyntax = true + +# Enables injecting missing generics into the decompiled source code for a better coding experience +# Turns most publically visible List, Map, etc. into proper List, Map types +enableGenericInjection = true + +# Generate a class with String fields for the mod id, name, version and group name named with the fields below +generateGradleTokenClass = appeng.core.BuildTags +gradleTokenModId = +gradleTokenModName = +gradleTokenVersion = VERSION +gradleTokenGroupName = +# [DEPRECATED] +# Multiple source files can be defined here by providing a comma-seperated list: Class1.java,Class2.java,Class3.java # public static final String VERSION = "GRADLETOKEN_VERSION"; # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's # version in @Mod([...], version = VERSION, [...]) # Leave these properties empty to skip individual token replacements -replaceGradleTokenInFile = AEConfig.java -gradleTokenModId = -gradleTokenModName = -gradleTokenVersion = GRADLETOKEN_VERSION -gradleTokenGroupName = +replaceGradleTokenInFile = # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can # leave this property empty. @@ -58,9 +69,58 @@ containsMixinsAndOrCoreModOnly = false # Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins. forceEnableMixins = true -# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your + +# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated in your jar. It is your # responsibility check the licence and request permission for distribution, if required. usesShadowedDependencies = false +# If disabled, won't remove unused classes from shaded dependencies. Some libraries use reflection to access +# their own classes, making the minimization unreliable. +minimizeShadowedDependencies = true +# If disabled, won't rename the shadowed classes. +relocateShadowedDependencies = true # Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories includeWellKnownRepositories = true + +# Publishing to modrinth requires you to set the MODRINTH_TOKEN environment variable to your current modrinth API token. + +# The project's ID on Modrinth. Can be either the slug or the ID. +# Leave this empty if you don't want to publish on Modrinth. +modrinthProjectId = + +# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth. +# Syntax: scope1-type1:name1;scope2-type2:name2;... +# Where scope can be one of [required, optional, incompatible, embedded], +# type can be one of [project, version], +# and the name is the Modrinth project or version slug/id of the other mod. +# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech +# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true +modrinthRelations = + + +# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens. + +# The project's numeric ID on CurseForge. You can find this in the About Project box. +# Leave this empty if you don't want to publish on CurseForge. +curseForgeProjectId = + +# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge. +# Syntax: type1:name1;type2:name2;... +# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible], +# and the name is the CurseForge project slug of the other mod. +# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft +# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true +curseForgeRelations = + + +# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older +# projects. New projects should not use this parameter. +# customArchiveBaseName = + +# Optional parameter to prevent the source code from being published +# noPublishedSources = + +# Uncomment this to disable spotless checks +# This should only be uncommented to keep it easier to sync with upstream/other forks. +# That is, if there is no other active fork/upstream, NEVER change this. +# disableSpotless = true diff --git a/src/main/java/appeng/api/config/AccessRestriction.java b/src/main/java/appeng/api/config/AccessRestriction.java index b3595236e1e..ccd607c65ba 100644 --- a/src/main/java/appeng/api/config/AccessRestriction.java +++ b/src/main/java/appeng/api/config/AccessRestriction.java @@ -35,17 +35,12 @@ public AccessRestriction restrictPermissions(final AccessRestriction ar) { } private AccessRestriction getPermByBit(final int bit) { - switch (bit) { - default: - case 0: - return NO_ACCESS; - case 1: - return READ; - case 2: - return WRITE; - case 3: - return READ_WRITE; - } + return switch (bit) { + default -> NO_ACCESS; + case 1 -> READ; + case 2 -> WRITE; + case 3 -> READ_WRITE; + }; } public AccessRestriction addPermissions(final AccessRestriction ar) { diff --git a/src/main/java/appeng/api/config/Upgrades.java b/src/main/java/appeng/api/config/Upgrades.java index dd8ebf7d5ce..b2520d43106 100644 --- a/src/main/java/appeng/api/config/Upgrades.java +++ b/src/main/java/appeng/api/config/Upgrades.java @@ -53,7 +53,7 @@ public enum Upgrades { * @deprecated use {@link Upgrades#getSupported()} */ @Deprecated - private final Map supportedMax = new HashMap(); + private final Map supportedMax = new HashMap<>(); Upgrades(final int tier) { this.tier = tier; diff --git a/src/main/java/appeng/api/storage/MEMonitorHandler.java b/src/main/java/appeng/api/storage/MEMonitorHandler.java index b0049a389be..5efc95effd5 100644 --- a/src/main/java/appeng/api/storage/MEMonitorHandler.java +++ b/src/main/java/appeng/api/storage/MEMonitorHandler.java @@ -35,7 +35,7 @@ public class MEMonitorHandler implements IMEMonitor< private final IMEInventoryHandler internalHandler; private final IItemList cachedList; - private final HashMap, Object> listeners = new HashMap, Object>(); + private final HashMap, Object> listeners = new HashMap<>(); protected boolean hasChanged = true; diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index 361a4760b4b..a1137678791 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -61,7 +61,7 @@ public abstract class AEBaseBlock extends Block implements IAEFeature { private BlockRenderInfo renderInfo; protected AEBaseBlock(final Material mat) { - this(mat, Optional.absent()); + this(mat, Optional.absent()); this.setLightOpacity(255); this.setLightLevel(0); this.setHardness(2.2F); @@ -115,7 +115,7 @@ public BlockRenderInfo getRendererInstance() { */ @SideOnly(Side.CLIENT) protected BaseBlockRender getRenderer() { - return new BaseBlockRender(); + return new BaseBlockRender<>(); } IIcon unmappedGetIcon(final IBlockAccess w, final int x, final int y, final int z, final int s) { @@ -178,11 +178,11 @@ protected ICustomCollision getCustomCollision(final World w, final int x, final @SuppressWarnings("unchecked") // NOTE: WAS FINAL, changed for Immibis public void addCollisionBoxesToList(final World w, final int x, final int y, final int z, final AxisAlignedBB bb, - final List out, final Entity e) { + final List out, final Entity e) { final ICustomCollision collisionHandler = this.getCustomCollision(w, x, y, z); if (collisionHandler != null && bb != null) { - final List tmp = new ArrayList(); + final List tmp = new ArrayList<>(); collisionHandler.addCollidingBlockToList(w, x, y, z, bb, tmp, e); for (final AxisAlignedBB b : tmp) { b.minX += x; @@ -331,8 +331,7 @@ public boolean onActivated(final World w, final int x, final int y, final int z, @Override @SideOnly(Side.CLIENT) - @SuppressWarnings("unchecked") - public final void getSubBlocks(final Item item, final CreativeTabs tabs, final List itemStacks) { + public final void getSubBlocks(final Item item, final CreativeTabs tabs, final List itemStacks) { this.getCheckedSubBlocks(item, tabs, itemStacks); } diff --git a/src/main/java/appeng/block/AEBaseItemBlock.java b/src/main/java/appeng/block/AEBaseItemBlock.java index 680807ceb83..efbe2b6f3ad 100644 --- a/src/main/java/appeng/block/AEBaseItemBlock.java +++ b/src/main/java/appeng/block/AEBaseItemBlock.java @@ -57,8 +57,7 @@ public int getMetadata(final int dmg) { @Override @SideOnly(Side.CLIENT) - @SuppressWarnings("unchecked") - public final void addInformation(final ItemStack itemStack, final EntityPlayer player, final List toolTip, + public final void addInformation(final ItemStack itemStack, final EntityPlayer player, final List toolTip, final boolean advancedTooltips) { this.addCheckedInformation(itemStack, player, toolTip, advancedTooltips); } @@ -106,21 +105,12 @@ public boolean placeBlockAt(final ItemStack stack, final EntityPlayer player, fi final byte rotation = (byte) (MathHelper.floor_double((player.rotationYaw * 4F) / 360F + 2.5D) & 3); - switch (rotation) { - default: - case 0: - forward = ForgeDirection.SOUTH; - break; - case 1: - forward = ForgeDirection.WEST; - break; - case 2: - forward = ForgeDirection.NORTH; - break; - case 3: - forward = ForgeDirection.EAST; - break; - } + forward = switch (rotation) { + default -> ForgeDirection.SOUTH; + case 1 -> ForgeDirection.WEST; + case 2 -> ForgeDirection.NORTH; + case 3 -> ForgeDirection.EAST; + }; if (player.rotationPitch > 65) { up = forward.getOpposite(); diff --git a/src/main/java/appeng/block/AEBaseStairBlock.java b/src/main/java/appeng/block/AEBaseStairBlock.java index 407ea075812..3b4dae3feac 100644 --- a/src/main/java/appeng/block/AEBaseStairBlock.java +++ b/src/main/java/appeng/block/AEBaseStairBlock.java @@ -29,7 +29,7 @@ public abstract class AEBaseStairBlock extends BlockStairs implements IAEFeature protected AEBaseStairBlock(final Block block, final int meta, final EnumSet features) { super(block, meta); - this.features = new StairBlockFeatureHandler(features, this, Optional.absent()); + this.features = new StairBlockFeatureHandler(features, this, Optional.absent()); this.setBlockName(block.getUnlocalizedName()); this.setLightOpacity(0); diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index 5ba79be8a1d..3699a6ec11a 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -131,7 +131,7 @@ public final TileEntity createNewTileEntity(final World var1, final int var2) { public void breakBlock(final World w, final int x, final int y, final int z, final Block a, final int b) { final AEBaseTile te = this.getTileEntity(w, x, y, z); if (te != null) { - final ArrayList drops = new ArrayList(); + final ArrayList drops = new ArrayList<>(); if (te.dropItems()) { te.getDrops(w, x, y, z, drops); } else { @@ -161,8 +161,7 @@ public boolean recolourBlock(final World world, final int x, final int y, final final int colour) { final TileEntity te = this.getTileEntity(world, x, y, z); - if (te instanceof IColorableTile) { - final IColorableTile ct = (IColorableTile) te; + if (te instanceof IColorableTile ct) { final AEColor c = ct.getColor(); final AEColor newColor = AEColor.values()[colour]; @@ -249,8 +248,7 @@ public boolean onBlockActivated(final World w, final int x, final int y, final i return false; } - if (is.getItem() instanceof IMemoryCard && !(this instanceof BlockCableBus)) { - final IMemoryCard memoryCard = (IMemoryCard) is.getItem(); + if (is.getItem() instanceof IMemoryCard memoryCard && !(this instanceof BlockCableBus)) { if (player.isSneaking()) { final AEBaseTile t = this.getTileEntity(w, x, y, z); if (t != null) { diff --git a/src/main/java/appeng/block/crafting/BlockAdvancedCraftingStorage.java b/src/main/java/appeng/block/crafting/BlockAdvancedCraftingStorage.java index 3a02cc0293b..359993406c9 100644 --- a/src/main/java/appeng/block/crafting/BlockAdvancedCraftingStorage.java +++ b/src/main/java/appeng/block/crafting/BlockAdvancedCraftingStorage.java @@ -14,42 +14,27 @@ public BlockAdvancedCraftingStorage() { @Override public IIcon getIcon(final int direction, final int metadata) { - switch (metadata & (~4)) { - default: - return super.getIcon(0, -1); - case 0: - return ExtraBlockTextures.BlockCraftingStorage256k.getIcon(); - case 1: - return ExtraBlockTextures.BlockCraftingStorage1024k.getIcon(); - case 2: - return ExtraBlockTextures.BlockCraftingStorage4096k.getIcon(); - case 3: - return ExtraBlockTextures.BlockCraftingStorage16384k.getIcon(); - - case FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingStorage256kFit.getIcon(); - case 1 | FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingStorage1024kFit.getIcon(); - case 2 | FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingStorage4096kFit.getIcon(); - case 3 | FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingStorage16384kFit.getIcon(); - } + return switch (metadata & (~4)) { + default -> super.getIcon(0, -1); + case 0 -> ExtraBlockTextures.BlockCraftingStorage256k.getIcon(); + case 1 -> ExtraBlockTextures.BlockCraftingStorage1024k.getIcon(); + case 2 -> ExtraBlockTextures.BlockCraftingStorage4096k.getIcon(); + case 3 -> ExtraBlockTextures.BlockCraftingStorage16384k.getIcon(); + case FLAG_FORMED -> ExtraBlockTextures.BlockCraftingStorage256kFit.getIcon(); + case 1 | FLAG_FORMED -> ExtraBlockTextures.BlockCraftingStorage1024kFit.getIcon(); + case 2 | FLAG_FORMED -> ExtraBlockTextures.BlockCraftingStorage4096kFit.getIcon(); + case 3 | FLAG_FORMED -> ExtraBlockTextures.BlockCraftingStorage16384kFit.getIcon(); + }; } @Override public String getUnlocalizedName(final ItemStack is) { - switch (is.getItemDamage()) { - case 0: - return "tile.appliedenergistics2.BlockCraftingStorage256k"; - case 1: - return "tile.appliedenergistics2.BlockCraftingStorage1024k"; - case 2: - return "tile.appliedenergistics2.BlockCraftingStorage4096k"; - case 3: - return "tile.appliedenergistics2.BlockCraftingStorage16384k"; - default: - return this.getItemUnlocalizedName(is); - } + return switch (is.getItemDamage()) { + case 0 -> "tile.appliedenergistics2.BlockCraftingStorage256k"; + case 1 -> "tile.appliedenergistics2.BlockCraftingStorage1024k"; + case 2 -> "tile.appliedenergistics2.BlockCraftingStorage4096k"; + case 3 -> "tile.appliedenergistics2.BlockCraftingStorage16384k"; + default -> this.getItemUnlocalizedName(is); + }; } } diff --git a/src/main/java/appeng/block/crafting/BlockAdvancedCraftingUnit.java b/src/main/java/appeng/block/crafting/BlockAdvancedCraftingUnit.java index e89f9e92300..c350bcf170c 100644 --- a/src/main/java/appeng/block/crafting/BlockAdvancedCraftingUnit.java +++ b/src/main/java/appeng/block/crafting/BlockAdvancedCraftingUnit.java @@ -9,25 +9,16 @@ public class BlockAdvancedCraftingUnit extends BlockCraftingUnit { @Override public IIcon getIcon(final int direction, final int metadata) { - switch (metadata) { - default: - case 0: - return ExtraBlockTextures.BlockCraftingAccelerator64x.getIcon(); - case FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingAccelerator64xFit.getIcon(); - case 1: - return ExtraBlockTextures.BlockCraftingAccelerator256x.getIcon(); - case 1 | FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingAccelerator256xFit.getIcon(); - case 2: - return ExtraBlockTextures.BlockCraftingAccelerator1024x.getIcon(); - case 2 | FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingAccelerator1024xFit.getIcon(); - case 3: - return ExtraBlockTextures.BlockCraftingAccelerator4096x.getIcon(); - case 3 | FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingAccelerator4096xFit.getIcon(); - } + return switch (metadata) { + default -> ExtraBlockTextures.BlockCraftingAccelerator64x.getIcon(); + case FLAG_FORMED -> ExtraBlockTextures.BlockCraftingAccelerator64xFit.getIcon(); + case 1 -> ExtraBlockTextures.BlockCraftingAccelerator256x.getIcon(); + case 1 | FLAG_FORMED -> ExtraBlockTextures.BlockCraftingAccelerator256xFit.getIcon(); + case 2 -> ExtraBlockTextures.BlockCraftingAccelerator1024x.getIcon(); + case 2 | FLAG_FORMED -> ExtraBlockTextures.BlockCraftingAccelerator1024xFit.getIcon(); + case 3 -> ExtraBlockTextures.BlockCraftingAccelerator4096x.getIcon(); + case 3 | FLAG_FORMED -> ExtraBlockTextures.BlockCraftingAccelerator4096xFit.getIcon(); + }; } @Override diff --git a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java b/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java index 76fb2806aaf..95d7ac3a911 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingMonitor.java @@ -47,13 +47,10 @@ public IIcon getIcon(final int direction, final int metadata) { } } - switch (metadata) { - default: - case 0: - return super.getIcon(0, 0); - case FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingMonitorFit_Light.getIcon(); - } + return switch (metadata) { + default -> super.getIcon(0, 0); + case FLAG_FORMED -> ExtraBlockTextures.BlockCraftingMonitorFit_Light.getIcon(); + }; } @Override diff --git a/src/main/java/appeng/block/crafting/BlockCraftingStorage.java b/src/main/java/appeng/block/crafting/BlockCraftingStorage.java index 6190178f961..96f65b56c1e 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingStorage.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingStorage.java @@ -35,27 +35,16 @@ public Class getItemBlockClass() { @Override public IIcon getIcon(final int direction, final int metadata) { - switch (metadata & (~4)) { - default: - - case 0: - return super.getIcon(0, 0); - case 1: - return ExtraBlockTextures.BlockCraftingStorage4k.getIcon(); - case 2: - return ExtraBlockTextures.BlockCraftingStorage16k.getIcon(); - case 3: - return ExtraBlockTextures.BlockCraftingStorage64k.getIcon(); - - case FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingStorage1kFit.getIcon(); - case 1 | FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingStorage4kFit.getIcon(); - case 2 | FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingStorage16kFit.getIcon(); - case 3 | FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingStorage64kFit.getIcon(); - } + return switch (metadata & (~4)) { + default -> super.getIcon(0, 0); + case 1 -> ExtraBlockTextures.BlockCraftingStorage4k.getIcon(); + case 2 -> ExtraBlockTextures.BlockCraftingStorage16k.getIcon(); + case 3 -> ExtraBlockTextures.BlockCraftingStorage64k.getIcon(); + case FLAG_FORMED -> ExtraBlockTextures.BlockCraftingStorage1kFit.getIcon(); + case 1 | FLAG_FORMED -> ExtraBlockTextures.BlockCraftingStorage4kFit.getIcon(); + case 2 | FLAG_FORMED -> ExtraBlockTextures.BlockCraftingStorage16kFit.getIcon(); + case 3 | FLAG_FORMED -> ExtraBlockTextures.BlockCraftingStorage64kFit.getIcon(); + }; } @Override @@ -69,15 +58,11 @@ public void getCheckedSubBlocks(final Item item, final CreativeTabs tabs, final @Override public String getUnlocalizedName(final ItemStack is) { - switch (is.getItemDamage()) { - case 1: - return "tile.appliedenergistics2.BlockCraftingStorage4k"; - case 2: - return "tile.appliedenergistics2.BlockCraftingStorage16k"; - case 3: - return "tile.appliedenergistics2.BlockCraftingStorage64k"; - default: - return this.getItemUnlocalizedName(is); - } + return switch (is.getItemDamage()) { + case 1 -> "tile.appliedenergistics2.BlockCraftingStorage4k"; + case 2 -> "tile.appliedenergistics2.BlockCraftingStorage16k"; + case 3 -> "tile.appliedenergistics2.BlockCraftingStorage64k"; + default -> this.getItemUnlocalizedName(is); + }; } } diff --git a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java index b078bfce7a7..2709a9603b8 100644 --- a/src/main/java/appeng/block/crafting/BlockCraftingUnit.java +++ b/src/main/java/appeng/block/crafting/BlockCraftingUnit.java @@ -53,25 +53,16 @@ public BlockCraftingUnit() { @Override public IIcon getIcon(final int direction, final int metadata) { - switch (metadata) { - default: - case 0: - return super.getIcon(0, 0); - case 1: - return ExtraBlockTextures.BlockCraftingAccelerator.getIcon(); - case FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingUnitFit.getIcon(); - case 1 | FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingAcceleratorFit.getIcon(); - case 2: - return ExtraBlockTextures.BlockCraftingAccelerator4x.getIcon(); - case 2 | FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingAccelerator4xFit.getIcon(); - case 3: - return ExtraBlockTextures.BlockCraftingAccelerator16x.getIcon(); - case 3 | FLAG_FORMED: - return ExtraBlockTextures.BlockCraftingAccelerator16xFit.getIcon(); - } + return switch (metadata) { + default -> super.getIcon(0, 0); + case 1 -> ExtraBlockTextures.BlockCraftingAccelerator.getIcon(); + case FLAG_FORMED -> ExtraBlockTextures.BlockCraftingUnitFit.getIcon(); + case 1 | FLAG_FORMED -> ExtraBlockTextures.BlockCraftingAcceleratorFit.getIcon(); + case 2 -> ExtraBlockTextures.BlockCraftingAccelerator4x.getIcon(); + case 2 | FLAG_FORMED -> ExtraBlockTextures.BlockCraftingAccelerator4xFit.getIcon(); + case 3 -> ExtraBlockTextures.BlockCraftingAccelerator16x.getIcon(); + case 3 | FLAG_FORMED -> ExtraBlockTextures.BlockCraftingAccelerator16xFit.getIcon(); + }; } @Override diff --git a/src/main/java/appeng/block/misc/BlockCharger.java b/src/main/java/appeng/block/misc/BlockCharger.java index b46bc6220ec..d4190d8ced7 100644 --- a/src/main/java/appeng/block/misc/BlockCharger.java +++ b/src/main/java/appeng/block/misc/BlockCharger.java @@ -83,8 +83,7 @@ public void randomDisplayTick(final World w, final int x, final int y, final int } final AEBaseTile tile = this.getTileEntity(w, x, y, z); - if (tile instanceof TileCharger) { - final TileCharger tc = (TileCharger) tile; + if (tile instanceof TileCharger tc) { if (AEApi.instance().definitions().materials().certusQuartzCrystalCharged() .isSameAs(tc.getStackInSlot(0))) { @@ -134,26 +133,13 @@ public Iterable getSelectedBoundingBoxesFromPool(final World w, f } switch (forward) { - case DOWN: - bb.maxY = 1; - break; - case UP: - bb.minY = 0; - break; - case NORTH: - bb.maxZ = 1; - break; - case SOUTH: - bb.minZ = 0; - break; - case EAST: - bb.minX = 0; - break; - case WEST: - bb.maxX = 1; - break; - default: - break; + case DOWN -> bb.maxY = 1; + case UP -> bb.minY = 0; + case NORTH -> bb.maxZ = 1; + case SOUTH -> bb.minZ = 0; + case EAST -> bb.minX = 0; + case WEST -> bb.maxX = 1; + default -> {} } return Collections.singletonList(bb); diff --git a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java index 5673c4ae90a..ddc9dc7f6e8 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java +++ b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java @@ -74,38 +74,38 @@ public void randomDisplayTick(final World w, final int x, final int y, final int double dz = 0; double dx = 0; switch (r.nextInt(4)) { - case 0: + case 0 -> { dx = 0.6; dz = d1; if (!w.getBlock(x + west.offsetX, y + west.offsetY, z + west.offsetZ) .isAir(w, x + west.offsetX, y + west.offsetY, z + west.offsetZ)) { return; } - break; - case 1: + } + case 1 -> { dx = d1; dz += 0.6; if (!w.getBlock(x + forward.offsetX, y + forward.offsetY, z + forward.offsetZ) .isAir(w, x + forward.offsetX, y + forward.offsetY, z + forward.offsetZ)) { return; } - break; - case 2: + } + case 2 -> { dx = d1; dz = -0.6; if (!w.getBlock(x - forward.offsetX, y - forward.offsetY, z - forward.offsetZ) .isAir(w, x - forward.offsetX, y - forward.offsetY, z - forward.offsetZ)) { return; } - break; - case 3: + } + case 3 -> { dx = -0.6; dz = d1; if (!w.getBlock(x - west.offsetX, y - west.offsetY, z - west.offsetZ) .isAir(w, x - west.offsetX, y - west.offsetY, z - west.offsetZ)) { return; } - break; + } } rx += dx * west.offsetX; diff --git a/src/main/java/appeng/block/misc/BlockSkyCompass.java b/src/main/java/appeng/block/misc/BlockSkyCompass.java index fb15e84cce6..9b28c680c54 100644 --- a/src/main/java/appeng/block/misc/BlockSkyCompass.java +++ b/src/main/java/appeng/block/misc/BlockSkyCompass.java @@ -113,44 +113,43 @@ public Iterable getSelectedBoundingBoxesFromPool(final World w, f double maxZ = 1; switch (forward) { - case DOWN: + case DOWN -> { minZ = minX = 5.0 / 16.0; maxZ = maxX = 11.0 / 16.0; maxY = 1.0; minY = 14.0 / 16.0; - break; - case EAST: + } + case EAST -> { minZ = minY = 5.0 / 16.0; maxZ = maxY = 11.0 / 16.0; maxX = 2.0 / 16.0; minX = 0.0; - break; - case NORTH: + } + case NORTH -> { minY = minX = 5.0 / 16.0; maxY = maxX = 11.0 / 16.0; maxZ = 1.0; minZ = 14.0 / 16.0; - break; - case SOUTH: + } + case SOUTH -> { minY = minX = 5.0 / 16.0; maxY = maxX = 11.0 / 16.0; maxZ = 2.0 / 16.0; minZ = 0.0; - break; - case UP: + } + case UP -> { minZ = minX = 5.0 / 16.0; maxZ = maxX = 11.0 / 16.0; maxY = 2.0 / 16.0; minY = 0.0; - break; - case WEST: + } + case WEST -> { minZ = minY = 5.0 / 16.0; maxZ = maxY = 11.0 / 16.0; maxX = 1.0; minX = 14.0 / 16.0; - break; - default: - break; + } + default -> {} } return Collections.singletonList(AxisAlignedBB.getBoundingBox(minX, minY, minZ, maxX, maxY, maxZ)); diff --git a/src/main/java/appeng/block/misc/BlockTinyTNT.java b/src/main/java/appeng/block/misc/BlockTinyTNT.java index bc23349decd..ad2da33af8f 100644 --- a/src/main/java/appeng/block/misc/BlockTinyTNT.java +++ b/src/main/java/appeng/block/misc/BlockTinyTNT.java @@ -135,8 +135,7 @@ public void onBlockDestroyedByExplosion(final World w, final int x, final int y, @Override public void onEntityCollidedWithBlock(final World w, final int x, final int y, final int z, final Entity entity) { - if (entity instanceof EntityArrow && !w.isRemote) { - final EntityArrow entityarrow = (EntityArrow) entity; + if (entity instanceof EntityArrow entityarrow && !w.isRemote) { if (entityarrow.isBurning()) { this.startFuse( diff --git a/src/main/java/appeng/block/misc/BlockVibrationChamber.java b/src/main/java/appeng/block/misc/BlockVibrationChamber.java index 3804a9dca51..0e672ee437b 100644 --- a/src/main/java/appeng/block/misc/BlockVibrationChamber.java +++ b/src/main/java/appeng/block/misc/BlockVibrationChamber.java @@ -75,8 +75,7 @@ public void randomDisplayTick(final World w, final int x, final int y, final int } final AEBaseTile tile = this.getTileEntity(w, x, y, z); - if (tile instanceof TileVibrationChamber) { - final TileVibrationChamber tc = (TileVibrationChamber) tile; + if (tile instanceof TileVibrationChamber tc) { if (tc.isOn) { float f1 = x + 0.5F; float f2 = y + 0.5F; diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index f551e483de0..d010dc37d1f 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -187,20 +187,14 @@ public boolean removedByPlayer(final World world, final EntityPlayer player, fin @Override public boolean canConnectRedstone(final IBlockAccess w, final int x, final int y, final int z, final int side) { - switch (side) { - case -1: - case 4: - return this.cb(w, x, y, z).canConnectRedstone(EnumSet.of(ForgeDirection.UP, ForgeDirection.DOWN)); - case 0: - return this.cb(w, x, y, z).canConnectRedstone(EnumSet.of(ForgeDirection.NORTH)); - case 1: - return this.cb(w, x, y, z).canConnectRedstone(EnumSet.of(ForgeDirection.EAST)); - case 2: - return this.cb(w, x, y, z).canConnectRedstone(EnumSet.of(ForgeDirection.SOUTH)); - case 3: - return this.cb(w, x, y, z).canConnectRedstone(EnumSet.of(ForgeDirection.WEST)); - } - return false; + return switch (side) { + case -1, 4 -> this.cb(w, x, y, z).canConnectRedstone(EnumSet.of(ForgeDirection.UP, ForgeDirection.DOWN)); + case 0 -> this.cb(w, x, y, z).canConnectRedstone(EnumSet.of(ForgeDirection.NORTH)); + case 1 -> this.cb(w, x, y, z).canConnectRedstone(EnumSet.of(ForgeDirection.EAST)); + case 2 -> this.cb(w, x, y, z).canConnectRedstone(EnumSet.of(ForgeDirection.SOUTH)); + case 3 -> this.cb(w, x, y, z).canConnectRedstone(EnumSet.of(ForgeDirection.WEST)); + default -> false; + }; } @Override @@ -234,8 +228,7 @@ public ItemStack getPickBlock(final MovingObjectPosition target, final World wor public boolean addHitEffects(final World world, final MovingObjectPosition target, final EffectRenderer effectRenderer) { final Object object = this.cb(world, target.blockX, target.blockY, target.blockZ); - if (object instanceof IPartHost) { - final IPartHost host = (IPartHost) object; + if (object instanceof IPartHost host) { for (final ForgeDirection side : ForgeDirection.values()) { final IPart p = host.getPart(side); @@ -285,8 +278,7 @@ public boolean addHitEffects(final World world, final MovingObjectPosition targe public boolean addDestroyEffects(final World world, final int x, final int y, final int z, final int meta, final EffectRenderer effectRenderer) { final Object object = this.cb(world, x, y, z); - if (object instanceof IPartHost) { - final IPartHost host = (IPartHost) object; + if (object instanceof IPartHost host) { for (final ForgeDirection side : ForgeDirection.values()) { final IPart p = host.getPart(side); diff --git a/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java b/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java index 6916d3200da..c4a5b45c0fc 100644 --- a/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java +++ b/src/main/java/appeng/block/networking/BlockDenseEnergyCell.java @@ -28,25 +28,17 @@ public BlockDenseEnergyCell() { @Override public IIcon getIcon(final int direction, final int metadata) { - switch (metadata) { - case 0: - return ExtraBlockTextures.MEDenseEnergyCell0.getIcon(); - case 1: - return ExtraBlockTextures.MEDenseEnergyCell1.getIcon(); - case 2: - return ExtraBlockTextures.MEDenseEnergyCell2.getIcon(); - case 3: - return ExtraBlockTextures.MEDenseEnergyCell3.getIcon(); - case 4: - return ExtraBlockTextures.MEDenseEnergyCell4.getIcon(); - case 5: - return ExtraBlockTextures.MEDenseEnergyCell5.getIcon(); - case 6: - return ExtraBlockTextures.MEDenseEnergyCell6.getIcon(); - case 7: - return ExtraBlockTextures.MEDenseEnergyCell7.getIcon(); - } - return super.getIcon(direction, metadata); + return switch (metadata) { + case 0 -> ExtraBlockTextures.MEDenseEnergyCell0.getIcon(); + case 1 -> ExtraBlockTextures.MEDenseEnergyCell1.getIcon(); + case 2 -> ExtraBlockTextures.MEDenseEnergyCell2.getIcon(); + case 3 -> ExtraBlockTextures.MEDenseEnergyCell3.getIcon(); + case 4 -> ExtraBlockTextures.MEDenseEnergyCell4.getIcon(); + case 5 -> ExtraBlockTextures.MEDenseEnergyCell5.getIcon(); + case 6 -> ExtraBlockTextures.MEDenseEnergyCell6.getIcon(); + case 7 -> ExtraBlockTextures.MEDenseEnergyCell7.getIcon(); + default -> super.getIcon(direction, metadata); + }; } @Override diff --git a/src/main/java/appeng/block/networking/BlockEnergyCell.java b/src/main/java/appeng/block/networking/BlockEnergyCell.java index 29085a53851..2a8c276797b 100644 --- a/src/main/java/appeng/block/networking/BlockEnergyCell.java +++ b/src/main/java/appeng/block/networking/BlockEnergyCell.java @@ -49,25 +49,17 @@ protected RenderBlockEnergyCube getRenderer() { @Override public IIcon getIcon(final int direction, final int metadata) { - switch (metadata) { - case 0: - return ExtraBlockTextures.MEEnergyCell0.getIcon(); - case 1: - return ExtraBlockTextures.MEEnergyCell1.getIcon(); - case 2: - return ExtraBlockTextures.MEEnergyCell2.getIcon(); - case 3: - return ExtraBlockTextures.MEEnergyCell3.getIcon(); - case 4: - return ExtraBlockTextures.MEEnergyCell4.getIcon(); - case 5: - return ExtraBlockTextures.MEEnergyCell5.getIcon(); - case 6: - return ExtraBlockTextures.MEEnergyCell6.getIcon(); - case 7: - return ExtraBlockTextures.MEEnergyCell7.getIcon(); - } - return super.getIcon(direction, metadata); + return switch (metadata) { + case 0 -> ExtraBlockTextures.MEEnergyCell0.getIcon(); + case 1 -> ExtraBlockTextures.MEEnergyCell1.getIcon(); + case 2 -> ExtraBlockTextures.MEEnergyCell2.getIcon(); + case 3 -> ExtraBlockTextures.MEEnergyCell3.getIcon(); + case 4 -> ExtraBlockTextures.MEEnergyCell4.getIcon(); + case 5 -> ExtraBlockTextures.MEEnergyCell5.getIcon(); + case 6 -> ExtraBlockTextures.MEEnergyCell6.getIcon(); + case 7 -> ExtraBlockTextures.MEEnergyCell7.getIcon(); + default -> super.getIcon(direction, metadata); + }; } @Override diff --git a/src/main/java/appeng/block/networking/BlockWireless.java b/src/main/java/appeng/block/networking/BlockWireless.java index 72980523086..71460d20843 100644 --- a/src/main/java/appeng/block/networking/BlockWireless.java +++ b/src/main/java/appeng/block/networking/BlockWireless.java @@ -78,44 +78,43 @@ public Iterable getSelectedBoundingBoxesFromPool(final World w, f double maxZ = 1; switch (forward) { - case DOWN: + case DOWN -> { minZ = minX = 3.0 / 16.0; maxZ = maxX = 13.0 / 16.0; maxY = 1.0; minY = 5.0 / 16.0; - break; - case EAST: + } + case EAST -> { minZ = minY = 3.0 / 16.0; maxZ = maxY = 13.0 / 16.0; maxX = 11.0 / 16.0; minX = 0.0; - break; - case NORTH: + } + case NORTH -> { minY = minX = 3.0 / 16.0; maxY = maxX = 13.0 / 16.0; maxZ = 1.0; minZ = 5.0 / 16.0; - break; - case SOUTH: + } + case SOUTH -> { minY = minX = 3.0 / 16.0; maxY = maxX = 13.0 / 16.0; maxZ = 11.0 / 16.0; minZ = 0.0; - break; - case UP: + } + case UP -> { minZ = minX = 3.0 / 16.0; maxZ = maxX = 13.0 / 16.0; maxY = 11.0 / 16.0; minY = 0.0; - break; - case WEST: + } + case WEST -> { minZ = minY = 3.0 / 16.0; maxZ = maxY = 13.0 / 16.0; maxX = 1.0; minX = 5.0 / 16.0; - break; - default: - break; + } + default -> {} } return Collections.singletonList(AxisAlignedBB.getBoundingBox(minX, minY, minZ, maxX, maxY, maxZ)); @@ -138,44 +137,43 @@ public void addCollidingBlockToList(final World w, final int x, final int y, fin double maxZ = 1; switch (forward) { - case DOWN: + case DOWN -> { minZ = minX = 3.0 / 16.0; maxZ = maxX = 13.0 / 16.0; maxY = 1.0; minY = 5.0 / 16.0; - break; - case EAST: + } + case EAST -> { minZ = minY = 3.0 / 16.0; maxZ = maxY = 13.0 / 16.0; maxX = 11.0 / 16.0; minX = 0.0; - break; - case NORTH: + } + case NORTH -> { minY = minX = 3.0 / 16.0; maxY = maxX = 13.0 / 16.0; maxZ = 1.0; minZ = 5.0 / 16.0; - break; - case SOUTH: + } + case SOUTH -> { minY = minX = 3.0 / 16.0; maxY = maxX = 13.0 / 16.0; maxZ = 11.0 / 16.0; minZ = 0.0; - break; - case UP: + } + case UP -> { minZ = minX = 3.0 / 16.0; maxZ = maxX = 13.0 / 16.0; maxY = 11.0 / 16.0; minY = 0.0; - break; - case WEST: + } + case WEST -> { minZ = minY = 3.0 / 16.0; maxZ = maxY = 13.0 / 16.0; maxX = 1.0; minX = 5.0 / 16.0; - break; - default: - break; + } + default -> {} } out.add(AxisAlignedBB.getBoundingBox(minX, minY, minZ, maxX, maxY, maxZ)); diff --git a/src/main/java/appeng/block/solids/OreQuartzCharged.java b/src/main/java/appeng/block/solids/OreQuartzCharged.java index 88946b1e967..16b72daa0bf 100644 --- a/src/main/java/appeng/block/solids/OreQuartzCharged.java +++ b/src/main/java/appeng/block/solids/OreQuartzCharged.java @@ -67,27 +67,13 @@ public void randomDisplayTick(final World w, final int x, final int y, final int double zOff = (r.nextFloat()); switch (r.nextInt(6)) { - case 0: - xOff = -0.01; - break; - case 1: - yOff = -0.01; - break; - case 2: - xOff = -0.01; - break; - case 3: - zOff = -0.01; - break; - case 4: - xOff = 1.01; - break; - case 5: - yOff = 1.01; - break; - case 6: - zOff = 1.01; - break; + case 0 -> xOff = -0.01; + case 1 -> yOff = -0.01; + case 2 -> xOff = -0.01; + case 3 -> zOff = -0.01; + case 4 -> xOff = 1.01; + case 5 -> yOff = 1.01; + case 6 -> zOff = 1.01; } if (CommonHelper.proxy.shouldAddParticles(r)) { diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index 029aa01f004..df675fa39a7 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -131,7 +131,7 @@ public void bindTileEntitySpecialRenderer(final Class tile, final AEBaseBlock bl @Override public List getPlayers() { if (Platform.isClient()) { - final List o = new ArrayList(); + final List o = new ArrayList<>(); o.add(Minecraft.getMinecraft().thePlayer); return o; } else { @@ -144,25 +144,31 @@ public void spawnEffect(final EffectType effect, final World worldObj, final dou final double posZ, final Object o) { if (AEConfig.instance.enableEffects) { switch (effect) { - case Assembler: + case Assembler -> { this.spawnAssembler(worldObj, posX, posY, posZ, o); return; - case Vibrant: + } + case Vibrant -> { this.spawnVibrant(worldObj, posX, posY, posZ); return; - case Crafting: + } + case Crafting -> { this.spawnCrafting(worldObj, posX, posY, posZ); return; - case Energy: + } + case Energy -> { this.spawnEnergy(worldObj, posX, posY, posZ); return; - case Lightning: + } + case Lightning -> { this.spawnLightning(worldObj, posX, posY, posZ); return; - case LightningArc: + } + case LightningArc -> { this.spawnLightningArc(worldObj, posX, posY, posZ, (Vec3) o); return; - default: + } + default -> {} } } } diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 00cc4229b28..485d8cbb75f 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -65,9 +65,9 @@ public abstract class AEBaseGui extends GuiContainer { private static boolean switchingGuis; - private final List meSlots = new LinkedList(); + private final List meSlots = new LinkedList<>(); // drag y - private final Set drag_click = new HashSet(); + private final Set drag_click = new HashSet<>(); private final AppEngRenderItem aeRenderItem = new AppEngRenderItem(); private GuiScrollbar scrollBar = null; private boolean disableShiftClick = false; @@ -106,12 +106,7 @@ public void initGui() { super.initGui(); final List slots = this.getInventorySlots(); - final Iterator i = slots.iterator(); - while (i.hasNext()) { - if (i.next() instanceof SlotME) { - i.remove(); - } - } + slots.removeIf(slot -> slot instanceof SlotME); for (final InternalSlotME me : this.meSlots) { slots.add(new SlotME(me)); @@ -252,8 +247,7 @@ protected final void drawGuiContainerBackgroundLayer(final float f, final int x, final List slots = this.getInventorySlots(); for (final Slot slot : slots) { - if (slot instanceof OptionalSlotFake) { - final OptionalSlotFake fs = (OptionalSlotFake) slot; + if (slot instanceof OptionalSlotFake fs) { if (fs.renderDisabled()) { if (fs.isEnabled()) { this.drawTexturedModalRect( @@ -450,28 +444,20 @@ protected void handleMouseClick(final Slot slot, final int slotIdx, final int ct InventoryAction action = null; switch (mouseButton) { - case 0: // pickup / set-down. + case 0 -> // pickup / set-down. { ItemStack heldStack = player.inventory.getItemStack(); if (slot.getStack() == null && heldStack != null) action = InventoryAction.SPLIT_OR_PLACE_SINGLE; else if (slot.getStack() != null && (heldStack == null || heldStack.stackSize <= 1)) action = InventoryAction.PICKUP_OR_SET_DOWN; } - break; - case 1: - action = ctrlDown == 1 ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK; - break; - - case 3: // creative dupe: + case 1 -> action = ctrlDown == 1 ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK; + case 3 -> { // creative dupe: if (player.capabilities.isCreativeMode) { action = InventoryAction.CREATIVE_DUPLICATE; } - - break; - - default: - case 4: // drop item: - case 6: + } // drop item: + default -> {} } if (action != null) { @@ -490,23 +476,20 @@ else if (slot.getStack() != null && (heldStack == null || heldStack.stackSize <= IAEItemStack stack = null; switch (mouseButton) { - case 0: // pickup / set-down. + case 0 -> { // pickup / set-down. action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN; stack = ((SlotME) slot).getAEStack(); - if (stack != null && action == InventoryAction.PICKUP_OR_SET_DOWN && stack.getStackSize() == 0 && player.inventory.getItemStack() == null) { action = InventoryAction.AUTO_CRAFT; } - - break; - case 1: + } + case 1 -> { action = ctrlDown == 1 ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK; stack = ((SlotME) slot).getAEStack(); - break; - - case 3: // creative dupe: + } + case 3 -> { // creative dupe: stack = ((SlotME) slot).getAEStack(); if (stack != null && stack.isCraftable()) { action = InventoryAction.AUTO_CRAFT; @@ -516,11 +499,8 @@ else if (slot.getStack() != null && (heldStack == null || heldStack.stackSize <= action = InventoryAction.CREATIVE_DUPLICATE; } } - break; - - default: - case 4: // drop item: - case 6: + } // drop item: + default -> {} } if (action != null) { @@ -748,9 +728,8 @@ private void drawSlot(final Slot s) { } else { try { final ItemStack is = s.getStack(); - if (s instanceof AppEngSlot && (((AppEngSlot) s).renderIconWithItem() || is == null) + if (s instanceof AppEngSlot aes && (((AppEngSlot) s).renderIconWithItem() || is == null) && (((AppEngSlot) s).shouldDisplay())) { - final AppEngSlot aes = (AppEngSlot) s; if (aes.getIcon() >= 0) { this.bindTexture("guis/states.png"); @@ -909,7 +888,7 @@ public static final synchronized void setSwitchingGuis(final boolean switchingGu protected void addItemTooltip(ItemStack is, List lineList) { if (isShiftKeyDown()) { - List l = is.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips); + List l = is.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips); if (!l.isEmpty()) l.remove(0); lineList.addAll(l); } else { @@ -948,12 +927,12 @@ public void drawCreativeTabHoveringText(String tabName, int mouseX, int mouseY) super.drawCreativeTabHoveringText(tabName, mouseX, mouseY); } - public void drawHoveringText(List textLines, int x, int y) { + public void drawHoveringText(List textLines, int x, int y) { super.func_146283_a(textLines, x, y); } @Override - public void drawHoveringText(List textLines, int x, int y, FontRenderer font) { + public void drawHoveringText(List textLines, int x, int y, FontRenderer font) { super.drawHoveringText(textLines, x, y, font); } diff --git a/src/main/java/appeng/client/gui/AEBaseMEGui.java b/src/main/java/appeng/client/gui/AEBaseMEGui.java index 4f84530ab11..67ee5d698c0 100644 --- a/src/main/java/appeng/client/gui/AEBaseMEGui.java +++ b/src/main/java/appeng/client/gui/AEBaseMEGui.java @@ -109,7 +109,8 @@ public void renderToolTip(final ItemStack stack, final int x, final int y) { this.drawTooltip(x, y, 0, join(currentToolTip, "\n")); } else if (stack.stackSize > BigNumber) { - final List var4 = stack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips); + final List var4 = stack + .getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips); var4.add("Items Stored: " + NumberFormat.getNumberInstance(Locale.US).format(stack.stackSize)); this.drawTooltip(x, y, 0, join(var4, "\n")); return; diff --git a/src/main/java/appeng/client/gui/config/AEConfigGui.java b/src/main/java/appeng/client/gui/config/AEConfigGui.java index a5a13861f7f..3f81de9a602 100644 --- a/src/main/java/appeng/client/gui/config/AEConfigGui.java +++ b/src/main/java/appeng/client/gui/config/AEConfigGui.java @@ -35,7 +35,7 @@ public AEConfigGui(final GuiScreen parent) { } private static List getConfigElements() { - final List list = new ArrayList(); + final List list = new ArrayList<>(); for (final String cat : AEConfig.instance.getCategoryNames()) { if (cat.equals("versionchecker")) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java index 1e2cbe7c69a..11b1e8006a0 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java @@ -55,25 +55,19 @@ public enum DisplayMode { TREE; public DisplayMode next() { - switch (this) { - case LIST: - return TREE; - case TREE: - return LIST; - default: - throw new IllegalArgumentException(this.toString()); - } + return switch (this) { + case LIST -> TREE; + case TREE -> LIST; + default -> throw new IllegalArgumentException(this.toString()); + }; } public int getYSize() { - switch (this) { - case LIST: - return 206; - case TREE: - return 238; - default: - throw new IllegalArgumentException(this.toString()); - } + return switch (this) { + case LIST -> 206; + case TREE -> 238; + default -> throw new IllegalArgumentException(this.toString()); + }; } } @@ -211,12 +205,8 @@ public void drawScreen(final int mouseX, final int mouseY, final float btn) { super.drawScreen(mouseX, mouseY, btn); switch (displayMode) { - case LIST: - drawListScreen(mouseX, mouseY, btn); - break; - case TREE: - drawTreeScreen(mouseX, mouseY, btn); - break; + case LIST -> drawListScreen(mouseX, mouseY, btn); + case TREE -> drawTreeScreen(mouseX, mouseY, btn); } } @@ -297,12 +287,8 @@ public void drawFG(final int offsetX, final int offsetY, final int mouseX, final GuiColors.CraftConfirmCraftingPlan.getColor()); switch (displayMode) { - case LIST: - drawListFG(offsetX, offsetY, mouseX, mouseY); - break; - case TREE: - drawTreeFG(offsetX, offsetY, mouseX, mouseY); - break; + case LIST -> drawListFG(offsetX, offsetY, mouseX, mouseY); + case TREE -> drawTreeFG(offsetX, offsetY, mouseX, mouseY); } } @@ -335,7 +321,7 @@ private void drawListFG(final int offsetX, final int offsetY, final int mouseX, final int viewEnd = viewStart + 3 * this.rows; String dspToolTip = ""; - final List lineList = new LinkedList(); + final List lineList = new LinkedList<>(); int toolPosX = 0; int toolPosY = 0; hoveredStack = null; @@ -491,54 +477,47 @@ public void drawBG(final int offsetX, final int offsetY, final int mouseX, final this.setScrollBar(); switch (displayMode) { - case LIST: - this.bindTexture("guis/craftingreport.png"); - break; - case TREE: - this.bindTexture("guis/craftingtree.png"); - break; + case LIST -> this.bindTexture("guis/craftingreport.png"); + case TREE -> this.bindTexture("guis/craftingtree.png"); } this.drawTexturedModalRect(offsetX, offsetY, 0, 0, this.xSize, this.ySize); } private void setScrollBar() { switch (displayMode) { - case LIST: + case LIST -> { if (getScrollBar() == null) { setScrollBar(scrollbar); } final int size = this.visual.size(); - this.getScrollBar().setTop(19).setLeft(218).setHeight(114); this.getScrollBar().setRange(0, (size + 2) / 3 - this.rows, 1); - break; - case TREE: + } + case TREE -> { if (getScrollBar() != null) { setScrollBar(null); } - break; + } } } public void postUpdate(final List list, final byte ref) { switch (ref) { - case 0: + case 0 -> { for (final IAEItemStack l : list) { this.handleInput(this.storage, l); } - break; - - case 1: + } + case 1 -> { for (final IAEItemStack l : list) { this.handleInput(this.pending, l); } - break; - - case 2: + } + case 2 -> { for (final IAEItemStack l : list) { this.handleInput(this.missing, l); } - break; + } } for (final IAEItemStack l : list) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java index 692154b8f05..4cc9c74db00 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java @@ -151,7 +151,7 @@ public int getStringWidth() { } } - private List visual = new ArrayList(); + private List visual = new ArrayList<>(); private GuiButton cancel; private int tooltip = -1; private final RemainingOperations remainingOperations = new RemainingOperations(); @@ -176,7 +176,7 @@ public void clearItems() { this.storage = AEApi.instance().storage().createItemList(); this.active = AEApi.instance().storage().createItemList(); this.pending = AEApi.instance().storage().createItemList(); - this.visual = new ArrayList(); + this.visual = new ArrayList<>(); } @Override @@ -313,7 +313,7 @@ public void drawFG(final int offsetX, final int offsetY, final int mouseX, final final int viewEnd = viewStart + 3 * 6; String dspToolTip = ""; - final List lineList = new LinkedList(); + final List lineList = new LinkedList<>(); int toolPosX = 0; int toolPosY = 0; @@ -504,23 +504,21 @@ public void postUpdate(int remainingOperations) { public void postUpdate(final List list, final byte ref) { switch (ref) { - case 0: + case 0 -> { for (final IAEItemStack l : list) { this.handleInput(this.storage, l); } - break; - - case 1: + } + case 1 -> { for (final IAEItemStack l : list) { this.handleInput(this.active, l); } - break; - - case 2: + } + case 2 -> { for (final IAEItemStack l : list) { this.handleInput(this.pending, l); } - break; + } } for (final IAEItemStack l : list) { diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterface.java b/src/main/java/appeng/client/gui/implementations/GuiInterface.java index 4d92990fd20..e823a46f90e 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterface.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterface.java @@ -95,17 +95,13 @@ public void drawFG(final int offsetX, final int offsetY, final int mouseX, final @Override protected String getBackground() { - switch (((ContainerInterface) this.cvb).getPatternCapacityCardsInstalled()) { - case -1: - return "guis/interfacenone.png"; - case 1: - return "guis/interface2.png"; - case 2: - return "guis/interface3.png"; - case 3: - return "guis/interface4.png"; - } - return "guis/interface.png"; + return switch (((ContainerInterface) this.cvb).getPatternCapacityCardsInstalled()) { + case -1 -> "guis/interfacenone.png"; + case 1 -> "guis/interface2.png"; + case 2 -> "guis/interface3.png"; + case 3 -> "guis/interface4.png"; + default -> "guis/interface.png"; + }; } @Override diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java index 31766209488..c70ef529db3 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java @@ -165,8 +165,7 @@ public void initGui() { protected void repositionSlots() { for (final Object obj : this.inventorySlots.inventorySlots) { - if (obj instanceof AppEngSlot) { - final AppEngSlot slot = (AppEngSlot) obj; + if (obj instanceof AppEngSlot slot) { slot.yDisplayPosition = this.ySize + slot.getY() - 78 - 7; } } @@ -198,8 +197,7 @@ public void drawFG(final int offsetX, final int offsetY, final int mouseX, final final int ex = getScrollBar().getCurrentScroll(); for (int x = 0; x < this.rows && ex + x < this.lines.size(); x++) { final Object lineObj = this.lines.get(ex + x); - if (lineObj instanceof ClientDCInternalInv) { - final ClientDCInternalInv inv = (ClientDCInternalInv) lineObj; + if (lineObj instanceof ClientDCInternalInv inv) { for (int z = 0; z < inv.getInventory().getSizeInventory(); z++) { if (this.matchedStacks.contains(inv.getInventory().getStackInSlot(z))) drawRect( z * 18 + 22, @@ -208,8 +206,7 @@ public void drawFG(final int offsetX, final int offsetY, final int mouseX, final 1 + offset + 16, GuiColors.InterfaceTerminalMatch.getColor()); } - } else if (lineObj instanceof String) { - String name = (String) lineObj; + } else if (lineObj instanceof String name) { final int rows = this.byName.get(name).size(); String postfix = ""; @@ -261,8 +258,7 @@ public void drawScreen(final int mouseX, final int mouseY, final float btn) { final int ex = this.getScrollBar().getCurrentScroll(); for (int x = 0; x < this.rows && ex + x < this.lines.size(); x++) { final Object lineObj = this.lines.get(ex + x); - if (lineObj instanceof ClientDCInternalInv) { - final ClientDCInternalInv inv = (ClientDCInternalInv) lineObj; + if (lineObj instanceof ClientDCInternalInv inv) { for (int z = 0; z < inv.getInventory().getSizeInventory(); z++) { inventorySlots.inventorySlots.add(new SlotDisconnected(inv, z, z * 18 + 22, 1 + offset)); } @@ -329,8 +325,7 @@ protected void actionPerformed(final GuiButton btn) { } else if (btn == guiButtonBrokenRecipes) { onlyBrokenRecipes = !onlyBrokenRecipes; this.refreshList(); - } else if (btn instanceof GuiImgButton) { - final GuiImgButton iBtn = (GuiImgButton) btn; + } else if (btn instanceof GuiImgButton iBtn) { if (iBtn.getSetting() != Settings.ACTIONS) { final Enum cv = iBtn.getCurrentValue(); final boolean backwards = Mouse.isButtonDown(1); @@ -367,8 +362,7 @@ public void drawBG(final int offsetX, final int offsetY, final int mouseX, final for (int x = 0; x < this.rows && ex + x < this.lines.size(); x++) { final Object lineObj = this.lines.get(ex + x); - if (lineObj instanceof ClientDCInternalInv) { - final ClientDCInternalInv inv = (ClientDCInternalInv) lineObj; + if (lineObj instanceof ClientDCInternalInv inv) { GL11.glColor4f(1, 1, 1, 1); final int width = inv.getInventory().getSizeInventory() * 18; diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java index 8203eba9109..41b96871017 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java +++ b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java @@ -178,8 +178,7 @@ protected void actionPerformed(final GuiButton btn) { NetworkHandler.instance.sendToServer(new PacketSwitchGuis(GuiBridge.GUI_CRAFTING_STATUS)); } - if (btn instanceof GuiImgButton) { - final GuiImgButton iBtn = (GuiImgButton) btn; + if (btn instanceof GuiImgButton iBtn) { if (iBtn.getSetting() != Settings.ACTIONS) { final Enum cv = iBtn.getCurrentValue(); final boolean backwards = Mouse.isButtonDown(1); diff --git a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java index 790dc1e4c20..03561552499 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiImgButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiImgButton.java @@ -45,7 +45,7 @@ public GuiImgButton(final int x, final int y, final Enum idx, final Enum val) { this.height = 16; if (appearances == null) { - appearances = new HashMap(); + appearances = new HashMap<>(); this.registerApp( 16 * 7, Settings.CONDENSER_OUTPUT, diff --git a/src/main/java/appeng/client/me/ItemRepo.java b/src/main/java/appeng/client/me/ItemRepo.java index 4bf8271d9ef..0fa626b514c 100644 --- a/src/main/java/appeng/client/me/ItemRepo.java +++ b/src/main/java/appeng/client/me/ItemRepo.java @@ -13,7 +13,6 @@ import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.function.BiPredicate; import java.util.regex.Pattern; @@ -44,8 +43,8 @@ public class ItemRepo { private final IItemList list = AEApi.instance().storage().createItemList(); - private final ArrayList view = new ArrayList(); - private final ArrayList dsp = new ArrayList(); + private final ArrayList view = new ArrayList<>(); + private final ArrayList dsp = new ArrayList<>(); private final IScrollSource src; private final ISortSource sortSrc; @@ -133,20 +132,12 @@ public void updateView() { if (this.innerSearch.length() == 0) { searchWhat = SearchMode.ITEM; } else { - switch (this.innerSearch.substring(0, 1)) { - case "#": - searchWhat = SearchMode.TOOLTIPS; - break; - case "@": - searchWhat = SearchMode.MOD; - break; - case "$": - searchWhat = SearchMode.ORE; - break; - default: - searchWhat = SearchMode.ITEM; - break; - } + searchWhat = switch (this.innerSearch.substring(0, 1)) { + case "#" -> SearchMode.TOOLTIPS; + case "@" -> SearchMode.MOD; + case "$" -> SearchMode.ORE; + default -> SearchMode.ITEM; + }; if (searchWhat != SearchMode.ITEM) this.innerSearch = this.innerSearch.substring(1); } Pattern m = null; @@ -187,21 +178,15 @@ public void updateView() { } String dspName = null; switch (searchWhat) { - case MOD: - dspName = Platform.getModId(is); - break; - case ORE: + case MOD -> dspName = Platform.getModId(is); + case ORE -> { OreReference ore = OreHelper.INSTANCE.isOre(is.getItemStack()); if (ore != null) { dspName = String.join(" ", ore.getEquivalents()); } - break; - case TOOLTIPS: - dspName = String.join(" ", ((List) Platform.getTooltip(is))); - break; - default: - dspName = Platform.getItemDisplayName(is); - break; + } + case TOOLTIPS -> dspName = String.join(" ", ((List) Platform.getTooltip(is))); + default -> dspName = Platform.getItemDisplayName(is); } if (dspName == null) continue; @@ -235,13 +220,13 @@ public void updateView() { ItemSorters.init(); if (SortBy == SortOrder.MOD) { - Collections.sort(this.view, ItemSorters.CONFIG_BASED_SORT_BY_MOD); + this.view.sort(ItemSorters.CONFIG_BASED_SORT_BY_MOD); } else if (SortBy == SortOrder.AMOUNT) { - Collections.sort(this.view, ItemSorters.CONFIG_BASED_SORT_BY_SIZE); + this.view.sort(ItemSorters.CONFIG_BASED_SORT_BY_SIZE); } else if (SortBy == SortOrder.INVTWEAKS) { - Collections.sort(this.view, ItemSorters.CONFIG_BASED_SORT_BY_INV_TWEAKS); + this.view.sort(ItemSorters.CONFIG_BASED_SORT_BY_INV_TWEAKS); } else { - Collections.sort(this.view, ItemSorters.CONFIG_BASED_SORT_BY_NAME); + this.view.sort(ItemSorters.CONFIG_BASED_SORT_BY_NAME); } for (final IAEItemStack is : this.view) { diff --git a/src/main/java/appeng/client/me/SlotDisconnected.java b/src/main/java/appeng/client/me/SlotDisconnected.java index 80ade924392..df150549589 100644 --- a/src/main/java/appeng/client/me/SlotDisconnected.java +++ b/src/main/java/appeng/client/me/SlotDisconnected.java @@ -44,8 +44,7 @@ public boolean canTakeStack(final EntityPlayer par1EntityPlayer) { public ItemStack getDisplayStack() { if (Platform.isClient()) { final ItemStack is = super.getStack(); - if (is != null && is.getItem() instanceof ItemEncodedPattern) { - final ItemEncodedPattern iep = (ItemEncodedPattern) is.getItem(); + if (is != null && is.getItem() instanceof ItemEncodedPattern iep) { final ItemStack out = iep.getOutput(is); if (out != null) { return out; diff --git a/src/main/java/appeng/client/render/BaseBlockRender.java b/src/main/java/appeng/client/render/BaseBlockRender.java index 65ea216fcc1..5b354290c1c 100644 --- a/src/main/java/appeng/client/render/BaseBlockRender.java +++ b/src/main/java/appeng/client/render/BaseBlockRender.java @@ -540,44 +540,37 @@ protected void renderCutoutFace(final B block, final IIcon ico, final int x, fin boolean flip = false; switch (orientation) { - case NORTH: + case NORTH -> { layerAX = 1.0; layerBY = 1.0; flip = true; - - break; - case SOUTH: + } + case SOUTH -> { layerAX = 1.0; layerBY = 1.0; offsetZ = 1.0; - - break; - case EAST: + } + case EAST -> { flip = true; layerAZ = 1.0; layerBY = 1.0; offsetX = 1.0; - - break; - case WEST: + } + case WEST -> { layerAZ = 1.0; layerBY = 1.0; - - break; - case UP: + } + case UP -> { flip = true; layerAX = 1.0; layerBZ = 1.0; offsetY = 1.0; - - break; - case DOWN: + } + case DOWN -> { layerAX = 1.0; layerBZ = 1.0; - - break; - default: - break; + } + default -> {} } offsetX += x; @@ -728,26 +721,13 @@ private void renderFace(final Tessellator tess, final double offsetX, final doub protected void renderFace(final int x, final int y, final int z, final B block, final IIcon ico, final RenderBlocks renderer, final ForgeDirection orientation) { switch (orientation) { - case NORTH: - renderer.renderFaceZNeg(block, x, y, z, ico); - break; - case SOUTH: - renderer.renderFaceZPos(block, x, y, z, ico); - break; - case EAST: - renderer.renderFaceXPos(block, x, y, z, ico); - break; - case WEST: - renderer.renderFaceXNeg(block, x, y, z, ico); - break; - case UP: - renderer.renderFaceYPos(block, x, y, z, ico); - break; - case DOWN: - renderer.renderFaceYNeg(block, x, y, z, ico); - break; - default: - break; + case NORTH -> renderer.renderFaceZNeg(block, x, y, z, ico); + case SOUTH -> renderer.renderFaceZPos(block, x, y, z, ico); + case EAST -> renderer.renderFaceXPos(block, x, y, z, ico); + case WEST -> renderer.renderFaceXNeg(block, x, y, z, ico); + case UP -> renderer.renderFaceYPos(block, x, y, z, ico); + case DOWN -> renderer.renderFaceYNeg(block, x, y, z, ico); + default -> {} } } diff --git a/src/main/java/appeng/client/render/BlockRenderInfo.java b/src/main/java/appeng/client/render/BlockRenderInfo.java index f6623f67fd2..0511b329fc4 100644 --- a/src/main/java/appeng/client/render/BlockRenderInfo.java +++ b/src/main/java/appeng/client/render/BlockRenderInfo.java @@ -77,38 +77,48 @@ public void setTemporaryRenderIcons(final IIcon nTopIcon, final IIcon nBottomIco public FlippableIcon getTexture(final ForgeDirection dir) { if (this.useTmp) { switch (dir) { - case DOWN: + case DOWN -> { return this.tmpBottomIcon; - case UP: + } + case UP -> { return this.tmpTopIcon; - case NORTH: + } + case NORTH -> { return this.tmpNorthIcon; - case SOUTH: + } + case SOUTH -> { return this.tmpSouthIcon; - case EAST: + } + case EAST -> { return this.tmpEastIcon; - case WEST: + } + case WEST -> { return this.tmpWestIcon; - default: - break; + } + default -> {} } } switch (dir) { - case DOWN: + case DOWN -> { return this.bottomIcon; - case UP: + } + case UP -> { return this.topIcon; - case NORTH: + } + case NORTH -> { return this.northIcon; - case SOUTH: + } + case SOUTH -> { return this.southIcon; - case EAST: + } + case EAST -> { return this.eastIcon; - case WEST: + } + case WEST -> { return this.westIcon; - default: - break; + } + default -> {} } return this.topIcon; diff --git a/src/main/java/appeng/client/render/BusRenderHelper.java b/src/main/java/appeng/client/render/BusRenderHelper.java index b68699e0111..72a16e6b72f 100644 --- a/src/main/java/appeng/client/render/BusRenderHelper.java +++ b/src/main/java/appeng/client/render/BusRenderHelper.java @@ -65,7 +65,7 @@ public final class BusRenderHelper implements IPartRenderHelper { public BusRenderHelper() { this.bbc = new BoundBoxCalculator(this); this.noAlphaPass = !AEConfig.instance.isFeatureEnabled(AEFeature.AlphaPass); - this.bbr = new BaseBlockRender(); + this.bbr = new BaseBlockRender<>(); this.renderingForPass = 0; this.currentPass = 0; this.itemsRendered = 0; @@ -94,23 +94,15 @@ public void setPass(final int pass) { } public double getBound(final ForgeDirection side) { - switch (side) { - default: - case UNKNOWN: - return 0.5; - case DOWN: - return this.minY; - case EAST: - return this.maxX; - case NORTH: - return this.minZ; - case SOUTH: - return this.maxZ; - case UP: - return this.maxY; - case WEST: - return this.minX; - } + return switch (side) { + default -> 0.5; + case DOWN -> this.minY; + case EAST -> this.maxX; + case NORTH -> this.minZ; + case SOUTH -> this.maxZ; + case UP -> this.maxY; + case WEST -> this.minX; + }; } public void setRenderColor(final int color) { diff --git a/src/main/java/appeng/client/render/BusRenderer.java b/src/main/java/appeng/client/render/BusRenderer.java index b58140a3980..62effd9f16c 100644 --- a/src/main/java/appeng/client/render/BusRenderer.java +++ b/src/main/java/appeng/client/render/BusRenderer.java @@ -39,7 +39,7 @@ public class BusRenderer implements IItemRenderer { public static final BusRenderer INSTANCE = new BusRenderer(); - private static final Map RENDER_PART = new HashMap(); + private static final Map RENDER_PART = new HashMap<>(); private final RenderBlocksWorkaround renderer = new RenderBlocksWorkaround(); @Override @@ -110,8 +110,7 @@ public void renderItem(final ItemRenderType type, final ItemStack item, final Ob this.getRenderer().useInventoryTint = false; this.getRenderer().overrideBlockTexture = null; - if (item.getItem() instanceof IFacadeItem) { - final IFacadeItem fi = (IFacadeItem) item.getItem(); + if (item.getItem() instanceof IFacadeItem fi) { final IFacadePart fp = fi.createPartFromItemStack(item, ForgeDirection.SOUTH); if (type == ItemRenderType.EQUIPPED_FIRST_PERSON) { diff --git a/src/main/java/appeng/client/render/CableRenderHelper.java b/src/main/java/appeng/client/render/CableRenderHelper.java index c5699044171..f10406fb66c 100644 --- a/src/main/java/appeng/client/render/CableRenderHelper.java +++ b/src/main/java/appeng/client/render/CableRenderHelper.java @@ -66,7 +66,7 @@ public void renderStatic(final CableBusContainer cableBusContainer, final IFacad /** * snag list of boxes... */ - final List boxes = new ArrayList(); + final List boxes = new ArrayList<>(); for (final ForgeDirection s : ForgeDirection.values()) { final IPart part = cableBusContainer.getPart(s); @@ -99,6 +99,7 @@ public void renderStatic(final CableBusContainer cableBusContainer, final IFacad if (o >= 2) { useThinFacades = true; + break; } } @@ -153,42 +154,41 @@ private void setSide(final ForgeDirection s) { final ForgeDirection az; switch (s) { - case DOWN: + case DOWN -> { ax = ForgeDirection.EAST; ay = ForgeDirection.NORTH; az = ForgeDirection.DOWN; - break; - case UP: + } + case UP -> { ax = ForgeDirection.EAST; ay = ForgeDirection.SOUTH; az = ForgeDirection.UP; - break; - case EAST: + } + case EAST -> { ax = ForgeDirection.SOUTH; ay = ForgeDirection.UP; az = ForgeDirection.EAST; - break; - case WEST: + } + case WEST -> { ax = ForgeDirection.NORTH; ay = ForgeDirection.UP; az = ForgeDirection.WEST; - break; - case NORTH: + } + case NORTH -> { ax = ForgeDirection.WEST; ay = ForgeDirection.UP; az = ForgeDirection.NORTH; - break; - case SOUTH: + } + case SOUTH -> { ax = ForgeDirection.EAST; ay = ForgeDirection.UP; az = ForgeDirection.SOUTH; - break; - case UNKNOWN: - default: + } + default -> { ax = ForgeDirection.EAST; ay = ForgeDirection.UP; az = ForgeDirection.SOUTH; - break; + } } BusRenderHelper.INSTANCE.setOrientation(ax, ay, az); @@ -205,42 +205,41 @@ public void renderDynamic(final CableBusContainer cableBusContainer, final doubl final ForgeDirection az; switch (s) { - case DOWN: + case DOWN -> { ax = ForgeDirection.EAST; ay = ForgeDirection.NORTH; az = ForgeDirection.DOWN; - break; - case UP: + } + case UP -> { ax = ForgeDirection.EAST; ay = ForgeDirection.SOUTH; az = ForgeDirection.UP; - break; - case EAST: + } + case EAST -> { ax = ForgeDirection.SOUTH; ay = ForgeDirection.UP; az = ForgeDirection.EAST; - break; - case WEST: + } + case WEST -> { ax = ForgeDirection.NORTH; ay = ForgeDirection.UP; az = ForgeDirection.WEST; - break; - case NORTH: + } + case NORTH -> { ax = ForgeDirection.WEST; ay = ForgeDirection.UP; az = ForgeDirection.NORTH; - break; - case SOUTH: + } + case SOUTH -> { ax = ForgeDirection.EAST; ay = ForgeDirection.UP; az = ForgeDirection.SOUTH; - break; - case UNKNOWN: - default: + } + default -> { ax = ForgeDirection.EAST; ay = ForgeDirection.UP; az = ForgeDirection.SOUTH; - break; + } } BusRenderHelper.INSTANCE.setOrientation(ax, ay, az); diff --git a/src/main/java/appeng/client/render/SpatialSkyRender.java b/src/main/java/appeng/client/render/SpatialSkyRender.java index 097a87fce33..22fa8f4c416 100644 --- a/src/main/java/appeng/client/render/SpatialSkyRender.java +++ b/src/main/java/appeng/client/render/SpatialSkyRender.java @@ -65,23 +65,12 @@ public void render(final float partialTicks, final WorldClient world, final Mine GL11.glPushMatrix(); switch (i) { - case 1: - GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); - break; - case 2: - GL11.glRotatef(-90.0F, 1.0F, 0.0F, 0.0F); - break; - case 3: - GL11.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); - break; - case 4: - GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); - break; - case 5: - GL11.glRotatef(-90.0F, 0.0F, 0.0F, 1.0F); - break; - default: - break; + case 1 -> GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); + case 2 -> GL11.glRotatef(-90.0F, 1.0F, 0.0F, 0.0F); + case 3 -> GL11.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); + case 4 -> GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); + case 5 -> GL11.glRotatef(-90.0F, 0.0F, 0.0F, 1.0F); + default -> {} } tessellator.startDrawingQuads(); diff --git a/src/main/java/appeng/client/render/WorldRender.java b/src/main/java/appeng/client/render/WorldRender.java index df74da4430e..98221f27d0a 100644 --- a/src/main/java/appeng/client/render/WorldRender.java +++ b/src/main/java/appeng/client/render/WorldRender.java @@ -30,7 +30,7 @@ public final class WorldRender implements ISimpleBlockRenderingHandler { public static final WorldRender INSTANCE = new WorldRender(); - private final Map blockRenders = new HashMap(); + private final Map blockRenders = new HashMap<>(); private final int renderID = RenderingRegistry.getNextAvailableRenderId(); private final RenderBlocks renderer = new RenderBlocks(); private boolean hasError = false; @@ -71,8 +71,7 @@ private BaseBlockRender getRender(final AEBaseBlock block) { void renderItemBlock(final ItemStack item, final ItemRenderType type, final Object[] data) { final Block blk = Block.getBlockFromItem(item.getItem()); - if (blk instanceof AEBaseBlock) { - final AEBaseBlock block = (AEBaseBlock) blk; + if (blk instanceof AEBaseBlock block) { this.renderer.setRenderBoundsFromBlock(block); this.renderer.uvRotateBottom = this.renderer.uvRotateEast = this.renderer.uvRotateNorth = this.renderer.uvRotateSouth = this.renderer.uvRotateTop = this.renderer.uvRotateWest = 0; diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java b/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java index fd31357197a..bb3db769f0e 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockAssembler.java @@ -290,12 +290,10 @@ private IIcon getConnectedCable(final IBlockAccess world, final int x, final int if (-1 < tileYPos && tileYPos < 256) { final TileEntity ne = world.getTileEntity(x + side.offsetX, tileYPos, z + side.offsetZ); - if (ne instanceof IGridHost && ne instanceof IPartHost) { - final IPartHost ph = (IPartHost) ne; + if (ne instanceof IGridHost && ne instanceof IPartHost ph) { final IPart pcx = ph.getPart(ForgeDirection.UNKNOWN); - if (pcx instanceof PartCable) { - final PartCable pc = (PartCable) pcx; + if (pcx instanceof PartCable pc) { if (pc.isConnected(side.getOpposite())) { if (covered) { diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java b/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java index 53d225de599..0bc2a51acdb 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPU.java @@ -300,45 +300,44 @@ private void handleSide(final B blk, final int meta, final int x, final int y, f final double width = 3.0 / 16.0; switch (a) { - case DOWN: + case DOWN -> { renderer.renderMinY = 0; renderer.renderMaxY = width; - break; - case EAST: + } + case EAST -> { renderer.renderMaxX = 1; renderer.renderMinX = 1.0 - width; renderer.uvRotateTop = 1; renderer.uvRotateBottom = 1; renderer.uvRotateWest = 1; renderer.uvRotateEast = 1; - break; - case NORTH: + } + case NORTH -> { renderer.renderMinZ = 0; renderer.renderMaxZ = width; renderer.uvRotateWest = 1; renderer.uvRotateNorth = 1; renderer.uvRotateSouth = 1; - break; - case SOUTH: + } + case SOUTH -> { renderer.renderMaxZ = 1; renderer.renderMinZ = 1.0 - width; renderer.uvRotateNorth = 1; renderer.uvRotateSouth = 1; - break; - case UP: + } + case UP -> { renderer.renderMaxY = 1; renderer.renderMinY = 1.0 - width; - break; - case WEST: + } + case WEST -> { renderer.renderMinX = 0; renderer.renderMaxX = width; renderer.uvRotateTop = 1; renderer.uvRotateBottom = 1; renderer.uvRotateWest = 1; renderer.uvRotateEast = 1; - break; - case UNKNOWN: - default: + } + default -> {} } i.renderBlockCurrentBounds(x, y, z, renderer); diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPUMonitor.java b/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPUMonitor.java index 05e11e67fab..36c2029f3aa 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPUMonitor.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockCraftingCPUMonitor.java @@ -93,34 +93,30 @@ private void tesrRenderScreen(final Tessellator tess, final TileCraftingMonitorT GL11.glScalef(scale, scale, scale); switch (side) { - case UP: + case UP -> { GL11.glScalef(1.0f, -1.0f, 1.0f); GL11.glRotatef(90.0f, 1.0f, 0.0f, 0.0f); GL11.glRotatef(spin * 90.0F, 0, 0, 1); - break; - case DOWN: + } + case DOWN -> { GL11.glScalef(1.0f, -1.0f, 1.0f); GL11.glRotatef(-90.0f, 1.0f, 0.0f, 0.0f); GL11.glRotatef(spin * -90.0F, 0, 0, 1); - break; - case EAST: + } + case EAST -> { GL11.glScalef(-1.0f, -1.0f, -1.0f); GL11.glRotatef(-90.0f, 0.0f, 1.0f, 0.0f); - break; - case WEST: + } + case WEST -> { GL11.glScalef(-1.0f, -1.0f, -1.0f); GL11.glRotatef(90.0f, 0.0f, 1.0f, 0.0f); - break; - case NORTH: - GL11.glScalef(-1.0f, -1.0f, -1.0f); - break; - case SOUTH: + } + case NORTH -> GL11.glScalef(-1.0f, -1.0f, -1.0f); + case SOUTH -> { GL11.glScalef(-1.0f, -1.0f, -1.0f); GL11.glRotatef(180.0f, 0.0f, 1.0f, 0.0f); - break; - - default: - break; + } + default -> {} } try { diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockPaint.java b/src/main/java/appeng/client/render/blocks/RenderBlockPaint.java index f5682a9bbc6..79970c469e2 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockPaint.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockPaint.java @@ -100,52 +100,46 @@ public boolean renderInWorld(final BlockPaint imb, final IBlockAccess world, fin final IIcon ico = icoSet[s.getSeed() % icoSet.length]; switch (s.getSide()) { - case UP: + case UP -> { offset = 1.0 - offset; tess.addVertexWithUV(pos_x - buffer, y + offset, pos_y - buffer, ico.getMinU(), ico.getMinV()); tess.addVertexWithUV(pos_x + buffer, y + offset, pos_y - buffer, ico.getMaxU(), ico.getMinV()); tess.addVertexWithUV(pos_x + buffer, y + offset, pos_y + buffer, ico.getMaxU(), ico.getMaxV()); tess.addVertexWithUV(pos_x - buffer, y + offset, pos_y + buffer, ico.getMinU(), ico.getMaxV()); - break; - - case DOWN: + } + case DOWN -> { tess.addVertexWithUV(pos_x + buffer, y + offset, pos_y - buffer, ico.getMinU(), ico.getMinV()); tess.addVertexWithUV(pos_x - buffer, y + offset, pos_y - buffer, ico.getMaxU(), ico.getMinV()); tess.addVertexWithUV(pos_x - buffer, y + offset, pos_y + buffer, ico.getMaxU(), ico.getMaxV()); tess.addVertexWithUV(pos_x + buffer, y + offset, pos_y + buffer, ico.getMinU(), ico.getMaxV()); - break; - - case EAST: + } + case EAST -> { offset = 1.0 - offset; tess.addVertexWithUV(x + offset, pos_x + buffer, pos_y - buffer, ico.getMinU(), ico.getMinV()); tess.addVertexWithUV(x + offset, pos_x - buffer, pos_y - buffer, ico.getMaxU(), ico.getMinV()); tess.addVertexWithUV(x + offset, pos_x - buffer, pos_y + buffer, ico.getMaxU(), ico.getMaxV()); tess.addVertexWithUV(x + offset, pos_x + buffer, pos_y + buffer, ico.getMinU(), ico.getMaxV()); - break; - - case WEST: + } + case WEST -> { tess.addVertexWithUV(x + offset, pos_x - buffer, pos_y - buffer, ico.getMinU(), ico.getMinV()); tess.addVertexWithUV(x + offset, pos_x + buffer, pos_y - buffer, ico.getMaxU(), ico.getMinV()); tess.addVertexWithUV(x + offset, pos_x + buffer, pos_y + buffer, ico.getMaxU(), ico.getMaxV()); tess.addVertexWithUV(x + offset, pos_x - buffer, pos_y + buffer, ico.getMinU(), ico.getMaxV()); - break; - - case SOUTH: + } + case SOUTH -> { offset = 1.0 - offset; tess.addVertexWithUV(pos_x + buffer, pos_y - buffer, z + offset, ico.getMinU(), ico.getMinV()); tess.addVertexWithUV(pos_x - buffer, pos_y - buffer, z + offset, ico.getMaxU(), ico.getMinV()); tess.addVertexWithUV(pos_x - buffer, pos_y + buffer, z + offset, ico.getMaxU(), ico.getMaxV()); tess.addVertexWithUV(pos_x + buffer, pos_y + buffer, z + offset, ico.getMinU(), ico.getMaxV()); - break; - - case NORTH: + } + case NORTH -> { tess.addVertexWithUV(pos_x - buffer, pos_y - buffer, z + offset, ico.getMinU(), ico.getMinV()); tess.addVertexWithUV(pos_x + buffer, pos_y - buffer, z + offset, ico.getMaxU(), ico.getMinV()); tess.addVertexWithUV(pos_x + buffer, pos_y + buffer, z + offset, ico.getMaxU(), ico.getMaxV()); tess.addVertexWithUV(pos_x - buffer, pos_y + buffer, z + offset, ico.getMinU(), ico.getMaxV()); - break; - - default: + } + default -> {} } } diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java b/src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java index 80167c2d815..049371bb921 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockQuartzAccelerator.java @@ -32,8 +32,7 @@ public boolean renderInWorld(final BlockQuartzGrowthAccelerator blk, final IBloc final int y, final int z, final RenderBlocks renderer) { final TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileQuartzGrowthAccelerator) { - final TileQuartzGrowthAccelerator tileCGA = (TileQuartzGrowthAccelerator) te; + if (te instanceof TileQuartzGrowthAccelerator tileCGA) { if (tileCGA.isPowered()) { final IIcon top_Bottom = ExtraBlockTextures.BlockQuartzGrowthAcceleratorOn.getIcon(); diff --git a/src/main/java/appeng/client/render/blocks/RenderBlockWireless.java b/src/main/java/appeng/client/render/blocks/RenderBlockWireless.java index 55444177e7c..b7a02a754d4 100644 --- a/src/main/java/appeng/client/render/blocks/RenderBlockWireless.java +++ b/src/main/java/appeng/client/render/blocks/RenderBlockWireless.java @@ -295,38 +295,37 @@ private void renderTorchAtAngle(final RenderBlocks renderer, final ForgeDirectio final IIcon sides = new OffsetIcon(r, 0.0f, -2.0f); switch (z) { - case DOWN: + case DOWN -> { renderer.uvRotateNorth = 3; renderer.uvRotateSouth = 3; renderer.uvRotateEast = 3; renderer.uvRotateWest = 3; - break; - case EAST: + } + case EAST -> { renderer.uvRotateTop = 1; renderer.uvRotateBottom = 2; renderer.uvRotateEast = 2; renderer.uvRotateWest = 1; - break; - case NORTH: + } + case NORTH -> { renderer.uvRotateTop = 0; renderer.uvRotateBottom = 0; renderer.uvRotateNorth = 2; renderer.uvRotateSouth = 1; - break; - case SOUTH: + } + case SOUTH -> { renderer.uvRotateTop = 3; renderer.uvRotateBottom = 3; renderer.uvRotateNorth = 1; renderer.uvRotateSouth = 2; - break; - case WEST: + } + case WEST -> { renderer.uvRotateTop = 2; renderer.uvRotateBottom = 1; renderer.uvRotateEast = 1; renderer.uvRotateWest = 2; - break; - default: - break; + } + default -> {} } Tessellator.instance.setColorOpaque_I(0xffffff); diff --git a/src/main/java/appeng/client/render/blocks/RenderDrive.java b/src/main/java/appeng/client/render/blocks/RenderDrive.java index 3a072bb30e9..6339b8947f1 100644 --- a/src/main/java/appeng/client/render/blocks/RenderDrive.java +++ b/src/main/java/appeng/client/render/blocks/RenderDrive.java @@ -69,108 +69,60 @@ public boolean renderInWorld(final BlockDrive imb, final IBlockAccess world, fin int spin = 0; switch (forward.offsetX + forward.offsetY * 2 + forward.offsetZ * 3) { - case 1: + case 1 -> { switch (up) { - case UP: - spin = 3; - break; - case DOWN: - spin = 1; - break; - case NORTH: - spin = 0; - break; - case SOUTH: - spin = 2; - break; - default: + case UP -> spin = 3; + case DOWN -> spin = 1; + case NORTH -> spin = 0; + case SOUTH -> spin = 2; + default -> {} } - break; - case -1: + } + case -1 -> { switch (up) { - case UP: - spin = 1; - break; - case DOWN: - spin = 3; - break; - case NORTH: - spin = 0; - break; - case SOUTH: - spin = 2; - break; - default: + case UP -> spin = 1; + case DOWN -> spin = 3; + case NORTH -> spin = 0; + case SOUTH -> spin = 2; + default -> {} } - break; - case -2: + } + case -2 -> { switch (up) { - case EAST: - spin = 1; - break; - case WEST: - spin = 3; - break; - case NORTH: - spin = 2; - break; - case SOUTH: - spin = 0; - break; - default: + case EAST -> spin = 1; + case WEST -> spin = 3; + case NORTH -> spin = 2; + case SOUTH -> spin = 0; + default -> {} } - break; - case 2: + } + case 2 -> { switch (up) { - case EAST: - spin = 1; - break; - case WEST: - spin = 3; - break; - case NORTH: - spin = 0; - break; - case SOUTH: - spin = 0; - break; - default: + case EAST -> spin = 1; + case WEST -> spin = 3; + case NORTH -> spin = 0; + case SOUTH -> spin = 0; + default -> {} } - break; - case 3: + } + case 3 -> { switch (up) { - case UP: - spin = 2; - break; - case DOWN: - spin = 0; - break; - case EAST: - spin = 3; - break; - case WEST: - spin = 1; - break; - default: + case UP -> spin = 2; + case DOWN -> spin = 0; + case EAST -> spin = 3; + case WEST -> spin = 1; + default -> {} } - break; - case -3: + } + case -3 -> { switch (up) { - case UP: - spin = 2; - break; - case DOWN: - spin = 0; - break; - case EAST: - spin = 1; - break; - case WEST: - spin = 3; - break; - default: + case UP -> spin = 2; + case DOWN -> spin = 0; + case EAST -> spin = 1; + case WEST -> spin = 3; + default -> {} } - break; + } } double u1 = ico.getInterpolatedU((spin % 4 < 2) ? 1 : 6); @@ -193,7 +145,7 @@ public boolean renderInWorld(final BlockDrive imb, final IBlockAccess world, fin tess.setBrightness(b); tess.setColorOpaque_I(0xffffff); switch (forward.offsetX + forward.offsetY * 2 + forward.offsetZ * 3) { - case 1: + case 1 -> { tess.addVertexWithUV( x + renderer.renderMaxX, y + renderer.renderMaxY, @@ -218,8 +170,8 @@ public boolean renderInWorld(final BlockDrive imb, final IBlockAccess world, fin z + renderer.renderMinZ, u4, v4); - break; - case -1: + } + case -1 -> { tess.addVertexWithUV( x + renderer.renderMaxX, y + renderer.renderMinY, @@ -244,8 +196,8 @@ public boolean renderInWorld(final BlockDrive imb, final IBlockAccess world, fin z + renderer.renderMinZ, u4, v4); - break; - case -2: + } + case -2 -> { tess.addVertexWithUV( x + renderer.renderMaxX, y + renderer.renderMaxY, @@ -270,8 +222,8 @@ public boolean renderInWorld(final BlockDrive imb, final IBlockAccess world, fin z + renderer.renderMinZ, u4, v4); - break; - case 2: + } + case 2 -> { tess.addVertexWithUV( x + renderer.renderMinX, y + renderer.renderMaxY, @@ -296,8 +248,8 @@ public boolean renderInWorld(final BlockDrive imb, final IBlockAccess world, fin z + renderer.renderMinZ, u4, v4); - break; - case 3: + } + case 3 -> { tess.addVertexWithUV( x + renderer.renderMaxX, y + renderer.renderMinY, @@ -322,8 +274,8 @@ public boolean renderInWorld(final BlockDrive imb, final IBlockAccess world, fin z + renderer.renderMaxZ, u4, v4); - break; - case -3: + } + case -3 -> { tess.addVertexWithUV( x + renderer.renderMinX, y + renderer.renderMinY, @@ -348,7 +300,7 @@ public boolean renderInWorld(final BlockDrive imb, final IBlockAccess world, fin z + renderer.renderMaxZ, u4, v4); - break; + } } if ((forward == ForgeDirection.UP && up == ForgeDirection.SOUTH) || forward == ForgeDirection.DOWN) { @@ -386,7 +338,7 @@ public boolean renderInWorld(final BlockDrive imb, final IBlockAccess world, fin } switch (forward.offsetX + forward.offsetY * 2 + forward.offsetZ * 3) { - case 1: + case 1 -> { tess.addVertexWithUV( x + renderer.renderMaxX, y + renderer.renderMaxY, @@ -411,8 +363,8 @@ public boolean renderInWorld(final BlockDrive imb, final IBlockAccess world, fin z + renderer.renderMinZ, u4, v4); - break; - case -1: + } + case -1 -> { tess.addVertexWithUV( x + renderer.renderMaxX, y + renderer.renderMinY, @@ -437,8 +389,8 @@ public boolean renderInWorld(final BlockDrive imb, final IBlockAccess world, fin z + renderer.renderMinZ, u4, v4); - break; - case -2: + } + case -2 -> { tess.addVertexWithUV( x + renderer.renderMaxX, y + renderer.renderMaxY, @@ -463,8 +415,8 @@ public boolean renderInWorld(final BlockDrive imb, final IBlockAccess world, fin z + renderer.renderMinZ, u4, v4); - break; - case 2: + } + case 2 -> { tess.addVertexWithUV( x + renderer.renderMinX, y + renderer.renderMaxY, @@ -489,8 +441,8 @@ public boolean renderInWorld(final BlockDrive imb, final IBlockAccess world, fin z + renderer.renderMinZ, u4, v4); - break; - case 3: + } + case 3 -> { tess.addVertexWithUV( x + renderer.renderMaxX, y + renderer.renderMinY, @@ -515,8 +467,8 @@ public boolean renderInWorld(final BlockDrive imb, final IBlockAccess world, fin z + renderer.renderMaxZ, u4, v4); - break; - case -3: + } + case -3 -> { tess.addVertexWithUV( x + renderer.renderMinX, y + renderer.renderMinY, @@ -541,7 +493,7 @@ public boolean renderInWorld(final BlockDrive imb, final IBlockAccess world, fin z + renderer.renderMaxZ, u4, v4); - break; + } } } } diff --git a/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java b/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java index fe55093d8af..548aa61678a 100644 --- a/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java +++ b/src/main/java/appeng/client/render/blocks/RenderQuartzGlass.java @@ -68,21 +68,19 @@ public boolean renderInWorld(final BlockQuartzGlass imb, final IBlockAccess worl final int v = OFFSETS[9 - cx][9 - cy][9 - cz] % 4; switch (Math.abs((OFFSETS[cx][cy][cz] + (x + y + z)) % 4)) { - case 0: - renderer.overrideBlockTexture = new OffsetIcon(imb.getIcon(0, 0), u / 2, v / 2); - break; - case 1: - renderer.overrideBlockTexture = new OffsetIcon( - ExtraBlockTextures.BlockQuartzGlassB.getIcon(), - u / 2, - v / 2); - break; - case 2: - renderer.overrideBlockTexture = new OffsetIcon(ExtraBlockTextures.BlockQuartzGlassC.getIcon(), u, v); - break; - case 3: - renderer.overrideBlockTexture = new OffsetIcon(ExtraBlockTextures.BlockQuartzGlassD.getIcon(), u, v); - break; + case 0 -> renderer.overrideBlockTexture = new OffsetIcon(imb.getIcon(0, 0), u / 2, v / 2); + case 1 -> renderer.overrideBlockTexture = new OffsetIcon( + ExtraBlockTextures.BlockQuartzGlassB.getIcon(), + u / 2, + v / 2); + case 2 -> renderer.overrideBlockTexture = new OffsetIcon( + ExtraBlockTextures.BlockQuartzGlassC.getIcon(), + u, + v); + case 3 -> renderer.overrideBlockTexture = new OffsetIcon( + ExtraBlockTextures.BlockQuartzGlassD.getIcon(), + u, + v); } final boolean result = renderer.renderStandardBlock(imb, x, y, z); @@ -168,26 +166,13 @@ private void renderEdge(final BlockQuartzGlass imb, final IBlockAccess world, fi renderer.setRenderBounds(minX, minY, minZ, maxX, maxY, maxZ); switch (side) { - case WEST: - renderer.renderFaceXNeg(imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon()); - break; - case EAST: - renderer.renderFaceXPos(imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon()); - break; - case NORTH: - renderer.renderFaceZNeg(imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon()); - break; - case SOUTH: - renderer.renderFaceZPos(imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon()); - break; - case DOWN: - renderer.renderFaceYNeg(imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon()); - break; - case UP: - renderer.renderFaceYPos(imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon()); - break; - default: - break; + case WEST -> renderer.renderFaceXNeg(imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon()); + case EAST -> renderer.renderFaceXPos(imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon()); + case NORTH -> renderer.renderFaceZNeg(imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon()); + case SOUTH -> renderer.renderFaceZPos(imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon()); + case DOWN -> renderer.renderFaceYNeg(imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon()); + case UP -> renderer.renderFaceYPos(imb, x, y, z, ExtraBlockTextures.GlassFrame.getIcon()); + default -> {} } } } diff --git a/src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java b/src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java index 77d1938a478..82ce5ed3375 100644 --- a/src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java +++ b/src/main/java/appeng/client/render/blocks/RenderQuartzTorch.java @@ -239,23 +239,23 @@ public boolean renderInWorld(final AEBaseBlock block, final IBlockAccess world, if (te != null) { final ForgeDirection forward = te.getUp(); switch (forward) { - case EAST: + case EAST -> { renderer.setRenderBounds(0, bottom + yOff, bottom + zOff, Point2 + xOff, top + yOff, top + zOff); renderer.renderStandardBlock(block, x, y, z); - break; - case WEST: + } + case WEST -> { renderer.setRenderBounds(Point13 + xOff, bottom + yOff, bottom + zOff, 1.0, top + yOff, top + zOff); renderer.renderStandardBlock(block, x, y, z); - break; - case NORTH: + } + case NORTH -> { renderer.setRenderBounds(bottom + xOff, bottom + yOff, Point13 + zOff, top + xOff, top + yOff, 1.0); renderer.renderStandardBlock(block, x, y, z); - break; - case SOUTH: + } + case SOUTH -> { renderer.setRenderBounds(bottom + xOff, bottom + yOff, 0, top + xOff, top + yOff, Point2 + zOff); renderer.renderStandardBlock(block, x, y, z); - break; - case UP: + } + case UP -> { renderer.setRenderBounds(Point2, 0, Point2, Point3, bottom + yOff, Point3); renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(Point2, 0, Point12, Point3, bottom + yOff, Point13); @@ -264,8 +264,8 @@ public boolean renderInWorld(final AEBaseBlock block, final IBlockAccess world, renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(Point12, 0, Point12, Point13, bottom + yOff, Point13); renderer.renderStandardBlock(block, x, y, z); - break; - case DOWN: + } + case DOWN -> { renderer.setRenderBounds(Point2, top + yOff, Point2, Point3, 1.0, Point3); renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(Point2, top + yOff, Point12, Point3, 1.0, Point13); @@ -274,8 +274,8 @@ public boolean renderInWorld(final AEBaseBlock block, final IBlockAccess world, renderer.renderStandardBlock(block, x, y, z); renderer.setRenderBounds(Point12, top + yOff, Point12, Point13, 1.0, Point13); renderer.renderStandardBlock(block, x, y, z); - break; - default: + } + default -> {} } } diff --git a/src/main/java/appeng/client/texture/TmpFlippableIcon.java b/src/main/java/appeng/client/texture/TmpFlippableIcon.java index 97bad4102f6..b341368de16 100644 --- a/src/main/java/appeng/client/texture/TmpFlippableIcon.java +++ b/src/main/java/appeng/client/texture/TmpFlippableIcon.java @@ -25,8 +25,7 @@ public TmpFlippableIcon() { public void setOriginal(IIcon i) { this.setFlip(false, false); - while (i instanceof FlippableIcon) { - final FlippableIcon fi = (FlippableIcon) i; + while (i instanceof FlippableIcon fi) { if (fi.isFlipU()) { this.setFlipU(!this.isFlipU()); } diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index 2daeb56bf80..cb9aeb377e3 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -67,12 +67,12 @@ public abstract class AEBaseContainer extends Container { private final InventoryPlayer invPlayer; private final BaseActionSource mySrc; - private final HashSet locked = new HashSet(); + private final HashSet locked = new HashSet<>(); private final TileEntity tileEntity; private final IPart part; private final IGuiItemObject obj; - private final List dataChunks = new LinkedList(); - private final HashMap syncData = new HashMap(); + private final List dataChunks = new LinkedList<>(); + private final HashMap syncData = new HashMap<>(); private boolean isContainerValid = true; private String customName; private ContainerOpenContext openContext; @@ -210,7 +210,7 @@ public void setTargetStack(final IAEItemStack stack) { CompressedStreamTools.writeCompressed(item, stream); final int maxChunkSize = 30000; - final List miniPackets = new LinkedList(); + final List miniPackets = new LinkedList<>(); final byte[] data = stream.toByteArray(); @@ -349,8 +349,7 @@ protected void bindPlayerInventory(final InventoryPlayer inventoryPlayer, final @Override protected Slot addSlotToContainer(final Slot newSlot) { - if (newSlot instanceof AppEngSlot) { - final AppEngSlot s = (AppEngSlot) newSlot; + if (newSlot instanceof AppEngSlot s) { s.setContainer(this); return super.addSlotToContainer(newSlot); } else { @@ -405,7 +404,7 @@ public ItemStack transferStackInSlot(final EntityPlayer p, final int idx) { return null; } - final List selectedSlots = new ArrayList(); + final List selectedSlots = new ArrayList<>(); /** * Gather a list of valid destinations. @@ -626,23 +625,21 @@ public void doAction(final EntityPlayerMP player, final InventoryAction action, final ItemStack hand = player.inventory.getItemStack(); switch (action) { - case PICKUP_OR_SET_DOWN: + case PICKUP_OR_SET_DOWN -> { if (hand == null) { s.putStack(null); } else { s.putStack(hand.copy()); } - - break; - case PLACE_SINGLE: + } + case PLACE_SINGLE -> { if (hand != null) { final ItemStack is = hand.copy(); is.stackSize = 1; s.putStack(is); } - - break; - case SPLIT_OR_PLACE_SINGLE: + } + case SPLIT_OR_PLACE_SINGLE -> { ItemStack is = s.getStack(); if (is != null) { if (hand == null) { @@ -662,13 +659,8 @@ public void doAction(final EntityPlayerMP player, final InventoryAction action, is.stackSize = 1; s.putStack(is); } - - break; - case CREATIVE_DUPLICATE: - case MOVE_REGION: - case SHIFT_CLICK: - default: - break; + } + default -> {} } } @@ -676,7 +668,7 @@ public void doAction(final EntityPlayerMP player, final InventoryAction action, if (s instanceof SlotPatternTerm) return; // SlotPatternTerm should't transfer its ItemStack to the Player - final List from = new LinkedList(); + final List from = new LinkedList<>(); for (final Object j : this.inventorySlots) { if (j instanceof Slot && j.getClass() == s.getClass()) { @@ -696,11 +688,10 @@ public void doAction(final EntityPlayerMP player, final InventoryAction action, final IAEItemStack slotItem = this.clientRequestedTargetItem; switch (action) { - case SHIFT_CLICK: + case SHIFT_CLICK -> { if (this.getPowerSource() == null || this.getCellInventory() == null) { return; } - if (slotItem != null) { IAEItemStack ais = slotItem.copy(); ItemStack myItem = ais.getItemStack(); @@ -724,15 +715,13 @@ public void doAction(final EntityPlayerMP player, final InventoryAction action, adp.addItems(ais.getItemStack()); } } - break; - case ROLL_DOWN: + } + case ROLL_DOWN -> { if (this.getPowerSource() == null || this.getCellInventory() == null) { return; } - final int releaseQty = 1; final ItemStack isg = player.inventory.getItemStack(); - if (isg != null && releaseQty > 0) { IAEItemStack ais = AEApi.instance().storage().createItemStack(isg); ais.setStackSize(1); @@ -752,14 +741,11 @@ public void doAction(final EntityPlayerMP player, final InventoryAction action, this.updateHeld(player); } } - - break; - case ROLL_UP: - case PICKUP_SINGLE: + } + case ROLL_UP, PICKUP_SINGLE -> { if (this.getPowerSource() == null || this.getCellInventory() == null) { return; } - if (slotItem != null) { int liftQty = 1; final ItemStack item = player.inventory.getItemStack(); @@ -793,12 +779,11 @@ public void doAction(final EntityPlayerMP player, final InventoryAction action, } } } - break; - case PICKUP_OR_SET_DOWN: + } + case PICKUP_OR_SET_DOWN -> { if (this.getPowerSource() == null || this.getCellInventory() == null) { return; } - if (player.inventory.getItemStack() == null) { if (slotItem != null) { IAEItemStack ais = slotItem.copy(); @@ -826,13 +811,11 @@ public void doAction(final EntityPlayerMP player, final InventoryAction action, } this.updateHeld(player); } - - break; - case SPLIT_OR_PLACE_SINGLE: + } + case SPLIT_OR_PLACE_SINGLE -> { if (this.getPowerSource() == null || this.getCellInventory() == null) { return; } - if (player.inventory.getItemStack() == null) { if (slotItem != null) { IAEItemStack ais = slotItem.copy(); @@ -871,21 +854,19 @@ public void doAction(final EntityPlayerMP player, final InventoryAction action, this.updateHeld(player); } } - - break; - case CREATIVE_DUPLICATE: + } + case CREATIVE_DUPLICATE -> { if (player.capabilities.isCreativeMode && slotItem != null) { final ItemStack is = slotItem.getItemStack(); is.stackSize = is.getMaxStackSize(); player.inventory.setItemStack(is); this.updateHeld(player); } - break; - case MOVE_REGION: + } + case MOVE_REGION -> { if (this.getPowerSource() == null || this.getCellInventory() == null) { return; } - if (slotItem != null) { final int playerInv = 9 * 4; for (int slotNum = 0; slotNum < playerInv; slotNum++) { @@ -914,10 +895,8 @@ public void doAction(final EntityPlayerMP player, final InventoryAction action, } } } - - break; - default: - break; + } + default -> {} } } diff --git a/src/main/java/appeng/container/guisync/SyncData.java b/src/main/java/appeng/container/guisync/SyncData.java index 92e76567ccb..ecccb680c58 100644 --- a/src/main/java/appeng/container/guisync/SyncData.java +++ b/src/main/java/appeng/container/guisync/SyncData.java @@ -79,11 +79,7 @@ public void tick(final ICrafting c) { } else if (!val.equals(this.clientVersion)) { this.send(c, val); } - } catch (final IllegalArgumentException e) { - AELog.debug(e); - } catch (final IllegalAccessException e) { - AELog.debug(e); - } catch (final IOException e) { + } catch (final IllegalArgumentException | IOException | IllegalAccessException e) { AELog.debug(e); } } @@ -115,9 +111,7 @@ public void update(final Object val) { } else { this.updateValue(oldValue, (Long) val); } - } catch (final IllegalArgumentException e) { - AELog.debug(e); - } catch (final IllegalAccessException e) { + } catch (final IllegalArgumentException | IllegalAccessException e) { AELog.debug(e); } } @@ -126,9 +120,7 @@ private void updateString(final Object oldValue, final String val) { try { this.setValue(val); this.source.onUpdate(this.fieldName, oldValue, this.getValue()); - } catch (final IllegalArgumentException e) { - AELog.debug(e); - } catch (final IllegalAccessException e) { + } catch (final IllegalArgumentException | IllegalAccessException e) { AELog.debug(e); } } @@ -160,9 +152,7 @@ private void updateValue(final Object oldValue, final long val) { } this.source.onUpdate(this.fieldName, oldValue, this.getValue()); - } catch (final IllegalArgumentException e) { - AELog.debug(e); - } catch (final IllegalAccessException e) { + } catch (final IllegalArgumentException | IllegalAccessException e) { AELog.debug(e); } } diff --git a/src/main/java/appeng/container/implementations/ContainerCPUTable.java b/src/main/java/appeng/container/implementations/ContainerCPUTable.java index 6a937175308..cb6e29ad99c 100644 --- a/src/main/java/appeng/container/implementations/ContainerCPUTable.java +++ b/src/main/java/appeng/container/implementations/ContainerCPUTable.java @@ -25,7 +25,7 @@ public class ContainerCPUTable implements ICraftingCPUSelectorContainer { private final AEBaseContainer parent; private ImmutableSet lastCpuSet = null; - private List cpus = new ArrayList(); + private List cpus = new ArrayList<>(); private final WeakHashMap cpuSerialMap = new WeakHashMap<>(); private int nextCpuSerial = 1; private int lastUpdate = 0; diff --git a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java index 4fe731c40d4..f296659f143 100644 --- a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java +++ b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java @@ -150,8 +150,7 @@ public void detectAndSendChanges() { if (this.prevStack != is) { // if the bars changed an item was probably made, so just send shit! for (final Object s : this.inventorySlots) { - if (s instanceof OptionalSlotRestrictedInput) { - final OptionalSlotRestrictedInput sri = (OptionalSlotRestrictedInput) s; + if (s instanceof OptionalSlotRestrictedInput sri) { icrafting.sendSlotContents(this, sri.slotNumber, sri.getStack()); } } @@ -211,7 +210,7 @@ public void partition() { null, StorageChannel.ITEMS); - Iterator i = new NullIterator(); + Iterator i = new NullIterator<>(); if (cellInv != null) { final IItemList list = cellInv.getAvailableItems(AEApi.instance().storage().createItemList()); i = list.iterator(); diff --git a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java index 94a95abad26..3e57e511102 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java @@ -193,8 +193,7 @@ public void detectAndSendChanges() { treeUpdate = null; } for (final Object player : this.crafters) { - if (player instanceof EntityPlayerMP) { - EntityPlayerMP playerMP = (EntityPlayerMP) player; + if (player instanceof EntityPlayerMP playerMP) { NetworkHandler.instance.sendTo(storageUpdate, playerMP); NetworkHandler.instance.sendTo(pendingUpdate, playerMP); if (missingUpdate != null) { diff --git a/src/main/java/appeng/container/implementations/ContainerInterface.java b/src/main/java/appeng/container/implementations/ContainerInterface.java index 42830eb250d..b73815d0f95 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterface.java +++ b/src/main/java/appeng/container/implementations/ContainerInterface.java @@ -110,10 +110,9 @@ public void detectAndSendChanges() { } private ArrayList getRemovedPatterns() { - final ArrayList drops = new ArrayList(); + final ArrayList drops = new ArrayList<>(); for (final Object o : this.inventorySlots) { - if (o instanceof OptionalSlotRestrictedInput) { - final OptionalSlotRestrictedInput fs = (OptionalSlotRestrictedInput) o; + if (o instanceof OptionalSlotRestrictedInput fs) { if (!fs.isEnabled()) { ItemStack s = fs.inventory.getStackInSlot(fs.getSlotIndex()); if (s != null) { diff --git a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java index f3d1089c3d1..6178ece7f97 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java +++ b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java @@ -58,7 +58,7 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer { private static long autoBase = Long.MIN_VALUE; private final Multimap diList = HashMultimap.create(); - private final Map byId = new HashMap(); + private final Map byId = new HashMap<>(); // private final Map byId = new HashMap<>(); private IGrid grid; private NBTTagCompound data = new NBTTagCompound(); @@ -154,7 +154,7 @@ public void doAction(final EntityPlayerMP player, final InventoryAction action, boolean canInsert = true; switch (action) { - case PICKUP_OR_SET_DOWN: + case PICKUP_OR_SET_DOWN -> { if (hasItemInHand) { for (int s = 0; s < interfaceHandler.getSizeInventory(); s++) { if (Platform.isSameItemPrecise( @@ -189,9 +189,8 @@ public void doAction(final EntityPlayerMP player, final InventoryAction action, final IInventory mySlot = slotInv.getWrapper(slot + inv.offset); mySlot.setInventorySlotContents(0, playerHand.addItems(mySlot.getStackInSlot(0))); } - - break; - case SPLIT_OR_PLACE_SINGLE: + } + case SPLIT_OR_PLACE_SINGLE -> { if (hasItemInHand) { for (int s = 0; s < interfaceHandler.getSizeInventory(); s++) { if (Platform.isSameItemPrecise( @@ -219,31 +218,28 @@ public void doAction(final EntityPlayerMP player, final InventoryAction action, interfaceSlot.addItems(extra); } } - - break; - case SHIFT_CLICK: + } + case SHIFT_CLICK -> { final IInventory mySlot = slotInv.getWrapper(slot + inv.offset); final InventoryAdaptor playerInv = InventoryAdaptor.getAdaptor(player, ForgeDirection.UNKNOWN); mySlot.setInventorySlotContents(0, mergeToPlayerInventory(playerInv, mySlot.getStackInSlot(0))); - - break; - case MOVE_REGION: + } + case MOVE_REGION -> { final InventoryAdaptor playerInvAd = InventoryAdaptor.getAdaptor(player, ForgeDirection.UNKNOWN); for (int x = 0; x < inv.client.getSizeInventory(); x++) { inv.server.setInventorySlotContents( x + inv.offset, mergeToPlayerInventory(playerInvAd, inv.server.getStackInSlot(x + inv.offset))); } - - break; - case CREATIVE_DUPLICATE: + } + case CREATIVE_DUPLICATE -> { if (player.capabilities.isCreativeMode && !hasItemInHand) { player.inventory.setItemStack(is == null ? null : is.copy()); } - - break; - default: + } + default -> { return; + } } this.updateHeld(player); diff --git a/src/main/java/appeng/container/implementations/ContainerMAC.java b/src/main/java/appeng/container/implementations/ContainerMAC.java index 691bc81a894..d24cd16652d 100644 --- a/src/main/java/appeng/container/implementations/ContainerMAC.java +++ b/src/main/java/appeng/container/implementations/ContainerMAC.java @@ -49,9 +49,8 @@ public boolean isValidItemForSlot(final int slotIndex, final ItemStack i) { return false; } - if (is.getItem() instanceof ItemEncodedPattern) { + if (is.getItem() instanceof ItemEncodedPattern iep) { final World w = this.getTileEntity().getWorldObj(); - final ItemEncodedPattern iep = (ItemEncodedPattern) is.getItem(); final ICraftingPatternDetails ph = iep.getPatternForItem(is, w); if (ph.isCraftable()) { return ph.isValidItemForSlot(slotIndex, i, w); diff --git a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java index d2895cd81af..04580ec3be6 100644 --- a/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java +++ b/src/main/java/appeng/container/implementations/ContainerMEMonitorable.java @@ -118,10 +118,7 @@ protected ContainerMEMonitorable(final InventoryPlayer ip, final ITerminalHost m this.networkNode = node; final IGrid g = node.getGrid(); if (g != null) { - this.setPowerSource( - new ChannelPowerSrc( - this.networkNode, - (IEnergySource) g.getCache(IEnergyGrid.class))); + this.setPowerSource(new ChannelPowerSrc(this.networkNode, g.getCache(IEnergyGrid.class))); } } } @@ -329,8 +326,7 @@ public void postChange(final IBaseMonitor monitor, final Iterable< @Override public void onListUpdate() { for (final Object c : this.crafters) { - if (c instanceof ICrafting) { - final ICrafting cr = (ICrafting) c; + if (c instanceof ICrafting cr) { this.queueInventory(cr); } } diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java index 1dfd3f29948..7862762e1b7 100644 --- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java @@ -300,7 +300,7 @@ private ItemStack[] getOutputs() { } if (hasValue) { - return list.toArray(new ItemStack[list.size()]); + return list.toArray(new ItemStack[0]); } } diff --git a/src/main/java/appeng/container/implementations/ContainerSecurity.java b/src/main/java/appeng/container/implementations/ContainerSecurity.java index 72710a2d779..815f14c7ce1 100644 --- a/src/main/java/appeng/container/implementations/ContainerSecurity.java +++ b/src/main/java/appeng/container/implementations/ContainerSecurity.java @@ -76,8 +76,7 @@ public void toggleSetting(final String value, final EntityPlayer player) { final SecurityPermissions permission = SecurityPermissions.valueOf(value); final ItemStack a = this.configSlot.getStack(); - if (a != null && a.getItem() instanceof IBiometricCard) { - final IBiometricCard bc = (IBiometricCard) a.getItem(); + if (a != null && a.getItem() instanceof IBiometricCard bc) { if (bc.hasPermission(a, permission)) { bc.removePermission(a, permission); } else { @@ -96,8 +95,7 @@ public void detectAndSendChanges() { this.setPermissionMode(0); final ItemStack a = this.configSlot.getStack(); - if (a != null && a.getItem() instanceof IBiometricCard) { - final IBiometricCard bc = (IBiometricCard) a.getItem(); + if (a != null && a.getItem() instanceof IBiometricCard bc) { for (final SecurityPermissions sp : bc.getPermissions(a)) { this.setPermissionMode(this.getPermissionMode() | (1 << sp.ordinal())); diff --git a/src/main/java/appeng/container/implementations/ContainerStorageBus.java b/src/main/java/appeng/container/implementations/ContainerStorageBus.java index 11f51903d8c..b93fc975c92 100644 --- a/src/main/java/appeng/container/implementations/ContainerStorageBus.java +++ b/src/main/java/appeng/container/implementations/ContainerStorageBus.java @@ -150,7 +150,7 @@ public void partition() { final IMEInventory cellInv = this.storageBus.getInternalHandler(); - Iterator i = new NullIterator(); + Iterator i = new NullIterator<>(); if (cellInv != null) { final IItemList list = cellInv.getAvailableItems(AEApi.instance().storage().createItemList()); i = list.iterator(); diff --git a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java b/src/main/java/appeng/container/implementations/ContainerUpgradeable.java index bfd0c90db72..89a5b8ccf75 100644 --- a/src/main/java/appeng/container/implementations/ContainerUpgradeable.java +++ b/src/main/java/appeng/container/implementations/ContainerUpgradeable.java @@ -57,8 +57,7 @@ public ContainerUpgradeable(final InventoryPlayer ip, final IUpgradeableHost te) int yCoord = 0; int zCoord = 0; - if (te instanceof TileEntity) { - final TileEntity myTile = (TileEntity) te; + if (te instanceof TileEntity myTile) { w = myTile.getWorldObj(); xCoord = myTile.xCoord; yCoord = myTile.yCoord; @@ -197,8 +196,7 @@ public void detectAndSendChanges() { this.checkToolbox(); for (final Object o : this.inventorySlots) { - if (o instanceof OptionalSlotFake) { - final OptionalSlotFake fs = (OptionalSlotFake) o; + if (o instanceof OptionalSlotFake fs) { if (!fs.isEnabled() && fs.getDisplayStack() != null) { fs.clearStack(); } diff --git a/src/main/java/appeng/container/slot/SlotCraftingTerm.java b/src/main/java/appeng/container/slot/SlotCraftingTerm.java index 81344b77739..a4699599343 100644 --- a/src/main/java/appeng/container/slot/SlotCraftingTerm.java +++ b/src/main/java/appeng/container/slot/SlotCraftingTerm.java @@ -114,7 +114,7 @@ public void doClick(final InventoryAction action, final EntityPlayer who) { rs.stackSize -= res.stackSize; final ItemStack extra = ia.addItems(res); if (extra != null) { - final List drops = new ArrayList(); + final List drops = new ArrayList<>(); drops.add(extra); Platform.spawnDrops(who.worldObj, (int) who.posX, (int) who.posY, (int) who.posZ, drops); break; @@ -242,7 +242,7 @@ private void makeItem(final EntityPlayer p, final ItemStack is) { private boolean postCraft(final EntityPlayer p, final IMEMonitor inv, final ItemStack[] set, final ItemStack result) { - final List drops = new ArrayList(); + final List drops = new ArrayList<>(); boolean hadEmptyStacks = false; // add one of each item to the items on the board... @@ -282,11 +282,11 @@ private boolean postCraft(final EntityPlayer p, final IMEMonitor i private void cleanup(final EntityPlayer p, final IMEMonitor inv, final ItemStack[] set) { if (Platform.isServer()) { - final List drops = new ArrayList(); - for (int i = 0; i < set.length; ++i) { - if (set[i] != null && set[i].stackSize > 0) { + final List drops = new ArrayList<>(); + for (ItemStack itemStack : set) { + if (itemStack != null && itemStack.stackSize > 0) { final IAEItemStack fail = inv - .injectItems(AEItemStack.create(set[i]), Actionable.MODULATE, this.mySrc); + .injectItems(AEItemStack.create(itemStack), Actionable.MODULATE, this.mySrc); if (fail != null) { drops.add(fail.getItemStack()); } diff --git a/src/main/java/appeng/container/slot/SlotRestrictedInput.java b/src/main/java/appeng/container/slot/SlotRestrictedInput.java index 45393d51565..3b24c4525f2 100644 --- a/src/main/java/appeng/container/slot/SlotRestrictedInput.java +++ b/src/main/java/appeng/container/slot/SlotRestrictedInput.java @@ -106,18 +106,16 @@ public boolean isItemValid(final ItemStack i) { final IItems items = definitions.items(); switch (this.which) { - case ENCODED_CRAFTING_PATTERN: - if (i.getItem() instanceof ICraftingPatternItem) { - final ICraftingPatternItem b = (ICraftingPatternItem) i.getItem(); + case ENCODED_CRAFTING_PATTERN -> { + if (i.getItem() instanceof ICraftingPatternItem b) { final ICraftingPatternDetails de = b.getPatternForItem(i, this.p.player.worldObj); if (de != null) { return de.isCraftable(); } } return false; - case VALID_ENCODED_PATTERN_W_OUTPUT: - case ENCODED_PATTERN_W_OUTPUT: - case ENCODED_PATTERN: { + } + case VALID_ENCODED_PATTERN_W_OUTPUT, ENCODED_PATTERN_W_OUTPUT, ENCODED_PATTERN -> { if (i.getItem() instanceof ICraftingPatternItem) { return true; } @@ -126,78 +124,85 @@ public boolean isItemValid(final ItemStack i) { // i.getItem()).getPatternForItem( i ) : null; return false; // pattern != null; } - case BLANK_PATTERN: + case BLANK_PATTERN -> { return materials.blankPattern().isSameAs(i); - - case PATTERN: + } + case PATTERN -> { if (i.getItem() instanceof ICraftingPatternItem) { return true; } - return materials.blankPattern().isSameAs(i); - - case INSCRIBER_PLATE: + } + case INSCRIBER_PLATE -> { if (materials.namePress().isSameAs(i)) { return true; } - for (final ItemStack optional : AEApi.instance().registries().inscriber().getOptionals()) { if (Platform.isSameItemPrecise(optional, i)) { return true; } } - return false; - - case INSCRIBER_INPUT: + } + case INSCRIBER_INPUT -> { return true; /* * for (ItemStack is : Inscribe.inputs) if ( Platform.isSameItemPrecise( is, i ) ) return * true; return false; */ - - case METAL_INGOTS: + } + case METAL_INGOTS -> { return isMetalIngot(i); - - case VIEW_CELL: + } + case VIEW_CELL -> { return items.viewCell().isSameAs(i); - case ORE: - return appeng.api.AEApi.instance().registries().grinder().getRecipeForInput(i) != null; - case FUEL: + } + case ORE -> { + return AEApi.instance().registries().grinder().getRecipeForInput(i) != null; + } + case FUEL -> { return TileEntityFurnace.getItemBurnTime(i) > 0; - case POWERED_TOOL: + } + case POWERED_TOOL -> { return Platform.isChargeable(i); - case QE_SINGULARITY: + } + case QE_SINGULARITY -> { return materials.qESingularity().isSameAs(i); - - case RANGE_BOOSTER: + } + case RANGE_BOOSTER -> { return materials.wirelessBooster().isSameAs(i); - - case SPATIAL_STORAGE_CELLS: + } + case SPATIAL_STORAGE_CELLS -> { return i.getItem() instanceof ISpatialStorageCell && ((ISpatialStorageCell) i.getItem()).isSpatialStorage(i); - case STORAGE_CELLS: + } + case STORAGE_CELLS -> { return AEApi.instance().registries().cell().isCellHandled(i); - case WORKBENCH_CELL: + } + case WORKBENCH_CELL -> { return i.getItem() instanceof ICellWorkbenchItem && ((ICellWorkbenchItem) i.getItem()).isEditable(i); - case STORAGE_COMPONENT: + } + case STORAGE_COMPONENT -> { return i.getItem() instanceof IStorageComponent && ((IStorageComponent) i.getItem()).isStorageComponent(i); - case TRASH: + } + case TRASH -> { if (AEApi.instance().registries().cell().isCellHandled(i)) { return false; } - return !(i.getItem() instanceof IStorageComponent && ((IStorageComponent) i.getItem()).isStorageComponent(i)); - case ENCODABLE_ITEM: + } + case ENCODABLE_ITEM -> { return i.getItem() instanceof INetworkEncodable || AEApi.instance().registries().wireless().isWirelessTerminal(i); - case BIOMETRIC_CARD: + } + case BIOMETRIC_CARD -> { return i.getItem() instanceof IBiometricCard; - case UPGRADES: + } + case UPGRADES -> { return i.getItem() instanceof IUpgradeModule && ((IUpgradeModule) i.getItem()).getType(i) != null; - default: - break; + } + default -> {} } return false; @@ -212,8 +217,7 @@ public boolean canTakeStack(final EntityPlayer par1EntityPlayer) { public ItemStack getDisplayStack() { if (Platform.isClient() && (this.which == PlacableItemType.ENCODED_PATTERN)) { final ItemStack is = super.getStack(); - if (is != null && is.getItem() instanceof ItemEncodedPattern) { - final ItemEncodedPattern iep = (ItemEncodedPattern) is.getItem(); + if (is != null && is.getItem() instanceof ItemEncodedPattern iep) { final ItemStack out = iep.getOutput(is); if (out != null) { return out; diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index 6a10ba88fa7..577b08cb8b0 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -35,7 +35,7 @@ public final class AEConfig extends Configuration implements IConfigurableObject, IConfigManagerHost { public static double TUNNEL_POWER_LOSS = 0.05; - public static final String VERSION = "GRADLETOKEN_VERSION"; + public static final String VERSION = BuildTags.VERSION; public static final String PACKET_CHANNEL = "AE"; public static AEConfig instance; public final IConfigManager settings = new ConfigManager(this); @@ -323,23 +323,23 @@ private void clientSync() { } } - private String getListComment(final Enum value) { - String comment = null; + @SuppressWarnings("unchecked") + private > String getListComment(final Enum value) { + StringBuilder comment = new StringBuilder(); if (value != null) { - final EnumSet set = EnumSet.allOf(value.getClass()); + final EnumSet set = EnumSet.allOf((Class) value.getClass()); - for (final Object Oeg : set) { - final Enum eg = (Enum) Oeg; - if (comment == null) { - comment = "Possible Values: " + eg.name(); + for (final T eg : set) { + if (comment.length() == 0) { + comment.append("Possible Values: ").append(eg.name()); } else { - comment += ", " + eg.name(); + comment.append(", ").append(eg.name()); } } } - return comment; + return comment.toString(); } public boolean isFeatureEnabled(final AEFeature f) { @@ -419,6 +419,7 @@ public boolean useAEVersion(final MaterialType mt) { } @Override + @SuppressWarnings("rawtypes") public void updateSetting(final IConfigManager manager, final Enum setting, final Enum newValue) { for (final Settings e : this.settings.getSettings()) { if (e == setting) { diff --git a/src/main/java/appeng/core/FeatureHandlerRegistry.java b/src/main/java/appeng/core/FeatureHandlerRegistry.java index 86dc5fed83a..a884e7b4979 100644 --- a/src/main/java/appeng/core/FeatureHandlerRegistry.java +++ b/src/main/java/appeng/core/FeatureHandlerRegistry.java @@ -17,7 +17,7 @@ public final class FeatureHandlerRegistry { - private final Set registry = new LinkedHashSet(); + private final Set registry = new LinkedHashSet<>(); public void addFeatureHandler(final IFeatureHandler feature) { this.registry.add(feature); diff --git a/src/main/java/appeng/core/FeatureRegistry.java b/src/main/java/appeng/core/FeatureRegistry.java index 1a7101aff29..f01f7c42fd8 100644 --- a/src/main/java/appeng/core/FeatureRegistry.java +++ b/src/main/java/appeng/core/FeatureRegistry.java @@ -17,7 +17,7 @@ public final class FeatureRegistry { - private final Set registry = new LinkedHashSet(); + private final Set registry = new LinkedHashSet<>(); public void addFeature(final IAEFeature feature) { this.registry.add(feature); diff --git a/src/main/java/appeng/core/IMCHandler.java b/src/main/java/appeng/core/IMCHandler.java index 3e307a26c1c..bd3952a65fb 100644 --- a/src/main/java/appeng/core/IMCHandler.java +++ b/src/main/java/appeng/core/IMCHandler.java @@ -41,7 +41,7 @@ public class IMCHandler { * Initializes the processors */ public IMCHandler() { - this.processors = new HashMap(INITIAL_PROCESSORS_CAPACITY); + this.processors = new HashMap<>(INITIAL_PROCESSORS_CAPACITY); this.processors.put("blacklist-block-spatial", new IMCBlackListSpatial()); this.processors.put("whitelist-spatial", new IMCSpatial()); diff --git a/src/main/java/appeng/core/RecipeLoader.java b/src/main/java/appeng/core/RecipeLoader.java index 3cf288084b1..09fb2b9810b 100644 --- a/src/main/java/appeng/core/RecipeLoader.java +++ b/src/main/java/appeng/core/RecipeLoader.java @@ -87,10 +87,7 @@ public final void run() { this.handler.parseRecipes(new ConfigLoader(generatedRecipesDir, userRecipesDir), "index.recipe"); } // on failure use jar parsing - catch (final IOException e) { - AELog.debug(e); - this.handler.parseRecipes(new JarLoader(ASSETS_RECIPE_PATH), "index.recipe"); - } catch (final URISyntaxException e) { + catch (final IOException | URISyntaxException e) { AELog.debug(e); this.handler.parseRecipes(new JarLoader(ASSETS_RECIPE_PATH), "index.recipe"); } diff --git a/src/main/java/appeng/core/api/ApiPart.java b/src/main/java/appeng/core/api/ApiPart.java index 2dbe5c76b22..a5c698ce272 100644 --- a/src/main/java/appeng/core/api/ApiPart.java +++ b/src/main/java/appeng/core/api/ApiPart.java @@ -49,10 +49,10 @@ public class ApiPart implements IPartHelper { - private final Map tileImplementations = new HashMap(); - private final Map, String> interfaces2Layer = new HashMap, String>(); - private final Map roots = new HashMap(); - private final List desc = new LinkedList(); + private final Map tileImplementations = new HashMap<>(); + private final Map, String> interfaces2Layer = new HashMap<>(); + private final Map roots = new HashMap<>(); + private final List desc = new LinkedList<>(); public void initFMPSupport() { for (final Class layerInterface : this.interfaces2Layer.keySet()) { @@ -203,8 +203,7 @@ private ClassNode getReader(final String name) { } private void processNode(final AbstractInsnNode next, final String nePar) { - if (next instanceof MethodInsnNode) { - final MethodInsnNode min = (MethodInsnNode) next; + if (next instanceof MethodInsnNode min) { if (min.owner.equals("appeng/api/parts/LayerBase")) { min.owner = nePar; } @@ -278,7 +277,7 @@ public CableRenderMode getCableRenderMode() { private static class DefaultPackageClassNameRemapper extends Remapper { - private final HashMap inputOutput = new HashMap(); + private final HashMap inputOutput = new HashMap<>(); @Override public String map(final String typeName) { diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 62c776efd60..109aa45b998 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -140,7 +140,7 @@ public ApiBlocks(final DefinitionConstructor constructor) { final BlockQuartz quartzBlock = new BlockQuartz(); final BlockQuartzChiseled chiseledQuartz = new BlockQuartzChiseled(); - this.orientables = ImmutableSet.of(lightDetector, quartzPillar, skyStone, cga, quartzTorch); + this.orientables = ImmutableSet.of(lightDetector, quartzPillar, skyStone, cga, quartzTorch); this.quartzOre = constructor.registerBlockDefinition(new OreQuartz()); this.quartzOreCharged = constructor.registerBlockDefinition(new OreQuartzCharged()); diff --git a/src/main/java/appeng/core/features/BlockDefinition.java b/src/main/java/appeng/core/features/BlockDefinition.java index 9cb9eba8a38..4b1bac05ef3 100644 --- a/src/main/java/appeng/core/features/BlockDefinition.java +++ b/src/main/java/appeng/core/features/BlockDefinition.java @@ -65,8 +65,7 @@ private static Item constructItemFromBlock(final Block block) { * @return a {@link Class} extending ItemBlock */ private static Class getItemBlockConstructor(final Block block) { - if (block instanceof AEBaseBlock) { - final AEBaseBlock aeBaseBlock = (AEBaseBlock) block; + if (block instanceof AEBaseBlock aeBaseBlock) { return aeBaseBlock.getItemBlockClass(); } diff --git a/src/main/java/appeng/core/features/SlabBlockFeatureHandler.java b/src/main/java/appeng/core/features/SlabBlockFeatureHandler.java index 0cceb383ec8..dffaed1d7cd 100644 --- a/src/main/java/appeng/core/features/SlabBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/SlabBlockFeatureHandler.java @@ -30,7 +30,7 @@ public class SlabBlockFeatureHandler implements IFeatureHandler { public SlabBlockFeatureHandler(final EnumSet features, final AEBaseSlabBlock slabs) { 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); } diff --git a/src/main/java/appeng/core/features/registries/CellRegistry.java b/src/main/java/appeng/core/features/registries/CellRegistry.java index 37a3fbff993..a7340bf4864 100644 --- a/src/main/java/appeng/core/features/registries/CellRegistry.java +++ b/src/main/java/appeng/core/features/registries/CellRegistry.java @@ -22,7 +22,7 @@ public class CellRegistry implements ICellRegistry { private final List handlers; public CellRegistry() { - this.handlers = new ArrayList(); + this.handlers = new ArrayList<>(); } @Override diff --git a/src/main/java/appeng/core/features/registries/ExternalStorageRegistry.java b/src/main/java/appeng/core/features/registries/ExternalStorageRegistry.java index 52a0a4d1f4f..db9d69e23ea 100644 --- a/src/main/java/appeng/core/features/registries/ExternalStorageRegistry.java +++ b/src/main/java/appeng/core/features/registries/ExternalStorageRegistry.java @@ -28,7 +28,7 @@ public class ExternalStorageRegistry implements IExternalStorageRegistry { private final ExternalIInv lastHandler = new ExternalIInv(); public ExternalStorageRegistry() { - this.Handlers = new ArrayList(); + this.Handlers = new ArrayList<>(); } @Override diff --git a/src/main/java/appeng/core/features/registries/GridCacheRegistry.java b/src/main/java/appeng/core/features/registries/GridCacheRegistry.java index a3655326084..67b467c1e18 100644 --- a/src/main/java/appeng/core/features/registries/GridCacheRegistry.java +++ b/src/main/java/appeng/core/features/registries/GridCacheRegistry.java @@ -22,7 +22,7 @@ public final class GridCacheRegistry implements IGridCacheRegistry { - private final Map, Class> caches = new HashMap, Class>(); + private final Map, Class> caches = new HashMap<>(); @Override public void registerGridCache(final Class iface, @@ -40,7 +40,7 @@ public void registerGridCache(final Class iface, @Override public HashMap, IGridCache> createCacheInstance(final IGrid g) { - final HashMap, IGridCache> map = new HashMap, IGridCache>(); + final HashMap, IGridCache> map = new HashMap<>(); for (final Class iface : this.caches.keySet()) { try { @@ -49,13 +49,7 @@ public HashMap, IGridCache> createCacheInstance(fina } catch (final NoSuchMethodException e) { AELog.error("Grid Caches must have a constructor with IGrid as the single param."); throw new IllegalArgumentException(e); - } catch (final InvocationTargetException e) { - AELog.error("Grid Caches must have a constructor with IGrid as the single param."); - throw new IllegalStateException(e); - } catch (final InstantiationException e) { - AELog.error("Grid Caches must have a constructor with IGrid as the single param."); - throw new IllegalStateException(e); - } catch (final IllegalAccessException e) { + } catch (final InvocationTargetException | IllegalAccessException | InstantiationException e) { AELog.error("Grid Caches must have a constructor with IGrid as the single param."); throw new IllegalStateException(e); } diff --git a/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java b/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java index e7a7ab43588..5fb1d6694f3 100644 --- a/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java +++ b/src/main/java/appeng/core/features/registries/GrinderRecipeManager.java @@ -37,10 +37,10 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene private final Map dusts; public GrinderRecipeManager() { - this.recipes = new ArrayList(); - this.ores = new HashMap(); - this.ingots = new HashMap(); - this.dusts = new HashMap(); + this.recipes = new ArrayList<>(); + this.ores = new HashMap<>(); + this.ingots = new HashMap<>(); + this.dusts = new HashMap<>(); this.addOre("Coal", new ItemStack(Items.coal)); this.addOre("Charcoal", new ItemStack(Items.coal, 1, 1)); diff --git a/src/main/java/appeng/core/features/registries/InscriberRegistry.java b/src/main/java/appeng/core/features/registries/InscriberRegistry.java index 2c79262fc3a..a1ace522be1 100644 --- a/src/main/java/appeng/core/features/registries/InscriberRegistry.java +++ b/src/main/java/appeng/core/features/registries/InscriberRegistry.java @@ -34,9 +34,9 @@ public final class InscriberRegistry implements IInscriberRegistry { private final Set inputs; public InscriberRegistry() { - this.inputs = new HashSet(); - this.optionals = new HashSet(); - this.recipes = new HashSet(); + this.inputs = new HashSet<>(); + this.optionals = new HashSet<>(); + this.recipes = new HashSet<>(); } @Nonnull @@ -79,12 +79,7 @@ public void addRecipe(final IInscriberRecipe recipe) { @Override public void removeRecipe(final IInscriberRecipe toBeRemovedRecipe) { - for (final Iterator iterator = this.recipes.iterator(); iterator.hasNext();) { - final IInscriberRecipe recipe = iterator.next(); - if (recipe.equals(toBeRemovedRecipe)) { - iterator.remove(); - } - } + this.recipes.removeIf(recipe -> recipe.equals(toBeRemovedRecipe)); } /** @@ -102,7 +97,7 @@ private static final class Builder implements IInscriberRecipeBuilder { @Nonnull @Override public Builder withInputs(@Nonnull final Collection inputs) { - this.inputs = new ArrayList(inputs.size()); + this.inputs = new ArrayList<>(inputs.size()); this.inputs.addAll(inputs); return this; diff --git a/src/main/java/appeng/core/features/registries/LocatableRegistry.java b/src/main/java/appeng/core/features/registries/LocatableRegistry.java index 4c3ca459a5f..6aa1ef348f3 100644 --- a/src/main/java/appeng/core/features/registries/LocatableRegistry.java +++ b/src/main/java/appeng/core/features/registries/LocatableRegistry.java @@ -27,7 +27,7 @@ public final class LocatableRegistry implements ILocatableRegistry { private final Map set; public LocatableRegistry() { - this.set = new HashMap(); + this.set = new HashMap<>(); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java b/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java index 0f0542a94c3..847371b05d6 100644 --- a/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java +++ b/src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java @@ -22,7 +22,7 @@ public class MatterCannonAmmoRegistry implements IOreListener, IMatterCannonAmmoRegistry { - private final HashMap DamageModifiers = new HashMap(); + private final HashMap DamageModifiers = new HashMap<>(); public MatterCannonAmmoRegistry() { OreDictionaryHandler.INSTANCE.observe(this); diff --git a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java index 0bdf2cfe8cb..16dbc7ff067 100644 --- a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java +++ b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java @@ -25,11 +25,11 @@ public class MovableTileRegistry implements IMovableRegistry { - private final HashSet blacklisted = new HashSet(); + private final HashSet blacklisted = new HashSet<>(); - private final HashMap, IMovableHandler> Valid = new HashMap, IMovableHandler>(); - private final LinkedList> test = new LinkedList>(); - private final LinkedList handlers = new LinkedList(); + private final HashMap, IMovableHandler> Valid = new HashMap<>(); + private final LinkedList> test = new LinkedList<>(); + private final LinkedList handlers = new LinkedList<>(); private final DefaultSpatialHandler dsh = new DefaultSpatialHandler(); private final IMovableHandler nullHandler = new DefaultSpatialHandler(); @@ -109,8 +109,7 @@ private IMovableHandler testClass(final Class myClass, final TileEntity te) { @Override public void doneMoving(final TileEntity te) { - if (te instanceof IMovableTile) { - final IMovableTile mt = (IMovableTile) te; + if (te instanceof IMovableTile mt) { mt.doneMoving(); } } diff --git a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java index 79d9cb1fbbd..a56db256e61 100644 --- a/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java +++ b/src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java @@ -36,7 +36,7 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry { private static final int INITIAL_CAPACITY = 40; - private final Map tunnels = new HashMap(INITIAL_CAPACITY); + private final Map tunnels = new HashMap<>(INITIAL_CAPACITY); public void configure() { /** diff --git a/src/main/java/appeng/core/features/registries/RecipeHandlerRegistry.java b/src/main/java/appeng/core/features/registries/RecipeHandlerRegistry.java index 7e98de0f111..2f0dcd045d0 100644 --- a/src/main/java/appeng/core/features/registries/RecipeHandlerRegistry.java +++ b/src/main/java/appeng/core/features/registries/RecipeHandlerRegistry.java @@ -29,9 +29,8 @@ */ public class RecipeHandlerRegistry implements IRecipeHandlerRegistry { - private final Map> handlers = new HashMap>( - 20); - private final Collection resolvers = new LinkedList(); + private final Map> handlers = new HashMap<>(20); + private final Collection resolvers = new LinkedList<>(); @Override public void addNewCraftHandler(final String name, final Class handler) { diff --git a/src/main/java/appeng/core/features/registries/SpecialComparisonRegistry.java b/src/main/java/appeng/core/features/registries/SpecialComparisonRegistry.java index a457b980f67..7e4dbf033fa 100644 --- a/src/main/java/appeng/core/features/registries/SpecialComparisonRegistry.java +++ b/src/main/java/appeng/core/features/registries/SpecialComparisonRegistry.java @@ -24,7 +24,7 @@ public class SpecialComparisonRegistry implements ISpecialComparisonRegistry { private final List CompRegistry; public SpecialComparisonRegistry() { - this.CompRegistry = new ArrayList(); + this.CompRegistry = new ArrayList<>(); } @Override diff --git a/src/main/java/appeng/core/features/registries/WirelessRegistry.java b/src/main/java/appeng/core/features/registries/WirelessRegistry.java index 6cfaece4df3..c403fede272 100644 --- a/src/main/java/appeng/core/features/registries/WirelessRegistry.java +++ b/src/main/java/appeng/core/features/registries/WirelessRegistry.java @@ -30,7 +30,7 @@ public final class WirelessRegistry implements IWirelessTermRegistry { private final List handlers; public WirelessRegistry() { - this.handlers = new ArrayList(); + this.handlers = new ArrayList<>(); } @Override diff --git a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java index c3de243f42d..753f5d07bd9 100644 --- a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java +++ b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java @@ -85,8 +85,8 @@ public boolean isWorldGenEnabled(final WorldGenType type, final World w) { private static class TypeSet { - final HashSet> badProviders = new HashSet>(); - final HashSet badDimensions = new HashSet(); - final HashSet enabledDimensions = new HashSet(); + final HashSet> badProviders = new HashSet<>(); + final HashSet badDimensions = new HashSet<>(); + final HashSet enabledDimensions = new HashSet<>(); } } diff --git a/src/main/java/appeng/core/features/registries/entries/BasicCellHandler.java b/src/main/java/appeng/core/features/registries/entries/BasicCellHandler.java index 1d780f7e979..450356897ad 100644 --- a/src/main/java/appeng/core/features/registries/entries/BasicCellHandler.java +++ b/src/main/java/appeng/core/features/registries/entries/BasicCellHandler.java @@ -62,8 +62,7 @@ public void openChestGui(final EntityPlayer player, final IChestOrDrive chest, f @Override public int getStatusForCell(final ItemStack is, final IMEInventory handler) { - if (handler instanceof CellInventoryHandler) { - final CellInventoryHandler ci = (CellInventoryHandler) handler; + if (handler instanceof CellInventoryHandler ci) { return ci.getStatusForCell(); } return 0; 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 57092699326..a243cb787c0 100644 --- a/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java +++ b/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java @@ -40,7 +40,7 @@ public class InscriberRecipe implements IInscriberRecipe { public InscriberRecipe(@Nonnull final Collection inputs, @Nonnull final ItemStack output, @Nullable final ItemStack top, @Nullable final ItemStack bot, @Nonnull final InscriberProcessType type) { - this.inputs = new ArrayList(inputs.size()); + this.inputs = new ArrayList<>(inputs.size()); this.inputs.addAll(inputs); this.output = output; @@ -85,12 +85,10 @@ public boolean equals(final Object o) { if (this == o) { return true; } - if (!(o instanceof IInscriberRecipe)) { + if (!(o instanceof IInscriberRecipe that)) { return false; } - final IInscriberRecipe that = (IInscriberRecipe) o; - if (!this.inputs.equals(that.getInputs())) { return false; } diff --git a/src/main/java/appeng/core/stats/PlayerStatsRegistration.java b/src/main/java/appeng/core/stats/PlayerStatsRegistration.java index 7fb8df29a33..b910663a1da 100644 --- a/src/main/java/appeng/core/stats/PlayerStatsRegistration.java +++ b/src/main/java/appeng/core/stats/PlayerStatsRegistration.java @@ -80,7 +80,7 @@ public void registerAchievements() { /** * register */ - final ArrayList list = new ArrayList(); + final ArrayList list = new ArrayList<>(); for (final Achievements a : Achievements.values()) { final Achievement ach = a.getAchievement(); @@ -91,7 +91,7 @@ public void registerAchievements() { final AchievementPage ae2AchievementPage = new AchievementPage( "Applied Energistics 2", - list.toArray(new Achievement[list.size()])); + list.toArray(new Achievement[0])); AchievementPage.registerAchievementPage(ae2AchievementPage); } } diff --git a/src/main/java/appeng/core/sync/GuiBridge.java b/src/main/java/appeng/core/sync/GuiBridge.java index 8c736f9e201..6dfe7e1cdf7 100644 --- a/src/main/java/appeng/core/sync/GuiBridge.java +++ b/src/main/java/appeng/core/sync/GuiBridge.java @@ -271,8 +271,7 @@ public boolean CorrectTileOrPart(final Object tE) { private Object updateGui(final Object newContainer, final World w, final int x, final int y, final int z, final ForgeDirection side, final Object myItem) { - if (newContainer instanceof AEBaseContainer) { - final AEBaseContainer bc = (AEBaseContainer) newContainer; + if (newContainer instanceof AEBaseContainer bc) { bc.setOpenContext(new ContainerOpenContext(myItem)); bc.getOpenContext().setWorld(w); bc.getOpenContext().setX(x); @@ -304,8 +303,7 @@ public Object ConstructContainer(final InventoryPlayer inventory, final ForgeDir /** * triggers achievement when the player sees presses. */ - if (o instanceof AEBaseContainer) { - final AEBaseContainer bc = (AEBaseContainer) o; + if (o instanceof AEBaseContainer bc) { for (final Object so : bc.inventorySlots) { if (so instanceof Slot) { final ItemStack is = ((Slot) so).getStack(); diff --git a/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java b/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java index 3879da00a12..697c7225194 100644 --- a/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java @@ -33,13 +33,8 @@ public void onPacketData(final INetworkInfo network, final FMLProxyPacket packet final int packetType = stream.readInt(); final AppEngPacket pack = PacketTypes.getPacket(packetType).parsePacket(stream); pack.clientPacketData(network, pack, player); - } catch (final InstantiationException e) { - AELog.debug(e); - } catch (final IllegalAccessException e) { - AELog.debug(e); - } catch (final IllegalArgumentException e) { - AELog.debug(e); - } catch (final InvocationTargetException e) { + } catch (final InstantiationException | InvocationTargetException | IllegalArgumentException + | IllegalAccessException e) { AELog.debug(e); } } diff --git a/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java b/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java index 6e481c3126a..54fe4db0c3e 100644 --- a/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java @@ -30,13 +30,8 @@ public void onPacketData(final INetworkInfo manager, final FMLProxyPacket packet final int packetType = stream.readInt(); final AppEngPacket pack = PacketTypes.getPacket(packetType).parsePacket(stream); pack.serverPacketData(manager, pack, player); - } catch (final InstantiationException e) { - AELog.debug(e); - } catch (final IllegalAccessException e) { - AELog.debug(e); - } catch (final IllegalArgumentException e) { - AELog.debug(e); - } catch (final InvocationTargetException e) { + } catch (final InstantiationException | InvocationTargetException | IllegalArgumentException + | IllegalAccessException e) { AELog.debug(e); } } diff --git a/src/main/java/appeng/core/sync/packets/PacketClick.java b/src/main/java/appeng/core/sync/packets/PacketClick.java index b3a292b33a4..67287987986 100644 --- a/src/main/java/appeng/core/sync/packets/PacketClick.java +++ b/src/main/java/appeng/core/sync/packets/PacketClick.java @@ -72,8 +72,7 @@ public void serverPacketData(final INetworkInfo manager, final AppEngPacket pack final IComparableDefinition maybeColorApplicator = items.colorApplicator(); if (is != null) { - if (is.getItem() instanceof ToolNetworkTool) { - final ToolNetworkTool tnt = (ToolNetworkTool) is.getItem(); + if (is.getItem() instanceof ToolNetworkTool tnt) { tnt.serverSideToolLogic( is, player, diff --git a/src/main/java/appeng/core/sync/packets/PacketConfigButton.java b/src/main/java/appeng/core/sync/packets/PacketConfigButton.java index 6551d0d17ed..128717b7c07 100644 --- a/src/main/java/appeng/core/sync/packets/PacketConfigButton.java +++ b/src/main/java/appeng/core/sync/packets/PacketConfigButton.java @@ -53,8 +53,7 @@ public PacketConfigButton(final Settings option, final boolean rotationDirection @Override public void serverPacketData(final INetworkInfo manager, final AppEngPacket packet, final EntityPlayer player) { final EntityPlayerMP sender = (EntityPlayerMP) player; - if (sender.openContainer instanceof AEBaseContainer) { - final AEBaseContainer baseContainer = (AEBaseContainer) sender.openContainer; + if (sender.openContainer instanceof AEBaseContainer baseContainer) { if (baseContainer.getTarget() instanceof IConfigurableObject) { final IConfigManager cm = ((IConfigurableObject) baseContainer.getTarget()).getConfigManager(); final Enum newState = Platform.rotateEnum( diff --git a/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java b/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java index c7442b7e4cd..6124633cdc6 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java +++ b/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java @@ -56,11 +56,9 @@ public PacketCraftRequest(final int craftAmt, final boolean shift) { @Override public void serverPacketData(final INetworkInfo manager, final AppEngPacket packet, final EntityPlayer player) { - if (player.openContainer instanceof ContainerCraftAmount) { - final ContainerCraftAmount cca = (ContainerCraftAmount) player.openContainer; + if (player.openContainer instanceof ContainerCraftAmount cca) { final Object target = cca.getTarget(); - if (target instanceof IGridHost) { - final IGridHost gh = (IGridHost) target; + if (target instanceof IGridHost gh) { final IGridNode gn = gh.getGridNode(ForgeDirection.UNKNOWN); if (gn == null) { return; @@ -88,8 +86,7 @@ public void serverPacketData(final INetworkInfo manager, final AppEngPacket pack final TileEntity te = context.getTile(); cca.openConfirmationGUI(player, te); - if (player.openContainer instanceof ContainerCraftConfirm) { - final ContainerCraftConfirm ccc = (ContainerCraftConfirm) player.openContainer; + if (player.openContainer instanceof ContainerCraftConfirm ccc) { ccc.setAutoStart(this.heldShift); ccc.setJob(futureJob); cca.detectAndSendChanges(); diff --git a/src/main/java/appeng/core/sync/packets/PacketCraftingCPUsUpdate.java b/src/main/java/appeng/core/sync/packets/PacketCraftingCPUsUpdate.java index 34a7172eb95..c202f4ae793 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCraftingCPUsUpdate.java +++ b/src/main/java/appeng/core/sync/packets/PacketCraftingCPUsUpdate.java @@ -46,8 +46,7 @@ public PacketCraftingCPUsUpdate(final Collection cpus) throws public void clientPacketData(final INetworkInfo network, final AppEngPacket packet, final EntityPlayer player) { final GuiScreen gs = Minecraft.getMinecraft().currentScreen; - if (gs instanceof ICraftingCPUTableHolder) { - ICraftingCPUTableHolder gui = (ICraftingCPUTableHolder) gs; + if (gs instanceof ICraftingCPUTableHolder gui) { gui.getCPUTable().getContainer().handleCPUUpdate(this.cpus); } } diff --git a/src/main/java/appeng/core/sync/packets/PacketCraftingItemInterface.java b/src/main/java/appeng/core/sync/packets/PacketCraftingItemInterface.java index 4c60344809e..bd9f46c57b2 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCraftingItemInterface.java +++ b/src/main/java/appeng/core/sync/packets/PacketCraftingItemInterface.java @@ -48,8 +48,7 @@ public PacketCraftingItemInterface(IAEItemStack is) throws IOException { @Override public void serverPacketData(INetworkInfo manager, AppEngPacket packet, EntityPlayer player) { - if (player.openContainer instanceof ContainerCraftingStatus) { - ContainerCraftingStatus cpv = (ContainerCraftingStatus) player.openContainer; + if (player.openContainer instanceof ContainerCraftingStatus cpv) { final Object target = cpv.getTarget(); if (target instanceof IGridHost) { final ContainerOpenContext context = cpv.getOpenContext(); diff --git a/src/main/java/appeng/core/sync/packets/PacketCraftingRemainingOperations.java b/src/main/java/appeng/core/sync/packets/PacketCraftingRemainingOperations.java index 6b4acbe7371..679cc8c8488 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCraftingRemainingOperations.java +++ b/src/main/java/appeng/core/sync/packets/PacketCraftingRemainingOperations.java @@ -47,8 +47,7 @@ public PacketCraftingRemainingOperations() throws IOException { @Override public void serverPacketData(INetworkInfo manager, AppEngPacket packet, EntityPlayer player) { - if (player.openContainer instanceof ContainerCraftingStatus) { - final ContainerCraftingStatus cpv = (ContainerCraftingStatus) player.openContainer; + if (player.openContainer instanceof ContainerCraftingStatus cpv) { final Object target = cpv.getTarget(); if (!(target instanceof IGridHost)) { return; diff --git a/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java b/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java index 36b089726d5..d9d801d282a 100644 --- a/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java +++ b/src/main/java/appeng/core/sync/packets/PacketInventoryAction.java @@ -102,8 +102,7 @@ public PacketInventoryAction(final InventoryAction action, final int slot, final @Override public void serverPacketData(final INetworkInfo manager, final AppEngPacket packet, final EntityPlayer player) { final EntityPlayerMP sender = (EntityPlayerMP) player; - if (sender.openContainer instanceof AEBaseContainer) { - final AEBaseContainer baseContainer = (AEBaseContainer) sender.openContainer; + if (sender.openContainer instanceof AEBaseContainer baseContainer) { if (this.action == InventoryAction.AUTO_CRAFT) { final ContainerOpenContext context = baseContainer.getOpenContext(); if (context != null) { @@ -114,8 +113,7 @@ public void serverPacketData(final INetworkInfo manager, final AppEngPacket pack baseContainer.getOpenContext().getSide(), GuiBridge.GUI_CRAFTING_AMOUNT); - if (sender.openContainer instanceof ContainerCraftAmount) { - final ContainerCraftAmount cca = (ContainerCraftAmount) sender.openContainer; + if (sender.openContainer instanceof ContainerCraftAmount cca) { if (baseContainer.getTargetStack() != null) { cca.getCraftingItem().putStack(baseContainer.getTargetStack().getItemStack()); @@ -134,8 +132,7 @@ public void serverPacketData(final INetworkInfo manager, final AppEngPacket pack te, baseContainer.getOpenContext().getSide(), GuiBridge.GUI_PATTERN_VALUE_AMOUNT); - if (sender.openContainer instanceof ContainerPatternValueAmount) { - final ContainerPatternValueAmount cpv = (ContainerPatternValueAmount) sender.openContainer; + if (sender.openContainer instanceof ContainerPatternValueAmount cpv) { if (baseContainer.getTargetStack() != null) { cpv.setValueIndex(this.slot); cpv.getPatternValue().putStack(baseContainer.getTargetStack().getItemStack()); diff --git a/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java b/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java index 1ea042592da..72cbbf1e2aa 100644 --- a/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java +++ b/src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java @@ -66,7 +66,7 @@ public class PacketMEInventoryUpdate extends AppEngPacket { public PacketMEInventoryUpdate(final ByteBuf stream) throws IOException { this.data = null; this.compressFrame = null; - this.list = new LinkedList(); + this.list = new LinkedList<>(); this.ref = stream.readByte(); // int originalBytes = stream.readableBytes(); diff --git a/src/main/java/appeng/core/sync/packets/PacketNEIRecipe.java b/src/main/java/appeng/core/sync/packets/PacketNEIRecipe.java index 5ca2bc054f4..febec85b697 100644 --- a/src/main/java/appeng/core/sync/packets/PacketNEIRecipe.java +++ b/src/main/java/appeng/core/sync/packets/PacketNEIRecipe.java @@ -94,8 +94,7 @@ public void serverPacketData(final INetworkInfo manager, final AppEngPacket pack final EntityPlayerMP pmp = (EntityPlayerMP) player; final Container con = pmp.openContainer; - if (con instanceof IContainerCraftingPacket) { - final IContainerCraftingPacket cct = (IContainerCraftingPacket) con; + if (con instanceof IContainerCraftingPacket cct) { final IGridNode node = cct.getNetworkNode(); if (node != null) { final IGrid grid = node.getGrid(); diff --git a/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java b/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java index 126f33819d7..804ceab8a1e 100644 --- a/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java +++ b/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java @@ -89,8 +89,7 @@ private void writeItem(final IAEItemStack slotItem, final ByteBuf data) throws I @Override public void serverPacketData(final INetworkInfo manager, final AppEngPacket packet, final EntityPlayer player) { final EntityPlayerMP sender = (EntityPlayerMP) player; - if (sender.openContainer instanceof ContainerPatternTerm) { - final ContainerPatternTerm patternTerminal = (ContainerPatternTerm) sender.openContainer; + if (sender.openContainer instanceof ContainerPatternTerm patternTerminal) { patternTerminal.craftOrGetItem(this); } } diff --git a/src/main/java/appeng/core/sync/packets/PacketPatternValueSet.java b/src/main/java/appeng/core/sync/packets/PacketPatternValueSet.java index efa3c91d031..81f36c2b3d9 100644 --- a/src/main/java/appeng/core/sync/packets/PacketPatternValueSet.java +++ b/src/main/java/appeng/core/sync/packets/PacketPatternValueSet.java @@ -46,8 +46,7 @@ public PacketPatternValueSet(int originalGui, int amount, int valueIndex) { @Override public void serverPacketData(INetworkInfo manager, AppEngPacket packet, EntityPlayer player) { - if (player.openContainer instanceof ContainerPatternValueAmount) { - ContainerPatternValueAmount cpv = (ContainerPatternValueAmount) player.openContainer; + if (player.openContainer instanceof ContainerPatternValueAmount cpv) { final Object target = cpv.getTarget(); if (target instanceof IGridHost) { final ContainerOpenContext context = cpv.getOpenContext(); diff --git a/src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java b/src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java index f1ea0c8ae48..6476823332e 100644 --- a/src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java +++ b/src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java @@ -52,8 +52,7 @@ public PacketSwitchGuis(final GuiBridge newGui) { @Override public void serverPacketData(final INetworkInfo manager, final AppEngPacket packet, final EntityPlayer player) { final Container c = player.openContainer; - if (c instanceof AEBaseContainer) { - final AEBaseContainer bc = (AEBaseContainer) c; + if (c instanceof AEBaseContainer bc) { final ContainerOpenContext context = bc.getOpenContext(); if (context != null) { final TileEntity te = context.getTile(); diff --git a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java index e0d7fe32a47..a9cc9e20980 100644 --- a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java +++ b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java @@ -90,53 +90,44 @@ public void serverPacketData(final INetworkInfo manager, final AppEngPacket pack } else if (this.Name.equals("QuartzKnife.ReName") && c instanceof ContainerRenamer) { final ContainerRenamer qk = (ContainerRenamer) c; qk.setNewName(this.Value); - } else if (this.Name.equals("TileSecurity.ToggleOption") && c instanceof ContainerSecurity) { - final ContainerSecurity sc = (ContainerSecurity) c; + } else if (this.Name.equals("TileSecurity.ToggleOption") && c instanceof ContainerSecurity sc) { sc.toggleSetting(this.Value, player); - } else if (this.Name.equals("PriorityHost.Priority") && c instanceof ContainerPriority) { - final ContainerPriority pc = (ContainerPriority) c; + } else if (this.Name.equals("PriorityHost.Priority") && c instanceof ContainerPriority pc) { pc.setPriority(Integer.parseInt(this.Value), player); - } else if (this.Name.equals("OreFilter") && c instanceof ContainerOreFilter) { - final ContainerOreFilter fc = (ContainerOreFilter) c; + } else if (this.Name.equals("OreFilter") && c instanceof ContainerOreFilter fc) { fc.setFilter(this.Value); - } else if (this.Name.equals("LevelEmitter.Value") && c instanceof ContainerLevelEmitter) { - final ContainerLevelEmitter lvc = (ContainerLevelEmitter) c; + } else if (this.Name.equals("LevelEmitter.Value") && c instanceof ContainerLevelEmitter lvc) { lvc.setLevel(Long.parseLong(this.Value), player); } else if (this.Name.startsWith("PatternTerminal.") && c instanceof ContainerPatternTerm) { final ContainerPatternTerm cpt = (ContainerPatternTerm) c; - if (this.Name.equals("PatternTerminal.CraftMode")) { - cpt.getPatternTerminal().setCraftingRecipe(this.Value.equals("1")); - } else if (this.Name.equals("PatternTerminal.Encode")) { - if (this.Value.equals("2")) cpt.encodeAndMoveToInventory(false); - else if (this.Value.equals("6")) cpt.encodeAndMoveToInventory(true); - else cpt.encode(); - } else if (this.Name.equals("PatternTerminal.Clear")) { - cpt.clear(); - } else if (this.Name.equals("PatternTerminal.Substitute")) { - cpt.getPatternTerminal().setSubstitution(this.Value.equals("1")); - } else if (this.Name.equals("PatternTerminal.BeSubstitute")) { - cpt.getPatternTerminal().setCanBeSubstitution(this.Value.equals("1")); - } else if (this.Name.equals("PatternTerminal.Double")) { - cpt.doubleStacks(Value.equals("1")); + switch (this.Name) { + case "PatternTerminal.CraftMode" -> cpt.getPatternTerminal().setCraftingRecipe(this.Value.equals("1")); + case "PatternTerminal.Encode" -> { + if (this.Value.equals("2")) cpt.encodeAndMoveToInventory(false); + else if (this.Value.equals("6")) cpt.encodeAndMoveToInventory(true); + else cpt.encode(); + } + case "PatternTerminal.Clear" -> cpt.clear(); + case "PatternTerminal.Substitute" -> cpt.getPatternTerminal().setSubstitution(this.Value.equals("1")); + case "PatternTerminal.BeSubstitute" -> cpt.getPatternTerminal() + .setCanBeSubstitution(this.Value.equals("1")); + case "PatternTerminal.Double" -> cpt.doubleStacks(Value.equals("1")); } } else if (this.Name.startsWith("PatternTerminalEx.") && c instanceof ContainerPatternTermEx) { final ContainerPatternTermEx cpt = (ContainerPatternTermEx) c; - if (this.Name.equals("PatternTerminalEx.Encode")) { - if (this.Value.equals("2")) cpt.encodeAndMoveToInventory(false); - else if (this.Value.equals("6")) cpt.encodeAndMoveToInventory(true); - else cpt.encode(); - } else if (this.Name.equals("PatternTerminalEx.Clear")) { - cpt.clear(); - } else if (this.Name.equals("PatternTerminalEx.Substitute")) { - cpt.getPatternTerminal().setSubstitution(this.Value.equals("1")); - } else if (this.Name.equals("PatternTerminalEx.BeSubstitute")) { - cpt.getPatternTerminal().setCanBeSubstitution(this.Value.equals("1")); - } else if (this.Name.equals("PatternTerminalEx.Invert")) { - cpt.getPatternTerminal().setInverted(Value.equals("1")); - } else if (this.Name.equals("PatternTerminalEx.Double")) { - cpt.doubleStacks(Value.equals("1")); - } else if (this.Name.equals("PatternTerminalEx.ActivePage")) { - cpt.getPatternTerminal().setActivePage(Integer.parseInt(Value)); + switch (this.Name) { + case "PatternTerminalEx.Encode" -> { + if (this.Value.equals("2")) cpt.encodeAndMoveToInventory(false); + else if (this.Value.equals("6")) cpt.encodeAndMoveToInventory(true); + else cpt.encode(); + } + case "PatternTerminalEx.Clear" -> cpt.clear(); + case "PatternTerminalEx.Substitute" -> cpt.getPatternTerminal().setSubstitution(this.Value.equals("1")); + case "PatternTerminalEx.BeSubstitute" -> cpt.getPatternTerminal() + .setCanBeSubstitution(this.Value.equals("1")); + case "PatternTerminalEx.Invert" -> cpt.getPatternTerminal().setInverted(Value.equals("1")); + case "PatternTerminalEx.Double" -> cpt.doubleStacks(Value.equals("1")); + case "PatternTerminalEx.ActivePage" -> cpt.getPatternTerminal().setActivePage(Integer.parseInt(Value)); } } else if (this.Name.startsWith("StorageBus.") && c instanceof ContainerStorageBus) { final ContainerStorageBus ccw = (ContainerStorageBus) c; @@ -150,12 +141,10 @@ public void serverPacketData(final INetworkInfo manager, final AppEngPacket pack } else if (this.Name.startsWith("CellWorkbench.") && c instanceof ContainerCellWorkbench) { final ContainerCellWorkbench ccw = (ContainerCellWorkbench) c; if (this.Name.equals("CellWorkbench.Action")) { - if (this.Value.equals("CopyMode")) { - ccw.nextWorkBenchCopyMode(); - } else if (this.Value.equals("Partition")) { - ccw.partition(); - } else if (this.Value.equals("Clear")) { - ccw.clear(); + switch (this.Value) { + case "CopyMode" -> ccw.nextWorkBenchCopyMode(); + case "Partition" -> ccw.partition(); + case "Clear" -> ccw.clear(); } } else if (this.Name.equals("CellWorkbench.Fuzzy")) { ccw.setFuzzy(FuzzyMode.valueOf(this.Value)); diff --git a/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java b/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java index 1ad50819236..0c5b5d39120 100644 --- a/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java +++ b/src/main/java/appeng/core/worlddata/PlayerMappingsInitializer.java @@ -46,7 +46,7 @@ class PlayerMappingsInitializer { final int capacity = playerList.size(); // Mappings for the IDs is a regular HashMap - this.playerMappings = new HashMap(capacity); + this.playerMappings = new HashMap<>(capacity); // Iterates through every pair of UUID to ID for (final Map.Entry entry : playerList.getValues().entrySet()) { diff --git a/src/main/java/appeng/core/worlddata/SpawnData.java b/src/main/java/appeng/core/worlddata/SpawnData.java index 751e6f817ca..42fff654f01 100644 --- a/src/main/java/appeng/core/worlddata/SpawnData.java +++ b/src/main/java/appeng/core/worlddata/SpawnData.java @@ -85,7 +85,7 @@ public boolean addNearByMeteorites(final int dim, final int chunkX, final int ch @Override public Collection getNearByMeteorites(final int dim, final int chunkX, final int chunkZ) { - final Collection ll = new LinkedList(); + final Collection ll = new LinkedList<>(); synchronized (SpawnData.class) { for (int x = -1; x <= 1; x++) { diff --git a/src/main/java/appeng/core/worlddata/StorageData.java b/src/main/java/appeng/core/worlddata/StorageData.java index 2ddfeca90a3..af0a11cbd64 100644 --- a/src/main/java/appeng/core/worlddata/StorageData.java +++ b/src/main/java/appeng/core/worlddata/StorageData.java @@ -39,8 +39,7 @@ final class StorageData implements IWorldGridStorageData, IOnWorldStartable, IOn private static final String GRID_STORAGE_CATEGORY = "gridstorage"; - private final Map> loadedStorage = new WeakHashMap>( - 10); + private final Map> loadedStorage = new WeakHashMap<>(10); private final Configuration config; private long lastGridStorage; @@ -67,8 +66,8 @@ public GridStorage getGridStorage(final long storageID) { final String id = String.valueOf(storageID); final String data = this.config.get("gridstorage", id, "").getString(); final GridStorage thisStorage = new GridStorage(data, storageID, gss); - gss.setGridStorage(new WeakReference(thisStorage)); - this.loadedStorage.put(gss, new WeakReference(gss)); + gss.setGridStorage(new WeakReference<>(thisStorage)); + this.loadedStorage.put(gss, new WeakReference<>(gss)); return thisStorage; } @@ -84,8 +83,8 @@ public GridStorage getNewGridStorage() { final long storageID = this.nextGridStorage(); final GridStorageSearch gss = new GridStorageSearch(storageID); final GridStorage newStorage = new GridStorage(storageID, gss); - gss.setGridStorage(new WeakReference(newStorage)); - this.loadedStorage.put(gss, new WeakReference(gss)); + gss.setGridStorage(new WeakReference<>(newStorage)); + this.loadedStorage.put(gss, new WeakReference<>(gss)); return newStorage; } diff --git a/src/main/java/appeng/core/worlddata/WorldData.java b/src/main/java/appeng/core/worlddata/WorldData.java index 24745f10e5f..c7037c70447 100644 --- a/src/main/java/appeng/core/worlddata/WorldData.java +++ b/src/main/java/appeng/core/worlddata/WorldData.java @@ -89,7 +89,7 @@ private WorldData(@Nonnull final File worldDirectory) { this.compassData = compassData; this.spawnData = spawnData; - this.startables = Lists.newArrayList(playerData, dimensionData, storageData); + this.startables = Lists.newArrayList(playerData, dimensionData, storageData); this.stoppables = Lists.newArrayList(playerData, dimensionData, storageData, compassData); } diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index 01074017b0b..39c204955c6 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/src/main/java/appeng/crafting/CraftingJob.java @@ -47,7 +47,7 @@ public class CraftingJob implements ICraftingJob, Runnable { private final World world; private final IItemList crafting = AEApi.instance().storage().createItemList(); private final IItemList missing = AEApi.instance().storage().createItemList(); - private final HashMap opsAndMultiplier = new HashMap(); + private final HashMap opsAndMultiplier = new HashMap<>(); private final Object monitor = new Object(); private final Stopwatch watch = Stopwatch.createUnstarted(); private CraftingTreeNode tree; @@ -159,10 +159,8 @@ public void run() { } this.logCraftingJob("simulate", timer); - } catch (final CraftBranchFailure e1) { + } catch (final CraftBranchFailure | CraftingCalculationFailure e1) { AELog.debug(e1); - } catch (final CraftingCalculationFailure f) { - AELog.debug(f); } catch (final InterruptedException e1) { AELog.crafting("Crafting calculation canceled."); this.finish(); @@ -311,8 +309,7 @@ private void logCraftingJob(String type, Stopwatch timer) { final DimensionalCoord location = actionableNode.getGridBlock().getLocation(); actionSource = String.format(LOG_MACHINE_SOURCE_DETAILS, machine, location); - } else if (this.actionSrc instanceof PlayerSource) { - final PlayerSource source = (PlayerSource) this.actionSrc; + } else if (this.actionSrc instanceof PlayerSource source) { final EntityPlayer player = source.player; actionSource = player.toString(); diff --git a/src/main/java/appeng/crafting/CraftingTreeNode.java b/src/main/java/appeng/crafting/CraftingTreeNode.java index cb50da7b0a1..0c992e3649b 100644 --- a/src/main/java/appeng/crafting/CraftingTreeNode.java +++ b/src/main/java/appeng/crafting/CraftingTreeNode.java @@ -40,7 +40,7 @@ public class CraftingTreeNode { // what item is this? private final IAEItemStack what; // what are the crafting patterns for this? - private final ArrayList nodes = new ArrayList(); + private final ArrayList nodes = new ArrayList<>(); private int bytes = 0; private boolean canEmit = false; private long missing = 0; diff --git a/src/main/java/appeng/crafting/CraftingTreeProcess.java b/src/main/java/appeng/crafting/CraftingTreeProcess.java index efa480113e6..22bb0e778ee 100644 --- a/src/main/java/appeng/crafting/CraftingTreeProcess.java +++ b/src/main/java/appeng/crafting/CraftingTreeProcess.java @@ -36,7 +36,7 @@ public class CraftingTreeProcess { private final CraftingTreeNode parent; final ICraftingPatternDetails details; private final CraftingJob job; - private final Map nodes = new HashMap(); + private final Map nodes = new HashMap<>(); private final int depth; boolean possible = true; private World world; @@ -80,6 +80,7 @@ public CraftingTreeProcess(final ICraftingGrid cc, final CraftingJob job, final for (final IAEItemStack a : details.getCondensedOutputs()) { if (g != null && a != null && a.equals(g)) { isAnInput = true; + break; } } @@ -126,6 +127,7 @@ public CraftingTreeProcess(final ICraftingGrid cc, final CraftingJob job, final for (final IAEItemStack a : details.getCondensedOutputs()) { if (g != null && a != null && a.equals(g)) { isAnInput = true; + break; } } diff --git a/src/main/java/appeng/crafting/CraftingWatcher.java b/src/main/java/appeng/crafting/CraftingWatcher.java index e99048b81ef..e4387e6452a 100644 --- a/src/main/java/appeng/crafting/CraftingWatcher.java +++ b/src/main/java/appeng/crafting/CraftingWatcher.java @@ -28,7 +28,7 @@ public class CraftingWatcher implements ICraftingWatcher { private final CraftingGridCache gsc; private final ICraftingWatcherHost host; - private final HashSet myInterests = new HashSet(); + private final HashSet myInterests = new HashSet<>(); public CraftingWatcher(final CraftingGridCache cache, final ICraftingWatcherHost host) { this.gsc = cache; diff --git a/src/main/java/appeng/crafting/v2/CraftingJobV2.java b/src/main/java/appeng/crafting/v2/CraftingJobV2.java index e6432ae29af..a732552974e 100644 --- a/src/main/java/appeng/crafting/v2/CraftingJobV2.java +++ b/src/main/java/appeng/crafting/v2/CraftingJobV2.java @@ -77,10 +77,9 @@ public static CraftingJobV2 deserialize(World world, ByteBuf buffer) { } catch (IOException e) { throw new RuntimeException(e); } - if (!(rawJob instanceof CraftingJobV2)) { + if (!(rawJob instanceof CraftingJobV2 job)) { throw new UnsupportedOperationException("Invalid job type deserialized: " + rawJob.getClass()); } - final CraftingJobV2 job = (CraftingJobV2) rawJob; while (serializer.hasWork()) { try { serializer.doWork(); @@ -273,15 +272,11 @@ public CraftingJobV2 get(long timeout, TimeUnit unit) } catch (Exception e) { throw new ExecutionException(e); } - switch (this.state) { - case RUNNING: - throw new TimeoutException(); - case CANCELLED: - throw new InterruptedException(); - case FINISHED: - return this; - default: - throw new IllegalStateException(); - } + return switch (this.state) { + case RUNNING -> throw new TimeoutException(); + case CANCELLED -> throw new InterruptedException(); + case FINISHED -> this; + default -> throw new IllegalStateException(); + }; } } diff --git a/src/main/java/appeng/crafting/v2/CraftingTreeSerializer.java b/src/main/java/appeng/crafting/v2/CraftingTreeSerializer.java index 86f50227a94..2ab65a4140f 100644 --- a/src/main/java/appeng/crafting/v2/CraftingTreeSerializer.java +++ b/src/main/java/appeng/crafting/v2/CraftingTreeSerializer.java @@ -191,16 +191,12 @@ public void writeStack(IAEStack stack) throws IOException { public IAEStack readStack() throws IOException { final byte stackType = buffer.readByte(); - switch (stackType) { - case ST_NULL: - return null; - case ST_ITEM: - return AEItemStack.loadItemStackFromPacket(buffer); - case ST_FLUID: - return AEFluidStack.loadFluidStackFromPacket(buffer); - default: - throw new UnsupportedOperationException("Unknown stack type " + stackType); - } + return switch (stackType) { + case ST_NULL -> null; + case ST_ITEM -> AEItemStack.loadItemStackFromPacket(buffer); + case ST_FLUID -> AEFluidStack.loadFluidStackFromPacket(buffer); + default -> throw new UnsupportedOperationException("Unknown stack type " + stackType); + }; } public void writeItemStack(IAEItemStack stack) throws IOException { diff --git a/src/main/java/appeng/crafting/v2/resolvers/CraftableItemResolver.java b/src/main/java/appeng/crafting/v2/resolvers/CraftableItemResolver.java index 4483d46e2f0..690679a0b21 100644 --- a/src/main/java/appeng/crafting/v2/resolvers/CraftableItemResolver.java +++ b/src/main/java/appeng/crafting/v2/resolvers/CraftableItemResolver.java @@ -246,6 +246,7 @@ public StepOutput calculateOneStep(CraftingContext context) { if (recInputChild.remainingToProcess > 0) { // If we can't resolve an input to the recursive process, we can't craft anything at all maxCraftable = 0; + break; } } for (RequestAndPerCraftAmount inputChildPair : childRequests) { @@ -330,6 +331,7 @@ public StepOutput calculateOneStep(CraftingContext context) { for (RequestAndPerCraftAmount inputChildPair : childRequests) { if (inputChildPair.request.wasSimulated) { this.request.wasSimulated = true; + break; } } } diff --git a/src/main/java/appeng/debug/TileItemGen.java b/src/main/java/appeng/debug/TileItemGen.java index e95800b2add..197e2017d1b 100644 --- a/src/main/java/appeng/debug/TileItemGen.java +++ b/src/main/java/appeng/debug/TileItemGen.java @@ -24,7 +24,7 @@ public class TileItemGen extends AEBaseTile implements IInventory { - private static final Queue POSSIBLE_ITEMS = new LinkedList(); + private static final Queue POSSIBLE_ITEMS = new LinkedList<>(); public TileItemGen() { if (POSSIBLE_ITEMS.isEmpty()) { @@ -36,7 +36,7 @@ public TileItemGen() { POSSIBLE_ITEMS.add(new ItemStack(mi, 1, dmg)); } } else { - final List list = new ArrayList(); + final List list = new ArrayList<>(); mi.getSubItems(mi, mi.getCreativeTab(), list); POSSIBLE_ITEMS.addAll(list); } diff --git a/src/main/java/appeng/debug/ToolDebugCard.java b/src/main/java/appeng/debug/ToolDebugCard.java index a7a83df196e..7cfe9dbf27e 100644 --- a/src/main/java/appeng/debug/ToolDebugCard.java +++ b/src/main/java/appeng/debug/ToolDebugCard.java @@ -83,7 +83,7 @@ public boolean onItemUseFirst(final ItemStack stack, final EntityPlayer player, final IPathingGrid pg = g.getCache(IPathingGrid.class); if (pg.getControllerState() == ControllerState.CONTROLLER_ONLINE) { - Set next = new HashSet(); + Set next = new HashSet<>(); next.add(node); final int maxLength = 10000; @@ -91,7 +91,7 @@ public boolean onItemUseFirst(final ItemStack stack, final EntityPlayer player, int length = 0; outer: while (!next.isEmpty()) { final Iterable current = next; - next = new HashSet(); + next = new HashSet<>(); for (final IGridNode n : current) { if (n.getMachine() instanceof TileController) { @@ -154,8 +154,7 @@ public boolean onItemUseFirst(final ItemStack stack, final EntityPlayer player, } } - if (te instanceof IAEPowerStorage) { - final IAEPowerStorage ps = (IAEPowerStorage) te; + if (te instanceof IAEPowerStorage ps) { this.outputMsg(player, "Energy: " + ps.getAECurrentPower() + " / " + ps.getAEMaxPower()); if (te instanceof IGridHost) { diff --git a/src/main/java/appeng/debug/ToolEraser.java b/src/main/java/appeng/debug/ToolEraser.java index 3151c0c996d..e1806921ec5 100644 --- a/src/main/java/appeng/debug/ToolEraser.java +++ b/src/main/java/appeng/debug/ToolEraser.java @@ -60,13 +60,13 @@ public boolean onItemUseFirst(final ItemStack stack, final EntityPlayer player, .isCanceled()) return true; - List next = new LinkedList(); + List next = new LinkedList<>(); next.add(new WorldCoord(x, y, z)); int blocks = 0; while (blocks < BLOCK_ERASE_LIMIT && !next.isEmpty()) { final List c = next; - next = new LinkedList(); + next = new LinkedList<>(); for (final WorldCoord wc : c) { final Block c_blk = world.getBlock(wc.x, wc.y, wc.z); diff --git a/src/main/java/appeng/debug/ToolReplicatorCard.java b/src/main/java/appeng/debug/ToolReplicatorCard.java index 6d9fb719a31..dd5b510c0bf 100644 --- a/src/main/java/appeng/debug/ToolReplicatorCard.java +++ b/src/main/java/appeng/debug/ToolReplicatorCard.java @@ -71,8 +71,7 @@ public boolean onItemUseFirst(final ItemStack stack, final EntityPlayer player, final World src_w = DimensionManager.getWorld(dimid); final TileEntity te = src_w.getTileEntity(src_x, src_y, src_z); - if (te instanceof IGridHost) { - final IGridHost gh = (IGridHost) te; + if (te instanceof IGridHost gh) { final ForgeDirection sideOff = ForgeDirection.getOrientation(src_side); final ForgeDirection currentSideOff = ForgeDirection.getOrientation(side); final IGridNode n = gh.getGridNode(sideOff); diff --git a/src/main/java/appeng/entity/RenderFloatingItem.java b/src/main/java/appeng/entity/RenderFloatingItem.java index 5890d8484ae..cc96ef96827 100644 --- a/src/main/java/appeng/entity/RenderFloatingItem.java +++ b/src/main/java/appeng/entity/RenderFloatingItem.java @@ -31,8 +31,7 @@ public RenderFloatingItem() { @Override public void doRender(final EntityItem entityItem, final double x, final double y, final double z, final float yaw, final float partialTick) { - if (entityItem instanceof EntityFloatingItem) { - final EntityFloatingItem efi = (EntityFloatingItem) entityItem; + if (entityItem instanceof EntityFloatingItem efi) { if (efi.getProgress() > 0.0) { GL11.glPushMatrix(); diff --git a/src/main/java/appeng/facade/FacadePart.java b/src/main/java/appeng/facade/FacadePart.java index 4e365aa51a6..a4cd0076972 100644 --- a/src/main/java/appeng/facade/FacadePart.java +++ b/src/main/java/appeng/facade/FacadePart.java @@ -127,8 +127,7 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende } if (randomItem != null) { - if (randomItem.getItem() instanceof ItemBlock) { - final ItemBlock ib = (ItemBlock) randomItem.getItem(); + if (randomItem.getItem() instanceof ItemBlock ib) { final Block blk = Block.getBlockFromItem(ib); if (AEApi.instance().partHelper().getCableRenderMode().transparentFacades) { @@ -451,8 +450,7 @@ public void renderInventory(final IPartRenderHelper instance, final RenderBlocks instance.setTexture(null); if (randomItem != null) { - if (randomItem.getItem() instanceof ItemBlock) { - final ItemBlock ib = (ItemBlock) randomItem.getItem(); + if (randomItem.getItem() instanceof ItemBlock ib) { final Block blk = Block.getBlockFromItem(ib); try { @@ -537,8 +535,7 @@ private ItemStack getTexture() { final Item maybeFacade = this.facade.getItem(); // AE Facade - if (maybeFacade instanceof IFacadeItem) { - final IFacadeItem facade = (IFacadeItem) maybeFacade; + if (maybeFacade instanceof IFacadeItem facade) { return facade.getTextureItem(this.facade); } else if (IntegrationRegistry.INSTANCE.isEnabled(IntegrationType.BuildCraftTransport)) { @@ -646,8 +643,7 @@ private void renderSegmentBlockCurrentBounds(final IPartRenderHelper instance, f } private boolean hasAlphaDiff(final TileEntity tileEntity, final ForgeDirection side, final IFacadePart facade) { - if (tileEntity instanceof IPartHost) { - final IPartHost ph = (IPartHost) tileEntity; + if (tileEntity instanceof IPartHost ph) { final IFacadePart fp = ph.getFacadeContainer().getFacade(side); return fp == null || (fp.isTransparent() != facade.isTransparent()); diff --git a/src/main/java/appeng/fmp/CableBusPart.java b/src/main/java/appeng/fmp/CableBusPart.java index db97314991e..890467e88a3 100644 --- a/src/main/java/appeng/fmp/CableBusPart.java +++ b/src/main/java/appeng/fmp/CableBusPart.java @@ -57,7 +57,7 @@ */ public class CableBusPart extends JCuboidPart implements JNormalOcclusion, IMaskedRedstonePart, AEMultiTile { - private static final ThreadLocal DISABLE_FACADE_OCCLUSION = new ThreadLocal(); + private static final ThreadLocal DISABLE_FACADE_OCCLUSION = new ThreadLocal<>(); private static final double SHORTER = 6.0 / 16.0; private static final double LONGER = 10.0 / 16.0; private static final double MIN_DIRECTION = 0; @@ -282,7 +282,7 @@ public void convertFromTile(final TileEntity blockTileEntity) { @Override public Iterable getOcclusionBoxes() { - final LinkedList l = new LinkedList(); + final LinkedList l = new LinkedList<>(); for (final AxisAlignedBB b : this.getCableBus() .getSelectedBoundingBoxesFromPool(true, DISABLE_FACADE_OCCLUSION.get() == null, null, true)) { l.add(new Cuboid6(b.minX, b.minY, b.minZ, b.maxX, b.maxY, b.maxZ)); @@ -311,7 +311,7 @@ public int getHollowSize(final int side) { final ForgeDirection dir = ForgeDirection.getOrientation(side); if (cable != null && cable.isConnected(dir)) { - final List boxes = new ArrayList(); + final List boxes = new ArrayList<>(); final BusCollisionHelper bch = new BusCollisionHelper( boxes, @@ -352,16 +352,16 @@ public int getHollowSize(final int side) { } switch (dir) { - case WEST: - case EAST: + case WEST, EAST -> { return this.getSize(b.minZ, b.maxZ, b.minY, b.maxY); - case DOWN: - case NORTH: + } + case DOWN, NORTH -> { return this.getSize(b.minX, b.maxX, b.minZ, b.maxZ); - case SOUTH: - case UP: + } + case SOUTH, UP -> { return this.getSize(b.minX, b.maxX, b.minY, b.maxY); - default: + } + default -> {} } } @@ -400,7 +400,7 @@ public boolean canAddPart(ItemStack is, final ForgeDirection side) { final IFacadePart fp = PartPlacement.isFacade(is, side); if (fp != null) { if (!(side == null || side == ForgeDirection.UNKNOWN || this.tile() == null)) { - final List boxes = new ArrayList(); + final List boxes = new ArrayList<>(); final IPartCollisionHelper bch = new BusCollisionHelper(boxes, side, null, true); fp.getBoxes(bch, null); for (final AxisAlignedBB bb : boxes) { @@ -415,15 +415,14 @@ public boolean canAddPart(ItemStack is, final ForgeDirection side) { return true; } - if (is.getItem() instanceof IPartItem) { - final IPartItem bi = (IPartItem) is.getItem(); + if (is.getItem() instanceof IPartItem bi) { is = is.copy(); is.stackSize = 1; final IPart bp = bi.createPartFromItemStack(is); if (!(side == null || side == ForgeDirection.UNKNOWN || this.tile() == null)) { - final List boxes = new ArrayList(); + final List boxes = new ArrayList<>(); final IPartCollisionHelper bch = new BusCollisionHelper(boxes, side, null, true); if (bp != null) { bp.getBoxes(bch); @@ -553,7 +552,7 @@ public boolean isInWorld() { @Override public Iterable getCollisionBoxes() { - final LinkedList l = new LinkedList(); + final LinkedList l = new LinkedList<>(); for (final AxisAlignedBB b : this.getCableBus().getSelectedBoundingBoxesFromPool(false, true, null, true)) { l.add(new Cuboid6(b.minX, b.minY, b.minZ, b.maxX, b.maxY, b.maxZ)); } @@ -562,7 +561,7 @@ public Iterable getCollisionBoxes() { @Override public Iterable getSubParts() { - final LinkedList l = new LinkedList(); + final LinkedList l = new LinkedList<>(); for (final Cuboid6 c : this.getCollisionBoxes()) { l.add(new IndexedCuboid6(0, c)); } diff --git a/src/main/java/appeng/fmp/FMPEvent.java b/src/main/java/appeng/fmp/FMPEvent.java index a7823173579..f114afce5aa 100644 --- a/src/main/java/appeng/fmp/FMPEvent.java +++ b/src/main/java/appeng/fmp/FMPEvent.java @@ -39,7 +39,7 @@ */ public class FMPEvent { - private final ThreadLocal placing = new ThreadLocal(); + private final ThreadLocal placing = new ThreadLocal<>(); @SubscribeEvent public void ServerFMPEvent(final FMPPacketEvent event) { @@ -61,8 +61,7 @@ private static boolean place(final EntityPlayer player, final World world) { Block blk = null; TMultiPart part = null; - if (held.getItem() instanceof AEBaseItemBlock) { - final AEBaseItemBlock ib = (AEBaseItemBlock) held.getItem(); + if (held.getItem() instanceof AEBaseItemBlock ib) { blk = Block.getBlockFromItem(ib); part = PartRegistry.getPartByBlock(blk, hit.sideHit); } diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 1fef281903b..7d03437048c 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -92,7 +92,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn public static final int NUMBER_OF_CONFIG_SLOTS = 9; public static final int NUMBER_OF_PATTERN_SLOTS = 9; - private static final Collection BAD_BLOCKS = new HashSet(100); + private static final Collection BAD_BLOCKS = new HashSet<>(100); private final int[] sides = { 0, 1, 2, 3, 4, 5, 6, 7, 8 }; private final IAEItemStack[] requireWork = { null, null, null, null, null, null, null, null, null }; private final MultiCraftingTracker craftingTracker; @@ -105,10 +105,10 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn private final AppEngInternalInventory storage = new AppEngInternalInventory(this, NUMBER_OF_STORAGE_SLOTS); private final AppEngInternalInventory patterns = new AppEngInternalInventory(this, NUMBER_OF_PATTERN_SLOTS * 4); private final WrapperInvSlot slotInv = new WrapperInvSlot(this.storage); - private final MEMonitorPassThrough items = new MEMonitorPassThrough( + private final MEMonitorPassThrough items = new MEMonitorPassThrough<>( new NullInventory(), StorageChannel.ITEMS); - private final MEMonitorPassThrough fluids = new MEMonitorPassThrough( + private final MEMonitorPassThrough fluids = new MEMonitorPassThrough<>( new NullInventory(), StorageChannel.FLUIDS); private final UpgradeInventory upgrades; @@ -233,7 +233,7 @@ private void addToSendList(final ItemStack is) { } if (this.waitingToSend == null) { - this.waitingToSend = new LinkedList(); + this.waitingToSend = new LinkedList<>(); } this.waitingToSend.add(is); @@ -392,13 +392,12 @@ protected void addToCraftingList(final ItemStack is) { return; } - if (is.getItem() instanceof ICraftingPatternItem) { - final ICraftingPatternItem cpi = (ICraftingPatternItem) is.getItem(); + if (is.getItem() instanceof ICraftingPatternItem cpi) { final ICraftingPatternDetails details = cpi.getPatternForItem(is, this.iHost.getTileEntity().getWorldObj()); if (details != null) { if (this.craftingList == null) { - this.craftingList = new LinkedList(); + this.craftingList = new LinkedList<>(); } this.craftingList.add(details); @@ -437,8 +436,8 @@ public void gridChanged() { this.items.setInternal(this.gridProxy.getStorage().getItemInventory()); this.fluids.setInternal(this.gridProxy.getStorage().getFluidInventory()); } catch (final GridAccessException gae) { - this.items.setInternal(new NullInventory()); - this.fluids.setInternal(new NullInventory()); + this.items.setInternal(new NullInventory<>()); + this.fluids.setInternal(new NullInventory<>()); } this.notifyNeighbors(); @@ -809,8 +808,7 @@ public boolean pushPattern(final ICraftingPatternDetails patternDetails, final I } } - if (te instanceof ICraftingMachine) { - final ICraftingMachine cm = (ICraftingMachine) te; + if (te instanceof ICraftingMachine cm) { if (cm.acceptsPlans()) { if (cm.pushPattern(patternDetails, table, s.getOpposite())) { return true; diff --git a/src/main/java/appeng/helpers/MultiCraftingTracker.java b/src/main/java/appeng/helpers/MultiCraftingTracker.java index 828a9b50152..f1a3cda8a5e 100644 --- a/src/main/java/appeng/helpers/MultiCraftingTracker.java +++ b/src/main/java/appeng/helpers/MultiCraftingTracker.java @@ -88,9 +88,7 @@ public boolean handleCrafting(final int x, final long itemToCraft, final IAEItem return true; } } - } catch (final InterruptedException e) { - // :P - } catch (final ExecutionException e) { + } catch (final InterruptedException | ExecutionException e) { // :P } } else { @@ -110,7 +108,7 @@ public ImmutableSet getRequestedJobs() { return ImmutableSet.of(); } - return ImmutableSet.copyOf(new NonNullArrayIterator(this.links)); + return ImmutableSet.copyOf(new NonNullArrayIterator<>(this.links)); } public void jobStateChange(final ICraftingLink link) { @@ -213,6 +211,7 @@ private void setJob(final int slot, final Future l) { for (final Future job : this.jobs) { if (job != null) { hasStuff = true; + break; } } diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java index 421e2c3cdb8..651ceda83a1 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -43,8 +43,8 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable failCache = new HashSet(); - private final Set passCache = new HashSet(); + private final Set failCache = new HashSet<>(); + private final Set passCache = new HashSet<>(); private final IAEItemStack pattern; private int priority = 0; @@ -64,8 +64,8 @@ public PatternHelper(final ItemStack is, final World w) { this.patternItem = is; this.pattern = AEItemStack.create(is); - final List in = new ArrayList(); - final List out = new ArrayList(); + final List in = new ArrayList<>(); + final List out = new ArrayList<>(); for (int x = 0; x < inTag.tagCount(); x++) { final NBTTagCompound tag = inTag.getCompoundTagAt(x); @@ -116,8 +116,8 @@ public PatternHelper(final ItemStack is, final World w) { } } - this.outputs = out.toArray(new IAEItemStack[out.size()]); - this.inputs = in.toArray(new IAEItemStack[in.size()]); + this.outputs = out.toArray(new IAEItemStack[0]); + this.inputs = in.toArray(new IAEItemStack[0]); this.condensedInputs = convertToCondensedList(this.inputs); this.condensedOutputs = convertToCondensedList(this.outputs); @@ -149,13 +149,13 @@ public synchronized boolean isValidItemForSlot(final int slotIndex, final ItemSt final TestStatus result = this.getStatus(slotIndex, i); switch (result) { - case ACCEPT: + case ACCEPT -> { return true; - case DECLINE: + } + case DECLINE -> { return false; - case TEST: - default: - break; + } + default -> {} } for (int x = 0; x < this.crafting.getSizeInventory(); x++) { @@ -333,8 +333,7 @@ public int hashCode() { public boolean equals(final Object obj) { final boolean equality; - if (obj instanceof TestLookup) { - final TestLookup b = (TestLookup) obj; + if (obj instanceof TestLookup b) { equality = b.slot == this.slot && b.ref == this.ref; } else { @@ -347,7 +346,7 @@ public boolean equals(final Object obj) { public static IAEItemStack[] loadIAEItemStackFromNBT(final NBTTagList tags, boolean saveOrder, final ItemStack unknownItem) { - final List items = new ArrayList(); + final List items = new ArrayList<>(); for (int x = 0; x < tags.tagCount(); x++) { final NBTTagCompound tag = tags.getCompoundTagAt(x); @@ -369,11 +368,11 @@ public static IAEItemStack[] loadIAEItemStackFromNBT(final NBTTagList tags, bool } } - return items.toArray(new IAEItemStack[items.size()]); + return items.toArray(new IAEItemStack[0]); } public static IAEItemStack[] convertToCondensedList(final IAEItemStack[] items) { - final Map tmp = new HashMap(); + final Map tmp = new HashMap<>(); for (final IAEItemStack io : items) { @@ -390,6 +389,6 @@ public static IAEItemStack[] convertToCondensedList(final IAEItemStack[] items) } } - return tmp.values().toArray(new IAEItemStack[tmp.size()]); + return tmp.values().toArray(new IAEItemStack[0]); } } diff --git a/src/main/java/appeng/hooks/CompassManager.java b/src/main/java/appeng/hooks/CompassManager.java index 35e20190d8a..7ec1315bab0 100644 --- a/src/main/java/appeng/hooks/CompassManager.java +++ b/src/main/java/appeng/hooks/CompassManager.java @@ -19,7 +19,7 @@ public class CompassManager { public static final CompassManager INSTANCE = new CompassManager(); - private final HashMap requests = new HashMap(); + private final HashMap requests = new HashMap<>(); public void postResult(final long attunement, final int x, final int y, final int z, final CompassResult result) { final CompassRequest r = new CompassRequest(attunement, x, y, z); diff --git a/src/main/java/appeng/hooks/DispenserBlockTool.java b/src/main/java/appeng/hooks/DispenserBlockTool.java index 8117c87e47a..f5e8179f12d 100644 --- a/src/main/java/appeng/hooks/DispenserBlockTool.java +++ b/src/main/java/appeng/hooks/DispenserBlockTool.java @@ -26,9 +26,8 @@ public final class DispenserBlockTool extends BehaviorDefaultDispenseItem { @Override protected ItemStack dispenseStack(final IBlockSource dispenser, final ItemStack dispensedItem) { final Item i = dispensedItem.getItem(); - if (i instanceof IBlockTool) { + if (i instanceof IBlockTool tm) { final EnumFacing enumfacing = BlockDispenser.func_149937_b(dispenser.getBlockMetadata()); - final IBlockTool tm = (IBlockTool) i; final World w = dispenser.getWorld(); if (w instanceof WorldServer) { diff --git a/src/main/java/appeng/hooks/DispenserMatterCannon.java b/src/main/java/appeng/hooks/DispenserMatterCannon.java index 2e200b02ead..9f969d47b05 100644 --- a/src/main/java/appeng/hooks/DispenserMatterCannon.java +++ b/src/main/java/appeng/hooks/DispenserMatterCannon.java @@ -29,7 +29,7 @@ public final class DispenserMatterCannon extends BehaviorDefaultDispenseItem { @Override protected ItemStack dispenseStack(final IBlockSource dispenser, ItemStack dispensedItem) { final Item i = dispensedItem.getItem(); - if (i instanceof ToolMassCannon) { + if (i instanceof ToolMassCannon tm) { final EnumFacing enumfacing = BlockDispenser.func_149937_b(dispenser.getBlockMetadata()); ForgeDirection dir = ForgeDirection.UNKNOWN; for (final ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) { @@ -39,8 +39,6 @@ protected ItemStack dispenseStack(final IBlockSource dispenser, ItemStack dispen } } - final ToolMassCannon tm = (ToolMassCannon) i; - final World w = dispenser.getWorld(); if (w instanceof WorldServer) { final EntityPlayer p = Platform.getPlayer((WorldServer) w); diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index 99d774cb9ca..2cb13d0c98e 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -48,13 +48,13 @@ public class TickHandler { public static final TickHandler INSTANCE = new TickHandler(); - private final Queue> serverQueue = new LinkedList>(); + private final Queue> serverQueue = new LinkedList<>(); private final Multimap craftingJobs = LinkedListMultimap.create(); - private final WeakHashMap>> callQueue = new WeakHashMap>>(); + private final WeakHashMap>> callQueue = new WeakHashMap<>(); private final HandlerRep server = new HandlerRep(); private final HandlerRep client = new HandlerRep(); - private final HashMap cliPlayerColors = new HashMap(); - private final HashMap srvPlayerColors = new HashMap(); + private final HashMap cliPlayerColors = new HashMap<>(); + private final HashMap srvPlayerColors = new HashMap<>(); private CableRenderMode crm = CableRenderMode.Standard; // must be a thread safe collection since this can be called from finalizer thread private final BlockingDeque callListToDelete = new LinkedBlockingDeque<>(); @@ -74,12 +74,7 @@ public void addCallable(final World w, final IWorldCallable c) { if (w == null) { this.serverQueue.add(c); } else { - Queue> queue = this.callQueue.get(w); - - if (queue == null) { - queue = new LinkedList>(); - this.callQueue.put(w, queue); - } + Queue> queue = this.callQueue.computeIfAbsent(w, k -> new LinkedList<>()); queue.add(c); } @@ -125,7 +120,7 @@ public void shutdown() { public void unloadWorld(final WorldEvent.Unload ev) { if (Platform.isServer()) // for no there is no reason to care about this on the client... { - final LinkedList toDestroy = new LinkedList(); + final LinkedList toDestroy = new LinkedList<>(); for (final Grid g : this.getRepo().networks) { for (final IGridNode n : g.getNodes()) { @@ -170,13 +165,7 @@ public void onTick(final TickEvent ev) { final Collection jobSet = this.craftingJobs.get(wte.world); if (!jobSet.isEmpty()) { final int simTime = Math.max(1, AEConfig.instance.craftingCalculationTimePerTick / jobSet.size()); - final Iterator i = jobSet.iterator(); - while (i.hasNext()) { - final ICraftingJob cj = i.next(); - if (!cj.simulateFor(simTime)) { - i.remove(); - } - } + jobSet.removeIf(cj -> !cj.simulateFor(simTime)); } } } @@ -260,12 +249,12 @@ public void registerCraftingSimulation(final World world, final ICraftingJob cra private static class HandlerRep { - private Queue tiles = new LinkedList(); + private Queue tiles = new LinkedList<>(); private Collection networks = new NetworkList(); private void clear() { - this.tiles = new LinkedList(); + this.tiles = new LinkedList<>(); this.networks = new NetworkList(); } } diff --git a/src/main/java/appeng/integration/IntegrationNode.java b/src/main/java/appeng/integration/IntegrationNode.java index ea07e6ef4bc..d03f14ceb7f 100644 --- a/src/main/java/appeng/integration/IntegrationNode.java +++ b/src/main/java/appeng/integration/IntegrationNode.java @@ -60,24 +60,21 @@ void call(final IntegrationStage stage) { try { switch (stage) { - case PRE_INIT: + case PRE_INIT -> { 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."); final String mode = AEConfig.instance .get("ModIntegration", this.displayName.replace(" ", ""), "AUTO").getString(); - if (mode.toUpperCase().equals("ON")) { enabled = true; } if (mode.toUpperCase().equals("OFF")) { enabled = false; } - if (enabled) { this.classValue = this.getClass().getClassLoader().loadClass(this.name); this.mod = (IIntegrationModule) this.classValue.getConstructor().newInstance(); @@ -86,23 +83,17 @@ void call(final IntegrationStage stage) { } else { throw new ModNotInstalled(this.modID); } - this.setState(IntegrationStage.INIT); - - break; - case INIT: + } + case INIT -> { this.mod.init(); this.setState(IntegrationStage.POST_INIT); - - break; - case POST_INIT: + } + case POST_INIT -> { this.mod.postInit(); this.setState(IntegrationStage.READY); - - break; - case FAILED: - default: - break; + } + default -> {} } } catch (final Throwable t) { this.failedStage = stage; diff --git a/src/main/java/appeng/integration/IntegrationRegistry.java b/src/main/java/appeng/integration/IntegrationRegistry.java index 40f2dcc82cd..b953e4b5607 100644 --- a/src/main/java/appeng/integration/IntegrationRegistry.java +++ b/src/main/java/appeng/integration/IntegrationRegistry.java @@ -24,7 +24,7 @@ public enum IntegrationRegistry { private static final String PACKAGE_PREFIX = "appeng.integration.modules."; - private final Collection modules = new LinkedList(); + private final Collection modules = new LinkedList<>(); public void add(final IntegrationType type) { if (type.side == IntegrationSide.CLIENT && FMLLaunchHandler.side() == Side.SERVER) { diff --git a/src/main/java/appeng/integration/modules/BCHelpers/AEGenericSchematicTile.java b/src/main/java/appeng/integration/modules/BCHelpers/AEGenericSchematicTile.java index ce5e4227102..65684762f76 100644 --- a/src/main/java/appeng/integration/modules/BCHelpers/AEGenericSchematicTile.java +++ b/src/main/java/appeng/integration/modules/BCHelpers/AEGenericSchematicTile.java @@ -27,13 +27,13 @@ public class AEGenericSchematicTile extends SchematicTile { @Override public void storeRequirements(final IBuilderContext context, final int x, final int y, final int z) { final TileEntity tile = context.world().getTileEntity(x, y, z); - final ArrayList list = new ArrayList(); + final ArrayList list = new ArrayList<>(); if (tile instanceof AEBaseTile) { final ICommonTile tcb = (ICommonTile) tile; tcb.getDrops(tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, list); } - this.storedRequirements = list.toArray(new ItemStack[list.size()]); + this.storedRequirements = list.toArray(new ItemStack[0]); } @Override diff --git a/src/main/java/appeng/integration/modules/BuildCraftTransport.java b/src/main/java/appeng/integration/modules/BuildCraftTransport.java index 2da4f8f6b66..469a7eca9c7 100644 --- a/src/main/java/appeng/integration/modules/BuildCraftTransport.java +++ b/src/main/java/appeng/integration/modules/BuildCraftTransport.java @@ -97,8 +97,7 @@ public IFacadePart createFacadePart(@Nonnull final ItemStack fs, @Nonnull final public ItemStack getTextureForFacade(@Nonnull final ItemStack facade) { final Item maybeFacadeItem = facade.getItem(); - if (maybeFacadeItem instanceof IFacadeItem) { - final IFacadeItem facadeItem = (IFacadeItem) maybeFacadeItem; + if (maybeFacadeItem instanceof IFacadeItem facadeItem) { final Block[] blocks = facadeItem.getBlocksForFacade(facade); final int[] metas = facadeItem.getMetaValuesForFacade(facade); @@ -124,8 +123,7 @@ public IIcon getCobbleStructurePipeTexture() { @Override public boolean isPipe(final TileEntity te, @Nonnull final ForgeDirection dir) { - if (te instanceof IPipeTile) { - final IPipeTile pipeTile = (IPipeTile) te; + if (te instanceof IPipeTile pipeTile) { return !pipeTile.hasPipePluggable(dir.getOpposite()); } @@ -134,8 +132,7 @@ public boolean isPipe(final TileEntity te, @Nonnull final ForgeDirection dir) { @Override public boolean canAddItemsToPipe(final TileEntity te, final ItemStack is, final ForgeDirection dir) { - if (is != null && te != null && te instanceof IInjectable) { - final IInjectable pt = (IInjectable) te; + if (is != null && te != null && te instanceof IInjectable pt) { if (pt.canInjectItems(dir)) { final int amt = pt.injectItem(is, false, dir, null); if (amt == is.stackSize) { @@ -150,8 +147,7 @@ public boolean canAddItemsToPipe(final TileEntity te, final ItemStack is, final @Override public boolean addItemsToPipe(@Nullable final TileEntity te, @Nullable final ItemStack is, @Nonnull final ForgeDirection dir) { - if (is != null && te != null && te instanceof IInjectable) { - final IInjectable pt = (IInjectable) te; + if (is != null && te != null && te instanceof IInjectable pt) { if (pt.canInjectItems(dir)) { final int amt = pt.injectItem(is, false, dir, null); if (amt == is.stackSize) { diff --git a/src/main/java/appeng/integration/modules/FMP.java b/src/main/java/appeng/integration/modules/FMP.java index 4d43ca235fb..c88b6a5b5b1 100644 --- a/src/main/java/appeng/integration/modules/FMP.java +++ b/src/main/java/appeng/integration/modules/FMP.java @@ -67,8 +67,7 @@ public TMultiPart convert(final World world, final BlockCoord pos) { final int meta = world.getBlockMetadata(pos.x, pos.y, pos.z); final TMultiPart part = PartRegistry.getPartByBlock(blk, meta); - if (part instanceof CableBusPart) { - final CableBusPart cbp = (CableBusPart) part; + if (part instanceof CableBusPart cbp) { cbp.convertFromTile(world.getTileEntity(pos.x, pos.y, pos.z)); } @@ -87,9 +86,7 @@ public Iterable blockTypes() { } private void addBlockTypes(final Collection blockTypes, final IBlockDefinition definition) { - for (final Block block : definition.maybeBlock().asSet()) { - blockTypes.add(block); - } + blockTypes.addAll(definition.maybeBlock().asSet()); } @Override @@ -153,8 +150,7 @@ public IPartHost getOrCreateHost(final TileEntity tile) { @Override public CableBusContainer getCableContainer(final TileEntity te) { - if (te instanceof TileMultipart) { - final TileMultipart mp = (TileMultipart) te; + if (te instanceof TileMultipart mp) { final scala.collection.Iterator i = mp.partList().iterator(); while (i.hasNext()) { final TMultiPart p = i.next(); diff --git a/src/main/java/appeng/integration/modules/FZ.java b/src/main/java/appeng/integration/modules/FZ.java index cc9fa767d6f..77467a3d344 100644 --- a/src/main/java/appeng/integration/modules/FZ.java +++ b/src/main/java/appeng/integration/modules/FZ.java @@ -54,7 +54,7 @@ public ItemStack barrelGetItem(final TileEntity te) { } return i; - } catch (final IllegalArgumentException ignored) {} catch (final IllegalAccessException ignored) {} + } catch (final IllegalArgumentException | IllegalAccessException ignored) {} return null; } @@ -64,7 +64,7 @@ public int barrelGetMaxItemCount(final TileEntity te) { if (day_BarrelClass.isInstance(te)) { return (Integer) day_getMaxSize.invoke(te); } - } catch (final IllegalAccessException ignored) {} catch (final IllegalArgumentException ignored) {} catch (final InvocationTargetException ignored) {} + } catch (final IllegalAccessException | InvocationTargetException | IllegalArgumentException ignored) {} return 0; } @@ -74,7 +74,7 @@ public int barrelGetItemCount(final TileEntity te) { if (day_BarrelClass.isInstance(te)) { return (Integer) day_getItemCount.invoke(te); } - } catch (final IllegalAccessException ignored) {} catch (final IllegalArgumentException ignored) {} catch (final InvocationTargetException ignored) {} + } catch (final IllegalAccessException | InvocationTargetException | IllegalArgumentException ignored) {} return 0; } @@ -84,7 +84,7 @@ public void setItemType(final TileEntity te, final ItemStack input) { if (day_BarrelClass.isInstance(te)) { day_item.set(te, input == null ? null : input.copy()); } - } catch (final IllegalArgumentException ignored) {} catch (final IllegalAccessException ignored) {} + } catch (final IllegalArgumentException | IllegalAccessException ignored) {} } @Override @@ -95,7 +95,7 @@ public void barrelSetCount(final TileEntity te, final int max) { } te.markDirty(); - } catch (final IllegalAccessException ignored) {} catch (final IllegalArgumentException ignored) {} catch (final InvocationTargetException ignored) {} + } catch (final IllegalAccessException | InvocationTargetException | IllegalArgumentException ignored) {} } @Override diff --git a/src/main/java/appeng/integration/modules/NEI.java b/src/main/java/appeng/integration/modules/NEI.java index 354c37010fd..0275a76f4b2 100644 --- a/src/main/java/appeng/integration/modules/NEI.java +++ b/src/main/java/appeng/integration/modules/NEI.java @@ -97,7 +97,7 @@ public void init() throws Throwable { // crafting terminal... final Method registerGuiOverlay = this.apiClass .getDeclaredMethod("registerGuiOverlay", Class.class, String.class, IStackPositioner.class); - final Class overlayHandler = Class.forName("codechicken.nei.api.IOverlayHandler"); + final Class overlayHandler = Class.forName("codechicken.nei.api.IOverlayHandler"); final Method registrar = this.apiClass .getDeclaredMethod("registerGuiOverlayHandler", Class.class, overlayHandler, String.class); @@ -105,7 +105,7 @@ public void init() throws Throwable { registerGuiOverlay.invoke(this.apiClass, GuiPatternTerm.class, "crafting", new TerminalCraftingSlotFinder()); final Class defaultHandler = NEICraftingHandler.class; - final Constructor defaultConstructor = defaultHandler.getConstructor(int.class, int.class); + final Constructor defaultConstructor = defaultHandler.getConstructor(int.class, int.class); registrar.invoke(this.apiClass, GuiCraftingTerm.class, defaultConstructor.newInstance(6, 75), "crafting"); registrar.invoke(this.apiClass, GuiPatternTerm.class, defaultConstructor.newInstance(6, 75), "crafting"); } diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java index 62361a3403d..374cf092f2d 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java @@ -163,7 +163,7 @@ private class CachedShapedRecipe extends TemplateRecipeHandler.CachedRecipe { public CachedShapedRecipe(final ShapedRecipe recipe) { this.result = new PositionedStack(recipe.getRecipeOutput(), 119, 24); - this.ingredients = new ArrayList(); + this.ingredients = new ArrayList<>(); this.setIngredients(recipe.getWidth(), recipe.getHeight(), recipe.getIngredients()); } @@ -183,9 +183,7 @@ private void setIngredients(final int width, final int height, final Object[] it false); stack.setMaxSize(1); this.ingredients.add(stack); - } catch (final RegistrationError ignored) { - - } catch (final MissingIngredientError ignored) { + } catch (final RegistrationError | MissingIngredientError ignored) { } } diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java index 2ef8d613b3e..68ac6779032 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java @@ -163,7 +163,7 @@ private class CachedShapelessRecipe extends TemplateRecipeHandler.CachedRecipe { public CachedShapelessRecipe(final ShapelessRecipe recipe) { this.result = new PositionedStack(recipe.getRecipeOutput(), 119, 24); - this.ingredients = new ArrayList(); + this.ingredients = new ArrayList<>(); this.setIngredients(recipe.getInput().toArray()); } @@ -193,9 +193,7 @@ private void setIngredients(final Object[] items) { false); stack.setMaxSize(1); this.ingredients.add(stack); - } catch (final RegistrationError ignored) { - - } catch (final MissingIngredientError ignored) { + } catch (final RegistrationError | MissingIngredientError ignored) { } } diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEICraftingHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEICraftingHandler.java index 7c3db999c65..04e778b5dcd 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEICraftingHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEICraftingHandler.java @@ -54,7 +54,7 @@ public void overlayRecipe(final GuiContainer gui, final IRecipeHandler recipe, f } NetworkHandler.instance.sendToServer(packet); } - } catch (final Exception ignored) {} catch (final Error ignored) {} + } catch (final Exception | Error ignored) {} } // if the packet becomes too large, limit each slot contents to 3k @@ -72,11 +72,11 @@ private NBTTagCompound packIngredients(GuiContainer gui, List i final int col = (positionedStack.relx - 25) / 18; final int row = (positionedStack.rely - 6) / 18; if (positionedStack.items != null && positionedStack.items.length > 0) { - for (final Slot slot : (List) gui.inventorySlots.inventorySlots) { + for (final Slot slot : gui.inventorySlots.inventorySlots) { if (slot instanceof SlotCraftingMatrix || slot instanceof SlotFakeCraftingMatrix) { if (slot.getSlotIndex() == col + row * 3) { final NBTTagList tags = new NBTTagList(); - final List list = new LinkedList(); + final List list = new LinkedList<>(); // prefer pure crystals. for (int x = 0; x < positionedStack.items.length; x++) { diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java index c925d2e8498..11d6d5fadbd 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIFacadeRecipeHandler.java @@ -163,7 +163,7 @@ private final class CachedShapedRecipe extends TemplateRecipeHandler.CachedRecip public CachedShapedRecipe(final IFacadeItem facade, final ItemStack anchor, final ItemStack output) { output.stackSize = 4; this.result = new PositionedStack(output, 119, 24); - this.ingredients = new ArrayList(); + this.ingredients = new ArrayList<>(); final ItemStack in = facade.getTextureItem(output); this.setIngredients(3, 3, new Object[] { null, anchor, null, anchor, in, anchor, null, anchor, null }); } diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java index 4fa34c07956..8fbd6af71db 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java @@ -111,8 +111,7 @@ public void drawForeground(final int recipe) { super.drawForeground(recipe); if (this.arecipes.size() > recipe) { final CachedRecipe cr = this.arecipes.get(recipe); - if (cr instanceof CachedGrindStoneRecipe) { - final CachedGrindStoneRecipe cachedRecipe = (CachedGrindStoneRecipe) cr; + if (cr instanceof CachedGrindStoneRecipe cachedRecipe) { if (cachedRecipe.hasOptional) { final FontRenderer fr = Minecraft.getMinecraft().fontRenderer; final int width = fr.getStringWidth(cachedRecipe.displayChance); @@ -163,7 +162,7 @@ private class CachedGrindStoneRecipe extends TemplateRecipeHandler.CachedRecipe public CachedGrindStoneRecipe(final IGrinderEntry recipe) { this.result = new PositionedStack(recipe.getOutput(), -30 + 107, 47); - this.ingredients = new ArrayList(); + this.ingredients = new ArrayList<>(); final ItemStack optionalOutput = recipe.getOptionalOutput(); final int optionalChancePercent = (int) (recipe.getOptionalChance() * 100); diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIGuiHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIGuiHandler.java index 73af85995fa..67846ccb23a 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIGuiHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIGuiHandler.java @@ -19,8 +19,7 @@ public class NEIGuiHandler extends INEIGuiAdapter { @Override public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) { - if (draggedStack != null && draggedStack.getItem() != null && gui instanceof IDropToFillTextField) { - IDropToFillTextField gmm = (IDropToFillTextField) gui; + if (draggedStack != null && draggedStack.getItem() != null && gui instanceof IDropToFillTextField gmm) { if (gmm.isOverTextField(mousex, mousey)) { gmm.setTextFieldValue( diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java index a4c5c05e67a..9a63ef51f36 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java @@ -135,7 +135,7 @@ private class CachedInscriberRecipe extends TemplateRecipeHandler.CachedRecipe { public CachedInscriberRecipe(final IInscriberRecipe recipe) { this.result = new PositionedStack(recipe.getOutput(), 108, 29); - this.ingredients = new ArrayList(); + this.ingredients = new ArrayList<>(); for (final ItemStack top : recipe.getTopOptional().asSet()) { this.ingredients.add(new PositionedStack(top, 40, 5)); diff --git a/src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java b/src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java index ee7ec2af157..189818bd0d8 100644 --- a/src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java +++ b/src/main/java/appeng/integration/modules/NEIHelpers/NEIWorldCraftingHandler.java @@ -37,9 +37,9 @@ public class NEIWorldCraftingHandler implements ICraftingHandler, IUsageHandler { - private final Map details = new HashMap(); - private final List offsets = new LinkedList(); - private final List outputs = new LinkedList(); + private final Map details = new HashMap<>(); + private final List offsets = new LinkedList<>(); + private final List outputs = new LinkedList<>(); private ItemStack target; @@ -71,12 +71,12 @@ public void drawForeground(final int recipe) { @Override public List getIngredientStacks(final int recipeIndex) { - return new ArrayList(); + return new ArrayList<>(); } @Override public List getOtherStacks(final int recipeIndex) { - return new ArrayList(); + return new ArrayList<>(); } @Override @@ -147,9 +147,7 @@ public ICraftingHandler getRecipeHandler(final String outputId, final Object... private NEIWorldCraftingHandler newInstance() { try { return this.getClass().newInstance(); - } catch (final InstantiationException e) { - throw new IllegalStateException(e); - } catch (final IllegalAccessException e) { + } catch (final InstantiationException | IllegalAccessException e) { throw new IllegalStateException(e); } } diff --git a/src/main/java/appeng/integration/modules/waila/part/P2PStateWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/P2PStateWailaDataProvider.java index 45bd6e7e2b5..b3a11fd5853 100644 --- a/src/main/java/appeng/integration/modules/waila/part/P2PStateWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/P2PStateWailaDataProvider.java @@ -61,15 +61,9 @@ public List getWailaBody(final IPart part, final List currentToo int outputs = stateArr[1]; switch (state) { - case STATE_UNLINKED: - currentToolTip.add(WailaText.P2PUnlinked.getLocal()); - break; - case STATE_OUTPUT: - currentToolTip.add(WailaText.P2POutput.getLocal()); - break; - case STATE_INPUT: - currentToolTip.add(getOutputText(outputs)); - break; + case STATE_UNLINKED -> currentToolTip.add(WailaText.P2PUnlinked.getLocal()); + case STATE_OUTPUT -> currentToolTip.add(WailaText.P2POutput.getLocal()); + case STATE_INPUT -> currentToolTip.add(getOutputText(outputs)); } } @@ -89,8 +83,7 @@ public List getWailaBody(final IPart part, final List currentToo @Override public NBTTagCompound getNBTData(final EntityPlayerMP player, final IPart part, final TileEntity te, final NBTTagCompound tag, final World world, final int x, final int y, final int z) { - if (part instanceof PartP2PTunnel) { - final PartP2PTunnel tunnel = (PartP2PTunnel) part; + if (part instanceof PartP2PTunnel tunnel) { if (!tunnel.isPowered()) { return tag; 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 6961f76e20a..d25b33a63e7 100644 --- a/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java +++ b/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java @@ -40,9 +40,8 @@ public final class PartAccessor { * @return maybe the looked at {@link appeng.api.parts.IPart} */ public Optional getMaybePart(final TileEntity te, final MovingObjectPosition mop) { - if (te instanceof IPartHost) { + if (te instanceof IPartHost host) { final Vec3 position = mop.hitVec.addVector(-mop.blockX, -mop.blockY, -mop.blockZ); - final IPartHost host = (IPartHost) te; final SelectedPart sp = host.selectPart(position); if (sp.part != null) { 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 4be556cefdf..f21ba8575bc 100644 --- a/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java @@ -39,8 +39,7 @@ public final class PowerStateWailaDataProvider extends BasePartWailaDataProvider @Override public List getWailaBody(final IPart part, final List currentToolTip, final IWailaDataAccessor accessor, final IWailaConfigHandler config) { - if (part instanceof IPowerChannelState) { - final IPowerChannelState state = (IPowerChannelState) part; + if (part instanceof IPowerChannelState state) { currentToolTip.add(this.getToolTip(state.isActive(), state.isPowered(), state.isBooting())); } 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 63a608f7afa..e32ee80a5a6 100644 --- a/src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java @@ -42,8 +42,7 @@ public final class StorageMonitorWailaDataProvider extends BasePartWailaDataProv @Override public List getWailaBody(final IPart part, final List currentToolTip, final IWailaDataAccessor accessor, final IWailaConfigHandler config) { - if (part instanceof IPartStorageMonitor) { - final IPartStorageMonitor monitor = (IPartStorageMonitor) part; + if (part instanceof IPartStorageMonitor monitor) { final IAEStack displayed = monitor.getDisplayed(); final boolean isLocked = monitor.isLocked(); 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 8f2b1c80d11..03db13787bd 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java @@ -45,8 +45,7 @@ public final class ChargerWailaDataProvider extends BaseWailaDataProvider { public List getWailaBody(final ItemStack itemStack, final List currentToolTip, final IWailaDataAccessor accessor, final IWailaConfigHandler config) { final TileEntity te = accessor.getTileEntity(); - if (te instanceof TileCharger) { - final TileCharger charger = (TileCharger) te; + if (te instanceof TileCharger charger) { final IInventory chargerInventory = charger.getInternalInventory(); final ItemStack chargingItem = chargerInventory.getStackInSlot(0); 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 f8d0cbc4377..70ae891128c 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/CraftingMonitorWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/CraftingMonitorWailaDataProvider.java @@ -44,8 +44,7 @@ public final class CraftingMonitorWailaDataProvider extends BaseWailaDataProvide public List getWailaBody(final ItemStack itemStack, final List currentToolTip, final IWailaDataAccessor accessor, final IWailaConfigHandler config) { final TileEntity te = accessor.getTileEntity(); - if (te instanceof TileCraftingMonitorTile) { - final TileCraftingMonitorTile monitor = (TileCraftingMonitorTile) te; + if (te instanceof TileCraftingMonitorTile monitor) { final IAEItemStack displayStack = monitor.getJobProgress(); if (displayStack != null) { 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 d31795ce388..574bea018eb 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.java @@ -44,8 +44,7 @@ public List getWailaBody(final ItemStack itemStack, final List c final IWailaDataAccessor accessor, final IWailaConfigHandler config) { final TileEntity te = accessor.getTileEntity(); - if (te instanceof IPowerChannelState) { - final IPowerChannelState state = (IPowerChannelState) te; + if (te instanceof IPowerChannelState state) { final boolean isActive = state.isActive(); final boolean isPowered = state.isPowered(); 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 dd96277bc83..6de3e8127ed 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java @@ -50,7 +50,7 @@ public final class PowerStorageWailaDataProvider extends BaseWailaDataProvider { *

* The cache will be updated from the server. */ - private final TObjectLongMap cache = new TObjectLongHashMap(); + private final TObjectLongMap cache = new TObjectLongHashMap<>(); /** * Adds the current and max power to the tool tip Will ignore if the tile has an energy buffer ( > 0 ) @@ -68,8 +68,7 @@ public List getWailaBody(final ItemStack itemStack, final List c ((ITaggedList) currentToolTip).removeEntries("RFEnergyStorage"); final TileEntity te = accessor.getTileEntity(); - if (te instanceof IAEPowerStorage) { - final IAEPowerStorage storage = (IAEPowerStorage) te; + if (te instanceof IAEPowerStorage storage) { final double maxPower = storage.getAEMaxPower(); if (maxPower > 0) { @@ -106,8 +105,7 @@ public List getWailaBody(final ItemStack itemStack, final List c @Override public NBTTagCompound getNBTData(final EntityPlayerMP player, final TileEntity te, final NBTTagCompound tag, final World world, final int x, final int y, final int z) { - if (te instanceof IAEPowerStorage) { - final IAEPowerStorage storage = (IAEPowerStorage) te; + if (te instanceof IAEPowerStorage storage) { if (storage.getAEMaxPower() > 0) { final long internalCurrentPower = (long) (100 * storage.getAECurrentPower()); diff --git a/src/main/java/appeng/items/AEBaseItem.java b/src/main/java/appeng/items/AEBaseItem.java index 15a380ec144..1e5c614d062 100644 --- a/src/main/java/appeng/items/AEBaseItem.java +++ b/src/main/java/appeng/items/AEBaseItem.java @@ -31,7 +31,7 @@ public abstract class AEBaseItem extends Item implements IAEFeature { private IFeatureHandler feature; public AEBaseItem() { - this(Optional.absent()); + this(Optional.absent()); this.setNoRepair(); } @@ -61,15 +61,14 @@ public void setFeature(final EnumSet f) { @SideOnly(Side.CLIENT) @Override - @SuppressWarnings("unchecked") - public final void addInformation(final ItemStack stack, final EntityPlayer player, final List lines, + public final void addInformation(final ItemStack stack, final EntityPlayer player, final List lines, final boolean displayMoreInfo) { this.addCheckedInformation(stack, player, lines, displayMoreInfo); } @Override - @SuppressWarnings("unchecked") - public final void getSubItems(final Item sameItem, final CreativeTabs creativeTab, final List itemStacks) { + public final void getSubItems(final Item sameItem, final CreativeTabs creativeTab, + final List itemStacks) { this.getCheckedSubItems(sameItem, creativeTab, itemStacks); } diff --git a/src/main/java/appeng/items/contents/PortableCellViewer.java b/src/main/java/appeng/items/contents/PortableCellViewer.java index fec1ccfbfd7..1162d03ecfa 100644 --- a/src/main/java/appeng/items/contents/PortableCellViewer.java +++ b/src/main/java/appeng/items/contents/PortableCellViewer.java @@ -24,7 +24,6 @@ import appeng.container.interfaces.IInventorySlotAware; import appeng.me.storage.CellInventory; import appeng.util.ConfigManager; -import appeng.util.IConfigManagerHost; import appeng.util.Platform; public class PortableCellViewer extends MEMonitorHandler implements IPortableCell, IInventorySlotAware { @@ -73,13 +72,9 @@ public IMEMonitor getFluidInventory() { @Override public IConfigManager getConfigManager() { - final ConfigManager out = new ConfigManager(new IConfigManagerHost() { - - @Override - public void updateSetting(final IConfigManager manager, final Enum settingName, final Enum newValue) { - final NBTTagCompound data = Platform.openNbtData(PortableCellViewer.this.target); - manager.writeToNBT(data); - } + final ConfigManager out = new ConfigManager((manager, settingName, newValue) -> { + final NBTTagCompound data = Platform.openNbtData(PortableCellViewer.this.target); + manager.writeToNBT(data); }); out.registerSetting(Settings.SORT_BY, SortOrder.NAME); diff --git a/src/main/java/appeng/items/materials/ItemMultiMaterial.java b/src/main/java/appeng/items/materials/ItemMultiMaterial.java index 822c99b531f..ae9092eca73 100644 --- a/src/main/java/appeng/items/materials/ItemMultiMaterial.java +++ b/src/main/java/appeng/items/materials/ItemMultiMaterial.java @@ -59,7 +59,7 @@ public final class ItemMultiMaterial extends AEBaseItem implements IStorageCompo private static final int KILO_SCALAR = 1024; - private final Map dmgToMaterial = new HashMap(); + private final Map dmgToMaterial = new HashMap<>(); private final NameResolver nameResolver; public ItemMultiMaterial() { @@ -86,14 +86,13 @@ public void addCheckedInformation(final ItemStack stack, final EntityPlayer play final Upgrades u = this.getType(stack); if (u != null) { - final List textList = new LinkedList(); + final List textList = new LinkedList<>(); for (final Entry j : u.getSupported().entrySet()) { String name = null; final int limit = j.getValue(); - if (j.getKey().getItem() instanceof IItemGroup) { - final IItemGroup ig = (IItemGroup) j.getKey().getItem(); + if (j.getKey().getItem() instanceof IItemGroup ig) { final String str = ig.getUnlocalizedGroupName(u.getSupported().keySet(), j.getKey()); if (str != null) { name = Platform.gui_localize(str) + (limit > 1 ? " (" + limit + ')' : ""); @@ -111,7 +110,7 @@ public void addCheckedInformation(final ItemStack stack, final EntityPlayer play final Pattern p = Pattern.compile("(\\d+)[^\\d]"); final SlightlyBetterSort s = new SlightlyBetterSort(p); - Collections.sort(textList, s); + textList.sort(s); lines.addAll(textList); } } @@ -125,30 +124,19 @@ public MaterialType getTypeByStack(final ItemStack is) { @Override public Upgrades getType(final ItemStack itemstack) { - switch (this.getTypeByStack(itemstack)) { - case CardOreFilter: - return Upgrades.ORE_FILTER; - case CardPatternCapacity: - return Upgrades.PATTERN_CAPACITY; - case CardCapacity: - return Upgrades.CAPACITY; - case CardFuzzy: - return Upgrades.FUZZY; - case CardRedstone: - return Upgrades.REDSTONE; - case CardSpeed: - return Upgrades.SPEED; - case CardSuperSpeed: - return Upgrades.SUPERSPEED; - case CardInverter: - return Upgrades.INVERTER; - case CardCrafting: - return Upgrades.CRAFTING; - case CardPatternRefiller: - return Upgrades.PATTERN_REFILLER; - default: - return null; - } + return switch (this.getTypeByStack(itemstack)) { + case CardOreFilter -> Upgrades.ORE_FILTER; + case CardPatternCapacity -> Upgrades.PATTERN_CAPACITY; + case CardCapacity -> Upgrades.CAPACITY; + case CardFuzzy -> Upgrades.FUZZY; + case CardRedstone -> Upgrades.REDSTONE; + case CardSpeed -> Upgrades.SPEED; + case CardSuperSpeed -> Upgrades.SUPERSPEED; + case CardInverter -> Upgrades.INVERTER; + case CardCrafting -> Upgrades.CRAFTING; + case CardPatternRefiller -> Upgrades.PATTERN_REFILLER; + default -> null; + }; } public IStackSrc createMaterial(final MaterialType mat) { @@ -247,13 +235,7 @@ private String nameOf(final ItemStack is) { protected void getCheckedSubItems(final Item sameItem, final CreativeTabs creativeTab, final List itemStacks) { final List types = Arrays.asList(MaterialType.values()); - Collections.sort(types, new Comparator() { - - @Override - public int compare(final MaterialType o1, final MaterialType o2) { - return o1.name().compareTo(o2.name()); - } - }); + types.sort(Comparator.comparing(Enum::name)); for (final MaterialType mat : types) { if (mat.getDamageValue() >= 0 && mat.isRegistered() && mat.getItemInstance() == this) { @@ -293,8 +275,7 @@ public boolean onItemUseFirst(final ItemStack is, final EntityPlayer player, fin upgrades = ((ISegmentedInventory) te).getInventoryByName("upgrades"); } - if (upgrades != null && is != null && is.getItem() instanceof IUpgradeModule) { - final IUpgradeModule um = (IUpgradeModule) is.getItem(); + if (upgrades != null && is != null && is.getItem() instanceof IUpgradeModule um) { final Upgrades u = um.getType(is); if (u != null) { @@ -345,15 +326,19 @@ public Entity createEntity(final World w, final Entity location, final ItemStack @Override public int getBytes(final ItemStack is) { switch (this.getTypeByStack(is)) { - case Cell1kPart: + case Cell1kPart -> { return KILO_SCALAR; - case Cell4kPart: + } + case Cell4kPart -> { return KILO_SCALAR * 4; - case Cell16kPart: + } + case Cell16kPart -> { return KILO_SCALAR * 16; - case Cell64kPart: + } + case Cell64kPart -> { return KILO_SCALAR * 64; - default: + } + default -> {} } return 0; } @@ -361,12 +346,10 @@ public int getBytes(final ItemStack is) { @Override public boolean isStorageComponent(final ItemStack is) { switch (this.getTypeByStack(is)) { - case Cell1kPart: - case Cell4kPart: - case Cell16kPart: - case Cell64kPart: + case Cell1kPart, Cell4kPart, Cell16kPart, Cell64kPart -> { return true; - default: + } + default -> {} } return false; } diff --git a/src/main/java/appeng/items/misc/ItemEncodedPattern.java b/src/main/java/appeng/items/misc/ItemEncodedPattern.java index b56b1dd518f..4e7dc5b81ac 100644 --- a/src/main/java/appeng/items/misc/ItemEncodedPattern.java +++ b/src/main/java/appeng/items/misc/ItemEncodedPattern.java @@ -42,7 +42,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternItem { // rather simple client side caching. - private static final Map SIMPLE_CACHE = new WeakHashMap(); + private static final Map SIMPLE_CACHE = new WeakHashMap<>(); public ItemEncodedPattern() { this.setFeature(EnumSet.of(AEFeature.Patterns)); diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index a9a904c0f9a..51ca1a328d8 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -91,13 +91,13 @@ protected void getCheckedSubItems(final Item sameItem, final CreativeTabs creati private void calculateSubTypes() { if (this.subTypes == null) { - this.subTypes = new ArrayList(1000); + this.subTypes = new ArrayList<>(1000); for (final Object blk : Block.blockRegistry) { final Block b = (Block) blk; try { final Item item = Item.getItemFromBlock(b); - final List tmpList = new ArrayList(100); + final List tmpList = new ArrayList<>(100); b.getSubBlocks(item, b.getCreativeTabToDisplayOn(), tmpList); for (final ItemStack l : tmpList) { final ItemStack facade = this.createFacadeForItem(l, false); diff --git a/src/main/java/appeng/items/parts/ItemMultiPart.java b/src/main/java/appeng/items/parts/ItemMultiPart.java index 2425c9df32f..7f02e6781ee 100644 --- a/src/main/java/appeng/items/parts/ItemMultiPart.java +++ b/src/main/java/appeng/items/parts/ItemMultiPart.java @@ -10,7 +10,6 @@ package appeng.items.parts; -import java.lang.reflect.InvocationTargetException; import java.util.*; import java.util.Map.Entry; @@ -58,7 +57,7 @@ public final class ItemMultiPart extends AEBaseItem implements IPartItem, IItemG public ItemMultiPart(final IPartHelper partHelper) { Preconditions.checkNotNull(partHelper); - this.registered = new HashMap(INITIAL_REGISTERED_CAPACITY); + this.registered = new HashMap<>(INITIAL_REGISTERED_CAPACITY); this.nameResolver = new NameResolver(this.getClass()); this.setFeature(EnumSet.of(AEFeature.Core)); @@ -218,9 +217,8 @@ public void registerIcons(final IIconRegister iconRegister) { @Override protected void getCheckedSubItems(final Item sameItem, final CreativeTabs creativeTab, final List itemStacks) { - final List> types = new ArrayList>( - this.registered.entrySet()); - Collections.sort(types, REGISTERED_COMPARATOR); + final List> types = new ArrayList<>(this.registered.entrySet()); + types.sort(REGISTERED_COMPARATOR); for (final Entry part : types) { itemStacks.add(new ItemStack(this, 1, part.getKey())); @@ -263,22 +261,7 @@ public IPart createPartFromItemStack(final ItemStack is) { } return type.getConstructor().newInstance(is); - } catch (final InstantiationException e) { - throw new IllegalStateException( - "Unable to construct IBusPart from IBusItem : " + part.getName() - + " ; Possibly didn't have correct constructor( ItemStack )", - e); - } catch (final IllegalAccessException e) { - throw new IllegalStateException( - "Unable to construct IBusPart from IBusItem : " + part.getName() - + " ; Possibly didn't have correct constructor( ItemStack )", - e); - } catch (final InvocationTargetException e) { - throw new IllegalStateException( - "Unable to construct IBusPart from IBusItem : " + part.getName() - + " ; Possibly didn't have correct constructor( ItemStack )", - e); - } catch (final NoSuchMethodException e) { + } catch (final ReflectiveOperationException e) { throw new IllegalStateException( "Unable to construct IBusPart from IBusItem : " + part.getName() + " ; Possibly didn't have correct constructor( ItemStack )", @@ -308,19 +291,19 @@ public String getUnlocalizedGroupName(final Set others, final ItemSta if (stack.getItem() == this) { final PartType pt = this.getTypeByStack(stack); switch (pt) { - case ImportBus: + case ImportBus -> { importBus = true; if (u == pt) { group = true; } - break; - case ExportBus: + } + case ExportBus -> { exportBus = true; if (u == pt) { group = true; } - break; - default: + } + default -> {} } } } diff --git a/src/main/java/appeng/items/storage/ItemAdvancedStorageCell.java b/src/main/java/appeng/items/storage/ItemAdvancedStorageCell.java index 278beb0ffa5..ab2cc8e4411 100644 --- a/src/main/java/appeng/items/storage/ItemAdvancedStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemAdvancedStorageCell.java @@ -24,25 +24,26 @@ public ItemAdvancedStorageCell(final MaterialType whichCell, final long kilobyte this.component = whichCell; switch (this.component) { - case Cell256kPart: + case Cell256kPart -> { this.idleDrain = 2.5; this.perType = 2048; - break; - case Cell1024kPart: + } + case Cell1024kPart -> { this.idleDrain = 3.0; this.perType = 8192; - break; - case Cell4096kPart: + } + case Cell4096kPart -> { this.idleDrain = 3.5; this.perType = 32768; - break; - case Cell16384kPart: + } + case Cell16384kPart -> { this.idleDrain = 4.0; this.perType = 131072; - break; - default: + } + default -> { this.idleDrain = 0.0; this.perType = 8; + } } } diff --git a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java index 07bb6df27b9..9f297d3d106 100644 --- a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java @@ -69,25 +69,26 @@ public ItemBasicStorageCell(final MaterialType whichCell, final long kilobytes) this.component = whichCell; switch (this.component) { - case Cell1kPart: + case Cell1kPart -> { this.idleDrain = 0.5; this.perType = 8; - break; - case Cell4kPart: + } + case Cell4kPart -> { this.idleDrain = 1.0; this.perType = 32; - break; - case Cell16kPart: + } + case Cell16kPart -> { this.idleDrain = 1.5; this.perType = 128; - break; - case Cell64kPart: + } + case Cell64kPart -> { this.idleDrain = 2.0; this.perType = 512; - break; - default: + } + default -> { this.idleDrain = 0.0; this.perType = 8; + } } } @@ -103,8 +104,7 @@ public void addCheckedInformation(final ItemStack stack, final EntityPlayer play final IMEInventoryHandler inventory = AEApi.instance().registries().cell() .getCellInventory(stack, null, StorageChannel.ITEMS); - if (inventory instanceof ICellInventoryHandler) { - final ICellInventoryHandler handler = (ICellInventoryHandler) inventory; + if (inventory instanceof ICellInventoryHandler handler) { final ICellInventory cellInventory = handler.getCellInv(); if (cellInventory != null) { diff --git a/src/main/java/appeng/items/storage/ItemViewCell.java b/src/main/java/appeng/items/storage/ItemViewCell.java index ef377ea8b55..c78af3083f3 100644 --- a/src/main/java/appeng/items/storage/ItemViewCell.java +++ b/src/main/java/appeng/items/storage/ItemViewCell.java @@ -43,7 +43,7 @@ public ItemViewCell() { public static IPartitionList createFilter(final ItemStack[] list) { IPartitionList myPartitionList = null; - final MergedPriorityList myMergedList = new MergedPriorityList(); + final MergedPriorityList myMergedList = new MergedPriorityList<>(); for (final ItemStack currentViewCell : list) { if (currentViewCell == null) { @@ -66,16 +66,10 @@ public static IPartitionList createFilter(final ItemStack[] list) final Upgrades u = ((IUpgradeModule) is.getItem()).getType(is); if (u != null) { switch (u) { - case FUZZY: - hasFuzzy = true; - break; - case INVERTER: - hasInverter = true; - break; - case ORE_FILTER: - hasOreFilter = true; - break; - default: + case FUZZY -> hasFuzzy = true; + case INVERTER -> hasInverter = true; + case ORE_FILTER -> hasOreFilter = true; + default -> {} } } } @@ -95,11 +89,9 @@ public static IPartitionList createFilter(final ItemStack[] list) if (!priorityList.isEmpty()) { if (hasFuzzy) { - myMergedList.addNewList( - new FuzzyPriorityList(priorityList, fzMode), - !hasInverter); + myMergedList.addNewList(new FuzzyPriorityList<>(priorityList, fzMode), !hasInverter); } else { - myMergedList.addNewList(new PrecisePriorityList(priorityList), !hasInverter); + myMergedList.addNewList(new PrecisePriorityList<>(priorityList), !hasInverter); } } } diff --git a/src/main/java/appeng/items/storage/ItemVoidStorageCell.java b/src/main/java/appeng/items/storage/ItemVoidStorageCell.java index 78b3fb8a03c..7d048b52f2d 100644 --- a/src/main/java/appeng/items/storage/ItemVoidStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemVoidStorageCell.java @@ -35,8 +35,7 @@ public void addCheckedInformation(final ItemStack stack, final EntityPlayer play lines.add(GuiText.VoidCellTooltip.getLocal()); lines.add(0 + " " + GuiText.Of.getLocal() + " \u00A7k9999\u00A77 " + GuiText.BytesUsed.getLocal()); VoidCellInventory inv = (VoidCellInventory) VoidCellInventory.getCell(stack); - if (inv != null && stack.getItem() instanceof ItemVoidStorageCell) { - ItemVoidStorageCell cell = (ItemVoidStorageCell) stack.getItem(); + if (inv != null && stack.getItem() instanceof ItemVoidStorageCell cell) { if (inv.isPreformatted()) { String filter = cell.getOreFilter(stack); if (filter.isEmpty()) { diff --git a/src/main/java/appeng/items/tools/ToolMemoryCard.java b/src/main/java/appeng/items/tools/ToolMemoryCard.java index b727921138c..fab7d123f58 100644 --- a/src/main/java/appeng/items/tools/ToolMemoryCard.java +++ b/src/main/java/appeng/items/tools/ToolMemoryCard.java @@ -111,19 +111,11 @@ public void notifyUser(final EntityPlayer player, final MemoryCardMessages msg) } switch (msg) { - case SETTINGS_CLEARED: - player.addChatMessage(PlayerMessages.SettingCleared.get()); - break; - case INVALID_MACHINE: - player.addChatMessage(PlayerMessages.InvalidMachine.get()); - break; - case SETTINGS_LOADED: - player.addChatMessage(PlayerMessages.LoadedSettings.get()); - break; - case SETTINGS_SAVED: - player.addChatMessage(PlayerMessages.SavedSettings.get()); - break; - default: + case SETTINGS_CLEARED -> player.addChatMessage(PlayerMessages.SettingCleared.get()); + case INVALID_MACHINE -> player.addChatMessage(PlayerMessages.InvalidMachine.get()); + case SETTINGS_LOADED -> player.addChatMessage(PlayerMessages.LoadedSettings.get()); + case SETTINGS_SAVED -> player.addChatMessage(PlayerMessages.SavedSettings.get()); + default -> {} } } diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java index 80cac8d77ce..b391532a3e8 100644 --- a/src/main/java/appeng/items/tools/ToolNetworkTool.java +++ b/src/main/java/appeng/items/tools/ToolNetworkTool.java @@ -50,7 +50,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench, IToolWrench { public ToolNetworkTool() { - super(Optional.absent()); + super(Optional.absent()); this.setFeature(EnumSet.of(AEFeature.NetworkTool)); this.setMaxStackSize(1); diff --git a/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java b/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java index 82e812edd3d..b67b4878fbe 100644 --- a/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java +++ b/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java @@ -30,7 +30,7 @@ public class ToolChargedStaff extends AEBasePoweredItem { public ToolChargedStaff() { - super(AEConfig.instance.chargedStaffBattery, Optional.absent()); + super(AEConfig.instance.chargedStaffBattery, Optional.absent()); this.setFeature(EnumSet.of(AEFeature.ChargedStaff, AEFeature.PoweredTools)); } diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index c0d9bf3a66a..b65b4ecd79b 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -67,7 +67,7 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCell, IItemGroup, IBlockTool, IMouseWheelItem { - private static final Map ORE_TO_COLOR = new HashMap(); + private static final Map ORE_TO_COLOR = new HashMap<>(); static { for (final AEColor col : AEColor.values()) { @@ -80,7 +80,7 @@ public class ToolColorApplicator extends AEBasePoweredItem } public ToolColorApplicator() { - super(AEConfig.instance.colorApplicatorBattery, Optional.absent()); + super(AEConfig.instance.colorApplicatorBattery, Optional.absent()); this.setFeature(EnumSet.of(AEFeature.ColorApplicator, AEFeature.PoweredTools)); if (Platform.isClient()) { MinecraftForgeClient.registerItemRenderer(this, new ToolColorApplicatorRender()); @@ -203,8 +203,7 @@ private AEColor getColorFromItem(final ItemStack paintBall) { return AEColor.Transparent; } - if (paintBall.getItem() instanceof ItemPaintBall) { - final ItemPaintBall ipb = (ItemPaintBall) paintBall.getItem(); + if (paintBall.getItem() instanceof ItemPaintBall ipb) { return ipb.getColor(paintBall); } else { final int[] id = OreDictionary.getOreIDs(paintBall); @@ -245,19 +244,13 @@ private ItemStack findNextColor(final ItemStack is, final ItemStack anchor, fina newColor = firstItem.getItemStack(); } } else { - final LinkedList list = new LinkedList(); + final LinkedList list = new LinkedList<>(); for (final IAEItemStack i : itemList) { list.add(i); } - Collections.sort(list, new Comparator() { - - @Override - public int compare(final IAEItemStack a, final IAEItemStack b) { - return ItemSorters.compareInt(a.getItemDamage(), b.getItemDamage()); - } - }); + list.sort((a, b) -> ItemSorters.compareInt(a.getItemDamage(), b.getItemDamage())); if (list.size() <= 0) { return null; diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index 7c591e846ed..ed96ca685e7 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java @@ -51,12 +51,12 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT private final Map coolDown; public ToolEntropyManipulator() { - super(AEConfig.instance.entropyManipulatorBattery, Optional.absent()); + super(AEConfig.instance.entropyManipulatorBattery, Optional.absent()); this.setFeature(EnumSet.of(AEFeature.EntropyManipulator, AEFeature.PoweredTools)); - this.heatUp = new HashMap(); - this.coolDown = new HashMap(); + this.heatUp = new HashMap<>(); + this.coolDown = new HashMap<>(); this.coolDown.put( new InWorldToolOperationIngredient(Blocks.stone, 0), @@ -74,7 +74,7 @@ public ToolEntropyManipulator() { new InWorldToolOperationIngredient(Blocks.grass, OreDictionary.WILDCARD_VALUE), new InWorldToolOperationResult(new ItemStack(Blocks.dirt))); - final List snowBalls = new ArrayList(); + final List snowBalls = new ArrayList<>(); snowBalls.add(new ItemStack(Items.snowball)); this.coolDown.put( new InWorldToolOperationIngredient(Blocks.flowing_water, OreDictionary.WILDCARD_VALUE), @@ -277,7 +277,7 @@ public boolean onItemUse(final ItemStack item, final EntityPlayer p, final World } final ItemStack[] stack = Platform.getBlockDrops(w, x, y, z); - final List out = new ArrayList(); + final List out = new ArrayList<>(); boolean hasFurnaceable = false; boolean canFurnaceable = true; @@ -304,7 +304,7 @@ public boolean onItemUse(final ItemStack item, final EntityPlayer p, final World this.extractAEPower(item, 1600); final InWorldToolOperationResult or = InWorldToolOperationResult - .getBlockOperationResult(out.toArray(new ItemStack[out.size()])); + .getBlockOperationResult(out.toArray(new ItemStack[0])); w.playSoundEffect( x + 0.5D, y + 0.5D, diff --git a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java index 46fc2d23d08..8b6d32e5142 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java @@ -71,7 +71,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell { public ToolMassCannon() { - super(AEConfig.instance.matterCannonBattery, Optional.absent()); + super(AEConfig.instance.matterCannonBattery, Optional.absent()); this.setFeature(EnumSet.of(AEFeature.MatterCannon, AEFeature.PoweredTools)); } @@ -202,8 +202,8 @@ private void shootPaintBalls(final ItemStack type, final World w, final EntityPl final List list = w.getEntitiesWithinAABBExcludingEntity(p, bb); double closest = 9999999.0D; - for (int l = 0; l < list.size(); ++l) { - final Entity entity1 = (Entity) list.get(l); + for (Object o : list) { + final Entity entity1 = (Entity) o; if (!entity1.isDead && entity1 != p && !(entity1 instanceof EntityItem)) { if (entity1.isEntityAlive()) { @@ -258,8 +258,7 @@ private void shootPaintBalls(final ItemStack type, final World w, final EntityPl AELog.debug(err); } - if (pos != null && type != null && type.getItem() instanceof ItemPaintBall) { - final ItemPaintBall ipb = (ItemPaintBall) type.getItem(); + if (pos != null && type != null && type.getItem() instanceof ItemPaintBall ipb) { final AEColor col = ipb.getColor(type); // boolean lit = ipb.isLumen( type ); @@ -269,8 +268,7 @@ private void shootPaintBalls(final ItemStack type, final World w, final EntityPl final PlayerColor marker = new PlayerColor(id, col, 20 * 30); TickHandler.INSTANCE.getPlayerColors().put(id, marker); - if (pos.entityHit instanceof EntitySheep) { - final EntitySheep sh = (EntitySheep) pos.entityHit; + if (pos.entityHit instanceof EntitySheep sh) { sh.setFleeceColor(col.ordinal()); } @@ -324,8 +322,8 @@ private void standardAmmo(float penetration, final World w, final EntityPlayer p final List list = w.getEntitiesWithinAABBExcludingEntity(p, bb); double closest = 9999999.0D; - for (int l = 0; l < list.size(); ++l) { - final Entity entity1 = (Entity) list.get(l); + for (Object o : list) { + final Entity entity1 = (Entity) o; if (!entity1.isDead && entity1 != p && !(entity1 instanceof EntityItem)) { if (entity1.isEntityAlive()) { @@ -385,8 +383,7 @@ private void standardAmmo(float penetration, final World w, final EntityPlayer p if (pos.typeOfHit == MovingObjectType.ENTITY) { final int dmg = (int) Math.ceil(penetration / 20.0f); - if (pos.entityHit instanceof EntityLivingBase) { - final EntityLivingBase el = (EntityLivingBase) pos.entityHit; + if (pos.entityHit instanceof EntityLivingBase el) { penetration -= dmg; el.knockBack(p, 0, -direction.xCoord, -direction.zCoord); // el.knockBack( p, 0, vec3.xCoord, diff --git a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java index 8f420e5ffbf..34319e6ffa2 100644 --- a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java +++ b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java @@ -49,7 +49,7 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell, IGuiItem, IItemGroup { public ToolPortableCell() { - super(AEConfig.instance.portableCellBattery, Optional.absent()); + super(AEConfig.instance.portableCellBattery, Optional.absent()); this.setFeature(EnumSet.of(AEFeature.PortableCell, AEFeature.StorageCells, AEFeature.PoweredTools)); } diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java index 9898ea4579b..6990fa211e9 100644 --- a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java +++ b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java @@ -31,7 +31,6 @@ import appeng.core.localization.GuiText; import appeng.items.tools.powered.powersink.AEBasePoweredItem; import appeng.util.ConfigManager; -import appeng.util.IConfigManagerHost; import appeng.util.Platform; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -39,7 +38,7 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWirelessTermHandler { public ToolWirelessTerminal() { - super(AEConfig.instance.wirelessTerminalBattery, Optional.absent()); + super(AEConfig.instance.wirelessTerminalBattery, Optional.absent()); this.setFeature(EnumSet.of(AEFeature.WirelessAccessTerminal, AEFeature.PoweredTools)); } @@ -95,13 +94,9 @@ public boolean hasPower(final EntityPlayer player, final double amt, final ItemS @Override public IConfigManager getConfigManager(final ItemStack target) { - final ConfigManager out = new ConfigManager(new IConfigManagerHost() { - - @Override - public void updateSetting(final IConfigManager manager, final Enum settingName, final Enum newValue) { - final NBTTagCompound data = Platform.openNbtData(target); - manager.writeToNBT(data); - } + final ConfigManager out = new ConfigManager((manager, settingName, newValue) -> { + final NBTTagCompound data = Platform.openNbtData(target); + manager.writeToNBT(data); }); out.registerSetting(Settings.SORT_BY, SortOrder.NAME); diff --git a/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java b/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java index 1903079be6b..d3a33a542cd 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java +++ b/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java @@ -106,7 +106,7 @@ private double getInternalBattery(final ItemStack is, final batteryOperation op, final double maxStorage = this.getAEMaxPower(is); switch (op) { - case INJECT: + case INJECT -> { currentStorage += adjustment; if (currentStorage > maxStorage) { final double diff = currentStorage - maxStorage; @@ -115,7 +115,8 @@ private double getInternalBattery(final ItemStack is, final batteryOperation op, } data.setDouble(POWER_NBT_KEY, currentStorage); return 0; - case EXTRACT: + } + case EXTRACT -> { if (currentStorage > adjustment) { currentStorage -= adjustment; data.setDouble(POWER_NBT_KEY, currentStorage); @@ -123,8 +124,8 @@ private double getInternalBattery(final ItemStack is, final batteryOperation op, } data.setDouble(POWER_NBT_KEY, 0); return currentStorage; - default: - break; + } + default -> {} } return currentStorage; diff --git a/src/main/java/appeng/me/Grid.java b/src/main/java/appeng/me/Grid.java index 3ff63339529..83f0fc1334a 100644 --- a/src/main/java/appeng/me/Grid.java +++ b/src/main/java/appeng/me/Grid.java @@ -26,8 +26,8 @@ public class Grid implements IGrid { private final NetworkEventBus eventBus = new NetworkEventBus(); - private final Map, MachineSet> machines = new HashMap, MachineSet>(); - private final Map, GridCacheWrapper> caches = new HashMap, GridCacheWrapper>(); + private final Map, MachineSet> machines = new HashMap<>(); + private final Map, GridCacheWrapper> caches = new HashMap<>(); private GridNode pivot; private int priority; // how import is this network? private GridStorage myStorage; @@ -190,7 +190,7 @@ public MENetworkEvent postEventTo(final IGridNode node, final MENetworkEvent ev) public IReadOnlyCollection> getMachinesClasses() { final Set> machineKeys = this.machines.keySet(); - return new ReadOnlyCollection>(machineKeys); + return new ReadOnlyCollection<>(machineKeys); } @Override diff --git a/src/main/java/appeng/me/GridConnection.java b/src/main/java/appeng/me/GridConnection.java index 2c5f798f92c..91f5a5d52cc 100644 --- a/src/main/java/appeng/me/GridConnection.java +++ b/src/main/java/appeng/me/GridConnection.java @@ -224,7 +224,7 @@ public boolean canSupportMoreChannels() { @Override public IReadOnlyCollection getPossibleOptions() { - return new ReadOnlyCollection(Arrays.asList((IPathItem) this.a(), (IPathItem) this.b())); + return new ReadOnlyCollection<>(Arrays.asList((IPathItem) this.a(), (IPathItem) this.b())); } @Override diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java index 1ad082cd191..a4d7e6515c3 100644 --- a/src/main/java/appeng/me/GridNode.java +++ b/src/main/java/appeng/me/GridNode.java @@ -81,7 +81,7 @@ void addConnection(final IGridConnection gridConnection) { final IGridNode gn = this; - Collections.sort(this.connections, new ConnectionComparator(gn)); + this.connections.sort(new ConnectionComparator(gn)); } void removeConnection(final IGridConnection gridConnection) { @@ -123,14 +123,13 @@ public void beginVisit(final IGridVisitor g) { CraftingGridCache.pauseRebuilds(); - LinkedList nextRun = new LinkedList(); + LinkedList nextRun = new LinkedList<>(); nextRun.add(this); this.visitorIterationNumber = tracker; - if (g instanceof IGridConnectionVisitor) { - final LinkedList nextConn = new LinkedList(); - final IGridConnectionVisitor gcv = (IGridConnectionVisitor) g; + if (g instanceof IGridConnectionVisitor gcv) { + final LinkedList nextConn = new LinkedList<>(); while (!nextRun.isEmpty()) { while (!nextConn.isEmpty()) { @@ -138,7 +137,7 @@ public void beginVisit(final IGridVisitor g) { } final Iterable thisRun = nextRun; - nextRun = new LinkedList(); + nextRun = new LinkedList<>(); for (final GridNode n : thisRun) { n.visitorConnection(tracker, g, nextRun, nextConn); @@ -147,7 +146,7 @@ public void beginVisit(final IGridVisitor g) { } else { while (!nextRun.isEmpty()) { final Iterable thisRun = nextRun; - nextRun = new LinkedList(); + nextRun = new LinkedList<>(); for (final GridNode n : thisRun) { n.visitorNode(tracker, g, nextRun); @@ -246,7 +245,7 @@ public EnumSet getConnectedSides() { @Override public IReadOnlyCollection getConnections() { - return new ReadOnlyCollection(this.connections); + return new ReadOnlyCollection<>(this.connections); } @Override diff --git a/src/main/java/appeng/me/GridNodeCollection.java b/src/main/java/appeng/me/GridNodeCollection.java index 2d8dbf3a32c..f0832c2c4f6 100644 --- a/src/main/java/appeng/me/GridNodeCollection.java +++ b/src/main/java/appeng/me/GridNodeCollection.java @@ -57,8 +57,7 @@ public boolean isEmpty() { public boolean contains(final Object maybeGridNode) { final boolean doesContainNode; - if (maybeGridNode instanceof IGridNode) { - final IGridNode node = (IGridNode) maybeGridNode; + if (maybeGridNode instanceof IGridNode node) { final IGridHost machine = node.getMachine(); final Class machineClass = machine.getClass(); diff --git a/src/main/java/appeng/me/GridStorage.java b/src/main/java/appeng/me/GridStorage.java index 43aa550be00..c4178db7f54 100644 --- a/src/main/java/appeng/me/GridStorage.java +++ b/src/main/java/appeng/me/GridStorage.java @@ -29,7 +29,7 @@ public class GridStorage implements IGridStorage { private final long myID; private final NBTTagCompound data; private final GridStorageSearch mySearchEntry; // keep myself in the list until I'm - private final WeakHashMap divided = new WeakHashMap(); + private final WeakHashMap divided = new WeakHashMap<>(); private WeakReference internalGrid = null; // lost... @@ -99,7 +99,7 @@ public IGrid getGrid() { } void setGrid(final Grid grid) { - this.internalGrid = new WeakReference(grid); + this.internalGrid = new WeakReference<>(grid); } @Override diff --git a/src/main/java/appeng/me/NetworkEventBus.java b/src/main/java/appeng/me/NetworkEventBus.java index 8f5d3bf9599..6f467eb6f85 100644 --- a/src/main/java/appeng/me/NetworkEventBus.java +++ b/src/main/java/appeng/me/NetworkEventBus.java @@ -21,8 +21,8 @@ public class NetworkEventBus { - private static final Collection READ_CLASSES = new HashSet(); - private static final Map, Map> EVENTS = new HashMap, Map>(); + private static final Collection READ_CLASSES = new HashSet<>(); + private static final Map, Map> EVENTS = new HashMap<>(); void readClass(final Class listAs, final Class c) { if (READ_CLASSES.contains(c)) { @@ -38,10 +38,8 @@ void readClass(final Class listAs, final Class c) { if (types.length == 1) { if (MENetworkEvent.class.isAssignableFrom(types[0])) { - Map classEvents = EVENTS.get(types[0]); - if (classEvents == null) { - EVENTS.put(types[0], classEvents = new HashMap()); - } + Map classEvents = EVENTS + .computeIfAbsent(types[0], k -> new HashMap<>()); MENetworkEventInfo thisEvent = classEvents.get(listAs); if (thisEvent == null) { @@ -152,7 +150,7 @@ private void invoke(final Object obj, final MENetworkEvent e) throws NetworkEven private class MENetworkEventInfo { - private final List methods = new ArrayList(); + private final List methods = new ArrayList<>(); private void Add(final Class Event, final Class ObjClass, final Method ObjMethod) { this.methods.add(new EventMethod(Event, ObjClass, ObjMethod)); diff --git a/src/main/java/appeng/me/NetworkList.java b/src/main/java/appeng/me/NetworkList.java index cc8c45c96ec..8ecf4c7a62d 100644 --- a/src/main/java/appeng/me/NetworkList.java +++ b/src/main/java/appeng/me/NetworkList.java @@ -20,7 +20,7 @@ */ public class NetworkList implements Collection { - private List networks = new CopyOnWriteArrayList(); + private List networks = new CopyOnWriteArrayList<>(); @Override public int size() { diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index b75c5b83ac2..3358fe70d9f 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -59,22 +59,11 @@ public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper, ICellProvider, IMEInventoryHandler { private static final ExecutorService CRAFTING_POOL; - private static final Comparator COMPARATOR = new Comparator() { - - @Override - public int compare(final ICraftingPatternDetails firstDetail, final ICraftingPatternDetails nextDetail) { - return nextDetail.getPriority() - firstDetail.getPriority(); - } - }; + private static final Comparator COMPARATOR = (firstDetail, + nextDetail) -> nextDetail.getPriority() - firstDetail.getPriority(); static { - final ThreadFactory factory = new ThreadFactory() { - - @Override - public Thread newThread(final Runnable ar) { - return new Thread(ar, "AE Crafting Calculator"); - } - }; + final ThreadFactory factory = ar -> new Thread(ar, "AE Crafting Calculator"); CRAFTING_POOL = Executors.newCachedThreadPool(factory); } @@ -87,10 +76,10 @@ public Thread newThread(final Runnable ar) { // Used for fuzzy lookups private final OreListMultiMap craftableItemSubstitutes = new OreListMultiMap<>(); private final Map> craftableItems = new HashMap<>(); - private final Set emitableItems = new HashSet(); - private final Map craftingLinks = new HashMap(); + private final Set emitableItems = new HashSet<>(); + private final Map craftingLinks = new HashMap<>(); private final Multimap interests = HashMultimap.create(); - private final GenericInterestManager interestManager = new GenericInterestManager( + private final GenericInterestManager interestManager = new GenericInterestManager<>( this.interests); private IStorageGrid storageGrid; private IEnergyGrid energyGrid; @@ -117,12 +106,7 @@ public void onUpdateTick() { this.updateCPUClusters(); } - final Iterator craftingLinkIterator = this.craftingLinks.values().iterator(); - while (craftingLinkIterator.hasNext()) { - if (craftingLinkIterator.next().isDead(this.grid, this)) { - craftingLinkIterator.remove(); - } - } + this.craftingLinks.values().removeIf(craftingLinkNexus -> craftingLinkNexus.isDead(this.grid, this)); for (final CraftingCPUCluster cpu : this.craftingCPUClusters) { cpu.updateCraftingLogic(this.grid, this.energyGrid, this); @@ -159,8 +143,7 @@ public void removeNode(final IGridNode gridNode, final IGridHost machine) { @Override public void addNode(final IGridNode gridNode, final IGridHost machine) { - if (machine instanceof ICraftingWatcherHost) { - final ICraftingWatcherHost watcherHost = (ICraftingWatcherHost) machine; + if (machine instanceof ICraftingWatcherHost watcherHost) { final CraftingWatcher watcher = new CraftingWatcher(this, watcherHost); this.craftingWatchers.put(gridNode, watcher); watcherHost.updateWatcher(watcher); @@ -284,7 +267,7 @@ private void updateCPUClusters() { this.craftingCPUClusters.clear(); for (Object cls : StreamSupport.stream(grid.getMachinesClasses().spliterator(), false) - .filter(c -> TileCraftingStorageTile.class.isAssignableFrom(c)).toArray()) { + .filter(TileCraftingStorageTile.class::isAssignableFrom).toArray()) { for (final IGridNode cst : this.grid.getMachines((Class) cls)) { final TileCraftingStorageTile tile = (TileCraftingStorageTile) cst.getMachine(); final CraftingCPUCluster cluster = (CraftingCPUCluster) tile.getCluster(); @@ -326,7 +309,7 @@ public void updateCPUClusters(final MENetworkCraftingPatternChange c) { public void addCraftingOption(final ICraftingMedium medium, final ICraftingPatternDetails api) { List details = this.craftingMethods.get(api); if (details == null) { - details = new ArrayList(); + details = new ArrayList<>(); details.add(medium); this.craftingMethods.put(api, details); } else { @@ -341,7 +324,7 @@ public void setEmitable(final IAEItemStack someItem) { @Override public List getCellArray(final StorageChannel channel) { - final List list = new ArrayList(1); + final List list = new ArrayList<>(1); if (channel == StorageChannel.ITEMS) { list.add(this); @@ -461,17 +444,11 @@ public Future beginCraftingJob(final World world, final IGrid grid throw new IllegalArgumentException("Invalid Crafting Job Request"); } - final ICraftingJob job; - switch (AEConfig.instance.craftingCalculatorVersion) { - case 1: - job = new CraftingJob(world, grid, actionSrc, slotItem, cb); - break; - case 2: - job = new CraftingJobV2(world, grid, actionSrc, slotItem, cb); - break; - default: - throw new IllegalStateException("Invalid crafting calculator version"); - } + final ICraftingJob job = switch (AEConfig.instance.craftingCalculatorVersion) { + case 1 -> new CraftingJob(world, grid, actionSrc, slotItem, cb); + case 2 -> new CraftingJobV2(world, grid, actionSrc, slotItem, cb); + default -> throw new IllegalStateException("Invalid crafting calculator version"); + }; return job.schedule(); } @@ -490,14 +467,14 @@ public ICraftingLink submitJob(final ICraftingJob job, final ICraftingRequester } if (target == null) { - final List validCpusClusters = new ArrayList(); + final List validCpusClusters = new ArrayList<>(); for (final CraftingCPUCluster cpu : this.craftingCPUClusters) { if (cpu.isActive() && !cpu.isBusy() && cpu.getAvailableStorage() >= job.getByteTotal()) { validCpusClusters.add(cpu); } } - Collections.sort(validCpusClusters, new Comparator() { + validCpusClusters.sort(new Comparator<>() { private int compareInternal(CraftingCPUCluster firstCluster, CraftingCPUCluster nextCluster) { int comparison = ItemSorters diff --git a/src/main/java/appeng/me/cache/EnergyGridCache.java b/src/main/java/appeng/me/cache/EnergyGridCache.java index c9b857a6721..29d9a37c469 100644 --- a/src/main/java/appeng/me/cache/EnergyGridCache.java +++ b/src/main/java/appeng/me/cache/EnergyGridCache.java @@ -30,14 +30,14 @@ public class EnergyGridCache implements IEnergyGrid { - private final TreeSet interests = new TreeSet(); + private final TreeSet interests = new TreeSet<>(); private final double AvgLength = 40.0; - private final Set providers = new LinkedHashSet(); - private final Set requesters = new LinkedHashSet(); + private final Set providers = new LinkedHashSet<>(); + private final Set requesters = new LinkedHashSet<>(); private final Multiset energyGridProviders = HashMultiset.create(); private final IGrid myGrid; - private final HashMap watchers = new HashMap(); - private final Set localSeen = new HashSet(); + private final HashMap watchers = new HashMap<>(); + private final Set localSeen = new HashSet<>(); /** * estimated power available. */ @@ -97,16 +97,16 @@ public void EnergyNodeChanges(final MENetworkPowerIdleChange ev) { public void EnergyNodeChanges(final MENetworkPowerStorage ev) { if (ev.storage.isAEPublicPowerStorage()) { switch (ev.type) { - case PROVIDE_POWER: + case PROVIDE_POWER -> { if (ev.storage.getPowerFlow() != AccessRestriction.WRITE) { this.providers.add(ev.storage); } - break; - case REQUEST_POWER: + } + case REQUEST_POWER -> { if (ev.storage.getPowerFlow() != AccessRestriction.READ) { this.requesters.add(ev.storage); } - break; + } } } else { (new RuntimeException("Attempt to ask the IEnergyGrid to charge a non public energy store.")) @@ -282,8 +282,7 @@ public double injectAEPower(double amt, final Actionable mode, final Set i = this.energyGridProviders.iterator(); while (amt > 0 && i.hasNext()) { final IEnergyGridProvider what = i.next(); - final Set listCopy = new HashSet(); - listCopy.addAll(seen); + final Set listCopy = new HashSet<>(seen); final double cannotHold = what.injectAEPower(amt, Actionable.SIMULATE, listCopy); what.injectAEPower(amt - cannotHold, mode, seen); @@ -428,8 +427,7 @@ public void removeNode(final IGridNode node, final IGridHost machine) { this.drainPerTick -= gridNode.getPreviousDraw(); // power storage. - if (machine instanceof IAEPowerStorage) { - final IAEPowerStorage ps = (IAEPowerStorage) machine; + if (machine instanceof IAEPowerStorage ps) { if (ps.isAEPublicPowerStorage()) { if (ps.getPowerFlow() != AccessRestriction.WRITE) { this.globalMaxPower -= ps.getAEMaxPower(); @@ -471,8 +469,7 @@ public void addNode(final IGridNode node, final IGridHost machine) { this.drainPerTick += gridNode.getPreviousDraw(); // power storage - if (machine instanceof IAEPowerStorage) { - final IAEPowerStorage ps = (IAEPowerStorage) machine; + if (machine instanceof IAEPowerStorage ps) { if (ps.isAEPublicPowerStorage()) { final double max = ps.getAEMaxPower(); final double current = ps.getAECurrentPower(); @@ -492,8 +489,7 @@ public void addNode(final IGridNode node, final IGridHost machine) { } } - if (machine instanceof IEnergyWatcherHost) { - final IEnergyWatcherHost swh = (IEnergyWatcherHost) machine; + if (machine instanceof IEnergyWatcherHost swh) { final EnergyWatcher iw = new EnergyWatcher(this, swh); this.watchers.put(node, iw); swh.updateWatcher(iw); diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java index 3aa94a073b4..d6fa5922f26 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/src/main/java/appeng/me/cache/GridStorageCache.java @@ -44,18 +44,13 @@ public class GridStorageCache implements IStorageGrid { private final IGrid myGrid; - private final HashSet activeCellProviders = new HashSet(); - private final HashSet inactiveCellProviders = new HashSet(); + private final HashSet activeCellProviders = new HashSet<>(); + private final HashSet inactiveCellProviders = new HashSet<>(); private final SetMultimap interests = HashMultimap.create(); - private final GenericInterestManager interestManager = new GenericInterestManager( - this.interests); - private final NetworkMonitor itemMonitor = new NetworkMonitor( - this, - StorageChannel.ITEMS); - private final NetworkMonitor fluidMonitor = new NetworkMonitor( - this, - StorageChannel.FLUIDS); - private final HashMap watchers = new HashMap(); + private final GenericInterestManager interestManager = new GenericInterestManager<>(this.interests); + private final NetworkMonitor itemMonitor = new NetworkMonitor<>(this, StorageChannel.ITEMS); + private final NetworkMonitor fluidMonitor = new NetworkMonitor<>(this, StorageChannel.FLUIDS); + private final HashMap watchers = new HashMap<>(); private NetworkInventoryHandler myItemNetwork; private NetworkInventoryHandler myFluidNetwork; @@ -71,8 +66,7 @@ public void onUpdateTick() { @Override public void removeNode(final IGridNode node, final IGridHost machine) { - if (machine instanceof ICellContainer) { - final ICellContainer cc = (ICellContainer) machine; + if (machine instanceof ICellContainer cc) { final CellChangeTracker tracker = new CellChangeTracker(); this.removeCellProvider(cc, tracker); @@ -94,8 +88,7 @@ public void removeNode(final IGridNode node, final IGridHost machine) { @Override public void addNode(final IGridNode node, final IGridHost machine) { - if (machine instanceof ICellContainer) { - final ICellContainer cc = (ICellContainer) machine; + if (machine instanceof ICellContainer cc) { this.inactiveCellProviders.add(cc); this.getGrid().postEvent(new MENetworkCellArrayUpdate()); @@ -108,8 +101,7 @@ public void addNode(final IGridNode node, final IGridHost machine) { } } - if (machine instanceof IStackWatcherHost) { - final IStackWatcherHost swh = (IStackWatcherHost) machine; + if (machine instanceof IStackWatcherHost swh) { final ItemWatcher iw = new ItemWatcher(this, swh); this.watchers.put(node, iw); swh.updateWatcher(iw); @@ -205,13 +197,9 @@ public void cellUpdate(final MENetworkCellArrayUpdate ev) { private void postChangesToNetwork(final StorageChannel chan, final int upOrDown, final IItemList availableItems, final BaseActionSource src) { switch (chan) { - case FLUIDS: - this.fluidMonitor.postChange(upOrDown > 0, availableItems, src); - break; - case ITEMS: - this.itemMonitor.postChange(upOrDown > 0, availableItems, src); - break; - default: + case FLUIDS -> this.fluidMonitor.postChange(upOrDown > 0, availableItems, src); + case ITEMS -> this.itemMonitor.postChange(upOrDown > 0, availableItems, src); + default -> {} } } @@ -226,23 +214,23 @@ private void buildNetworkStorage(final StorageChannel chan) { final SecurityCache security = this.getGrid().getCache(ISecurityGrid.class); switch (chan) { - case FLUIDS: - this.myFluidNetwork = new NetworkInventoryHandler(StorageChannel.FLUIDS, security); + case FLUIDS -> { + this.myFluidNetwork = new NetworkInventoryHandler<>(StorageChannel.FLUIDS, security); for (final ICellProvider cc : this.activeCellProviders) { for (final IMEInventoryHandler h : cc.getCellArray(chan)) { this.myFluidNetwork.addNewStorage(h); } } - break; - case ITEMS: - this.myItemNetwork = new NetworkInventoryHandler(StorageChannel.ITEMS, security); + } + case ITEMS -> { + this.myItemNetwork = new NetworkInventoryHandler<>(StorageChannel.ITEMS, security); for (final ICellProvider cc : this.activeCellProviders) { for (final IMEInventoryHandler h : cc.getCellArray(chan)) { this.myItemNetwork.addNewStorage(h); } } - break; - default: + } + default -> {} } } @@ -324,7 +312,7 @@ public void applyChanges() { private class CellChangeTracker { - final List data = new LinkedList(); + final List data = new LinkedList<>(); public void postChanges(final StorageChannel channel, final int i, final IMEInventoryHandler h, final BaseActionSource actionSrc) { diff --git a/src/main/java/appeng/me/cache/NetworkMonitor.java b/src/main/java/appeng/me/cache/NetworkMonitor.java index 6dfe3669c14..1caa4b3bc74 100644 --- a/src/main/java/appeng/me/cache/NetworkMonitor.java +++ b/src/main/java/appeng/me/cache/NetworkMonitor.java @@ -59,7 +59,7 @@ public NetworkMonitor(final GridStorageCache cache, final StorageChannel chan) { this.myGridCache = cache; this.myChannel = chan; this.cachedList = (IItemList) chan.createList(); - this.listeners = new HashMap, Object>(); + this.listeners = new HashMap<>(); } @Override @@ -162,11 +162,13 @@ public boolean validForPass(final int i) { @SuppressWarnings("unchecked") private IMEInventoryHandler getHandler() { switch (this.myChannel) { - case ITEMS: + case ITEMS -> { return (IMEInventoryHandler) this.myGridCache.getItemInventoryHandler(); - case FLUIDS: + } + case FLUIDS -> { return (IMEInventoryHandler) this.myGridCache.getFluidInventoryHandler(); - default: + } + default -> {} } return null; } diff --git a/src/main/java/appeng/me/cache/P2PCache.java b/src/main/java/appeng/me/cache/P2PCache.java index b4731eeb602..ec30d784aa1 100644 --- a/src/main/java/appeng/me/cache/P2PCache.java +++ b/src/main/java/appeng/me/cache/P2PCache.java @@ -27,9 +27,9 @@ public class P2PCache implements IGridCache { private final IGrid myGrid; - private final HashMap inputs = new HashMap(); + private final HashMap inputs = new HashMap<>(); private final Multimap outputs = LinkedHashMultimap.create(); - private final TunnelCollection NullColl = new TunnelCollection(null, null); + private final TunnelCollection NullColl = new TunnelCollection<>(null, null); public P2PCache(final IGrid g) { this.myGrid = g; @@ -60,14 +60,13 @@ public void onUpdateTick() {} @Override public void removeNode(final IGridNode node, final IGridHost machine) { - if (machine instanceof PartP2PTunnel) { + if (machine instanceof PartP2PTunnel t) { if (machine instanceof PartP2PTunnelME) { if (!node.hasFlag(GridFlags.REQUIRE_CHANNEL)) { return; } } - final PartP2PTunnel t = (PartP2PTunnel) machine; // AELog.info( "rmv-" + (t.output ? "output: " : "input: ") + t.freq // ); @@ -83,14 +82,13 @@ public void removeNode(final IGridNode node, final IGridHost machine) { @Override public void addNode(final IGridNode node, final IGridHost machine) { - if (machine instanceof PartP2PTunnel) { + if (machine instanceof PartP2PTunnel t) { if (machine instanceof PartP2PTunnelME) { if (!node.hasFlag(GridFlags.REQUIRE_CHANNEL)) { return; } } - final PartP2PTunnel t = (PartP2PTunnel) machine; // AELog.info( "add-" + (t.output ? "output: " : "input: ") + t.freq // ); diff --git a/src/main/java/appeng/me/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java index 9f1d9818177..504039fa249 100644 --- a/src/main/java/appeng/me/cache/PathGridCache.java +++ b/src/main/java/appeng/me/cache/PathGridCache.java @@ -51,7 +51,7 @@ public class PathGridCache implements IPathingGrid { private ControllerState controllerState = ControllerState.NO_CONTROLLER; private int ticksUntilReady = 20; private int lastChannels = 0; - private HashSet semiOpen = new HashSet(); + private HashSet semiOpen = new HashSet<>(); public PathGridCache(final IGrid g) { this.myGrid = g; @@ -93,8 +93,8 @@ public void onUpdateTick() { } else { final int nodes = this.myGrid.getNodes().size(); this.ticksUntilReady = 20 + Math.max(0, nodes / 100 - 20); - final HashSet closedList = new HashSet(); - this.semiOpen = new HashSet(); + final HashSet closedList = new HashSet<>(); + this.semiOpen = new HashSet<>(); // myGrid.getPivot().beginVisit( new AdHocChannelUpdater( 0 ) // ); @@ -103,7 +103,7 @@ public void onUpdateTick() { for (final IGridConnection gcc : node.getConnections()) { final GridConnection gc = (GridConnection) gcc; if (!(gc.getOtherSide(node).getMachine() instanceof TileController)) { - final List open = new LinkedList(); + final List open = new LinkedList<>(); closedList.add(gc); open.add(gc); gc.setControllerRoute((GridNode) node, true); @@ -295,7 +295,7 @@ private void achievementPost() { final Achievements currentBracket = this.getAchievementBracket(this.getChannelsInUse()); final Achievements lastBracket = this.getAchievementBracket(this.lastChannels); if (currentBracket != lastBracket && currentBracket != null) { - final Set players = new HashSet(); + final Set players = new HashSet<>(); for (final IGridNode n : this.requireChannels) { players.add(n.getPlayerID()); } diff --git a/src/main/java/appeng/me/cache/SpatialPylonCache.java b/src/main/java/appeng/me/cache/SpatialPylonCache.java index a90e89ced40..baab1ce963c 100644 --- a/src/main/java/appeng/me/cache/SpatialPylonCache.java +++ b/src/main/java/appeng/me/cache/SpatialPylonCache.java @@ -36,8 +36,8 @@ public class SpatialPylonCache implements ISpatialCache { private DimensionalCoord captureMin; private DimensionalCoord captureMax; private boolean isValid = false; - private List ioPorts = new LinkedList(); - private HashMap clusters = new HashMap(); + private List ioPorts = new LinkedList<>(); + private HashMap clusters = new HashMap<>(); public SpatialPylonCache(final IGrid g) { this.myGrid = g; @@ -50,8 +50,8 @@ public void bootingRender(final MENetworkBootingStatusChange c) { private void reset(final IGrid grid) { - this.clusters = new HashMap(); - this.ioPorts = new LinkedList(); + this.clusters = new HashMap<>(); + this.ioPorts = new LinkedList<>(); for (final IGridNode gm : grid.getMachines(TileSpatialIOPort.class)) { this.ioPorts.add((TileSpatialIOPort) gm.getMachine()); @@ -99,33 +99,22 @@ private void reset(final IGrid grid) { for (final SpatialPylonCluster cl : this.clusters.values()) { switch (cl.getCurrentAxis()) { - case X: - this.isValid = this.isValid - && ((this.captureMax.y == cl.getMin().y || this.captureMin.y == cl.getMax().y) - || (this.captureMax.z == cl.getMin().z || this.captureMin.z == cl.getMax().z)) - && ((this.captureMax.y == cl.getMax().y || this.captureMin.y == cl.getMin().y) - || (this.captureMax.z == cl.getMax().z || this.captureMin.z == cl.getMin().z)); - - break; - case Y: - this.isValid = this.isValid - && ((this.captureMax.x == cl.getMin().x || this.captureMin.x == cl.getMax().x) - || (this.captureMax.z == cl.getMin().z || this.captureMin.z == cl.getMax().z)) - && ((this.captureMax.x == cl.getMax().x || this.captureMin.x == cl.getMin().x) - || (this.captureMax.z == cl.getMax().z || this.captureMin.z == cl.getMin().z)); - - break; - case Z: - this.isValid = this.isValid - && ((this.captureMax.y == cl.getMin().y || this.captureMin.y == cl.getMax().y) - || (this.captureMax.x == cl.getMin().x || this.captureMin.x == cl.getMax().x)) - && ((this.captureMax.y == cl.getMax().y || this.captureMin.y == cl.getMin().y) - || (this.captureMax.x == cl.getMax().x || this.captureMin.x == cl.getMin().x)); - - break; - case UNFORMED: - this.isValid = false; - break; + case X -> this.isValid = this.isValid + && ((this.captureMax.y == cl.getMin().y || this.captureMin.y == cl.getMax().y) + || (this.captureMax.z == cl.getMin().z || this.captureMin.z == cl.getMax().z)) + && ((this.captureMax.y == cl.getMax().y || this.captureMin.y == cl.getMin().y) + || (this.captureMax.z == cl.getMax().z || this.captureMin.z == cl.getMin().z)); + case Y -> this.isValid = this.isValid + && ((this.captureMax.x == cl.getMin().x || this.captureMin.x == cl.getMax().x) + || (this.captureMax.z == cl.getMin().z || this.captureMin.z == cl.getMax().z)) + && ((this.captureMax.x == cl.getMax().x || this.captureMin.x == cl.getMin().x) + || (this.captureMax.z == cl.getMax().z || this.captureMin.z == cl.getMin().z)); + case Z -> this.isValid = this.isValid + && ((this.captureMax.y == cl.getMin().y || this.captureMin.y == cl.getMax().y) + || (this.captureMax.x == cl.getMin().x || this.captureMin.x == cl.getMax().x)) + && ((this.captureMax.y == cl.getMax().y || this.captureMin.y == cl.getMin().y) + || (this.captureMax.x == cl.getMax().x || this.captureMin.x == cl.getMin().x)); + case UNFORMED -> this.isValid = false; } } diff --git a/src/main/java/appeng/me/cache/TickManagerCache.java b/src/main/java/appeng/me/cache/TickManagerCache.java index 703b88f5849..e5ba3421606 100644 --- a/src/main/java/appeng/me/cache/TickManagerCache.java +++ b/src/main/java/appeng/me/cache/TickManagerCache.java @@ -33,10 +33,10 @@ public class TickManagerCache implements ITickManager { private final IGrid myGrid; - private final HashMap alertable = new HashMap(); - private final HashMap sleeping = new HashMap(); - private final HashMap awake = new HashMap(); - private final PriorityQueue upcomingTicks = new PriorityQueue(); + private final HashMap alertable = new HashMap<>(); + private final HashMap sleeping = new HashMap<>(); + private final HashMap awake = new HashMap<>(); + private final PriorityQueue upcomingTicks = new PriorityQueue<>(); private long currentTick = 0; public TickManagerCache(final IGrid g) { diff --git a/src/main/java/appeng/me/cache/helpers/Connections.java b/src/main/java/appeng/me/cache/helpers/Connections.java index 90709bc49d7..d0a971e2cb9 100644 --- a/src/main/java/appeng/me/cache/helpers/Connections.java +++ b/src/main/java/appeng/me/cache/helpers/Connections.java @@ -20,7 +20,7 @@ public class Connections implements IWorldCallable { - private final HashMap connections = new HashMap(); + private final HashMap connections = new HashMap<>(); private final PartP2PTunnelME me; private boolean create = false; private boolean destroy = false; diff --git a/src/main/java/appeng/me/cache/helpers/TickTracker.java b/src/main/java/appeng/me/cache/helpers/TickTracker.java index 04a7ed4cffd..2076f66ae28 100644 --- a/src/main/java/appeng/me/cache/helpers/TickTracker.java +++ b/src/main/java/appeng/me/cache/helpers/TickTracker.java @@ -67,8 +67,7 @@ public int compareTo(@Nonnull final TickTracker t) { } public void addEntityCrashInfo(final CrashReportCategory crashreportcategory) { - if (this.getGridTickable() instanceof AEBasePart) { - final AEBasePart part = (AEBasePart) this.getGridTickable(); + if (this.getGridTickable() instanceof AEBasePart part) { part.addEntityCrashInfo(crashreportcategory); } diff --git a/src/main/java/appeng/me/cache/helpers/TunnelCollection.java b/src/main/java/appeng/me/cache/helpers/TunnelCollection.java index 6eb5d0d224d..0ac1720f9a6 100644 --- a/src/main/java/appeng/me/cache/helpers/TunnelCollection.java +++ b/src/main/java/appeng/me/cache/helpers/TunnelCollection.java @@ -37,9 +37,9 @@ public boolean isEmpty() { @Override public Iterator iterator() { if (this.tunnelSources == null) { - return new NullIterator(); + return new NullIterator<>(); } - return new TunnelIterator(this.tunnelSources, this.clz); + return new TunnelIterator<>(this.tunnelSources, this.clz); } public boolean matches(final Class c) { diff --git a/src/main/java/appeng/me/cluster/MBCalculator.java b/src/main/java/appeng/me/cluster/MBCalculator.java index 84197035995..628ed34be33 100644 --- a/src/main/java/appeng/me/cluster/MBCalculator.java +++ b/src/main/java/appeng/me/cluster/MBCalculator.java @@ -151,32 +151,33 @@ private boolean verifyUnownedRegion(final World w, final WorldCoord min, final W private boolean verifyUnownedRegionInner(final World w, int minX, int minY, int minZ, int maxX, int maxY, int maxZ, final ForgeDirection side) { switch (side) { - case WEST: + case WEST -> { minX -= 1; maxX = minX; - break; - case EAST: + } + case EAST -> { maxX += 1; minX = maxX; - break; - case DOWN: + } + case DOWN -> { minY -= 1; maxY = minY; - break; - case NORTH: + } + case NORTH -> { maxZ += 1; minZ = maxZ; - break; - case SOUTH: + } + case SOUTH -> { minZ -= 1; maxZ = minZ; - break; - case UP: + } + case UP -> { maxY += 1; minY = maxY; - break; - case UNKNOWN: + } + case UNKNOWN -> { return false; + } } for (int x = minX; x <= maxX; x++) { diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index f00753bc5b2..5ec3d68a921 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -75,12 +75,12 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { private final WorldCoord min; private final WorldCoord max; private final int[] usedOps = new int[3]; - private final Map tasks = new HashMap(); + private final Map tasks = new HashMap<>(); // INSTANCE sate - private final LinkedList tiles = new LinkedList(); - private final LinkedList storage = new LinkedList(); - private final LinkedList status = new LinkedList(); - private final HashMap, Object> listeners = new HashMap, Object>(); + private final LinkedList tiles = new LinkedList<>(); + private final LinkedList storage = new LinkedList<>(); + private final LinkedList status = new LinkedList<>(); + private final HashMap, Object> listeners = new HashMap<>(); private final HashMap> providers = new HashMap<>(); private ICraftingLink myLastLink; private String myName = ""; @@ -827,13 +827,10 @@ public ICraftingLink submitJob(final IGrid g, final ICraftingJob job, final Base @Override public boolean isBusy() { - final Iterator> i = this.tasks.entrySet().iterator(); - while (i.hasNext()) { - if (i.next().getValue().value <= 0) { - i.remove(); - } - } + this.tasks.entrySet().removeIf( + iCraftingPatternDetailsTaskProgressEntry -> iCraftingPatternDetailsTaskProgressEntry.getValue().value + <= 0); return !this.tasks.isEmpty() || !this.waitingFor.isEmpty(); } @@ -905,12 +902,12 @@ private void submitLink(final ICraftingLink myLastLink2) { public void getListOfItem(final IItemList list, final CraftingItemList whichList) { switch (whichList) { - case ACTIVE: + case ACTIVE -> { for (final IAEItemStack ais : this.waitingFor) { list.add(ais); } - break; - case PENDING: + } + case PENDING -> { for (final Entry t : this.tasks.entrySet()) { for (IAEItemStack ais : t.getKey().getCondensedOutputs()) { ais = ais.copy(); @@ -918,18 +915,13 @@ public void getListOfItem(final IItemList list, final CraftingItem list.add(ais); } } - break; - case STORAGE: - this.inventory.getAvailableItems(list); - break; - default: - case ALL: + } + case STORAGE -> this.inventory.getAvailableItems(list); + default -> { this.inventory.getAvailableItems(list); - for (final IAEItemStack ais : this.waitingFor) { list.add(ais); } - for (final Entry t : this.tasks.entrySet()) { for (IAEItemStack ais : t.getKey().getCondensedOutputs()) { ais = ais.copy(); @@ -937,7 +929,7 @@ public void getListOfItem(final IItemList list, final CraftingItem list.add(ais); } } - break; + } } } @@ -963,20 +955,15 @@ public void addCrafting(final ICraftingPatternDetails details, final long crafts public IAEItemStack getItemStack(final IAEItemStack what, final CraftingItemList storage2) { IAEItemStack is; switch (storage2) { - case STORAGE: - is = this.inventory.getItemList().findPrecise(what); - break; - case ACTIVE: - is = this.waitingFor.findPrecise(what); - break; - case PENDING: + case STORAGE -> is = this.inventory.getItemList().findPrecise(what); + case ACTIVE -> is = this.waitingFor.findPrecise(what); + case PENDING -> { CraftingGridCache cache = null; if (this.getGrid() != null) { cache = this.getGrid().getCache(ICraftingGrid.class); } is = what.copy(); is.setStackSize(0); - for (final Entry t : this.tasks.entrySet()) { for (final IAEItemStack ais : t.getKey().getCondensedOutputs()) { if (ais.equals(is)) { @@ -993,11 +980,8 @@ public IAEItemStack getItemStack(final IAEItemStack what, final CraftingItemList } } } - - break; - default: - case ALL: - throw new IllegalStateException("Invalid Operation"); + } + default -> throw new IllegalStateException("Invalid Operation"); } if (is != null) { @@ -1098,8 +1082,7 @@ public void readFromNBT(final NBTTagCompound data) { for (int x = 0; x < list.tagCount(); x++) { final NBTTagCompound item = list.getCompoundTagAt(x); final IAEItemStack pattern = AEItemStack.loadItemStackFromNBT(item); - if (pattern != null && pattern.getItem() instanceof ICraftingPatternItem) { - final ICraftingPatternItem cpi = (ICraftingPatternItem) pattern.getItem(); + if (pattern != null && pattern.getItem() instanceof ICraftingPatternItem cpi) { final ICraftingPatternDetails details = cpi.getPatternForItem(pattern.getItemStack(), this.getWorld()); if (details != null) { final TaskProgress tp = new TaskProgress(); diff --git a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java index ebfdb368fe1..5011585ebe9 100644 --- a/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/QuantumCluster.java @@ -20,6 +20,8 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.world.WorldEvent; +import com.google.common.collect.Iterators; + import appeng.api.AEApi; import appeng.api.events.LocatableEventAnnounce; import appeng.api.events.LocatableEventAnnounce.LocatableEvent; @@ -31,7 +33,6 @@ import appeng.me.cache.helpers.ConnectionWrapper; import appeng.me.cluster.IAECluster; import appeng.tile.qnb.TileQuantumBridge; -import appeng.util.iterators.ChainedIterator; import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class QuantumCluster implements ILocatable, IAECluster { @@ -93,9 +94,8 @@ public void updateStatus(final boolean updateGrid) { boolean shutdown = false; - if (myOtherSide instanceof QuantumCluster) { + if (myOtherSide instanceof QuantumCluster sideB) { final QuantumCluster sideA = this; - final QuantumCluster sideB = (QuantumCluster) myOtherSide; if (sideA.isActive() && sideB.isActive()) { if (this.connection != null && this.connection.getConnection() != null) { @@ -207,16 +207,7 @@ public void destroy() { @Override public Iterator getTiles() { - return new ChainedIterator( - this.getRing()[0], - this.getRing()[1], - this.getRing()[2], - this.getRing()[3], - this.getRing()[4], - this.getRing()[5], - this.getRing()[6], - this.getRing()[7], - this.center); + return Iterators.concat(Iterators.forArray(getRing()), Iterators.singletonIterator(center)); } public boolean isCorner(final TileQuantumBridge tileQuantumBridge) { diff --git a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java index 975547d0709..fcdb4467dc4 100644 --- a/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/SpatialPylonCluster.java @@ -23,7 +23,7 @@ public class SpatialPylonCluster implements IAECluster { private final DimensionalCoord min; private final DimensionalCoord max; - private final List line = new ArrayList(); + private final List line = new ArrayList<>(); private boolean isDestroyed = false; private Axis currentAxis = Axis.UNFORMED; diff --git a/src/main/java/appeng/me/energy/EnergyWatcher.java b/src/main/java/appeng/me/energy/EnergyWatcher.java index 7a2f394501f..052a2905971 100644 --- a/src/main/java/appeng/me/energy/EnergyWatcher.java +++ b/src/main/java/appeng/me/energy/EnergyWatcher.java @@ -25,7 +25,7 @@ public class EnergyWatcher implements IEnergyWatcher { private final EnergyGridCache gsc; private final IEnergyWatcherHost myObject; - private final HashSet myInterests = new HashSet(); + private final HashSet myInterests = new HashSet<>(); public EnergyWatcher(final EnergyGridCache cache, final IEnergyWatcherHost host) { this.gsc = cache; diff --git a/src/main/java/appeng/me/helpers/AENetworkProxy.java b/src/main/java/appeng/me/helpers/AENetworkProxy.java index 20dd938297c..5c3ccd90c87 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxy.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxy.java @@ -104,8 +104,7 @@ public void onReady() { this.isReady = true; // send orientation based directionality to the node. - if (this.gp instanceof IOrientable) { - final IOrientable ori = (IOrientable) this.gp; + if (this.gp instanceof IOrientable ori) { if (ori.canBeRotated()) { ori.setOrientation(ori.getForward(), ori.getUp()); } diff --git a/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java b/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java index 3964369d158..80d11f8d8ad 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxyMultiblock.java @@ -14,11 +14,12 @@ import net.minecraft.item.ItemStack; +import com.google.common.collect.Iterators; + import appeng.api.networking.IGridMultiblock; import appeng.api.networking.IGridNode; import appeng.me.cluster.IAECluster; import appeng.me.cluster.IAEMultiBlock; -import appeng.util.iterators.ChainedIterator; import appeng.util.iterators.ProxyNodeIterator; public class AENetworkProxyMultiblock extends AENetworkProxy implements IGridMultiblock { @@ -31,7 +32,7 @@ public AENetworkProxyMultiblock(final IGridProxyable te, final String nbtName, f @Override public Iterator getMultiblockNodes() { if (this.getCluster() == null) { - return new ChainedIterator(); + return Iterators.emptyIterator(); } return new ProxyNodeIterator(this.getCluster().getTiles()); diff --git a/src/main/java/appeng/me/helpers/GenericInterestManager.java b/src/main/java/appeng/me/helpers/GenericInterestManager.java index aabb7ae3890..f064b48be8b 100644 --- a/src/main/java/appeng/me/helpers/GenericInterestManager.java +++ b/src/main/java/appeng/me/helpers/GenericInterestManager.java @@ -29,7 +29,7 @@ public GenericInterestManager(final Multimap interests) { public void enableTransactions() { if (this.transDepth == 0) { - this.transactions = new LinkedList(); + this.transactions = new LinkedList<>(); } this.transDepth++; diff --git a/src/main/java/appeng/me/pathfinding/BackbonePathSegment.java b/src/main/java/appeng/me/pathfinding/BackbonePathSegment.java index 310e1bbfb32..44e42cd5568 100644 --- a/src/main/java/appeng/me/pathfinding/BackbonePathSegment.java +++ b/src/main/java/appeng/me/pathfinding/BackbonePathSegment.java @@ -12,7 +12,7 @@ public class BackbonePathSegment extends PathSegment { public BackbonePathSegment(IPathItem node, final PathGridCache myPGC, final Set semiOpen, final Set closed) { - super(myPGC, new LinkedList(), semiOpen, closed); + super(myPGC, new LinkedList<>(), semiOpen, closed); startNode = node; } diff --git a/src/main/java/appeng/me/pathfinding/ControllerValidator.java b/src/main/java/appeng/me/pathfinding/ControllerValidator.java index 02d566683a5..95de020e0bc 100644 --- a/src/main/java/appeng/me/pathfinding/ControllerValidator.java +++ b/src/main/java/appeng/me/pathfinding/ControllerValidator.java @@ -38,8 +38,7 @@ public ControllerValidator(final int x, final int y, final int z) { @Override public boolean visitNode(final IGridNode n) { final IGridHost host = n.getMachine(); - if (this.isValid() && host instanceof TileController) { - final TileController c = (TileController) host; + if (this.isValid() && host instanceof TileController c) { this.minX = Math.min(c.xCoord, this.minX); this.maxX = Math.max(c.xCoord, this.maxX); diff --git a/src/main/java/appeng/me/storage/AEExternalHandler.java b/src/main/java/appeng/me/storage/AEExternalHandler.java index 8072501ecd7..e1f411fabed 100644 --- a/src/main/java/appeng/me/storage/AEExternalHandler.java +++ b/src/main/java/appeng/me/storage/AEExternalHandler.java @@ -46,8 +46,7 @@ public IMEInventory getInventory(final TileEntity te, final ForgeDirection d, fi } } - if (te instanceof ITileStorageMonitorable) { - final ITileStorageMonitorable iface = (ITileStorageMonitorable) te; + if (te instanceof ITileStorageMonitorable iface) { final IStorageMonitorable sm = iface.getMonitorable(d, src); if (channel == StorageChannel.ITEMS && sm != null) { diff --git a/src/main/java/appeng/me/storage/CellInventory.java b/src/main/java/appeng/me/storage/CellInventory.java index b2919a50c0c..f668fed6c42 100644 --- a/src/main/java/appeng/me/storage/CellInventory.java +++ b/src/main/java/appeng/me/storage/CellInventory.java @@ -38,7 +38,7 @@ public class CellInventory implements ICellInventory { private static final String ITEM_COUNT_TAG = "ic"; private static final String ITEM_SLOT = "#"; private static final String ITEM_SLOT_COUNT = "@"; - private static final Set BLACK_LIST = new HashSet(); + private static final Set BLACK_LIST = new HashSet<>(); private static String[] itemSlots; private static String[] itemSlotCount; private final NBTTagCompound tagCompound; diff --git a/src/main/java/appeng/me/storage/CellInventoryHandler.java b/src/main/java/appeng/me/storage/CellInventoryHandler.java index 8e61afa5cc6..77e4d29243a 100644 --- a/src/main/java/appeng/me/storage/CellInventoryHandler.java +++ b/src/main/java/appeng/me/storage/CellInventoryHandler.java @@ -52,16 +52,10 @@ public class CellInventoryHandler extends MEInventoryHandler imple final Upgrades u = ((IUpgradeModule) is.getItem()).getType(is); if (u != null) { switch (u) { - case FUZZY: - hasFuzzy = true; - break; - case INVERTER: - hasInverter = true; - break; - case ORE_FILTER: - hasOreFilter = true; - break; - default: + case FUZZY -> hasFuzzy = true; + case INVERTER -> hasInverter = true; + case ORE_FILTER -> hasOreFilter = true; + default -> {} } } } diff --git a/src/main/java/appeng/me/storage/ItemWatcher.java b/src/main/java/appeng/me/storage/ItemWatcher.java index 98b89665f66..65b6e073def 100644 --- a/src/main/java/appeng/me/storage/ItemWatcher.java +++ b/src/main/java/appeng/me/storage/ItemWatcher.java @@ -26,7 +26,7 @@ public class ItemWatcher implements IStackWatcher { private final GridStorageCache gsc; private final IStackWatcherHost myObject; - private final HashSet myInterests = new HashSet(); + private final HashSet myInterests = new HashSet<>(); public ItemWatcher(final GridStorageCache cache, final IStackWatcherHost host) { this.gsc = cache; diff --git a/src/main/java/appeng/me/storage/MEInventoryHandler.java b/src/main/java/appeng/me/storage/MEInventoryHandler.java index 5d3de3053a8..5d08959cd06 100644 --- a/src/main/java/appeng/me/storage/MEInventoryHandler.java +++ b/src/main/java/appeng/me/storage/MEInventoryHandler.java @@ -38,13 +38,13 @@ public MEInventoryHandler(final IMEInventory i, final StorageChannel channel) if (i instanceof IMEInventoryHandler) { this.internal = (IMEInventoryHandler) i; } else { - this.internal = new MEPassThrough(i, channel); + this.internal = new MEPassThrough<>(i, channel); } this.myPriority = 0; this.myWhitelist = IncludeExclude.WHITELIST; this.setBaseAccess(AccessRestriction.READ_WRITE); - this.myPartitionList = new DefaultPriorityList(); + this.myPartitionList = new DefaultPriorityList<>(); } public IncludeExclude getWhitelist() { diff --git a/src/main/java/appeng/me/storage/MEMonitorIInventory.java b/src/main/java/appeng/me/storage/MEMonitorIInventory.java index e8f403f8e9f..d0a83c26cb8 100644 --- a/src/main/java/appeng/me/storage/MEMonitorIInventory.java +++ b/src/main/java/appeng/me/storage/MEMonitorIInventory.java @@ -38,14 +38,14 @@ public class MEMonitorIInventory implements IMEMonitor { private final InventoryAdaptor adaptor; private final IItemList list = AEApi.instance().storage().createItemList(); - private final HashMap, Object> listeners = new HashMap, Object>(); + private final HashMap, Object> listeners = new HashMap<>(); private final NavigableMap memory; private BaseActionSource mySource; private StorageFilter mode = StorageFilter.EXTRACTABLE_ONLY; public MEMonitorIInventory(final InventoryAdaptor adaptor) { this.adaptor = adaptor; - this.memory = new ConcurrentSkipListMap(); + this.memory = new ConcurrentSkipListMap<>(); } @Override @@ -115,7 +115,7 @@ public StorageChannel getChannel() { public TickRateModulation onTick() { - final LinkedList changes = new LinkedList(); + final LinkedList changes = new LinkedList<>(); this.list.resetStatus(); int high = 0; diff --git a/src/main/java/appeng/me/storage/MEMonitorPassThrough.java b/src/main/java/appeng/me/storage/MEMonitorPassThrough.java index eac00b40827..1a0360ff553 100644 --- a/src/main/java/appeng/me/storage/MEMonitorPassThrough.java +++ b/src/main/java/appeng/me/storage/MEMonitorPassThrough.java @@ -28,7 +28,7 @@ public class MEMonitorPassThrough> extends MEPassThrough implements IMEMonitor, IMEMonitorHandlerReceiver { - private final HashMap, Object> listeners = new HashMap, Object>(); + private final HashMap, Object> listeners = new HashMap<>(); private BaseActionSource changeSource; private IMEMonitor monitor; diff --git a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java index 82bdbb29e9a..52c42103d59 100644 --- a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java +++ b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java @@ -30,15 +30,9 @@ public class NetworkInventoryHandler> implements IMEInventoryHandler { - private static final ThreadLocal DEPTH_MOD = new ThreadLocal(); - private static final ThreadLocal DEPTH_SIM = new ThreadLocal(); - private static final Comparator PRIORITY_SORTER = new Comparator() { - - @Override - public int compare(final Integer o1, final Integer o2) { - return ItemSorters.compareInt(o2, o1); - } - }; + private static final ThreadLocal DEPTH_MOD = new ThreadLocal<>(); + private static final ThreadLocal DEPTH_SIM = new ThreadLocal<>(); + private static final Comparator PRIORITY_SORTER = (o1, o2) -> ItemSorters.compareInt(o2, o1); private static int currentPass = 0; private final StorageChannel myChannel; private final SecurityCache security; @@ -49,17 +43,14 @@ public int compare(final Integer o1, final Integer o2) { public NetworkInventoryHandler(final StorageChannel chan, final SecurityCache security) { this.myChannel = chan; this.security = security; - this.priorityInventory = new TreeMap>>(PRIORITY_SORTER); // TreeMultimap.create( + this.priorityInventory = new TreeMap<>(PRIORITY_SORTER); // TreeMultimap.create( // prioritySorter, // hashSorter ); } public void addNewStorage(final IMEInventoryHandler h) { final int priority = h.getPriority(); - List> list = this.priorityInventory.get(priority); - if (list == null) { - this.priorityInventory.put(priority, list = new ArrayList>()); - } + List> list = this.priorityInventory.computeIfAbsent(priority, k -> new ArrayList<>()); list.add(h); } diff --git a/src/main/java/appeng/me/storage/SecurityInventory.java b/src/main/java/appeng/me/storage/SecurityInventory.java index 04365d7db92..c330d054d71 100644 --- a/src/main/java/appeng/me/storage/SecurityInventory.java +++ b/src/main/java/appeng/me/storage/SecurityInventory.java @@ -110,8 +110,7 @@ public boolean isPrioritized(final IAEItemStack input) { @Override public boolean canAccept(final IAEItemStack input) { - if (input.getItem() instanceof IBiometricCard) { - final IBiometricCard tbc = (IBiometricCard) input.getItem(); + if (input.getItem() instanceof IBiometricCard tbc) { final GameProfile newUser = tbc.getProfile(input.getItemStack()); final int PlayerID = AEApi.instance().registries().players().getID(newUser); diff --git a/src/main/java/appeng/me/storage/VoidCellInventory.java b/src/main/java/appeng/me/storage/VoidCellInventory.java index e9261d77681..c2c2b3db869 100644 --- a/src/main/java/appeng/me/storage/VoidCellInventory.java +++ b/src/main/java/appeng/me/storage/VoidCellInventory.java @@ -24,10 +24,9 @@ public class VoidCellInventory extends MEInventoryHandler { protected VoidCellInventory(final ItemStack o) throws AppEngException { super(new NullInventory<>(), StorageChannel.ITEMS); - if (o == null || !(o.getItem() instanceof ItemVoidStorageCell)) { + if (o == null || !(o.getItem() instanceof ItemVoidStorageCell cell)) { throw new AppEngException("ItemStack was used as a void cell, but was not a void cell!"); } - final ItemVoidStorageCell cell = (ItemVoidStorageCell) o.getItem(); final IInventory upgrades = cell.getUpgradesInventory(o); final IInventory config = cell.getConfigInventory(o); final FuzzyMode fzMode = cell.getFuzzyMode(o); @@ -42,16 +41,10 @@ protected VoidCellInventory(final ItemStack o) throws AppEngException { final Upgrades u = ((IUpgradeModule) is.getItem()).getType(is); if (u != null) { switch (u) { - case FUZZY: - hasFuzzy = true; - break; - case INVERTER: - hasInverter = true; - break; - case ORE_FILTER: - hasOreFilter = true; - break; - default: + case FUZZY -> hasFuzzy = true; + case INVERTER -> hasInverter = true; + case ORE_FILTER -> hasOreFilter = true; + default -> {} } } } diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index 4d960140d2f..fc7c8fdd2c3 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -92,7 +92,7 @@ public AECableType getCableConnectionType(final ForgeDirection dir) { @Override public void securityBreak() { if (this.getItemStack().stackSize > 0) { - final List items = new ArrayList(); + final List items = new ArrayList<>(); items.add(this.getItemStack().copy()); this.host.removePart(this.getSide(), false); Platform.spawnDrops(this.tile.getWorldObj(), this.tile.xCoord, this.tile.yCoord, this.tile.zCoord, items); @@ -311,14 +311,12 @@ private void uploadSettings(final SettingsFrom from, final NBTTagCompound compou } } - if (this instanceof IPriorityHost) { - final IPriorityHost pHost = (IPriorityHost) this; + if (this instanceof IPriorityHost pHost) { pHost.setPriority(compound.getInteger("priority")); } final IInventory inv = this.getInventoryByName("config"); - if (inv instanceof AppEngInternalAEInventory) { - final AppEngInternalAEInventory target = (AppEngInternalAEInventory) inv; + if (inv instanceof AppEngInternalAEInventory target) { final AppEngInternalAEInventory tmp = new AppEngInternalAEInventory(null, target.getSizeInventory()); tmp.readFromNBT(compound, "config"); for (int x = 0; x < tmp.getSizeInventory(); x++) { @@ -341,8 +339,7 @@ private NBTTagCompound downloadSettings(final SettingsFrom from) { cm.writeToNBT(output); } - if (this instanceof IPriorityHost) { - final IPriorityHost pHost = (IPriorityHost) this; + if (this instanceof IPriorityHost pHost) { output.setInteger("priority", pHost.getPriority()); } @@ -360,9 +357,9 @@ public boolean useStandardMemoryCard() { private boolean useMemoryCard(final EntityPlayer player) { final ItemStack memCardIS = player.inventory.getCurrentItem(); - if (memCardIS != null && this.useStandardMemoryCard() && memCardIS.getItem() instanceof IMemoryCard) { + if (memCardIS != null && this.useStandardMemoryCard() + && memCardIS.getItem() instanceof IMemoryCard memoryCard) { if (ForgeEventFactory.onItemUseStart(player, memCardIS, 1) <= 0) return false; - final IMemoryCard memoryCard = (IMemoryCard) memCardIS.getItem(); ItemStack is = this.getItemStack(PartItemStack.Network); diff --git a/src/main/java/appeng/parts/BusCollisionHelper.java b/src/main/java/appeng/parts/BusCollisionHelper.java index 96ad0a734bd..b22b3c91947 100644 --- a/src/main/java/appeng/parts/BusCollisionHelper.java +++ b/src/main/java/appeng/parts/BusCollisionHelper.java @@ -46,42 +46,41 @@ public BusCollisionHelper(final List boxes, final ForgeDirection this.isVisual = visual; switch (s) { - case DOWN: + case DOWN -> { this.x = ForgeDirection.EAST; this.y = ForgeDirection.NORTH; this.z = ForgeDirection.DOWN; - break; - case UP: + } + case UP -> { this.x = ForgeDirection.EAST; this.y = ForgeDirection.SOUTH; this.z = ForgeDirection.UP; - break; - case EAST: + } + case EAST -> { this.x = ForgeDirection.SOUTH; this.y = ForgeDirection.UP; this.z = ForgeDirection.EAST; - break; - case WEST: + } + case WEST -> { this.x = ForgeDirection.NORTH; this.y = ForgeDirection.UP; this.z = ForgeDirection.WEST; - break; - case NORTH: + } + case NORTH -> { this.x = ForgeDirection.WEST; this.y = ForgeDirection.UP; this.z = ForgeDirection.NORTH; - break; - case SOUTH: + } + case SOUTH -> { this.x = ForgeDirection.EAST; this.y = ForgeDirection.UP; this.z = ForgeDirection.SOUTH; - break; - case UNKNOWN: - default: + } + default -> { this.x = ForgeDirection.EAST; this.y = ForgeDirection.UP; this.z = ForgeDirection.SOUTH; - break; + } } } diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 8acc12a054d..378abe3f5a6 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -50,7 +50,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, ICableBusContainer { - private static final ThreadLocal IS_LOADING = new ThreadLocal(); + private static final ThreadLocal IS_LOADING = new ThreadLocal<>(); private final EnumSet myLayerFlags = EnumSet.noneOf(LayerFlags.class); private YesNo hasRedstone = YesNo.UNDECIDED; private IPartHost tcb; @@ -100,8 +100,7 @@ public boolean canAddPart(ItemStack is, final ForgeDirection side) { return true; } - if (is.getItem() instanceof IPartItem) { - final IPartItem bi = (IPartItem) is.getItem(); + if (is.getItem() instanceof IPartItem bi) { is = is.copy(); is.stackSize = 1; @@ -138,8 +137,7 @@ public boolean canAddPart(ItemStack is, final ForgeDirection side) { @Override public ForgeDirection addPart(ItemStack is, final ForgeDirection side, final EntityPlayer player) { if (this.canAddPart(is, side)) { - if (is.getItem() instanceof IPartItem) { - final IPartItem bi = (IPartItem) is.getItem(); + if (is.getItem() instanceof IPartItem bi) { is = is.copy(); is.stackSize = 1; @@ -315,7 +313,7 @@ public SelectedPart selectPart(final Vec3 pos) { for (final ForgeDirection side : ForgeDirection.values()) { final IPart p = this.getPart(side); if (p != null) { - final List boxes = new LinkedList(); + final List boxes = new LinkedList<>(); final IPartCollisionHelper bch = new BusCollisionHelper(boxes, side, null, true); p.getBoxes(bch); @@ -333,7 +331,7 @@ public SelectedPart selectPart(final Vec3 pos) { for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { final IFacadePart p = fc.getFacade(side); if (p != null) { - final List boxes = new LinkedList(); + final List boxes = new LinkedList<>(); final IPartCollisionHelper bch = new BusCollisionHelper(boxes, side, null, true); p.getBoxes(bch, null); @@ -358,7 +356,7 @@ public void markForSave() { @Override public void partChanged() { if (this.getCenter() == null) { - final List facades = new LinkedList(); + final List facades = new LinkedList<>(); final IFacadeContainer fc = this.getFacadeContainer(); for (final ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) { @@ -573,7 +571,7 @@ public void securityBreak() { public Iterable getSelectedBoundingBoxesFromPool(final boolean ignoreConnections, final boolean includeFacades, final Entity e, final boolean visual) { - final List boxes = new LinkedList(); + final List boxes = new LinkedList<>(); final IFacadeContainer fc = this.getFacadeContainer(); for (final ForgeDirection s : ForgeDirection.values()) { diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 10f939247e8..805e99b5ef8 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -56,7 +56,7 @@ public class PartPlacement { private static float eyeHeight = 0.0f; - private final ThreadLocal placing = new ThreadLocal(); + private final ThreadLocal placing = new ThreadLocal<>(); private boolean wasCanceled = false; public static boolean place(final ItemStack held, final int x, final int y, final int z, final int face, @@ -85,7 +85,7 @@ public static boolean place(final ItemStack held, final int x, final int y, fina final LookDirection dir = Platform.getPlayerRay(player, getEyeOffset(player)); final MovingObjectPosition mop = block.collisionRayTrace(world, x, y, z, dir.getA(), dir.getB()); if (mop != null) { - final List is = new LinkedList(); + final List is = new LinkedList<>(); final SelectedPart sp = selectPart( player, host, diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index 46bb9ee40d4..ec18f66605a 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -244,8 +244,7 @@ public void onEntityCollision(final Entity entity) { boolean capture = false; switch (this.getSide()) { - case DOWN: - case UP: + case DOWN, UP -> { if (entity.posX > this.getTile().xCoord && entity.posX < this.getTile().xCoord + 1) { if (entity.posZ > this.getTile().zCoord && entity.posZ < this.getTile().zCoord + 1) { if ((entity.posY > this.getTile().yCoord + 0.9 && this.getSide() == ForgeDirection.UP) @@ -255,9 +254,8 @@ public void onEntityCollision(final Entity entity) { } } } - break; - case SOUTH: - case NORTH: + } + case SOUTH, NORTH -> { if (entity.posX > this.getTile().xCoord && entity.posX < this.getTile().xCoord + 1) { if (entity.posY > this.getTile().yCoord && entity.posY < this.getTile().yCoord + 1) { if ((entity.posZ > this.getTile().zCoord + 0.9 && this.getSide() == ForgeDirection.SOUTH) @@ -267,9 +265,8 @@ public void onEntityCollision(final Entity entity) { } } } - break; - case EAST: - case WEST: + } + case EAST, WEST -> { if (entity.posZ > this.getTile().zCoord && entity.posZ < this.getTile().zCoord + 1) { if (entity.posY > this.getTile().yCoord && entity.posY < this.getTile().yCoord + 1) { if ((entity.posX > this.getTile().xCoord + 0.9 && this.getSide() == ForgeDirection.EAST) @@ -279,10 +276,9 @@ public void onEntityCollision(final Entity entity) { } } } - break; - default: - // umm? - break; + } + default -> {} + // umm? } if (capture) { @@ -579,8 +575,7 @@ private void breakBlockAndStoreItems(final WorldServer w, final int x, final int final AxisAlignedBB box = AxisAlignedBB.getBoundingBox(x - 0.2, y - 0.2, z - 0.2, x + 1.2, y + 1.2, z + 1.2); for (final Object ei : w.getEntitiesWithinAABB(EntityItem.class, box)) { - if (ei instanceof EntityItem) { - final EntityItem entityItem = (EntityItem) ei; + if (ei instanceof EntityItem entityItem) { this.storeEntityItem(entityItem); } } diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/PartFormationPlane.java index 38670b49122..8187a8543d1 100644 --- a/src/main/java/appeng/parts/automation/PartFormationPlane.java +++ b/src/main/java/appeng/parts/automation/PartFormationPlane.java @@ -364,11 +364,11 @@ private boolean isTransitionPlane(final TileEntity blockTileEntity, final ForgeD @Override public List getCellArray(final StorageChannel channel) { if (this.getProxy().isActive() && channel == StorageChannel.ITEMS) { - final List Handler = new ArrayList(1); + final List Handler = new ArrayList<>(1); Handler.add(this.myHandler); return Handler; } - return new ArrayList(); + return new ArrayList<>(); } @Override diff --git a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java index dbc392532f3..b67896fb1c5 100644 --- a/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java @@ -72,7 +72,7 @@ protected List obtainBlockDrops(final WorldServer w, final int x, fin final int blockMeta = w.getBlockMetadata(x, y, z); if (block.canSilkHarvest(w, fakePlayer, x, y, z, blockMeta)) { - final List out = new ArrayList(1); + final List out = new ArrayList<>(1); final Item item = Item.getItemFromBlock(block); if (item != null) { diff --git a/src/main/java/appeng/parts/automation/PartSharedItemBus.java b/src/main/java/appeng/parts/automation/PartSharedItemBus.java index 2bcfd378093..331c58ce7d4 100644 --- a/src/main/java/appeng/parts/automation/PartSharedItemBus.java +++ b/src/main/java/appeng/parts/automation/PartSharedItemBus.java @@ -109,19 +109,13 @@ protected int availableSlots() { } protected int calculateItemsToSend() { - switch (this.getInstalledUpgrades(Upgrades.SPEED)) { - default: - case 0: - return 1; - case 1: - return 8; - case 2: - return 32; - case 3: - return 64; - case 4: - return 96; - } + return switch (this.getInstalledUpgrades(Upgrades.SPEED)) { + default -> 1; + case 1 -> 8; + case 2 -> 32; + case 3 -> 64; + case 4 -> 96; + }; } /** diff --git a/src/main/java/appeng/parts/automation/PartUpgradeable.java b/src/main/java/appeng/parts/automation/PartUpgradeable.java index bb5bfa589c8..821be1e0b38 100644 --- a/src/main/java/appeng/parts/automation/PartUpgradeable.java +++ b/src/main/java/appeng/parts/automation/PartUpgradeable.java @@ -56,26 +56,20 @@ public void upgradesChanged() {} protected boolean isSleeping() { if (this.getInstalledUpgrades(Upgrades.REDSTONE) > 0) { switch (this.getRSMode()) { - case IGNORE: + case IGNORE -> { return false; - - case HIGH_SIGNAL: + } + case HIGH_SIGNAL -> { if (this.getHost().hasRedstone(this.getSide())) { return false; } - - break; - - case LOW_SIGNAL: + } + case LOW_SIGNAL -> { if (!this.getHost().hasRedstone(this.getSide())) { return false; } - - break; - - case SIGNAL_PULSE: - default: - break; + } + default -> {} } return true; diff --git a/src/main/java/appeng/parts/automation/UpgradeInventory.java b/src/main/java/appeng/parts/automation/UpgradeInventory.java index 1fc4a900785..52911154a40 100644 --- a/src/main/java/appeng/parts/automation/UpgradeInventory.java +++ b/src/main/java/appeng/parts/automation/UpgradeInventory.java @@ -73,28 +73,18 @@ public int getInstalledUpgrades(final Upgrades u) { this.updateUpgradeInfo(); } - switch (u) { - case PATTERN_CAPACITY: - return this.patternCapacityUpgrades; - case CAPACITY: - return this.capacityUpgrades; - case FUZZY: - return this.fuzzyUpgrades; - case REDSTONE: - return this.redstoneUpgrades; - case SPEED: - return this.speedUpgrades; - case SUPERSPEED: - return this.superSpeedUpgrades; - case INVERTER: - return this.inverterUpgrades; - case CRAFTING: - return this.craftingUpgrades; - case ORE_FILTER: - return this.oreFilterUpgrades; - default: - return 0; - } + return switch (u) { + case PATTERN_CAPACITY -> this.patternCapacityUpgrades; + case CAPACITY -> this.capacityUpgrades; + case FUZZY -> this.fuzzyUpgrades; + case REDSTONE -> this.redstoneUpgrades; + case SPEED -> this.speedUpgrades; + case SUPERSPEED -> this.superSpeedUpgrades; + case INVERTER -> this.inverterUpgrades; + case CRAFTING -> this.craftingUpgrades; + case ORE_FILTER -> this.oreFilterUpgrades; + default -> 0; + }; } public abstract int getMaxInstalled(Upgrades upgrades); @@ -110,35 +100,16 @@ private void updateUpgradeInfo() { final Upgrades myUpgrade = ((IUpgradeModule) is.getItem()).getType(is); switch (myUpgrade) { - case PATTERN_CAPACITY: - this.patternCapacityUpgrades++; - break; - case CAPACITY: - this.capacityUpgrades++; - break; - case FUZZY: - this.fuzzyUpgrades++; - break; - case REDSTONE: - this.redstoneUpgrades++; - break; - case SPEED: - this.speedUpgrades++; - break; - case SUPERSPEED: - this.superSpeedUpgrades++; - break; - case INVERTER: - this.inverterUpgrades++; - break; - case CRAFTING: - this.craftingUpgrades++; - break; - case ORE_FILTER: - this.oreFilterUpgrades++; - break; - default: - break; + case PATTERN_CAPACITY -> this.patternCapacityUpgrades++; + case CAPACITY -> this.capacityUpgrades++; + case FUZZY -> this.fuzzyUpgrades++; + case REDSTONE -> this.redstoneUpgrades++; + case SPEED -> this.speedUpgrades++; + case SUPERSPEED -> this.superSpeedUpgrades++; + case INVERTER -> this.inverterUpgrades++; + case CRAFTING -> this.craftingUpgrades++; + case ORE_FILTER -> this.oreFilterUpgrades++; + default -> {} } } diff --git a/src/main/java/appeng/parts/layers/LayerISidedInventory.java b/src/main/java/appeng/parts/layers/LayerISidedInventory.java index f631fa37e8e..ae018d44a55 100644 --- a/src/main/java/appeng/parts/layers/LayerISidedInventory.java +++ b/src/main/java/appeng/parts/layers/LayerISidedInventory.java @@ -48,13 +48,12 @@ public class LayerISidedInventory extends LayerBase implements ISidedInventory { public void notifyNeighbors() { // cache of inventory state. - List inventories = new ArrayList(); + List inventories = new ArrayList<>(); int slotCount = 0; for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { final IPart bp = this.getPart(side); - if (bp instanceof ISidedInventory) { - final ISidedInventory part = (ISidedInventory) bp; + if (bp instanceof ISidedInventory part) { slotCount += part.getSizeInventory(); inventories.add(part); } @@ -66,7 +65,7 @@ public void notifyNeighbors() { inventories = null; } else { sideData = new int[][] { NULL_SIDES, NULL_SIDES, NULL_SIDES, NULL_SIDES, NULL_SIDES, NULL_SIDES }; - slots = new ArrayList(Collections.nCopies(slotCount, (InvSot) null)); + slots = new ArrayList<>(Collections.nCopies(slotCount, null)); int offsetForLayer = 0; int offsetForPart = 0; diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index f7f1f378127..e4c72a9aa63 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartStorageBus.java @@ -390,8 +390,7 @@ public MEInventoryHandler getInternalHandler() { final IMEInventory inv = esh .getInventory(target, this.getSide().getOpposite(), StorageChannel.ITEMS, this.mySrc); - if (inv instanceof MEMonitorIInventory) { - final MEMonitorIInventory h = (MEMonitorIInventory) inv; + if (inv instanceof MEMonitorIInventory h) { h.setMode((StorageFilter) this.getConfigManager().getSetting(Settings.STORAGE_FILTER)); h.setActionSource(new MachineSource(this)); } diff --git a/src/main/java/appeng/parts/misc/PartToggleBus.java b/src/main/java/appeng/parts/misc/PartToggleBus.java index 326c9f2ff9a..a235a5dc0d0 100644 --- a/src/main/java/appeng/parts/misc/PartToggleBus.java +++ b/src/main/java/appeng/parts/misc/PartToggleBus.java @@ -85,7 +85,7 @@ public AECableType getCableConnectionType(final ForgeDirection dir) { @Override public void securityBreak() { if (this.getItemStack().stackSize > 0) { - final List items = new ArrayList(); + final List items = new ArrayList<>(); items.add(this.getItemStack().copy()); this.getHost().removePart(this.getSide(), false); Platform.spawnDrops( diff --git a/src/main/java/appeng/parts/networking/PartCable.java b/src/main/java/appeng/parts/networking/PartCable.java index 4a454e76093..14d7e2ac7b1 100644 --- a/src/main/java/appeng/parts/networking/PartCable.java +++ b/src/main/java/appeng/parts/networking/PartCable.java @@ -161,25 +161,13 @@ public void getBoxes(final IPartCollisionHelper bch) { } switch (dir) { - case DOWN: - bch.addBox(6.0, dist, 6.0, 10.0, 6.0, 10.0); - break; - case EAST: - bch.addBox(10.0, 6.0, 6.0, 16.0 - dist, 10.0, 10.0); - break; - case NORTH: - bch.addBox(6.0, 6.0, dist, 10.0, 10.0, 6.0); - break; - case SOUTH: - bch.addBox(6.0, 6.0, 10.0, 10.0, 10.0, 16.0 - dist); - break; - case UP: - bch.addBox(6.0, 10.0, 6.0, 10.0, 16.0 - dist, 10.0); - break; - case WEST: - bch.addBox(dist, 6.0, 6.0, 6.0, 10.0, 10.0); - break; - default: + case DOWN -> bch.addBox(6.0, dist, 6.0, 10.0, 6.0, 10.0); + case EAST -> bch.addBox(10.0, 6.0, 6.0, 16.0 - dist, 10.0, 10.0); + case NORTH -> bch.addBox(6.0, 6.0, dist, 10.0, 10.0, 6.0); + case SOUTH -> bch.addBox(6.0, 6.0, 10.0, 10.0, 10.0, 16.0 - dist); + case UP -> bch.addBox(6.0, 10.0, 6.0, 10.0, 16.0 - dist, 10.0); + case WEST -> bch.addBox(dist, 6.0, 6.0, 6.0, 10.0, 10.0); + default -> {} } } } @@ -187,25 +175,13 @@ public void getBoxes(final IPartCollisionHelper bch) { for (final ForgeDirection of : this.getConnections()) { switch (of) { - case DOWN: - bch.addBox(6.0, 0.0, 6.0, 10.0, 6.0, 10.0); - break; - case EAST: - bch.addBox(10.0, 6.0, 6.0, 16.0, 10.0, 10.0); - break; - case NORTH: - bch.addBox(6.0, 6.0, 0.0, 10.0, 10.0, 6.0); - break; - case SOUTH: - bch.addBox(6.0, 6.0, 10.0, 10.0, 10.0, 16.0); - break; - case UP: - bch.addBox(6.0, 10.0, 6.0, 10.0, 16.0, 10.0); - break; - case WEST: - bch.addBox(0.0, 6.0, 6.0, 6.0, 10.0, 10.0); - break; - default: + case DOWN -> bch.addBox(6.0, 0.0, 6.0, 10.0, 6.0, 10.0); + case EAST -> bch.addBox(10.0, 6.0, 6.0, 16.0, 10.0, 10.0); + case NORTH -> bch.addBox(6.0, 6.0, 0.0, 10.0, 10.0, 6.0); + case SOUTH -> bch.addBox(6.0, 6.0, 10.0, 10.0, 10.0, 16.0); + case UP -> bch.addBox(6.0, 10.0, 6.0, 10.0, 16.0, 10.0); + case WEST -> bch.addBox(0.0, 6.0, 6.0, 6.0, 10.0, 10.0); + default -> {} } } } @@ -227,39 +203,55 @@ public IIcon getTexture(final AEColor c) { public IIcon getGlassTexture(final AEColor c) { switch (c) { - case Black: + case Black -> { return CableBusTextures.MECable_Black.getIcon(); - case Blue: + } + case Blue -> { return CableBusTextures.MECable_Blue.getIcon(); - case Brown: + } + case Brown -> { return CableBusTextures.MECable_Brown.getIcon(); - case Cyan: + } + case Cyan -> { return CableBusTextures.MECable_Cyan.getIcon(); - case Gray: + } + case Gray -> { return CableBusTextures.MECable_Grey.getIcon(); - case Green: + } + case Green -> { return CableBusTextures.MECable_Green.getIcon(); - case LightBlue: + } + case LightBlue -> { return CableBusTextures.MECable_LightBlue.getIcon(); - case LightGray: + } + case LightGray -> { return CableBusTextures.MECable_LightGrey.getIcon(); - case Lime: + } + case Lime -> { return CableBusTextures.MECable_Lime.getIcon(); - case Magenta: + } + case Magenta -> { return CableBusTextures.MECable_Magenta.getIcon(); - case Orange: + } + case Orange -> { return CableBusTextures.MECable_Orange.getIcon(); - case Pink: + } + case Pink -> { return CableBusTextures.MECable_Pink.getIcon(); - case Purple: + } + case Purple -> { return CableBusTextures.MECable_Purple.getIcon(); - case Red: + } + case Red -> { return CableBusTextures.MECable_Red.getIcon(); - case White: + } + case White -> { return CableBusTextures.MECable_White.getIcon(); - case Yellow: + } + case Yellow -> { return CableBusTextures.MECable_Yellow.getIcon(); - default: + } + default -> {} } final AEColoredItemDefinition glassCable = AEApi.instance().definitions().parts().cableGlass(); @@ -278,8 +270,7 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende for (final ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { final IPart p = this.getHost().getPart(dir); - if (p instanceof IGridHost) { - final IGridHost igh = (IGridHost) p; + if (p instanceof IGridHost igh) { final AECableType type = igh.getCableConnectionType(dir.getOpposite()); if (type == AECableType.COVERED || type == AECableType.SMART) { useCovered = true; @@ -309,26 +300,15 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende final int len = bp.cableConnectionRenderTo(); if (len < 8) { switch (of) { - case DOWN: - rh.setBounds(6, len, 6, 10, 6, 10); - break; - case EAST: - rh.setBounds(10, 6, 6, 16 - len, 10, 10); - break; - case NORTH: - rh.setBounds(6, 6, len, 10, 10, 6); - break; - case SOUTH: - rh.setBounds(6, 6, 10, 10, 10, 16 - len); - break; - case UP: - rh.setBounds(6, 10, 6, 10, 16 - len, 10); - break; - case WEST: - rh.setBounds(len, 6, 6, 6, 10, 10); - break; - default: + case DOWN -> rh.setBounds(6, len, 6, 10, 6, 10); + case EAST -> rh.setBounds(10, 6, 6, 16 - len, 10, 10); + case NORTH -> rh.setBounds(6, 6, len, 10, 10, 6); + case SOUTH -> rh.setBounds(6, 6, 10, 10, 10, 16 - len); + case UP -> rh.setBounds(6, 10, 6, 10, 16 - len, 10); + case WEST -> rh.setBounds(len, 6, 6, 6, 10, 10); + default -> { continue; + } } rh.renderBlock(x, y, z, renderer); } @@ -356,22 +336,17 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende for (final ForgeDirection of : this.getConnections()) { rh.setFacesToRender(EnumSet.complementOf(EnumSet.of(of, of.getOpposite()))); switch (of) { - case DOWN: - case UP: - renderer.setRenderBounds(6 / 16.0, 0, 6 / 16.0, 10 / 16.0, 16 / 16.0, 10 / 16.0); - break; - case EAST: - case WEST: + case DOWN, UP -> renderer.setRenderBounds(6 / 16.0, 0, 6 / 16.0, 10 / 16.0, 16 / 16.0, 10 / 16.0); + case EAST, WEST -> { renderer.uvRotateEast = renderer.uvRotateWest = 1; renderer.uvRotateBottom = renderer.uvRotateTop = 1; renderer.setRenderBounds(0, 6 / 16.0, 6 / 16.0, 16 / 16.0, 10 / 16.0, 10 / 16.0); - break; - case NORTH: - case SOUTH: + } + case NORTH, SOUTH -> { renderer.uvRotateNorth = renderer.uvRotateSouth = 1; renderer.setRenderBounds(6 / 16.0, 6 / 16.0, 0, 10 / 16.0, 10 / 16.0, 16 / 16.0); - break; - default: + } + default -> {} } } @@ -507,39 +482,55 @@ public IIcon getBreakingTexture() { public IIcon getCoveredTexture(final AEColor c) { switch (c) { - case Black: + case Black -> { return CableBusTextures.MECovered_Black.getIcon(); - case Blue: + } + case Blue -> { return CableBusTextures.MECovered_Blue.getIcon(); - case Brown: + } + case Brown -> { return CableBusTextures.MECovered_Brown.getIcon(); - case Cyan: + } + case Cyan -> { return CableBusTextures.MECovered_Cyan.getIcon(); - case Gray: + } + case Gray -> { return CableBusTextures.MECovered_Gray.getIcon(); - case Green: + } + case Green -> { return CableBusTextures.MECovered_Green.getIcon(); - case LightBlue: + } + case LightBlue -> { return CableBusTextures.MECovered_LightBlue.getIcon(); - case LightGray: + } + case LightGray -> { return CableBusTextures.MECovered_LightGrey.getIcon(); - case Lime: + } + case Lime -> { return CableBusTextures.MECovered_Lime.getIcon(); - case Magenta: + } + case Magenta -> { return CableBusTextures.MECovered_Magenta.getIcon(); - case Orange: + } + case Orange -> { return CableBusTextures.MECovered_Orange.getIcon(); - case Pink: + } + case Pink -> { return CableBusTextures.MECovered_Pink.getIcon(); - case Purple: + } + case Purple -> { return CableBusTextures.MECovered_Purple.getIcon(); - case Red: + } + case Red -> { return CableBusTextures.MECovered_Red.getIcon(); - case White: + } + case White -> { return CableBusTextures.MECovered_White.getIcon(); - case Yellow: + } + case Yellow -> { return CableBusTextures.MECovered_Yellow.getIcon(); - default: + } + default -> {} } final AEColoredItemDefinition coveredCable = AEApi.instance().definitions().parts().cableCovered(); @@ -572,26 +563,15 @@ private void renderGlassConnection(final int x, final int y, final int z, final } else if (partHost == null && gh != null && gh.getCableConnectionType(of.getOpposite()) != AECableType.GLASS) { rh.setTexture(this.getCoveredTexture(this.getCableColor())); switch (of) { - case DOWN: - rh.setBounds(5, 0, 5, 11, 4, 11); - break; - case EAST: - rh.setBounds(12, 5, 5, 16, 11, 11); - break; - case NORTH: - rh.setBounds(5, 5, 0, 11, 11, 4); - break; - case SOUTH: - rh.setBounds(5, 5, 12, 11, 11, 16); - break; - case UP: - rh.setBounds(5, 12, 5, 11, 16, 11); - break; - case WEST: - rh.setBounds(0, 5, 5, 4, 11, 11); - break; - default: + case DOWN -> rh.setBounds(5, 0, 5, 11, 4, 11); + case EAST -> rh.setBounds(12, 5, 5, 16, 11, 11); + case NORTH -> rh.setBounds(5, 5, 0, 11, 11, 4); + case SOUTH -> rh.setBounds(5, 5, 12, 11, 11, 16); + case UP -> rh.setBounds(5, 12, 5, 11, 16, 11); + case WEST -> rh.setBounds(0, 5, 5, 4, 11, 11); + default -> { return; + } } rh.renderBlock(x, y, z, renderer); @@ -601,26 +581,15 @@ private void renderGlassConnection(final int x, final int y, final int z, final } switch (of) { - case DOWN: - rh.setBounds(6, 0, 6, 10, 6, 10); - break; - case EAST: - rh.setBounds(10, 6, 6, 16, 10, 10); - break; - case NORTH: - rh.setBounds(6, 6, 0, 10, 10, 6); - break; - case SOUTH: - rh.setBounds(6, 6, 10, 10, 10, 16); - break; - case UP: - rh.setBounds(6, 10, 6, 10, 16, 10); - break; - case WEST: - rh.setBounds(0, 6, 6, 6, 10, 10); - break; - default: + case DOWN -> rh.setBounds(6, 0, 6, 10, 6, 10); + case EAST -> rh.setBounds(10, 6, 6, 16, 10, 10); + case NORTH -> rh.setBounds(6, 6, 0, 10, 10, 6); + case SOUTH -> rh.setBounds(6, 6, 10, 10, 10, 16); + case UP -> rh.setBounds(6, 10, 6, 10, 16, 10); + case WEST -> rh.setBounds(0, 6, 6, 6, 10, 10); + default -> { return; + } } rh.renderBlock(x, y, z, renderer); @@ -645,26 +614,15 @@ void renderCoveredConnection(final int x, final int y, final int z, final IPartR if (partHost == null && ghh != null && ghh.getCableConnectionType(of.getOpposite()) != AECableType.GLASS) { rh.setTexture(this.getCoveredTexture(this.getCableColor())); switch (of) { - case DOWN: - rh.setBounds(5, 0, 5, 11, 4, 11); - break; - case EAST: - rh.setBounds(12, 5, 5, 16, 11, 11); - break; - case NORTH: - rh.setBounds(5, 5, 0, 11, 11, 4); - break; - case SOUTH: - rh.setBounds(5, 5, 12, 11, 11, 16); - break; - case UP: - rh.setBounds(5, 12, 5, 11, 16, 11); - break; - case WEST: - rh.setBounds(0, 5, 5, 4, 11, 11); - break; - default: + case DOWN -> rh.setBounds(5, 0, 5, 11, 4, 11); + case EAST -> rh.setBounds(12, 5, 5, 16, 11, 11); + case NORTH -> rh.setBounds(5, 5, 0, 11, 11, 4); + case SOUTH -> rh.setBounds(5, 5, 12, 11, 11, 16); + case UP -> rh.setBounds(5, 12, 5, 11, 16, 11); + case WEST -> rh.setBounds(0, 5, 5, 4, 11, 11); + default -> { return; + } } rh.renderBlock(x, y, z, renderer); @@ -680,26 +638,15 @@ void renderCoveredConnection(final int x, final int y, final int z, final IPartR } switch (of) { - case DOWN: - rh.setBounds(6, 0, 6, 10, 5, 10); - break; - case EAST: - rh.setBounds(11, 6, 6, 16, 10, 10); - break; - case NORTH: - rh.setBounds(6, 6, 0, 10, 10, 5); - break; - case SOUTH: - rh.setBounds(6, 6, 11, 10, 10, 16); - break; - case UP: - rh.setBounds(6, 11, 6, 10, 16, 10); - break; - case WEST: - rh.setBounds(0, 6, 6, 5, 10, 10); - break; - default: + case DOWN -> rh.setBounds(6, 0, 6, 10, 5, 10); + case EAST -> rh.setBounds(11, 6, 6, 16, 10, 10); + case NORTH -> rh.setBounds(6, 6, 0, 10, 10, 5); + case SOUTH -> rh.setBounds(6, 6, 11, 10, 10, 16); + case UP -> rh.setBounds(6, 11, 6, 10, 16, 10); + case WEST -> rh.setBounds(0, 6, 6, 5, 10, 10); + default -> { return; + } } rh.renderBlock(x, y, z, renderer); @@ -729,26 +676,15 @@ void renderSmartConnection(final int x, final int y, final int z, final IPartRen if (partHost == null && ghh != null && ghh.getCableConnectionType(of.getOpposite()) != AECableType.GLASS) { rh.setTexture(this.getSmartTexture(myColor)); switch (of) { - case DOWN: - rh.setBounds(5, 0, 5, 11, 4, 11); - break; - case EAST: - rh.setBounds(12, 5, 5, 16, 11, 11); - break; - case NORTH: - rh.setBounds(5, 5, 0, 11, 11, 4); - break; - case SOUTH: - rh.setBounds(5, 5, 12, 11, 11, 16); - break; - case UP: - rh.setBounds(5, 12, 5, 11, 16, 11); - break; - case WEST: - rh.setBounds(0, 5, 5, 4, 11, 11); - break; - default: + case DOWN -> rh.setBounds(5, 0, 5, 11, 4, 11); + case EAST -> rh.setBounds(12, 5, 5, 16, 11, 11); + case NORTH -> rh.setBounds(5, 5, 0, 11, 11, 4); + case SOUTH -> rh.setBounds(5, 5, 12, 11, 11, 16); + case UP -> rh.setBounds(5, 12, 5, 11, 16, 11); + case WEST -> rh.setBounds(0, 5, 5, 4, 11, 11); + default -> { return; + } } rh.renderBlock(x, y, z, renderer); @@ -784,26 +720,15 @@ void renderSmartConnection(final int x, final int y, final int z, final IPartRen } switch (of) { - case DOWN: - rh.setBounds(6, 0, 6, 10, 5, 10); - break; - case EAST: - rh.setBounds(11, 6, 6, 16, 10, 10); - break; - case NORTH: - rh.setBounds(6, 6, 0, 10, 10, 5); - break; - case SOUTH: - rh.setBounds(6, 6, 11, 10, 10, 16); - break; - case UP: - rh.setBounds(6, 11, 6, 10, 16, 10); - break; - case WEST: - rh.setBounds(0, 6, 6, 5, 10, 10); - break; - default: + case DOWN -> rh.setBounds(6, 0, 6, 10, 5, 10); + case EAST -> rh.setBounds(11, 6, 6, 16, 10, 10); + case NORTH -> rh.setBounds(6, 6, 0, 10, 10, 5); + case SOUTH -> rh.setBounds(6, 6, 11, 10, 10, 16); + case UP -> rh.setBounds(6, 11, 6, 10, 16, 10); + case WEST -> rh.setBounds(0, 6, 6, 5, 10, 10); + default -> { return; + } } rh.renderBlock(x, y, z, renderer); @@ -830,39 +755,55 @@ void renderSmartConnection(final int x, final int y, final int z, final IPartRen IIcon getSmartTexture(final AEColor c) { switch (c) { - case Black: + case Black -> { return CableBusTextures.MESmart_Black.getIcon(); - case Blue: + } + case Blue -> { return CableBusTextures.MESmart_Blue.getIcon(); - case Brown: + } + case Brown -> { return CableBusTextures.MESmart_Brown.getIcon(); - case Cyan: + } + case Cyan -> { return CableBusTextures.MESmart_Cyan.getIcon(); - case Gray: + } + case Gray -> { return CableBusTextures.MESmart_Gray.getIcon(); - case Green: + } + case Green -> { return CableBusTextures.MESmart_Green.getIcon(); - case LightBlue: + } + case LightBlue -> { return CableBusTextures.MESmart_LightBlue.getIcon(); - case LightGray: + } + case LightGray -> { return CableBusTextures.MESmart_LightGrey.getIcon(); - case Lime: + } + case Lime -> { return CableBusTextures.MESmart_Lime.getIcon(); - case Magenta: + } + case Magenta -> { return CableBusTextures.MESmart_Magenta.getIcon(); - case Orange: + } + case Orange -> { return CableBusTextures.MESmart_Orange.getIcon(); - case Pink: + } + case Pink -> { return CableBusTextures.MESmart_Pink.getIcon(); - case Purple: + } + case Purple -> { return CableBusTextures.MESmart_Purple.getIcon(); - case Red: + } + case Red -> { return CableBusTextures.MESmart_Red.getIcon(); - case White: + } + case White -> { return CableBusTextures.MESmart_White.getIcon(); - case Yellow: + } + case Yellow -> { return CableBusTextures.MESmart_Yellow.getIcon(); - default: + } + default -> {} } final IParts parts = AEApi.instance().definitions().parts(); @@ -874,32 +815,28 @@ IIcon getSmartTexture(final AEColor c) { @SideOnly(Side.CLIENT) protected void setSmartConnectionRotations(final ForgeDirection of, final RenderBlocks renderer) { switch (of) { - case UP: - case DOWN: + case UP, DOWN -> { renderer.uvRotateTop = 0; renderer.uvRotateBottom = 0; renderer.uvRotateSouth = 3; renderer.uvRotateEast = 3; - break; - case NORTH: - case SOUTH: + } + case NORTH, SOUTH -> { renderer.uvRotateTop = 3; renderer.uvRotateBottom = 3; renderer.uvRotateNorth = 1; renderer.uvRotateSouth = 2; renderer.uvRotateWest = 1; - break; - case EAST: - case WEST: + } + case EAST, WEST -> { renderer.uvRotateEast = 2; renderer.uvRotateWest = 1; renderer.uvRotateBottom = 2; renderer.uvRotateTop = 1; renderer.uvRotateSouth = 3; renderer.uvRotateNorth = 0; - break; - default: - break; + } + default -> {} } } @@ -909,31 +846,21 @@ protected CableBusTextures getChannelTex(int i, final boolean b) { } if (b) { - switch (i) { - default: - return CableBusTextures.Channels10; - case 5: - return CableBusTextures.Channels11; - case 6: - return CableBusTextures.Channels12; - case 7: - return CableBusTextures.Channels13; - case 8: - return CableBusTextures.Channels14; - } + return switch (i) { + default -> CableBusTextures.Channels10; + case 5 -> CableBusTextures.Channels11; + case 6 -> CableBusTextures.Channels12; + case 7 -> CableBusTextures.Channels13; + case 8 -> CableBusTextures.Channels14; + }; } else { - switch (i) { - case 0: - return CableBusTextures.Channels00; - case 1: - return CableBusTextures.Channels01; - case 2: - return CableBusTextures.Channels02; - case 3: - return CableBusTextures.Channels03; - default: - return CableBusTextures.Channels04; - } + return switch (i) { + case 0 -> CableBusTextures.Channels00; + case 1 -> CableBusTextures.Channels01; + case 2 -> CableBusTextures.Channels02; + case 3 -> CableBusTextures.Channels03; + default -> CableBusTextures.Channels04; + }; } } diff --git a/src/main/java/appeng/parts/networking/PartCableCovered.java b/src/main/java/appeng/parts/networking/PartCableCovered.java index 8fa2702f293..68ad2f6a17e 100644 --- a/src/main/java/appeng/parts/networking/PartCableCovered.java +++ b/src/main/java/appeng/parts/networking/PartCableCovered.java @@ -73,25 +73,13 @@ public void getBoxes(final IPartCollisionHelper bch) { for (final ForgeDirection of : this.getConnections()) { switch (of) { - case DOWN: - bch.addBox(5.0, 0.0, 5.0, 11.0, 5.0, 11.0); - break; - case EAST: - bch.addBox(11.0, 5.0, 5.0, 16.0, 11.0, 11.0); - break; - case NORTH: - bch.addBox(5.0, 5.0, 0.0, 11.0, 11.0, 5.0); - break; - case SOUTH: - bch.addBox(5.0, 5.0, 11.0, 11.0, 11.0, 16.0); - break; - case UP: - bch.addBox(5.0, 11.0, 5.0, 11.0, 16.0, 11.0); - break; - case WEST: - bch.addBox(0.0, 5.0, 5.0, 5.0, 11.0, 11.0); - break; - default: + case DOWN -> bch.addBox(5.0, 0.0, 5.0, 11.0, 5.0, 11.0); + case EAST -> bch.addBox(11.0, 5.0, 5.0, 16.0, 11.0, 11.0); + case NORTH -> bch.addBox(5.0, 5.0, 0.0, 11.0, 11.0, 5.0); + case SOUTH -> bch.addBox(5.0, 5.0, 11.0, 11.0, 11.0, 16.0); + case UP -> bch.addBox(5.0, 11.0, 5.0, 11.0, 16.0, 11.0); + case WEST -> bch.addBox(0.0, 5.0, 5.0, 5.0, 11.0, 11.0); + default -> {} } } } @@ -155,26 +143,15 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende final int len = bp.cableConnectionRenderTo(); if (len < 8) { switch (of) { - case DOWN: - rh.setBounds(6, len, 6, 10, 5, 10); - break; - case EAST: - rh.setBounds(11, 6, 6, 16 - len, 10, 10); - break; - case NORTH: - rh.setBounds(6, 6, len, 10, 10, 5); - break; - case SOUTH: - rh.setBounds(6, 6, 11, 10, 10, 16 - len); - break; - case UP: - rh.setBounds(6, 11, 6, 10, 16 - len, 10); - break; - case WEST: - rh.setBounds(len, 6, 6, 5, 10, 10); - break; - default: + case DOWN -> rh.setBounds(6, len, 6, 10, 5, 10); + case EAST -> rh.setBounds(11, 6, 6, 16 - len, 10, 10); + case NORTH -> rh.setBounds(6, 6, len, 10, 10, 5); + case SOUTH -> rh.setBounds(6, 6, 11, 10, 10, 16 - len); + case UP -> rh.setBounds(6, 11, 6, 10, 16 - len, 10); + case WEST -> rh.setBounds(len, 6, 6, 5, 10, 10); + default -> { continue; + } } rh.renderBlock(x, y, z, renderer); } @@ -194,25 +171,22 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende final IIcon off = new OffsetIcon(def, 0, -12); for (final ForgeDirection of : this.getConnections()) { switch (of) { - case DOWN: - case UP: + case DOWN, UP -> { rh.setTexture(def, def, off, off, off, off); renderer.setRenderBounds(5 / 16.0, 0, 5 / 16.0, 11 / 16.0, 16 / 16.0, 11 / 16.0); - break; - case EAST: - case WEST: + } + case EAST, WEST -> { rh.setTexture(off, off, off, off, def, def); renderer.uvRotateEast = renderer.uvRotateWest = 1; renderer.uvRotateBottom = renderer.uvRotateTop = 1; renderer.setRenderBounds(0, 5 / 16.0, 5 / 16.0, 16 / 16.0, 11 / 16.0, 11 / 16.0); - break; - case NORTH: - case SOUTH: + } + case NORTH, SOUTH -> { rh.setTexture(off, off, def, def, off, off); renderer.uvRotateNorth = renderer.uvRotateSouth = 1; renderer.setRenderBounds(5 / 16.0, 5 / 16.0, 0, 11 / 16.0, 11 / 16.0, 16 / 16.0); - break; - default: + } + default -> {} } } diff --git a/src/main/java/appeng/parts/networking/PartCableSmart.java b/src/main/java/appeng/parts/networking/PartCableSmart.java index 8091c2cfb7c..7f916a36c2c 100644 --- a/src/main/java/appeng/parts/networking/PartCableSmart.java +++ b/src/main/java/appeng/parts/networking/PartCableSmart.java @@ -77,25 +77,13 @@ public void getBoxes(final IPartCollisionHelper bch) { for (final ForgeDirection of : this.getConnections()) { switch (of) { - case DOWN: - bch.addBox(5.0, 0.0, 5.0, 11.0, 5.0, 11.0); - break; - case EAST: - bch.addBox(11.0, 5.0, 5.0, 16.0, 11.0, 11.0); - break; - case NORTH: - bch.addBox(5.0, 5.0, 0.0, 11.0, 11.0, 5.0); - break; - case SOUTH: - bch.addBox(5.0, 5.0, 11.0, 11.0, 11.0, 16.0); - break; - case UP: - bch.addBox(5.0, 11.0, 5.0, 11.0, 16.0, 11.0); - break; - case WEST: - bch.addBox(0.0, 5.0, 5.0, 5.0, 11.0, 11.0); - break; - default: + case DOWN -> bch.addBox(5.0, 0.0, 5.0, 11.0, 5.0, 11.0); + case EAST -> bch.addBox(11.0, 5.0, 5.0, 16.0, 11.0, 11.0); + case NORTH -> bch.addBox(5.0, 5.0, 0.0, 11.0, 11.0, 5.0); + case SOUTH -> bch.addBox(5.0, 5.0, 11.0, 11.0, 11.0, 16.0); + case UP -> bch.addBox(5.0, 11.0, 5.0, 11.0, 16.0, 11.0); + case WEST -> bch.addBox(0.0, 5.0, 5.0, 5.0, 11.0, 11.0); + default -> {} } } } @@ -173,26 +161,15 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende final int len = bp.cableConnectionRenderTo(); if (len < 8) { switch (of) { - case DOWN: - rh.setBounds(6, len, 6, 10, 5, 10); - break; - case EAST: - rh.setBounds(11, 6, 6, 16 - len, 10, 10); - break; - case NORTH: - rh.setBounds(6, 6, len, 10, 10, 5); - break; - case SOUTH: - rh.setBounds(6, 6, 11, 10, 10, 16 - len); - break; - case UP: - rh.setBounds(6, 11, 6, 10, 16 - len, 10); - break; - case WEST: - rh.setBounds(len, 6, 6, 5, 10, 10); - break; - default: + case DOWN -> rh.setBounds(6, len, 6, 10, 5, 10); + case EAST -> rh.setBounds(11, 6, 6, 16 - len, 10, 10); + case NORTH -> rh.setBounds(6, 6, len, 10, 10, 5); + case SOUTH -> rh.setBounds(6, 6, 11, 10, 10, 16 - len); + case UP -> rh.setBounds(6, 11, 6, 10, 16 - len, 10); + case WEST -> rh.setBounds(len, 6, 6, 5, 10, 10); + default -> { continue; + } } rh.renderBlock(x, y, z, renderer); @@ -253,19 +230,15 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende final IIcon secondOffsetIcon = new OffsetIcon(secondTaughtIcon, 0, -12); switch (selectedSide) { - case DOWN: - case UP: + case DOWN, UP -> { renderer.setRenderBounds(5 / 16.0, 0, 5 / 16.0, 11 / 16.0, 16 / 16.0, 11 / 16.0); rh.setTexture(def, def, off, off, off, off); rh.renderBlockCurrentBounds(x, y, z, renderer); - renderer.uvRotateTop = 0; renderer.uvRotateBottom = 0; renderer.uvRotateSouth = 3; renderer.uvRotateEast = 3; - Tessellator.instance.setBrightness(15 << 20 | 15 << 4); - Tessellator.instance.setColorOpaque_I(this.getCableColor().blackVariant); rh.setTexture( firstTaughtIcon, @@ -275,7 +248,6 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende firstOffsetIcon, firstOffsetIcon); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); - Tessellator.instance.setColorOpaque_I(this.getCableColor().whiteVariant); rh.setTexture( secondTaughtIcon, @@ -285,9 +257,8 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende secondOffsetIcon, secondOffsetIcon); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); - break; - case EAST: - case WEST: + } + case EAST, WEST -> { rh.setTexture(off, off, off, off, def, def); renderer.uvRotateEast = 2; renderer.uvRotateWest = 1; @@ -295,25 +266,18 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende renderer.uvRotateTop = 1; renderer.uvRotateSouth = 0; renderer.uvRotateNorth = 0; - final AEBaseBlock blk = (AEBaseBlock) rh.getBlock(); final FlippableIcon ico = blk.getRendererInstance().getTexture(ForgeDirection.EAST); ico.setFlip(false, true); - renderer.setRenderBounds(0, 5 / 16.0, 5 / 16.0, 16 / 16.0, 11 / 16.0, 11 / 16.0); rh.renderBlockCurrentBounds(x, y, z, renderer); - Tessellator.instance.setBrightness(15 << 20 | 15 << 4); - FlippableIcon fpA = new FlippableIcon(firstTaughtIcon); FlippableIcon fpB = new FlippableIcon(secondTaughtIcon); - fpA = new FlippableIcon(firstTaughtIcon); fpB = new FlippableIcon(secondTaughtIcon); - fpA.setFlip(true, false); fpB.setFlip(true, false); - Tessellator.instance.setColorOpaque_I(this.getCableColor().blackVariant); rh.setTexture( firstOffsetIcon, @@ -323,7 +287,6 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende firstTaughtIcon, fpA); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); - Tessellator.instance.setColorOpaque_I(this.getCableColor().whiteVariant); rh.setTexture( secondOffsetIcon, @@ -333,9 +296,8 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende secondTaughtIcon, fpB); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); - break; - case NORTH: - case SOUTH: + } + case NORTH, SOUTH -> { rh.setTexture(off, off, def, def, off, off); renderer.uvRotateTop = 3; renderer.uvRotateBottom = 3; @@ -344,9 +306,7 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende renderer.uvRotateWest = 1; renderer.setRenderBounds(5 / 16.0, 5 / 16.0, 0, 11 / 16.0, 11 / 16.0, 16 / 16.0); rh.renderBlockCurrentBounds(x, y, z, renderer); - Tessellator.instance.setBrightness(15 << 20 | 15 << 4); - Tessellator.instance.setColorOpaque_I(this.getCableColor().blackVariant); rh.setTexture( firstOffsetIcon, @@ -356,7 +316,6 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende firstOffsetIcon, firstOffsetIcon); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); - Tessellator.instance.setColorOpaque_I(this.getCableColor().whiteVariant); rh.setTexture( secondOffsetIcon, @@ -366,9 +325,8 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende secondOffsetIcon, secondOffsetIcon); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); - break; - default: - break; + } + default -> {} } } diff --git a/src/main/java/appeng/parts/networking/PartDenseCable.java b/src/main/java/appeng/parts/networking/PartDenseCable.java index 7ea88c5a901..c851e2b7f3d 100644 --- a/src/main/java/appeng/parts/networking/PartDenseCable.java +++ b/src/main/java/appeng/parts/networking/PartDenseCable.java @@ -83,47 +83,23 @@ public void getBoxes(final IPartCollisionHelper bch) { for (final ForgeDirection of : this.getConnections()) { if (this.isDense(of)) { switch (of) { - case DOWN: - bch.addBox(min, 0.0, min, max, min, max); - break; - case EAST: - bch.addBox(max, min, min, 16.0, max, max); - break; - case NORTH: - bch.addBox(min, min, 0.0, max, max, min); - break; - case SOUTH: - bch.addBox(min, min, max, max, max, 16.0); - break; - case UP: - bch.addBox(min, max, min, max, 16.0, max); - break; - case WEST: - bch.addBox(0.0, min, min, min, max, max); - break; - default: + case DOWN -> bch.addBox(min, 0.0, min, max, min, max); + case EAST -> bch.addBox(max, min, min, 16.0, max, max); + case NORTH -> bch.addBox(min, min, 0.0, max, max, min); + case SOUTH -> bch.addBox(min, min, max, max, max, 16.0); + case UP -> bch.addBox(min, max, min, max, 16.0, max); + case WEST -> bch.addBox(0.0, min, min, min, max, max); + default -> {} } } else { switch (of) { - case DOWN: - bch.addBox(5.0, 0.0, 5.0, 11.0, 5.0, 11.0); - break; - case EAST: - bch.addBox(11.0, 5.0, 5.0, 16.0, 11.0, 11.0); - break; - case NORTH: - bch.addBox(5.0, 5.0, 0.0, 11.0, 11.0, 5.0); - break; - case SOUTH: - bch.addBox(5.0, 5.0, 11.0, 11.0, 11.0, 16.0); - break; - case UP: - bch.addBox(5.0, 11.0, 5.0, 11.0, 16.0, 11.0); - break; - case WEST: - bch.addBox(0.0, 5.0, 5.0, 5.0, 11.0, 11.0); - break; - default: + case DOWN -> bch.addBox(5.0, 0.0, 5.0, 11.0, 5.0, 11.0); + case EAST -> bch.addBox(11.0, 5.0, 5.0, 16.0, 11.0, 11.0); + case NORTH -> bch.addBox(5.0, 5.0, 0.0, 11.0, 11.0, 5.0); + case SOUTH -> bch.addBox(5.0, 5.0, 11.0, 11.0, 11.0, 16.0); + case UP -> bch.addBox(5.0, 11.0, 5.0, 11.0, 16.0, 11.0); + case WEST -> bch.addBox(0.0, 5.0, 5.0, 5.0, 11.0, 11.0); + default -> {} } } } @@ -231,29 +207,23 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende final IIcon secondOffset = new OffsetIcon(secondIcon, 0, -12); switch (selectedSide) { - case DOWN: - case UP: + case DOWN, UP -> { renderer.setRenderBounds(3 / 16.0, 0, 3 / 16.0, 13 / 16.0, 16 / 16.0, 13 / 16.0); rh.setTexture(def, def, off, off, off, off); rh.renderBlockCurrentBounds(x, y, z, renderer); - renderer.uvRotateTop = 0; renderer.uvRotateBottom = 0; renderer.uvRotateSouth = 3; renderer.uvRotateEast = 3; - Tessellator.instance.setBrightness(15 << 20 | 15 << 4); - Tessellator.instance.setColorOpaque_I(this.getCableColor().blackVariant); rh.setTexture(firstIcon, firstIcon, firstOffset, firstOffset, firstOffset, firstOffset); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); - Tessellator.instance.setColorOpaque_I(this.getCableColor().whiteVariant); rh.setTexture(secondIcon, secondIcon, secondOffset, secondOffset, secondOffset, secondOffset); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); - break; - case EAST: - case WEST: + } + case EAST, WEST -> { rh.setTexture(off, off, off, off, def, def); renderer.uvRotateEast = 2; renderer.uvRotateWest = 1; @@ -261,32 +231,24 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende renderer.uvRotateTop = 1; renderer.uvRotateSouth = 0; renderer.uvRotateNorth = 0; - final AEBaseBlock blk = (AEBaseBlock) rh.getBlock(); final FlippableIcon ico = blk.getRendererInstance().getTexture(ForgeDirection.EAST); ico.setFlip(false, true); - renderer.setRenderBounds(0, 3 / 16.0, 3 / 16.0, 16 / 16.0, 13 / 16.0, 13 / 16.0); rh.renderBlockCurrentBounds(x, y, z, renderer); - Tessellator.instance.setBrightness(15 << 20 | 15 << 4); - final FlippableIcon fpA = new FlippableIcon(firstIcon); final FlippableIcon fpB = new FlippableIcon(secondIcon); - fpA.setFlip(true, false); fpB.setFlip(true, false); - Tessellator.instance.setColorOpaque_I(this.getCableColor().blackVariant); rh.setTexture(firstOffset, firstOffset, firstOffset, firstOffset, firstIcon, fpA); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); - Tessellator.instance.setColorOpaque_I(this.getCableColor().whiteVariant); rh.setTexture(secondOffset, secondOffset, secondOffset, secondOffset, secondIcon, fpB); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); - break; - case NORTH: - case SOUTH: + } + case NORTH, SOUTH -> { rh.setTexture(off, off, def, def, off, off); renderer.uvRotateTop = 3; renderer.uvRotateBottom = 3; @@ -295,19 +257,15 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende renderer.uvRotateWest = 1; renderer.setRenderBounds(3 / 16.0, 3 / 16.0, 0, 13 / 16.0, 13 / 16.0, 16 / 16.0); rh.renderBlockCurrentBounds(x, y, z, renderer); - Tessellator.instance.setBrightness(15 << 20 | 15 << 4); - Tessellator.instance.setColorOpaque_I(this.getCableColor().blackVariant); rh.setTexture(firstOffset, firstOffset, firstIcon, firstIcon, firstOffset, firstOffset); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); - Tessellator.instance.setColorOpaque_I(this.getCableColor().whiteVariant); rh.setTexture(secondOffset, secondOffset, secondIcon, secondIcon, secondOffset, secondOffset); this.renderAllFaces((AEBaseBlock) rh.getBlock(), x, y, z, rh, renderer); - break; - default: - break; + } + default -> {} } } @@ -356,26 +314,15 @@ private void renderDenseConnection(final int x, final int y, final int z, final } switch (of) { - case DOWN: - rh.setBounds(4, 0, 4, 12, 5, 12); - break; - case EAST: - rh.setBounds(11, 4, 4, 16, 12, 12); - break; - case NORTH: - rh.setBounds(4, 4, 0, 12, 12, 5); - break; - case SOUTH: - rh.setBounds(4, 4, 11, 12, 12, 16); - break; - case UP: - rh.setBounds(4, 11, 4, 12, 16, 12); - break; - case WEST: - rh.setBounds(0, 4, 4, 5, 12, 12); - break; - default: + case DOWN -> rh.setBounds(4, 0, 4, 12, 5, 12); + case EAST -> rh.setBounds(11, 4, 4, 16, 12, 12); + case NORTH -> rh.setBounds(4, 4, 0, 12, 12, 5); + case SOUTH -> rh.setBounds(4, 4, 11, 12, 12, 16); + case UP -> rh.setBounds(4, 11, 4, 12, 16, 12); + case WEST -> rh.setBounds(0, 4, 4, 5, 12, 12); + default -> { return; + } } rh.renderBlock(x, y, z, renderer); @@ -415,39 +362,55 @@ private boolean isSmart(final ForgeDirection of) { protected IIcon getDenseTexture(final AEColor c) { switch (c) { - case Black: + case Black -> { return CableBusTextures.MEDense_Black.getIcon(); - case Blue: + } + case Blue -> { return CableBusTextures.MEDense_Blue.getIcon(); - case Brown: + } + case Brown -> { return CableBusTextures.MEDense_Brown.getIcon(); - case Cyan: + } + case Cyan -> { return CableBusTextures.MEDense_Cyan.getIcon(); - case Gray: + } + case Gray -> { return CableBusTextures.MEDense_Gray.getIcon(); - case Green: + } + case Green -> { return CableBusTextures.MEDense_Green.getIcon(); - case LightBlue: + } + case LightBlue -> { return CableBusTextures.MEDense_LightBlue.getIcon(); - case LightGray: + } + case LightGray -> { return CableBusTextures.MEDense_LightGrey.getIcon(); - case Lime: + } + case Lime -> { return CableBusTextures.MEDense_Lime.getIcon(); - case Magenta: + } + case Magenta -> { return CableBusTextures.MEDense_Magenta.getIcon(); - case Orange: + } + case Orange -> { return CableBusTextures.MEDense_Orange.getIcon(); - case Pink: + } + case Pink -> { return CableBusTextures.MEDense_Pink.getIcon(); - case Purple: + } + case Purple -> { return CableBusTextures.MEDense_Purple.getIcon(); - case Red: + } + case Red -> { return CableBusTextures.MEDense_Red.getIcon(); - case White: + } + case White -> { return CableBusTextures.MEDense_White.getIcon(); - case Yellow: + } + case Yellow -> { return CableBusTextures.MEDense_Yellow.getIcon(); - default: + } + default -> {} } return this.getItemStack().getIconIndex(); diff --git a/src/main/java/appeng/parts/networking/PartDenseCableCovered.java b/src/main/java/appeng/parts/networking/PartDenseCableCovered.java index 4d2de5dcd58..9fd626a96b5 100644 --- a/src/main/java/appeng/parts/networking/PartDenseCableCovered.java +++ b/src/main/java/appeng/parts/networking/PartDenseCableCovered.java @@ -81,47 +81,23 @@ public void getBoxes(final IPartCollisionHelper bch) { for (final ForgeDirection of : this.getConnections()) { if (this.isDense(of)) { switch (of) { - case DOWN: - bch.addBox(min, 0.0, min, max, min, max); - break; - case EAST: - bch.addBox(max, min, min, 16.0, max, max); - break; - case NORTH: - bch.addBox(min, min, 0.0, max, max, min); - break; - case SOUTH: - bch.addBox(min, min, max, max, max, 16.0); - break; - case UP: - bch.addBox(min, max, min, max, 16.0, max); - break; - case WEST: - bch.addBox(0.0, min, min, min, max, max); - break; - default: + case DOWN -> bch.addBox(min, 0.0, min, max, min, max); + case EAST -> bch.addBox(max, min, min, 16.0, max, max); + case NORTH -> bch.addBox(min, min, 0.0, max, max, min); + case SOUTH -> bch.addBox(min, min, max, max, max, 16.0); + case UP -> bch.addBox(min, max, min, max, 16.0, max); + case WEST -> bch.addBox(0.0, min, min, min, max, max); + default -> {} } } else { switch (of) { - case DOWN: - bch.addBox(5.0, 0.0, 5.0, 11.0, 5.0, 11.0); - break; - case EAST: - bch.addBox(11.0, 5.0, 5.0, 16.0, 11.0, 11.0); - break; - case NORTH: - bch.addBox(5.0, 5.0, 0.0, 11.0, 11.0, 5.0); - break; - case SOUTH: - bch.addBox(5.0, 5.0, 11.0, 11.0, 11.0, 16.0); - break; - case UP: - bch.addBox(5.0, 11.0, 5.0, 11.0, 16.0, 11.0); - break; - case WEST: - bch.addBox(0.0, 5.0, 5.0, 5.0, 11.0, 11.0); - break; - default: + case DOWN -> bch.addBox(5.0, 0.0, 5.0, 11.0, 5.0, 11.0); + case EAST -> bch.addBox(11.0, 5.0, 5.0, 16.0, 11.0, 11.0); + case NORTH -> bch.addBox(5.0, 5.0, 0.0, 11.0, 11.0, 5.0); + case SOUTH -> bch.addBox(5.0, 5.0, 11.0, 11.0, 11.0, 16.0); + case UP -> bch.addBox(5.0, 11.0, 5.0, 11.0, 16.0, 11.0); + case WEST -> bch.addBox(0.0, 5.0, 5.0, 5.0, 11.0, 11.0); + default -> {} } } } @@ -208,14 +184,12 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende final IIcon off = new OffsetIcon(def, 0, -12); switch (selectedSide) { - case DOWN: - case UP: + case DOWN, UP -> { renderer.setRenderBounds(3 / 16.0, 0, 3 / 16.0, 13 / 16.0, 16 / 16.0, 13 / 16.0); rh.setTexture(def, def, off, off, off, off); rh.renderBlockCurrentBounds(x, y, z, renderer); - break; - case EAST: - case WEST: + } + case EAST, WEST -> { rh.setTexture(off, off, off, off, def, def); renderer.uvRotateEast = 2; renderer.uvRotateWest = 1; @@ -223,16 +197,13 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende renderer.uvRotateTop = 1; renderer.uvRotateSouth = 0; renderer.uvRotateNorth = 0; - final AEBaseBlock blk = (AEBaseBlock) rh.getBlock(); final FlippableIcon ico = blk.getRendererInstance().getTexture(ForgeDirection.EAST); ico.setFlip(false, true); - renderer.setRenderBounds(0, 3 / 16.0, 3 / 16.0, 16 / 16.0, 13 / 16.0, 13 / 16.0); rh.renderBlockCurrentBounds(x, y, z, renderer); - break; - case NORTH: - case SOUTH: + } + case NORTH, SOUTH -> { rh.setTexture(off, off, def, def, off, off); renderer.uvRotateTop = 3; renderer.uvRotateBottom = 3; @@ -241,9 +212,8 @@ public void renderStatic(final int x, final int y, final int z, final IPartRende renderer.uvRotateWest = 1; renderer.setRenderBounds(3 / 16.0, 3 / 16.0, 0, 13 / 16.0, 13 / 16.0, 16 / 16.0); rh.renderBlockCurrentBounds(x, y, z, renderer); - break; - default: - break; + } + default -> {} } } @@ -270,26 +240,15 @@ private void renderDenseCoveredConnection(final int x, final int y, final int z, } switch (of) { - case DOWN: - rh.setBounds(4, 0, 4, 12, 5, 12); - break; - case EAST: - rh.setBounds(11, 4, 4, 16, 12, 12); - break; - case NORTH: - rh.setBounds(4, 4, 0, 12, 12, 5); - break; - case SOUTH: - rh.setBounds(4, 4, 11, 12, 12, 16); - break; - case UP: - rh.setBounds(4, 11, 4, 12, 16, 12); - break; - case WEST: - rh.setBounds(0, 4, 4, 5, 12, 12); - break; - default: + case DOWN -> rh.setBounds(4, 0, 4, 12, 5, 12); + case EAST -> rh.setBounds(11, 4, 4, 16, 12, 12); + case NORTH -> rh.setBounds(4, 4, 0, 12, 12, 5); + case SOUTH -> rh.setBounds(4, 4, 11, 12, 12, 16); + case UP -> rh.setBounds(4, 11, 4, 12, 16, 12); + case WEST -> rh.setBounds(0, 4, 4, 5, 12, 12); + default -> { return; + } } rh.renderBlock(x, y, z, renderer); @@ -298,39 +257,55 @@ private void renderDenseCoveredConnection(final int x, final int y, final int z, protected IIcon getDenseCoveredTexture(final AEColor c) { switch (c) { - case Black: + case Black -> { return CableBusTextures.MEDenseCovered_Black.getIcon(); - case Blue: + } + case Blue -> { return CableBusTextures.MEDenseCovered_Blue.getIcon(); - case Brown: + } + case Brown -> { return CableBusTextures.MEDenseCovered_Brown.getIcon(); - case Cyan: + } + case Cyan -> { return CableBusTextures.MEDenseCovered_Cyan.getIcon(); - case Gray: + } + case Gray -> { return CableBusTextures.MEDenseCovered_Gray.getIcon(); - case Green: + } + case Green -> { return CableBusTextures.MEDenseCovered_Green.getIcon(); - case LightBlue: + } + case LightBlue -> { return CableBusTextures.MEDenseCovered_LightBlue.getIcon(); - case LightGray: + } + case LightGray -> { return CableBusTextures.MEDenseCovered_LightGrey.getIcon(); - case Lime: + } + case Lime -> { return CableBusTextures.MEDenseCovered_Lime.getIcon(); - case Magenta: + } + case Magenta -> { return CableBusTextures.MEDenseCovered_Magenta.getIcon(); - case Orange: + } + case Orange -> { return CableBusTextures.MEDenseCovered_Orange.getIcon(); - case Pink: + } + case Pink -> { return CableBusTextures.MEDenseCovered_Pink.getIcon(); - case Purple: + } + case Purple -> { return CableBusTextures.MEDenseCovered_Purple.getIcon(); - case Red: + } + case Red -> { return CableBusTextures.MEDenseCovered_Red.getIcon(); - case White: + } + case White -> { return CableBusTextures.MEDenseCovered_White.getIcon(); - case Yellow: + } + case Yellow -> { return CableBusTextures.MEDenseCovered_Yellow.getIcon(); - default: + } + default -> {} } return this.getItemStack().getIconIndex(); diff --git a/src/main/java/appeng/parts/networking/PartUltraDenseCableCovered.java b/src/main/java/appeng/parts/networking/PartUltraDenseCableCovered.java index 822aef1c08a..2f5366894c9 100644 --- a/src/main/java/appeng/parts/networking/PartUltraDenseCableCovered.java +++ b/src/main/java/appeng/parts/networking/PartUltraDenseCableCovered.java @@ -36,39 +36,55 @@ public IIcon getTexture(final AEColor c) { @Override protected IIcon getDenseCoveredTexture(final AEColor c) { switch (c) { - case Black: + case Black -> { return CableBusTextures.MEUltraDenseCovered_Black.getIcon(); - case Blue: + } + case Blue -> { return CableBusTextures.MEUltraDenseCovered_Blue.getIcon(); - case Brown: + } + case Brown -> { return CableBusTextures.MEUltraDenseCovered_Brown.getIcon(); - case Cyan: + } + case Cyan -> { return CableBusTextures.MEUltraDenseCovered_Cyan.getIcon(); - case Gray: + } + case Gray -> { return CableBusTextures.MEUltraDenseCovered_Gray.getIcon(); - case Green: + } + case Green -> { return CableBusTextures.MEUltraDenseCovered_Green.getIcon(); - case LightBlue: + } + case LightBlue -> { return CableBusTextures.MEUltraDenseCovered_LightBlue.getIcon(); - case LightGray: + } + case LightGray -> { return CableBusTextures.MEUltraDenseCovered_LightGrey.getIcon(); - case Lime: + } + case Lime -> { return CableBusTextures.MEUltraDenseCovered_Lime.getIcon(); - case Magenta: + } + case Magenta -> { return CableBusTextures.MEUltraDenseCovered_Magenta.getIcon(); - case Orange: + } + case Orange -> { return CableBusTextures.MEUltraDenseCovered_Orange.getIcon(); - case Pink: + } + case Pink -> { return CableBusTextures.MEUltraDenseCovered_Pink.getIcon(); - case Purple: + } + case Purple -> { return CableBusTextures.MEUltraDenseCovered_Purple.getIcon(); - case Red: + } + case Red -> { return CableBusTextures.MEUltraDenseCovered_Red.getIcon(); - case White: + } + case White -> { return CableBusTextures.MEUltraDenseCovered_White.getIcon(); - case Yellow: + } + case Yellow -> { return CableBusTextures.MEUltraDenseCovered_Yellow.getIcon(); - default: + } + default -> {} } return this.getItemStack().getIconIndex(); diff --git a/src/main/java/appeng/parts/networking/PartUltraDenseCableSmart.java b/src/main/java/appeng/parts/networking/PartUltraDenseCableSmart.java index 19096ae4ec8..aaff4beb004 100644 --- a/src/main/java/appeng/parts/networking/PartUltraDenseCableSmart.java +++ b/src/main/java/appeng/parts/networking/PartUltraDenseCableSmart.java @@ -36,39 +36,55 @@ public IIcon getTexture(final AEColor c) { @Override protected IIcon getDenseTexture(final AEColor c) { switch (c) { - case Black: + case Black -> { return CableBusTextures.MEUltraDense_Black.getIcon(); - case Blue: + } + case Blue -> { return CableBusTextures.MEUltraDense_Blue.getIcon(); - case Brown: + } + case Brown -> { return CableBusTextures.MEUltraDense_Brown.getIcon(); - case Cyan: + } + case Cyan -> { return CableBusTextures.MEUltraDense_Cyan.getIcon(); - case Gray: + } + case Gray -> { return CableBusTextures.MEUltraDense_Gray.getIcon(); - case Green: + } + case Green -> { return CableBusTextures.MEUltraDense_Green.getIcon(); - case LightBlue: + } + case LightBlue -> { return CableBusTextures.MEUltraDense_LightBlue.getIcon(); - case LightGray: + } + case LightGray -> { return CableBusTextures.MEUltraDense_LightGrey.getIcon(); - case Lime: + } + case Lime -> { return CableBusTextures.MEUltraDense_Lime.getIcon(); - case Magenta: + } + case Magenta -> { return CableBusTextures.MEUltraDense_Magenta.getIcon(); - case Orange: + } + case Orange -> { return CableBusTextures.MEUltraDense_Orange.getIcon(); - case Pink: + } + case Pink -> { return CableBusTextures.MEUltraDense_Pink.getIcon(); - case Purple: + } + case Purple -> { return CableBusTextures.MEUltraDense_Purple.getIcon(); - case Red: + } + case Red -> { return CableBusTextures.MEUltraDense_Red.getIcon(); - case White: + } + case White -> { return CableBusTextures.MEUltraDense_White.getIcon(); - case Yellow: + } + case Yellow -> { return CableBusTextures.MEUltraDense_Yellow.getIcon(); - default: + } + default -> {} } return this.getItemStack().getIconIndex(); diff --git a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java index df665ed99c3..f1909e16428 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java +++ b/src/main/java/appeng/parts/p2p/PartP2PIC2Power.java @@ -133,7 +133,7 @@ public double injectEnergy(final ForgeDirection directionFrom, final double amou return amount; } - final LinkedList options = new LinkedList(); + final LinkedList options = new LinkedList<>(); for (final PartP2PIC2Power o : outs) { if (o.OutputEnergyA <= 0.01) { options.add(o); diff --git a/src/main/java/appeng/parts/p2p/PartP2PItems.java b/src/main/java/appeng/parts/p2p/PartP2PItems.java index 9d6515deef1..d7fa1fb4fb8 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PItems.java +++ b/src/main/java/appeng/parts/p2p/PartP2PItems.java @@ -53,7 +53,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeConnection, ISidedInventory, IGridTickable { - private final LinkedList which = new LinkedList(); + private final LinkedList which = new LinkedList<>(); private int oldSize = 0; private boolean requested; private IInventory cachedInv; @@ -78,7 +78,7 @@ private IInventory getDestination() { return this.cachedInv; } - final List outs = new LinkedList(); + final List outs = new LinkedList<>(); final TunnelCollection itemTunnels; try { diff --git a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java index 6ce76cdd1c2..cce79220bfa 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PRFPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PRFPower.java @@ -32,7 +32,7 @@ @InterfaceList(value = { @Interface(iface = "cofh.api.energy.IEnergyReceiver", iname = IntegrationType.RF) }) public final class PartP2PRFPower extends PartP2PTunnel implements IEnergyReceiver { - private static final ThreadLocal> THREAD_STACK = new ThreadLocal>(); + private static final ThreadLocal> THREAD_STACK = new ThreadLocal<>(); /** * Default element based on the null element pattern */ @@ -126,7 +126,7 @@ private Stack getDepth() { Stack s = THREAD_STACK.get(); if (s == null) { - THREAD_STACK.set(s = new Stack()); + THREAD_STACK.set(s = new Stack<>()); } return s; diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java index 82e2512d75e..f84802583cf 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java @@ -91,7 +91,7 @@ public TunnelCollection getOutputs() throws GridAccessException { if (this.getProxy().isActive()) { return (TunnelCollection) this.getProxy().getP2P().getOutputs(this.getFrequency(), this.getClass()); } - return new TunnelCollection(new ArrayList(), this.getClass()); + return new TunnelCollection<>(new ArrayList<>(), this.getClass()); } @Override @@ -216,10 +216,9 @@ public boolean onPartActivate(final EntityPlayer player, final Vec3 pos) { // AELog.info( "ID:" + id.toString() + " : " + is.getItemDamage() ); final TunnelType tt = AEApi.instance().registries().p2pTunnel().getTunnelTypeByItem(is); - if (is != null && is.getItem() instanceof IMemoryCard) { + if (is != null && is.getItem() instanceof IMemoryCard mc) { if (ForgeEventFactory.onItemUseStart(player, is, 1) <= 0) return false; - final IMemoryCard mc = (IMemoryCard) is.getItem(); final NBTTagCompound data = mc.getData(is); final ItemStack newType = ItemStack.loadItemStackFromNBT(data); @@ -233,8 +232,7 @@ public boolean onPartActivate(final EntityPlayer player, final Vec3 pos) { final ForgeDirection dir = this.getHost().addPart(newType, this.getSide(), player); final IPart newBus = this.getHost().getPart(dir); - if (newBus instanceof PartP2PTunnel) { - final PartP2PTunnel newTunnel = (PartP2PTunnel) newBus; + if (newBus instanceof PartP2PTunnelnewTunnel) { newTunnel.setOutput(true); try { @@ -264,74 +262,62 @@ public boolean onPartActivate(final EntityPlayer player, final Vec3 pos) { final IParts parts = AEApi.instance().definitions().parts(); switch (tt) { - case LIGHT: + case LIGHT -> { for (final ItemStack stack : parts.p2PTunnelLight().maybeStack(1).asSet()) { newType = stack; } - break; - - case RF_POWER: + } + case RF_POWER -> { for (final ItemStack stack : parts.p2PTunnelRF().maybeStack(1).asSet()) { newType = stack; } - break; - - case FLUID: + } + case FLUID -> { for (final ItemStack stack : parts.p2PTunnelLiquids().maybeStack(1).asSet()) { newType = stack; } - break; - - case IC2_POWER: + } + case IC2_POWER -> { for (final ItemStack stack : parts.p2PTunnelEU().maybeStack(1).asSet()) { newType = stack; } - break; - - case ITEM: + } + case ITEM -> { for (final ItemStack stack : parts.p2PTunnelItems().maybeStack(1).asSet()) { newType = stack; } - break; - - case ME: + } + case ME -> { for (final ItemStack stack : parts.p2PTunnelME().maybeStack(1).asSet()) { newType = stack; } - break; - - case REDSTONE: + } + case REDSTONE -> { for (final ItemStack stack : parts.p2PTunnelRedstone().maybeStack(1).asSet()) { newType = stack; } - break; - - case COMPUTER_MESSAGE: + } + case COMPUTER_MESSAGE -> { for (final ItemStack stack : parts.p2PTunnelOpenComputers().maybeStack(1).asSet()) { newType = stack; } - break; - - case PRESSURE: + } + case PRESSURE -> { for (final ItemStack stack : parts.p2PTunnelPneumaticCraft().maybeStack(1).asSet()) { newType = stack; } - break; - - case GT_POWER: + } + case GT_POWER -> { for (final ItemStack stack : parts.p2PTunnelGregtech().maybeStack(1).asSet()) { newType = stack; } - break; - - case ME_INTERFACE: + } + case ME_INTERFACE -> { for (final ItemStack stack : parts.p2PTunnelMEInterface().maybeStack(1).asSet()) { newType = stack; } - break; - - default: - break; + } + default -> {} } if (newType != null && !Platform.isSameItem(newType, this.getItemStack())) { @@ -343,8 +329,7 @@ public boolean onPartActivate(final EntityPlayer player, final Vec3 pos) { final ForgeDirection dir = this.getHost().addPart(newType, this.getSide(), player); final IPart newBus = this.getHost().getPart(dir); - if (newBus instanceof PartP2PTunnel) { - final PartP2PTunnel newTunnel = (PartP2PTunnel) newBus; + if (newBus instanceof PartP2PTunnelnewTunnel) { newTunnel.setOutput(oldOutput); newTunnel.onTunnelNetworkChange(); @@ -402,10 +387,9 @@ private void printConnectionInfo(EntityPlayer player) { @Override public boolean onPartShiftActivate(final EntityPlayer player, final Vec3 pos) { final ItemStack is = player.inventory.getCurrentItem(); - if (is != null && is.getItem() instanceof IMemoryCard) { + if (is != null && is.getItem() instanceof IMemoryCard mc) { if (ForgeEventFactory.onItemUseStart(player, is, 1) <= 0) return false; - final IMemoryCard mc = (IMemoryCard) is.getItem(); final NBTTagCompound data = new NBTTagCompound(); long newFreq = this.getFrequency(); diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java index c127de04367..28590033247 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java @@ -166,7 +166,7 @@ public void updateConnections(final Connections connections) { } } - final LinkedList newSides = new LinkedList(); + final LinkedList newSides = new LinkedList<>(); try { for (final PartP2PTunnelME me : this.getOutputs()) { if (me.getProxy().isActive() && connections.getConnections().get(me.getGridNode()) == null) { diff --git a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java index e1cd37c8e4f..eb4e5be333f 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java @@ -266,34 +266,30 @@ private void tesrRenderScreen(final Tessellator tess, final IAEItemStack ais) { GL11.glTranslated(d.offsetX * 0.77, d.offsetY * 0.77, d.offsetZ * 0.77); switch (d) { - case UP: + case UP -> { GL11.glScalef(1.0f, -1.0f, 1.0f); GL11.glRotatef(90.0f, 1.0f, 0.0f, 0.0f); GL11.glRotatef(this.getSpin() * 90.0F, 0, 0, 1); - break; - case DOWN: + } + case DOWN -> { GL11.glScalef(1.0f, -1.0f, 1.0f); GL11.glRotatef(-90.0f, 1.0f, 0.0f, 0.0f); GL11.glRotatef(this.getSpin() * -90.0F, 0, 0, 1); - break; - case EAST: + } + case EAST -> { GL11.glScalef(-1.0f, -1.0f, -1.0f); GL11.glRotatef(-90.0f, 0.0f, 1.0f, 0.0f); - break; - case WEST: + } + case WEST -> { GL11.glScalef(-1.0f, -1.0f, -1.0f); GL11.glRotatef(90.0f, 0.0f, 1.0f, 0.0f); - break; - case NORTH: - GL11.glScalef(-1.0f, -1.0f, -1.0f); - break; - case SOUTH: + } + case NORTH -> GL11.glScalef(-1.0f, -1.0f, -1.0f); + case SOUTH -> { GL11.glScalef(-1.0f, -1.0f, -1.0f); GL11.glRotatef(180.0f, 0.0f, 1.0f, 0.0f); - break; - - default: - break; + } + default -> {} } try { diff --git a/src/main/java/appeng/parts/reporting/AbstractPartReporting.java b/src/main/java/appeng/parts/reporting/AbstractPartReporting.java index a95ee124b83..1661e7a873e 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartReporting.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartReporting.java @@ -162,18 +162,10 @@ public boolean onPartActivate(final EntityPlayer player, final Vec3 pos) { } switch (this.getSpin()) { - case 0: - this.spin = 1; - break; - case 1: - this.spin = 3; - break; - case 2: - this.spin = 0; - break; - case 3: - this.spin = 2; - break; + case 0 -> this.spin = 1; + case 1 -> this.spin = 3; + case 2 -> this.spin = 0; + case 3 -> this.spin = 2; } this.getHost().markForUpdate(); diff --git a/src/main/java/appeng/parts/reporting/PartPatternTerminal.java b/src/main/java/appeng/parts/reporting/PartPatternTerminal.java index 045daf45ff6..e9cb250844e 100644 --- a/src/main/java/appeng/parts/reporting/PartPatternTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartPatternTerminal.java @@ -106,8 +106,7 @@ public void onChangeInventory(final IInventory inv, final int slot, final InvOpe final ItemStack stack = this.pattern.getStackInSlot(1); - if (stack != null && stack.getItem() instanceof ICraftingPatternItem) { - final ICraftingPatternItem pattern = (ICraftingPatternItem) stack.getItem(); + if (stack != null && stack.getItem() instanceof ICraftingPatternItem pattern) { final NBTTagCompound encodedValue = stack.getTagCompound(); if (encodedValue != null) { diff --git a/src/main/java/appeng/parts/reporting/PartPatternTerminalEx.java b/src/main/java/appeng/parts/reporting/PartPatternTerminalEx.java index aff299d22e2..106b83a50ea 100644 --- a/src/main/java/appeng/parts/reporting/PartPatternTerminalEx.java +++ b/src/main/java/appeng/parts/reporting/PartPatternTerminalEx.java @@ -100,8 +100,7 @@ public void onChangeInventory(final IInventory inv, final int slot, final InvOpe if (inv == this.pattern && slot == 1) { final ItemStack stack = this.pattern.getStackInSlot(1); - if (stack != null && stack.getItem() instanceof ICraftingPatternItem) { - final ICraftingPatternItem pattern = (ICraftingPatternItem) stack.getItem(); + if (stack != null && stack.getItem() instanceof ICraftingPatternItem pattern) { final NBTTagCompound encodedValue = stack.getTagCompound(); if (encodedValue != null) { @@ -122,14 +121,14 @@ public void onChangeInventory(final IInventory inv, final int slot, final InvOpe outItems = details.getOutputs(); } - for (int x = 0; x < inItems.length; x++) { - if (inItems[x] != null) { + for (IAEItemStack inItem : inItems) { + if (inItem != null) { inputsCount++; } } - for (int x = 0; x < outItems.length; x++) { - if (outItems[x] != null) { + for (IAEItemStack outItem : outItems) { + if (outItem != null) { outputCount++; } } diff --git a/src/main/java/appeng/recipes/GroupIngredient.java b/src/main/java/appeng/recipes/GroupIngredient.java index c5ae6c74215..a70a1b7af8a 100644 --- a/src/main/java/appeng/recipes/GroupIngredient.java +++ b/src/main/java/appeng/recipes/GroupIngredient.java @@ -70,7 +70,7 @@ public ItemStack[] getItemStackSet() throws RegistrationError, MissingIngredient return new ItemStack[0]; } - final List out = new LinkedList(); + final List out = new LinkedList<>(); this.isInside = true; try { for (final IIngredient i : this.ingredients) { @@ -92,7 +92,7 @@ public ItemStack[] getItemStackSet() throws RegistrationError, MissingIngredient is.stackSize = this.qty; } - return out.toArray(new ItemStack[out.size()]); + return out.toArray(new ItemStack[0]); } @Override diff --git a/src/main/java/appeng/recipes/Ingredient.java b/src/main/java/appeng/recipes/Ingredient.java index 5b8b259b694..dba1e181ac4 100644 --- a/src/main/java/appeng/recipes/Ingredient.java +++ b/src/main/java/appeng/recipes/Ingredient.java @@ -73,8 +73,7 @@ public Ingredient(final RecipeHandler handler, final String input, final int qty } else { try { final Object ro = AEApi.instance().registries().recipes().resolveItem(this.nameSpace, tmpName); - if (ro instanceof ResolverResult) { - final ResolverResult rr = (ResolverResult) ro; + if (ro instanceof ResolverResult rr) { tmpName = rr.itemName; sel = rr.damageValue; this.nbt = rr.compound; @@ -168,7 +167,7 @@ public ItemStack[] getItemStackSet() throws RegistrationError, MissingIngredient if (this.nameSpace.equalsIgnoreCase("oreDictionary")) { final List ores = OreDictionary.getOres(this.itemName); - final ItemStack[] set = ores.toArray(new ItemStack[ores.size()]); + final ItemStack[] set = ores.toArray(new ItemStack[0]); // clone and set qty. for (int x = 0; x < set.length; x++) { diff --git a/src/main/java/appeng/recipes/IngredientSet.java b/src/main/java/appeng/recipes/IngredientSet.java index 95ca0170457..6ad1fe7c62e 100644 --- a/src/main/java/appeng/recipes/IngredientSet.java +++ b/src/main/java/appeng/recipes/IngredientSet.java @@ -57,8 +57,7 @@ public ItemStack[] getItemStackSet() throws RegistrationError, MissingIngredient return new ItemStack[0]; } - final List out = new LinkedList(); - out.addAll(this.items); + final List out = new LinkedList<>(this.items); if (out.isEmpty()) { throw new MissingIngredientError(this.toString() + " - group could not be resolved to any items."); @@ -68,7 +67,7 @@ public ItemStack[] getItemStackSet() throws RegistrationError, MissingIngredient is.stackSize = this.qty; } - return out.toArray(new ItemStack[out.size()]); + return out.toArray(new ItemStack[0]); } @Override diff --git a/src/main/java/appeng/recipes/RecipeData.java b/src/main/java/appeng/recipes/RecipeData.java index 8da53d9d0cd..67dd7681788 100644 --- a/src/main/java/appeng/recipes/RecipeData.java +++ b/src/main/java/appeng/recipes/RecipeData.java @@ -16,11 +16,11 @@ public class RecipeData { - final Map aliases = new HashMap(); - final Map groups = new HashMap(); + final Map aliases = new HashMap<>(); + final Map groups = new HashMap<>(); - final List handlers = new LinkedList(); - final Set knownItem = new HashSet(); + final List handlers = new LinkedList<>(); + final Set knownItem = new HashSet<>(); boolean crash = true; boolean exceptions = true; boolean errorOnMissing = true; diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index 923287f8eb9..6db61278f0b 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -11,7 +11,6 @@ package appeng.recipes; import java.io.BufferedReader; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.util.*; @@ -62,7 +61,7 @@ public class RecipeHandler implements IRecipeHandler { private final RecipeData data; - private final List tokens = new LinkedList(); + private final List tokens = new LinkedList<>(); public RecipeHandler() { this.data = new RecipeData(); @@ -126,43 +125,27 @@ private String getName(final ItemStack is) throws RecipeError { } } else if (maybeSkyStoneItem.isPresent() && is.getItem() == maybeSkyStoneItem.get()) { switch (is.getItemDamage()) { - case 1: - realName += ".Block"; - break; - case 2: - realName += ".Brick"; - break; - case 3: - realName += ".SmallBrick"; - break; - default: + case 1 -> realName += ".Block"; + case 2 -> realName += ".Brick"; + case 3 -> realName += ".SmallBrick"; + default -> {} } } else if (maybeCStorageItem.isPresent() && is.getItem() == maybeCStorageItem.get()) { switch (is.getItemDamage()) { - case 1: - realName += "4k"; - break; - case 2: - realName += "16k"; - break; - case 3: - realName += "64k"; - break; - default: + case 1 -> realName += "4k"; + case 2 -> realName += "16k"; + case 3 -> realName += "64k"; + default -> {} } } else if (maybeCUnitItem.isPresent() && is.getItem() == maybeCUnitItem.get()) { switch (is.getItemDamage()) { - case 1: - realName = realName.replace("Unit", "Accelerator"); - break; - default: + case 1 -> realName = realName.replace("Unit", "Accelerator"); + default -> {} } } else if (maybeSkyChestItem.isPresent() && is.getItem() == maybeSkyChestItem.get()) { switch (is.getItemDamage()) { - case 1: - realName += ".Block"; - break; - default: + case 1 -> realName += ".Block"; + default -> {} } } else if (is.getItem() instanceof ItemMultiMaterial) { realName = realName.replace("ItemMultiMaterial", "ItemMaterial"); @@ -226,11 +209,8 @@ public void parseRecipes(final IRecipeLoader loader, final String path) { } } else if (inQuote) { switch (c) { - case '"': - inQuote = !inQuote; - break; - default: - token += c; + case '"' -> inQuote = !inQuote; + default -> token += c; } } else { switch (c) { @@ -295,19 +275,14 @@ public void injectRecipes() { throw new IllegalStateException("Recipes must now be loaded in Init."); } - final Map processed = new HashMap(); + final Map processed = new HashMap<>(); try { for (final ICraftHandler ch : this.data.handlers) { try { ch.register(); final Class clz = ch.getClass(); - final Integer i = processed.get(clz); - if (i == null) { - processed.put(clz, 1); - } else { - processed.put(clz, i + 1); - } + processed.merge(clz, 1, Integer::sum); } catch (final RegistrationError e) { AELog.warn("Unable to register a recipe: " + e.getMessage()); if (this.data.exceptions) { @@ -359,13 +334,8 @@ public void injectRecipes() { combined.putAll(realName, recipes); } } - } catch (final RecipeError ignored) { - - } catch (final MissedIngredientSet ignored) { - - } catch (final RegistrationError ignored) { - - } catch (final MissingIngredientError ignored) { + } catch (final RecipeError | MissingIngredientError | RegistrationError + | MissedIngredientSet ignored) { } } @@ -384,8 +354,6 @@ public void injectRecipes() { } out.close(); - } catch (final FileNotFoundException e1) { - AELog.debug(e1); } catch (final IOException e1) { AELog.debug(e1); } @@ -393,7 +361,7 @@ public void injectRecipes() { } private List findRecipe(final ItemStack output) { - final List out = new LinkedList(); + final List out = new LinkedList<>(); for (final ICraftHandler ch : this.data.handlers) { try { @@ -424,50 +392,55 @@ private void processTokens(final IRecipeLoader loader, final String file, final if (split != -1) { final String operation = this.tokens.remove(0).toLowerCase(Locale.ENGLISH); - if (operation.equals("alias")) { - if (this.tokens.size() == 3 && this.tokens.indexOf("->") == 1) { - this.data.aliases.put(this.tokens.get(0), this.tokens.get(2)); - } else { - throw new RecipeError("Alias must have exactly 1 input and 1 output."); + switch (operation) { + case "alias" -> { + if (this.tokens.size() == 3 && this.tokens.indexOf("->") == 1) { + this.data.aliases.put(this.tokens.get(0), this.tokens.get(2)); + } else { + throw new RecipeError("Alias must have exactly 1 input and 1 output."); + } } - } else if (operation.equals("group")) { - final List pre = this.tokens.subList(0, split - 1); - final List post = this.tokens.subList(split, this.tokens.size()); + case "group" -> { + final List pre = this.tokens.subList(0, split - 1); + final List post = this.tokens.subList(split, this.tokens.size()); - final List> inputs = this.parseLines(pre); + final List> inputs = this.parseLines(pre); - if (inputs.size() == 1 && inputs.get(0).size() > 0 && post.size() == 1) { - this.data.groups.put(post.get(0), new GroupIngredient(post.get(0), inputs.get(0), 1)); - } else { - throw new RecipeError("Group must have exactly 1 output, and 1 or more inputs."); + if (inputs.size() == 1 && inputs.get(0).size() > 0 && post.size() == 1) { + this.data.groups.put(post.get(0), new GroupIngredient(post.get(0), inputs.get(0), 1)); + } else { + throw new RecipeError("Group must have exactly 1 output, and 1 or more inputs."); + } } - } else if (operation.equals("ore")) { - final List pre = this.tokens.subList(0, split - 1); - final List post = this.tokens.subList(split, this.tokens.size()); + case "ore" -> { + final List pre = this.tokens.subList(0, split - 1); + final List post = this.tokens.subList(split, this.tokens.size()); - final List> inputs = this.parseLines(pre); + final List> inputs = this.parseLines(pre); - if (inputs.size() == 1 && inputs.get(0).size() > 0 && post.size() == 1) { - final ICraftHandler ch = new OreRegistration(inputs.get(0), post.get(0)); - this.addCrafting(ch); - } else { - throw new RecipeError( - "Group must have exactly 1 output, and 1 or more inputs in a single row."); + if (inputs.size() == 1 && inputs.get(0).size() > 0 && post.size() == 1) { + final ICraftHandler ch = new OreRegistration(inputs.get(0), post.get(0)); + this.addCrafting(ch); + } else { + throw new RecipeError( + "Group must have exactly 1 output, and 1 or more inputs in a single row."); + } } - } else { - final List pre = this.tokens.subList(0, split - 1); - final List post = this.tokens.subList(split, this.tokens.size()); + default -> { + final List pre = this.tokens.subList(0, split - 1); + final List post = this.tokens.subList(split, this.tokens.size()); - final List> inputs = this.parseLines(pre); - final List> outputs = this.parseLines(post); + final List> inputs = this.parseLines(pre); + final List> outputs = this.parseLines(post); - final ICraftHandler ch = cr.getCraftHandlerFor(operation); + final ICraftHandler ch = cr.getCraftHandlerFor(operation); - if (ch != null) { - ch.setup(inputs, outputs); - this.addCrafting(ch); - } else { - throw new RecipeError("Invalid crafting type: " + operation); + if (ch != null) { + ch.setup(inputs, outputs); + this.addCrafting(ch); + } else { + throw new RecipeError("Invalid crafting type: " + operation); + } } } } else { @@ -522,8 +495,8 @@ private void processTokens(final IRecipeLoader loader, final String file, final } private List> parseLines(final Iterable subList) throws RecipeError { - final List> out = new LinkedList>(); - List cList = new LinkedList(); + final List> out = new LinkedList<>(); + List cList = new LinkedList<>(); boolean hasQty = false; int qty = 1; @@ -536,7 +509,7 @@ private List> parseLines(final Iterable subList) throw if (!cList.isEmpty()) { out.add(cList); } - cList = new LinkedList(); + cList = new LinkedList<>(); } else { if (this.isNumber(v)) { if (hasQty) { diff --git a/src/main/java/appeng/recipes/game/ShapedRecipe.java b/src/main/java/appeng/recipes/game/ShapedRecipe.java index cd1ed03b5fe..f77ac30adb6 100644 --- a/src/main/java/appeng/recipes/game/ShapedRecipe.java +++ b/src/main/java/appeng/recipes/game/ShapedRecipe.java @@ -52,8 +52,7 @@ public ShapedRecipe(final ItemStack result, Object... recipe) { } } - if (recipe[idx] instanceof String[]) { - final String[] parts = ((String[]) recipe[idx]); + if (recipe[idx] instanceof String[]parts) { idx++; for (final String s : parts) { @@ -63,8 +62,7 @@ public ShapedRecipe(final ItemStack result, Object... recipe) { this.height = parts.length; } else { - while (recipe[idx] instanceof String) { - final String s = (String) recipe[idx]; + while (recipe[idx] instanceof String s) { idx++; shape.append(s); this.width = s.length(); @@ -81,7 +79,7 @@ public ShapedRecipe(final ItemStack result, Object... recipe) { throw new IllegalStateException(ret.toString()); } - final Map itemMap = new HashMap(); + final Map itemMap = new HashMap<>(); for (; idx < recipe.length; idx += 2) { final Character chr = (Character) recipe[idx]; @@ -176,9 +174,7 @@ private boolean checkMatch(final InventoryCrafting inv, final int startX, final for (final ItemStack item : ((IIngredient) target).getItemStackSet()) { matched = matched || this.checkItemEquals(item, slot); } - } catch (final RegistrationError e) { - // :P - } catch (final MissingIngredientError e) { + } catch (final RegistrationError | MissingIngredientError e) { // :P } diff --git a/src/main/java/appeng/recipes/game/ShapelessRecipe.java b/src/main/java/appeng/recipes/game/ShapelessRecipe.java index 0c723ec5de2..7915d26f392 100644 --- a/src/main/java/appeng/recipes/game/ShapelessRecipe.java +++ b/src/main/java/appeng/recipes/game/ShapelessRecipe.java @@ -24,7 +24,7 @@ public class ShapelessRecipe implements IRecipe, IRecipeBakeable { - private final ArrayList input = new ArrayList(); + private final ArrayList input = new ArrayList<>(); private ItemStack output = null; private boolean disable = false; @@ -55,7 +55,7 @@ public boolean matches(final InventoryCrafting var1, final World world) { return false; } - final ArrayList required = new ArrayList(this.input); + final ArrayList required = new ArrayList<>(this.input); for (int x = 0; x < var1.getSizeInventory(); x++) { final ItemStack slot = var1.getStackInSlot(x); @@ -71,9 +71,7 @@ public boolean matches(final InventoryCrafting var1, final World world) { for (final ItemStack item : ((IIngredient) next).getItemStackSet()) { match = match || this.checkItemEquals(item, slot); } - } catch (final RegistrationError e) { - // :P - } catch (final MissingIngredientError e) { + } catch (final RegistrationError | MissingIngredientError e) { // :P } } diff --git a/src/main/java/appeng/recipes/handlers/Inscribe.java b/src/main/java/appeng/recipes/handlers/Inscribe.java index 62e30cf0ae7..a0663416e04 100644 --- a/src/main/java/appeng/recipes/handlers/Inscribe.java +++ b/src/main/java/appeng/recipes/handlers/Inscribe.java @@ -43,7 +43,7 @@ public void register() throws RegistrationError, MissingIngredientError { } final ItemStack[] realInput = this.getImprintable().getItemStackSet(); - final List inputs = new ArrayList(realInput.length); + 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(); diff --git a/src/main/java/appeng/recipes/handlers/Press.java b/src/main/java/appeng/recipes/handlers/Press.java index 7ef4c7775ab..76d75fbeedc 100644 --- a/src/main/java/appeng/recipes/handlers/Press.java +++ b/src/main/java/appeng/recipes/handlers/Press.java @@ -43,7 +43,7 @@ public void register() throws RegistrationError, MissingIngredientError { } final ItemStack[] realInput = this.getImprintable().getItemStackSet(); - final List inputs = new ArrayList(realInput.length); + 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(); diff --git a/src/main/java/appeng/recipes/handlers/Shaped.java b/src/main/java/appeng/recipes/handlers/Shaped.java index 5a63e0bed9f..9008b1ef2f8 100644 --- a/src/main/java/appeng/recipes/handlers/Shaped.java +++ b/src/main/java/appeng/recipes/handlers/Shaped.java @@ -63,7 +63,7 @@ public void setup(final List> input, final List args = new ArrayList(); + final List args = new ArrayList<>(); for (int y = 0; y < this.rows; y++) { final StringBuilder row = new StringBuilder(); @@ -84,7 +84,7 @@ public void register() throws RegistrationError, MissingIngredientError { final ItemStack outIS = this.output.getItemStack(); try { - GameRegistry.addRecipe(new ShapedRecipe(outIS, args.toArray(new Object[args.size()]))); + GameRegistry.addRecipe(new ShapedRecipe(outIS, args.toArray(new Object[0]))); } catch (final Throwable e) { AELog.debug(e); throw new RegistrationError("Error while adding shaped recipe."); diff --git a/src/main/java/appeng/recipes/handlers/Shapeless.java b/src/main/java/appeng/recipes/handlers/Shapeless.java index 5455b05ad1d..49618aaedcb 100644 --- a/src/main/java/appeng/recipes/handlers/Shapeless.java +++ b/src/main/java/appeng/recipes/handlers/Shapeless.java @@ -47,15 +47,13 @@ public void setup(final List> input, final List args = new ArrayList(); - for (final IIngredient i : this.inputs) { - args.add(i); - } + final List args = new ArrayList<>(); + args.addAll(this.inputs); final ItemStack outIS = this.output.getItemStack(); try { - GameRegistry.addRecipe(new ShapelessRecipe(outIS, args.toArray(new Object[args.size()]))); + GameRegistry.addRecipe(new ShapelessRecipe(outIS, args.toArray(new Object[0]))); } catch (final Throwable e) { AELog.debug(e); throw new RegistrationError("Error while adding shapeless recipe."); diff --git a/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java b/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java index 6838494a05a..b1bf1ba33bc 100644 --- a/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java +++ b/src/main/java/appeng/recipes/loader/RecipeResourceCopier.java @@ -198,11 +198,10 @@ private String[] getResourceListing(@Nonnull final Class clazz, @Nonnull fina final String dirPath = dirURL.getPath(); final String jarPath = dirPath.substring(5, dirPath.indexOf('!')); // strip out only // the JAR file - final JarFile jar = new JarFile(URLDecoder.decode(jarPath, UTF_8_ENCODING)); - try { + try (JarFile jar = new JarFile(URLDecoder.decode(jarPath, UTF_8_ENCODING))) { final Enumeration entries = jar.entries(); // gives ALL entries in jar - final Collection result = new HashSet(INITIAL_RESOURCE_CAPACITY); // avoid - // duplicates + final Collection result = new HashSet<>(INITIAL_RESOURCE_CAPACITY); // avoid + // duplicates // in case it is a // subdirectory @@ -221,8 +220,6 @@ private String[] getResourceListing(@Nonnull final Class clazz, @Nonnull fina } return result.toArray(new String[result.size()]); - } finally { - jar.close(); } } } diff --git a/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java b/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java index 3b431ea00ab..148424c6a77 100644 --- a/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java +++ b/src/main/java/appeng/recipes/ores/OreDictionaryHandler.java @@ -25,7 +25,7 @@ public class OreDictionaryHandler { public static final OreDictionaryHandler INSTANCE = new OreDictionaryHandler(); - private final List oreListeners = new ArrayList(); + private final List oreListeners = new ArrayList<>(); private boolean enableRebaking = false; diff --git a/src/main/java/appeng/server/AECommand.java b/src/main/java/appeng/server/AECommand.java index 4d3c22ba485..1b48f269072 100644 --- a/src/main/java/appeng/server/AECommand.java +++ b/src/main/java/appeng/server/AECommand.java @@ -53,7 +53,7 @@ public String getCommandUsage(final ICommandSender icommandsender) { } @Override - public List addTabCompletionOptions(ICommandSender sender, String[] ss) { + public List addTabCompletionOptions(ICommandSender sender, String[] ss) { List l = new ArrayList<>(); String test = ss.length == 0 ? "" : ss[0].trim(); if (ss.length == 0 || ss.length == 1 diff --git a/src/main/java/appeng/server/ServerHelper.java b/src/main/java/appeng/server/ServerHelper.java index c2d35429ea6..b545b840fbc 100644 --- a/src/main/java/appeng/server/ServerHelper.java +++ b/src/main/java/appeng/server/ServerHelper.java @@ -52,16 +52,19 @@ public void bindTileEntitySpecialRenderer(final Class tile, final AEBaseBlock bl } @Override + @SuppressWarnings("unchecked") public List getPlayers() { if (!Platform.isClient()) { final MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance(); if (server != null) { - return server.getConfigurationManager().playerEntityList; + // The real generic type uses EntityPlayerMP, but we can't change it here without breaking API + // compatibility + return (List) (List) server.getConfigurationManager().playerEntityList; } } - return new ArrayList(); + return new ArrayList<>(); } @Override diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 3194f1f9833..030a8b23efc 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -35,7 +35,7 @@ public final class CompassService { private static final int CHUNK_SIZE = 16; - private final Map worldSet = new HashMap(10); + private final Map worldSet = new HashMap<>(10); private final ExecutorService executor; /** diff --git a/src/main/java/appeng/services/compass/CompassReader.java b/src/main/java/appeng/services/compass/CompassReader.java index d181d8d61ef..29214de731e 100644 --- a/src/main/java/appeng/services/compass/CompassReader.java +++ b/src/main/java/appeng/services/compass/CompassReader.java @@ -20,7 +20,7 @@ public final class CompassReader { - private final Map regions = new HashMap(100); + private final Map regions = new HashMap<>(100); private final int dimensionId; private final File worldCompassFolder; diff --git a/src/main/java/appeng/services/version/BaseVersion.java b/src/main/java/appeng/services/version/BaseVersion.java index b4a7d8702db..9510df369aa 100644 --- a/src/main/java/appeng/services/version/BaseVersion.java +++ b/src/main/java/appeng/services/version/BaseVersion.java @@ -80,12 +80,10 @@ public final boolean equals(final Object o) { if (this == o) { return true; } - if (!(o instanceof Version)) { + if (!(o instanceof Version that)) { return false; } - final Version that = (Version) o; - if (this.revision != that.revision()) { return false; } diff --git a/src/main/java/appeng/services/version/github/ReleaseFetcher.java b/src/main/java/appeng/services/version/github/ReleaseFetcher.java index 4f77298fdae..13e3d0c88fa 100644 --- a/src/main/java/appeng/services/version/github/ReleaseFetcher.java +++ b/src/main/java/appeng/services/version/github/ReleaseFetcher.java @@ -12,7 +12,6 @@ import java.io.IOException; import java.lang.reflect.Type; -import java.net.MalformedURLException; import java.net.URL; import java.util.List; @@ -60,11 +59,7 @@ public FormattedRelease get() { final FormattedRelease latestFitRelease = this.getLatestFitRelease(releases); return latestFitRelease; - } catch (final VersionCheckerException e) { - AELog.debug(e); - } catch (MalformedURLException e) { - AELog.debug(e); - } catch (IOException e) { + } catch (final VersionCheckerException | IOException e) { AELog.debug(e); } diff --git a/src/main/java/appeng/spatial/CachedPlane.java b/src/main/java/appeng/spatial/CachedPlane.java index dac3bb57d34..7238afdc2e3 100644 --- a/src/main/java/appeng/spatial/CachedPlane.java +++ b/src/main/java/appeng/spatial/CachedPlane.java @@ -10,7 +10,6 @@ package appeng.spatial; -import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map.Entry; @@ -45,11 +44,11 @@ public class CachedPlane { private final int y_size; private final Chunk[][] myChunks; private final Column[][] myColumns; - private final LinkedList tiles = new LinkedList(); - private final LinkedList ticks = new LinkedList(); + private final LinkedList tiles = new LinkedList<>(); + private final LinkedList ticks = new LinkedList<>(); private final World world; private final IMovableRegistry reg = AEApi.instance().registries().movable(); - private final LinkedList updates = new LinkedList(); + private final LinkedList updates = new LinkedList<>(); private final IBlockDefinition matrixFrame = AEApi.instance().definitions().blocks().matrixFrame(); private int verticalBits; @@ -100,13 +99,13 @@ public CachedPlane(final World w, final int minX, final int minY, final int minZ for (int cx = 0; cx < this.cx_size; cx++) { for (int cz = 0; cz < this.cz_size; cz++) { - final LinkedList> rawTiles = new LinkedList>(); - final LinkedList deadTiles = new LinkedList(); + final LinkedList deadTiles = new LinkedList<>(); final Chunk c = w.getChunkFromChunkCoords(minCX + cx, minCZ + cz); this.myChunks[cx][cz] = c; - rawTiles.addAll(((HashMap) c.chunkTileEntityMap).entrySet()); + final LinkedList> rawTiles = new LinkedList<>( + c.chunkTileEntityMap.entrySet()); for (final Entry tx : rawTiles) { final ChunkPosition cp = tx.getKey(); final TileEntity te = tx.getValue(); @@ -375,6 +374,7 @@ private void setBlockIDWithMetadata(final int y, final Object[] blk) { for (final Block matrixFrameBlock : CachedPlane.this.matrixFrame.maybeBlock().asSet()) { if (blk[0] == matrixFrameBlock) { blk[0] = Platform.AIR_BLOCK; + break; } } @@ -404,7 +404,7 @@ private boolean doNotSkip(final int y) { private void setSkip(final int yCoord) { if (this.skipThese == null) { - this.skipThese = new LinkedList(); + this.skipThese = new LinkedList<>(); } this.skipThese.add(yCoord); } diff --git a/src/main/java/appeng/spatial/StorageChunkProvider.java b/src/main/java/appeng/spatial/StorageChunkProvider.java index 941f95f3a5e..9be3ff67c63 100644 --- a/src/main/java/appeng/spatial/StorageChunkProvider.java +++ b/src/main/java/appeng/spatial/StorageChunkProvider.java @@ -11,6 +11,7 @@ package appeng.spatial; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import net.minecraft.block.Block; @@ -33,9 +34,7 @@ public class StorageChunkProvider extends ChunkProviderGenerate { for (final Block matrixFrameBlock : AEApi.instance().definitions().blocks().matrixFrame().maybeBlock() .asSet()) { - for (int x = 0; x < BLOCKS.length; x++) { - BLOCKS[x] = matrixFrameBlock; - } + Arrays.fill(BLOCKS, matrixFrameBlock); } } @@ -53,9 +52,7 @@ public Chunk provideChunk(final int x, final int z) { final byte[] biomes = chunk.getBiomeArray(); final AEConfig config = AEConfig.instance; - for (int k = 0; k < biomes.length; ++k) { - biomes[k] = (byte) config.storageBiomeID; - } + Arrays.fill(biomes, (byte) config.storageBiomeID); if (!chunk.isTerrainPopulated) { chunk.isTerrainPopulated = true; diff --git a/src/main/java/appeng/spatial/StorageHelper.java b/src/main/java/appeng/spatial/StorageHelper.java index 0e0e414be2c..d3a13c18250 100644 --- a/src/main/java/appeng/spatial/StorageHelper.java +++ b/src/main/java/appeng/spatial/StorageHelper.java @@ -108,8 +108,7 @@ private Entity teleportEntity(Entity entity, final TelDestination link) { entity.lastTickPosY = entity.prevPosY = entity.posY = link.y; entity.lastTickPosZ = entity.prevPosZ = entity.posZ = link.z; - if (entity instanceof EntityHanging) { - final EntityHanging h = (EntityHanging) entity; + if (entity instanceof EntityHanging h) { h.field_146063_b += link.xOff; h.field_146064_c += link.yOff; h.field_146062_d += link.zOff; diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index 48dc0036664..ca653c5f5b0 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -47,9 +47,9 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile, ICustomNameObject { - private static final ThreadLocal> DROP_NO_ITEMS = new ThreadLocal>(); - private static final Map, Map>> HANDLERS = new HashMap, Map>>(); - private static final Map, IStackSrc> ITEM_STACKS = new HashMap, IStackSrc>(); + private static final ThreadLocal> DROP_NO_ITEMS = new ThreadLocal<>(); + private static final Map, Map>> HANDLERS = new HashMap<>(); + private static final Map, IStackSrc> ITEM_STACKS = new HashMap<>(); private int renderFragment = 0; @Nullable @@ -278,8 +278,7 @@ private Map> getEventToHandlers() { final Map> storedHandlers = HANDLERS.get(clazz); if (storedHandlers == null) { - final Map> newStoredHandlers = new EnumMap>( - TileEventType.class); + final Map> newStoredHandlers = new EnumMap<>(TileEventType.class); HANDLERS.put(clazz, newStoredHandlers); @@ -302,7 +301,7 @@ private List getHandlers(final Map oldHandlers = eventToHandlers.get(event); if (oldHandlers == null) { - final List newHandlers = new LinkedList(); + final List newHandlers = new LinkedList<>(); eventToHandlers.put(event, newHandlers); return newHandlers; @@ -313,12 +312,7 @@ private List getHandlers(final Map> handlerSet, final TileEventType value, final Method m) { - List list = handlerSet.get(value); - - if (list == null) { - list = new ArrayList(); - handlerSet.put(value, list); - } + List list = handlerSet.computeIfAbsent(value, k -> new ArrayList<>()); list.add(new AETileEventHandler(m)); } @@ -361,15 +355,13 @@ public void uploadSettings(final SettingsFrom from, final NBTTagCompound compoun } } - if (this instanceof IPriorityHost) { - final IPriorityHost pHost = (IPriorityHost) this; + if (this instanceof IPriorityHost pHost) { pHost.setPriority(compound.getInteger("priority")); } if (this instanceof ISegmentedInventory) { final IInventory inv = ((ISegmentedInventory) this).getInventoryByName("config"); - if (inv instanceof AppEngInternalAEInventory) { - final AppEngInternalAEInventory target = (AppEngInternalAEInventory) inv; + if (inv instanceof AppEngInternalAEInventory target) { final AppEngInternalAEInventory tmp = new AppEngInternalAEInventory(null, target.getSizeInventory()); tmp.readFromNBT(compound, "config"); for (int x = 0; x < tmp.getSizeInventory(); x++) { @@ -390,8 +382,7 @@ public void uploadSettings(final SettingsFrom from, final NBTTagCompound compoun */ @Override public void getDrops(final World w, final int x, final int y, final int z, final List drops) { - if (this instanceof IInventory) { - final IInventory inv = (IInventory) this; + if (this instanceof IInventory inv) { for (int l = 0; l < inv.getSizeInventory(); l++) { final ItemStack is = inv.getStackInSlot(l); @@ -428,8 +419,7 @@ public NBTTagCompound downloadSettings(final SettingsFrom from) { } } - if (this instanceof IPriorityHost) { - final IPriorityHost pHost = (IPriorityHost) this; + if (this instanceof IPriorityHost pHost) { output.setInteger("priority", pHost.getPriority()); } @@ -464,7 +454,7 @@ public void securityBreak() { } public void disableDrops() { - DROP_NO_ITEMS.set(new WeakReference(this)); + DROP_NO_ITEMS.set(new WeakReference<>(this)); } public void saveChanges() { diff --git a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java b/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java index d6c30c78b98..76969f7020e 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingStorageTile.java @@ -27,41 +27,41 @@ protected ItemStack getItemFromTile(final Object obj) { final int storage = ((TileCraftingTile) obj).getStorageBytes() / KILO_SCALAR; switch (storage) { - case 4: + case 4 -> { for (final ItemStack stack : blocks.craftingStorage4k().maybeStack(1).asSet()) { return stack; } - break; - case 16: + } + case 16 -> { for (final ItemStack stack : blocks.craftingStorage16k().maybeStack(1).asSet()) { return stack; } - break; - case 64: + } + case 64 -> { for (final ItemStack stack : blocks.craftingStorage64k().maybeStack(1).asSet()) { return stack; } - break; - case 256: + } + case 256 -> { for (final ItemStack stack : blocks.craftingStorage256k().maybeStack(1).asSet()) { return stack; } - break; - case 1024: + } + case 1024 -> { for (final ItemStack stack : blocks.craftingStorage1024k().maybeStack(1).asSet()) { return stack; } - break; - case 4096: + } + case 4096 -> { for (final ItemStack stack : blocks.craftingStorage4096k().maybeStack(1).asSet()) { return stack; } - break; - case 16384: + } + case 16384 -> { for (final ItemStack stack : blocks.craftingStorage16384k().maybeStack(1).asSet()) { return stack; } - break; + } } return super.getItemFromTile(obj); @@ -85,16 +85,11 @@ public int getStorageBytes() { Block block = this.worldObj.getBlock(this.xCoord, this.yCoord, this.zCoord); int blockMultiplier = block instanceof BlockAdvancedCraftingStorage ? 256 : 1; - switch (this.worldObj.getBlockMetadata(this.xCoord, this.yCoord, this.zCoord) & 3) { - default: - case 0: - return KILO_SCALAR * blockMultiplier; - case 1: - return 4 * KILO_SCALAR * blockMultiplier; - case 2: - return 16 * KILO_SCALAR * blockMultiplier; - case 3: - return 64 * KILO_SCALAR * blockMultiplier; - } + return switch (this.worldObj.getBlockMetadata(this.xCoord, this.yCoord, this.zCoord) & 3) { + default -> KILO_SCALAR * blockMultiplier; + case 1 -> 4 * KILO_SCALAR * blockMultiplier; + case 2 -> 16 * KILO_SCALAR * blockMultiplier; + case 3 -> 64 * KILO_SCALAR * blockMultiplier; + }; } } diff --git a/src/main/java/appeng/tile/crafting/TileCraftingTile.java b/src/main/java/appeng/tile/crafting/TileCraftingTile.java index 76a45a0351e..c87492c93d7 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingTile.java @@ -242,7 +242,7 @@ public void breakCluster() { this.cluster.cancel(); final IMEInventory inv = this.cluster.getInventory(); - final LinkedList places = new LinkedList(); + final LinkedList places = new LinkedList<>(); final Iterator i = this.cluster.getTiles(); while (i.hasNext()) { diff --git a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java index 1be23b77b46..d6d57bfc071 100644 --- a/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java +++ b/src/main/java/appeng/tile/crafting/TileMolecularAssembler.java @@ -197,9 +197,8 @@ public void readFromNBT_TileMolecularAssembler(final NBTTagCompound data) { if (data.hasKey("myPlan")) { final ItemStack myPat = ItemStack.loadItemStackFromNBT(data.getCompoundTag("myPlan")); - if (myPat != null && myPat.getItem() instanceof ItemEncodedPattern) { + if (myPat != null && myPat.getItem() instanceof ItemEncodedPattern iep) { final World w = this.getWorldObj(); - final ItemEncodedPattern iep = (ItemEncodedPattern) myPat.getItem(); final ICraftingPatternDetails ph = iep.getPatternForItem(myPat, w); if (ph != null && ph.isCraftable()) { this.forcePlan = true; @@ -378,24 +377,12 @@ public TickRateModulation tickingRequest(final IGridNode node, int ticksSinceLas this.reboot = false; int speed = 10; switch (this.upgrades.getInstalledUpgrades(Upgrades.SPEED)) { - case 0: - this.progress += this.userPower(ticksSinceLastCall, speed = 10, 1.0); - break; - case 1: - this.progress += this.userPower(ticksSinceLastCall, speed = 13, 1.3); - break; - case 2: - this.progress += this.userPower(ticksSinceLastCall, speed = 17, 1.7); - break; - case 3: - this.progress += this.userPower(ticksSinceLastCall, speed = 20, 2.0); - break; - case 4: - this.progress += this.userPower(ticksSinceLastCall, speed = 25, 2.5); - break; - case 5: - this.progress += this.userPower(ticksSinceLastCall, speed = 50, 5.0); - break; + case 0 -> this.progress += this.userPower(ticksSinceLastCall, speed = 10, 1.0); + case 1 -> this.progress += this.userPower(ticksSinceLastCall, speed = 13, 1.3); + case 2 -> this.progress += this.userPower(ticksSinceLastCall, speed = 17, 1.7); + case 3 -> this.progress += this.userPower(ticksSinceLastCall, speed = 20, 2.0); + case 4 -> this.progress += this.userPower(ticksSinceLastCall, speed = 25, 2.5); + case 5 -> this.progress += this.userPower(ticksSinceLastCall, speed = 50, 5.0); } if (this.progress >= 100) { diff --git a/src/main/java/appeng/tile/events/AETileEventHandler.java b/src/main/java/appeng/tile/events/AETileEventHandler.java index 7eaa5f6b9ee..ce969572081 100644 --- a/src/main/java/appeng/tile/events/AETileEventHandler.java +++ b/src/main/java/appeng/tile/events/AETileEventHandler.java @@ -32,11 +32,7 @@ public AETileEventHandler(final Method method) { public void tick(final AEBaseTile tile) { try { this.method.invoke(tile); - } catch (final IllegalAccessException e) { - throw new IllegalStateException(e); - } catch (final IllegalArgumentException e) { - throw new IllegalStateException(e); - } catch (final InvocationTargetException e) { + } catch (final IllegalAccessException | InvocationTargetException | IllegalArgumentException e) { throw new IllegalStateException(e); } } @@ -45,11 +41,7 @@ public void tick(final AEBaseTile tile) { public void writeToNBT(final AEBaseTile tile, final NBTTagCompound data) { try { this.method.invoke(tile, data); - } catch (final IllegalAccessException e) { - throw new IllegalStateException(e); - } catch (final IllegalArgumentException e) { - throw new IllegalStateException(e); - } catch (final InvocationTargetException e) { + } catch (final IllegalAccessException | InvocationTargetException | IllegalArgumentException e) { throw new IllegalStateException(e); } } @@ -58,11 +50,7 @@ public void writeToNBT(final AEBaseTile tile, final NBTTagCompound data) { public void readFromNBT(final AEBaseTile tile, final NBTTagCompound data) { try { this.method.invoke(tile, data); - } catch (final IllegalAccessException e) { - throw new IllegalStateException(e); - } catch (final IllegalArgumentException e) { - throw new IllegalStateException(e); - } catch (final InvocationTargetException e) { + } catch (final IllegalAccessException | InvocationTargetException | IllegalArgumentException e) { throw new IllegalStateException(e); } } @@ -71,11 +59,7 @@ public void readFromNBT(final AEBaseTile tile, final NBTTagCompound data) { public void writeToStream(final AEBaseTile tile, final ByteBuf data) { try { this.method.invoke(tile, data); - } catch (final IllegalAccessException e) { - throw new IllegalStateException(e); - } catch (final IllegalArgumentException e) { - throw new IllegalStateException(e); - } catch (final InvocationTargetException e) { + } catch (final IllegalAccessException | InvocationTargetException | IllegalArgumentException e) { throw new IllegalStateException(e); } } @@ -92,11 +76,7 @@ public void writeToStream(final AEBaseTile tile, final ByteBuf data) { public boolean readFromStream(final AEBaseTile tile, final ByteBuf data) { try { return (Boolean) this.method.invoke(tile, data); - } catch (final IllegalAccessException e) { - throw new IllegalStateException(e); - } catch (final IllegalArgumentException e) { - throw new IllegalStateException(e); - } catch (final InvocationTargetException e) { + } catch (final IllegalAccessException | InvocationTargetException | IllegalArgumentException e) { throw new IllegalStateException(e); } } diff --git a/src/main/java/appeng/tile/grindstone/TileGrinder.java b/src/main/java/appeng/tile/grindstone/TileGrinder.java index 72f14bb3ef9..49d3e981a97 100644 --- a/src/main/java/appeng/tile/grindstone/TileGrinder.java +++ b/src/main/java/appeng/tile/grindstone/TileGrinder.java @@ -153,7 +153,7 @@ private void addItem(final InventoryAdaptor sia, final ItemStack output) { wc.add(this.getForward(), 1); - final List out = new ArrayList(); + final List out = new ArrayList<>(); out.add(notAdded); Platform.spawnDrops(this.worldObj, wc.x, wc.y, wc.z, out); diff --git a/src/main/java/appeng/tile/misc/TileCharger.java b/src/main/java/appeng/tile/misc/TileCharger.java index b050c33f9aa..945be7bd55e 100644 --- a/src/main/java/appeng/tile/misc/TileCharger.java +++ b/src/main/java/appeng/tile/misc/TileCharger.java @@ -246,7 +246,7 @@ public void activate(final EntityPlayer player) { this.setInventorySlotContents(0, held); } } else { - final List drops = new ArrayList(); + final List drops = new ArrayList<>(); drops.add(myItem); this.setInventorySlotContents(0, null); Platform.spawnDrops( diff --git a/src/main/java/appeng/tile/misc/TileCondenser.java b/src/main/java/appeng/tile/misc/TileCondenser.java index 0134bb9df78..fa491a187bd 100644 --- a/src/main/java/appeng/tile/misc/TileCondenser.java +++ b/src/main/java/appeng/tile/misc/TileCondenser.java @@ -63,8 +63,7 @@ public void readFromNBT_TileCondenser(final NBTTagCompound data) { public double getStorage() { final ItemStack is = this.inv.getStackInSlot(2); if (is != null) { - if (is.getItem() instanceof IStorageComponent) { - final IStorageComponent sc = (IStorageComponent) is.getItem(); + if (is.getItem() instanceof IStorageComponent sc) { if (sc.isStorageComponent(is)) { return sc.getBytes(is) * 8; } diff --git a/src/main/java/appeng/tile/misc/TilePaint.java b/src/main/java/appeng/tile/misc/TilePaint.java index df04e101850..b70dff8dc28 100644 --- a/src/main/java/appeng/tile/misc/TilePaint.java +++ b/src/main/java/appeng/tile/misc/TilePaint.java @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import java.util.List; import net.minecraft.block.Block; @@ -79,7 +78,7 @@ private void readBuffer(final ByteBuf in) { return; } - this.dots = new ArrayList(howMany); + this.dots = new ArrayList<>(howMany); for (int x = 0; x < howMany; x++) { this.dots.add(new Splotch(in)); } @@ -141,13 +140,7 @@ public boolean isSideValid(final ForgeDirection side) { } private void removeSide(final ForgeDirection side) { - final Iterator i = this.dots.iterator(); - while (i.hasNext()) { - final Splotch s = i.next(); - if (s.getSide() == side) { - i.remove(); - } - } + this.dots.removeIf(s -> s.getSide() == side); this.markForUpdate(); this.markDirty(); @@ -201,7 +194,7 @@ public void addBlot(final ItemStack type, final ForgeDirection side, final Vec3 final boolean lit = ipb.isLumen(type); if (this.dots == null) { - this.dots = new ArrayList(); + this.dots = new ArrayList<>(); } if (this.dots.size() > 20) { diff --git a/src/main/java/appeng/tile/misc/TileSecurity.java b/src/main/java/appeng/tile/misc/TileSecurity.java index 72499b3e498..187898529cd 100644 --- a/src/main/java/appeng/tile/misc/TileSecurity.java +++ b/src/main/java/appeng/tile/misc/TileSecurity.java @@ -70,7 +70,7 @@ public class TileSecurity extends AENetworkTile implements ITerminalHost, IAEApp private final AppEngInternalInventory configSlot = new AppEngInternalInventory(this, 1); private final IConfigManager cm = new ConfigManager(this); private final SecurityInventory inventory = new SecurityInventory(this); - private final MEMonitorHandler securityMonitor = new MEMonitorHandler(this.inventory); + private final MEMonitorHandler securityMonitor = new MEMonitorHandler<>(this.inventory); private long securityKey; private AEColor paintedColor = AEColor.Transparent; private boolean isActive = false; @@ -263,8 +263,7 @@ public void readPermissions(final HashMap> for (final IAEItemStack ais : this.inventory.getStoredItems()) { final ItemStack is = ais.getItemStack(); final Item i = is.getItem(); - if (i instanceof IBiometricCard) { - final IBiometricCard bc = (IBiometricCard) i; + if (i instanceof IBiometricCard bc) { bc.registerPermissions(new PlayerSecurityWrapper(playerPerms), pr, is); } } diff --git a/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java b/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java index 51e2162cfe5..03fc3e210de 100644 --- a/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java +++ b/src/main/java/appeng/tile/spatial/TileSpatialIOPort.java @@ -91,8 +91,7 @@ private void triggerTransition() { } private boolean isSpatialCell(final ItemStack cell) { - if (cell != null && cell.getItem() instanceof ISpatialStorageCell) { - final ISpatialStorageCell sc = (ISpatialStorageCell) cell.getItem(); + if (cell != null && cell.getItem() instanceof ISpatialStorageCell sc) { return sc != null && sc.isSpatialStorage(cell); } return false; diff --git a/src/main/java/appeng/tile/spatial/TileSpatialPylon.java b/src/main/java/appeng/tile/spatial/TileSpatialPylon.java index 6b29ecae2d4..05fbdac7ea7 100644 --- a/src/main/java/appeng/tile/spatial/TileSpatialPylon.java +++ b/src/main/java/appeng/tile/spatial/TileSpatialPylon.java @@ -121,18 +121,10 @@ public void recalculateDisplay() { } switch (this.cluster.getCurrentAxis()) { - case X: - this.displayBits |= DISPLAY_X; - break; - case Y: - this.displayBits |= DISPLAY_Y; - break; - case Z: - this.displayBits |= DISPLAY_Z; - break; - default: - this.displayBits = 0; - break; + case X -> this.displayBits |= DISPLAY_X; + case Y -> this.displayBits |= DISPLAY_Y; + case Z -> this.displayBits |= DISPLAY_Z; + default -> this.displayBits = 0; } try { diff --git a/src/main/java/appeng/tile/storage/TileChest.java b/src/main/java/appeng/tile/storage/TileChest.java index aa423a11485..cf47d7458f6 100644 --- a/src/main/java/appeng/tile/storage/TileChest.java +++ b/src/main/java/appeng/tile/storage/TileChest.java @@ -168,17 +168,19 @@ private IMEInventoryHandler getHandler(final StorageChannel channel) throws Ches } switch (channel) { - case FLUIDS: + case FLUIDS -> { if (this.fluidCell == null) { throw NO_HANDLER; } return this.fluidCell; - case ITEMS: + } + case ITEMS -> { if (this.itemCell == null) { throw NO_HANDLER; } return this.itemCell; - default: + } + default -> {} } return null; @@ -500,7 +502,7 @@ public List getCellArray(final StorageChannel channel) { // :P } } - return new ArrayList(); + return new ArrayList<>(); } @Override diff --git a/src/main/java/appeng/tile/storage/TileDrive.java b/src/main/java/appeng/tile/storage/TileDrive.java index 89ac6b48939..f8cd1415e55 100644 --- a/src/main/java/appeng/tile/storage/TileDrive.java +++ b/src/main/java/appeng/tile/storage/TileDrive.java @@ -56,8 +56,8 @@ public class TileDrive extends AENetworkInvTile implements IChestOrDrive, IPrior private final DriveWatcher[] invBySlot = new DriveWatcher[10]; private final BaseActionSource mySrc; private boolean isCached = false; - private List items = new LinkedList(); - private List fluids = new LinkedList(); + private List items = new LinkedList<>(); + private List fluids = new LinkedList<>(); private long lastStateChange = 0; private int state = 0; private int priority = 0; diff --git a/src/main/java/appeng/tile/storage/TileIOPort.java b/src/main/java/appeng/tile/storage/TileIOPort.java index cea907c6fad..4778e0a77c1 100644 --- a/src/main/java/appeng/tile/storage/TileIOPort.java +++ b/src/main/java/appeng/tile/storage/TileIOPort.java @@ -269,27 +269,15 @@ public TickRateModulation tickingRequest(final IGridNode node, final int ticksSi long ItemsToMove = 256; switch (this.getInstalledUpgrades(Upgrades.SPEED)) { - case 1: - ItemsToMove *= 2; - break; - case 2: - ItemsToMove *= 4; - break; - case 3: - ItemsToMove *= 8; - break; + case 1 -> ItemsToMove *= 2; + case 2 -> ItemsToMove *= 4; + case 3 -> ItemsToMove *= 8; } switch (this.getInstalledUpgrades(Upgrades.SUPERSPEED)) { - case 1: - ItemsToMove *= 16; - break; - case 2: - ItemsToMove *= 128; - break; - case 3: - ItemsToMove *= 1024; - break; + case 1 -> ItemsToMove *= 16; + case 2 -> ItemsToMove *= 128; + case 3 -> ItemsToMove *= 1024; } try { diff --git a/src/main/java/appeng/util/ClassInstantiation.java b/src/main/java/appeng/util/ClassInstantiation.java index 1e0fc4adc01..d0c7b8d8be5 100644 --- a/src/main/java/appeng/util/ClassInstantiation.java +++ b/src/main/java/appeng/util/ClassInstantiation.java @@ -46,11 +46,7 @@ public Optional get() { if (valid) { try { return Optional.of(constructor.newInstance(this.args)); - } catch (final InstantiationException e) { - e.printStackTrace(); - } catch (final IllegalAccessException e) { - e.printStackTrace(); - } catch (final InvocationTargetException e) { + } catch (final InstantiationException | InvocationTargetException | IllegalAccessException e) { e.printStackTrace(); } break; diff --git a/src/main/java/appeng/util/ConfigManager.java b/src/main/java/appeng/util/ConfigManager.java index f9a34237337..b4441ffc97d 100644 --- a/src/main/java/appeng/util/ConfigManager.java +++ b/src/main/java/appeng/util/ConfigManager.java @@ -24,7 +24,7 @@ public final class ConfigManager implements IConfigManager { - private final Map> settings = new EnumMap>(Settings.class); + private final Map> settings = new EnumMap<>(Settings.class); private final IConfigManagerHost target; public ConfigManager(final IConfigManagerHost tile) { diff --git a/src/main/java/appeng/util/IConfigManagerHost.java b/src/main/java/appeng/util/IConfigManagerHost.java index 47bd9cd044e..cf7a63561bb 100644 --- a/src/main/java/appeng/util/IConfigManagerHost.java +++ b/src/main/java/appeng/util/IConfigManagerHost.java @@ -12,6 +12,7 @@ import appeng.api.util.IConfigManager; +@SuppressWarnings("rawtypes") public interface IConfigManagerHost { void updateSetting(IConfigManager manager, Enum settingName, Enum newValue); diff --git a/src/main/java/appeng/util/InWorldToolOperationResult.java b/src/main/java/appeng/util/InWorldToolOperationResult.java index da042925fdf..deded3df224 100644 --- a/src/main/java/appeng/util/InWorldToolOperationResult.java +++ b/src/main/java/appeng/util/InWorldToolOperationResult.java @@ -38,7 +38,7 @@ public InWorldToolOperationResult(final ItemStack block) { } public static InWorldToolOperationResult getBlockOperationResult(final ItemStack[] items) { - final List temp = new ArrayList(); + final List temp = new ArrayList<>(); ItemStack b = null; for (final ItemStack l : items) { diff --git a/src/main/java/appeng/util/InventoryAdaptor.java b/src/main/java/appeng/util/InventoryAdaptor.java index cd5bbeb8287..b7d072469d2 100644 --- a/src/main/java/appeng/util/InventoryAdaptor.java +++ b/src/main/java/appeng/util/InventoryAdaptor.java @@ -50,8 +50,7 @@ public static InventoryAdaptor getAdaptor(final Object te, final ForgeDirection return bs.getAdaptor(te, d); } else if (te instanceof TileEntityChest) { return new AdaptorIInventory(Platform.GetChestInv(te)); - } else if (te instanceof ISidedInventory) { - final ISidedInventory si = (ISidedInventory) te; + } else if (te instanceof ISidedInventory si) { final int[] slots = si.getAccessibleSlotsFromSide(d.ordinal()); int stackLimit = 0; if (te instanceof AEBaseInvTile) { @@ -63,8 +62,7 @@ public static InventoryAdaptor getAdaptor(final Object te, final ForgeDirection } return new AdaptorIInventory(new WrapperMCISidedInventory(si, d)); } - } else if (te instanceof IInventory) { - final IInventory i = (IInventory) te; + } else if (te instanceof IInventory i) { if (i.getSizeInventory() > 0) { return new AdaptorIInventory(i); } diff --git a/src/main/java/appeng/util/ItemSorters.java b/src/main/java/appeng/util/ItemSorters.java index 9efb7a7eabd..4447fc90124 100644 --- a/src/main/java/appeng/util/ItemSorters.java +++ b/src/main/java/appeng/util/ItemSorters.java @@ -34,7 +34,7 @@ public class ItemSorters { .comparing(IAEStack::getStackSize, (a, b) -> Long.compare(b, a) * direction.sortHint); private static IInvTweaks api; - public static final Comparator CONFIG_BASED_SORT_BY_INV_TWEAKS = new Comparator() { + public static final Comparator CONFIG_BASED_SORT_BY_INV_TWEAKS = new Comparator<>() { @Override public int compare(final IAEItemStack o1, final IAEItemStack o2) { diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 98e39705bd7..2d0d0c66db1 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -117,7 +117,7 @@ public class Platform { * random source, use it for item drop locations... */ private static final Random RANDOM_GENERATOR = new Random(); - private static final WeakHashMap FAKE_PLAYERS = new WeakHashMap(); + private static final WeakHashMap FAKE_PLAYERS = new WeakHashMap<>(); private static Field tagList; private static Class playerInstance; private static Method getOrCreateChunkWatcher; @@ -193,24 +193,16 @@ public static ForgeDirection crossProduct(final ForgeDirection forward, final Fo final int west_y = forward.offsetZ * up.offsetX - forward.offsetX * up.offsetZ; final int west_z = forward.offsetX * up.offsetY - forward.offsetY * up.offsetX; - switch (west_x + west_y * 2 + west_z * 3) { - case 1: - return ForgeDirection.EAST; - case -1: - return ForgeDirection.WEST; + return switch (west_x + west_y * 2 + west_z * 3) { + case 1 -> ForgeDirection.EAST; + case -1 -> ForgeDirection.WEST; + case 2 -> ForgeDirection.UP; + case -2 -> ForgeDirection.DOWN; + case 3 -> ForgeDirection.SOUTH; + case -3 -> ForgeDirection.NORTH; + default -> ForgeDirection.UNKNOWN; + }; - case 2: - return ForgeDirection.UP; - case -2: - return ForgeDirection.DOWN; - - case 3: - return ForgeDirection.SOUTH; - case -3: - return ForgeDirection.NORTH; - } - - return ForgeDirection.UNKNOWN; } public static T rotateEnum(T ce, final boolean backwards, final EnumSet validOptions) { @@ -392,7 +384,7 @@ public static boolean NBTEqualityTest(final NBTBase left, final NBTBase right) { final byte id = left.getId(); if (id == right.getId()) { switch (id) { - case 10: { + case 10 -> { final NBTTagCompound ctA = (NBTTagCompound) left; final NBTTagCompound ctB = (NBTTagCompound) right; @@ -417,8 +409,7 @@ public static boolean NBTEqualityTest(final NBTBase left, final NBTBase right) { return true; } - - case 9: // ) // A instanceof NBTTagList ) + case 9 -> // ) // A instanceof NBTTagList ) { final NBTTagList lA = (NBTTagList) left; final NBTTagList lB = (NBTTagList) right; @@ -444,33 +435,33 @@ public static boolean NBTEqualityTest(final NBTBase left, final NBTBase right) { return true; } - - case 1: // ( A instanceof NBTTagByte ) + case 1 -> { // ( A instanceof NBTTagByte ) return ((NBTBase.NBTPrimitive) left).func_150287_d() == ((NBTBase.NBTPrimitive) right).func_150287_d(); - - case 4: // else if ( A instanceof NBTTagLong ) + } + case 4 -> { // else if ( A instanceof NBTTagLong ) return ((NBTBase.NBTPrimitive) left).func_150291_c() == ((NBTBase.NBTPrimitive) right).func_150291_c(); - - case 8: // else if ( A instanceof NBTTagString ) + } + case 8 -> { // else if ( A instanceof NBTTagString ) return ((NBTTagString) left).func_150285_a_().equals(((NBTTagString) right).func_150285_a_()) || ((NBTTagString) left).func_150285_a_().equals(((NBTTagString) right).func_150285_a_()); - - case 6: // else if ( A instanceof NBTTagDouble ) + } + case 6 -> { // else if ( A instanceof NBTTagDouble ) return ((NBTBase.NBTPrimitive) left).func_150286_g() == ((NBTBase.NBTPrimitive) right).func_150286_g(); - - case 5: // else if ( A instanceof NBTTagFloat ) + } + case 5 -> { // else if ( A instanceof NBTTagFloat ) return ((NBTBase.NBTPrimitive) left).func_150288_h() == ((NBTBase.NBTPrimitive) right).func_150288_h(); - - case 3: // else if ( A instanceof NBTTagInt ) + } + case 3 -> { // else if ( A instanceof NBTTagInt ) return ((NBTBase.NBTPrimitive) left).func_150287_d() == ((NBTBase.NBTPrimitive) right).func_150287_d(); - - default: + } + default -> { return left.equals(right); + } } } @@ -498,7 +489,7 @@ private static List tagList(final NBTTagList lB) { AELog.debug(t); } - return new ArrayList(); + return new ArrayList<>(); } /* @@ -511,7 +502,7 @@ public static int NBTOrderlessHash(final NBTBase nbt) { final byte id = nbt.getId(); hash += id; switch (id) { - case 10: { + case 10 -> { final NBTTagCompound ctA = (NBTTagCompound) nbt; final Set cA = ctA.func_150296_c(); @@ -522,8 +513,7 @@ public static int NBTOrderlessHash(final NBTBase nbt) { return hash; } - - case 9: // ) // A instanceof NBTTagList ) + case 9 -> // ) // A instanceof NBTTagList ) { final NBTTagList lA = (NBTTagList) nbt; hash += 9 * lA.tagCount(); @@ -535,27 +525,27 @@ public static int NBTOrderlessHash(final NBTBase nbt) { return hash; } - - case 1: // ( A instanceof NBTTagByte ) + case 1 -> { // ( A instanceof NBTTagByte ) return hash + ((NBTBase.NBTPrimitive) nbt).func_150290_f(); - - case 4: // else if ( A instanceof NBTTagLong ) + } + case 4 -> { // else if ( A instanceof NBTTagLong ) return hash + (int) ((NBTBase.NBTPrimitive) nbt).func_150291_c(); - - case 8: // else if ( A instanceof NBTTagString ) + } + case 8 -> { // else if ( A instanceof NBTTagString ) return hash + ((NBTTagString) nbt).func_150285_a_().hashCode(); - - case 6: // else if ( A instanceof NBTTagDouble ) + } + case 6 -> { // else if ( A instanceof NBTTagDouble ) return hash + (int) ((NBTBase.NBTPrimitive) nbt).func_150286_g(); - - case 5: // else if ( A instanceof NBTTagFloat ) + } + case 5 -> { // else if ( A instanceof NBTTagFloat ) return hash + (int) ((NBTBase.NBTPrimitive) nbt).func_150288_h(); - - case 3: // else if ( A instanceof NBTTagInt ) + } + case 3 -> { // else if ( A instanceof NBTTagInt ) return hash + ((NBTBase.NBTPrimitive) nbt).func_150287_d(); - - default: + } + default -> { return hash; + } } } @@ -581,7 +571,7 @@ public static IRecipe findMatchingRecipe(final InventoryCrafting inventoryCrafti } public static ItemStack[] getBlockDrops(final World w, final int x, final int y, final int z) { - List out = new ArrayList(); + List out = new ArrayList<>(); final Block which = w.getBlock(x, y, z); if (which != null) { @@ -591,47 +581,31 @@ public static ItemStack[] getBlockDrops(final World w, final int x, final int y, if (out == null) { return new ItemStack[0]; } - return out.toArray(new ItemStack[out.size()]); + return out.toArray(new ItemStack[0]); } public static ForgeDirection cycleOrientations(final ForgeDirection dir, final boolean upAndDown) { if (upAndDown) { - switch (dir) { - case NORTH: - return ForgeDirection.SOUTH; - case SOUTH: - return ForgeDirection.EAST; - case EAST: - return ForgeDirection.WEST; - case WEST: - return ForgeDirection.NORTH; - case UP: - return ForgeDirection.UP; - case DOWN: - return ForgeDirection.DOWN; - case UNKNOWN: - return ForgeDirection.UNKNOWN; - } + return switch (dir) { + case NORTH -> ForgeDirection.SOUTH; + case SOUTH -> ForgeDirection.EAST; + case EAST -> ForgeDirection.WEST; + case WEST -> ForgeDirection.NORTH; + case UP -> ForgeDirection.UP; + case DOWN -> ForgeDirection.DOWN; + case UNKNOWN -> ForgeDirection.UNKNOWN; + }; } else { - switch (dir) { - case UP: - return ForgeDirection.DOWN; - case DOWN: - return ForgeDirection.NORTH; - case NORTH: - return ForgeDirection.SOUTH; - case SOUTH: - return ForgeDirection.EAST; - case EAST: - return ForgeDirection.WEST; - case WEST: - return ForgeDirection.UP; - case UNKNOWN: - return ForgeDirection.UNKNOWN; - } + return switch (dir) { + case UP -> ForgeDirection.DOWN; + case DOWN -> ForgeDirection.NORTH; + case NORTH -> ForgeDirection.SOUTH; + case SOUTH -> ForgeDirection.EAST; + case EAST -> ForgeDirection.WEST; + case WEST -> ForgeDirection.UP; + case UNKNOWN -> ForgeDirection.UNKNOWN; + }; } - - return ForgeDirection.UNKNOWN; } /* @@ -758,25 +732,24 @@ public static ItemStack findMatchingRecipeOutput(final InventoryCrafting ic, fin } @SideOnly(Side.CLIENT) - public static List getTooltip(final Object o) { + public static List getTooltip(final Object o) { if (o == null) { - return new ArrayList(); + return new ArrayList<>(); } ItemStack itemStack = null; - if (o instanceof AEItemStack) { - final AEItemStack ais = (AEItemStack) o; + if (o instanceof AEItemStack ais) { return ais.getToolTip(); } else if (o instanceof ItemStack) { itemStack = (ItemStack) o; } else { - return new ArrayList(); + return new ArrayList<>(); } try { return itemStack.getTooltip(Minecraft.getMinecraft().thePlayer, false); } catch (final Exception errB) { - return new ArrayList(); + return new ArrayList<>(); } } @@ -841,8 +814,7 @@ public static boolean isWrench(final EntityPlayer player, final ItemStack eq, fi final int z) { if (eq != null) { try { - if (eq.getItem() instanceof IToolWrench) { - final IToolWrench wrench = (IToolWrench) eq.getItem(); + if (eq.getItem() instanceof IToolWrench wrench) { return wrench.canWrench(player, x, y, z); } } catch (final Throwable ignore) { // explodes without BC @@ -944,89 +916,109 @@ public static ForgeDirection rotateAround(final ForgeDirection forward, final Fo switch (forward) { case DOWN: switch (axis) { - case DOWN: + case DOWN -> { return forward; - case UP: + } + case UP -> { return forward; - case NORTH: + } + case NORTH -> { return ForgeDirection.EAST; - case SOUTH: + } + case SOUTH -> { return ForgeDirection.WEST; - case EAST: + } + case EAST -> { return ForgeDirection.NORTH; - case WEST: + } + case WEST -> { return ForgeDirection.SOUTH; - default: - break; + } + default -> {} } break; case UP: switch (axis) { - case NORTH: + case NORTH -> { return ForgeDirection.WEST; - case SOUTH: + } + case SOUTH -> { return ForgeDirection.EAST; - case EAST: + } + case EAST -> { return ForgeDirection.SOUTH; - case WEST: + } + case WEST -> { return ForgeDirection.NORTH; - default: - break; + } + default -> {} } break; case NORTH: switch (axis) { - case UP: + case UP -> { return ForgeDirection.WEST; - case DOWN: + } + case DOWN -> { return ForgeDirection.EAST; - case EAST: + } + case EAST -> { return ForgeDirection.UP; - case WEST: + } + case WEST -> { return ForgeDirection.DOWN; - default: - break; + } + default -> {} } break; case SOUTH: switch (axis) { - case UP: + case UP -> { return ForgeDirection.EAST; - case DOWN: + } + case DOWN -> { return ForgeDirection.WEST; - case EAST: + } + case EAST -> { return ForgeDirection.DOWN; - case WEST: + } + case WEST -> { return ForgeDirection.UP; - default: - break; + } + default -> {} } break; case EAST: switch (axis) { - case UP: + case UP -> { return ForgeDirection.NORTH; - case DOWN: + } + case DOWN -> { return ForgeDirection.SOUTH; - case NORTH: + } + case NORTH -> { return ForgeDirection.UP; - case SOUTH: + } + case SOUTH -> { return ForgeDirection.DOWN; - default: - break; + } + default -> {} } case WEST: switch (axis) { - case UP: + case UP -> { return ForgeDirection.SOUTH; - case DOWN: + } + case DOWN -> { return ForgeDirection.NORTH; - case NORTH: + } + case NORTH -> { return ForgeDirection.DOWN; - case SOUTH: + } + case SOUTH -> { return ForgeDirection.UP; - default: - break; + } + default -> {} } default: break; @@ -1168,8 +1160,8 @@ public static MovingObjectPosition rayTrace(final EntityPlayer p, final boolean if (hitEntities) { final List list = w.getEntitiesWithinAABBExcludingEntity(p, bb); - for (int l = 0; l < list.size(); ++l) { - final Entity entity1 = (Entity) list.get(l); + for (Object o : list) { + final Entity entity1 = (Entity) o; if (!entity1.isDead && entity1 != p && !(entity1 instanceof EntityItem)) { if (entity1.isEntityAlive()) { @@ -1343,7 +1335,7 @@ public static void postChanges(final IStorageGrid gs, final ItemStack removed, f public static > void postListChanges(final IItemList before, final IItemList after, final IMEMonitorHandlerReceiver meMonitorPassthrough, final BaseActionSource source) { - final LinkedList changes = new LinkedList(); + final LinkedList changes = new LinkedList<>(); for (final T is : before) { is.setStackSize(-is.getStackSize()); @@ -1373,8 +1365,7 @@ public static int generateTileHash(final TileEntity target) { if (target instanceof ITileStorageMonitorable) { return 0; - } else if (target instanceof TileEntityChest) { - final TileEntityChest chest = (TileEntityChest) target; + } else if (target instanceof TileEntityChest chest) { chest.checkForAdjacentChests(); if (chest.adjacentChestZNeg != null) { hash ^= chest.adjacentChestZNeg.hashCode(); @@ -1756,20 +1747,25 @@ public static void sendChunk(final Chunk c, final int verticalBits) { public static AxisAlignedBB getPrimaryBox(final ForgeDirection side, final int facadeThickness) { switch (side) { - case DOWN: + case DOWN -> { return AxisAlignedBB.getBoundingBox(0.0, 0.0, 0.0, 1.0, (facadeThickness) / 16.0, 1.0); - case EAST: + } + case EAST -> { return AxisAlignedBB.getBoundingBox((16.0 - facadeThickness) / 16.0, 0.0, 0.0, 1.0, 1.0, 1.0); - case NORTH: + } + case NORTH -> { return AxisAlignedBB.getBoundingBox(0.0, 0.0, 0.0, 1.0, 1.0, (facadeThickness) / 16.0); - case SOUTH: + } + case SOUTH -> { return AxisAlignedBB.getBoundingBox(0.0, 0.0, (16.0 - facadeThickness) / 16.0, 1.0, 1.0, 1.0); - case UP: + } + case UP -> { return AxisAlignedBB.getBoundingBox(0.0, (16.0 - facadeThickness) / 16.0, 0.0, 1.0, 1.0, 1.0); - case WEST: + } + case WEST -> { return AxisAlignedBB.getBoundingBox(0.0, 0.0, 0.0, (facadeThickness) / 16.0, 1.0, 1.0); - default: - break; + } + default -> {} } return AxisAlignedBB.getBoundingBox(0, 0, 0, 1, 1, 1); } diff --git a/src/main/java/appeng/util/calculators/ArithHelper.java b/src/main/java/appeng/util/calculators/ArithHelper.java index 8f6fac7e262..cb92d3b55e4 100644 --- a/src/main/java/appeng/util/calculators/ArithHelper.java +++ b/src/main/java/appeng/util/calculators/ArithHelper.java @@ -1,5 +1,7 @@ package appeng.util.calculators; +import java.math.RoundingMode; + public class ArithHelper { private static final int DEF_DIV_SCALE = 16; @@ -55,7 +57,7 @@ public static String mul(String v1, String v2) { public static String div(String v1, String v2) { java.math.BigDecimal b1 = new java.math.BigDecimal(v1); java.math.BigDecimal b2 = new java.math.BigDecimal(v2); - return String.valueOf(b1.divide(b2, DEF_DIV_SCALE, java.math.BigDecimal.ROUND_HALF_UP)); + return String.valueOf(b1.divide(b2, DEF_DIV_SCALE, RoundingMode.HALF_UP)); } /** @@ -71,7 +73,7 @@ public static double round(double v, int scale) { } java.math.BigDecimal b = new java.math.BigDecimal(Double.toString(v)); java.math.BigDecimal one = new java.math.BigDecimal("1"); - return b.divide(one, scale, java.math.BigDecimal.ROUND_HALF_UP).doubleValue(); + return b.divide(one, scale, RoundingMode.HALF_UP).doubleValue(); } public static String round(String v, int scale) { @@ -80,6 +82,6 @@ public static String round(String v, int scale) { } java.math.BigDecimal b = new java.math.BigDecimal(v); java.math.BigDecimal one = new java.math.BigDecimal("1"); - return String.valueOf(b.divide(one, scale, java.math.BigDecimal.ROUND_HALF_UP)); + return String.valueOf(b.divide(one, scale, RoundingMode.HALF_UP)); } } diff --git a/src/main/java/appeng/util/calculators/Calculator.java b/src/main/java/appeng/util/calculators/Calculator.java index c2ae0121f10..2661edeb1b1 100644 --- a/src/main/java/appeng/util/calculators/Calculator.java +++ b/src/main/java/appeng/util/calculators/Calculator.java @@ -167,21 +167,13 @@ public boolean compare(char cur, char peek) { * @return */ private String calculate(String firstValue, String secondValue, char currentOp) { - String result = ""; - switch (currentOp) { - case '+': - result = ArithHelper.add(firstValue, secondValue); - break; - case '-': - result = ArithHelper.sub(firstValue, secondValue); - break; - case '*': - result = ArithHelper.mul(firstValue, secondValue); - break; - case '/': - result = ArithHelper.div(firstValue, secondValue); - break; - } + String result = switch (currentOp) { + case '+' -> ArithHelper.add(firstValue, secondValue); + case '-' -> ArithHelper.sub(firstValue, secondValue); + case '*' -> ArithHelper.mul(firstValue, secondValue); + case '/' -> ArithHelper.div(firstValue, secondValue); + default -> ""; + }; return result; } } diff --git a/src/main/java/appeng/util/inv/AdaptorBCPipe.java b/src/main/java/appeng/util/inv/AdaptorBCPipe.java index be380a3883c..64274e64717 100644 --- a/src/main/java/appeng/util/inv/AdaptorBCPipe.java +++ b/src/main/java/appeng/util/inv/AdaptorBCPipe.java @@ -99,6 +99,6 @@ public boolean containsItems() { @Override public Iterator iterator() { - return new NullIterator(); + return new NullIterator<>(); } } diff --git a/src/main/java/appeng/util/inv/AdaptorPlayerHand.java b/src/main/java/appeng/util/inv/AdaptorPlayerHand.java index b0daf7c16c1..d28718e98c1 100644 --- a/src/main/java/appeng/util/inv/AdaptorPlayerHand.java +++ b/src/main/java/appeng/util/inv/AdaptorPlayerHand.java @@ -189,6 +189,6 @@ public boolean containsItems() { @Override public Iterator iterator() { - return new NullIterator(); + return new NullIterator<>(); } } diff --git a/src/main/java/appeng/util/inv/WrapperChainedInventory.java b/src/main/java/appeng/util/inv/WrapperChainedInventory.java index 919d2e7519b..bdf19c6f831 100644 --- a/src/main/java/appeng/util/inv/WrapperChainedInventory.java +++ b/src/main/java/appeng/util/inv/WrapperChainedInventory.java @@ -37,7 +37,7 @@ private void setInventory(final IInventory... a) { } private void calculateSizes() { - this.offsets = new HashMap(); + this.offsets = new HashMap<>(); int offset = 0; for (final IInventory in : this.l) { @@ -67,7 +67,7 @@ private void setInventory(final List a) { public void cycleOrder() { if (this.l.size() > 1) { - final List newOrder = new ArrayList(this.l.size()); + final List newOrder = new ArrayList<>(this.l.size()); newOrder.add(this.l.get(this.l.size() - 1)); for (int x = 0; x < this.l.size() - 1; x++) { newOrder.add(this.l.get(x)); diff --git a/src/main/java/appeng/util/item/AEFluidStack.java b/src/main/java/appeng/util/item/AEFluidStack.java index 9709e48caa8..7cea7710a88 100644 --- a/src/main/java/appeng/util/item/AEFluidStack.java +++ b/src/main/java/appeng/util/item/AEFluidStack.java @@ -240,7 +240,7 @@ public StorageChannel getChannel() { @Override public int compareTo(final AEFluidStack b) { final int diff = this.hashCode() - b.hashCode(); - return diff > 0 ? 1 : (diff < 0 ? -1 : 0); + return Integer.compare(diff, 0); } @Override @@ -252,8 +252,7 @@ public int hashCode() { public boolean equals(final Object ia) { if (ia instanceof AEFluidStack) { return ((AEFluidStack) ia).fluid == this.fluid && this.tagCompound == ((AEFluidStack) ia).tagCompound; - } else if (ia instanceof FluidStack) { - final FluidStack is = (FluidStack) ia; + } else if (ia instanceof FluidStack is) { if (is.getFluidID() == this.fluid.getID()) { final NBTTagCompound ta = (NBTTagCompound) this.tagCompound; diff --git a/src/main/java/appeng/util/item/AEItemDef.java b/src/main/java/appeng/util/item/AEItemDef.java index ca4200516cd..19aa178af2d 100644 --- a/src/main/java/appeng/util/item/AEItemDef.java +++ b/src/main/java/appeng/util/item/AEItemDef.java @@ -38,7 +38,7 @@ public class AEItemDef { private String displayName; @SideOnly(Side.CLIENT) - private List tooltip; + private List tooltip; @SideOnly(Side.CLIENT) private UniqueIdentifier uniqueID; @@ -138,11 +138,11 @@ void setDisplayName(final String displayName) { this.displayName = displayName; } - List getTooltip() { + List getTooltip() { return this.tooltip; } - List setTooltip(final List tooltip) { + List setTooltip(final List tooltip) { this.tooltip = tooltip; return tooltip; } diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/src/main/java/appeng/util/item/AEItemStack.java index 0457775edb9..a4b00629a02 100644 --- a/src/main/java/appeng/util/item/AEItemStack.java +++ b/src/main/java/appeng/util/item/AEItemStack.java @@ -398,8 +398,7 @@ public boolean equals(final Object ia) { return ((AEItemStack) ia).getDefinition().equals(this.getDefinition()); // && def.tagCompound == // ((AEItemStack) // ia).def.tagCompound; - } else if (ia instanceof ItemStack) { - final ItemStack is = (ItemStack) ia; + } else if (ia instanceof ItemStack is) { if (is.getItem() == this.getDefinition().getItem() && is.getItemDamage() == this.getDefinition().getDamageValue()) { @@ -468,11 +467,11 @@ private int compareNBT(final AEItemDef b) { } private int compare(final int l, final int m) { - return l < m ? -1 : (l > m ? 1 : 0); + return Integer.compare(l, m); } @SideOnly(Side.CLIENT) - public List getToolTip() { + public List getToolTip() { if (this.getDefinition().getTooltip() != null) { return this.getDefinition().getTooltip(); } diff --git a/src/main/java/appeng/util/item/AESharedNBT.java b/src/main/java/appeng/util/item/AESharedNBT.java index 8af24cb572e..5c1adf820ad 100644 --- a/src/main/java/appeng/util/item/AESharedNBT.java +++ b/src/main/java/appeng/util/item/AESharedNBT.java @@ -30,7 +30,7 @@ public class AESharedNBT extends NBTTagCompound implements IAETagCompound { /* * Shared Tag Compound Cache. */ - private static final WeakHashMap> SHARED_TAG_COMPOUND = new WeakHashMap>(); + private static final WeakHashMap> SHARED_TAG_COMPOUND = new WeakHashMap<>(); private final Item item; private final int meta; private SharedSearchObject sso; @@ -93,7 +93,7 @@ static synchronized NBTTagCompound getSharedTagCompound(final NBTTagCompound tag sso.setShared(clone); clone.sso = sso; - SHARED_TAG_COMPOUND.put(sso, new WeakReference(sso)); + SHARED_TAG_COMPOUND.put(sso, new WeakReference<>(sso)); return clone; } diff --git a/src/main/java/appeng/util/item/AEStack.java b/src/main/java/appeng/util/item/AEStack.java index 32a2d79a513..4e7dc405e58 100644 --- a/src/main/java/appeng/util/item/AEStack.java +++ b/src/main/java/appeng/util/item/AEStack.java @@ -15,7 +15,7 @@ import appeng.api.storage.data.IAEStack; import io.netty.buffer.ByteBuf; -public abstract class AEStack implements IAEStack { +public abstract class AEStack> implements IAEStack { private boolean isCraftable; private long stackSize; diff --git a/src/main/java/appeng/util/item/FluidList.java b/src/main/java/appeng/util/item/FluidList.java index 68bd9fd7aaa..6811c0f6999 100644 --- a/src/main/java/appeng/util/item/FluidList.java +++ b/src/main/java/appeng/util/item/FluidList.java @@ -18,7 +18,7 @@ public final class FluidList implements IItemList { - private final Map records = new HashMap(); + private final Map records = new HashMap<>(); @Override public void add(final IAEFluidStack option) { @@ -141,7 +141,7 @@ public int size() { @Override public Iterator iterator() { - return new MeaningfulFluidIterator(this.records.values().iterator()); + return new MeaningfulFluidIterator<>(this.records.values().iterator()); } @Override diff --git a/src/main/java/appeng/util/item/ItemList.java b/src/main/java/appeng/util/item/ItemList.java index 488f6a4b2f4..b6bb09858d5 100644 --- a/src/main/java/appeng/util/item/ItemList.java +++ b/src/main/java/appeng/util/item/ItemList.java @@ -21,7 +21,7 @@ public final class ItemList implements IItemList { - private final NavigableMap records = new ConcurrentSkipListMap(); + private final NavigableMap records = new ConcurrentSkipListMap<>(); @Override public void add(final IAEItemStack option) { @@ -67,7 +67,7 @@ public Collection findFuzzy(final IAEItemStack filter, final Fuzzy return this .findFuzzyDamage((AEItemStack) is, fuzzy, is.getItemDamage() == OreDictionary.WILDCARD_VALUE); } else { - final Collection output = new LinkedList(); + final Collection output = new LinkedList<>(); for (final IAEItemStack is : or.getAEEquivalents()) { output.addAll( @@ -169,7 +169,7 @@ public int size() { @Override public Iterator iterator() { - return new MeaningfulItemIterator(this.records.values().iterator()); + return new MeaningfulItemIterator<>(this.records.values().iterator()); } @Override diff --git a/src/main/java/appeng/util/item/OreHelper.java b/src/main/java/appeng/util/item/OreHelper.java index 44bd68dd9b0..6e19d6729de 100644 --- a/src/main/java/appeng/util/item/OreHelper.java +++ b/src/main/java/appeng/util/item/OreHelper.java @@ -31,7 +31,7 @@ public class OreHelper { * A local cache to speed up OreDictionary lookups. */ private final LoadingCache> oreDictCache = CacheBuilder.newBuilder() - .build(new CacheLoader>() { + .build(new CacheLoader<>() { @Override public List load(final String oreName) { @@ -39,7 +39,7 @@ public List load(final String oreName) { } }); - private final Map references = new HashMap(); + private final Map references = new HashMap<>(); /** * Test if the passed {@link ItemStack} is an ore. diff --git a/src/main/java/appeng/util/item/OreReference.java b/src/main/java/appeng/util/item/OreReference.java index e833ebcf82d..bc78430e7e1 100644 --- a/src/main/java/appeng/util/item/OreReference.java +++ b/src/main/java/appeng/util/item/OreReference.java @@ -18,8 +18,8 @@ public class OreReference { - private final List otherOptions = new LinkedList(); - private final Set ores = new HashSet(); + private final List otherOptions = new LinkedList<>(); + private final Set ores = new HashSet<>(); private List aeOtherOptions = null; public Collection getEquivalents() { @@ -28,7 +28,7 @@ public Collection getEquivalents() { List getAEEquivalents() { if (this.aeOtherOptions == null) { - this.aeOtherOptions = new ArrayList(this.otherOptions.size()); + this.aeOtherOptions = new ArrayList<>(this.otherOptions.size()); // SUMMON AE STACKS! for (final String oreName : this.otherOptions) { diff --git a/src/main/java/appeng/util/iterators/ChainedIterator.java b/src/main/java/appeng/util/iterators/ChainedIterator.java index f39c119946f..9a5095fa81a 100644 --- a/src/main/java/appeng/util/iterators/ChainedIterator.java +++ b/src/main/java/appeng/util/iterators/ChainedIterator.java @@ -12,12 +12,17 @@ import java.util.Iterator; +/** + * @deprecated Use Guava's {@link com.google.common.collect.Iterators} types instead + */ +@Deprecated public final class ChainedIterator implements Iterator { private final T[] list; private int offset = 0; + @SafeVarargs public ChainedIterator(final T... list) { this.list = list; } diff --git a/src/main/java/appeng/util/prioitylist/MergedPriorityList.java b/src/main/java/appeng/util/prioitylist/MergedPriorityList.java index 8bc9cec1208..7b0fe168731 100644 --- a/src/main/java/appeng/util/prioitylist/MergedPriorityList.java +++ b/src/main/java/appeng/util/prioitylist/MergedPriorityList.java @@ -17,8 +17,8 @@ public final class MergedPriorityList> implements IPartitionList { - private final Collection> positive = new ArrayList>(); - private final Collection> negative = new ArrayList>(); + private final Collection> positive = new ArrayList<>(); + private final Collection> negative = new ArrayList<>(); public void addNewList(final IPartitionList list, final boolean isWhitelist) { if (isWhitelist) { diff --git a/src/main/java/appeng/worldgen/MeteoritePlacer.java b/src/main/java/appeng/worldgen/MeteoritePlacer.java index 343c1eda58f..0c1cc3b5ad3 100644 --- a/src/main/java/appeng/worldgen/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/MeteoritePlacer.java @@ -323,24 +323,22 @@ private void placeMeteorite(final IMeteoriteWorld w, final int x, final int y, f final int secondaryCount = 1 + lootRng.nextInt(3); for (int zz = 0; zz < secondaryCount; zz++) { switch (lootRng.nextInt(3)) { - case 0: + case 0 -> { final int amount = 1 + lootRng.nextInt(SKYSTONE_SPAWN_LIMIT); for (final ItemStack skyStoneStack : skyStoneDefinition.maybeStack(amount).asSet()) { ap.addItems(skyStoneStack); } - break; - case 1: + } + case 1 -> { ItemStack nugget = nuggetLoot.get(lootRng.nextInt(nuggetLoot.size())); if (nugget != null) { nugget = nugget.copy(); nugget.stackSize = 1 + lootRng.nextInt(12); ap.addItems(nugget); } - break; - case 2: - default: - // Add nothing - break; + } + default -> {} + // Add nothing } } }