diff options
Diffstat (limited to 'src/main/java/gregtech/common')
143 files changed, 1328 insertions, 1935 deletions
diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java index 9938b46ab0..505fa1a96d 100644 --- a/src/main/java/gregtech/common/GT_Client.java +++ b/src/main/java/gregtech/common/GT_Client.java @@ -342,37 +342,37 @@ public class GT_Client extends GT_Proxy implements Runnable { for (byte tSide : ALL_VALID_SIDES) { if ((tConnections & (1 << tSide)) != 0) { switch (GRID_SWITCH_TABLE[aEvent.target.sideHit][tSide]) { - case 0: + case 0 -> { GL11.glVertex3d(+.25D, .0D, +.25D); GL11.glVertex3d(-.25D, .0D, -.25D); GL11.glVertex3d(-.25D, .0D, +.25D); GL11.glVertex3d(+.25D, .0D, -.25D); - break; - case 1: + } + case 1 -> { GL11.glVertex3d(-.25D, .0D, +.50D); GL11.glVertex3d(+.25D, .0D, +.25D); GL11.glVertex3d(-.25D, .0D, +.25D); GL11.glVertex3d(+.25D, .0D, +.50D); - break; - case 2: + } + case 2 -> { GL11.glVertex3d(-.50D, .0D, -.25D); GL11.glVertex3d(-.25D, .0D, +.25D); GL11.glVertex3d(-.50D, .0D, +.25D); GL11.glVertex3d(-.25D, .0D, -.25D); - break; - case 3: + } + case 3 -> { GL11.glVertex3d(-.25D, .0D, -.50D); GL11.glVertex3d(+.25D, .0D, -.25D); GL11.glVertex3d(-.25D, .0D, -.25D); GL11.glVertex3d(+.25D, .0D, -.50D); - break; - case 4: + } + case 4 -> { GL11.glVertex3d(+.50D, .0D, -.25D); GL11.glVertex3d(+.25D, .0D, +.25D); GL11.glVertex3d(+.50D, .0D, +.25D); GL11.glVertex3d(+.25D, .0D, -.25D); - break; - case 5: + } + case 5 -> { GL11.glVertex3d(+.50D, .0D, +.50D); GL11.glVertex3d(+.25D, .0D, +.25D); GL11.glVertex3d(+.50D, .0D, +.25D); @@ -389,7 +389,7 @@ public class GT_Client extends GT_Proxy implements Runnable { GL11.glVertex3d(-.25D, .0D, -.25D); GL11.glVertex3d(-.50D, .0D, -.25D); GL11.glVertex3d(-.25D, .0D, -.50D); - break; + } } } } @@ -744,8 +744,7 @@ public class GT_Client extends GT_Proxy implements Runnable { trace.blockX, trace.blockY, trace.blockZ); - if (tileEntity instanceof IGregTechTileEntity) { - final IGregTechTileEntity gtTile = (IGregTechTileEntity) tileEntity; + if (tileEntity instanceof IGregTechTileEntity gtTile) { if (gtTile.getMetaTileEntity() instanceof IHasFluidDisplayItem) { GT_Values.NW.sendToServer( new MessageUpdateFluidDisplayItem( @@ -948,59 +947,33 @@ public class GT_Client extends GT_Proxy implements Runnable { if (tString.startsWith(SoundResource.RANDOM_EXPLODE.toString())) if (aStack.stackSize == 3) tString = SoundResource.RANDOM_FUSE.toString(); else if (aStack.stackSize == 2) tString = "random.old_explode"; - if (tString.startsWith("streaming.")) switch (aStack.stackSize) { - case 1: // '\001' - tString = tString + "13"; - break; - - case 2: // '\002' - tString = tString + "cat"; - break; - - case 3: // '\003' - tString = tString + "blocks"; - break; - - case 4: // '\004' - tString = tString + "chirp"; - break; - - case 5: // '\005' - tString = tString + "far"; - break; - - case 6: // '\006' - tString = tString + "mall"; - break; - - case 7: // '\007' - tString = tString + "mellohi"; - break; - - case 8: // '\b' - tString = tString + "stal"; - break; - - case 9: // '\t' - tString = tString + "strad"; - break; - - case 10: // '\n' - tString = tString + "ward"; - break; - - case 11: // '\013' - tString = tString + "11"; - break; - - case 12: // '\f' - tString = tString + "wait"; - break; - - default: - tString = tString + "wherearewenow"; - break; - } + if (tString.startsWith("streaming.")) tString = switch (aStack.stackSize) { + case 1 -> // '\001' + tString + "13"; + case 2 -> // '\002' + tString + "cat"; + case 3 -> // '\003' + tString + "blocks"; + case 4 -> // '\004' + tString + "chirp"; + case 5 -> // '\005' + tString + "far"; + case 6 -> // '\006' + tString + "mall"; + case 7 -> // '\007' + tString + "mellohi"; + case 8 -> // '\b' + tString + "stal"; + case 9 -> // '\t' + tString + "strad"; + case 10 -> // '\n' + tString + "ward"; + case 11 -> // '\013' + tString + "11"; + case 12 -> // '\f' + tString + "wait"; + default -> tString + "wherearewenow"; + }; if (tString.startsWith("streaming.")) { new WorldSpawnedEventBuilder.RecordEffectEventBuilder().setIdentifier(tString.substring(10)) .setPosition(aX, aY, aZ) diff --git a/src/main/java/gregtech/common/GT_Network.java b/src/main/java/gregtech/common/GT_Network.java index 665439dbd8..b6d44be85b 100644 --- a/src/main/java/gregtech/common/GT_Network.java +++ b/src/main/java/gregtech/common/GT_Network.java @@ -141,10 +141,9 @@ public class GT_Network extends MessageToMessageCodec<FMLProxyPacket, GT_Packet> public void sendPacketToAllPlayersInRange(World aWorld, GT_Packet aPacket, int aX, int aZ) { if (!aWorld.isRemote) { for (Object tObject : aWorld.playerEntities) { - if (!(tObject instanceof EntityPlayerMP)) { + if (!(tObject instanceof EntityPlayerMP tPlayer)) { break; } - EntityPlayerMP tPlayer = (EntityPlayerMP) tObject; Chunk tChunk = aWorld.getChunkFromBlockCoords(aX, aZ); if (tPlayer.getServerForPlayer() .getPlayerManager() diff --git a/src/main/java/gregtech/common/GT_PlayerActivityLogger.java b/src/main/java/gregtech/common/GT_PlayerActivityLogger.java index 384a3a8eb4..686c066c2c 100644 --- a/src/main/java/gregtech/common/GT_PlayerActivityLogger.java +++ b/src/main/java/gregtech/common/GT_PlayerActivityLogger.java @@ -15,14 +15,14 @@ public class GT_PlayerActivityLogger implements Runnable { return; } ArrayList<String> tList = GT_Mod.gregtechproxy.mBufferedPlayerActivity; - GT_Mod.gregtechproxy.mBufferedPlayerActivity = new ArrayList(); + GT_Mod.gregtechproxy.mBufferedPlayerActivity = new ArrayList<>(); String tLastOutput = ""; int i = 0; for (int j = tList.size(); i < j; i++) { if (!tLastOutput.equals(tList.get(i))) { - GT_Log.pal.println((String) tList.get(i)); + GT_Log.pal.println(tList.get(i)); } - tLastOutput = (String) tList.get(i); + tLastOutput = tList.get(i); } Thread.sleep(10000L); } diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index 30de62084a..df8d0bb39b 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -47,6 +47,7 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBow; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; import net.minecraft.tileentity.TileEntity; @@ -763,10 +764,12 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG try { for (String tOreName : OreDictionary.getOreNames()) { ItemStack tOreStack; - for (Iterator i$ = OreDictionary.getOres(tOreName) - .iterator(); i$.hasNext(); registerOre( - new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) { - tOreStack = (ItemStack) i$.next(); + for (Iterator<ItemStack> i$ = OreDictionary.getOres(tOreName) + .iterator(); i$.hasNext(); registerOre( + new OreDictionary.OreRegisterEvent( + tOreName, + tOreStack))) { + tOreStack = i$.next(); } } } catch (Throwable e) { @@ -1318,19 +1321,19 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_Log.out.println( "GT_Mod: Cleaning up all OreDict Crafting Recipes, which have an empty List in them, since they are never meeting any Condition."); - List tList = CraftingManager.getInstance() - .getRecipeList(); + List<IRecipe> tList = CraftingManager.getInstance() + .getRecipeList(); for (int i = 0; i < tList.size(); i++) { if ((tList.get(i) instanceof ShapedOreRecipe)) { for (Object tObject : ((ShapedOreRecipe) tList.get(i)).getInput()) { - if (((tObject instanceof List)) && (((List) tObject).isEmpty())) { + if (((tObject instanceof List)) && (((List<?>) tObject).isEmpty())) { tList.remove(i--); break; } } } else if ((tList.get(i) instanceof ShapelessOreRecipe)) { for (Object tObject : ((ShapelessOreRecipe) tList.get(i)).getInput()) { - if (((tObject instanceof List)) && (((List) tObject).isEmpty())) { + if (((tObject instanceof List)) && (((List<?>) tObject).isEmpty())) { tList.remove(i--); break; } @@ -1673,24 +1676,31 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } else if (aEvent.Name.equals("sheetPlastic")) { GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Plastic, aEvent.Ore); } else if (aEvent.Name.startsWith("shard")) { - if (aEvent.Name.equals("shardAir")) { - GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedAir, aEvent.Ore); - return; - } else if (aEvent.Name.equals("shardWater")) { - GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedWater, aEvent.Ore); - return; - } else if (aEvent.Name.equals("shardFire")) { - GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedFire, aEvent.Ore); - return; - } else if (aEvent.Name.equals("shardEarth")) { - GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedEarth, aEvent.Ore); - return; - } else if (aEvent.Name.equals("shardOrder")) { - GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedOrder, aEvent.Ore); - return; - } else if (aEvent.Name.equals("shardEntropy")) { - GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedEntropy, aEvent.Ore); - return; + switch (aEvent.Name) { + case "shardAir" -> { + GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedAir, aEvent.Ore); + return; + } + case "shardWater" -> { + GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedWater, aEvent.Ore); + return; + } + case "shardFire" -> { + GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedFire, aEvent.Ore); + return; + } + case "shardEarth" -> { + GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedEarth, aEvent.Ore); + return; + } + case "shardOrder" -> { + GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedOrder, aEvent.Ore); + return; + } + case "shardEntropy" -> { + GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedEntropy, aEvent.Ore); + return; + } } } else if (aEvent.Name.equals("fieryIngot")) { GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.FierySteel, aEvent.Ore); @@ -1778,11 +1788,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } if (aMaterial != Materials._NULL) { Materials tReRegisteredMaterial; - for (Iterator i$ = aMaterial.mOreReRegistrations.iterator(); i$.hasNext(); GT_OreDictUnificator.registerOre( + for (Iterator<Materials> i$ = aMaterial.mOreReRegistrations.iterator(); i$.hasNext(); GT_OreDictUnificator.registerOre( aPrefix, tReRegisteredMaterial, aEvent.Ore)) { - tReRegisteredMaterial = (Materials) i$.next(); + tReRegisteredMaterial = i$.next(); } aMaterial.add(GT_Utility.copyAmount(1L, aEvent.Ore)); @@ -1800,14 +1810,14 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } switch (aPrefix) { - case crystal: + case crystal -> { if ((aMaterial == Materials.CertusQuartz) || (aMaterial == Materials.NetherQuartz) || (aMaterial == Materials.Fluix)) { GT_OreDictUnificator.registerOre(OrePrefixes.gem, aMaterial, aEvent.Ore); } - break; - case gem: + } + case gem -> { if (aMaterial == Materials.Lapis || aMaterial == Materials.Sodalite) { GT_OreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore); } else if (aMaterial == Materials.Lazurite) { @@ -1847,8 +1857,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG OreDictNames.craftingQuartz, aEvent.Ore); } - break; - case cableGt01: + } + case cableGt01 -> { if (aMaterial == Materials.Tin) { GT_OreDictUnificator.registerOre(OreDictNames.craftingWireTin, aEvent.Ore); } else if (aMaterial == Materials.AnyCopper) { @@ -1860,8 +1870,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } else if (aMaterial == Materials.AnyIron) { GT_OreDictUnificator.registerOre(OreDictNames.craftingWireIron, aEvent.Ore); } - break; - case lens: + } + case lens -> { if ((aMaterial.contains(SubTag.TRANSPARENT)) && (aMaterial.mColor != Dyes._NULL)) { GT_OreDictUnificator.registerOre( @@ -1869,8 +1879,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG .replaceFirst("dye", ""), aEvent.Ore); } - break; - case plate: + } + case plate -> { if ((aMaterial == Materials.Plastic) || (aMaterial == Materials.Rubber)) { GT_OreDictUnificator.registerOre(OrePrefixes.sheet, aMaterial, aEvent.Ore); } else if (aMaterial == Materials.Silicon) { @@ -1879,16 +1889,17 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG GT_OreDictUnificator.addToBlacklist(aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.plank, aMaterial, aEvent.Ore); } - break; - case cell: + } + case cell -> { if (aMaterial == Materials.Empty) { GT_OreDictUnificator.addToBlacklist(aEvent.Ore); } - break; - case gearGt: - GT_OreDictUnificator.registerOre(OrePrefixes.gear, aMaterial, aEvent.Ore); - break; - case stick: + } + case gearGt -> GT_OreDictUnificator.registerOre( + OrePrefixes.gear, + aMaterial, + aEvent.Ore); + case stick -> { if (!GT_RecipeRegistrator.sRodMaterialList.contains(aMaterial)) { GT_RecipeRegistrator.sRodMaterialList.add(aMaterial); } else if (aMaterial == Materials.Wood) { @@ -1899,8 +1910,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG ToolDictNames.craftingToolSolderingMetal, aEvent.Ore); } - break; - case dust: + } + case dust -> { if (aMaterial == Materials.Salt) { GT_OreDictUnificator.registerOre("itemSalt", aEvent.Ore); } else if (aMaterial == Materials.Wood) { @@ -1923,8 +1934,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } else if (aMaterial == Materials.YellowLimonite) { GT_OreDictUnificator.registerOre(Dyes.dyeYellow, aEvent.Ore); } - break; - case ingot: + } + case ingot -> { if (aMaterial == Materials.Rubber) { GT_OreDictUnificator.registerOre("itemRubber", aEvent.Ore); } else if (aMaterial == Materials.FierySteel) { @@ -1996,9 +2007,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG 400, 8); } - break; - default: - break; + } + default -> {} } if (aPrefix.mIsUnificatable && !aMaterial.mUnificatable) { return; @@ -2035,55 +2045,51 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG return; } switch (aPrefix) { - case dye: + case dye -> { if (GT_Utility.isStringValid(tName)) { GT_OreDictUnificator.registerOre(OrePrefixes.dye, aEvent.Ore); } - break; - case stoneSmooth: - GT_OreDictUnificator.registerOre("stone", aEvent.Ore); - break; - case stoneCobble: - GT_OreDictUnificator.registerOre("cobblestone", aEvent.Ore); - break; - case plank: + } + case stoneSmooth -> GT_OreDictUnificator.registerOre("stone", aEvent.Ore); + case stoneCobble -> GT_OreDictUnificator.registerOre("cobblestone", aEvent.Ore); + case plank -> { if (tName.equals("Wood")) { GT_OreDictUnificator.addItemData(aEvent.Ore, new ItemData(Materials.Wood, 3628800L)); } - break; - case slab: + } + case slab -> { if (tName.equals("Wood")) { GT_OreDictUnificator.addItemData(aEvent.Ore, new ItemData(Materials.Wood, 1814400L)); } - break; - case sheet: + } + case sheet -> { if (tName.equals("Plastic")) { GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Plastic, aEvent.Ore); } else if (tName.equals("Rubber")) { GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Rubber, aEvent.Ore); } - break; - case crafting: - if (tName.equals("ToolSolderingMetal")) { - GregTech_API.registerSolderingMetal(aEvent.Ore); - } else if (tName.equals("IndustrialDiamond")) { - GT_OreDictUnificator.addToBlacklist(aEvent.Ore); - } else if (tName.equals("WireCopper")) { - GT_OreDictUnificator.registerOre(OrePrefixes.wire, Materials.Copper, aEvent.Ore); + } + case crafting -> { + switch (tName) { + case "ToolSolderingMetal" -> GregTech_API.registerSolderingMetal(aEvent.Ore); + case "IndustrialDiamond" -> GT_OreDictUnificator.addToBlacklist(aEvent.Ore); + case "WireCopper" -> GT_OreDictUnificator.registerOre( + OrePrefixes.wire, + Materials.Copper, + aEvent.Ore); } - break; - case wood: + } + case wood -> { if (tName.equals("Rubber")) { GT_OreDictUnificator.registerOre("logRubber", aEvent.Ore); } - break; - case food: + } + case food -> { if (tName.equals("Cocoapowder")) { GT_OreDictUnificator.registerOre(OrePrefixes.dust, Materials.Cocoa, aEvent.Ore); } - break; - default: - break; + } + default -> {} } } GT_Log.ore.println(tModToName); @@ -2196,7 +2202,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG } for (int i = 0; i < aEvent.world.loadedEntityList.size(); i++) { if ((aEvent.world.loadedEntityList.get(i) instanceof Entity)) { - Entity tEntity = (Entity) aEvent.world.loadedEntityList.get(i); + Entity tEntity = aEvent.world.loadedEntityList.get(i); if (((tEntity instanceof EntityItem)) && (this.mItemDespawnTime != 6000) && (((EntityItem) tEntity).lifespan == 6000)) { ((EntityItem) tEntity).lifespan = this.mItemDespawnTime; @@ -2204,13 +2210,13 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG && (!(tEntity instanceof EntityPlayer)) && (tEntity.canBePushed()) && (((EntityLivingBase) tEntity).getHealth() > 0.0F)) { - List tList = tEntity.worldObj.getEntitiesWithinAABBExcludingEntity( + List<Entity> tList = tEntity.worldObj.getEntitiesWithinAABBExcludingEntity( tEntity, tEntity.boundingBox.expand( 0.20000000298023224D, 0.0D, 0.20000000298023224D)); - Class tClass = tEntity.getClass(); + Class<? extends Entity> tClass = tEntity.getClass(); int tEntityCount = 1; if (tList != null) { for (Object o : tList) { @@ -2395,8 +2401,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG return null; } final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if ((tTileEntity instanceof IGregTechTileEntity)) { - final IGregTechTileEntity tile = (IGregTechTileEntity) tTileEntity; + if ((tTileEntity instanceof IGregTechTileEntity tile)) { if (GUI_ID_COVER_SIDE_BASE <= aID && aID < GUI_ID_COVER_SIDE_BASE + 6) { final byte side = (byte) (aID - GT_Proxy.GUI_ID_COVER_SIDE_BASE); diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 5c7ac4cd4a..3816973227 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -510,7 +510,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { public void addDefaultPolymerizationRecipes(Fluid aBasicMaterial, ItemStack aBasicMaterialCell, Fluid aPolymer) { // Oxygen/Titaniumtetrafluoride -> +50% Output each addChemicalRecipe( - ItemList.Cell_Air.get(1, new Object[0]), + ItemList.Cell_Air.get(1), GT_Utility.getIntegratedCircuit(1), new GT_FluidStack(aBasicMaterial, 144), new GT_FluidStack(aPolymer, 144), @@ -1278,7 +1278,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (tGunpowder < 65) { GT_Recipe.GT_Recipe_Map.sImplosionRecipes.addRecipe( true, - new ItemStack[] { aInput1, ItemList.Block_Powderbarrel.get(tGunpowder, new Object[0]) }, + new ItemStack[] { aInput1, ItemList.Block_Powderbarrel.get(tGunpowder) }, new ItemStack[] { aOutput1, aOutput2 }, null, null, @@ -2366,7 +2366,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { } List<FluidStack> tFluidOutputList; if (FluidOutputArray != null) { - tFluidOutputList = new ArrayList<>(Arrays.asList(FluidOutputArray));; + tFluidOutputList = new ArrayList<>(Arrays.asList(FluidOutputArray)); } else { tFluidOutputList = new ArrayList<>(1); } @@ -2854,7 +2854,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { } GT_Recipe.GT_Recipe_Map.sPyrolyseRecipes.addRecipe( false, - new ItemStack[] { aInput, ItemList.Circuit_Integrated.getWithDamage(0L, intCircuit, new Object[0]) }, + new ItemStack[] { aInput, ItemList.Circuit_Integrated.getWithDamage(0L, intCircuit) }, new ItemStack[] { aOutput }, null, null, @@ -2921,7 +2921,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { false, new ItemStack[] { aResearchItem }, new ItemStack[] { aOutput }, - new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Writes Research result", new Object[0]) }, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Writes Research result") }, null, null, aResearchTime, @@ -2931,7 +2931,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { false, aInputs, new ItemStack[] { aOutput }, - new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Reads Research result", new Object[0]) }, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Reads Research result") }, aFluidInputs, null, aDuration, @@ -2974,8 +2974,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { tAlts[i] = null; tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(tInputs[i], true, false); continue; - } else if (obj instanceof ItemStack[]) { - ItemStack[] aStacks = (ItemStack[]) obj; + } else if (obj instanceof ItemStack[]aStacks) { if (aStacks.length > 0) { tInputs[i] = aStacks[0]; tAlts[i] = Arrays.copyOf(aStacks, aStacks.length); @@ -2985,8 +2984,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { tPersistentHash *= 31; continue; } - } else if (obj instanceof Object[]) { - Object[] objs = (Object[]) obj; + } else if (obj instanceof Object[]objs) { List<ItemStack> tList; if (objs.length >= 2 && !(tList = GT_OreDictUnificator.getOres(objs[0])).isEmpty()) { try { @@ -3032,7 +3030,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { false, new ItemStack[] { aResearchItem }, new ItemStack[] { aOutput }, - new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Writes Research result", new Object[0]) }, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Writes Research result") }, null, null, aResearchTime, @@ -3042,7 +3040,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { false, tInputs, new ItemStack[] { aOutput }, - new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Reads Research result", new Object[0]) }, + new ItemStack[] { ItemList.Tool_DataStick.getWithName(1L, "Reads Research result") }, aFluidInputs, null, aDuration, diff --git a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java index a7a2f0d4ee..9c7eeb8f09 100644 --- a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java +++ b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java @@ -123,10 +123,10 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { private static final AspectList getAspectList(List<TC_Aspects.TC_AspectStack> aAspects) { AspectList rAspects = new AspectList(); TC_Aspects.TC_AspectStack tAspect; - for (Iterator i$ = aAspects.iterator(); i$.hasNext(); rAspects.add( + for (Iterator<TC_Aspects.TC_AspectStack> i$ = aAspects.iterator(); i$.hasNext(); rAspects.add( (Aspect) tAspect.mAspect.mAspect, (int) tAspect.mAmount)) { - tAspect = (TC_Aspects.TC_AspectStack) i$.next(); + tAspect = i$.next(); } return rAspects; } @@ -142,9 +142,7 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { if (tCategory == null) { return null; } - for (Iterator i$ = tCategory.research.values() - .iterator(); i$.hasNext();) { - ResearchItem tResearch = (ResearchItem) i$.next(); + for (ResearchItem tResearch : tCategory.research.values()) { if ((tResearch.displayColumn == aX) && (tResearch.displayRow == aY)) { aX += (aX > 0 ? 5 : -5); aY += (aY > 0 ? 5 : -5); @@ -158,7 +156,7 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { aY, aComplexity, aIcon); - ArrayList<ResearchPage> tPages = new ArrayList(aPages.length); + ArrayList<ResearchPage> tPages = new ArrayList<>(aPages.length); GT_LanguageManager.addStringLocalization("tc.research_name." + aResearch, aName); GT_LanguageManager.addStringLocalization("tc.research_text." + aResearch, "[GT] " + aText); for (Object tPage : aPages) { @@ -198,14 +196,14 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { rResearch.setStub(); } if (aParentResearches != null) { - ArrayList<String> tParentResearches = new ArrayList(); + ArrayList<String> tParentResearches = new ArrayList<>(); for (String tParent : aParentResearches) { if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.researches, aResearch, true)) { tParentResearches.add(tParent); } } if (tParentResearches.size() > 0) { - rResearch.setParents((String[]) tParentResearches.toArray(new String[tParentResearches.size()])); + rResearch.setParents(tParentResearches.toArray(new String[0])); rResearch.setConcealed(); } } @@ -213,7 +211,7 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { rResearch.setItemTriggers(aResearchTriggers); rResearch.setHidden(); } - rResearch.setPages((ResearchPage[]) tPages.toArray(new ResearchPage[tPages.size()])); + rResearch.setPages(tPages.toArray(new ResearchPage[0])); return rResearch.registerResearchItem(); } @@ -273,7 +271,7 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { public boolean registerThaumcraftAspectsToItem(ItemStack aExampleStack, List<TC_Aspects.TC_AspectStack> aAspects, String aOreDict) { if (aAspects.isEmpty()) return false; - ThaumcraftApi.registerObjectTag(aOreDict, (AspectList) getAspectList(aAspects)); + ThaumcraftApi.registerObjectTag(aOreDict, getAspectList(aAspects)); return true; } @@ -282,12 +280,12 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { boolean aAdditive) { if (aAspects.isEmpty()) return false; if (aAdditive) { - ThaumcraftApi.registerComplexObjectTag(aStack, (AspectList) getAspectList(aAspects)); + ThaumcraftApi.registerComplexObjectTag(aStack, getAspectList(aAspects)); return true; } AspectList tAlreadyRegisteredAspects = ThaumcraftApiHelper.getObjectAspects(aStack); if (tAlreadyRegisteredAspects == null || tAlreadyRegisteredAspects.size() <= 0) { - ThaumcraftApi.registerObjectTag(aStack, (AspectList) getAspectList(aAspects)); + ThaumcraftApi.registerObjectTag(aStack, getAspectList(aAspects)); } return true; } diff --git a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java index f11d6d0640..0b10523f1a 100644 --- a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java +++ b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java @@ -21,7 +21,7 @@ import gregtech.common.blocks.GT_TileEntity_Ores; public class GT_Worldgen_GT_Ore_Layer extends GT_Worldgen { - public static ArrayList<GT_Worldgen_GT_Ore_Layer> sList = new ArrayList(); + public static ArrayList<GT_Worldgen_GT_Ore_Layer> sList = new ArrayList<>(); public static int sWeight = 0; public final short mMinY; public final short mMaxY; diff --git a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java index 5387668dce..fb44948805 100644 --- a/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java +++ b/src/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java @@ -26,7 +26,7 @@ public class GT_Worldgen_GT_Ore_SmallPieces extends GT_Worldgen { public final boolean mMoon = false, mMars = false, mAsteroid = false; public final String mBiome; public final String aTextWorldgen = "worldgen."; - public static ArrayList<GT_Worldgen_GT_Ore_SmallPieces> sList = new ArrayList<GT_Worldgen_GT_Ore_SmallPieces>(); + public static ArrayList<GT_Worldgen_GT_Ore_SmallPieces> sList = new ArrayList<>(); // TODO CHECK IF INSTANTIATION IS CORRECT public GT_Worldgen_GT_Ore_SmallPieces(String aName, boolean aDefault, int aMinY, int aMaxY, int aAmount, diff --git a/src/main/java/gregtech/common/GT_Worldgen_Stone.java b/src/main/java/gregtech/common/GT_Worldgen_Stone.java index 22782d8231..94b529c1e5 100644 --- a/src/main/java/gregtech/common/GT_Worldgen_Stone.java +++ b/src/main/java/gregtech/common/GT_Worldgen_Stone.java @@ -22,7 +22,7 @@ import gregtech.common.blocks.GT_TileEntity_Ores; public class GT_Worldgen_Stone extends GT_Worldgen_Ore { - static final double sizeConversion[] = { 1, 1, 1.333333, 1.333333, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 }; // Bias + static final double[] sizeConversion = { 1, 1, 1.333333, 1.333333, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 }; // Bias // the // sizes // towards @@ -36,18 +36,18 @@ public class GT_Worldgen_Stone extends GT_Worldgen_Ore { // or // sills. - public Hashtable<Long, StoneSeeds> validStoneSeeds = new Hashtable(1024); + public Hashtable<Long, StoneSeeds> validStoneSeeds = new Hashtable<>(1024); - class StoneSeeds { + static class StoneSeeds { public boolean mExists; StoneSeeds(boolean exists) { mExists = exists; } - }; + } - class ValidSeeds { + static class ValidSeeds { public int mX; public int mZ; @@ -56,7 +56,7 @@ public class GT_Worldgen_Stone extends GT_Worldgen_Ore { this.mX = x; this.mZ = z; } - }; + } public GT_Worldgen_Stone(String aName, boolean aDefault, Block aBlock, int aBlockMeta, int aDimensionType, int aAmount, int aSize, int aProbability, int aMinY, int aMaxY, Collection<String> aBiomeList, @@ -80,7 +80,7 @@ public class GT_Worldgen_Stone extends GT_Worldgen_Ore { public boolean executeWorldgen(World aWorld, Random aRandom, String aBiome, int aDimensionType, int aChunkX, int aChunkZ, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) { XSTR stoneRNG = new XSTR(); - ArrayList<ValidSeeds> stones = new ArrayList(); + ArrayList<ValidSeeds> stones = new ArrayList<>(); if (!isGenerationAllowed(aWorld, aDimensionType, this.mDimensionType)) { return false; @@ -96,13 +96,12 @@ public class GT_Worldgen_Stone extends GT_Worldgen_Ore { // Check stone seeds to see if they have been added for (int x = aChunkX / 16 - windowWidth; x < (aChunkX / 16 + windowWidth + 1); x++) { for (int z = aChunkZ / 16 - windowWidth; z < (aChunkZ / 16 + windowWidth + 1); z++) { - long hash = ((long) ((aWorld.provider.dimensionId & 0xffL) << 56) - | (((long) x & 0x000000000fffffffL) << 28) + long hash = (((aWorld.provider.dimensionId & 0xffL) << 56) | (((long) x & 0x000000000fffffffL) << 28) | ((long) z & 0x000000000fffffffL)); if (!validStoneSeeds.containsKey(hash)) { // Determine if RNG says to add stone at this chunk stoneRNG.setSeed( - (long) aWorld.getSeed() ^ hash + Math.abs(mBlockMeta) + aWorld.getSeed() ^ hash + Math.abs(mBlockMeta) + Math.abs(mSize) + ((GregTech_API.sBlockGranites == mBlock) ? (32768) : (0))); // Don't judge me. // Want different @@ -139,11 +138,11 @@ public class GT_Worldgen_Stone extends GT_Worldgen_Ore { int z = stones.get(0).mZ * 16; stoneRNG.setSeed( - (long) aWorld.getSeed() ^ ((long) ((aWorld.provider.dimensionId & 0xffL) << 56) - | (((long) x & 0x000000000fffffffL) << 28) - | ((long) z & 0x000000000fffffffL)) + Math.abs(mBlockMeta) - + Math.abs(mSize) - + ((GregTech_API.sBlockGranites == mBlock) ? (32768) : (0))); // Don't judge me + aWorld.getSeed() + ^ (((aWorld.provider.dimensionId & 0xffL) << 56) | (((long) x & 0x000000000fffffffL) << 28) + | ((long) z & 0x000000000fffffffL)) + Math.abs(mBlockMeta) + + Math.abs(mSize) + + ((GregTech_API.sBlockGranites == mBlock) ? (32768) : (0))); // Don't judge me for (int i = 0; i < this.mAmount; i++) { // Not sure why you would want more than one in a chunk! Left alone // though. // Locate the stoneseed XYZ. Original code would request an isAir at the seed location, causing a chunk @@ -198,7 +197,7 @@ public class GT_Worldgen_Stone extends GT_Worldgen_Ore { + " tMaxY=" + tMaxY + " - Skipped because first requesting chunk would not contain this stone"); - long hash = ((long) ((aWorld.provider.dimensionId & 0xffL) << 56) + long hash = (((aWorld.provider.dimensionId & 0xffL) << 56) | (((long) x & 0x000000000fffffffL) << 28) | ((long) z & 0x000000000fffffffL)); validStoneSeeds.remove(hash); diff --git a/src/main/java/gregtech/common/GT_Worldgenerator.java b/src/main/java/gregtech/common/GT_Worldgenerator.java index 2ac29036d0..37b917e8c5 100644 --- a/src/main/java/gregtech/common/GT_Worldgenerator.java +++ b/src/main/java/gregtech/common/GT_Worldgenerator.java @@ -34,8 +34,8 @@ public class GT_Worldgenerator implements IWorldGenerator { private static int endMinSize = 50; private static int endMaxSize = 200; private static boolean endAsteroids = true; - public static List<Runnable> mList = new ArrayList(); - public static HashSet<Long> ProcChunks = new HashSet<Long>(); + public static List<Runnable> mList = new ArrayList<>(); + public static HashSet<Long> ProcChunks = new HashSet<>(); // This is probably not going to work. Trying to create a fake orevein to put into hashtable when there will be no // ores in a vein. public static GT_Worldgen_GT_Ore_Layer noOresInVein = new GT_Worldgen_GT_Ore_Layer( @@ -53,7 +53,7 @@ public class GT_Worldgenerator implements IWorldGenerator { Materials.Aluminium, Materials.Aluminium, Materials.Aluminium); - public static Hashtable<Long, GT_Worldgen_GT_Ore_Layer> validOreveins = new Hashtable(1024); + public static Hashtable<Long, GT_Worldgen_GT_Ore_Layer> validOreveins = new Hashtable<>(1024); public boolean mIsGenerating = false; public static final Object listLock = new Object(); @@ -136,7 +136,7 @@ public class GT_Worldgenerator implements IWorldGenerator { // static int test=0; // Local class to track which orevein seeds must be checked when doing chunkified worldgen - class NearbySeeds { + static class NearbySeeds { public int mX; public int mZ; @@ -149,8 +149,7 @@ public class GT_Worldgenerator implements IWorldGenerator { @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof GT_Worldgenerator.WorldGenContainer.NearbySeeds)) return false; - GT_Worldgenerator.WorldGenContainer.NearbySeeds that = (GT_Worldgenerator.WorldGenContainer.NearbySeeds) o; + if (!(o instanceof NearbySeeds that)) return false; if (this.mX != that.mX) return false; return this.mZ == that.mZ; } @@ -161,9 +160,9 @@ public class GT_Worldgenerator implements IWorldGenerator { result = 31 * result + this.mZ; return result; } - }; + } - public static ArrayList<GT_Worldgenerator.WorldGenContainer.NearbySeeds> seedList = new ArrayList(); + public static ArrayList<GT_Worldgenerator.WorldGenContainer.NearbySeeds> seedList = new ArrayList<>(); // aX and aZ are now the by-chunk X and Z for the chunk of interest public WorldGenContainer(Random aRandom, int aX, int aZ, int aDimensionType, World aWorld, @@ -213,11 +212,10 @@ public class GT_Worldgenerator implements IWorldGenerator { // bits of the chunk so we have bits for dimension. // ( (long)oreseedZ & 0x000000000fffffffL )) Puts the chunk Z in the bits 0-27. Cuts off the top few bits // of the chunk so we have bits for dimension. - long oreveinSeed = ((long) this.mWorld.getSeed() << 16) - ^ ((long) ((this.mWorld.provider.dimensionId & 0xffL) << 56) - | (((long) oreseedX & 0x000000000fffffffL) << 28) - | ((long) oreseedZ & 0x000000000fffffffL)); // Use an RNG that is identical every time it is - // called for + long oreveinSeed = (this.mWorld.getSeed() << 16) ^ (((this.mWorld.provider.dimensionId & 0xffL) << 56) + | (((long) oreseedX & 0x000000000fffffffL) << 28) + | ((long) oreseedZ & 0x000000000fffffffL)); // Use an RNG that is identical every time it is + // called for // this oreseed. XSTR oreveinRNG = new XSTR(oreveinSeed); int oreveinPercentageRoll = oreveinRNG.nextInt(100); // Roll the dice, see if we get an orevein here at all @@ -279,7 +277,7 @@ public class GT_Worldgenerator implements IWorldGenerator { this.mChunkGenerator, this.mChunkProvider); switch (placementResult) { - case GT_Worldgen_GT_Ore_Layer.ORE_PLACED: + case GT_Worldgen_GT_Ore_Layer.ORE_PLACED -> { if (debugOrevein) GT_Log.out.println( " Added near oreveinSeed=" + oreveinSeed + " " @@ -292,12 +290,11 @@ public class GT_Worldgenerator implements IWorldGenerator { + tDimensionName); validOreveins.put(oreveinSeed, tWorldGen); oreveinFound = true; - break; - case GT_Worldgen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER: - placementAttempts++; - // SHould do retry in this case until out of chances - break; - case GT_Worldgen_GT_Ore_Layer.NO_OVERLAP: + } + case GT_Worldgen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER -> placementAttempts++; + + // SHould do retry in this case until out of chances + case GT_Worldgen_GT_Ore_Layer.NO_OVERLAP -> { if (debugOrevein) GT_Log.out.println( " Added far oreveinSeed=" + oreveinSeed + " " @@ -310,8 +307,8 @@ public class GT_Worldgenerator implements IWorldGenerator { + tDimensionName); validOreveins.put(oreveinSeed, tWorldGen); oreveinFound = true; - break; - case GT_Worldgen_GT_Ore_Layer.NO_OVERLAP_AIR_BLOCK: + } + case GT_Worldgen_GT_Ore_Layer.NO_OVERLAP_AIR_BLOCK -> { if (debugOrevein) GT_Log.out.println( " No overlap and air block in test spot=" + oreveinSeed + " " @@ -324,7 +321,7 @@ public class GT_Worldgenerator implements IWorldGenerator { + tDimensionName); // SHould do retry in this case until out of chances placementAttempts++; - break; + } } break; // Try the next orevein } catch (Throwable e) { @@ -403,11 +400,12 @@ public class GT_Worldgenerator implements IWorldGenerator { this.mChunkGenerator, this.mChunkProvider); switch (placementResult) { - case GT_Worldgen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER: + case GT_Worldgen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER -> { if (debugOrevein) GT_Log.out.println(" No ore in bottom layer"); - break; - case GT_Worldgen_GT_Ore_Layer.NO_OVERLAP: + } + case GT_Worldgen_GT_Ore_Layer.NO_OVERLAP -> { if (debugOrevein) GT_Log.out.println(" No overlap"); + } } } } @@ -458,7 +456,7 @@ public class GT_Worldgenerator implements IWorldGenerator { // Determine if this X/Z is an orevein seed if (((Math.abs(x) % 3) == 1) && ((Math.abs(z) % 3) == 1)) { if (debugWorldGen) GT_Log.out.println("Adding seed x=" + x + " z=" + z); - seedList.add(new GT_Worldgenerator.WorldGenContainer.NearbySeeds(x, z)); + seedList.add(new NearbySeeds(x, z)); } } } @@ -491,7 +489,7 @@ public class GT_Worldgenerator implements IWorldGenerator { for (int i = 0; (i < oreveinAttempts) && (temp); i++) { tRandomWeight = aRandom.nextInt(GT_Worldgen_GT_Ore_Layer.sWeight); for (GT_Worldgen_GT_Ore_Layer tWorldGen : GT_Worldgen_GT_Ore_Layer.sList) { - tRandomWeight -= ((GT_Worldgen_GT_Ore_Layer) tWorldGen).mWeight; + tRandomWeight -= tWorldGen.mWeight; if (tRandomWeight <= 0) { try { // if ((tWorldGen.mEndAsteroid && tDimensionType == 1) || (tWorldGen.mAsteroid && @@ -516,7 +514,7 @@ public class GT_Worldgenerator implements IWorldGenerator { int tY = 50 + aRandom.nextInt(200 - 50); int tZ = mZ * 16 + aRandom.nextInt(16); if (tDimensionType == 1) { - mSize = aRandom.nextInt((int) (endMaxSize - endMinSize)); + mSize = aRandom.nextInt(endMaxSize - endMinSize); // } else if (tDimensionName.equals("Asteroids")) { // mSize = aRandom.nextInt((int) (gcMaxSize - gcMinSize)); } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java index e4d3e7e52a..5751ebc703 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings1.java @@ -66,18 +66,24 @@ public class GT_Block_Casings1 extends GT_Block_Casings_Abstract { public IIcon getIcon(int aSide, int aMeta) { if ((aMeta >= 0) && (aMeta < 16)) { switch (aMeta) { - case 10: + case 10 -> { return Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon(); - case 11: + } + case 11 -> { return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon(); - case 12: + } + case 12 -> { return Textures.BlockIcons.MACHINE_DIM_TRANS_CASING.getIcon(); - case 13: + } + case 13 -> { return Textures.BlockIcons.MACHINE_DIM_INJECTOR.getIcon(); - case 14: + } + case 14 -> { return Textures.BlockIcons.MACHINE_DIM_BRIDGE.getIcon(); - case 15: + } + case 15 -> { return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon(); + } } if (aSide == 0) { return Textures.BlockIcons.MACHINECASINGS_BOTTOM[aMeta].getIcon(); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java index c1cff0f346..dfc5ff974b 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings2.java @@ -68,41 +68,25 @@ public class GT_Block_Casings2 extends GT_Block_Casings_Abstract { @Override public IIcon getIcon(int aSide, int aMeta) { - switch (aMeta) { - case 0: - return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); - case 1: - return Textures.BlockIcons.MACHINE_CASING_FROST_PROOF.getIcon(); - case 2: - return Textures.BlockIcons.MACHINE_CASING_GEARBOX_BRONZE.getIcon(); - case 3: - return Textures.BlockIcons.MACHINE_CASING_GEARBOX_STEEL.getIcon(); - case 4: - return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TITANIUM.getIcon(); - case 5: - return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TUNGSTENSTEEL.getIcon(); - case 6: - return Textures.BlockIcons.MACHINE_CASING_PROCESSOR.getIcon(); - case 7: - return Textures.BlockIcons.MACHINE_CASING_DATA_DRIVE.getIcon(); - case 8: - return Textures.BlockIcons.MACHINE_CASING_CONTAINMENT_FIELD.getIcon(); - case 9: - return Textures.BlockIcons.MACHINE_CASING_ASSEMBLER.getIcon(); - case 10: - return Textures.BlockIcons.MACHINE_CASING_PUMP.getIcon(); - case 11: - return Textures.BlockIcons.MACHINE_CASING_MOTOR.getIcon(); - case 12: - return Textures.BlockIcons.MACHINE_CASING_PIPE_BRONZE.getIcon(); - case 13: - return Textures.BlockIcons.MACHINE_CASING_PIPE_STEEL.getIcon(); - case 14: - return Textures.BlockIcons.MACHINE_CASING_PIPE_TITANIUM.getIcon(); - case 15: - return Textures.BlockIcons.MACHINE_CASING_PIPE_TUNGSTENSTEEL.getIcon(); - } - return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + return switch (aMeta) { + case 0 -> Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + case 1 -> Textures.BlockIcons.MACHINE_CASING_FROST_PROOF.getIcon(); + case 2 -> Textures.BlockIcons.MACHINE_CASING_GEARBOX_BRONZE.getIcon(); + case 3 -> Textures.BlockIcons.MACHINE_CASING_GEARBOX_STEEL.getIcon(); + case 4 -> Textures.BlockIcons.MACHINE_CASING_GEARBOX_TITANIUM.getIcon(); + case 5 -> Textures.BlockIcons.MACHINE_CASING_GEARBOX_TUNGSTENSTEEL.getIcon(); + case 6 -> Textures.BlockIcons.MACHINE_CASING_PROCESSOR.getIcon(); + case 7 -> Textures.BlockIcons.MACHINE_CASING_DATA_DRIVE.getIcon(); + case 8 -> Textures.BlockIcons.MACHINE_CASING_CONTAINMENT_FIELD.getIcon(); + case 9 -> Textures.BlockIcons.MACHINE_CASING_ASSEMBLER.getIcon(); + case 10 -> Textures.BlockIcons.MACHINE_CASING_PUMP.getIcon(); + case 11 -> Textures.BlockIcons.MACHINE_CASING_MOTOR.getIcon(); + case 12 -> Textures.BlockIcons.MACHINE_CASING_PIPE_BRONZE.getIcon(); + case 13 -> Textures.BlockIcons.MACHINE_CASING_PIPE_STEEL.getIcon(); + case 14 -> Textures.BlockIcons.MACHINE_CASING_PIPE_TITANIUM.getIcon(); + case 15 -> Textures.BlockIcons.MACHINE_CASING_PIPE_TUNGSTENSTEEL.getIcon(); + default -> Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + }; } @Override diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings3.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings3.java index aef025d08f..3985acf049 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings3.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings3.java @@ -52,43 +52,27 @@ public class GT_Block_Casings3 extends GT_Block_Casings_Abstract { @Override public IIcon getIcon(int aSide, int aMeta) { - switch (aMeta) { - case 0: - return Textures.BlockIcons.MACHINE_CASING_STRIPES_A.getIcon(); - case 1: - return Textures.BlockIcons.MACHINE_CASING_STRIPES_B.getIcon(); - case 2: - return Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon(); - case 3: - return Textures.BlockIcons.MACHINE_CASING_BIOHAZARD.getIcon(); - case 4: - return Textures.BlockIcons.MACHINE_CASING_EXPLOSIONHAZARD.getIcon(); - case 5: - return Textures.BlockIcons.MACHINE_CASING_FIREHAZARD.getIcon(); - case 6: - return Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD.getIcon(); - case 7: - return Textures.BlockIcons.MACHINE_CASING_MAGICHAZARD.getIcon(); - case 8: - return Textures.BlockIcons.MACHINE_CASING_FROSTHAZARD.getIcon(); - case 9: - return Textures.BlockIcons.MACHINE_CASING_NOISEHAZARD.getIcon(); - case 10: - return Textures.BlockIcons.MACHINE_CASING_GRATE.getIcon(); - case 11: - return Textures.BlockIcons.MACHINE_CASING_VENT.getIcon(); - case 12: - return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon(); - case 13: - return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon() - : Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon(); - case 14: - return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon() - : Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); - case 15: - return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_TUNGSTENSTEEL.getIcon() - : Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); - } - return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + return switch (aMeta) { + case 0 -> Textures.BlockIcons.MACHINE_CASING_STRIPES_A.getIcon(); + case 1 -> Textures.BlockIcons.MACHINE_CASING_STRIPES_B.getIcon(); + case 2 -> Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon(); + case 3 -> Textures.BlockIcons.MACHINE_CASING_BIOHAZARD.getIcon(); + case 4 -> Textures.BlockIcons.MACHINE_CASING_EXPLOSIONHAZARD.getIcon(); + case 5 -> Textures.BlockIcons.MACHINE_CASING_FIREHAZARD.getIcon(); + case 6 -> Textures.BlockIcons.MACHINE_CASING_ACIDHAZARD.getIcon(); + case 7 -> Textures.BlockIcons.MACHINE_CASING_MAGICHAZARD.getIcon(); + case 8 -> Textures.BlockIcons.MACHINE_CASING_FROSTHAZARD.getIcon(); + case 9 -> Textures.BlockIcons.MACHINE_CASING_NOISEHAZARD.getIcon(); + case 10 -> Textures.BlockIcons.MACHINE_CASING_GRATE.getIcon(); + case 11 -> Textures.BlockIcons.MACHINE_CASING_VENT.getIcon(); + case 12 -> Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon(); + case 13 -> aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon() + : Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon(); + case 14 -> aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon() + : Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + case 15 -> aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_TUNGSTENSTEEL.getIcon() + : Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); + default -> Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + }; } } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java index 254b34b513..e95935ab78 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings4.java @@ -89,89 +89,66 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract { @Override public IIcon getIcon(int aSide, int aMeta) { - switch (aMeta) { - case 0: - case 12: - return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); - case 1: - case 10: - return Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon(); - case 2: - case 11: - return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); - case 3: - return aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_TITANIUM.getIcon() - : Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); - case 4: + return switch (aMeta) { + case 0, 12 -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); + case 1, 10 -> Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon(); + case 2, 11 -> Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); + case 3 -> aSide > 1 ? Textures.BlockIcons.MACHINE_CASING_FIREBOX_TITANIUM.getIcon() + : Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); + case 4 -> // Do not overwrite! - return Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW.getIcon(); - case 5: + Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW.getIcon(); + case 5 -> // Do not overwrite! - return Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS.getIcon(); - case 6: - return Textures.BlockIcons.MACHINE_CASING_FUSION.getIcon(); - case 7: - return Textures.BlockIcons.MACHINE_CASING_FUSION_COIL.getIcon(); - case 8: - return Textures.BlockIcons.MACHINE_CASING_FUSION_2.getIcon(); - case 9: - return Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon(); - case 13: - return Textures.BlockIcons.MACHINE_CASING_ENGINE_INTAKE.getIcon(); - case 14: - return Textures.BlockIcons.MACHINE_CASING_MINING_OSMIRIDIUM.getIcon(); - case 15: - return Textures.BlockIcons.MACHINE_CASING_DENSEBRICKS.getIcon(); - } - return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS.getIcon(); + case 6 -> Textures.BlockIcons.MACHINE_CASING_FUSION.getIcon(); + case 7 -> Textures.BlockIcons.MACHINE_CASING_FUSION_COIL.getIcon(); + case 8 -> Textures.BlockIcons.MACHINE_CASING_FUSION_2.getIcon(); + case 9 -> Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon(); + case 13 -> Textures.BlockIcons.MACHINE_CASING_ENGINE_INTAKE.getIcon(); + case 14 -> Textures.BlockIcons.MACHINE_CASING_MINING_OSMIRIDIUM.getIcon(); + case 15 -> Textures.BlockIcons.MACHINE_CASING_DENSEBRICKS.getIcon(); + default -> Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + }; } @Deprecated public IIcon getTurbineCasing(int meta, int iconIndex, boolean active) { - switch (meta) { - case 10: - return active ? Textures.BlockIcons.TURBINE_ACTIVE1[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE1[iconIndex].getIcon(); - case 11: - return active ? Textures.BlockIcons.TURBINE_ACTIVE2[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE2[iconIndex].getIcon(); - case 12: - return active ? Textures.BlockIcons.TURBINE_ACTIVE3[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE3[iconIndex].getIcon(); - default: - return active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE[iconIndex].getIcon(); - } + return switch (meta) { + case 10 -> active ? Textures.BlockIcons.TURBINE_ACTIVE1[iconIndex].getIcon() + : Textures.BlockIcons.TURBINE1[iconIndex].getIcon(); + case 11 -> active ? Textures.BlockIcons.TURBINE_ACTIVE2[iconIndex].getIcon() + : Textures.BlockIcons.TURBINE2[iconIndex].getIcon(); + case 12 -> active ? Textures.BlockIcons.TURBINE_ACTIVE3[iconIndex].getIcon() + : Textures.BlockIcons.TURBINE3[iconIndex].getIcon(); + default -> active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() + : Textures.BlockIcons.TURBINE[iconIndex].getIcon(); + }; } @Deprecated public IIcon getTurbineCasing(int meta, int iconIndex, boolean active, boolean hasTurbine) { - switch (meta) { - case 10: - return active ? Textures.BlockIcons.TURBINE_ACTIVE1[iconIndex].getIcon() - : hasTurbine ? Textures.BlockIcons.TURBINE1[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE_EMPTY1[iconIndex].getIcon(); - case 11: - return active ? Textures.BlockIcons.TURBINE_ACTIVE2[iconIndex].getIcon() - : hasTurbine ? Textures.BlockIcons.TURBINE2[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE_EMPTY2[iconIndex].getIcon(); - case 12: - return active ? Textures.BlockIcons.TURBINE_ACTIVE3[iconIndex].getIcon() - : hasTurbine ? Textures.BlockIcons.TURBINE3[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE_EMPTY3[iconIndex].getIcon(); - default: - return active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() - : hasTurbine ? Textures.BlockIcons.TURBINE[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE_EMPTY[iconIndex].getIcon(); - } + return switch (meta) { + case 10 -> active ? Textures.BlockIcons.TURBINE_ACTIVE1[iconIndex].getIcon() + : hasTurbine ? Textures.BlockIcons.TURBINE1[iconIndex].getIcon() + : Textures.BlockIcons.TURBINE_EMPTY1[iconIndex].getIcon(); + case 11 -> active ? Textures.BlockIcons.TURBINE_ACTIVE2[iconIndex].getIcon() + : hasTurbine ? Textures.BlockIcons.TURBINE2[iconIndex].getIcon() + : Textures.BlockIcons.TURBINE_EMPTY2[iconIndex].getIcon(); + case 12 -> active ? Textures.BlockIcons.TURBINE_ACTIVE3[iconIndex].getIcon() + : hasTurbine ? Textures.BlockIcons.TURBINE3[iconIndex].getIcon() + : Textures.BlockIcons.TURBINE_EMPTY3[iconIndex].getIcon(); + default -> active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() + : hasTurbine ? Textures.BlockIcons.TURBINE[iconIndex].getIcon() + : Textures.BlockIcons.TURBINE_EMPTY[iconIndex].getIcon(); + }; } private static int isTurbineControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if (!(tTileEntity instanceof IGregTechTileEntity)) return 0; - IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity; - if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine && tTile.getFrontFacing() == aSide) { - GT_MetaTileEntity_LargeTurbine turbine = (GT_MetaTileEntity_LargeTurbine) tTile.getMetaTileEntity(); + if (!(tTileEntity instanceof IGregTechTileEntity tTile)) return 0; + if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine turbine + && tTile.getFrontFacing() == aSide) { if (turbine.isNewStyleRendering()) return 0; if (tTile.isActive()) return 1; return turbine.hasTurbine() ? 2 : 3; @@ -191,7 +168,7 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract { if (tMeta > 8 && tMeta < 13) { int tInvertLeftRightMod = aSide % 2 * 2 - 1; switch (aSide / 2) { - case 0: + case 0 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -202,8 +179,8 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract { } } } - break; - case 1: + } + case 1 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -218,8 +195,8 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract { } } } - break; - case 2: + } + case 2 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -234,18 +211,14 @@ public class GT_Block_Casings4 extends GT_Block_Casings_Abstract { } } } - break; - } - switch (tMeta) { - case 10: - return Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon(); - case 11: - return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); - case 12: - return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); - default: - return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + } } + return switch (tMeta) { + case 10 -> Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon(); + case 11 -> Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); + case 12 -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); + default -> Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + }; } int tStartIndex = tMeta == 6 ? 1 : 13; int tIndexIntoMapping = 0; diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java index 364d6e0eed..50101dae49 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings5.java @@ -58,109 +58,65 @@ public class GT_Block_Casings5 extends GT_Block_Casings_Abstract implements IHea @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int aSide, int aMeta) { - switch (aMeta) { - case 0: - return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon(); - case 1: - return Textures.BlockIcons.MACHINE_COIL_KANTHAL.getIcon(); - case 2: - return Textures.BlockIcons.MACHINE_COIL_NICHROME.getIcon(); - case 3: - return Textures.BlockIcons.MACHINE_COIL_TUNGSTENSTEEL.getIcon(); - case 4: - return Textures.BlockIcons.MACHINE_COIL_HSSG.getIcon(); - case 5: - return Textures.BlockIcons.MACHINE_COIL_NAQUADAH.getIcon(); - case 6: - return Textures.BlockIcons.MACHINE_COIL_NAQUADAHALLOY.getIcon(); - case 7: - return Textures.BlockIcons.MACHINE_COIL_ELECTRUMFLUX.getIcon(); - case 8: - return Textures.BlockIcons.MACHINE_COIL_AWAKENEDDRACONIUM.getIcon(); - case 9: - return Textures.BlockIcons.MACHINE_COIL_HSSS.getIcon(); - case 10: - return Textures.BlockIcons.MACHINE_COIL_TRINIUM.getIcon(); - case 11: - return Textures.BlockIcons.MACHINE_COIL_INFINITY.getIcon(); - case 12: - return Textures.BlockIcons.MACHINE_COIL_HYPOGEN.getIcon(); - case 13: - return Textures.BlockIcons.MACHINE_COIL_ETERNAL.getIcon(); - } - return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon(); + return switch (aMeta) { + case 0 -> Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon(); + case 1 -> Textures.BlockIcons.MACHINE_COIL_KANTHAL.getIcon(); + case 2 -> Textures.BlockIcons.MACHINE_COIL_NICHROME.getIcon(); + case 3 -> Textures.BlockIcons.MACHINE_COIL_TUNGSTENSTEEL.getIcon(); + case 4 -> Textures.BlockIcons.MACHINE_COIL_HSSG.getIcon(); + case 5 -> Textures.BlockIcons.MACHINE_COIL_NAQUADAH.getIcon(); + case 6 -> Textures.BlockIcons.MACHINE_COIL_NAQUADAHALLOY.getIcon(); + case 7 -> Textures.BlockIcons.MACHINE_COIL_ELECTRUMFLUX.getIcon(); + case 8 -> Textures.BlockIcons.MACHINE_COIL_AWAKENEDDRACONIUM.getIcon(); + case 9 -> Textures.BlockIcons.MACHINE_COIL_HSSS.getIcon(); + case 10 -> Textures.BlockIcons.MACHINE_COIL_TRINIUM.getIcon(); + case 11 -> Textures.BlockIcons.MACHINE_COIL_INFINITY.getIcon(); + case 12 -> Textures.BlockIcons.MACHINE_COIL_HYPOGEN.getIcon(); + case 13 -> Textures.BlockIcons.MACHINE_COIL_ETERNAL.getIcon(); + default -> Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon(); + }; } /*--------------- COIL CHECK IMPL. ------------*/ public static HeatingCoilLevel getCoilHeatFromDamage(int meta) { - switch (meta) { - case 0: - return LV; - case 1: - return MV; - case 2: - return HV; - case 3: - return EV; - case 4: - return IV; - case 5: - return ZPM; - case 6: - return UV; - case 7: - return UEV; - case 8: - return UIV; - case 9: - return LuV; - case 10: - return UHV; - case 11: - return UMV; - case 12: - return UXV; - case 13: - return MAX; - default: - return None; - } + return switch (meta) { + case 0 -> LV; + case 1 -> MV; + case 2 -> HV; + case 3 -> EV; + case 4 -> IV; + case 5 -> ZPM; + case 6 -> UV; + case 7 -> UEV; + case 8 -> UIV; + case 9 -> LuV; + case 10 -> UHV; + case 11 -> UMV; + case 12 -> UXV; + case 13 -> MAX; + default -> None; + }; } public static int getMetaFromCoilHeat(HeatingCoilLevel level) { - switch (level) { - case LV: - return 0; - case MV: - return 1; - case HV: - return 2; - case EV: - return 3; - case IV: - return 4; - case ZPM: - return 5; - case UV: - return 6; - case UEV: - return 7; - case UIV: - return 8; - case LuV: - return 9; - case UHV: - return 10; - case UMV: - return 11; - case UXV: - return 12; - case MAX: - return 13; - default: - return 0; - } + return switch (level) { + case LV -> 0; + case MV -> 1; + case HV -> 2; + case EV -> 3; + case IV -> 4; + case ZPM -> 5; + case UV -> 6; + case UEV -> 7; + case UIV -> 8; + case LuV -> 9; + case UHV -> 10; + case UMV -> 11; + case UXV -> 12; + case MAX -> 13; + default -> 0; + }; } @Override diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java index 177b5bdbe7..92ba33a4b9 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings6.java @@ -62,38 +62,23 @@ public class GT_Block_Casings6 extends GT_Block_Casings_Abstract { if (aSide == 1) { return Textures.BlockIcons.MACHINECASINGS_TOP[aMeta].getIcon(); } - switch (aMeta) { - case 1: - return Textures.BlockIcons.MACHINE_CASING_TANK_1.getIcon(); - case 2: - return Textures.BlockIcons.MACHINE_CASING_TANK_2.getIcon(); - case 3: - return Textures.BlockIcons.MACHINE_CASING_TANK_3.getIcon(); - case 4: - return Textures.BlockIcons.MACHINE_CASING_TANK_4.getIcon(); - case 5: - return Textures.BlockIcons.MACHINE_CASING_TANK_5.getIcon(); - case 6: - return Textures.BlockIcons.MACHINE_CASING_TANK_6.getIcon(); - case 7: - return Textures.BlockIcons.MACHINE_CASING_TANK_7.getIcon(); - case 8: - return Textures.BlockIcons.MACHINE_CASING_TANK_8.getIcon(); - case 9: - return Textures.BlockIcons.MACHINE_CASING_TANK_9.getIcon(); - case 10: - return Textures.BlockIcons.MACHINE_CASING_TANK_10.getIcon(); - case 11: - return Textures.BlockIcons.MACHINE_CASING_TANK_11.getIcon(); - case 12: - return Textures.BlockIcons.MACHINE_CASING_TANK_12.getIcon(); - case 13: - return Textures.BlockIcons.MACHINE_CASING_TANK_13.getIcon(); - case 14: - return Textures.BlockIcons.MACHINE_CASING_TANK_14.getIcon(); - default: - return Textures.BlockIcons.MACHINE_CASING_TANK_0.getIcon(); - } + return switch (aMeta) { + case 1 -> Textures.BlockIcons.MACHINE_CASING_TANK_1.getIcon(); + case 2 -> Textures.BlockIcons.MACHINE_CASING_TANK_2.getIcon(); + case 3 -> Textures.BlockIcons.MACHINE_CASING_TANK_3.getIcon(); + case 4 -> Textures.BlockIcons.MACHINE_CASING_TANK_4.getIcon(); + case 5 -> Textures.BlockIcons.MACHINE_CASING_TANK_5.getIcon(); + case 6 -> Textures.BlockIcons.MACHINE_CASING_TANK_6.getIcon(); + case 7 -> Textures.BlockIcons.MACHINE_CASING_TANK_7.getIcon(); + case 8 -> Textures.BlockIcons.MACHINE_CASING_TANK_8.getIcon(); + case 9 -> Textures.BlockIcons.MACHINE_CASING_TANK_9.getIcon(); + case 10 -> Textures.BlockIcons.MACHINE_CASING_TANK_10.getIcon(); + case 11 -> Textures.BlockIcons.MACHINE_CASING_TANK_11.getIcon(); + case 12 -> Textures.BlockIcons.MACHINE_CASING_TANK_12.getIcon(); + case 13 -> Textures.BlockIcons.MACHINE_CASING_TANK_13.getIcon(); + case 14 -> Textures.BlockIcons.MACHINE_CASING_TANK_14.getIcon(); + default -> Textures.BlockIcons.MACHINE_CASING_TANK_0.getIcon(); + }; } @Override diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java index a8d04cd10f..6e6313c05c 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java @@ -78,73 +78,53 @@ public class GT_Block_Casings8 extends GT_Block_Casings_Abstract { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int aSide, int aMeta) { - switch (aMeta) { - case 0: - return Textures.BlockIcons.MACHINE_CASING_CHEMICALLY_INERT.getIcon(); - case 1: - return Textures.BlockIcons.MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.getIcon(); - case 2: - return Textures.BlockIcons.MACHINE_CASING_MINING_NEUTRONIUM.getIcon(); - case 3: - return Textures.BlockIcons.MACHINE_CASING_MINING_BLACKPLUTONIUM.getIcon(); - case 4: - return Textures.BlockIcons.MACHINE_CASING_EXTREME_ENGINE_INTAKE.getIcon(); // changed color in a - // terrible way - case 5: - return Textures.BlockIcons.MACHINE_CASING_ADVANCEDRADIATIONPROOF.getIcon(); - case 6: - return Textures.BlockIcons.MACHINE_CASING_RHODIUM_PALLADIUM.getIcon(); - case 7: - return Textures.BlockIcons.MACHINE_CASING_IRIDIUM.getIcon(); - case 8: - return Textures.BlockIcons.MACHINE_CASING_MAGICAL.getIcon(); - case 9: - return Textures.BlockIcons.MACHINE_CASING_ADVANCEDGAS.getIcon(); - case 10: - return Textures.BlockIcons.MACHINE_CASING_RADIANT_NAQUADAH_ALLOY.getIcon(); - case 11: - return Textures.BlockIcons.MACHINE_CASING_PCB_TIER_1.getIcon(); - case 12: - return Textures.BlockIcons.MACHINE_CASING_PCB_TIER_2.getIcon(); - case 13: - return Textures.BlockIcons.MACHINE_CASING_PCB_TIER_3.getIcon(); - case 14: - return Textures.BlockIcons.INFINITY_COOLED_CASING.getIcon(); - } - return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); + return switch (aMeta) { + case 0 -> Textures.BlockIcons.MACHINE_CASING_CHEMICALLY_INERT.getIcon(); + case 1 -> Textures.BlockIcons.MACHINE_CASING_PIPE_POLYTETRAFLUOROETHYLENE.getIcon(); + case 2 -> Textures.BlockIcons.MACHINE_CASING_MINING_NEUTRONIUM.getIcon(); + case 3 -> Textures.BlockIcons.MACHINE_CASING_MINING_BLACKPLUTONIUM.getIcon(); + case 4 -> Textures.BlockIcons.MACHINE_CASING_EXTREME_ENGINE_INTAKE.getIcon(); // changed color in a + // terrible way + case 5 -> Textures.BlockIcons.MACHINE_CASING_ADVANCEDRADIATIONPROOF.getIcon(); + case 6 -> Textures.BlockIcons.MACHINE_CASING_RHODIUM_PALLADIUM.getIcon(); + case 7 -> Textures.BlockIcons.MACHINE_CASING_IRIDIUM.getIcon(); + case 8 -> Textures.BlockIcons.MACHINE_CASING_MAGICAL.getIcon(); + case 9 -> Textures.BlockIcons.MACHINE_CASING_ADVANCEDGAS.getIcon(); + case 10 -> Textures.BlockIcons.MACHINE_CASING_RADIANT_NAQUADAH_ALLOY.getIcon(); + case 11 -> Textures.BlockIcons.MACHINE_CASING_PCB_TIER_1.getIcon(); + case 12 -> Textures.BlockIcons.MACHINE_CASING_PCB_TIER_2.getIcon(); + case 13 -> Textures.BlockIcons.MACHINE_CASING_PCB_TIER_3.getIcon(); + case 14 -> Textures.BlockIcons.INFINITY_COOLED_CASING.getIcon(); + default -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); + }; } @Deprecated public IIcon getTurbineCasing(int meta, int iconIndex, boolean active) { - switch (meta) { - case 9: - return active ? Textures.BlockIcons.TURBINE_ADVGASACTIVE[iconIndex].getIcon() - : Textures.BlockIcons.TURBINEADVGAS[iconIndex].getIcon(); - default: - return active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE[iconIndex].getIcon(); - } + return switch (meta) { + case 9 -> active ? Textures.BlockIcons.TURBINE_ADVGASACTIVE[iconIndex].getIcon() + : Textures.BlockIcons.TURBINEADVGAS[iconIndex].getIcon(); + default -> active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() + : Textures.BlockIcons.TURBINE[iconIndex].getIcon(); + }; } public IIcon getTurbineCasing(int meta, int iconIndex, boolean active, boolean hasTurbine) { - switch (meta) { - case 9: - return active ? Textures.BlockIcons.TURBINE_ADVGASACTIVE[iconIndex].getIcon() - : hasTurbine ? Textures.BlockIcons.TURBINEADVGAS[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE_ADVGASEMPTY[iconIndex].getIcon(); - default: - return active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() - : hasTurbine ? Textures.BlockIcons.TURBINE[iconIndex].getIcon() - : Textures.BlockIcons.TURBINE_EMPTY[iconIndex].getIcon(); - } + return switch (meta) { + case 9 -> active ? Textures.BlockIcons.TURBINE_ADVGASACTIVE[iconIndex].getIcon() + : hasTurbine ? Textures.BlockIcons.TURBINEADVGAS[iconIndex].getIcon() + : Textures.BlockIcons.TURBINE_ADVGASEMPTY[iconIndex].getIcon(); + default -> active ? Textures.BlockIcons.TURBINE_ACTIVE[iconIndex].getIcon() + : hasTurbine ? Textures.BlockIcons.TURBINE[iconIndex].getIcon() + : Textures.BlockIcons.TURBINE_EMPTY[iconIndex].getIcon(); + }; } private static int isTurbineControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, int aSide) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if (!(tTileEntity instanceof IGregTechTileEntity)) return 0; - IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity; - if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine && tTile.getFrontFacing() == aSide) { - GT_MetaTileEntity_LargeTurbine turbine = (GT_MetaTileEntity_LargeTurbine) tTile.getMetaTileEntity(); + if (!(tTileEntity instanceof IGregTechTileEntity tTile)) return 0; + if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine turbine + && tTile.getFrontFacing() == aSide) { if (turbine.isNewStyleRendering()) return 0; if (tTile.isActive()) return 1; return turbine.hasTurbine() ? 2 : 3; @@ -163,7 +143,7 @@ public class GT_Block_Casings8 extends GT_Block_Casings_Abstract { if (tMeta == 9) { int tInvertLeftRightMod = aSide % 2 * 2 - 1; switch (aSide / 2) { - case 0: + case 0 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -174,8 +154,8 @@ public class GT_Block_Casings8 extends GT_Block_Casings_Abstract { } } } - break; - case 1: + } + case 1 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -190,8 +170,8 @@ public class GT_Block_Casings8 extends GT_Block_Casings_Abstract { } } } - break; - case 2: + } + case 2 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -206,14 +186,12 @@ public class GT_Block_Casings8 extends GT_Block_Casings_Abstract { } } } - break; - } - switch (tMeta) { - case 9: - return Textures.BlockIcons.MACHINE_CASING_ADVANCEDGAS.getIcon(); - default: - return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + } } + return switch (tMeta) { + case 9 -> Textures.BlockIcons.MACHINE_CASING_ADVANCEDGAS.getIcon(); + default -> Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); + }; } return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java index 118d92a81b..79a026af44 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings9.java @@ -31,12 +31,10 @@ public class GT_Block_Casings9 extends GT_Block_Casings_Abstract { @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int aSide, int aMeta) { - switch (aMeta) { - case 0: - return Textures.BlockIcons.MACHINE_CASING_PIPE_POLYBENZIMIDAZOLE.getIcon(); - case 1: - return Textures.BlockIcons.MACHINE_CASING_VENT_T2.getIcon(); - } - return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); + return switch (aMeta) { + case 0 -> Textures.BlockIcons.MACHINE_CASING_PIPE_POLYBENZIMIDAZOLE.getIcon(); + case 1 -> Textures.BlockIcons.MACHINE_CASING_VENT_T2.getIcon(); + default -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); + }; } } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java index 57e52b6137..a7dd8a1fd1 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java @@ -123,7 +123,7 @@ public abstract class GT_Block_Casings_Abstract extends GT_Generic_Block @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) { for (int i = 0; i < 16; i++) { ItemStack aStack = new ItemStack(aItem, 1, i); if (!aStack.getDisplayName() diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java index e2a40aebc0..eb8adf7872 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java @@ -230,8 +230,8 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo @SuppressWarnings("unchecked") // Old API uses raw List type @Override - public void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB, List outputAABB, - Entity collider) { + public void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB, + List<AxisAlignedBB> outputAABB, Entity collider) { final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (tTileEntity instanceof IGregTechTileEntity && ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null) { @@ -420,8 +420,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetadata) { GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if (tTileEntity instanceof IGregTechTileEntity) { - final IGregTechTileEntity tGregTechTileEntity = (IGregTechTileEntity) tTileEntity; + if (tTileEntity instanceof IGregTechTileEntity tGregTechTileEntity) { tGregTechTileEntity.onBlockDestroyed(); mTemporaryTileEntity.set(tGregTechTileEntity); if (!(tGregTechTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_QuantumChest)) { @@ -621,7 +620,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo @SideOnly(Side.CLIENT) @Override @SuppressWarnings("unchecked") // Old API uses raw List type - public void getSubBlocks(Item item, CreativeTabs aCreativeTab, List outputSubBlocks) { + public void getSubBlocks(Item item, CreativeTabs aCreativeTab, List<ItemStack> outputSubBlocks) { for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { if (GregTech_API.METATILEENTITIES[i] != null) { outputSubBlocks.add(new ItemStack(item, 1, i)); @@ -632,8 +631,7 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo @Override public void onBlockPlacedBy(World aWorld, int aX, int aY, int aZ, EntityLivingBase aPlayer, ItemStack aStack) { final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if (!(tTileEntity instanceof IGregTechTileEntity)) return; - final IGregTechTileEntity iGregTechTileEntity = (IGregTechTileEntity) tTileEntity; + if (!(tTileEntity instanceof IGregTechTileEntity iGregTechTileEntity)) return; iGregTechTileEntity.setFrontFacing( BaseTileEntity.getSideForPlayerPlacing(aPlayer, SIDE_UP, iGregTechTileEntity.getValidFacings())); } @@ -663,9 +661,8 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo @Override public Block getFacade(IBlockAccess aWorld, int aX, int aY, int aZ, int side) { final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if (tTileEntity instanceof CoverableTileEntity) { + if (tTileEntity instanceof CoverableTileEntity tile) { final byte aSide = (byte) side; - final CoverableTileEntity tile = (CoverableTileEntity) tTileEntity; if (side != -1) { final Block facadeBlock = tile.getCoverInfoAtSide(aSide) .getFacadeBlock(); @@ -688,9 +685,8 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo @Override public int getFacadeMetadata(IBlockAccess aWorld, int aX, int aY, int aZ, int side) { final TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if (tTileEntity instanceof CoverableTileEntity) { + if (tTileEntity instanceof CoverableTileEntity tile) { final byte aSide = (byte) side; - final CoverableTileEntity tile = (CoverableTileEntity) tTileEntity; if (side != -1) { final CoverInfo coverInfo = tile.getCoverInfoAtSide(aSide); final Block facadeBlock = coverInfo.getFacadeBlock(); diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores.java index 4db556ac10..db239341a3 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores.java @@ -49,22 +49,15 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract { @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { int index = ((meta / 1000) % 16); - switch (index) { - case 1: - return Blocks.netherrack.getIcon(side, 0); - case 2: - return Blocks.end_stone.getIcon(side, 0); - case 3: - return GRANITE_BLACK_STONE.getIcon(); - case 4: - return GRANITE_RED_STONE.getIcon(); - case 5: - return MARBLE_STONE.getIcon(); - case 6: - return BASALT_STONE.getIcon(); - default: - return Blocks.stone.getIcon(side, 0); - } + return switch (index) { + case 1 -> Blocks.netherrack.getIcon(side, 0); + case 2 -> Blocks.end_stone.getIcon(side, 0); + case 3 -> GRANITE_BLACK_STONE.getIcon(); + case 4 -> GRANITE_RED_STONE.getIcon(); + case 5 -> MARBLE_STONE.getIcon(); + case 6 -> BASALT_STONE.getIcon(); + default -> Blocks.stone.getIcon(side, 0); + }; } /** @@ -85,18 +78,10 @@ public class GT_Block_Ores extends GT_Block_Ores_Abstract { @Override public int getBaseBlockHarvestLevel(int aMeta) { - switch (aMeta) { - case 3: - case 4: - return 3; - case 0: - case 1: - case 2: - case 5: - case 6: - default: - return 0; - } + return switch (aMeta) { + case 3, 4 -> 3; + default -> 0; + }; } @Override diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java index 566e2486dc..098c2f3ebe 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java @@ -129,32 +129,11 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements } public String getLocalizedNameFormat(Materials aMaterial) { - switch (aMaterial.mName) { - case "InfusedAir": - case "InfusedDull": - case "InfusedEarth": - case "InfusedEntropy": - case "InfusedFire": - case "InfusedOrder": - case "InfusedVis": - case "InfusedWater": - return "%material Infused Stone"; - case "Vermiculite": - case "Bentonite": - case "Kaolinite": - case "Talc": - case "BasalticMineralSand": - case "GraniticMineralSand": - case "GlauconiteSand": - case "CassiteriteSand": - case "GarnetSand": - case "QuartzSand": - case "Pitchblende": - case "FullersEarth": - return "%material"; - default: - return "%material" + OrePrefixes.ore.mLocalizedMaterialPost; - } + return switch (aMaterial.mName) { + case "InfusedAir", "InfusedDull", "InfusedEarth", "InfusedEntropy", "InfusedFire", "InfusedOrder", "InfusedVis", "InfusedWater" -> "%material Infused Stone"; + case "Vermiculite", "Bentonite", "Kaolinite", "Talc", "BasalticMineralSand", "GraniticMineralSand", "GlauconiteSand", "CassiteriteSand", "GarnetSand", "QuartzSand", "Pitchblende", "FullersEarth" -> "%material"; + default -> "%material" + OrePrefixes.ore.mLocalizedMaterialPost; + }; } public String getLocalizedName(Materials aMaterial) { @@ -339,7 +318,7 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements @SuppressWarnings({ "unchecked" }) @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item aItem, CreativeTabs aTab, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs aTab, List<ItemStack> aList) { for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) { Materials tMaterial = GregTech_API.sGeneratedMaterials[i]; if ((tMaterial != null) && ((tMaterial.mTypes & 0x8) != 0) && !aBlockedOres.contains(tMaterial)) { diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java index 345b0385b0..93a10dc45b 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java @@ -162,32 +162,45 @@ public class GT_Block_Reinforced extends GT_Generic_Block { public IIcon getIcon(int aSide, int aMeta) { if ((aMeta >= 0) && (aMeta < 16)) { switch (aMeta) { - case 0: + case 0 -> { return Textures.BlockIcons.BLOCK_BRONZEPREIN.getIcon(); - case 1: + } + case 1 -> { return Textures.BlockIcons.BLOCK_IRREIN.getIcon(); - case 2: + } + case 2 -> { return Textures.BlockIcons.BLOCK_PLASCRETE.getIcon(); - case 3: + } + case 3 -> { return Textures.BlockIcons.BLOCK_TSREIN.getIcon(); - case 4: + } + case 4 -> { return Blocks.coal_block.getIcon(0, 0); - case 5: + } + case 5 -> { return Textures.BlockIcons.COVER_WOOD_PLATE.getIcon(); - case 6: + } + case 6 -> { return Blocks.coal_block.getIcon(0, 0); - case 7: + } + case 7 -> { return Blocks.coal_block.getIcon(0, 0); - case 8: + } + case 8 -> { return Textures.BlockIcons.BLOCK_STEELPREIN.getIcon(); - case 9: + } + case 9 -> { return Textures.BlockIcons.BLOCK_TITANIUMPREIN.getIcon(); - case 10: + } + case 10 -> { return Textures.BlockIcons.BLOCK_NAQUADAHPREIN.getIcon(); - case 11: + } + case 11 -> { return Textures.BlockIcons.BLOCK_NEUTRONIUMPREIN.getIcon(); - case 12: + } + case 12 -> { return Textures.BlockIcons.BLOCK_DEEP_DARK_RAW.getIcon(); + } } } return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); @@ -383,7 +396,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) { for (int i = 0; i < 16; i++) { ItemStack aStack = new ItemStack(aItem, 1, i); if (!aStack.getDisplayName() diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java index 47e9fe250d..3a9920e7e4 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java @@ -49,13 +49,13 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 15), new ItemStack(this, 1, 8)); GT_Values.RA.addAssemblerRecipe( new ItemStack(this, 1, 0), - ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), + ItemList.Circuit_Integrated.getWithDamage(0L, 4L), new ItemStack(this, 1, 3), 50, 4); GT_Values.RA.addAssemblerRecipe( new ItemStack(this, 1, 8), - ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), + ItemList.Circuit_Integrated.getWithDamage(0L, 4L), new ItemStack(this, 1, 11), 50, 4); @@ -111,13 +111,13 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) { GT_Values.RA.addLaserEngraverRecipe( new ItemStack(this, 1, 7), - GT_Utility.copyAmount(0L, new Object[] { aStack }), + GT_Utility.copyAmount(0L, aStack), new ItemStack(this, 1, 6), 50, 16); GT_Values.RA.addLaserEngraverRecipe( new ItemStack(this, 1, 15), - GT_Utility.copyAmount(0L, new Object[] { aStack }), + GT_Utility.copyAmount(0L, aStack), new ItemStack(this, 1, 14), 50, 16); @@ -188,7 +188,7 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) { for (int i = 0; i < 16; i++) { aList.add(new ItemStack(aItem, 1, i)); } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Storage.java b/src/main/java/gregtech/common/blocks/GT_Block_Storage.java index e8e36a2b56..47053f6e78 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Storage.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Storage.java @@ -94,7 +94,7 @@ public class GT_Block_Storage extends GT_Generic_Block { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { + public void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) { for (int i = 0; i < 16; i++) { if (!(new ItemStack(aItem, 1, i).getDisplayName() .contains(".name"))) diff --git a/src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java b/src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java index b42bbfa076..99d80d1cbb 100644 --- a/src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java +++ b/src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java @@ -47,61 +47,72 @@ public class GT_Cyclotron_Coils extends GT_Block_Casings_Abstract { public IIcon getIcon(int aSide, int aMeta) { if ((aMeta >= 0) && (aMeta < 16)) { switch (aMeta) { - case 0: + case 0 -> { if (aSide == 0 || aSide == 1) { return Textures.BlockIcons.MV_TOP_CYCLOTRON_SOLENOID.getIcon(); } return Textures.BlockIcons.MV_SIDE_CYCLOTRON_SOLENOID.getIcon(); - case 1: + } + case 1 -> { if (aSide == 0 || aSide == 1) { return Textures.BlockIcons.HV_TOP_CYCLOTRON_SOLENOID.getIcon(); } return Textures.BlockIcons.HV_SIDE_CYCLOTRON_SOLENOID.getIcon(); - case 2: + } + case 2 -> { if (aSide == 0 || aSide == 1) { return Textures.BlockIcons.EV_TOP_CYCLOTRON_SOLENOID.getIcon(); } return Textures.BlockIcons.EV_SIDE_CYCLOTRON_SOLENOID.getIcon(); - case 3: + } + case 3 -> { if (aSide == 0 || aSide == 1) { return Textures.BlockIcons.IV_TOP_CYCLOTRON_SOLENOID.getIcon(); } return Textures.BlockIcons.IV_SIDE_CYCLOTRON_SOLENOID.getIcon(); - case 4: + } + case 4 -> { if (aSide == 0 || aSide == 1) { return Textures.BlockIcons.LuV_TOP_CYCLOTRON_SOLENOID.getIcon(); } return Textures.BlockIcons.LuV_SIDE_CYCLOTRON_SOLENOID.getIcon(); - case 5: + } + case 5 -> { if (aSide == 0 || aSide == 1) { return Textures.BlockIcons.ZPM_TOP_CYCLOTRON_SOLENOID.getIcon(); } return Textures.BlockIcons.ZPM_SIDE_CYCLOTRON_SOLENOID.getIcon(); - case 6: + } + case 6 -> { if (aSide == 0 || aSide == 1) { return Textures.BlockIcons.UV_TOP_CYCLOTRON_SOLENOID.getIcon(); } return Textures.BlockIcons.UV_SIDE_CYCLOTRON_SOLENOID.getIcon(); - case 7: + } + case 7 -> { if (aSide == 0 || aSide == 1) { return Textures.BlockIcons.UHV_TOP_CYCLOTRON_SOLENOID.getIcon(); } return Textures.BlockIcons.UHV_SIDE_CYCLOTRON_SOLENOID.getIcon(); - case 8: + } + case 8 -> { if (aSide == 0 || aSide == 1) { return Textures.BlockIcons.UEV_TOP_CYCLOTRON_SOLENOID.getIcon(); } return Textures.BlockIcons.UEV_SIDE_CYCLOTRON_SOLENOID.getIcon(); - case 9: + } + case 9 -> { if (aSide == 0 || aSide == 1) { return Textures.BlockIcons.UIV_TOP_CYCLOTRON_SOLENOID.getIcon(); } return Textures.BlockIcons.UIV_SIDE_CYCLOTRON_SOLENOID.getIcon(); - case 10: + } + case 10 -> { if (aSide == 0 || aSide == 1) { return Textures.BlockIcons.UMV_TOP_CYCLOTRON_SOLENOID.getIcon(); } return Textures.BlockIcons.UMV_SIDE_CYCLOTRON_SOLENOID.getIcon(); + } } } return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java index 4f126426cb..ec30251560 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings2.java @@ -13,11 +13,10 @@ public class GT_Item_Casings2 extends GT_Item_Casings_Abstract { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { super.addInformation(aStack, aPlayer, aList, aF3_H); - switch (getDamage(aStack)) { - case 8: - aList.add(this.mBlastProofTooltip); + if (getDamage(aStack) == 8) { + aList.add(this.mBlastProofTooltip); } } } diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java index 57b2ccae3e..fb6b8ebc85 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java @@ -27,7 +27,7 @@ public class GT_Item_Casings5 extends GT_Item_Casings_Abstract { @Override @SideOnly(Side.CLIENT) @SuppressWarnings("unchecked") - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { super.addInformation(aStack, aPlayer, aList, aF3_H); HeatingCoilLevel coilLevel = GT_Block_Casings5.getCoilHeatFromDamage(aStack.getItemDamage()); aList.add(mCoilHeatTooltip + coilLevel.getHeat() + mCoilUnitTooltip); diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java index 12c6619bcb..e7a20e28cb 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java @@ -67,7 +67,7 @@ public abstract class GT_Item_Casings_Abstract extends ItemBlock { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { super.addInformation(aStack, aPlayer, aList, aF3_H); aList.add(this.mNoMobsToolTip); aList.add(this.mNoTileEntityToolTip); diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java b/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java index 13b4ba2d25..294d0df1cc 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Concretes.java @@ -19,7 +19,7 @@ public class GT_Item_Concretes extends GT_Item_Stones_Abstract { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { super.addInformation(aStack, aPlayer, aList, aF3_H); aList.add(this.mRunFasterToolTip); } diff --git a/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java b/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java index 66c8abc3e2..ebd495784b 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java @@ -37,7 +37,7 @@ public class GT_Item_LongDistancePipe extends ItemBlock { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { super.addInformation(aStack, aPlayer, aList, aF3_H); aList.add(this.mNoMobsToolTip); aList.add(this.mNoTileEntityToolTip); diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java index 6965ffda2f..64d7cfca69 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java @@ -56,7 +56,7 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem { @Override @SuppressWarnings("unchecked") - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { try { final int tDamage = getDamage(aStack); if ((tDamage <= 0) || (tDamage >= GregTech_API.METATILEENTITIES.length)) { diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java b/src/main/java/gregtech/common/blocks/GT_Item_Ores.java index f3cdaab1ba..2471c514a9 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Ores.java @@ -73,7 +73,7 @@ public class GT_Item_Ores extends ItemBlock { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { String formula = StatCollector.translateToLocal( field_150939_a.getUnlocalizedName() + '.' + getDamage(aStack) + ".tooltip"); if (!StringUtils.isBlank(formula)) aList.add(formula); diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java index 5a75f28dae..0b44d223a9 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java @@ -34,7 +34,7 @@ public class GT_Item_Stones_Abstract extends ItemBlock { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { super.addInformation(aStack, aPlayer, aList, aF3_H); if (aStack.getItemDamage() % 8 >= 3) { aList.add(this.mNoMobsToolTip); diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Storage.java b/src/main/java/gregtech/common/blocks/GT_Item_Storage.java index fddf64163d..4ac1b9cdfd 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Storage.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Storage.java @@ -41,7 +41,7 @@ public class GT_Item_Storage extends ItemBlock { } @Override - public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { super.addInformation(aStack, aPlayer, aList, aF3_H); } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java index 6ed09dbf06..8349dde2ee 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java @@ -39,8 +39,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) { if (!makeSureOnlyOne(aSide, aTileEntity)) return 0; - if (aTileEntity instanceof IMachineProgress) { - IMachineProgress machine = (IMachineProgress) aTileEntity; + if (aTileEntity instanceof IMachineProgress machine) { if (aCoverVariable < 2) { if ((aInputRedstone > 0) == (aCoverVariable == 0)) { if (!machine.isAllowedToWork()) machine.enableWorking(); @@ -81,7 +80,7 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior implements IControls /** * Make sure there is only one GT_Cover_ControlsWork on the aTileEntity TODO this is a migration thing. Remove this * after 2.3.0 is released. - * + * * @return true if the cover is the first (side) one **/ private boolean makeSureOnlyOne(byte aSide, ICoverable aTileEntity) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java index e056c1c02d..ac99e56005 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java @@ -91,42 +91,24 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior { aCoverVariable = 11; } switch (aCoverVariable) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("006", "Export")); - break; - case 1: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("007", "Import")); - break; - case 2: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("008", "Export (conditional)")); - break; - case 3: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("009", "Import (conditional)")); - break; - case 4: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("010", "Export (invert cond)")); - break; - case 5: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("011", "Import (invert cond)")); - break; - case 6: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("012", "Export allow Input")); - break; - case 7: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("013", "Import allow Output")); - break; - case 8: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("014", "Export allow Input (conditional)")); - break; - case 9: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("015", "Import allow Output (conditional)")); - break; - case 10: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("016", "Export allow Input (invert cond)")); - break; - case 11: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("017", "Import allow Output (invert cond)")); - break; + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("006", "Export")); + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("007", "Import")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("008", "Export (conditional)")); + case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("009", "Import (conditional)")); + case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("010", "Export (invert cond)")); + case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("011", "Import (invert cond)")); + case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("012", "Export allow Input")); + case 7 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("013", "Import allow Output")); + case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("014", "Export allow Input (conditional)")); + case 9 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("015", "Import allow Output (conditional)")); + case 10 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("016", "Export allow Input (invert cond)")); + case 11 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("017", "Import allow Output (invert cond)")); } return aCoverVariable; } @@ -321,46 +303,45 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior { private int getNewCoverVariable(int id, int coverVariable) { switch (id) { - case 0: + case 0 -> { return coverVariable & ~0x1; - case 1: + } + case 1 -> { return coverVariable | 0x1; - case 2: + } + case 2 -> { if (coverVariable > 5) return 0x6 | (coverVariable & ~0xE); return (coverVariable & ~0xE); - case 3: + } + case 3 -> { if (coverVariable > 5) return 0x8 | (coverVariable & ~0xE); return 0x2 | (coverVariable & ~0xE); - case 4: + } + case 4 -> { if (coverVariable > 5) return 0xA | (coverVariable & ~0xE); return (0x4 | (coverVariable & ~0xE)); - case 5: + } + case 5 -> { if (coverVariable <= 5) return coverVariable + 6; - break; - case 6: + } + case 6 -> { if (coverVariable > 5) return coverVariable - 6; + } } return coverVariable; } private boolean getClickable(int id, int coverVariable) { if (coverVariable < 0 | 11 < coverVariable) return false; - switch (id) { - case 0: - case 1: - return (0x1 & coverVariable) != id; - case 2: - return (coverVariable % 6) >= 2; - case 3: - return (coverVariable % 6) < 2 | 4 <= (coverVariable % 6); - case 4: - return (coverVariable % 6) < 4; - case 5: - return coverVariable < 6; - case 6: - return coverVariable >= 6; - } - return false; + return switch (id) { + case 0, 1 -> (0x1 & coverVariable) != id; + case 2 -> (coverVariable % 6) >= 2; + case 3 -> (coverVariable % 6) < 2 | 4 <= (coverVariable % 6); + case 4 -> (coverVariable % 6) < 4; + case 5 -> coverVariable < 6; + case 6 -> coverVariable >= 6; + default -> false; + }; } } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java b/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java index bcbf07798b..4a5c254ee1 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Crafting.java @@ -36,9 +36,9 @@ public class GT_Cover_Crafting extends GT_CoverBehavior { ((EntityPlayerMP) aPlayer).getNextWindowId(); ((EntityPlayerMP) aPlayer).playerNetServerHandler.sendPacket( new S2DPacketOpenWindow(((EntityPlayerMP) aPlayer).currentWindowId, 1, "Crafting", 9, true)); - ((EntityPlayerMP) aPlayer).openContainer = new ContainerWorkbench( - ((EntityPlayerMP) aPlayer).inventory, - ((EntityPlayerMP) aPlayer).worldObj, + aPlayer.openContainer = new ContainerWorkbench( + aPlayer.inventory, + aPlayer.worldObj, aTileEntity.getXCoord(), aTileEntity.getYCoord(), aTileEntity.getZCoord()) { @@ -48,8 +48,8 @@ public class GT_Cover_Crafting extends GT_CoverBehavior { return true; } }; - ((EntityPlayerMP) aPlayer).openContainer.windowId = ((EntityPlayerMP) aPlayer).currentWindowId; - ((EntityPlayerMP) aPlayer).openContainer.addCraftingToCrafters((EntityPlayerMP) aPlayer); + aPlayer.openContainer.windowId = ((EntityPlayerMP) aPlayer).currentWindowId; + aPlayer.openContainer.addCraftingToCrafters((EntityPlayerMP) aPlayer); } return true; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java index c4d3364ba0..01d95f1664 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java @@ -71,18 +71,14 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior { aCoverVariable = 3; } switch (aCoverVariable) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("018", "Normal")); - break; // Progress scaled - case 1: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("019", "Inverted")); - break; // ^ inverted - case 2: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("020", "Ready to work")); - break; // Not Running - case 3: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("021", "Not ready to work")); - break; // Running + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("018", "Normal")); + // Progress scaled + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("019", "Inverted")); + // ^ inverted + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("020", "Ready to work")); + // Not Running + case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("021", "Not ready to work")); + // Running } return aCoverVariable; } @@ -205,27 +201,27 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior { private int getNewCoverVariable(int id, int coverVariable) { switch (id) { - case 0: + case 0 -> { return coverVariable & ~0x2; - case 1: + } + case 1 -> { return coverVariable | 0x2; - case 2: + } + case 2 -> { if ((coverVariable & 0x1) > 0) return coverVariable & ~0x1; return coverVariable | 0x1; + } } return coverVariable; } private boolean isEnabled(int id, int coverVariable) { - switch (id) { - case 0: - return (coverVariable & 0x2) == 0; - case 1: - return (coverVariable & 0x2) > 0; - case 2: - return (coverVariable & 0x1) > 0; - } - return true; + return switch (id) { + case 0 -> (coverVariable & 0x2) == 0; + case 1 -> (coverVariable & 0x2) > 0; + case 2 -> (coverVariable & 0x1) > 0; + default -> true; + }; } } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java index 4a08925ca4..5f5381a141 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Drain.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Drain.java @@ -123,24 +123,12 @@ public class GT_Cover_Drain extends GT_CoverBehavior { aCoverVariable = 5; } switch (aCoverVariable) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("022", "Import")); - break; - case 1: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("023", "Import (conditional)")); - break; - case 2: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("024", "Import (invert cond)")); - break; - case 3: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("025", "Keep Liquids Away")); - break; - case 4: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("026", "Keep Liquids Away (conditional)")); - break; - case 5: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("027", "Keep Liquids Away (invert cond)")); - break; + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("022", "Import")); + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("023", "Import (conditional)")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("024", "Import (invert cond)")); + case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("025", "Keep Liquids Away")); + case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("026", "Keep Liquids Away (conditional)")); + case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("027", "Keep Liquids Away (invert cond)")); } return aCoverVariable; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java index 0ded299507..a57544e55c 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java @@ -97,46 +97,22 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe int num = (aCoverVariable.getNum() + (aPlayer.isSneaking() ? -1 : 1) + EnergyType.values().length * 2) % (EnergyType.values().length * 2); switch (num) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("031", "Normal Universal Storage")); - break; - case 1: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("032", "Inverted Universal Storage")); - break; - case 2: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("033", "Normal Electricity Storage")); - break; - case 3: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("034", "Inverted Electricity Storage")); - break; - case 4: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("035", "Normal Steam Storage")); - break; - case 5: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("036", "Inverted Steam Storage")); - break; - case 6: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("037", "Normal Average Electric Input")); - break; - case 7: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("038", "Inverted Average Electric Input")); - break; - case 8: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("039", "Normal Average Electric Output")); - break; - case 9: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("040", "Inverted Average Electric Output")); - break; - case 10: - GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("041", "Normal Electricity Storage(Including Batteries)")); - break; - case 11: - GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("042", "Inverted Electricity Storage(Including Batteries)")); - break; + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("031", "Normal Universal Storage")); + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("032", "Inverted Universal Storage")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("033", "Normal Electricity Storage")); + case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("034", "Inverted Electricity Storage")); + case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("035", "Normal Steam Storage")); + case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("036", "Inverted Steam Storage")); + case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("037", "Normal Average Electric Input")); + case 7 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("038", "Inverted Average Electric Input")); + case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("039", "Normal Average Electric Output")); + case 9 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("040", "Inverted Average Electric Output")); + case 10 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("041", "Normal Electricity Storage(Including Batteries)")); + case 11 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("042", "Inverted Electricity Storage(Including Batteries)")); } aCoverVariable.setNum(num); return aCoverVariable; @@ -391,8 +367,7 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe GT_Utility.trans("261", "Electricity Storage(Including Batteries)"), (te) -> { if (te instanceof IGregTechTileEntity) { IMetaTileEntity mte = ((IGregTechTileEntity) te).getMetaTileEntity(); - if (mte instanceof GT_MetaTileEntity_BasicBatteryBuffer) { - GT_MetaTileEntity_BasicBatteryBuffer buffer = (GT_MetaTileEntity_BasicBatteryBuffer) mte; + if (mte instanceof GT_MetaTileEntity_BasicBatteryBuffer buffer) { return buffer.getStoredEnergy()[0]; } } @@ -400,8 +375,7 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe }, (te) -> { if (te instanceof IGregTechTileEntity) { IMetaTileEntity mte = ((IGregTechTileEntity) te).getMetaTileEntity(); - if (mte instanceof GT_MetaTileEntity_BasicBatteryBuffer) { - GT_MetaTileEntity_BasicBatteryBuffer buffer = (GT_MetaTileEntity_BasicBatteryBuffer) mte; + if (mte instanceof GT_MetaTileEntity_BasicBatteryBuffer buffer) { return buffer.getStoredEnergy()[1]; } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java index 80eeead660..66d5eae5e5 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java @@ -386,31 +386,23 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_ protected void addTitleToUI(ModularWindow.Builder builder) {} private int getNewCoverVariable(int id, FacadeData coverVariable) { - switch (id) { - case 0: - return coverVariable.mFlags ^ 0x1; - case 1: - return coverVariable.mFlags ^ 0x2; - case 2: - return coverVariable.mFlags ^ 0x4; - case 3: - return coverVariable.mFlags ^ 0x8; - } - return coverVariable.mFlags; + return switch (id) { + case 0 -> coverVariable.mFlags ^ 0x1; + case 1 -> coverVariable.mFlags ^ 0x2; + case 2 -> coverVariable.mFlags ^ 0x4; + case 3 -> coverVariable.mFlags ^ 0x8; + default -> coverVariable.mFlags; + }; } private boolean isEnabled(int id, FacadeData coverVariable) { - switch (id) { - case 0: - return (coverVariable.mFlags & 0x1) > 0; - case 1: - return (coverVariable.mFlags & 0x2) > 0; - case 2: - return (coverVariable.mFlags & 0x4) > 0; - case 3: - return (coverVariable.mFlags & 0x8) > 0; - } - return false; + return switch (id) { + case 0 -> (coverVariable.mFlags & 0x1) > 0; + case 1 -> (coverVariable.mFlags & 0x2) > 0; + case 2 -> (coverVariable.mFlags & 0x4) > 0; + case 3 -> (coverVariable.mFlags & 0x8) > 0; + default -> false; + }; } } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java index 68bf59b5df..bf82af3ad2 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidLimiter.java @@ -152,8 +152,7 @@ public class GT_Cover_FluidLimiter extends GT_CoverBehaviorBase<GT_Cover_FluidLi @Override public void loadDataFromNBT(NBTBase aNBT) { - if (aNBT instanceof NBTTagCompound) { - NBTTagCompound tag = (NBTTagCompound) aNBT; + if (aNBT instanceof NBTTagCompound tag) { this.threshold = tag.getFloat("threshold"); } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java index d02f098e3b..d233d741ae 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java @@ -557,8 +557,7 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid @Override public void loadDataFromNBT(NBTBase aNBT) { - if (!(aNBT instanceof NBTTagCompound)) return; // not very good... - NBTTagCompound tag = (NBTTagCompound) aNBT; + if (!(aNBT instanceof NBTTagCompound tag)) return; // not very good... speed = tag.getInteger("mSpeed"); tickRate = tag.getInteger("mTickRate"); condition = Conditional.VALUES[tag.getByte("mCondition")]; diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java index bb140b37a8..3457649957 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidStorageMonitor.java @@ -191,8 +191,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ return null; } - if (container.getItem() instanceof IFluidContainerItem) { - final IFluidContainerItem containerItem = (IFluidContainerItem) container.getItem(); + if (container.getItem() instanceof IFluidContainerItem containerItem) { final int filled = tank.fill(side, fluidToFill, true); if (filled == 0) { return null; @@ -218,8 +217,7 @@ public class GT_Cover_FluidStorageMonitor extends GT_CoverBehaviorBase<GT_Cover_ return null; } - if (container.getItem() instanceof IFluidContainerItem) { - final IFluidContainerItem containerItem = (IFluidContainerItem) container.getItem(); + if (container.getItem() instanceof IFluidContainerItem containerItem) { final int filled = Math.min( Optional.ofNullable( tank.drain( diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java index 65e036a110..a067674322 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java @@ -92,26 +92,17 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil } public String getFilterMode(int aFilterMode) { - switch (aFilterMode) { - case FILTER_INPUT_DENY_OUTPUT: - return GT_Utility.trans("043", "Filter input, Deny output"); - case INVERT_INPUT_DENY_OUTPUT: - return GT_Utility.trans("044", "Invert input, Deny output"); - case FILTER_INPUT_ANY_OUTPUT: - return GT_Utility.trans("045", "Filter input, Permit any output"); - case INVERT_INPUT_ANY_OUTPUT: - return GT_Utility.trans("046", "Invert input, Permit any output"); - case DENY_INPUT_FILTER_OUTPUT: - return GT_Utility.trans("307", "Deny input, Filter output"); - case DENY_INPUT_INVERT_OUTPUT: - return GT_Utility.trans("308", "Deny input, Invert output"); - case ANY_INPUT_FILTER_OUTPUT: - return GT_Utility.trans("309", "Permit any input, Filter output"); - case ANY_INPUT_INVERT_OUTPUT: - return GT_Utility.trans("310", "Permit any input, Invert output"); - default: - return ("UNKNOWN"); - } + return switch (aFilterMode) { + case FILTER_INPUT_DENY_OUTPUT -> GT_Utility.trans("043", "Filter input, Deny output"); + case INVERT_INPUT_DENY_OUTPUT -> GT_Utility.trans("044", "Invert input, Deny output"); + case FILTER_INPUT_ANY_OUTPUT -> GT_Utility.trans("045", "Filter input, Permit any output"); + case INVERT_INPUT_ANY_OUTPUT -> GT_Utility.trans("046", "Invert input, Permit any output"); + case DENY_INPUT_FILTER_OUTPUT -> GT_Utility.trans("307", "Deny input, Filter output"); + case DENY_INPUT_INVERT_OUTPUT -> GT_Utility.trans("308", "Deny input, Invert output"); + case ANY_INPUT_FILTER_OUTPUT -> GT_Utility.trans("309", "Permit any input, Filter output"); + case ANY_INPUT_INVERT_OUTPUT -> GT_Utility.trans("310", "Permit any input, Invert output"); + default -> ("UNKNOWN"); + }; } @Override @@ -371,36 +362,24 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil } private int getNewFilterMode(int id, FluidFilterData coverVariable) { - switch (id) { - case 0: - return (coverVariable.mFilterMode & 0x3); - case 1: - return (coverVariable.mFilterMode | 0x4); - case 2: - return (coverVariable.mFilterMode & 0x5); - case 3: - return (coverVariable.mFilterMode | 0x2); - case 4: - return (coverVariable.mFilterMode & 0x6); - case 5: - return (coverVariable.mFilterMode | 0x1); - } - return coverVariable.mFilterMode; + return switch (id) { + case 0 -> (coverVariable.mFilterMode & 0x3); + case 1 -> (coverVariable.mFilterMode | 0x4); + case 2 -> (coverVariable.mFilterMode & 0x5); + case 3 -> (coverVariable.mFilterMode | 0x2); + case 4 -> (coverVariable.mFilterMode & 0x6); + case 5 -> (coverVariable.mFilterMode | 0x1); + default -> coverVariable.mFilterMode; + }; } private boolean getClickable(int id, FluidFilterData coverVariable) { - switch (id) { - case 0: - case 1: - return (coverVariable.mFilterMode >> 2 & 0x1) != (id & 0x1); - case 2: - case 3: - return (coverVariable.mFilterMode >> 1 & 0x1) != (id & 0x1); - case 4: - case 5: - return (coverVariable.mFilterMode & 0x1) != (id & 0x1); - } - return false; + return switch (id) { + case 0, 1 -> (coverVariable.mFilterMode >> 2 & 0x1) != (id & 0x1); + case 2, 3 -> (coverVariable.mFilterMode >> 1 & 0x1) != (id & 0x1); + case 4, 5 -> (coverVariable.mFilterMode & 0x1) != (id & 0x1); + default -> false; + }; } private ItemStack getFluidDisplayItem(FluidFilterData coverData) { @@ -445,8 +424,7 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil @Override public void loadDataFromNBT(NBTBase aNBT) { - if (aNBT instanceof NBTTagCompound) { - NBTTagCompound tNBT = (NBTTagCompound) aNBT; + if (aNBT instanceof NBTTagCompound tNBT) { mFilterMode = tNBT.getInteger("mFilterMode"); if (tNBT.hasKey("mFluid", NBT.TAG_STRING)) mFluidID = FluidRegistry.getFluidID(tNBT.getString("mFluid")); diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java index cc3f553755..059cf43e2c 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java @@ -82,8 +82,7 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter. long max = 0; long used = 0; IMetaTileEntity mte = ((IGregTechTileEntity) tileEntity).getMetaTileEntity(); - if (mte instanceof GT_MetaTileEntity_DigitalChestBase) { - GT_MetaTileEntity_DigitalChestBase dc = (GT_MetaTileEntity_DigitalChestBase) mte; + if (mte instanceof GT_MetaTileEntity_DigitalChestBase dc) { max = dc.getMaxItemCount(); used = dc.getProgresstime(); } else if (GregTech_API.mAE2 && mte instanceof GT_MetaTileEntity_Hatch_OutputBus_ME) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java index 0387d4e4b9..b0ec7137b4 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java @@ -50,11 +50,9 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior { public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) { boolean needsRepair = false; - if (aTileEntity instanceof IGregTechTileEntity) { - IGregTechTileEntity tTileEntity = (IGregTechTileEntity) aTileEntity; + if (aTileEntity instanceof IGregTechTileEntity tTileEntity) { IMetaTileEntity mTileEntity = tTileEntity.getMetaTileEntity(); - if (mTileEntity instanceof GT_MetaTileEntity_MultiBlockBase) { - GT_MetaTileEntity_MultiBlockBase multi = (GT_MetaTileEntity_MultiBlockBase) mTileEntity; + if (mTileEntity instanceof GT_MetaTileEntity_MultiBlockBase multi) { int ideal = multi.getIdealStatus(); int real = multi.getRepairStatus(); ItemStack tRotor = multi.getRealInventory()[1]; @@ -97,56 +95,38 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior { aCoverVariable = 13; } switch (aCoverVariable) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("056", "Emit if 1 Maintenance Needed")); - break; - case 1: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("057", "Emit if 1 Maintenance Needed(inverted)")); - break; - case 2: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("058", "Emit if 2 Maintenance Needed")); - break; - case 3: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("059", "Emit if 2 Maintenance Needed(inverted)")); - break; - case 4: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("060", "Emit if 3 Maintenance Needed")); - break; - case 5: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("061", "Emit if 3 Maintenance Needed(inverted)")); - break; - case 6: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("062", "Emit if 4 Maintenance Needed")); - break; - case 7: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("063", "Emit if 4 Maintenance Needed(inverted)")); - break; - case 8: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("064", "Emit if 5 Maintenance Needed")); - break; - case 9: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("065", "Emit if 5 Maintenance Needed(inverted)")); - break; - case 10: - GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("066", "Emit if rotor needs maintenance low accuracy mod")); - break; - case 11: - GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("067", "Emit if rotor needs maintenance low accuracy mod(inverted)")); - break; - case 12: - GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("068", "Emit if rotor needs maintenance high accuracy mod")); - break; - case 13: - GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("069", "Emit if rotor needs maintenance high accuracy mod(inverted)")); - break; + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("056", "Emit if 1 Maintenance Needed")); + case 1 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("057", "Emit if 1 Maintenance Needed(inverted)")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("058", "Emit if 2 Maintenance Needed")); + case 3 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("059", "Emit if 2 Maintenance Needed(inverted)")); + case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("060", "Emit if 3 Maintenance Needed")); + case 5 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("061", "Emit if 3 Maintenance Needed(inverted)")); + case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("062", "Emit if 4 Maintenance Needed")); + case 7 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("063", "Emit if 4 Maintenance Needed(inverted)")); + case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("064", "Emit if 5 Maintenance Needed")); + case 9 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("065", "Emit if 5 Maintenance Needed(inverted)")); + case 10 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("066", "Emit if rotor needs maintenance low accuracy mod")); + case 11 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("067", "Emit if rotor needs maintenance low accuracy mod(inverted)")); + case 12 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("068", "Emit if rotor needs maintenance high accuracy mod")); + case 13 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("069", "Emit if rotor needs maintenance high accuracy mod(inverted)")); } return aCoverVariable; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java index bbfe23eb30..466931d075 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java @@ -55,8 +55,7 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior { placer = ((IGregTechTileEntity) aTileEntity).getOwnerName(); } for (Object tObject : aTileEntity.getWorld().playerEntities) { - if ((tObject instanceof EntityPlayerMP)) { - EntityPlayerMP tEntity = (EntityPlayerMP) tObject; + if ((tObject instanceof EntityPlayerMP tEntity)) { int dist = Math.max( 1, (int) tEntity.getDistance( @@ -94,15 +93,9 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior { aCoverVariable = 2; } switch (aCoverVariable) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("068.1", "Emit if any Player is close")); - break; - case 1: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("069.1", "Emit if other Player is close")); - break; - case 2: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("070", "Emit if you are close")); - break; + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("068.1", "Emit if any Player is close")); + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("069.1", "Emit if other Player is close")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("070", "Emit if you are close")); } return aCoverVariable; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java index 2e23995fcf..f95c586427 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java @@ -111,42 +111,24 @@ public class GT_Cover_Pump extends GT_CoverBehavior { aCoverVariable = 11; } switch (aCoverVariable) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("006", "Export")); - break; - case 1: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("007", "Import")); - break; - case 2: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("008", "Export (conditional)")); - break; - case 3: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("009", "Import (conditional)")); - break; - case 4: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("010", "Export (invert cond)")); - break; - case 5: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("011", "Import (invert cond)")); - break; - case 6: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("012", "Export allow Input")); - break; - case 7: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("013", "Import allow Output")); - break; - case 8: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("014", "Export allow Input (conditional)")); - break; - case 9: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("015", "Import allow Output (conditional)")); - break; - case 10: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("016", "Export allow Input (invert cond)")); - break; - case 11: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("017", "Import allow Output (invert cond)")); - break; + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("006", "Export")); + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("007", "Import")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("008", "Export (conditional)")); + case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("009", "Import (conditional)")); + case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("010", "Export (invert cond)")); + case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("011", "Import (invert cond)")); + case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("012", "Export allow Input")); + case 7 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("013", "Import allow Output")); + case 8 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("014", "Export allow Input (conditional)")); + case 9 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("015", "Import allow Output (conditional)")); + case 10 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("016", "Export allow Input (invert cond)")); + case 11 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("017", "Import allow Output (invert cond)")); } return aCoverVariable; } @@ -351,46 +333,45 @@ public class GT_Cover_Pump extends GT_CoverBehavior { private int getNewCoverVariable(int id, int coverVariable) { switch (id) { - case 0: + case 0 -> { return coverVariable & ~0x1; - case 1: + } + case 1 -> { return coverVariable | 0x1; - case 2: + } + case 2 -> { if (coverVariable > 5) return 0x6 | (coverVariable & ~0xE); return (coverVariable & ~0xE); - case 3: + } + case 3 -> { if (coverVariable > 5) return 0x8 | (coverVariable & ~0xE); return 0x2 | (coverVariable & ~0xE); - case 4: + } + case 4 -> { if (coverVariable > 5) return 0xA | (coverVariable & ~0xE); return (0x4 | (coverVariable & ~0xE)); - case 5: + } + case 5 -> { if (coverVariable <= 5) return coverVariable + 6; - break; - case 6: + } + case 6 -> { if (coverVariable > 5) return coverVariable - 6; + } } return coverVariable; } private boolean getClickable(int id, int coverVariable) { if (coverVariable < 0 | 11 < coverVariable) return false; - switch (id) { - case 0: - case 1: - return (0x1 & coverVariable) != id; - case 2: - return (coverVariable % 6) >= 2; - case 3: - return (coverVariable % 6) < 2 | 4 <= (coverVariable % 6); - case 4: - return (coverVariable % 6) < 4; - case 5: - return coverVariable < 6; - case 6: - return coverVariable >= 6; - } - return false; + return switch (id) { + case 0, 1 -> (0x1 & coverVariable) != id; + case 2 -> (coverVariable % 6) >= 2; + case 3 -> (coverVariable % 6) < 2 | 4 <= (coverVariable % 6); + case 4 -> (coverVariable % 6) < 4; + case 5 -> coverVariable < 6; + case 6 -> coverVariable >= 6; + default -> false; + }; } } } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java index 733376f6e2..7b1adacff4 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java @@ -42,27 +42,13 @@ public class GT_Cover_RedstoneConductor extends GT_CoverBehavior { aCoverVariable = 6; } switch (aCoverVariable) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("071", "Conducts strongest Input")); - break; - case 1: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("072", "Conducts from bottom Input")); - break; - case 2: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("073", "Conducts from top Input")); - break; - case 3: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("074", "Conducts from north Input")); - break; - case 4: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("075", "Conducts from south Input")); - break; - case 5: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("076", "Conducts from west Input")); - break; - case 6: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("077", "Conducts from east Input")); - break; + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("071", "Conducts strongest Input")); + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("072", "Conducts from bottom Input")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("073", "Conducts from top Input")); + case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("074", "Conducts from north Input")); + case 4 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("075", "Conducts from south Input")); + case 5 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("076", "Conducts from west Input")); + case 6 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("077", "Conducts from east Input")); } return aCoverVariable; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java index 9cd9f7f5fb..8fe1bb5d13 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverExternal.java @@ -29,8 +29,8 @@ public class GT_Cover_RedstoneReceiverExternal extends GT_Cover_RedstoneWireless long aTimer) { aTileEntity.setOutputRedstoneSignal( aSide, - GregTech_API.sWirelessRedstone.get(Integer.valueOf(aCoverVariable)) == null ? 0 - : ((Byte) GregTech_API.sWirelessRedstone.get(Integer.valueOf(aCoverVariable))).byteValue()); + GregTech_API.sWirelessRedstone.get(aCoverVariable) == null ? 0 + : GregTech_API.sWirelessRedstone.get(aCoverVariable)); return aCoverVariable; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java index d596b4ec15..bdb160f15e 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java @@ -27,19 +27,15 @@ public class GT_Cover_RedstoneSignalizer extends GT_CoverBehavior { EntityPlayer aPlayer, float aX, float aY, float aZ) { aCoverVariable = (aCoverVariable + 1) % 48; switch (aCoverVariable / 16) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("078", "Signal = ") + (aCoverVariable & 0xF)); - break; - case 1: - GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("079", "Conditional Signal = ") + (aCoverVariable & 0xF)); - break; - case 2: - GT_Utility.sendChatToPlayer( - aPlayer, - GT_Utility.trans("080", "Inverted Conditional Signal = ") + (aCoverVariable & 0xF)); - break; + case 0 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("078", "Signal = ") + (aCoverVariable & 0xF)); + case 1 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("079", "Conditional Signal = ") + (aCoverVariable & 0xF)); + case 2 -> GT_Utility.sendChatToPlayer( + aPlayer, + GT_Utility.trans("080", "Inverted Conditional Signal = ") + (aCoverVariable & 0xF)); } return aCoverVariable; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java index 968ad3f815..42c20e9088 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneTransmitterInternal.java @@ -27,9 +27,7 @@ public class GT_Cover_RedstoneTransmitterInternal extends GT_Cover_RedstoneWirel @Override public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) { - GregTech_API.sWirelessRedstone.put( - Integer.valueOf(aCoverVariable), - Byte.valueOf(aTileEntity.getOutputRedstoneSignal(aSide))); + GregTech_API.sWirelessRedstone.put(aCoverVariable, aTileEntity.getOutputRedstoneSignal(aSide)); return aCoverVariable; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java index 88a472797b..a2a6ea76c6 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java @@ -90,21 +90,14 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior { GregTech_API.sWirelessRedstone.put(aCoverVariable, (byte) 0); float[] tCoords = GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ); - short tAdjustVal = 0; - - switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + 2 * (byte) (int) (tCoords[1] * 2.0F))) { - case 0: - tAdjustVal = -32; - break; - case 1: - tAdjustVal = 32; - break; - case 2: - tAdjustVal = -1024; - break; - case 3: - tAdjustVal = 1024; - } + short tAdjustVal = switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + + 2 * (byte) (int) (tCoords[1] * 2.0F))) { + case 0 -> -32; + case 1 -> 32; + case 2 -> -1024; + case 3 -> 1024; + default -> 0; + }; int tPublicChannel = (aCoverVariable & PUBLIC_MASK) + tAdjustVal; diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java index 81af7b06d4..1e70efc5b8 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java @@ -51,18 +51,10 @@ public class GT_Cover_Shutter extends GT_CoverBehavior { aCoverVariable = 3; } switch (aCoverVariable) { - case 0: - GT_Utility.sendChatToPlayer(aPlayer, trans("082", "Open if work enabled")); - break; - case 1: - GT_Utility.sendChatToPlayer(aPlayer, trans("083", "Open if work disabled")); - break; - case 2: - GT_Utility.sendChatToPlayer(aPlayer, trans("084", "Only Output allowed")); - break; - case 3: - GT_Utility.sendChatToPlayer(aPlayer, trans("085", "Only Input allowed")); - break; + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, trans("082", "Open if work enabled")); + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, trans("083", "Open if work disabled")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, trans("084", "Only Output allowed")); + case 3 -> GT_Utility.sendChatToPlayer(aPlayer, trans("085", "Only Input allowed")); } if (aTileEntity instanceof BaseMetaPipeEntity) { ((BaseMetaPipeEntity) aTileEntity).reloadLocks(); diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Vent.java b/src/main/java/gregtech/common/covers/GT_Cover_Vent.java index 184ac5bb57..800d3822de 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Vent.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Vent.java @@ -84,27 +84,18 @@ public class GT_Cover_Vent extends GT_CoverBehavior { return 0; } if (blockAtSide == Blocks.water || blockAtSide == Blocks.flowing_water) { - switch (mEfficiency) { - case 2: - chances = 10000; // 100% chances for Diamond reactor vent with water - break; - case 1: - chances = 5000; // 50% chances for Gold and Overclocked reactor vents with water - break; - default: - chances = 2500; // 25% chances for Basic reactor vent with water - break; - } + chances = switch (mEfficiency) { + case 2 -> 10000; // 100% chances for Diamond reactor vent with water + case 1 -> 5000; // 50% chances for Gold and Overclocked reactor vents with water + default -> 2500; // 25% chances for Basic reactor vent with water + }; } else if (blockAtSide.isAir(world, offsetX, offsetY, offsetZ)) { switch (mEfficiency) { - case 2: - chances = 2500; // 25% chances for Diamond reactor vent with air - break; - case 1: - chances = 1250; // 12.5% chances for Gold and Overclocked reactor vents with air - break; - default: + case 2 -> chances = 2500; // 25% chances for Diamond reactor vent with air + case 1 -> chances = 1250; // 12.5% chances for Gold and Overclocked reactor vents with air + default -> { return 0; // Basic reactor vent cannot be used with air + } } } else { return 0; // Vent cover need water or air diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java index f80fdc8e65..0ceaaeb887 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedRedstoneReceiverInternal.java @@ -13,8 +13,7 @@ public class GT_Cover_AdvancedRedstoneReceiverInternal extends GT_Cover_Advanced @Override public ReceiverData doCoverThingsImpl(byte aSide, byte aInputRedstone, int aCoverID, ReceiverData aCoverVariable, ICoverable aTileEntity, long aTimer) { - if (aTileEntity instanceof IMachineProgress) { - IMachineProgress machine = ((IMachineProgress) aTileEntity); + if (aTileEntity instanceof IMachineProgress machine) { if (getRedstoneInput(aSide, aInputRedstone, aCoverID, aCoverVariable, aTileEntity) > 0) { machine.enableWorking(); } else { diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java index e619d72723..fecb188214 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_AdvancedWirelessRedstoneBase.java @@ -43,37 +43,42 @@ public abstract class GT_Cover_AdvancedWirelessRedstoneBase<T extends GT_Cover_A if (signals == null) signals = new ConcurrentHashMap<>(); switch (mode) { - case AND: + case AND -> { return (byte) (signals.values() .stream() .map(signal -> signal > 0) .reduce(true, (signalA, signalB) -> signalA && signalB) ? 15 : 0); - case NAND: + } + case NAND -> { return (byte) (signals.values() .stream() .map(signal -> signal > 0) .reduce(true, (signalA, signalB) -> signalA && signalB) ? 0 : 15); - case OR: + } + case OR -> { return (byte) (signals.values() .stream() .map(signal -> signal > 0) .reduce(false, (signalA, signalB) -> signalA || signalB) ? 15 : 0); - case NOR: + } + case NOR -> { return (byte) (signals.values() .stream() .map(signal -> signal > 0) .reduce(false, (signalA, signalB) -> signalA || signalB) ? 0 : 15); - case SINGLE_SOURCE: + } + case SINGLE_SOURCE -> { if (signals.values() .isEmpty()) { return 0; } - return signals.values() .iterator() .next(); - default: + } + default -> { return 0; + } } } diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java index 515a196b65..d567ea0ae5 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessMaintenanceDetector.java @@ -50,24 +50,15 @@ public class GT_Cover_WirelessMaintenanceDetector extends if (tileEntity instanceof IGregTechTileEntity) { IMetaTileEntity metaTE = ((IGregTechTileEntity) tileEntity).getMetaTileEntity(); - if (metaTE instanceof GT_MetaTileEntity_MultiBlockBase) { - GT_MetaTileEntity_MultiBlockBase multiTE = (GT_MetaTileEntity_MultiBlockBase) metaTE; + if (metaTE instanceof GT_MetaTileEntity_MultiBlockBase multiTE) { int ideal = multiTE.getIdealStatus(); int real = multiTE.getRepairStatus(); switch (coverVariable.mode) { - case NO_ISSUE: - signal = ideal == real; - break; - case ONE_ISSUE: - case TWO_ISSUES: - case THREE_ISSUES: - case FOUR_ISSUES: - case FIVE_ISSUES: - signal = ideal - real >= coverVariable.mode.ordinal(); - break; - case ROTOR_80: - case ROTOR_100: + case NO_ISSUE -> signal = ideal == real; + case ONE_ISSUE, TWO_ISSUES, THREE_ISSUES, FOUR_ISSUES, FIVE_ISSUES -> signal = ideal - real + >= coverVariable.mode.ordinal(); + case ROTOR_80, ROTOR_100 -> { ItemStack rotor = multiTE.getRealInventory()[1]; if (GT_Cover_NeedMaintainance.isRotor(rotor)) { long max = GT_MetaGenerated_Tool.getToolMaxDamage(rotor); @@ -85,6 +76,7 @@ public class GT_Cover_WirelessMaintenanceDetector extends } else { signal = true; } + } } } } diff --git a/src/main/java/gregtech/common/entities/GT_Entity_Arrow.java b/src/main/java/gregtech/common/entities/GT_Entity_Arrow.java index 540a8e23a5..c07e316684 100644 --- a/src/main/java/gregtech/common/entities/GT_Entity_Arrow.java +++ b/src/main/java/gregtech/common/entities/GT_Entity_Arrow.java @@ -126,13 +126,13 @@ public class GT_Entity_Arrow extends EntityArrow { vec3 = Vec3.createVectorHelper(tVector.hitVec.xCoord, tVector.hitVec.yCoord, tVector.hitVec.zCoord); } Entity tHitEntity = null; - List tAllPotentiallyHitEntities = this.worldObj.getEntitiesWithinAABBExcludingEntity( + List<Entity> tAllPotentiallyHitEntities = this.worldObj.getEntitiesWithinAABBExcludingEntity( this, this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ) .expand(1.0D, 1.0D, 1.0D)); double tLargestDistance = Double.MAX_VALUE; - for (int i = 0; i < tAllPotentiallyHitEntities.size(); i++) { - Entity entity1 = (Entity) tAllPotentiallyHitEntities.get(i); + for (Entity tAllPotentiallyHitEntity : tAllPotentiallyHitEntities) { + Entity entity1 = tAllPotentiallyHitEntity; if ((entity1.canBeCollidedWith()) && ((entity1 != tShootingEntity) || (this.ticksInAir >= 5))) { AxisAlignedBB axisalignedbb1 = entity1.boundingBox.expand(0.3D, 0.3D, 0.3D); MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept(vec31, vec3); @@ -148,8 +148,7 @@ public class GT_Entity_Arrow extends EntityArrow { if (tHitEntity != null) { tVector = new MovingObjectPosition(tHitEntity); } - if ((tVector != null) && ((tVector.entityHit instanceof EntityPlayer))) { - EntityPlayer entityplayer = (EntityPlayer) tVector.entityHit; + if ((tVector != null) && ((tVector.entityHit instanceof EntityPlayer entityplayer))) { if ((entityplayer.capabilities.disableDamage) || (((tShootingEntity instanceof EntityPlayer)) && (!((EntityPlayer) tShootingEntity).canAttackPlayer(entityplayer)))) { tVector = null; @@ -209,7 +208,7 @@ public class GT_Entity_Arrow extends EntityArrow { new GameProfile( new UUID(0L, 0L), (tShootingEntity instanceof EntityLivingBase) - ? ((EntityLivingBase) tShootingEntity).getCommandSenderName() + ? tShootingEntity.getCommandSenderName() : "Arrow")); } if (tPlayer != null) { @@ -224,7 +223,7 @@ public class GT_Entity_Arrow extends EntityArrow { tShootingEntity == null ? this : tShootingEntity); if ((tDamage + tMagicDamage > 0.0F) && (tVector.entityHit.attackEntityFrom(tDamageSource, tDamage + tMagicDamage))) { - if ((tVector.entityHit instanceof EntityLivingBase)) { + if ((tVector.entityHit instanceof EntityLivingBase tHitLivingEntity)) { if (tHitTimer >= 0) { tVector.entityHit.hurtResistantTime = tHitTimer; } @@ -234,7 +233,6 @@ public class GT_Entity_Arrow extends EntityArrow { this.mArrow) > 0)) { ((EntityCreeper) tVector.entityHit).func_146079_cb(); } - EntityLivingBase tHitLivingEntity = (EntityLivingBase) tVector.entityHit; if (!this.worldObj.isRemote) { tHitLivingEntity.setArrowCountInEntity( tHitLivingEntity.getArrowCountInEntity() + 1); diff --git a/src/main/java/gregtech/common/fluid/GT_Fluid.java b/src/main/java/gregtech/common/fluid/GT_Fluid.java index a508b5ecf1..dd3ffdfc51 100644 --- a/src/main/java/gregtech/common/fluid/GT_Fluid.java +++ b/src/main/java/gregtech/common/fluid/GT_Fluid.java @@ -154,22 +154,11 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R public IGT_RegisteredFluid configureMaterials(final Materials material) { if (material != null) { switch (fluidState) { - case SLURRY: - material.mSolid = registeredFluid; - break; - case GAS: - material.mGas = registeredFluid; - break; - case PLASMA: - material.mPlasma = registeredFluid; - break; - case MOLTEN: - material.mStandardMoltenFluid = registeredFluid; - break; - case LIQUID: - default: - material.mFluid = registeredFluid; - break; + case SLURRY -> material.mSolid = registeredFluid; + case GAS -> material.mGas = registeredFluid; + case PLASMA -> material.mPlasma = registeredFluid; + case MOLTEN -> material.mStandardMoltenFluid = registeredFluid; + default -> material.mFluid = registeredFluid; } Materials.FLUID_MAP.put(registeredFluid, material); } diff --git a/src/main/java/gregtech/common/gui/modularui/UIHelper.java b/src/main/java/gregtech/common/gui/modularui/UIHelper.java index 2135d3686a..1337ce18ca 100644 --- a/src/main/java/gregtech/common/gui/modularui/UIHelper.java +++ b/src/main/java/gregtech/common/gui/modularui/UIHelper.java @@ -83,46 +83,30 @@ public class UIHelper { * @return Display positions for GUI, including border (18x18 size) */ public static List<Pos2d> getItemInputPositions(int itemInputCount) { - switch (itemInputCount) { - case 0: - return Collections.emptyList(); - case 1: - return getGridPositions(itemInputCount, 52, 24, 1, 1); - case 2: - return getGridPositions(itemInputCount, 34, 24, 2, 1); - case 3: - return getGridPositions(itemInputCount, 16, 24, 3, 1); - case 4: - return getGridPositions(itemInputCount, 34, 15, 2, 2); - case 5: - case 6: - return getGridPositions(itemInputCount, 16, 15, 3, 2); - default: - return getGridPositions(itemInputCount, 16, 6, 3); - } + return switch (itemInputCount) { + case 0 -> Collections.emptyList(); + case 1 -> getGridPositions(itemInputCount, 52, 24, 1, 1); + case 2 -> getGridPositions(itemInputCount, 34, 24, 2, 1); + case 3 -> getGridPositions(itemInputCount, 16, 24, 3, 1); + case 4 -> getGridPositions(itemInputCount, 34, 15, 2, 2); + case 5, 6 -> getGridPositions(itemInputCount, 16, 15, 3, 2); + default -> getGridPositions(itemInputCount, 16, 6, 3); + }; } /** * @return Display positions for GUI, including border (18x18 size) */ public static List<Pos2d> getItemOutputPositions(int itemOutputCount) { - switch (itemOutputCount) { - case 0: - return Collections.emptyList(); - case 1: - return getGridPositions(itemOutputCount, 106, 24, 1, 1); - case 2: - return getGridPositions(itemOutputCount, 106, 24, 2, 1); - case 3: - return getGridPositions(itemOutputCount, 106, 24, 3, 1); - case 4: - return getGridPositions(itemOutputCount, 106, 15, 2, 2); - case 5: - case 6: - return getGridPositions(itemOutputCount, 106, 15, 3, 2); - default: - return getGridPositions(itemOutputCount, 106, 6, 3); - } + return switch (itemOutputCount) { + case 0 -> Collections.emptyList(); + case 1 -> getGridPositions(itemOutputCount, 106, 24, 1, 1); + case 2 -> getGridPositions(itemOutputCount, 106, 24, 2, 1); + case 3 -> getGridPositions(itemOutputCount, 106, 24, 3, 1); + case 4 -> getGridPositions(itemOutputCount, 106, 15, 2, 2); + case 5, 6 -> getGridPositions(itemOutputCount, 106, 15, 3, 2); + default -> getGridPositions(itemOutputCount, 106, 6, 3); + }; } /** diff --git a/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java index 13bcc12504..4f9f19d49a 100644 --- a/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java +++ b/src/main/java/gregtech/common/gui/modularui/widget/FluidDisplaySlotWidget.java @@ -209,8 +209,7 @@ public class FluidDisplaySlotWidget extends SlotWidget { if (tStackSizedOne == null || tStackHeld.stackSize == 0) return null; int tOriginalFluidAmount = tTankStack.amount; ItemStack tFilledContainer = GT_Utility.fillFluidContainer(tTankStack, tStackSizedOne, true, false); - if (tFilledContainer == null && tStackSizedOne.getItem() instanceof IFluidContainerItem) { - IFluidContainerItem tContainerItem = (IFluidContainerItem) tStackSizedOne.getItem(); + if (tFilledContainer == null && tStackSizedOne.getItem() instanceof IFluidContainerItem tContainerItem) { int tFilledAmount = tContainerItem.fill(tStackSizedOne, tTankStack, true); if (tFilledAmount > 0) { tFilledContainer = tStackSizedOne; @@ -260,9 +259,8 @@ public class FluidDisplaySlotWidget extends SlotWidget { tStackEmptied = GT_Utility.getContainerForFilledItem(tStackSizedOne, false); tAmountTaken = aFluidHeld.amount; } - if (tStackEmptied == null && tStackSizedOne.getItem() instanceof IFluidContainerItem) { + if (tStackEmptied == null && tStackSizedOne.getItem() instanceof IFluidContainerItem container) { // either partially accepted, or is IFluidContainerItem - IFluidContainerItem container = (IFluidContainerItem) tStackSizedOne.getItem(); FluidStack tDrained = container.drain(tStackSizedOne, tFreeSpace, true); if (tDrained != null && tDrained.amount > 0) { // something is actually drained - change the cell and drop it to player @@ -319,8 +317,7 @@ public class FluidDisplaySlotWidget extends SlotWidget { } protected void lockFluid(ItemStack cursorStack) { - if (!(iHasFluidDisplay instanceof IFluidLockable)) return; - IFluidLockable mteToLock = (IFluidLockable) iHasFluidDisplay; + if (!(iHasFluidDisplay instanceof IFluidLockable mteToLock)) return; if (cursorStack == null) { if (!mteToLock.allowChangingLockedFluid(null)) return; @@ -417,7 +414,7 @@ public class FluidDisplaySlotWidget extends SlotWidget { /** * Sets function called before {@link #executeRealClick}. - * + * * @param beforeRealClick (click data, this widget) -> if allow click */ public FluidDisplaySlotWidget setBeforeRealClick( @@ -428,7 +425,7 @@ public class FluidDisplaySlotWidget extends SlotWidget { /** * Sets function called before {@link #executeDragAndDrop}. - * + * * @param beforeDragAndDrop (click data, this widget) -> if allow click */ public FluidDisplaySlotWidget setBeforeDragAndDrop( @@ -439,7 +436,7 @@ public class FluidDisplaySlotWidget extends SlotWidget { /** * Sets function called before both of {@link #executeRealClick} and {@link #executeDragAndDrop}. - * + * * @param beforeClick (click data, this widget) -> if allow click */ public FluidDisplaySlotWidget setBeforeClick(BiFunction<ClickData, FluidDisplaySlotWidget, Boolean> beforeClick) { diff --git a/src/main/java/gregtech/common/items/DropType.java b/src/main/java/gregtech/common/items/DropType.java index 3573978e21..198e1e3787 100644 --- a/src/main/java/gregtech/common/items/DropType.java +++ b/src/main/java/gregtech/common/items/DropType.java @@ -23,7 +23,7 @@ public enum DropType { public int chance; private String name; - private DropType(String pName, boolean show) { + DropType(String pName, boolean show) { this.name = pName; this.showInList = show; } diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java index 95a6474c17..dd1dc60e06 100644 --- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java +++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java @@ -150,7 +150,7 @@ public class GT_FluidDisplayItem extends GT_Generic_Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item aItem, CreativeTabs aTab, List aList) { + public void getSubItems(Item aItem, CreativeTabs aTab, List<ItemStack> aList) { if (GT_Values.D1) { int i = 0; for (int j = FluidRegistry.getMaxID(); i < j; i++) { diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java index 65cd24c116..66a6437e98 100644 --- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java +++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java @@ -171,19 +171,14 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo } private static String getModeString(int aMetaData) { - switch ((byte) (aMetaData >>> 8)) { - case 0: - return "=="; - case 1: - return "<="; - case 2: - return ">="; - case 3: - return "<"; - case 4: - return ">"; - } - return ""; + return switch ((byte) (aMetaData >>> 8)) { + case 0 -> "=="; + case 1 -> "<="; + case 2 -> ">="; + case 3 -> "<"; + case 4 -> ">"; + default -> ""; + }; } private static String getConfigurationString(int aMetaData) { @@ -220,7 +215,7 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo @Override @SideOnly(Side.CLIENT) - public final void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { + public final void getSubItems(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) { aList.add(new ItemStack(this, 1, 0)); } diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java index 8bd30912fc..c748ae8520 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java @@ -312,7 +312,7 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item { @SuppressWarnings("unchecked") @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { + public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) { Arrays.stream(FluidCell.values()) .filter(fluid -> FluidRegistry.getFluid(fluid.getFluidName()) != null) .map(FluidCell::get) diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java index 4186b607f8..ce3ef4be30 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java @@ -177,7 +177,7 @@ public class GT_MetaGenerated_Item_99 extends GT_MetaGenerated_Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { + public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) { enabled.stream() .mapToObj(i -> new ItemStack(this, 1, i)) .forEach(aList::add); diff --git a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java b/src/main/java/gregtech/common/items/GT_SensorCard_Item.java index fbe8ab9728..0a2b7ff9b5 100644 --- a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java +++ b/src/main/java/gregtech/common/items/GT_SensorCard_Item.java @@ -102,5 +102,5 @@ public class GT_SensorCard_Item extends GT_Generic_Item implements IRemoteSensor @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aOutputSubItems) {} + public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aOutputSubItems) {} } diff --git a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java index 1787875100..63fa279916 100644 --- a/src/main/java/gregtech/common/items/GT_VolumetricFlask.java +++ b/src/main/java/gregtech/common/items/GT_VolumetricFlask.java @@ -226,7 +226,7 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs creativeTabs, List itemList) { + public void getSubItems(Item item, CreativeTabs creativeTabs, List<ItemStack> itemList) { itemList.add(new ItemStack(this)); for (Fluid fluid : FluidRegistry.getRegisteredFluids() .values()) { @@ -244,10 +244,9 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain return false; } TileEntity te = world.getTileEntity(x, y, z); - if (!(te instanceof IFluidHandler)) { + if (!(te instanceof IFluidHandler handler)) { return false; } - IFluidHandler handler = (IFluidHandler) te; ForgeDirection dir = ForgeDirection.getOrientation(side); FluidStack fs = this.getFluid(stack); int capacity = getCapacity(stack); @@ -274,8 +273,7 @@ public class GT_VolumetricFlask extends GT_Generic_Item implements IFluidContain private boolean collectFluidBlock(ItemStack stack, EntityPlayer player, World world, int x, int y, int z) { Block block = world.getBlock(x, y, z); - if (block instanceof IFluidBlock) { - IFluidBlock liquid = (IFluidBlock) block; + if (block instanceof IFluidBlock liquid) { if (liquid.canDrain(world, x, y, z)) { FluidStack fluid = liquid.drain(world, x, y, z, false); int amount = fillContainerStack(stack, player, fluid, true); diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 70a89d3c17..1cf5de780e 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -58,7 +58,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tabs, List list) { + public void getSubItems(Item item, CreativeTabs tabs, List<ItemStack> list) { for (CombType type : CombType.values()) { if (type.showInList) { list.add(this.getStackForType(type)); @@ -742,13 +742,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addProcessGT(CombType.SULFUR, new Materials[] { Materials.Sulfur }, Voltage.LV); addProcessGT(CombType.GALLIUM, new Materials[] { Materials.Gallium }, Voltage.LV); addProcessGT(CombType.ARSENIC, new Materials[] { Materials.Arsenic }, Voltage.LV); - if (ProcessingModSupport.aEnableGCMarsMats) { - addProcessGT(CombType.IRON, new Materials[] { Materials.Iron }, Voltage.LV); - addProcessGT(CombType.STEEL, new Materials[] { Materials.Steel }, Voltage.LV); - } else { - addProcessGT(CombType.IRON, new Materials[] { Materials.Iron }, Voltage.LV); - addProcessGT(CombType.STEEL, new Materials[] { Materials.Steel }, Voltage.LV); - } + addProcessGT(CombType.IRON, new Materials[] { Materials.Iron }, Voltage.LV); + addProcessGT(CombType.STEEL, new Materials[] { Materials.Steel }, Voltage.LV); if (GT_Mod.gregtechproxy.mNerfedCombs) { addCentrifugeToMaterial( CombType.SLAG, @@ -1549,7 +1544,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { addCentrifugeToMaterial( CombType.INFINITYCATALYST, new Materials[] { Materials.InfinityCatalyst, Materials.Neutronium }, - new int[] { (int) (25 * 100), 20 * 100 }, + new int[] { 25 * 100, 20 * 100 }, new int[] {}, Voltage.ZPM, 100, @@ -1600,9 +1595,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { 100 * 100, (fluid.getFluid() .getDensity() * 128 > 0 - ? (int) (fluid.getFluid() - .getDensity() - * 100) + ? (fluid.getFluid() + .getDensity() * 100) : 128), volt.getSimpleEnergy() / 2); } @@ -1618,8 +1612,8 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { **/ public void addProcessGT(CombType comb, Materials[] aMaterial, Voltage volt) { ItemStack tComb = getStackForType(comb); - for (int i = 0; i < aMaterial.length; i++) { - if (GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial[i], 4) != NI) { + for (Materials materials : aMaterial) { + if (GT_OreDictUnificator.get(OrePrefixes.crushedPurified, materials, 4) != NI) { switch (comb) { case NEUTRONIUM: RA.addChemicalRecipe( @@ -1671,7 +1665,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { null, volt.getFluidAccordingToCombTier(), null, - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial[i], 4), + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, materials, 4), NI, volt.getComplexTime(), volt.getChemicalEnergy(), @@ -1742,7 +1736,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { public void addCentrifugeToItemStack(CombType comb, ItemStack[] aItem, int[] chance, Voltage volt, int duration) { ItemStack tComb = getStackForType(comb); - Builder<ItemStack, Float> Product = new ImmutableMap.Builder<ItemStack, Float>(); + Builder<ItemStack, Float> Product = new ImmutableMap.Builder<>(); for (int i = 0; i < aItem.length; i++) { if (aItem[i] == NI) { continue; @@ -1841,25 +1835,24 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { // cascading from IV to UMV since all recipes use HydrofluiricAcid // for later tiers, just add the corresponding tier to a case int fluidAmount = this.getFluidAmount(); - switch (this.getVoltageFromEU()) { - case 0: + return switch (this.getVoltageFromEU()) { + case 0 -> /** ULV **/ - return Materials.Water.getFluid(fluidAmount); - case 1: + Materials.Water.getFluid(fluidAmount); + case 1 -> /** LV **/ - return Materials.SulfuricAcid.getFluid(fluidAmount); - case 2: + Materials.SulfuricAcid.getFluid(fluidAmount); + case 2 -> /** MV **/ - return Materials.HydrochloricAcid.getFluid(fluidAmount); - case 3: + Materials.HydrochloricAcid.getFluid(fluidAmount); + case 3 -> /** HV **/ - return Materials.PhosphoricAcid.getFluid(fluidAmount); - case 4: + Materials.PhosphoricAcid.getFluid(fluidAmount); + case 4 -> /** EV **/ - return Materials.HydrofluoricAcid.getFluid(this.getFluidAmount()); - default: - return Materials.PhthalicAcid.getFluid(fluidAmount); - } + Materials.HydrofluoricAcid.getFluid(this.getFluidAmount()); + default -> Materials.PhthalicAcid.getFluid(fluidAmount); + }; } /** @return additional required UU-Matter amount for Autoclave process related to the Tier **/ @@ -1892,7 +1885,7 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { if (this == Voltage.ULV) { return 5; } else { - return (int) (this.getVoltage() / 16) * 15; + return (this.getVoltage() / 16) * 15; } } } diff --git a/src/main/java/gregtech/common/items/ItemDrop.java b/src/main/java/gregtech/common/items/ItemDrop.java index 4b615b9f6e..2593945417 100644 --- a/src/main/java/gregtech/common/items/ItemDrop.java +++ b/src/main/java/gregtech/common/items/ItemDrop.java @@ -46,7 +46,7 @@ public class ItemDrop extends Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tabs, List list) { + public void getSubItems(Item item, CreativeTabs tabs, List<ItemStack> list) { for (DropType type : DropType.values()) { if (type.showInList) { list.add(this.getStackForType(type)); diff --git a/src/main/java/gregtech/common/items/ItemPollen.java b/src/main/java/gregtech/common/items/ItemPollen.java index b2e2462585..45557518ff 100644 --- a/src/main/java/gregtech/common/items/ItemPollen.java +++ b/src/main/java/gregtech/common/items/ItemPollen.java @@ -38,7 +38,7 @@ public class ItemPollen extends Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tabs, List list) { + public void getSubItems(Item item, CreativeTabs tabs, List<ItemStack> list) { for (PollenType type : PollenType.values()) { if (type.showInList) { list.add(this.getStackForType(type)); diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java index 657c6ef99a..00f2f4843a 100644 --- a/src/main/java/gregtech/common/items/ItemPropolis.java +++ b/src/main/java/gregtech/common/items/ItemPropolis.java @@ -45,7 +45,7 @@ public class ItemPropolis extends Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item item, CreativeTabs tabs, List list) { + public void getSubItems(Item item, CreativeTabs tabs, List<ItemStack> list) { for (PropolisType type : PropolisType.values()) { if (type.showInList) { list.add(this.getStackForType(type)); diff --git a/src/main/java/gregtech/common/items/PollenType.java b/src/main/java/gregtech/common/items/PollenType.java index 782bed9f64..94393c1c3d 100644 --- a/src/main/java/gregtech/common/items/PollenType.java +++ b/src/main/java/gregtech/common/items/PollenType.java @@ -13,7 +13,7 @@ public enum PollenType { public int chance; private String name; - private PollenType(String pName, boolean show) { + PollenType(String pName, boolean show) { this.name = pName; this.showInList = show; } diff --git a/src/main/java/gregtech/common/items/PropolisType.java b/src/main/java/gregtech/common/items/PropolisType.java index 88a1a3faa8..1060c21b0c 100644 --- a/src/main/java/gregtech/common/items/PropolisType.java +++ b/src/main/java/gregtech/common/items/PropolisType.java @@ -23,7 +23,7 @@ public enum PropolisType { public int chance; private String name; - private PropolisType(String pName, boolean show) { + PropolisType(String pName, boolean show) { this.name = pName; this.showInList = show; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java index 93414ec8aa..7c03965cc0 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Arrow.java @@ -122,7 +122,7 @@ public class Behaviour_Arrow extends Behaviour_None { -1, null, true, - new Object[] { aWorld, Double.valueOf(aX), Double.valueOf(aY), Double.valueOf(aZ) }); + new Object[] { aWorld, aX, aY, aZ }); rArrow.setArrowItem(aStack); return rArrow; } @@ -138,7 +138,7 @@ public class Behaviour_Arrow extends Behaviour_None { -1, null, true, - new Object[] { aWorld, aEntity, Float.valueOf(this.mSpeedMultiplier * aSpeed) }); + new Object[] { aWorld, aEntity, this.mSpeedMultiplier * aSpeed }); rArrow.setArrowItem(aStack); return rArrow; } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java index 57e0750335..d0c589c09f 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java @@ -104,8 +104,7 @@ public class Behaviour_Cover_Tool extends Behaviour_None { + aWorld.provider.dimensionId + EnumChatFormatting.RESET + " -----"); - if (aTileEntity instanceof ICoverable) { - ICoverable tCoverable = (ICoverable) aTileEntity; + if (aTileEntity instanceof ICoverable tCoverable) { int tSide = tCoverable.getCoverItemAtSide((byte) aSide) != null ? aSide : tCoverable.getCoverItemAtSide(GT_Utility.determineWrenchingSide((byte) aSide, hitX, hitY, hitZ)) != null ? GT_Utility.determineWrenchingSide((byte) aSide, hitX, hitY, hitZ) : -1; @@ -135,8 +134,7 @@ public class Behaviour_Cover_Tool extends Behaviour_None { } private void doPaste(TileEntity aTileEntity, int aSide, float hitX, float hitY, float hitZ, EntityPlayer aPlayer) { - if (aTileEntity instanceof ICoverable) { - ICoverable tCoverable = (ICoverable) aTileEntity; + if (aTileEntity instanceof ICoverable tCoverable) { if (mCoverType == 0 || mStoredData == null) { GT_Utility.sendChatToPlayer(aPlayer, "Please Copy a Valid Cover First."); return; diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java index 84b6513563..8b876a5b44 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_DataStick.java @@ -38,17 +38,14 @@ public class Behaviour_DataStick extends Behaviour_None { aList.add("Rocket Schematic Tier: " + sTier); } else if (sTier >= 100) { switch (sTier) { - case 100: { + case 100 -> { aList.add("Moonbuggy Schematic"); - break; } - case 101: { + case 101 -> { aList.add("Cargo-Rocket Schematic"); - break; } - case 102: { + case 102 -> { aList.add("Astro-Miner Schematic"); - break; } } } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java index 737caf9f5b..cf5b782200 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Plunger_Fluid.java @@ -55,11 +55,9 @@ public class Behaviour_Plunger_Fluid extends Behaviour_None { } } } - if (aTileEntity instanceof IGregTechTileEntity) { - IGregTechTileEntity tTileEntity = (IGregTechTileEntity) aTileEntity; + if (aTileEntity instanceof IGregTechTileEntity tTileEntity) { IMetaTileEntity mTileEntity = tTileEntity.getMetaTileEntity(); - if (mTileEntity instanceof GT_MetaTileEntity_BasicTank) { - GT_MetaTileEntity_BasicTank machine = (GT_MetaTileEntity_BasicTank) mTileEntity; + if (mTileEntity instanceof GT_MetaTileEntity_BasicTank machine) { if (machine.mFluid != null && machine.mFluid.amount > 0) machine.mFluid.amount = machine.mFluid.amount - Math.min(machine.mFluid.amount, 1000); GT_Utility.sendSoundToPlayers( diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java index 51723469d6..6bb687a5a8 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Scoop.java @@ -33,24 +33,22 @@ public class Behaviour_Scoop extends Behaviour_None { } if ((aPlayer.capabilities.isCreativeMode) || (((GT_MetaGenerated_Tool) aItem).doDamage(aStack, this.mCosts))) { - Object tButterfly = ((IEntityButterfly) aEntity).getButterfly(); - ((IButterfly) tButterfly).getGenome() - .getPrimary() - .getRoot() - .getBreedingTracker(aEntity.worldObj, aPlayer.getGameProfile()) - .registerCatch((IButterfly) tButterfly); + IButterfly tButterfly = ((IEntityButterfly) aEntity).getButterfly(); + tButterfly.getGenome() + .getPrimary() + .getRoot() + .getBreedingTracker(aEntity.worldObj, aPlayer.getGameProfile()) + .registerCatch(tButterfly); aPlayer.worldObj.spawnEntityInWorld( new EntityItem( aPlayer.worldObj, aEntity.posX, aEntity.posY, aEntity.posZ, - ((IButterfly) tButterfly).getGenome() - .getPrimary() - .getRoot() - .getMemberStack( - ((IButterfly) tButterfly).copy(), - EnumFlutterType.BUTTERFLY.ordinal()))); + tButterfly.getGenome() + .getPrimary() + .getRoot() + .getMemberStack(tButterfly.copy(), EnumFlutterType.BUTTERFLY.ordinal()))); aEntity.setDead(); } return true; diff --git a/src/main/java/gregtech/common/misc/GT_Command.java b/src/main/java/gregtech/common/misc/GT_Command.java index 66b77b2c87..2b91cdebd9 100644 --- a/src/main/java/gregtech/common/misc/GT_Command.java +++ b/src/main/java/gregtech/common/misc/GT_Command.java @@ -98,7 +98,7 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner } @Override - public List addTabCompletionOptions(ICommandSender sender, String[] ss) { + public List<String> addTabCompletionOptions(ICommandSender sender, String[] ss) { List<String> l = new ArrayList<>(); String test = ss.length == 0 ? "" : ss[0].trim(); if (ss.length == 0 || ss.length == 1 && (test.isEmpty() || Stream @@ -151,7 +151,7 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner return; } switch (strings[0]) { - case "toggle": + case "toggle" -> { if (strings.length < 2) { printHelp(sender); return; @@ -174,12 +174,12 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner } catch (Exception e) { sender.addChatMessage(new ChatComponentText("No such variable: " + strings[0])); } - break; - case "chunks": + } + case "chunks" -> { GT_ChunkManager.printTickets(); sender.addChatMessage(new ChatComponentText("Forced chunks logged to GregTech.log")); - break; - case "pollution": + } + case "pollution" -> { ChunkCoordinates coordinates = sender.getPlayerCoordinates(); int amount = (strings.length < 2) ? GT_Mod.gregtechproxy.mPollutionSmogLimit : Integer.parseInt(strings[1]); @@ -187,8 +187,8 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner sender.getEntityWorld() .getChunkFromBlockCoords(coordinates.posX, coordinates.posZ), amount); - break; - case "global_energy_add": { + } + case "global_energy_add" -> { String username = strings[1]; String formatted_username = EnumChatFormatting.BLUE + username + EnumChatFormatting.RESET; String uuid = getUUIDFromUsername(username); @@ -228,9 +228,8 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner + EnumChatFormatting.RESET + "EU in their network.")); - break; } - case "global_energy_set": { + case "global_energy_set" -> { // Usage is /gt global_energy_set username EU @@ -263,9 +262,8 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner + EnumChatFormatting.RESET + "EU.")); - break; } - case "global_energy_join": { + case "global_energy_join" -> { // Usage is /gt global_energy_join username_of_you username_to_join @@ -327,9 +325,8 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner + formatted_username_0 + ".")); - break; } - case "global_energy_display": { + case "global_energy_display" -> { // Usage is /gt global_energy_display username. @@ -352,12 +349,12 @@ public final class GT_Command extends CommandBase implements IGlobalWirelessEner + EnumChatFormatting.RESET + "EU in their network.")); - break; } - default: + default -> { sender.addChatMessage( new ChatComponentText(EnumChatFormatting.RED + "Invalid command/syntax detected.")); printHelp(sender); + } } } } diff --git a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java index db7b811a1d..1067673399 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/SpaceProjectManager.java @@ -63,7 +63,7 @@ public class SpaceProjectManager { */ public static boolean addTeamProject(UUID member, ISpaceBody location, String projectName, ISpaceProject project) { if (!spaceTeamProjects.containsKey(getLeader(member)) || spaceTeamProjects.get(getLeader(member)) == null) { - spaceTeamProjects.put(getLeader(member), new HashMap<Pair<ISpaceBody, String>, ISpaceProject>()); + spaceTeamProjects.put(getLeader(member), new HashMap<>()); } Map<Pair<ISpaceBody, String>, ISpaceProject> map = spaceTeamProjects.get(getLeader(member)); diff --git a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Requirements.java b/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Requirements.java index 0cce6f08f0..b910b5e344 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Requirements.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/base/SP_Requirements.java @@ -1,6 +1,7 @@ package gregtech.common.misc.spaceprojects.base; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import gregtech.common.misc.spaceprojects.enums.SpaceBodyType; @@ -60,16 +61,12 @@ public class SP_Requirements implements ISP_Requirements { } public SP_Requirements setUpgrades(ISP_Upgrade... requirementUpgrades) { - for (ISP_Upgrade upgrade : requirementUpgrades) { - upgrades.add(upgrade); - } + upgrades.addAll(Arrays.asList(requirementUpgrades)); return this; } public SP_Requirements setSpaceProjects(ISpaceProject... requirementProjects) { - for (ISpaceProject project : requirementProjects) { - spaceProjects.add(project); - } + spaceProjects.addAll(Arrays.asList(requirementProjects)); return this; } diff --git a/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java index 6bd2561d68..f3c93c25b6 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/commands/SPM_Command.java @@ -123,10 +123,8 @@ public class SPM_Command extends CommandBase { List<String> autoComplete = new ArrayList<>(); String filter = arguments.length == 0 ? "" : arguments[0].trim(); switch (arguments.length) { - case 1: - autoComplete.addAll(Arrays.asList(getSubCommands())); - break; - case 2: + case 1 -> autoComplete.addAll(Arrays.asList(getSubCommands())); + case 2 -> { filter = arguments.length == 1 ? "" : arguments[1].trim(); if (arguments[0].equals(LIST)) { autoComplete.addAll(Arrays.asList(getListArguments())); @@ -135,21 +133,19 @@ public class SPM_Command extends CommandBase { } else { autoComplete.addAll(Arrays.asList(getProjects())); } - break; - case 3: + } + case 3 -> { filter = arguments.length == 2 ? "" : arguments[2].trim(); - if (arguments[1].equals(ALL)) { - break; - } else if (arguments[0].equals(LIST)) { + if (arguments[1].equals(ALL)) {} else if (arguments[0].equals(LIST)) { autoComplete.addAll(Arrays.asList(getPlayers())); } else { autoComplete.addAll(Arrays.asList(getLocations())); } - break; - case 4: + } + case 4 -> { filter = arguments.length == 3 ? "" : arguments[3].trim(); autoComplete.addAll(Arrays.asList(getPlayers())); - break; + } } String finalFilter = filter; return autoComplete.stream() @@ -208,24 +204,24 @@ public class SPM_Command extends CommandBase { private void processList(ICommandSender sender, String argument, String playerName) { UUID tID = SpaceProjectManager.getPlayerUUIDFromName(playerName); switch (argument) { - case ALL: + case ALL -> { for (String project : SpaceProjectManager.getProjectsMap() .keySet()) { sender.addChatMessage(new ChatComponentText(project)); } - break; - case AVAILABLE: + } + case AVAILABLE -> { for (ISpaceProject project : SpaceProjectManager.getAllProjects()) { if (project.meetsRequirements(tID, false)) { sender.addChatMessage(new ChatComponentText(project.getProjectName())); } } - break; - case UNLOCKED: + } + case UNLOCKED -> { for (ISpaceProject project : SpaceProjectManager.getTeamSpaceProjects(tID)) { sender.addChatMessage(new ChatComponentText(project.getProjectName())); } - break; + } } } diff --git a/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java b/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java index 8ef301b6ba..29ae7e9432 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/commands/SP_Command.java @@ -19,9 +19,8 @@ import gregtech.common.misc.spaceprojects.SpaceProjectManager; */ public class SP_Command extends CommandBase { - private static Set<Pair<EntityPlayerMP, EntityPlayerMP>> invite = Collections.newSetFromMap( - new WeakHashMap<Pair<EntityPlayerMP, EntityPlayerMP>, Boolean>()); - private static Set<EntityPlayerMP> confirm = Collections.newSetFromMap(new WeakHashMap<EntityPlayerMP, Boolean>()); + private static Set<Pair<EntityPlayerMP, EntityPlayerMP>> invite = Collections.newSetFromMap(new WeakHashMap<>()); + private static Set<EntityPlayerMP> confirm = Collections.newSetFromMap(new WeakHashMap<>()); private static final String INVITE = "invite"; private static final String ACCEPT = "accept"; @@ -49,24 +48,20 @@ public class SP_Command extends CommandBase { return; } switch (arguments[0]) { - case INVITE: + case INVITE -> { if (arguments.length < 2) { return; } processInvite(sender, arguments[1]); - break; - case ACCEPT: + } + case ACCEPT -> { if (arguments.length < 2) { return; } processAccept(sender, arguments[1]); - break; - case LEAVE: - processLeave(sender); - break; - case CONFIRM: - processConfirm(sender); - break; + } + case LEAVE -> processLeave(sender); + case CONFIRM -> processConfirm(sender); } } diff --git a/src/main/java/gregtech/common/misc/spaceprojects/enums/SpaceBodyType.java b/src/main/java/gregtech/common/misc/spaceprojects/enums/SpaceBodyType.java index 511c2c438e..8ca8b663da 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/enums/SpaceBodyType.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/enums/SpaceBodyType.java @@ -13,5 +13,5 @@ public enum SpaceBodyType { GasGiant, DwarfPlanet, IceGiant, - NONE; + NONE } diff --git a/src/main/java/gregtech/common/misc/spaceprojects/enums/StarType.java b/src/main/java/gregtech/common/misc/spaceprojects/enums/StarType.java index abcb75d55b..a329c7c639 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/enums/StarType.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/enums/StarType.java @@ -17,7 +17,7 @@ public enum StarType { private double solarLuminosity; private float costMultiplier; - private StarType(double solarLuminosity, float costMultiplier) { + StarType(double solarLuminosity, float costMultiplier) { this.solarLuminosity = solarLuminosity; this.costMultiplier = costMultiplier; } diff --git a/src/main/java/gregtech/common/misc/spaceprojects/enums/UpgradeStatus.java b/src/main/java/gregtech/common/misc/spaceprojects/enums/UpgradeStatus.java index d171d53c29..3e662720ac 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/enums/UpgradeStatus.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/enums/UpgradeStatus.java @@ -7,5 +7,5 @@ public enum UpgradeStatus { Locked, Unlocked, InProgress, - Finished; + Finished } diff --git a/src/main/java/gregtech/common/misc/spaceprojects/interfaces/ISpaceProject.java b/src/main/java/gregtech/common/misc/spaceprojects/interfaces/ISpaceProject.java index 3de3ef2b94..369c7c8c7a 100644 --- a/src/main/java/gregtech/common/misc/spaceprojects/interfaces/ISpaceProject.java +++ b/src/main/java/gregtech/common/misc/spaceprojects/interfaces/ISpaceProject.java @@ -205,7 +205,7 @@ public interface ISpaceProject { /** * Checks if the project meets all requirements with its current location - * + * * @param team Team wanting said project and checking their projects * @return true if all requirements met, false otherwise */ @@ -214,7 +214,7 @@ public interface ISpaceProject { /** * Checks if the project meets requirements if it requires other projects, unless {@code checkLocation} is true, * then it also checks for the location - * + * * @param team Team wanting said project and checking their projects * @param checkLocation If the location position should be checked * @return true if all requirements met, false otherwise @@ -228,7 +228,7 @@ public interface ISpaceProject { /** * Checks if the project has a certain upgrade installed or not - * + * * @param upgradeName Upgrade being searched for * @return True if that upgrade has been installed, false otherwise */ @@ -237,7 +237,7 @@ public interface ISpaceProject { /** * @author BlueWeabo */ - public interface ISP_Upgrade { + interface ISP_Upgrade { /** * @return internal name of the upgrade @@ -373,14 +373,14 @@ public interface ISpaceProject { /** * Sets the current stage of the upgrade - * + * * @param stage */ void setUpgradeCurrentStage(int stage); /** * Checks if the team has met all requirements to be able to build said upgrade - * + * * @param team The one starting the upgrade * @return true if all requirements are met, false otherwise */ @@ -405,7 +405,7 @@ public interface ISpaceProject { /** * @author BlueWeabo */ - public interface ISP_Requirements { + interface ISP_Requirements { /** * @return Space Body Type required by the project/upgrade diff --git a/src/main/java/gregtech/common/net/MessageUpdateFluidDisplayItem.java b/src/main/java/gregtech/common/net/MessageUpdateFluidDisplayItem.java index 8d3b60e0f0..2887714996 100644 --- a/src/main/java/gregtech/common/net/MessageUpdateFluidDisplayItem.java +++ b/src/main/java/gregtech/common/net/MessageUpdateFluidDisplayItem.java @@ -52,8 +52,7 @@ public class MessageUpdateFluidDisplayItem extends GT_Packet_New { if (world != null) { if (world.blockExists(mBlockX, mBlockY, mBlockZ)) { TileEntity tileEntity = world.getTileEntity(mBlockX, mBlockY, mBlockZ); - if (tileEntity instanceof IGregTechTileEntity) { - IGregTechTileEntity gtTile = (IGregTechTileEntity) tileEntity; + if (tileEntity instanceof IGregTechTileEntity gtTile) { if (gtTile.getMetaTileEntity() instanceof IHasFluidDisplayItem) { ((IHasFluidDisplayItem) gtTile.getMetaTileEntity()).updateFluidDisplayItem(); } diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java index ad9b0798dc..3e179aee11 100644 --- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java +++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_BasicLogic.java @@ -78,34 +78,48 @@ public class GT_Circuit_BasicLogic extends GT_CircuitryBehavior { public String getDataDescription(int[] aCircuitData, int aCircuitDataIndex) { if (aCircuitDataIndex == 0) { switch (aCircuitData[0]) { - case 0: + case 0 -> { return "OR"; - case 1: + } + case 1 -> { return "NOR"; - case 2: + } + case 2 -> { return "XOR"; - case 3: + } + case 3 -> { return "XNOR"; - case 4: + } + case 4 -> { return "AND"; - case 5: + } + case 5 -> { return "NAND"; - case 6: + } + case 6 -> { return "INVERT"; - case 7: + } + case 7 -> { return "BIT_OR"; - case 8: + } + case 8 -> { return "BIT_NOR"; - case 9: + } + case 9 -> { return "BIT_XOR"; - case 10: + } + case 10 -> { return "BIT_XNOR"; - case 11: + } + case 11 -> { return "BIT_AND"; - case 12: + } + case 12 -> { return "BIT_NAND"; - case 13: + } + case 13 -> { return "BIT_INVERT"; + } } } return ""; diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java index e162040f00..5e230d3363 100644 --- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java +++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Equals.java @@ -52,13 +52,11 @@ public class GT_Circuit_Equals extends GT_CircuitryBehavior { @Override public String getDataDescription(int[] aCircuitData, int aCircuitDataIndex) { - switch (aCircuitDataIndex) { - case 0: - return "Signal"; - case 1: - return aCircuitData[1] == 0 ? "Equal" : "Unequal"; - } - return ""; + return switch (aCircuitDataIndex) { + case 0 -> "Signal"; + case 1 -> aCircuitData[1] == 0 ? "Equal" : "Unequal"; + default -> ""; + }; } @Override diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java index 7f6858b09f..672fddf7fb 100644 --- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java +++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Pulser.java @@ -49,8 +49,8 @@ public class GT_Circuit_Pulser extends GT_CircuitryBehavior { } } aRedstoneCircuitBlock.setRedstone( - (byte) ((aCircuitData[4] > 0) && (aCircuitData[4] <= aCircuitData[0]) ? (byte) aCircuitData[1] - : (aCircuitData[1] <= 0) || (aCircuitData[1] > 15) ? (byte) aCircuitData[5] : 0), + (aCircuitData[4] > 0) && (aCircuitData[4] <= aCircuitData[0]) ? (byte) aCircuitData[1] + : (aCircuitData[1] <= 0) || (aCircuitData[1] > 15) ? (byte) aCircuitData[5] : 0, aRedstoneCircuitBlock.getOutputFacing()); } @@ -66,13 +66,11 @@ public class GT_Circuit_Pulser extends GT_CircuitryBehavior { @Override public String getDataDescription(int[] aCircuitData, int aCircuitDataIndex) { - switch (aCircuitDataIndex) { - case 0: - return "Length"; - case 1: - return "RS Out"; - } - return ""; + return switch (aCircuitDataIndex) { + case 0 -> "Length"; + case 1 -> "RS Out"; + default -> ""; + }; } @Override diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java index cac5263454..6557f0277c 100644 --- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java +++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Randomizer.java @@ -64,15 +64,12 @@ public class GT_Circuit_Randomizer extends GT_CircuitryBehavior { @Override public String getDataDescription(int[] aCircuitData, int aCircuitDataIndex) { - switch (aCircuitDataIndex) { - case 0: - return "Delay"; - case 3: - return aCircuitData[aCircuitDataIndex] == 1 ? "RS => ON" : "RS => OFF"; - case 4: - return "Status"; - } - return ""; + return switch (aCircuitDataIndex) { + case 0 -> "Delay"; + case 3 -> aCircuitData[aCircuitDataIndex] == 1 ? "RS => ON" : "RS => OFF"; + case 4 -> "Status"; + default -> ""; + }; } @Override diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_RedstoneMeter.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_RedstoneMeter.java index 7755630b26..491fe72c87 100644 --- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_RedstoneMeter.java +++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_RedstoneMeter.java @@ -52,8 +52,8 @@ public class GT_Circuit_RedstoneMeter extends GT_CircuitryBehavior { public void onTick(int[] aCircuitData, IRedstoneCircuitBlock aRedstoneCircuitBlock) { byte tRedstone = getStrongestRedstone(aRedstoneCircuitBlock); aRedstoneCircuitBlock.setRedstone( - (byte) (((tRedstone >= aCircuitData[0]) && (tRedstone <= aCircuitData[1]) ? 1 : 0) - != (aCircuitData[2] != 0 ? 1 : 0) ? (byte) aCircuitData[3] : 0), + ((tRedstone >= aCircuitData[0]) && (tRedstone <= aCircuitData[1]) ? 1 : 0) + != (aCircuitData[2] != 0 ? 1 : 0) ? (byte) aCircuitData[3] : 0, aRedstoneCircuitBlock.getOutputFacing()); } @@ -69,17 +69,13 @@ public class GT_Circuit_RedstoneMeter extends GT_CircuitryBehavior { @Override public String getDataDescription(int[] aCircuitData, int aCircuitDataIndex) { - switch (aCircuitDataIndex) { - case 0: - return "Lower"; - case 1: - return "Upper"; - case 2: - return "Invert:"; - case 3: - return "RS Out:"; - } - return ""; + return switch (aCircuitDataIndex) { + case 0 -> "Lower"; + case 1 -> "Upper"; + case 2 -> "Invert:"; + case 3 -> "RS Out:"; + default -> ""; + }; } @Override diff --git a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java index c592d10e99..b7ff2096c6 100644 --- a/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java +++ b/src/main/java/gregtech/common/redstonecircuits/GT_Circuit_Timer.java @@ -83,19 +83,14 @@ public class GT_Circuit_Timer extends GT_CircuitryBehavior { @Override public String getDataDescription(int[] aCircuitData, int aCircuitDataIndex) { - switch (aCircuitDataIndex) { - case 0: - return "Delay"; - case 1: - return "Pulses"; - case 2: - return "Length"; - case 3: - return aCircuitData[aCircuitDataIndex] == 1 ? "RS => ON" : "RS => OFF"; - case 4: - return "Time"; - } - return ""; + return switch (aCircuitDataIndex) { + case 0 -> "Delay"; + case 1 -> "Pulses"; + case 2 -> "Length"; + case 3 -> aCircuitData[aCircuitDataIndex] == 1 ? "RS => ON" : "RS => OFF"; + case 4 -> "Time"; + default -> ""; + }; } @Override diff --git a/src/main/java/gregtech/common/render/GT_RenderUtil.java b/src/main/java/gregtech/common/render/GT_RenderUtil.java index ffa6e359d8..1919b7975c 100644 --- a/src/main/java/gregtech/common/render/GT_RenderUtil.java +++ b/src/main/java/gregtech/common/render/GT_RenderUtil.java @@ -13,8 +13,7 @@ import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer; public class GT_RenderUtil { public static void colorGTItem(ItemStack aStack) { - if (aStack.getItem() instanceof IGT_ItemWithMaterialRenderer) { - IGT_ItemWithMaterialRenderer aItem = (IGT_ItemWithMaterialRenderer) aStack.getItem(); + if (aStack.getItem() instanceof IGT_ItemWithMaterialRenderer aItem) { short[] tModulation = aItem.getRGBa(aStack); GL11.glColor4f(tModulation[0] / 255.0F, tModulation[1] / 255.0F, tModulation[2] / 255.0F, 255.0f); @@ -26,24 +25,30 @@ public class GT_RenderUtil { public static void renderBlockIcon(RenderBlocks aRenderer, Block aBlock, double aX, double aY, double aZ, IIcon aIcon, byte aSide) { switch (aSide) { - case 0: + case 0 -> { aRenderer.renderFaceYNeg(aBlock, aX, aY, aZ, aIcon); return; - case 1: + } + case 1 -> { aRenderer.renderFaceYPos(aBlock, aX, aY, aZ, aIcon); return; - case 2: + } + case 2 -> { aRenderer.renderFaceZNeg(aBlock, aX, aY, aZ, aIcon); return; - case 3: + } + case 3 -> { aRenderer.renderFaceZPos(aBlock, aX, aY, aZ, aIcon); return; - case 4: + } + case 4 -> { aRenderer.renderFaceXNeg(aBlock, aX, aY, aZ, aIcon); return; - case 5: + } + case 5 -> { aRenderer.renderFaceXPos(aBlock, aX, aY, aZ, aIcon); return; + } } } diff --git a/src/main/java/gregtech/common/render/GT_RenderedTexture.java b/src/main/java/gregtech/common/render/GT_RenderedTexture.java index a4c19c79d3..bc36628324 100644 --- a/src/main/java/gregtech/common/render/GT_RenderedTexture.java +++ b/src/main/java/gregtech/common/render/GT_RenderedTexture.java @@ -222,18 +222,10 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol ExtendedFacing extendedFacing) { switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) { - case COUNTER_CLOCKWISE: - aRenderer.uvRotateBottom = 2; - break; - case CLOCKWISE: - aRenderer.uvRotateBottom = 1; - break; - case UPSIDE_DOWN: - aRenderer.uvRotateBottom = 3; - break; - default: - aRenderer.uvRotateBottom = 0; - break; + case COUNTER_CLOCKWISE -> aRenderer.uvRotateBottom = 2; + case CLOCKWISE -> aRenderer.uvRotateBottom = 1; + case UPSIDE_DOWN -> aRenderer.uvRotateBottom = 3; + default -> aRenderer.uvRotateBottom = 0; } final Flip aFlip = extendedFacing.getFlip(); @@ -258,18 +250,10 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol ExtendedFacing extendedFacing) { switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) { - case COUNTER_CLOCKWISE: - aRenderer.uvRotateTop = 2; - break; - case CLOCKWISE: - aRenderer.uvRotateTop = 1; - break; - case UPSIDE_DOWN: - aRenderer.uvRotateTop = 3; - break; - default: - aRenderer.uvRotateTop = 0; - break; + case COUNTER_CLOCKWISE -> aRenderer.uvRotateTop = 2; + case CLOCKWISE -> aRenderer.uvRotateTop = 1; + case UPSIDE_DOWN -> aRenderer.uvRotateTop = 3; + default -> aRenderer.uvRotateTop = 0; } final Flip aFlip = extendedFacing.getFlip(); @@ -292,18 +276,10 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol aRenderer.field_152631_f = true; // **NOT A BUG**: aRenderer.uvRotateEast REALLY CONTROLS THE ROTATION OF THE NORTH SIDE switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) { - case COUNTER_CLOCKWISE: - aRenderer.uvRotateEast = 2; - break; - case CLOCKWISE: - aRenderer.uvRotateEast = 1; - break; - case UPSIDE_DOWN: - aRenderer.uvRotateEast = 3; - break; - default: - aRenderer.uvRotateEast = 0; - break; + case COUNTER_CLOCKWISE -> aRenderer.uvRotateEast = 2; + case CLOCKWISE -> aRenderer.uvRotateEast = 1; + case UPSIDE_DOWN -> aRenderer.uvRotateEast = 3; + default -> aRenderer.uvRotateEast = 0; } final Flip aFlip = extendedFacing.getFlip(); @@ -326,18 +302,10 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol ExtendedFacing extendedFacing) { // **NOT A BUG**: aRenderer.uvRotateWest REALLY CONTROLS THE ROTATION OF THE SOUTH SIDE switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) { - case COUNTER_CLOCKWISE: - aRenderer.uvRotateWest = 2; - break; - case CLOCKWISE: - aRenderer.uvRotateWest = 1; - break; - case UPSIDE_DOWN: - aRenderer.uvRotateWest = 3; - break; - default: - aRenderer.uvRotateWest = 0; - break; + case COUNTER_CLOCKWISE -> aRenderer.uvRotateWest = 2; + case CLOCKWISE -> aRenderer.uvRotateWest = 1; + case UPSIDE_DOWN -> aRenderer.uvRotateWest = 3; + default -> aRenderer.uvRotateWest = 0; } final Flip aFlip = extendedFacing.getFlip(); @@ -359,18 +327,10 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol ExtendedFacing extendedFacing) { // **NOT A BUG**: aRenderer.uvRotateNorth REALLY CONTROLS THE ROTATION OF THE WEST SIDE switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) { - case COUNTER_CLOCKWISE: - aRenderer.uvRotateNorth = 2; - break; - case CLOCKWISE: - aRenderer.uvRotateNorth = 1; - break; - case UPSIDE_DOWN: - aRenderer.uvRotateNorth = 3; - break; - default: - aRenderer.uvRotateNorth = 0; - break; + case COUNTER_CLOCKWISE -> aRenderer.uvRotateNorth = 2; + case CLOCKWISE -> aRenderer.uvRotateNorth = 1; + case UPSIDE_DOWN -> aRenderer.uvRotateNorth = 3; + default -> aRenderer.uvRotateNorth = 0; } final Flip aFlip = extendedFacing.getFlip(); @@ -393,18 +353,10 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol aRenderer.field_152631_f = true; // **NOT A BUG**: aRenderer.uvRotateSouth REALLY CONTROLS THE ROTATION OF THE EAST SIDE switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) { - case COUNTER_CLOCKWISE: - aRenderer.uvRotateSouth = 2; - break; - case CLOCKWISE: - aRenderer.uvRotateSouth = 1; - break; - case UPSIDE_DOWN: - aRenderer.uvRotateSouth = 3; - break; - default: - aRenderer.uvRotateSouth = 0; - break; + case COUNTER_CLOCKWISE -> aRenderer.uvRotateSouth = 2; + case CLOCKWISE -> aRenderer.uvRotateSouth = 1; + case UPSIDE_DOWN -> aRenderer.uvRotateSouth = 3; + default -> aRenderer.uvRotateSouth = 0; } final Flip aFlip = extendedFacing.getFlip(); diff --git a/src/main/java/gregtech/common/render/GT_Renderer_Block.java b/src/main/java/gregtech/common/render/GT_Renderer_Block.java index f17618829b..ca9997f333 100644 --- a/src/main/java/gregtech/common/render/GT_Renderer_Block.java +++ b/src/main/java/gregtech/common/render/GT_Renderer_Block.java @@ -142,7 +142,7 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { } switch (aConnections) { - case NO_CONNECTION: + case NO_CONNECTION -> { aBlock.setBlockBounds(pipeMin, pipeMin, pipeMin, pipeMax, pipeMax, pipeMax); aRenderer.setRenderBoundsFromBlock(aBlock); renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[DOWN.ordinal()], false); @@ -151,8 +151,8 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[SOUTH.ordinal()], false); renderNegativeXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[WEST.ordinal()], false); renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[EAST.ordinal()], false); - break; - case CONNECTED_EAST | CONNECTED_WEST: + } + case CONNECTED_EAST | CONNECTED_WEST -> { // EAST - WEST Pipe Sides aBlock.setBlockBounds(blockMin, pipeMin, pipeMin, blockMax, pipeMax, pipeMax); aRenderer.setRenderBoundsFromBlock(aBlock); @@ -164,8 +164,8 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { // EAST - WEST Pipe Ends renderNegativeXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[WEST.ordinal()], false); renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[EAST.ordinal()], false); - break; - case CONNECTED_DOWN | CONNECTED_UP: + } + case CONNECTED_DOWN | CONNECTED_UP -> { // UP - DOWN Pipe Sides aBlock.setBlockBounds(pipeMin, blockMin, pipeMin, pipeMax, blockMax, pipeMax); aRenderer.setRenderBoundsFromBlock(aBlock); @@ -177,8 +177,8 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { // UP - DOWN Pipe Ends renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[DOWN.ordinal()], false); renderPositiveYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[UP.ordinal()], false); - break; - case CONNECTED_NORTH | CONNECTED_SOUTH: + } + case CONNECTED_NORTH | CONNECTED_SOUTH -> { // NORTH - SOUTH Pipe Sides aBlock.setBlockBounds(pipeMin, pipeMin, blockMin, pipeMax, pipeMax, blockMax); aRenderer.setRenderBoundsFromBlock(aBlock); @@ -190,8 +190,8 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { // NORTH - SOUTH Pipe Ends renderNegativeZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[NORTH.ordinal()], false); renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[SOUTH.ordinal()], false); - break; - default: + } + default -> { if ((aConnections & CONNECTED_WEST) == 0) { aBlock.setBlockBounds(pipeMin, pipeMin, pipeMin, pipeMax, pipeMax, pipeMax); aRenderer.setRenderBoundsFromBlock(aBlock); @@ -204,7 +204,6 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[SOUTH.ordinal()], false); } renderNegativeXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[WEST.ordinal()], false); - if ((aConnections & CONNECTED_EAST) == 0) { aBlock.setBlockBounds(pipeMin, pipeMin, pipeMin, pipeMax, pipeMax, pipeMax); aRenderer.setRenderBoundsFromBlock(aBlock); @@ -217,7 +216,6 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[SOUTH.ordinal()], false); } renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[EAST.ordinal()], false); - if ((aConnections & CONNECTED_DOWN) == 0) { aBlock.setBlockBounds(pipeMin, pipeMin, pipeMin, pipeMax, pipeMax, pipeMax); aRenderer.setRenderBoundsFromBlock(aBlock); @@ -230,7 +228,6 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[EAST.ordinal()], false); } renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[DOWN.ordinal()], false); - if ((aConnections & CONNECTED_UP) == 0) { aBlock.setBlockBounds(pipeMin, pipeMin, pipeMin, pipeMax, pipeMax, pipeMax); aRenderer.setRenderBoundsFromBlock(aBlock); @@ -243,7 +240,6 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[EAST.ordinal()], false); } renderPositiveYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[UP.ordinal()], false); - if ((aConnections & CONNECTED_NORTH) == 0) { aBlock.setBlockBounds(pipeMin, pipeMin, pipeMin, pipeMax, pipeMax, pipeMax); aRenderer.setRenderBoundsFromBlock(aBlock); @@ -256,7 +252,6 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[EAST.ordinal()], false); } renderNegativeZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[NORTH.ordinal()], false); - if ((aConnections & CONNECTED_SOUTH) == 0) { aBlock.setBlockBounds(pipeMin, pipeMin, pipeMin, pipeMax, pipeMax, pipeMax); aRenderer.setRenderBoundsFromBlock(aBlock); @@ -269,7 +264,7 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[EAST.ordinal()], false); } renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[SOUTH.ordinal()], false); - break; + } } // Render covers on pipes diff --git a/src/main/java/gregtech/common/render/GT_Renderer_Entity_Arrow.java b/src/main/java/gregtech/common/render/GT_Renderer_Entity_Arrow.java index 028573fdaf..e72a79514e 100644 --- a/src/main/java/gregtech/common/render/GT_Renderer_Entity_Arrow.java +++ b/src/main/java/gregtech/common/render/GT_Renderer_Entity_Arrow.java @@ -2,6 +2,7 @@ package gregtech.common.render; import net.minecraft.client.renderer.entity.RenderArrow; import net.minecraft.entity.Entity; +import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.util.ResourceLocation; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -10,7 +11,7 @@ public class GT_Renderer_Entity_Arrow extends RenderArrow { private final ResourceLocation mTexture; - public GT_Renderer_Entity_Arrow(Class aArrowClass, String aTextureName) { + public GT_Renderer_Entity_Arrow(Class<? extends EntityArrow> aArrowClass, String aTextureName) { this.mTexture = new ResourceLocation("gregtech:textures/entity/" + aTextureName + ".png"); RenderingRegistry.registerEntityRenderingHandler(aArrowClass, this); } diff --git a/src/main/java/gregtech/common/render/GT_TextureBuilder.java b/src/main/java/gregtech/common/render/GT_TextureBuilder.java index 1cb613b32e..56009c2971 100644 --- a/src/main/java/gregtech/common/render/GT_TextureBuilder.java +++ b/src/main/java/gregtech/common/render/GT_TextureBuilder.java @@ -118,22 +118,19 @@ public class GT_TextureBuilder implements ITextureBuilder { } if (worldCoord != null) throw new IllegalStateException("worldCoord without from block"); if (!textureLayers.isEmpty()) return new GT_MultiTexture(textureLayers.toArray(new ITexture[0])); - switch (iconContainerList.size()) { - case 1: - return new GT_RenderedTexture(iconContainerList.get(0), rgba, allowAlpha, glow, stdOrient, extFacing); - case 6: - return new GT_SidedTexture( - iconContainerList.get(ForgeDirection.DOWN.ordinal()), - iconContainerList.get(ForgeDirection.UP.ordinal()), - iconContainerList.get(ForgeDirection.NORTH.ordinal()), - iconContainerList.get(ForgeDirection.SOUTH.ordinal()), - iconContainerList.get(ForgeDirection.WEST.ordinal()), - iconContainerList.get(ForgeDirection.EAST.ordinal()), - rgba, - allowAlpha); - default: - throw new IllegalStateException("Invalid sideIconContainer count"); - } + return switch (iconContainerList.size()) { + case 1 -> new GT_RenderedTexture(iconContainerList.get(0), rgba, allowAlpha, glow, stdOrient, extFacing); + case 6 -> new GT_SidedTexture( + iconContainerList.get(ForgeDirection.DOWN.ordinal()), + iconContainerList.get(ForgeDirection.UP.ordinal()), + iconContainerList.get(ForgeDirection.NORTH.ordinal()), + iconContainerList.get(ForgeDirection.SOUTH.ordinal()), + iconContainerList.get(ForgeDirection.WEST.ordinal()), + iconContainerList.get(ForgeDirection.EAST.ordinal()), + rgba, + allowAlpha); + default -> throw new IllegalStateException("Invalid sideIconContainer count"); + }; } private boolean isCTMBlock(Block fromBlock, int fromMeta) { diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java b/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java index 398465d586..fbd3798b76 100644 --- a/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java +++ b/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java @@ -43,8 +43,7 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer { @Override public void renderItem(ItemRenderType type, ItemStack aStack, Object... data) { short aMetaData = (short) aStack.getItemDamage(); - if (!(aStack.getItem() instanceof GT_MetaGenerated_Item)) return; - GT_MetaGenerated_Item aItem = (GT_MetaGenerated_Item) aStack.getItem(); + if (!(aStack.getItem() instanceof GT_MetaGenerated_Item aItem)) return; GL11.glEnable(GL11.GL_BLEND); GL11.glColor3f(1.0F, 1.0F, 1.0F); diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java b/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java index 4e8a85cace..ebfb06bcbe 100644 --- a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java +++ b/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java @@ -49,8 +49,7 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { @Override public void renderItem(ItemRenderType type, ItemStack aStack, Object... data) { short aMetaData = (short) aStack.getItemDamage(); - if (!(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer)) return; - IGT_ItemWithMaterialRenderer aItem = (IGT_ItemWithMaterialRenderer) aStack.getItem(); + if (!(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer aItem)) return; int passes = 1; if (aItem.requiresMultipleRenderPasses()) { @@ -98,8 +97,7 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { } protected void renderRegularItem(ItemRenderType type, ItemStack aStack, IIcon icon, boolean shouldModulateColor) { - if (!(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer)) return; - IGT_ItemWithMaterialRenderer aItem = (IGT_ItemWithMaterialRenderer) aStack.getItem(); + if (!(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer aItem)) return; if (shouldModulateColor) { short[] tModulation = aItem.getRGBa(aStack); diff --git a/src/main/java/gregtech/common/render/items/InfinityRenderer.java b/src/main/java/gregtech/common/render/items/InfinityRenderer.java index 0441ab2272..3187ab8bcb 100644 --- a/src/main/java/gregtech/common/render/items/InfinityRenderer.java +++ b/src/main/java/gregtech/common/render/items/InfinityRenderer.java @@ -21,8 +21,7 @@ public class InfinityRenderer extends GT_GeneratedMaterial_Renderer { @Override public void renderItem(ItemRenderType type, ItemStack aStack, Object... data) { short aMetaData = (short) aStack.getItemDamage(); - if (!(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer)) return; - IGT_ItemWithMaterialRenderer aItem = (IGT_ItemWithMaterialRenderer) aStack.getItem(); + if (!(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer aItem)) return; int passes = 1; if (aItem.requiresMultipleRenderPasses()) { diff --git a/src/main/java/gregtech/common/render/items/UniversiumRenderer.java b/src/main/java/gregtech/common/render/items/UniversiumRenderer.java index a2369128b0..8f75bfb03e 100644 --- a/src/main/java/gregtech/common/render/items/UniversiumRenderer.java +++ b/src/main/java/gregtech/common/render/items/UniversiumRenderer.java @@ -45,8 +45,7 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { @Override public void renderItem(ItemRenderType type, ItemStack aStack, Object... data) { short aMetaData = (short) aStack.getItemDamage(); - if (!(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer)) return; - IGT_ItemWithMaterialRenderer aItem = (IGT_ItemWithMaterialRenderer) aStack.getItem(); + if (!(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer aItem)) return; int passes = 1; if (aItem.requiresMultipleRenderPasses()) { @@ -90,20 +89,17 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { processLightLevel(type, data); switch (type) { - case ENTITY: { + case ENTITY -> { GL11.glPushMatrix(); if (aStack.isOnItemFrame()) GL11.glTranslatef(0F, -0.3F, 0.01F); render(tIcon); GL11.glPopMatrix(); - break; } - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: { + case EQUIPPED, EQUIPPED_FIRST_PERSON -> { render(tIcon); - break; } - case INVENTORY: { + case INVENTORY -> { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -163,10 +159,8 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); - break; } - default: - break; + default -> {} } } @@ -229,7 +223,7 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { private void processLightLevel(ItemRenderType type, Object... data) { switch (type) { - case ENTITY: { + case ENTITY -> { EntityItem ent = (EntityItem) (data[1]); if (ent != null) { CosmicRenderStuffs.setLightFromLocation( @@ -238,10 +232,8 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { MathHelper.floor_double(ent.posY), MathHelper.floor_double(ent.posZ)); } - break; } - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: { + case EQUIPPED, EQUIPPED_FIRST_PERSON -> { EntityLivingBase ent = (EntityLivingBase) (data[1]); if (ent != null) { CosmicRenderStuffs.setLightFromLocation( @@ -250,13 +242,12 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { MathHelper.floor_double(ent.posY), MathHelper.floor_double(ent.posZ)); } - break; } - case INVENTORY: { + case INVENTORY -> { CosmicRenderStuffs.setLightLevel(10.2f); return; } - default: { + default -> { CosmicRenderStuffs.setLightLevel(1.0f); } } diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java index 00f1700d98..60500310e0 100644 --- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java +++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_RecipeFilter.java @@ -48,8 +48,7 @@ public class GT_MetaTileEntity_RecipeFilter extends GT_MetaTileEntity_SpecialFil public void clickTypeIcon(boolean aRightClick, ItemStack aHandStack) { if (!aRightClick) { IMetaTileEntity mte = GT_Item_Machines.getMetaTileEntity(aHandStack); - if (mte instanceof GT_MetaTileEntity_BasicMachine) { - GT_MetaTileEntity_BasicMachine machine = (GT_MetaTileEntity_BasicMachine) mte; + if (mte instanceof GT_MetaTileEntity_BasicMachine machine) { GT_Recipe.GT_Recipe_Map recipeList = machine.getRecipeList(); if (recipeList != null) { mInventory[SPECIAL_SLOT_INDEX] = machine.getStackForm(1); diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java index b6b293d8d1..0f03f6bee4 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java @@ -192,8 +192,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { if (fillableAmount <= 0) return null; final Item containerItem = SourceItemStack.getItem(); - if (containerItem instanceof IFluidContainerItem) { - IFluidContainerItem equippedIFluidContainerItem = (IFluidContainerItem) containerItem; + if (containerItem instanceof IFluidContainerItem equippedIFluidContainerItem) { destinationIFluidTank.fill(equippedIFluidContainerItem.drain(SourceItemStack, fillableAmount, true), true); return null; } else { @@ -341,22 +340,22 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { y = oY + XSTR_INSTANCE.nextFloat() * 6D / 16D; switch (frontDirection) { - case WEST: + case WEST -> { x = oX - offset; z = oZ + horizontal; - break; - case EAST: + } + case EAST -> { x = oX + offset; z = oZ + horizontal; - break; - case NORTH: + } + case NORTH -> { x = oX + horizontal; z = oZ - offset; - break; - default: // case SOUTH: + } + default -> { // case SOUTH: x = oX + horizontal; z = oZ + offset; - break; + } } ParticleEventBuilder particleEventBuilder = (new ParticleEventBuilder()).setMotion(0D, 0D, 0D) diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java index 42e0fc6117..67e821f636 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java @@ -24,7 +24,7 @@ public class GT_MetaTileEntity_Boiler_Steel extends GT_MetaTileEntity_Boiler_Bro aName, aNameRegional, new String[] { "Faster than the Bronze Boiler", "Produces 300L of Steam per second", - "Causes " + Integer.toString(GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond) + "Causes " + GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond + " Pollution per second" }); } diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java index 491eeea306..391a212115 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java @@ -658,7 +658,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B MagicalEnergyBB(GT_MetaTileEntity_MagicalEnergyAbsorber aAbsorber, int aDefaultTier, int aMaxTier) { mAbsorber = aAbsorber; mListener = aAbsorber; - mMaxTier = Math.max(aMaxTier > 0 ? aMaxTier : 0, aDefaultTier > 0 ? aDefaultTier : 0); + mMaxTier = Math.max(Math.max(aMaxTier, 0), Math.max(aDefaultTier, 0)); mDefaultTier = Math.min(aDefaultTier, mMaxTier); mTier = mDefaultTier; if (THAUMCRAFT_LOADED) mAvailableAspects = new ArrayList<>(Aspect.aspects.size()); @@ -676,11 +676,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B */ int setTier(int aTier) { if (aTier >= 0) { - if (aTier <= mMaxTier) { - mTier = aTier; - } else { - mTier = mMaxTier; - } + mTier = Math.min(aTier, mMaxTier); } else { mTier = 0; } @@ -730,9 +726,9 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B World tWorld = mAbsorber.getBaseMetaTileEntity() .getWorld(); mLivingCrystalIDs.clear(); - for (Object o : tWorld.getEntitiesWithinAABB(EntityEnderCrystal.class, getAxisAlignedBB())) { - if (((EntityEnderCrystal) o).isEntityAlive()) { - mLivingCrystalIDs.add(((EntityEnderCrystal) o).getPersistentID()); + for (EntityEnderCrystal o : tWorld.getEntitiesWithinAABB(EntityEnderCrystal.class, getAxisAlignedBB())) { + if (o.isEntityAlive()) { + mLivingCrystalIDs.add(o.getPersistentID()); } } } diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java index 615f512ff0..b81b0b956b 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_NaquadahReactor.java @@ -47,29 +47,23 @@ public class GT_MetaTileEntity_NaquadahReactor extends GT_MetaTileEntity_BasicGe public GT_Recipe.GT_Recipe_Map getRecipes() { GT_Recipe.GT_Recipe_Map ret; switch (mTier) { - case 4: { + case 4 -> { ret = GT_Recipe.GT_Recipe_Map.sSmallNaquadahReactorFuels; - break; } - case 5: { + case 5 -> { ret = GT_Recipe.GT_Recipe_Map.sLargeNaquadahReactorFuels; - break; } - case 6: { + case 6 -> { ret = GT_Recipe.GT_Recipe_Map.sHugeNaquadahReactorFuels; - break; } - case 7: { + case 7 -> { ret = GT_Recipe.GT_Recipe_Map.sExtremeNaquadahReactorFuels; - break; } - case 8: { + case 8 -> { ret = GT_Recipe.GT_Recipe_Map.sUltraHugeNaquadahReactorFuels; - break; } - default: { + default -> { ret = null; - break; } } return ret; diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java index 70a03a9f03..606c0b8157 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_OutputBus_ME.java @@ -238,8 +238,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus_ME extends GT_MetaTileEntity_Hatc .storage() .createItemStack(GT_Utility.loadItem((NBTTagCompound) t))); t = aNBT.getTag("cachedItems"); - if (t instanceof NBTTagList) { - NBTTagList l = (NBTTagList) t; + if (t instanceof NBTTagList l) { for (int i = 0; i < l.tagCount(); ++i) { NBTTagCompound tag = l.getCompoundTagAt(i); if (!tag.hasKey("itemStack")) { // legacy #868 diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java index edcbd21b16..780a6c03de 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_Output_ME.java @@ -252,8 +252,7 @@ public class GT_MetaTileEntity_Hatch_Output_ME extends GT_MetaTileEntity_Hatch_O super.loadNBTData(aNBT); if (GregTech_API.mAE2) { NBTBase t = aNBT.getTag("cachedFluids"); - if (t instanceof NBTTagList) { - NBTTagList l = (NBTTagList) t; + if (t instanceof NBTTagList l) { for (int i = 0; i < l.tagCount(); ++i) { NBTTagCompound tag = l.getCompoundTagAt(i); NBTTagCompound tagFluidStack = tag.getCompoundTag("fluidStack"); diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java index 28caaef181..f273197026 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Charger.java @@ -59,8 +59,7 @@ public class GT_MetaTileEntity_Charger extends GT_MetaTileEntity_BasicBatteryBuf super.onPostTick(aBaseMetaTileEntity, aTick); if (this.getBaseMetaTileEntity() instanceof BaseMetaTileEntity) { BaseMetaTileEntity mBaseMetaTileEntity = (BaseMetaTileEntity) getBaseMetaTileEntity(); - if (mBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) { - MetaTileEntity mMetaTileEntity = (MetaTileEntity) mBaseMetaTileEntity.getMetaTileEntity(); + if (mBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity mMetaTileEntity) { // for (int t = 0; t < 6; t++) { if (mMetaTileEntity.dechargerSlotCount() > 0 && mBaseMetaTileEntity.getStoredEU() < mBaseMetaTileEntity.getEUCapacity()) { diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java index 71b01f4cc2..444121cc79 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Printer.java @@ -47,7 +47,7 @@ public class GT_MetaTileEntity_Printer extends GT_MetaTileEntity_BasicMachine { tList.add(tList.get(0)); int i = 0; for (int j = tList.size() - 1; i < j; i++) { - if (GT_Utility.areStacksEqual(getInputAt(0), (ItemStack) tList.get(i))) { + if (GT_Utility.areStacksEqual(getInputAt(0), tList.get(i))) { this.mOutputItems[0] = GT_Utility.copyAmount(1L, tList.get(i + 1)); calculateOverclockedNess(1, 32); // In case recipe is too OP for that machine diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java index 18929fcb55..021511032b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_SeismicProspector.java @@ -154,7 +154,7 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic && aStack.getItem() == ItemList.Tool_DataStick.getItem()) { this.ready = false; GT_Utility.ItemNBT.setBookTitle(aPlayer.getCurrentEquippedItem(), "Raw Prospection Data"); - List<String> tStringList = new ArrayList<String>(); + List<String> tStringList = new ArrayList<>(); // range by tier int min = -range(); @@ -238,26 +238,20 @@ public class GT_MetaTileEntity_SeismicProspector extends GT_MetaTileEntity_Basic } private int range() { - switch (mTier) { - case 1: - return 16; - case 2: - return 32; - case 3: - return 48; - } - return 0; + return switch (mTier) { + case 1 -> 16; + case 2 -> 32; + case 3 -> 48; + default -> 0; + }; } private int step() { - switch (mTier) { - case 1: - return 1; - case 2: - return 3; - case 3: - return 4; - } - return 1; + return switch (mTier) { + case 1 -> 1; + case 2 -> 3; + case 3 -> 4; + default -> 1; + }; } } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java index 210c55578f..08b5897298 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java @@ -111,8 +111,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank if ((aEntity instanceof EntityWeatherEffect)) { return -1.0F; } - if ((aEntity instanceof EntityPlayer)) { - EntityPlayer tPlayer = (EntityPlayer) aEntity; + if ((aEntity instanceof EntityPlayer tPlayer)) { int tCount = 64; for (int i = 0; i < 36; i++) { if (tPlayer.inventory.getStackInSlot(i) != null) { @@ -366,32 +365,31 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank } } } - List entities_in_box = getBaseMetaTileEntity().getWorld() - .getEntitiesWithinAABB( - Entity.class, - AxisAlignedBB.getBoundingBox( - getBaseMetaTileEntity().getOffsetX( - getBaseMetaTileEntity().getFrontFacing(), - 2) - 1, - getBaseMetaTileEntity().getOffsetY( - getBaseMetaTileEntity().getFrontFacing(), - 2) - 1, - getBaseMetaTileEntity().getOffsetZ( - getBaseMetaTileEntity().getFrontFacing(), - 2) - 1, - getBaseMetaTileEntity().getOffsetX( - getBaseMetaTileEntity().getFrontFacing(), - 2) + 2, - getBaseMetaTileEntity().getOffsetY( - getBaseMetaTileEntity().getFrontFacing(), - 2) + 2, - getBaseMetaTileEntity().getOffsetZ( - getBaseMetaTileEntity().getFrontFacing(), - 2) + 2)); + List<Entity> entities_in_box = getBaseMetaTileEntity().getWorld() + .getEntitiesWithinAABB( + Entity.class, + AxisAlignedBB.getBoundingBox( + getBaseMetaTileEntity().getOffsetX( + getBaseMetaTileEntity().getFrontFacing(), + 2) - 1, + getBaseMetaTileEntity().getOffsetY( + getBaseMetaTileEntity().getFrontFacing(), + 2) - 1, + getBaseMetaTileEntity().getOffsetZ( + getBaseMetaTileEntity().getFrontFacing(), + 2) - 1, + getBaseMetaTileEntity().getOffsetX( + getBaseMetaTileEntity().getFrontFacing(), + 2) + 2, + getBaseMetaTileEntity().getOffsetY( + getBaseMetaTileEntity().getFrontFacing(), + 2) + 2, + getBaseMetaTileEntity().getOffsetZ( + getBaseMetaTileEntity().getFrontFacing(), + 2) + 2)); for (Object tObject : entities_in_box) { - if (((tObject instanceof Entity)) && (!((Entity) tObject).isDead)) { - Entity tEntity = (Entity) tObject; + if (((tObject instanceof Entity tEntity)) && (!((Entity) tObject).isDead)) { // GT_FML_LOGGER.info("teleport"+(Math.pow(tDistance, 1.5))); if (getBaseMetaTileEntity().decreaseStoredEnergyUnits( (long) (Math.pow(tDistance, 1.5) * weightCalculation(tEntity) * sFPowerMultiplyer), diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java index 7d8ae980cd..898d819109 100644 --- a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java @@ -240,8 +240,7 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta // It's not a block - let's see if it's a tile entity TileEntity tTileEntity = world.getTileEntity(aCoords.posX, aCoords.posY, aCoords.posZ); if (tTileEntity != gtTile && tTileEntity instanceof BaseMetaTileEntity - && ((BaseMetaTileEntity) tTileEntity).getMetaTileEntity() instanceof GT_MetaTileEntity_LongDistancePipelineBase) { - final GT_MetaTileEntity_LongDistancePipelineBase tGtTile = (GT_MetaTileEntity_LongDistancePipelineBase) ((BaseMetaTileEntity) tTileEntity).getMetaTileEntity(); + && ((BaseMetaTileEntity) tTileEntity).getMetaTileEntity() instanceof GT_MetaTileEntity_LongDistancePipelineBase tGtTile) { if (isSameClass(tGtTile) && tWires.contains( tGtTile.getFacingOffset( (BaseMetaTileEntity) tTileEntity, diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java index 54551473f3..dbd24fb012 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java @@ -379,9 +379,7 @@ public class GT_MetaTileEntity_AssemblyLine extends if (!isValidMetaTileEntity(mInputHatches.get(i))) { continue nextDataStick; } else { - if (mInputHatches.get(i) instanceof GT_MetaTileEntity_Hatch_MultiInput) { - GT_MetaTileEntity_Hatch_MultiInput tMultiHatch = (GT_MetaTileEntity_Hatch_MultiInput) mInputHatches.get( - i); + if (mInputHatches.get(i) instanceof GT_MetaTileEntity_Hatch_MultiInput tMultiHatch) { if (!tMultiHatch.hasFluid(tRecipe.mFluidInputs[i]) || tMultiHatch.getFluidAmount(tRecipe.mFluidInputs[i]) < tRecipe.mFluidInputs[i].amount) { @@ -437,9 +435,7 @@ public class GT_MetaTileEntity_AssemblyLine extends } for (int i = 0; i < tFluids.length; i++) { - if (mInputHatches.get(i) instanceof GT_MetaTileEntity_Hatch_MultiInput) { - GT_MetaTileEntity_Hatch_MultiInput tMultiHatch = (GT_MetaTileEntity_Hatch_MultiInput) mInputHatches.get( - i); + if (mInputHatches.get(i) instanceof GT_MetaTileEntity_Hatch_MultiInput tMultiHatch) { tMultiHatch.getFluid(tFluidSlot[i]).amount -= tFluids[i]; if (tMultiHatch.getFluid(tFluidSlot[i]).amount <= 0) { tMultiHatch.setFluid(null, tFluidSlot[i]); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java index f445d5fea1..7e6ff95da1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java @@ -46,7 +46,7 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_DieselEngine> implements ISurvivalConstructable { private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_DieselEngine>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_DieselEngine>>() { + private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_DieselEngine>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<GT_MetaTileEntity_DieselEngine> computeValue(Class<?> type) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java index eb5adfbd3c..716634998f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java @@ -268,30 +268,28 @@ public class GT_MetaTileEntity_DistillationTower long tVoltage = getMaxInputVoltage(); byte tTier = (byte) Math.max(0, GT_Utility.getTier(tVoltage)); FluidStack[] tFluids = tFluidList.toArray(new FluidStack[0]); - if (tFluids.length > 0) { - for (FluidStack tFluid : tFluids) { - tRecipe = GT_Recipe.GT_Recipe_Map.sDistillationRecipes.findRecipe( - getBaseMetaTileEntity(), - false, - gregtech.api.enums.GT_Values.V[tTier], - new FluidStack[] { tFluid }, - inputs); - if (tRecipe != null) { - if (tRecipe.isRecipeInputEqual(true, tFluids, inputs)) { - this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); - this.mEfficiencyIncrease = 10000; - calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage); - // In case recipe is too OP for that machine - if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) return false; - if (this.mEUt > 0) { - this.mEUt = (-this.mEUt); - } - this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); - this.mOutputItems = new ItemStack[] { tRecipe.getOutput(0) }; - this.mOutputFluids = tRecipe.mFluidOutputs.clone(); - updateSlots(); - return true; + for (FluidStack tFluid : tFluids) { + tRecipe = GT_Recipe.GT_Recipe_Map.sDistillationRecipes.findRecipe( + getBaseMetaTileEntity(), + false, + gregtech.api.enums.GT_Values.V[tTier], + new FluidStack[] { tFluid }, + inputs); + if (tRecipe != null) { + if (tRecipe.isRecipeInputEqual(true, tFluids, inputs)) { + this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); + this.mEfficiencyIncrease = 10000; + calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage); + // In case recipe is too OP for that machine + if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) return false; + if (this.mEUt > 0) { + this.mEUt = (-this.mEUt); } + this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); + this.mOutputItems = new ItemStack[] { tRecipe.getOutput(0) }; + this.mOutputFluids = tRecipe.mFluidOutputs.clone(); + updateSlots(); + return true; } } } @@ -316,10 +314,9 @@ public class GT_MetaTileEntity_DistillationTower protected boolean addLayerOutputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { if (aTileEntity == null || aTileEntity.isDead() - || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output)) + || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output tHatch)) return false; while (mOutputHatchesByLayer.size() < mHeight) mOutputHatchesByLayer.add(new ArrayList<>()); - GT_MetaTileEntity_Hatch_Output tHatch = (GT_MetaTileEntity_Hatch_Output) aTileEntity.getMetaTileEntity(); tHatch.updateTexture(aBaseCasingIndex); return mOutputHatchesByLayer.get(mHeight - 1) .add(tHatch); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java index a0c62ae2a7..f7993fd2f4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java @@ -58,7 +58,7 @@ public abstract class GT_MetaTileEntity_DrillerBase private static final Block miningPipeBlock = GT_Utility.getBlockFromStack(miningPipe); private static final Block miningPipeTipBlock = GT_Utility.getBlockFromStack(miningPipeTip); protected static final String STRUCTURE_PIECE_MAIN = "main"; - protected static final ClassValue<IStructureDefinition<GT_MetaTileEntity_DrillerBase>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_DrillerBase>>() { + protected static final ClassValue<IStructureDefinition<GT_MetaTileEntity_DrillerBase>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<GT_MetaTileEntity_DrillerBase> computeValue(Class<?> type) { @@ -252,7 +252,7 @@ public abstract class GT_MetaTileEntity_DrillerBase /** * Added for compability reasons - * + * * @return true if the state is 0 false otherwise. * @deprecated compatibility reason */ @@ -274,10 +274,12 @@ public abstract class GT_MetaTileEntity_DrillerBase protected int tryLowerPipeState(boolean isSimulating) { if (!isHasMiningPipes()) return 2; switch (canLowerPipe()) { - case 1: + case 1 -> { return 1; - case 2: + } + case 2 -> { return 3; + } } Block b = getBaseMetaTileEntity().getBlock(xPipe, yHead - 1, zPipe); @@ -375,30 +377,32 @@ public abstract class GT_MetaTileEntity_DrillerBase protected boolean workingDownward(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, int yHead, int oldYHead) { switch (tryLowerPipeState()) { - case 2: + case 2 -> { mMaxProgresstime = 0; return false; - case 3: + } + case 3 -> { workState = STATE_UPWARD; return true; - case 1: + } + case 1 -> { workState = STATE_AT_BOTTOM; return true; - default: + } + default -> { return true; + } } } protected boolean workingAtBottom(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, int yHead, int oldYHead) { - switch (tryLowerPipeState(true)) { - case 0: - workState = STATE_DOWNWARD; - return true; - default: - workState = STATE_UPWARD; - return true; + if (tryLowerPipeState(true) == 0) { + workState = STATE_DOWNWARD; + return true; } + workState = STATE_UPWARD; + return true; } protected boolean workingUpward(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, @@ -422,16 +426,12 @@ public abstract class GT_MetaTileEntity_DrillerBase return false; } putMiningPipesFromInputsInController(); - switch (workState) { - case STATE_DOWNWARD: - return workingDownward(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead); - case STATE_AT_BOTTOM: - return workingAtBottom(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead); - case STATE_UPWARD: - return workingUpward(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead); - default: - return false; - } + return switch (workState) { + case STATE_DOWNWARD -> workingDownward(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead); + case STATE_AT_BOTTOM -> workingAtBottom(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead); + case STATE_UPWARD -> workingUpward(aStack, xDrill, yDrill, zDrill, xPipe, zPipe, yHead, oldYHead); + default -> false; + }; } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index 869e1b53f8..73b26c6a59 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -62,7 +62,7 @@ public abstract class GT_MetaTileEntity_FusionComputer protected FusionPower power; public static final String STRUCTURE_PIECE_MAIN = "main"; - private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_FusionComputer>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_FusionComputer>>() { + private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_FusionComputer>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<GT_MetaTileEntity_FusionComputer> computeValue(Class<?> type) { @@ -239,8 +239,7 @@ public abstract class GT_MetaTileEntity_FusionComputer private boolean addEnergyInjector(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy)) return false; - GT_MetaTileEntity_Hatch_Energy tHatch = (GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity; + if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy tHatch)) return false; if (tHatch.mTier < tier()) return false; tHatch.updateTexture(aBaseCasingIndex); return mEnergyHatches.add(tHatch); @@ -249,8 +248,7 @@ public abstract class GT_MetaTileEntity_FusionComputer private boolean addInjector(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input)) return false; - GT_MetaTileEntity_Hatch_Input tHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity; + if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input tHatch)) return false; if (tHatch.mTier < tier()) return false; tHatch.updateTexture(aBaseCasingIndex); tHatch.mRecipeMap = getRecipeMap(); @@ -261,8 +259,7 @@ public abstract class GT_MetaTileEntity_FusionComputer if (aBaseMetaTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output)) return false; - GT_MetaTileEntity_Hatch_Output tHatch = (GT_MetaTileEntity_Hatch_Output) aMetaTileEntity; + if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output tHatch)) return false; if (tHatch.mTier < tier()) return false; tHatch.updateTexture(aBaseCasingIndex); return mOutputHatches.add(tHatch); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java index 832d376dc6..c3321931dd 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java @@ -357,20 +357,16 @@ public class GT_MetaTileEntity_IntegratedOreFactory } private static int getTime(int mode) { - switch (mode) { - case 0: - return 30 * 20; - case 1: - return 15 * 20; - case 2: - return 10 * 20; - case 3: - return 20 * 20; - case 4: - return 17 * 20; - } - // go to hell - return 1000000000; + return switch (mode) { + case 0 -> 30 * 20; + case 1 -> 15 * 20; + case 2 -> 10 * 20; + case 3 -> 20 * 20; + case 4 -> 17 * 20; + default -> + // go to hell + 1000000000; + }; } @Override @@ -438,36 +434,37 @@ public class GT_MetaTileEntity_IntegratedOreFactory sMidProduct = tOres.toArray(new ItemStack[0]); switch (sMode) { - case 0: + case 0 -> { doMac(isOre); doWash(isCrushedOre); doThermal(isCrushedPureOre, isCrushedOre); doMac(isThermal, isOre, isCrushedOre, isCrushedPureOre); - break; - case 1: + } + case 1 -> { doMac(isOre); doWash(isCrushedOre); doMac(isOre, isCrushedOre, isCrushedPureOre); doCentrifuge(isImpureDust, isPureDust); - break; - case 2: + } + case 2 -> { doMac(isOre); doMac(isThermal, isOre, isCrushedOre, isCrushedPureOre); doCentrifuge(isImpureDust, isPureDust); - break; - case 3: + } + case 3 -> { doMac(isOre); doWash(isCrushedOre); doSift(isCrushedPureOre); - break; - case 4: + } + case 4 -> { doMac(isOre); doChemWash(isCrushedOre, isCrushedPureOre); doMac(isCrushedOre, isCrushedPureOre); doCentrifuge(isImpureDust, isPureDust); - break; - default: + } + default -> { return false; + } } this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); @@ -844,37 +841,35 @@ public class GT_MetaTileEntity_IntegratedOreFactory des.add(StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor1") + " "); switch (mode) { - case 0: + case 0 -> { des.add(AQUA + CRUSH + ARROW); des.add(AQUA + WASH + ARROW); des.add(AQUA + THERMAL + ARROW); des.add(AQUA + CRUSH + ' '); - break; - case 1: + } + case 1 -> { des.add(AQUA + CRUSH + ARROW); des.add(AQUA + WASH + ARROW); des.add(AQUA + CENTRIFUGE + ARROW); des.add(AQUA + CRUSH + ' '); - break; - case 2: + } + case 2 -> { des.add(AQUA + CRUSH + ARROW); des.add(AQUA + CRUSH + ARROW); des.add(AQUA + CENTRIFUGE + ' '); - break; - case 3: + } + case 3 -> { des.add(AQUA + CRUSH + ARROW); des.add(AQUA + WASH + ARROW); des.add(AQUA + SIFTER + ' '); - - break; - case 4: + } + case 4 -> { des.add(AQUA + CRUSH + ARROW); des.add(AQUA + CHEM_WASH + ARROW); des.add(AQUA + CRUSH + ARROW); des.add(AQUA + CENTRIFUGE + ' '); - break; - default: - des.add(StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor.WRONG_MODE")); + } + default -> des.add(StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor.WRONG_MODE")); } des.add(StatCollector.translateToLocalFormatted("GT5U.machines.oreprocessor2", getTime(mode) / 20)); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java index d6fdc56854..fa2ebcb2a4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java @@ -47,7 +47,7 @@ public abstract class GT_MetaTileEntity_LargeBoiler extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_LargeBoiler> implements ISurvivalConstructable { private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeBoiler>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeBoiler>>() { + private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeBoiler>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<GT_MetaTileEntity_LargeBoiler> computeValue(Class<?> type) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java index 38c3cc9af7..d14b06313f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java @@ -44,7 +44,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_LargeTurbine> implements ISurvivalConstructable { private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeTurbine>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeTurbine>>() { + private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeTurbine>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<GT_MetaTileEntity_LargeTurbine> computeValue(Class<?> type) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java index 3acf460d3f..6b7abb526e 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java @@ -154,13 +154,11 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT if (totalFlow <= 0) return 0; tEU = GT_Utility.safeInt((long) totalFlow * fuelValue); - if (totalFlow == actualOptimalFlow) { - tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); - } else { + if (totalFlow != actualOptimalFlow) { float efficiency = getOverflowEfficiency(totalFlow, actualOptimalFlow, overflowMultiplier); tEU *= efficiency; - tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); } + tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); // EU/t output cap to properly tier the LGT against the Advanced LGT, will be implemented in a future dev // update diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java index 54787a1914..559f7ae32f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_GasAdvanced.java @@ -158,13 +158,11 @@ public class GT_MetaTileEntity_LargeTurbine_GasAdvanced extends GT_MetaTileEntit if (totalFlow <= 0) return 0; tEU = GT_Utility.safeInt((long) totalFlow * fuelValue); - if (totalFlow == actualOptimalFlow) { - tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); - } else { + if (totalFlow != actualOptimalFlow) { float efficiency = getOverflowEfficiency(totalFlow, actualOptimalFlow, overflowMultiplier); tEU *= efficiency; - tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); } + tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); // If next output is above the maximum the dynamo can handle, set it to the maximum instead of exploding the // turbine diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java index 22681138ea..e6a707b9a1 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java @@ -158,13 +158,11 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar // GT_FML_LOGGER.info(totalFlow+" : "+fuelValue+" : "+aOptFlow+" : "+actualOptimalFlow+" : "+tEU); - if (totalFlow == actualOptimalFlow) { - tEU = GT_Utility.safeInt((long) (aBaseEff / 10000D * tEU)); - } else { + if (totalFlow != actualOptimalFlow) { float efficiency = getOverflowEfficiency(totalFlow, actualOptimalFlow, overflowMultiplier); tEU = (int) (tEU * efficiency); - tEU = GT_Utility.safeInt((long) (aBaseEff / 10000D * tEU)); } + tEU = GT_Utility.safeInt((long) (aBaseEff / 10000D * tEU)); // If next output is above the maximum the dynamo can handle, set it to the maximum instead of exploding the // turbine @@ -347,7 +345,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar + "L", /* 6 */ StatCollector.translateToLocal("GT5U.turbine.dmg") + ": " + EnumChatFormatting.RED - + Integer.toString(tDura) + + tDura + EnumChatFormatting.RESET + "%", /* 7 */ StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java index 4887c95930..c4d4c3548c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java @@ -250,7 +250,7 @@ public class GT_MetaTileEntity_NanoForge extends GT_Recipe.GT_Recipe_Map map = getRecipeMap(); FluidStack[] tFluidInputs = getCompactedFluids(); if (inputSeparation) { - ArrayList<ItemStack> tInputList = new ArrayList<ItemStack>(); + ArrayList<ItemStack> tInputList = new ArrayList<>(); for (GT_MetaTileEntity_Hatch_InputBus tBus : mInputBusses) { for (int i = tBus.getSizeInventory() - 1; i >= 0; i--) { if (tBus.getStackInSlot(i) != null) tInputList.add(tBus.getStackInSlot(i)); @@ -303,7 +303,7 @@ public class GT_MetaTileEntity_NanoForge extends this.lEUt *= -1; } - ArrayList<ItemStack> tOutputs = new ArrayList<ItemStack>(); + ArrayList<ItemStack> tOutputs = new ArrayList<>(); for (int i = 0; i < tRecipe.mOutputs.length; i++) { if (getBaseMetaTileEntity().getRandomNumber(10000) < tRecipe.getOutputChance(i)) { tOutputs.add(tRecipe.getOutput(i)); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java index c35f387fd1..1f2feb3657 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java @@ -250,8 +250,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult if (aTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - GT_MetaTileEntity_Hatch_Input tHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity; + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input tHatch) { tHatch.updateTexture(aBaseCasingIndex); tHatch.mRecipeMap = getRecipeMap(); return mMiddleInputHatches.add(tHatch); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java index f8eb8c7670..310703cd3f 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java @@ -178,13 +178,15 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D protected boolean workingAtBottom(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, int yHead, int oldYHead) { switch (tryLowerPipeState(true)) { - case 0: + case 0 -> { workState = STATE_DOWNWARD; setElectricityStats(); return true; - case 3: + } + case 3 -> { workState = STATE_UPWARD; return true; + } } if (reachingVoidOrBedrock() && tryFillChunkList()) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java index c058c8880f..ba6a2604a5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java @@ -113,15 +113,18 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile fillMineListIfEmpty(xDrill, yDrill, zDrill, xPipe, zPipe, yHead); if (oreBlockPositions.isEmpty()) { switch (tryLowerPipeState()) { - case 2: + case 2 -> { mMaxProgresstime = 0; return false; - case 3: + } + case 3 -> { workState = STATE_UPWARD; return true; - case 1: + } + case 1 -> { workState = STATE_AT_BOTTOM; return true; + } } // new layer - fill again fillMineListIfEmpty(xDrill, yDrill, zDrill, xPipe, zPipe, yHead); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java index 7ad3c1b4bf..21432394b4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java @@ -628,7 +628,7 @@ public class GT_MetaTileEntity_PCBFactory extends GT_Recipe.GT_Recipe_Map aMap = getRecipeMap(); FluidStack[] tFluidInputs = getStoredFluids().toArray(new FluidStack[0]); if (inputSeparation) { - ArrayList<ItemStack> tInputList = new ArrayList<ItemStack>(); + ArrayList<ItemStack> tInputList = new ArrayList<>(); for (GT_MetaTileEntity_Hatch_InputBus tBus : mInputBusses) { for (int i = tBus.getSizeInventory() - 1; i >= 0; i--) { if (tBus.getStackInSlot(i) != null) tInputList.add(tBus.getStackInSlot(i)); @@ -743,7 +743,7 @@ public class GT_MetaTileEntity_PCBFactory extends } mOutputItems = new ItemStack[tRecipe.mOutputs.length]; - ArrayList<ItemStack> tOutputs = new ArrayList<ItemStack>(); + ArrayList<ItemStack> tOutputs = new ArrayList<>(); int remainingEfficiency = getMaxEfficiency(aStack); for (int j = 0; j < (int) Math.ceil(getMaxEfficiency(aStack) / 10000.0f); j++) { int chanced = getBaseMetaTileEntity().getRandomNumber(10000); @@ -875,43 +875,33 @@ public class GT_MetaTileEntity_PCBFactory extends if (curDirection == ForgeDirection.UP || curDirection == ForgeDirection.DOWN) { switch (curRotation) { - case CLOCKWISE: - case COUNTER_CLOCKWISE: + case CLOCKWISE, COUNTER_CLOCKWISE -> { newFlip = curFlip == Flip.NONE ? Flip.HORIZONTAL : Flip.NONE; newDirection = curDirection == ForgeDirection.UP ? ForgeDirection.NORTH : ForgeDirection.SOUTH; - break; - case NORMAL: + } + case NORMAL -> { newRotation = curDirection == ForgeDirection.UP ? Rotation.CLOCKWISE : Rotation.COUNTER_CLOCKWISE; newDirection = curDirection == ForgeDirection.UP ? ForgeDirection.EAST : ForgeDirection.WEST; newFlip = Flip.NONE; - break; - case UPSIDE_DOWN: + } + case UPSIDE_DOWN -> { newRotation = curDirection == ForgeDirection.UP ? Rotation.COUNTER_CLOCKWISE : Rotation.CLOCKWISE; newDirection = curDirection == ForgeDirection.UP ? ForgeDirection.EAST : ForgeDirection.WEST; newFlip = Flip.NONE; - break; + } } } else if (curRotation == Rotation.CLOCKWISE || curRotation == Rotation.COUNTER_CLOCKWISE) { newFlip = curRotation == Rotation.CLOCKWISE ? curFlip == Flip.NONE ? Flip.NONE : Flip.HORIZONTAL : curFlip != Flip.NONE ? Flip.NONE : Flip.HORIZONTAL; newDirection = curRotation == Rotation.CLOCKWISE ? ForgeDirection.UP : ForgeDirection.DOWN; } else { - switch (curDirection) { - case EAST: - newDirection = ForgeDirection.SOUTH; - break; - case NORTH: - newDirection = ForgeDirection.EAST; - break; - case WEST: - newDirection = ForgeDirection.NORTH; - break; - case SOUTH: - newDirection = ForgeDirection.WEST; - break; - default: - newDirection = curDirection; - } + newDirection = switch (curDirection) { + case EAST -> ForgeDirection.SOUTH; + case NORTH -> ForgeDirection.EAST; + case WEST -> ForgeDirection.NORTH; + case SOUTH -> ForgeDirection.WEST; + default -> curDirection; + }; } if (curRotation == Rotation.UPSIDE_DOWN) { @@ -1059,7 +1049,7 @@ public class GT_MetaTileEntity_PCBFactory extends + StatCollector.translateToLocal("GT5U.multiblock.efficiency") + ": " + EnumChatFormatting.YELLOW - + Float.toString(mEfficiency / 100.0F) + + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", /* 6 */ StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " @@ -1293,7 +1283,7 @@ public class GT_MetaTileEntity_PCBFactory extends .setPos(173, 98)) .widget( new TextFieldWidget().setGetterInt(() -> mSetTier) - .setSetterInt(val -> { mSetTier = val; }) + .setSetterInt(val -> mSetTier = val) .setNumbers(1, 3) .setTextColor(Color.WHITE.normal) .setTextAlignment(Alignment.Center) @@ -1486,10 +1476,8 @@ public class GT_MetaTileEntity_PCBFactory extends new TextFieldWidget().setGetterInt( () -> (int) ((1f / mRoughnessMultiplier) * 100f)) .setSetterInt( - val -> { - mRoughnessMultiplier = 100f - / val; - }) + val -> mRoughnessMultiplier = 100f + / val) .setNumbers(50, 200) .setTextColor(Color.WHITE.normal) .setTextAlignment(Alignment.Center) @@ -1523,9 +1511,7 @@ public class GT_MetaTileEntity_PCBFactory extends new TextFieldWidget().setGetterInt( () -> mBioOffsets[0]) .setSetterInt( - val -> { - mBioOffsets[0] = val; - }) + val -> mBioOffsets[0] = val) .setNumbers( -16, 16) @@ -1544,9 +1530,7 @@ public class GT_MetaTileEntity_PCBFactory extends new TextFieldWidget().setGetterInt( () -> mBioOffsets[1]) .setSetterInt( - val -> { - mBioOffsets[1] = val; - }) + val -> mBioOffsets[1] = val) .setNumbers( -16, 16) @@ -1574,9 +1558,7 @@ public class GT_MetaTileEntity_PCBFactory extends new TextFieldWidget().setGetterInt( () -> mOCTier1Offsets[0]) .setSetterInt( - val -> { - mOCTier1Offsets[0] = val; - }) + val -> mOCTier1Offsets[0] = val) .setNumbers( -16, 16) @@ -1595,9 +1577,7 @@ public class GT_MetaTileEntity_PCBFactory extends new TextFieldWidget().setGetterInt( () -> mOCTier1Offsets[1]) .setSetterInt( - val -> { - mOCTier1Offsets[1] = val; - }) + val -> mOCTier1Offsets[1] = val) .setNumbers( -16, 16) @@ -1625,9 +1605,7 @@ public class GT_MetaTileEntity_PCBFactory extends new TextFieldWidget().setGetterInt( () -> mOCTier2Offsets[0]) .setSetterInt( - val -> { - mOCTier2Offsets[0] = val; - }) + val -> mOCTier2Offsets[0] = val) .setNumbers( -16, 16) @@ -1646,9 +1624,7 @@ public class GT_MetaTileEntity_PCBFactory extends new TextFieldWidget().setGetterInt( () -> mOCTier2Offsets[1]) .setSetterInt( - val -> { - mOCTier2Offsets[1] = val; - }) + val -> mOCTier2Offsets[1] = val) .setNumbers( -16, 16) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java index 04811bb5d4..4c847e0fb7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java @@ -47,7 +47,7 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn implements IAlignment, ISurvivalConstructable, IAddUIWidgets, IGetTitleColor { public static final int INPUT_SLOTS = 3, OUTPUT_SLOTS = 3; - private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_PrimitiveBlastFurnace>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_PrimitiveBlastFurnace>>() { + private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_PrimitiveBlastFurnace>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<GT_MetaTileEntity_PrimitiveBlastFurnace> computeValue(Class<?> type) { diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java index cee78c3fa4..ce6a5509bb 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java @@ -59,30 +59,19 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti } protected static int commonSizeCompute(int tier) { - switch (tier) { - case 1: - return 4000000; - case 2: - return 8000000; - case 3: - return 16000000; - case 4: - return 32000000; - case 5: - return 64000000; - case 6: - return 128000000; - case 7: - return 256000000; - case 8: - return 512000000; - case 9: - return 1024000000; - case 10: - return 2147483640; - default: - return 0; - } + return switch (tier) { + case 1 -> 4000000; + case 2 -> 8000000; + case 3 -> 16000000; + case 4 -> 32000000; + case 5 -> 64000000; + case 6 -> 128000000; + case 7 -> 256000000; + case 8 -> 512000000; + case 9 -> 1024000000; + case 10 -> 2147483640; + default -> 0; + }; } public GT_MetaTileEntity_DigitalChestBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java index e374658871..93ee2b0c10 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java @@ -64,57 +64,35 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit } protected static int commonSizeCompute(int tier) { - switch (tier) { - case 1: - return 4000000; - case 2: - return 8000000; - case 3: - return 16000000; - case 4: - return 32000000; - case 5: - return 64000000; - case 6: - return 128000000; - case 7: - return 256000000; - case 8: - return 512000000; - case 9: - return 1024000000; - case 10: - return 2147483640; - default: - return 0; - } + return switch (tier) { + case 1 -> 4000000; + case 2 -> 8000000; + case 3 -> 16000000; + case 4 -> 32000000; + case 5 -> 64000000; + case 6 -> 128000000; + case 7 -> 256000000; + case 8 -> 512000000; + case 9 -> 1024000000; + case 10 -> 2147483640; + default -> 0; + }; } private static int tierPump(int tier) { - switch (tier) { - case 1: - return 2; - case 2: - return 3; - case 3: - return 3; - case 4: - return 4; - case 5: - return 4; - case 6: - return 5; - case 7: - return 5; - case 8: - return 6; - case 9: - return 7; - case 10: - return 8; - default: - return 0; - } + return switch (tier) { + case 1 -> 2; + case 2 -> 3; + case 3 -> 3; + case 4 -> 4; + case 5 -> 4; + case 6 -> 5; + case 7 -> 5; + case 8 -> 6; + case 9 -> 7; + case 10 -> 8; + default -> 0; + }; } public GT_MetaTileEntity_DigitalTankBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java b/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java index 3a9bb289ad..b5cc684469 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java @@ -97,8 +97,8 @@ public class GT_Tool_Crowbar extends GT_Tool { } String tTool = aBlock.getHarvestTool(aMetaData); if ((tTool == null) || (tTool.equals(""))) { - for (Iterator i$ = GT_MetaGenerated_Tool_01.INSTANCE.mToolStats.values() - .iterator(); i$.hasNext(); i$.next()) { + for (Iterator<IToolStats> i$ = GT_MetaGenerated_Tool_01.INSTANCE.mToolStats.values() + .iterator(); i$.hasNext(); i$.next()) { if (((i$ instanceof GT_Tool_Crowbar)) && (!((IToolStats) i$).isMinableBlock(aBlock, aMetaData))) { return false; } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java b/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java index 51b4abe4af..2fc1c8f8e9 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java @@ -90,7 +90,7 @@ public class GT_Tool_JackHammer extends GT_Tool_Drill_LV { true, 2147483647L, null, - GT_Utility.copyAmount(1L, new Object[] { tDrop })); + GT_Utility.copyAmount(1L, tDrop)); if (tRecipe != null) { ItemStack tHammeringOutput = tRecipe.getOutput(0); if (tHammeringOutput != null) { diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plow.java b/src/main/java/gregtech/common/tools/GT_Tool_Plow.java index 1ffb26df59..1c49c196f3 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Plow.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Plow.java @@ -21,7 +21,7 @@ import gregtech.api.util.GT_ToolHarvestHelper; public class GT_Tool_Plow extends GT_Tool { - private ThreadLocal<Object> sIsHarvestingRightNow = new ThreadLocal(); + private ThreadLocal<Object> sIsHarvestingRightNow = new ThreadLocal<>(); @Override public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java b/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java index b08e76dca3..baf8b4b3cf 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java @@ -61,6 +61,7 @@ public class GT_Tool_Plunger extends GT_Tool { } @Override + @SuppressWarnings("unchecked") // the IItemBehaviour cast cannot be expressed strictly via generics public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) { aItem.addItemBehavior(aID, new Behaviour_Plunger_Item(getToolDamagePerDropConversion())); aItem.addItemBehavior(aID, new Behaviour_Plunger_Fluid(getToolDamagePerDropConversion())); diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Sense.java b/src/main/java/gregtech/common/tools/GT_Tool_Sense.java index 081f167bf1..051193c3bc 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Sense.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Sense.java @@ -20,7 +20,7 @@ import gregtech.common.items.behaviors.Behaviour_Sense; public class GT_Tool_Sense extends GT_Tool { - private ThreadLocal<Object> sIsHarvestingRightNow = new ThreadLocal(); + private ThreadLocal<Object> sIsHarvestingRightNow = new ThreadLocal<>(); @Override public float getBaseDamage() { |