diff options
Diffstat (limited to 'src/main/java/gregtech')
277 files changed, 3092 insertions, 4727 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index ca00a5373f..7d239263b0 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -315,7 +315,7 @@ public class GT_Mod implements IGT_Mod { gregtechproxy.onLoad(); - registerCircuitProgrammer(new Predicate<ItemStack>() { + registerCircuitProgrammer(new Predicate<>() { private final int screwdriverOreId = OreDictionary.getOreID("craftingToolScrewdriver"); @@ -711,14 +711,14 @@ public class GT_Mod implements IGT_Mod { FurnaceRecipes.smelting() .getSmeltingList() .values() - .forEach(k -> tStacks.add((ItemStack) k)); + .forEach(tStacks::add); if (gregtechproxy.mCraftingUnification) { GT_Log.out.println("GT_Mod: Crafting Recipes"); - for (Object tRecipe : CraftingManager.getInstance() - .getRecipeList()) { + for (IRecipe tRecipe : CraftingManager.getInstance() + .getRecipeList()) { if ((tRecipe instanceof IRecipe)) { - tStacks.add(((IRecipe) tRecipe).getRecipeOutput()); + tStacks.add(tRecipe.getRecipeOutput()); } } } diff --git a/src/main/java/gregtech/api/enums/ConfigCategories.java b/src/main/java/gregtech/api/enums/ConfigCategories.java index e4a647db22..a85d569d74 100644 --- a/src/main/java/gregtech/api/enums/ConfigCategories.java +++ b/src/main/java/gregtech/api/enums/ConfigCategories.java @@ -9,14 +9,14 @@ public enum ConfigCategories { public enum IDs { crops, - enchantments; + enchantments } public enum Materials { heatdamage, oreprocessingoutputmultiplier, blastfurnacerequirements, - blastinductionsmelter,; + blastinductionsmelter, } public enum Recipes { @@ -27,7 +27,7 @@ public enum ConfigCategories { recipereplacements, storageblockcrafting, storageblockdecrafting, - crops; + crops } public enum Machines { @@ -47,11 +47,11 @@ public enum ConfigCategories { massfabamplifier, maceration, rockcrushing, - pulverization; + pulverization } public enum Fuels { - boilerfuels; + boilerfuels } public enum Tools { @@ -62,6 +62,6 @@ public enum ConfigCategories { hammertripleplate, hammerquadrupleplate, hammerquintupleplate, - scoop; + scoop } } diff --git a/src/main/java/gregtech/api/enums/Dyes.java b/src/main/java/gregtech/api/enums/Dyes.java index a0b9f87593..165545b26c 100644 --- a/src/main/java/gregtech/api/enums/Dyes.java +++ b/src/main/java/gregtech/api/enums/Dyes.java @@ -48,7 +48,7 @@ public enum Dyes implements IColorModulationContainer { public final String mName; public final short[] mRGBa; public final short[] mOriginalRGBa; - private final ArrayList<Fluid> mFluidDyes = new GT_ArrayList<Fluid>(false, 1); + private final ArrayList<Fluid> mFluidDyes = new GT_ArrayList<>(false, 1); Dyes(int aIndex, int aR, int aG, int aB, String aName) { mIndex = (byte) aIndex; diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index eb742c902f..1a9422f374 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -170,13 +170,10 @@ public class GT_Values { EnumChatFormatting.DARK_GREEN.toString(), // UV, 8 EnumChatFormatting.DARK_RED.toString(), // UHV, 9 EnumChatFormatting.DARK_PURPLE.toString(), // UEV, 10 - EnumChatFormatting.DARK_BLUE.toString() + EnumChatFormatting.BOLD.toString(), // UIV, 11 - EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD.toString() - + EnumChatFormatting.UNDERLINE.toString(), // UMV, 12 - EnumChatFormatting.DARK_RED.toString() + EnumChatFormatting.BOLD.toString() - + EnumChatFormatting.UNDERLINE.toString(), // UXV, 13 - EnumChatFormatting.WHITE.toString() + EnumChatFormatting.BOLD.toString() - + EnumChatFormatting.UNDERLINE.toString(), // MAX, 14 + EnumChatFormatting.DARK_BLUE.toString() + EnumChatFormatting.BOLD, // UIV, 11 + EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.UNDERLINE, // UMV, 12 + EnumChatFormatting.DARK_RED.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.UNDERLINE, // UXV, 13 + EnumChatFormatting.WHITE.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.UNDERLINE, // MAX, 14 EnumChatFormatting.OBFUSCATED.toString() // ~~~, 15 }; @@ -547,4 +544,18 @@ public class GT_Values { public static double getMaxPlasmaTurbineEfficiency() { return maxPlasmaTurbineEfficiency; } + + private static final long[] EXPLOSION_LOOKUP_V = new long[] { V[0], V[1], V[2], V[3], V[4], V[4] * 2, V[5], V[6], + V[7], V[8], V[8] * 2, V[9], V[10], V[11], V[12], V[12] * 2, V[13], V[14], V[15] }; + private static final float[] EXPLOSION_LOOKUP_POWER = new float[] { 1.0F, 2.0F, 3.0F, 4.0F, 5.0F, 6.0F, 7.0F, 8.0F, + 9.0F, 10.0F, 11.0F, 12.0F, 13.0F, 14.0F, 15.0F, 16.0F, 17.0F, 18.0F, 19.0F, 20.0F }; + + public static float getExplosionPowerForVoltage(long voltage) { + for (int i = 0; i < EXPLOSION_LOOKUP_V.length; i++) { + if (voltage < EXPLOSION_LOOKUP_V[i]) { + return EXPLOSION_LOOKUP_POWER[i]; + } + } + return EXPLOSION_LOOKUP_POWER[EXPLOSION_LOOKUP_POWER.length - 1]; + } } diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 4139f90db1..8d3201f6ca 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -863,87 +863,79 @@ public enum OrePrefixes { itemCasing.mGeneratedItems.addAll(itemCasing.mGeneratedItems); // ----- - toolHeadFile.mCondition = new ICondition.And<ISubTagContainer>( - new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING), - new ICondition.Not<ISubTagContainer>(SubTag.BOUNCY)); - toolHeadSaw.mCondition = new ICondition.And<ISubTagContainer>( - new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING), - new ICondition.Not<ISubTagContainer>(SubTag.BOUNCY)); - toolHeadDrill.mCondition = new ICondition.And<ISubTagContainer>( - new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING), - new ICondition.Not<ISubTagContainer>(SubTag.BOUNCY)); - toolHeadChainsaw.mCondition = new ICondition.And<ISubTagContainer>( - new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING), - new ICondition.Not<ISubTagContainer>(SubTag.BOUNCY)); - toolHeadWrench.mCondition = new ICondition.And<ISubTagContainer>( - new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING), - new ICondition.Not<ISubTagContainer>(SubTag.BOUNCY)); - toolHeadBuzzSaw.mCondition = new ICondition.And<ISubTagContainer>( - new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING), - new ICondition.Not<ISubTagContainer>(SubTag.BOUNCY)); - turbineBlade.mCondition = new ICondition.And<ISubTagContainer>( - new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING), - new ICondition.Not<ISubTagContainer>(SubTag.BOUNCY)); - - rotor.mCondition = new ICondition.Nor<ISubTagContainer>(SubTag.CRYSTAL, SubTag.STONE, SubTag.BOUNCY); - - spring.mCondition = new ICondition.Or<ISubTagContainer>( + toolHeadFile.mCondition = new ICondition.And<>( + new ICondition.Not<>(SubTag.NO_SMASHING), + new ICondition.Not<>(SubTag.BOUNCY)); + toolHeadSaw.mCondition = new ICondition.And<>( + new ICondition.Not<>(SubTag.NO_SMASHING), + new ICondition.Not<>(SubTag.BOUNCY)); + toolHeadDrill.mCondition = new ICondition.And<>( + new ICondition.Not<>(SubTag.NO_SMASHING), + new ICondition.Not<>(SubTag.BOUNCY)); + toolHeadChainsaw.mCondition = new ICondition.And<>( + new ICondition.Not<>(SubTag.NO_SMASHING), + new ICondition.Not<>(SubTag.BOUNCY)); + toolHeadWrench.mCondition = new ICondition.And<>( + new ICondition.Not<>(SubTag.NO_SMASHING), + new ICondition.Not<>(SubTag.BOUNCY)); + toolHeadBuzzSaw.mCondition = new ICondition.And<>( + new ICondition.Not<>(SubTag.NO_SMASHING), + new ICondition.Not<>(SubTag.BOUNCY)); + turbineBlade.mCondition = new ICondition.And<>( + new ICondition.Not<>(SubTag.NO_SMASHING), + new ICondition.Not<>(SubTag.BOUNCY)); + + rotor.mCondition = new ICondition.Nor<>(SubTag.CRYSTAL, SubTag.STONE, SubTag.BOUNCY); + + spring.mCondition = new ICondition.Or<>( SubTag.STRETCHY, SubTag.BOUNCY, - new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING)); - springSmall.mCondition = new ICondition.Or<ISubTagContainer>( + new ICondition.Not<>(SubTag.NO_SMASHING)); + springSmall.mCondition = new ICondition.Or<>( SubTag.STRETCHY, SubTag.BOUNCY, - new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING)); + new ICondition.Not<>(SubTag.NO_SMASHING)); - gemChipped.mCondition = new ICondition.And<ISubTagContainer>( + gemChipped.mCondition = new ICondition.And<>( SubTag.TRANSPARENT, SubTag.CRYSTAL, - new ICondition.Not<ISubTagContainer>(SubTag.QUARTZ), - new ICondition.Not<ISubTagContainer>(SubTag.PEARL), - new ICondition.Not<ISubTagContainer>(SubTag.MAGICAL)); - gemFlawed.mCondition = new ICondition.And<ISubTagContainer>( + new ICondition.Not<>(SubTag.QUARTZ), + new ICondition.Not<>(SubTag.PEARL), + new ICondition.Not<>(SubTag.MAGICAL)); + gemFlawed.mCondition = new ICondition.And<>( SubTag.TRANSPARENT, SubTag.CRYSTAL, - new ICondition.Not<ISubTagContainer>(SubTag.QUARTZ), - new ICondition.Not<ISubTagContainer>(SubTag.PEARL), - new ICondition.Not<ISubTagContainer>(SubTag.MAGICAL)); - gemFlawless.mCondition = new ICondition.And<ISubTagContainer>( + new ICondition.Not<>(SubTag.QUARTZ), + new ICondition.Not<>(SubTag.PEARL), + new ICondition.Not<>(SubTag.MAGICAL)); + gemFlawless.mCondition = new ICondition.And<>( SubTag.TRANSPARENT, SubTag.CRYSTAL, - new ICondition.Not<ISubTagContainer>(SubTag.QUARTZ), - new ICondition.Not<ISubTagContainer>(SubTag.PEARL), - new ICondition.Not<ISubTagContainer>(SubTag.MAGICAL)); - gemExquisite.mCondition = new ICondition.And<ISubTagContainer>( + new ICondition.Not<>(SubTag.QUARTZ), + new ICondition.Not<>(SubTag.PEARL), + new ICondition.Not<>(SubTag.MAGICAL)); + gemExquisite.mCondition = new ICondition.And<>( SubTag.TRANSPARENT, SubTag.CRYSTAL, - new ICondition.Not<ISubTagContainer>(SubTag.QUARTZ), - new ICondition.Not<ISubTagContainer>(SubTag.PEARL), - new ICondition.Not<ISubTagContainer>(SubTag.MAGICAL)); + new ICondition.Not<>(SubTag.QUARTZ), + new ICondition.Not<>(SubTag.PEARL), + new ICondition.Not<>(SubTag.MAGICAL)); - lens.mCondition = new ICondition.Or<ISubTagContainer>( + lens.mCondition = new ICondition.Or<>( SubTag.MAGICAL, - new ICondition.And<ISubTagContainer>(SubTag.TRANSPARENT, SubTag.HAS_COLOR)); - - plateDouble.mCondition = new ICondition.Or<ISubTagContainer>( - SubTag.PAPER, - new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING)); - plateTriple.mCondition = new ICondition.Or<ISubTagContainer>( - SubTag.PAPER, - new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING)); - plateQuadruple.mCondition = new ICondition.Or<ISubTagContainer>( - SubTag.PAPER, - new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING)); - plateQuintuple.mCondition = new ICondition.Or<ISubTagContainer>( - SubTag.PAPER, - new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING)); - - plateDense.mCondition = new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING); - - ingotDouble.mCondition = new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING); - ingotTriple.mCondition = new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING); - ingotQuadruple.mCondition = new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING); - ingotQuintuple.mCondition = new ICondition.Not<ISubTagContainer>(SubTag.NO_SMASHING); + new ICondition.And<>(SubTag.TRANSPARENT, SubTag.HAS_COLOR)); + + plateDouble.mCondition = new ICondition.Or<>(SubTag.PAPER, new ICondition.Not<>(SubTag.NO_SMASHING)); + plateTriple.mCondition = new ICondition.Or<>(SubTag.PAPER, new ICondition.Not<>(SubTag.NO_SMASHING)); + plateQuadruple.mCondition = new ICondition.Or<>(SubTag.PAPER, new ICondition.Not<>(SubTag.NO_SMASHING)); + plateQuintuple.mCondition = new ICondition.Or<>(SubTag.PAPER, new ICondition.Not<>(SubTag.NO_SMASHING)); + + plateDense.mCondition = new ICondition.Not<>(SubTag.NO_SMASHING); + + ingotDouble.mCondition = new ICondition.Not<>(SubTag.NO_SMASHING); + ingotTriple.mCondition = new ICondition.Not<>(SubTag.NO_SMASHING); + ingotQuadruple.mCondition = new ICondition.Not<>(SubTag.NO_SMASHING); + ingotQuintuple.mCondition = new ICondition.Not<>(SubTag.NO_SMASHING); wireFine.mCondition = SubTag.METAL; @@ -998,18 +990,17 @@ public enum OrePrefixes { public final String mRegularLocalName, mLocalizedMaterialPre, mLocalizedMaterialPost; public final boolean mIsUsedForOreProcessing, mIsEnchantable, mIsUnificatable, mIsMaterialBased, mIsSelfReferencing, mIsContainer, mDontUnificateActively, mIsUsedForBlocks, mAllowNormalRecycling, mGenerateDefaultItem; - public final List<TC_AspectStack> mAspects = new ArrayList<TC_AspectStack>(); - public final Collection<OrePrefixes> mFamiliarPrefixes = new HashSet<OrePrefixes>(); + public final List<TC_AspectStack> mAspects = new ArrayList<>(); + public final Collection<OrePrefixes> mFamiliarPrefixes = new HashSet<>(); /** * Used to determine the amount of Material this Prefix contains. Multiply or Divide GregTech_API.MATERIAL_UNIT to * get the Amounts in comparision to one Ingot. 0 = Null Negative = Undefined Amount */ public final long mMaterialAmount; - public final Collection<Materials> mDisabledItems = new HashSet<Materials>(), - mNotGeneratedItems = new HashSet<Materials>(), mIgnoredMaterials = new HashSet<Materials>(), - mGeneratedItems = new HashSet<Materials>(); - private final ArrayList<IOreRecipeRegistrator> mOreProcessing = new ArrayList<IOreRecipeRegistrator>(); + public final Collection<Materials> mDisabledItems = new HashSet<>(), mNotGeneratedItems = new HashSet<>(), + mIgnoredMaterials = new HashSet<>(), mGeneratedItems = new HashSet<>(); + private final ArrayList<IOreRecipeRegistrator> mOreProcessing = new ArrayList<>(); public ItemStack mContainerItem = null; public ICondition<ISubTagContainer> mCondition = null; public byte mDefaultStackSize = 64; @@ -1508,8 +1499,6 @@ public enum OrePrefixes { || aMaterial == Materials.Uranium235 || aMaterial == Materials.Plutonium241 || aMaterial == Materials.Americium - || aMaterial == Materials.Neutronium - || aMaterial == Materials.Bronze || aMaterial == Materials.Brass || aMaterial == Materials.Electrum || aMaterial == Materials.NaquadahEnriched @@ -1576,7 +1565,7 @@ public enum OrePrefixes { !aPrefix.mDisabledItems.contains(aMaterial)); if (!aEnableComponent) { // Disable component if false and is not already in disabled list aPrefix.disableComponent(aMaterial); - } else if (aEnableComponent) { // Enable component if true and is not already in enabled list + } else { // Enable component if true and is not already in enabled list aPrefix.enableComponent(aMaterial); } } @@ -1742,151 +1731,115 @@ public enum OrePrefixes { public String getDefaultLocalNameFormatForItem(Materials aMaterial) { // Certain Materials have slightly different Localizations. switch (this) { - case crateGtDust: + case crateGtDust -> { return mLocalizedMaterialPre + OrePrefixes.dust.getDefaultLocalNameFormatForItem(aMaterial); - case crateGtIngot: + } + case crateGtIngot -> { return mLocalizedMaterialPre + OrePrefixes.ingot.getDefaultLocalNameFormatForItem(aMaterial); - case crateGtGem: + } + case crateGtGem -> { return mLocalizedMaterialPre + OrePrefixes.gem.getDefaultLocalNameFormatForItem(aMaterial); - case crateGtPlate: + } + case crateGtPlate -> { return mLocalizedMaterialPre + OrePrefixes.plate.getDefaultLocalNameFormatForItem(aMaterial); + } } switch (aMaterial.mName) { - case "Glass": - case "BorosilicateGlass": + case "Glass", "BorosilicateGlass" -> { if (name().startsWith("gem")) return mLocalizedMaterialPre + "%material" + " Crystal"; if (name().startsWith("plate")) return mLocalizedMaterialPre + "%material" + " Pane"; if (name().startsWith("ingot")) return mLocalizedMaterialPre + "%material" + " Bar"; if (name().startsWith("nugget")) return mLocalizedMaterialPre + "%material" + " Chip"; - break; - case "Wheat": + } + case "Wheat" -> { if (name().startsWith("dust")) return mLocalizedMaterialPre + "Flour"; - break; - case "Ice": + } + case "Ice" -> { if (name().startsWith("dust")) return mLocalizedMaterialPre + "Crushed Ice"; - break; - case "Wood": - case "WoodSealed": + } + case "Wood", "WoodSealed" -> { if (name().startsWith("bolt")) return "Short " + "%material" + " Stick"; if (name().startsWith("stick")) return mLocalizedMaterialPre + "%material" + " Stick"; if (name().startsWith("dust")) return mLocalizedMaterialPre + "%material" + " Pulp"; if (name().startsWith("nugget")) return mLocalizedMaterialPre + "%material" + " Chip"; if (name().startsWith("plate")) return mLocalizedMaterialPre + "%material" + " Plank"; - break; - case "Plastic": - case "Rubber": - case "Polyethylene": - case "Epoxid": - case "EpoxidFiberReinforced": - case "Polydimethylsiloxane": - case "Silicone": - case "Polysiloxane": - case "Polycaprolactam": - case "Polytetrafluoroethylene": - case "PolyvinylChloride": - case "Polystyrene": - case "StyreneButadieneRubber": + } + case "Plastic", "Rubber", "Polyethylene", "Epoxid", "EpoxidFiberReinforced", "Polydimethylsiloxane", "Silicone", "Polysiloxane", "Polycaprolactam", "Polytetrafluoroethylene", "PolyvinylChloride", "Polystyrene", "StyreneButadieneRubber" -> { if (name().startsWith("dust")) return mLocalizedMaterialPre + "%material" + " Pulp"; if (name().startsWith("plate")) return mLocalizedMaterialPre + "%material" + " Sheet"; if (name().startsWith("ingot")) return mLocalizedMaterialPre + "%material" + " Bar"; if (name().startsWith("nugget")) return mLocalizedMaterialPre + "%material" + " Chip"; if (name().startsWith("foil")) return "Thin " + "%material" + " Sheet"; - break; - case "FierySteel": + } + case "FierySteel" -> { if (mIsContainer) return mLocalizedMaterialPre + "Fiery Blood" + mLocalizedMaterialPost; - break; - case "Steeleaf": + } + case "Steeleaf" -> { if (name().startsWith("ingot")) return mLocalizedMaterialPre + "%material"; - break; - case "Bone": + } + case "Bone" -> { if (name().startsWith("dust")) return mLocalizedMaterialPre + "Bone Meal"; - break; - case "Blaze": - case "Milk": - case "Cocoa": - case "Chocolate": - case "Coffee": - case "Chili": - case "Cheese": - case "Snow": + } + case "Blaze", "Milk", "Cocoa", "Chocolate", "Coffee", "Chili", "Cheese", "Snow" -> { if (name().startsWith("dust")) return mLocalizedMaterialPre + "%material" + " Powder"; - break; - case "Paper": + } + case "Paper" -> { if (name().startsWith("dust")) return mLocalizedMaterialPre + "Chad"; switch (this) { - case plate: + case plate -> { return "Sheet of Paper"; - case plateDouble: + } + case plateDouble -> { return "Paperboard"; - case plateTriple: + } + case plateTriple -> { return "Carton"; - case plateQuadruple: + } + case plateQuadruple -> { return "Cardboard"; - case plateQuintuple: + } + case plateQuintuple -> { return "Thick Cardboard"; - case plateDense: + } + case plateDense -> { return "Strong Cardboard"; + } } - break; - case "MeatRaw": + } + case "MeatRaw" -> { if (name().startsWith("dust")) return mLocalizedMaterialPre + "Mince Meat"; - break; - case "MeatCooked": + } + case "MeatCooked" -> { if (name().startsWith("dust")) return mLocalizedMaterialPre + "Cooked Mince Meat"; - break; - case "Ash": - case "DarkAsh": - case "Gunpowder": - case "Sugar": - case "Salt": - case "RockSalt": - case "VolcanicAsh": - case "RareEarth": + } + case "Ash", "DarkAsh", "Gunpowder", "Sugar", "Salt", "RockSalt", "VolcanicAsh", "RareEarth" -> { if (name().startsWith("dust")) return mLocalizedMaterialPre + "%material"; - break; - case "Vermiculite": - case "Bentonite": - case "Kaolinite": - case "Talc": - case "BasalticMineralSand": - case "GraniticMineralSand": - case "GlauconiteSand": - case "CassiteriteSand": - case "GarnetSand": - case "QuartzSand": - case "Pitchblende": - case "FullersEarth": + } + case "Vermiculite", "Bentonite", "Kaolinite", "Talc", "BasalticMineralSand", "GraniticMineralSand", "GlauconiteSand", "CassiteriteSand", "GarnetSand", "QuartzSand", "Pitchblende", "FullersEarth" -> { if (name().startsWith("dust")) return mLocalizedMaterialPre + "%material"; switch (this) { - case crushedCentrifuged: - case crushedPurified: + case crushedCentrifuged, crushedPurified -> { return mLocalizedMaterialPre + "%material"; - case crushed: + } + case crushed -> { return "Ground " + "%material"; + } } - break; + } } if (ProcessingModSupport.aEnableThaumcraftMats) { switch (aMaterial.mName) { - case "InfusedAir": - case "InfusedDull": - case "InfusedEarth": - case "InfusedEntropy": - case "InfusedFire": - case "InfusedOrder": - case "InfusedVis": - case "InfusedWater": + case "InfusedAir", "InfusedDull", "InfusedEarth", "InfusedEntropy", "InfusedFire", "InfusedOrder", "InfusedVis", "InfusedWater" -> { if (name().startsWith("gem")) return mLocalizedMaterialPre + "Shard of " + "%material"; if (name().startsWith("crystal")) return mLocalizedMaterialPre + "Shard of " + "%material"; if (name().startsWith("plate")) return mLocalizedMaterialPre + "%material" + " Crystal Plate"; if (name().startsWith("dust")) return mLocalizedMaterialPre + "%material" + " Crystal Powder"; switch (this) { - case crushedCentrifuged: - case crushedPurified: - case crushed: + case crushedCentrifuged, crushedPurified, crushed -> { return mLocalizedMaterialPre + "%material" + " Crystals"; + } } - break; + } } } // Use Standard Localization diff --git a/src/main/java/gregtech/api/graphs/GenerateNodeMap.java b/src/main/java/gregtech/api/graphs/GenerateNodeMap.java index fba74b0aec..b64020f33d 100644 --- a/src/main/java/gregtech/api/graphs/GenerateNodeMap.java +++ b/src/main/java/gregtech/api/graphs/GenerateNodeMap.java @@ -18,8 +18,7 @@ public abstract class GenerateNodeMap { // clearing the node map to make sure it is gone on reset public static void clearNodeMap(Node aNode, int aReturnNodeValue) { - if (aNode.mTileEntity instanceof BaseMetaPipeEntity) { - final BaseMetaPipeEntity tPipe = (BaseMetaPipeEntity) aNode.mTileEntity; + if (aNode.mTileEntity instanceof BaseMetaPipeEntity tPipe) { tPipe.setNode(null); tPipe.setNodePath(null); if (aNode.mSelfPath != null) { diff --git a/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java b/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java index 26c3c60ef1..67591040e9 100644 --- a/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java +++ b/src/main/java/gregtech/api/graphs/GenerateNodeMapPower.java @@ -39,16 +39,14 @@ public class GenerateNodeMapPower extends GenerateNodeMap { @Override protected boolean addConsumer(TileEntity aTileEntity, byte aSide, int aNodeValue, ArrayList<ConsumerNode> aConsumers) { - if (aTileEntity instanceof BaseMetaTileEntity) { - BaseMetaTileEntity tBaseTileEntity = (BaseMetaTileEntity) aTileEntity; + if (aTileEntity instanceof BaseMetaTileEntity tBaseTileEntity) { if (tBaseTileEntity.inputEnergyFrom(aSide, false)) { ConsumerNode tConsumerNode = new NodeGTBaseMetaTile(aNodeValue, tBaseTileEntity, aSide, aConsumers); aConsumers.add(tConsumerNode); return true; } - } else if (aTileEntity instanceof IEnergyConnected) { - IEnergyConnected tTileEntity = (IEnergyConnected) aTileEntity; + } else if (aTileEntity instanceof IEnergyConnected tTileEntity) { if (tTileEntity.inputEnergyFrom(aSide, false)) { ConsumerNode tConsumerNode = new NodeEnergyConnected(aNodeValue, tTileEntity, aSide, aConsumers); aConsumers.add(tConsumerNode); @@ -97,8 +95,8 @@ public class GenerateNodeMapPower extends GenerateNodeMap { @Override protected Node getEmptyNode(int aNodeValue, byte aSide, TileEntity aTileEntity, ArrayList<ConsumerNode> aConsumers) { - Node tNode = new EmptyPowerConsumer(aNodeValue, aTileEntity, aSide, aConsumers); - aConsumers.add((ConsumerNode) tNode); + ConsumerNode tNode = new EmptyPowerConsumer(aNodeValue, aTileEntity, aSide, aConsumers); + aConsumers.add(tNode); return tNode; } diff --git a/src/main/java/gregtech/api/graphs/Node.java b/src/main/java/gregtech/api/graphs/Node.java index 38b3cd0e37..005b32a5b7 100644 --- a/src/main/java/gregtech/api/graphs/Node.java +++ b/src/main/java/gregtech/api/graphs/Node.java @@ -32,7 +32,7 @@ public class Node { public int mNodeValue; public int mHighestNodeValue; - public class ReturnPair { + public static class ReturnPair { public NodePath mReturnPath; public Lock returnLock; diff --git a/src/main/java/gregtech/api/graphs/PowerNodes.java b/src/main/java/gregtech/api/graphs/PowerNodes.java index 12416f6d72..22f1e02add 100644 --- a/src/main/java/gregtech/api/graphs/PowerNodes.java +++ b/src/main/java/gregtech/api/graphs/PowerNodes.java @@ -30,7 +30,6 @@ public class PowerNodes { if (tNextNode.mNodeValue == tConsumer.mNodeValue) { tAmpsUsed += processNodeInject(aCurrentNode, tConsumer, j, aMaxAmps - tAmpsUsed, aVoltage); tConsumer = (ConsumerNode) aConsumers.getNextNode(); - break; } else { if (aPreviousNode == tNextNode) return tAmpsUsed; tAmpsUsed += processNextNode( @@ -41,8 +40,8 @@ public class PowerNodes { aMaxAmps - tAmpsUsed, aVoltage); tConsumer = (ConsumerNode) aConsumers.getNode(); - break; } + break; } } } else { diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java index c7c4cbeba5..fec34c9d66 100644 --- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java +++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java @@ -1,7 +1,5 @@ package gregtech.api.graphs.consumers; -import static gregtech.api.enums.GT_Values.V; - import java.util.ArrayList; import net.minecraft.init.Blocks; @@ -12,6 +10,7 @@ import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyReceiver; import gregtech.GT_Mod; import gregtech.api.GregTech_API; +import gregtech.api.enums.GT_Values; import gregtech.api.enums.SoundResource; import gregtech.api.util.GT_Utility; import gregtech.api.util.WorldSpawnedEventBuilder; @@ -51,37 +50,7 @@ public class NodeEnergyReceiver extends ConsumerNode { // copied from IEnergyConnected private void explode(int aRfOut) { if (aRfOut > 32L * GregTech_API.mEUtoRF / 100L) { - int aExplosionPower = aRfOut; - float tStrength = aExplosionPower < V[0] ? 1.0F - : aExplosionPower < V[1] ? 2.0F - : aExplosionPower < V[2] ? 3.0F - : aExplosionPower < V[3] ? 4.0F - : aExplosionPower < V[4] ? 5.0F - : aExplosionPower < V[4] * 2 ? 6.0F - : aExplosionPower < V[5] ? 7.0F - : aExplosionPower < V[6] ? 8.0F - : aExplosionPower < V[7] ? 9.0F - : aExplosionPower < V[8] ? 10.0F - : aExplosionPower < V[8] * 2 - ? 11.0F - : aExplosionPower - < V[9] ? 12.0F - : aExplosionPower - < V[10] ? 13.0F - : aExplosionPower - < V[11] ? 14.0F - : aExplosionPower - < V[12] ? 15.0F - : aExplosionPower - < V[12] * 2 - ? 16.0F - : aExplosionPower - < V[13] ? 17.0F - : aExplosionPower - < V[14] ? 18.0F - : aExplosionPower - < V[15] ? 19.0F - : 20.0F; + float tStrength = GT_Values.getExplosionPowerForVoltage(aRfOut); int tX = mTileEntity.xCoord, tY = mTileEntity.yCoord, tZ = mTileEntity.zCoord; World tWorld = mTileEntity.getWorldObj(); GT_Utility.sendSoundToPlayers(tWorld, SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1, tX, tY, tZ); diff --git a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java index 7d9a76524e..97edd5757c 100644 --- a/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java +++ b/src/main/java/gregtech/api/graphs/paths/PowerNodePath.java @@ -90,8 +90,8 @@ public class PowerNodePath extends NodePath { public long getVoltage(MetaPipeEntity aCable) { int tLoss = 0; if (mCountUp) { - for (int i = 0; i < mPipes.length; i++) { - GT_MetaPipeEntity_Cable tCable = (GT_MetaPipeEntity_Cable) mPipes[i]; + for (MetaPipeEntity mPipe : mPipes) { + GT_MetaPipeEntity_Cable tCable = (GT_MetaPipeEntity_Cable) mPipe; tLoss += tCable.mCableLossPerMeter; if (aCable == tCable) { return Math.max(mVoltage - tLoss, 0); diff --git a/src/main/java/gregtech/api/gui/GT_Container.java b/src/main/java/gregtech/api/gui/GT_Container.java index 1c6b4ff60a..819171ae02 100644 --- a/src/main/java/gregtech/api/gui/GT_Container.java +++ b/src/main/java/gregtech/api/gui/GT_Container.java @@ -149,7 +149,7 @@ public class GT_Container extends Container { } } } else if (aShifthold == 1) { - aSlot = (Slot) this.inventorySlots.get(aSlotIndex); + aSlot = this.inventorySlots.get(aSlotIndex); if (aSlot != null && aSlot.canTakeStack(aPlayer)) { tTempStack = this.transferStackInSlot(aPlayer, aSlotIndex); if (tTempStack != null) { @@ -165,7 +165,7 @@ public class GT_Container extends Container { if (aSlotIndex < 0) { return null; } - aSlot = (Slot) this.inventorySlots.get(aSlotIndex); + aSlot = this.inventorySlots.get(aSlotIndex); if (aSlot != null) { tTempStack = aSlot.getStack(); ItemStack mouseStack = aPlayerInventory.getItemStack(); @@ -239,7 +239,7 @@ public class GT_Container extends Container { // number key from 1 to 9 // aMouseclick == 0 means number 1, aMouseclick == 8 means number 9 } else if (aShifthold == 2 && aMouseclick >= 0 && aMouseclick < 9) { - aSlot = (Slot) this.inventorySlots.get(aSlotIndex); + aSlot = this.inventorySlots.get(aSlotIndex); if (aSlot.canTakeStack(aPlayer)) { // get the stack at the specified hotbar slot. @@ -277,7 +277,7 @@ public class GT_Container extends Container { } else if (aShifthold == 3 && aPlayer.capabilities.isCreativeMode && aPlayerInventory.getItemStack() == null && aSlotIndex >= 0) { - aSlot = (Slot) this.inventorySlots.get(aSlotIndex); + aSlot = this.inventorySlots.get(aSlotIndex); if (aSlot != null && aSlot.getHasStack()) { tTempStack = GT_Utility.copyOrNull(aSlot.getStack()); tTempStack.stackSize = tTempStack.getMaxStackSize(); @@ -290,7 +290,7 @@ public class GT_Container extends Container { @Override public ItemStack transferStackInSlot(EntityPlayer aPlayer, int aSlotIndex) { ItemStack stack = null; - Slot slotObject = (Slot) inventorySlots.get(aSlotIndex); + Slot slotObject = inventorySlots.get(aSlotIndex); mTileEntity.markDirty(); @@ -345,7 +345,7 @@ public class GT_Container extends Container { if (aStack.isStackable()) { while (aStack.stackSize > 0 && (!reverseOrder && slotIndex < aSlotCount || reverseOrder && slotIndex >= aStartIndex)) { - slot = (Slot) this.inventorySlots.get(slotIndex); + slot = this.inventorySlots.get(slotIndex); itemStack = slot.getStack(); if (!(slot instanceof GT_Slot_Holo) && !(slot instanceof GT_Slot_Output) && slot.isItemValid(aStack) @@ -384,7 +384,7 @@ public class GT_Container extends Container { } while (!reverseOrder && slotIndex < aSlotCount || reverseOrder && slotIndex >= aStartIndex) { - slot = (Slot) this.inventorySlots.get(slotIndex); + slot = this.inventorySlots.get(slotIndex); itemStack = slot.getStack(); if (slot.isItemValid(aStack) && itemStack == null) { @@ -427,7 +427,7 @@ public class GT_Container extends Container { } @Override - public List getInventory() { + public List<ItemStack> getInventory() { try { return super.getInventory(); } catch (Throwable e) { @@ -643,8 +643,7 @@ public class GT_Container extends Container { 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; @@ -694,9 +693,8 @@ public class GT_Container extends Container { 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 diff --git a/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java b/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java index 4627362e66..3f2b45064d 100644 --- a/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java +++ b/src/main/java/gregtech/api/gui/GT_ContainerMetaTile_Machine.java @@ -59,8 +59,7 @@ public class GT_ContainerMetaTile_Machine extends GT_Container { } protected void addCircuitSlot() { - if (mTileEntity.getMetaTileEntity() instanceof IConfigurationCircuitSupport) { - IConfigurationCircuitSupport ccs = (IConfigurationCircuitSupport) mTileEntity.getMetaTileEntity(); + if (mTileEntity.getMetaTileEntity() instanceof IConfigurationCircuitSupport ccs) { GT_Slot_Render slotCircuit = new GT_Slot_Render( mTileEntity, ccs.getCircuitSlot(), @@ -94,8 +93,8 @@ public class GT_ContainerMetaTile_Machine extends GT_Container { mActive = mTileEntity.isActive() ? 1 : 0; mTimer++; - for (Object crafter : this.crafters) { - ICrafting player = (ICrafting) crafter; + for (ICrafting crafter : this.crafters) { + ICrafting player = crafter; if (mTimer % 500 == 10 || oEnergy != mEnergy) { player.sendProgressBarUpdate(this, 0, mEnergy & 65535); player.sendProgressBarUpdate(this, 1, mEnergy >>> 16); @@ -165,69 +164,27 @@ public class GT_ContainerMetaTile_Machine extends GT_Container { public void updateProgressBar(int id, int value) { super.updateProgressBar(id, value); switch (id) { - case 0: - mEnergy = mEnergy & 0xffff0000 | value & 0x0000ffff; - break; - case 1: - mEnergy = mEnergy & 0x0000ffff | value << 16; - break; - case 2: - mStorage = mStorage & 0xffff0000 | value & 0x0000ffff; - break; - case 3: - mStorage = mStorage & 0x0000ffff | value << 16; - break; - case 4: - mOutput = value; - break; - case 5: - mInput = value; - break; - case 6: - mDisplayErrorCode = value; - break; - case 11: - mProgressTime = mProgressTime & 0xffff0000 | value; - break; - case 12: - mProgressTime = mProgressTime & 0x0000ffff | value << 16; - break; - case 13: - mMaxProgressTime = mMaxProgressTime & 0xffff0000 | value & 0x0000ffff; - break; - case 14: - mMaxProgressTime = mMaxProgressTime & 0x0000ffff | value << 16; - break; - case 15: - mID = value; - break; - case 16: - mActive = value; - break; - case 17: - mSteam = mSteam & 0xffff0000 | value & 0x0000ffff; - break; - case 18: - mSteam = mSteam & 0x0000ffff | value << 16; - break; - case 19: - mSteamStorage = mSteamStorage & 0xffff0000 | value & 0x0000ffff; - break; - case 20: - mSteamStorage = mSteamStorage & 0x0000ffff | value << 16; - break; - case 21: - mEnergyLong = mEnergyLong & 0xffffffff00000000L | value & 0x00000000ffffffffL; - break; - case 22: - mEnergyLong = mEnergyLong & 0x00000000ffffffffL | (long) value << 32; - break; - case 23: - mStorageLong = mStorageLong & 0xffffffff00000000L | value & 0x00000000ffffffffL; - break; - case 24: - mStorageLong = mStorageLong & 0x00000000ffffffffL | (long) value << 32; - break; + case 0 -> mEnergy = mEnergy & 0xffff0000 | value & 0x0000ffff; + case 1 -> mEnergy = mEnergy & 0x0000ffff | value << 16; + case 2 -> mStorage = mStorage & 0xffff0000 | value & 0x0000ffff; + case 3 -> mStorage = mStorage & 0x0000ffff | value << 16; + case 4 -> mOutput = value; + case 5 -> mInput = value; + case 6 -> mDisplayErrorCode = value; + case 11 -> mProgressTime = mProgressTime & 0xffff0000 | value; + case 12 -> mProgressTime = mProgressTime & 0x0000ffff | value << 16; + case 13 -> mMaxProgressTime = mMaxProgressTime & 0xffff0000 | value & 0x0000ffff; + case 14 -> mMaxProgressTime = mMaxProgressTime & 0x0000ffff | value << 16; + case 15 -> mID = value; + case 16 -> mActive = value; + case 17 -> mSteam = mSteam & 0xffff0000 | value & 0x0000ffff; + case 18 -> mSteam = mSteam & 0x0000ffff | value << 16; + case 19 -> mSteamStorage = mSteamStorage & 0xffff0000 | value & 0x0000ffff; + case 20 -> mSteamStorage = mSteamStorage & 0x0000ffff | value << 16; + case 21 -> mEnergyLong = mEnergyLong & 0xffffffff00000000L | value & 0x00000000ffffffffL; + case 22 -> mEnergyLong = mEnergyLong & 0x00000000ffffffffL | (long) value << 32; + case 23 -> mStorageLong = mStorageLong & 0xffffffff00000000L | value & 0x00000000ffffffffL; + case 24 -> mStorageLong = mStorageLong & 0x00000000ffffffffL | (long) value << 32; } } diff --git a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java b/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java index 101c1cba83..976d7e8127 100644 --- a/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java +++ b/src/main/java/gregtech/api/gui/GT_Container_BasicMachine.java @@ -203,23 +203,25 @@ public class GT_Container_BasicMachine extends GT_Container_BasicTank { GT_MetaTileEntity_BasicMachine machine = getMachine(); if (machine == null) return null; switch (aSlotNumber) { - case 0: + case 0 -> { if (slotFluidTransferToggle.isEnabled()) { machine.mFluidTransfer = !machine.mFluidTransfer; } return null; - case 1: + } + case 1 -> { if (slotItemTransferToggle.isEnabled()) { machine.mItemTransfer = !machine.mItemTransfer; } return null; - default: + } + default -> { if (aSlotNumber == OTHER_SLOT_COUNT + 1 + machine.mInputSlotCount + machine.mOutputItems.length && aMouseclick < 2) { GT_MetaTileEntity_BasicTank tTank = (GT_MetaTileEntity_BasicTank) mTileEntity.getMetaTileEntity(); if (mTileEntity.isClientSide()) { // see parent class slotClick for an explanation on why doing this - Slot slot = (Slot) inventorySlots.get(aSlotNumber); + Slot slot = inventorySlots.get(aSlotNumber); tTank.setFillableStack(GT_Utility.getFluidFromDisplayStack(slot.getStack())); } IFluidAccess tFillableAccess = constructFluidAccess(tTank, true); @@ -236,6 +238,7 @@ public class GT_Container_BasicMachine extends GT_Container_BasicTank { } else { return super.slotClick(aSlotNumber, aMouseclick, aShifthold, aPlayer); } + } } } @@ -248,8 +251,8 @@ public class GT_Container_BasicMachine extends GT_Container_BasicTank { mItemTransfer = getMachine().mItemTransfer; mStuttering = getMachine().mStuttering; - for (Object crafter : this.crafters) { - ICrafting player = (ICrafting) crafter; + for (ICrafting crafter : this.crafters) { + ICrafting player = crafter; player.sendProgressBarUpdate(this, 102, mFluidTransfer ? 1 : 0); player.sendProgressBarUpdate(this, 103, mItemTransfer ? 1 : 0); player.sendProgressBarUpdate(this, 104, mStuttering ? 1 : 0); @@ -266,15 +269,9 @@ public class GT_Container_BasicMachine extends GT_Container_BasicTank { public void updateProgressBar(int id, int value) { super.updateProgressBar(id, value); switch (id) { - case 102: - mFluidTransfer = (value != 0); - break; - case 103: - mItemTransfer = (value != 0); - break; - case 104: - mStuttering = (value != 0); - break; + case 102 -> mFluidTransfer = (value != 0); + case 103 -> mItemTransfer = (value != 0); + case 104 -> mStuttering = (value != 0); } } diff --git a/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java b/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java index 5aa793f8f6..f463b35f7c 100644 --- a/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java +++ b/src/main/java/gregtech/api/gui/GT_Container_BasicTank.java @@ -51,7 +51,7 @@ public class GT_Container_BasicTank extends GT_ContainerMetaTile_Machine { * to become only more severe when playing MP over ethernet, which would have much more latency than a * memory connection */ - Slot slot = (Slot) inventorySlots.get(aSlotIndex); + Slot slot = inventorySlots.get(aSlotIndex); tTank.setDrainableStack(GT_Utility.getFluidFromDisplayStack(slot.getStack())); } IFluidAccess tDrainableAccess = constructFluidAccess(tTank, false); @@ -77,8 +77,8 @@ public class GT_Container_BasicTank extends GT_ContainerMetaTile_Machine { } public void sendProgressBar() { - for (Object crafter : this.crafters) { - ICrafting player = (ICrafting) crafter; + for (ICrafting crafter : this.crafters) { + ICrafting player = crafter; if (mTimer % 500 == 0 || oContent != mContent) { player.sendProgressBarUpdate(this, 100, mContent & 65535); player.sendProgressBarUpdate(this, 101, mContent >>> 16); @@ -91,12 +91,8 @@ public class GT_Container_BasicTank extends GT_ContainerMetaTile_Machine { public void updateProgressBar(int id, int value) { super.updateProgressBar(id, value); switch (id) { - case 100: - mContent = mContent & 0xffff0000 | value & 0x0000ffff; - break; - case 101: - mContent = mContent & 0xffff | value << 16; - break; + case 100 -> mContent = mContent & 0xffff0000 | value & 0x0000ffff; + case 101 -> mContent = mContent & 0xffff | value << 16; } } diff --git a/src/main/java/gregtech/api/gui/GT_GUIColorOverride.java b/src/main/java/gregtech/api/gui/GT_GUIColorOverride.java index 06ddf16d02..7c6328bb34 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIColorOverride.java +++ b/src/main/java/gregtech/api/gui/GT_GUIColorOverride.java @@ -23,27 +23,26 @@ public class GT_GUIColorOverride { private static final Object NOT_FOUND = new Object(); private static final LoadingCache<ResourceLocation, Object> cache = CacheBuilder.newBuilder() .softValues() - .build( - new CacheLoader<ResourceLocation, Object>() { - - @Override - public Object load( - @Nonnull ResourceLocation key) - throws Exception { - IResource ir = Minecraft.getMinecraft() - .getResourceManager() - .getResource( - key); - if (ir.hasMetadata()) - return ir.getMetadata( - "colors"); - // return a dummy - // object because - // LoadingCache - // doesn't like null - return NOT_FOUND; - } - }); + .build(new CacheLoader<>() { + + @Override + public Object load( + @Nonnull ResourceLocation key) + throws Exception { + IResource ir = Minecraft.getMinecraft() + .getResourceManager() + .getResource( + key); + if (ir.hasMetadata()) + return ir.getMetadata( + "colors"); + // return a dummy + // object because + // LoadingCache + // doesn't like null + return NOT_FOUND; + } + }); private static final GT_GUIColorOverride FALLBACK = new GT_GUIColorOverride(); private ColorsMetadataSection cmSection; diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java b/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java index e44b4f0cbc..cbccdc5385 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainerMetaTile_Machine.java @@ -180,8 +180,7 @@ public class GT_GUIContainerMetaTile_Machine extends GT_GUIContainer implements * are enabled. */ protected void setupTooltips() { - if (mContainer.mTileEntity.getMetaTileEntity() instanceof IConfigurationCircuitSupport) { - IConfigurationCircuitSupport ccs = (IConfigurationCircuitSupport) mContainer.mTileEntity.getMetaTileEntity(); + if (mContainer.mTileEntity.getMetaTileEntity() instanceof IConfigurationCircuitSupport ccs) { if (ccs.allowSelectCircuit()) addToolTip( new GT_GuiSlotTooltip( mContainer.getSlot(ccs.getCircuitGUISlot()), @@ -191,7 +190,7 @@ public class GT_GUIContainerMetaTile_Machine extends GT_GUIContainer implements // GT_IToolTipRenderer and GT_ITabRenderer implementations @Override - public void drawHoveringText(List text, int mouseX, int mouseY, FontRenderer font) { + public void drawHoveringText(List<String> text, int mouseX, int mouseY, FontRenderer font) { super.drawHoveringText(text, mouseX, mouseY, font); } @@ -232,8 +231,7 @@ public class GT_GUIContainerMetaTile_Machine extends GT_GUIContainer implements @Override protected void onMouseWheel(int mx, int my, int delta) { - if (mContainer.mTileEntity.getMetaTileEntity() instanceof IConfigurationCircuitSupport) { - IConfigurationCircuitSupport ccs = (IConfigurationCircuitSupport) mContainer.mTileEntity.getMetaTileEntity(); + if (mContainer.mTileEntity.getMetaTileEntity() instanceof IConfigurationCircuitSupport ccs) { Slot slotCircuit = mContainer.getSlot(ccs.getCircuitGUISlot()); if (slotCircuit != null && func_146978_c(slotCircuit.xDisplayPosition, slotCircuit.yDisplayPosition, 16, 16, mx, my)) { diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java index 899d8331bc..eb0122093c 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java +++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java @@ -11,7 +11,6 @@ import gregtech.api.enums.GT_Values; import gregtech.api.gui.widgets.GT_GuiIcon; import gregtech.api.gui.widgets.GT_GuiSlotTooltip; import gregtech.api.gui.widgets.GT_GuiSmartTooltip; -import gregtech.api.gui.widgets.GT_GuiSmartTooltip.TooltipVisibilityProvider; import gregtech.api.gui.widgets.GT_GuiTabLine.GT_GuiTabIconSet; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; @@ -84,12 +83,11 @@ public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machin if (machine.isSteampowered()) { batterySlotTooltipKey = UNUSED_SLOT_TOOLTIP; batterySlotTooltipArgs = new String[0]; - addToolTip(new GT_GuiSmartTooltip(tProblemArea, new TooltipVisibilityProvider() { - - public boolean shouldShowTooltip() { - return hasErrorCode(NEEDS_STEAM_VENTING); - } - }, mTooltipCache.getData(STALLED_VENT_TOOLTIP))); + addToolTip( + new GT_GuiSmartTooltip( + tProblemArea, + () -> hasErrorCode(NEEDS_STEAM_VENTING), + mTooltipCache.getData(STALLED_VENT_TOOLTIP))); } else { String pTier1 = powerTierName(machine.mTier); if (machine.mTier == GT_Values.VN.length - 1) { @@ -130,21 +128,19 @@ public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machin mTooltipCache.getData( recipes != null && recipes.usesSpecialSlot() ? SPECIAL_SLOT_TOOLTIP : UNUSED_SLOT_TOOLTIP))); - addToolTip(new GT_GuiSmartTooltip(tProblemArea, new TooltipVisibilityProvider() { - - public boolean shouldShowTooltip() { - return container.mStuttering && !hasErrorCode(NEEDS_STEAM_VENTING); - } - }, - mTooltipCache.getData( - STALLED_STUTTERING_TOOLTIP, - StatCollector.translateToLocal( - POWER_SOURCE_KEY + (machine.isSteampowered() ? "steam" : "power"))))); + addToolTip( + new GT_GuiSmartTooltip( + tProblemArea, + () -> container.mStuttering && !hasErrorCode(NEEDS_STEAM_VENTING), + mTooltipCache.getData( + STALLED_STUTTERING_TOOLTIP, + StatCollector.translateToLocal( + POWER_SOURCE_KEY + (machine.isSteampowered() ? "steam" : "power"))))); } /** * Apply proper coloration to a machine's power tier short name - * + * * @param machineTier * @return colored power tier short name */ @@ -187,34 +183,38 @@ public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machin % (tSize + 1); switch (mProgressBarDirection) { // yes, my OCD was mad at me before I did the Tabs. - case 0: - drawTexturedModalRect(x + 78, y + 24, 176, 0, tProgress, 18); - break; - case 1: - drawTexturedModalRect(x + 78 + 20 - tProgress, y + 24, 176 + 20 - tProgress, 0, tProgress, 18); - break; - case 2: - drawTexturedModalRect(x + 78, y + 24, 176, 0, 20, tProgress); - break; - case 3: - drawTexturedModalRect(x + 78, y + 24 + 18 - tProgress, 176, 18 - tProgress, 20, tProgress); - break; - case 4: + case 0 -> drawTexturedModalRect(x + 78, y + 24, 176, 0, tProgress, 18); + case 1 -> drawTexturedModalRect( + x + 78 + 20 - tProgress, + y + 24, + 176 + 20 - tProgress, + 0, + tProgress, + 18); + case 2 -> drawTexturedModalRect(x + 78, y + 24, 176, 0, 20, tProgress); + case 3 -> drawTexturedModalRect( + x + 78, + y + 24 + 18 - tProgress, + 176, + 18 - tProgress, + 20, + tProgress); + case 4 -> { tProgress = 20 - tProgress; drawTexturedModalRect(x + 78, y + 24, 176, 0, tProgress, 18); - break; - case 5: + } + case 5 -> { tProgress = 20 - tProgress; drawTexturedModalRect(x + 78 + 20 - tProgress, y + 24, 176 + 20 - tProgress, 0, tProgress, 18); - break; - case 6: + } + case 6 -> { tProgress = 18 - tProgress; drawTexturedModalRect(x + 78, y + 24, 176, 0, 20, tProgress); - break; - case 7: + } + case 7 -> { tProgress = 18 - tProgress; drawTexturedModalRect(x + 78, y + 24 + 18 - tProgress, 176, 18 - tProgress, 20, tProgress); - break; + } } } } diff --git a/src/main/java/gregtech/api/gui/GT_GUIDialogSelectItem.java b/src/main/java/gregtech/api/gui/GT_GUIDialogSelectItem.java index fed1671484..1f95def197 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIDialogSelectItem.java +++ b/src/main/java/gregtech/api/gui/GT_GUIDialogSelectItem.java @@ -52,7 +52,7 @@ public class GT_GUIDialogSelectItem extends GT_GUIScreen { /** * Open a dialog to select an item from given list. Given callback may be called zero or more times depending on * user action. - * + * * @param header Header text * @param headerItem ItemStack to use as Dialog icon * @param parent open which GUIScreen when this dialog is closed. use null if it has no parent. @@ -105,12 +105,14 @@ public class GT_GUIDialogSelectItem extends GT_GUIScreen { @Override public void buttonClicked(GuiButton button) { switch (button.id) { - case 0: + case 0 -> { setScroll(scroll - 1); return; - case 1: + } + case 1 -> { setScroll(scroll + 1); return; + } } super.buttonClicked(button); } diff --git a/src/main/java/gregtech/api/gui/GT_GUIScreen.java b/src/main/java/gregtech/api/gui/GT_GUIScreen.java index 1aa9ccc24c..52ecbe8ab5 100644 --- a/src/main/java/gregtech/api/gui/GT_GUIScreen.java +++ b/src/main/java/gregtech/api/gui/GT_GUIScreen.java @@ -61,7 +61,7 @@ public abstract class GT_GUIScreen extends GuiScreen implements GT_IToolTipRende guiTop = (this.height - this.gui_height) / 2; for (IGuiElement element : elements) { - if (element instanceof GuiButton) buttonList.add(element); + if (element instanceof GuiButton button) buttonList.add(button); if (element instanceof GT_GuiIntegerTextBox) textBoxes.add((GT_GuiIntegerTextBox) element); } @@ -181,12 +181,11 @@ public abstract class GT_GUIScreen extends GuiScreen implements GT_IToolTipRende if (focusedTextBox != null) { resetTextBox(focusedTextBox); setFocusedTextBox(null); - return; } else { closeScreen(); // don't fall through to parent - return; } + return; } if (c == '\t') { // tab @@ -268,7 +267,7 @@ public abstract class GT_GUIScreen extends GuiScreen implements GT_IToolTipRende * GT_IToolTipRenderer */ @Override - public void drawHoveringText(List text, int mouseX, int mouseY, FontRenderer render) { + public void drawHoveringText(List<String> text, int mouseX, int mouseY, FontRenderer render) { super.drawHoveringText(text, mouseX, mouseY, render); } diff --git a/src/main/java/gregtech/api/gui/modularui/GT_UIInfos.java b/src/main/java/gregtech/api/gui/modularui/GT_UIInfos.java index e068cd967e..4d004429b0 100644 --- a/src/main/java/gregtech/api/gui/modularui/GT_UIInfos.java +++ b/src/main/java/gregtech/api/gui/modularui/GT_UIInfos.java @@ -89,8 +89,7 @@ public class GT_UIInfos { UIBuilder.of() .container((player, world, x, y, z) -> { final TileEntity te = world.getTileEntity(x, y, z); - if (!(te instanceof ICoverable)) return null; - final ICoverable gtTileEntity = (ICoverable) te; + if (!(te instanceof ICoverable gtTileEntity)) return null; GT_CoverBehaviorBase<?> cover = gtTileEntity.getCoverBehaviorAtSideNew(side); return createCoverContainer( player, @@ -103,8 +102,7 @@ public class GT_UIInfos { .gui((player, world, x, y, z) -> { if (!world.isRemote) return null; final TileEntity te = world.getTileEntity(x, y, z); - if (!(te instanceof ICoverable)) return null; - final ICoverable gtTileEntity = (ICoverable) te; + if (!(te instanceof ICoverable gtTileEntity)) return null; final GT_CoverBehaviorBase<?> cover = gtTileEntity.getCoverBehaviorAtSideNew(side); return createCoverGuiContainer( player, diff --git a/src/main/java/gregtech/api/gui/modularui/SteamTexture.java b/src/main/java/gregtech/api/gui/modularui/SteamTexture.java index 619b19e232..7cebd957f2 100644 --- a/src/main/java/gregtech/api/gui/modularui/SteamTexture.java +++ b/src/main/java/gregtech/api/gui/modularui/SteamTexture.java @@ -50,29 +50,21 @@ public class SteamTexture { } public UITexture get(SteamVariant variant) { - switch (variant) { - case BRONZE: - return bronzeTexture; - case STEEL: - return steelTexture; - case PRIMITIVE: - return primitiveTexture; - default: - return null; - } + return switch (variant) { + case BRONZE -> bronzeTexture; + case STEEL -> steelTexture; + case PRIMITIVE -> primitiveTexture; + default -> null; + }; } public AdaptableUITexture getAdaptable(SteamVariant variant) { - switch (variant) { - case BRONZE: - return (AdaptableUITexture) bronzeTexture; - case STEEL: - return (AdaptableUITexture) steelTexture; - case PRIMITIVE: - return (AdaptableUITexture) primitiveTexture; - default: - return null; - } + return switch (variant) { + case BRONZE -> (AdaptableUITexture) bronzeTexture; + case STEEL -> (AdaptableUITexture) steelTexture; + case PRIMITIVE -> (AdaptableUITexture) primitiveTexture; + default -> null; + }; } public UITexture get(boolean isHighPressure) { diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java index 01c8671678..cb149547b4 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java @@ -119,10 +119,8 @@ public enum GT_GuiIcon implements IGuiIcon { if (location == null || location.length == 0) return; int startIndex = TEXTURES.length; - TEXTURES = (ResourceLocation[]) Arrays.copyOf(TEXTURES, location.length); - for (int i = 0; i < location.length; i++) { - TEXTURES[startIndex + i] = location[i]; - } + TEXTURES = Arrays.copyOf(TEXTURES, location.length); + System.arraycopy(location, 0, TEXTURES, startIndex + 0, location.length); } @Override diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java index 9caf51cd4b..01a0f3c8b1 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java @@ -34,7 +34,7 @@ public class GT_GuiTabLine { /** * Controls the rendering style of the tab line */ - public static enum DisplayStyle { + public enum DisplayStyle { NONE((byte) 0), NORMAL((byte) 1), @@ -189,9 +189,9 @@ public class GT_GuiTabLine { * @param mouseY */ protected void drawOverlays(float parTicks, int mouseX, int mouseY) { - for (int i = 0; i < mTabs.length; i++) { - if (mTabs[i] != null) { - mTabs[i].drawOverlays(mouseX, mouseY, parTicks); + for (GT_GuiTab mTab : mTabs) { + if (mTab != null) { + mTab.drawOverlays(mouseX, mouseY, parTicks); } } } @@ -204,9 +204,9 @@ public class GT_GuiTabLine { * @param mouseY */ protected void drawBackground(float parTicks, int mouseX, int mouseY) { - for (int i = 0; i < mTabs.length; i++) { - if (mTabs[i] != null) { - mTabs[i].drawBackground(mouseX, mouseY, parTicks); + for (GT_GuiTab mTab : mTabs) { + if (mTab != null) { + mTab.drawBackground(mouseX, mouseY, parTicks); } } } diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java index 1162630d5e..326e744382 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java @@ -2,7 +2,6 @@ package gregtech.api.gui.widgets; import java.awt.Rectangle; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -44,10 +43,10 @@ public class GT_GuiTooltip { private TooltipData sanitizeTooltipData(TooltipData data) { if (data.text == null) { - data.text = Arrays.asList(new String[0]); + data.text = Collections.emptyList(); } if (data.shiftText == null) { - data.shiftText = Arrays.asList(new String[0]); + data.shiftText = Collections.emptyList(); } return data; } @@ -97,10 +96,10 @@ public class GT_GuiTooltip { List<String> list; if (text != null) { list = new ArrayList<>(text.length); - for (int i = 0; i < text.length; i++) { - if (text[i] == null) continue; - if (list.isEmpty()) list.add("\u00a7f" + text[i]); - else list.add("\u00a77" + text[i]); + for (String s : text) { + if (s == null) continue; + if (list.isEmpty()) list.add("\u00a7f" + s); + else list.add("\u00a77" + s); } } else { list = Collections.emptyList(); diff --git a/src/main/java/gregtech/api/interfaces/ICondition.java b/src/main/java/gregtech/api/interfaces/ICondition.java index 554cd2df77..9c7033b3d7 100644 --- a/src/main/java/gregtech/api/interfaces/ICondition.java +++ b/src/main/java/gregtech/api/interfaces/ICondition.java @@ -24,6 +24,7 @@ public interface ICondition<O> { private final ICondition<O>[] mConditions; + @SafeVarargs public Or(ICondition<O>... aConditions) { mConditions = aConditions; } @@ -39,6 +40,7 @@ public interface ICondition<O> { private final ICondition<O>[] mConditions; + @SafeVarargs public Nor(ICondition<O>... aConditions) { mConditions = aConditions; } @@ -54,6 +56,7 @@ public interface ICondition<O> { private final ICondition<O>[] mConditions; + @SafeVarargs public And(ICondition<O>... aConditions) { mConditions = aConditions; } @@ -69,6 +72,7 @@ public interface ICondition<O> { private final ICondition<O>[] mConditions; + @SafeVarargs public Nand(ICondition<O>... aConditions) { mConditions = aConditions; } diff --git a/src/main/java/gregtech/api/interfaces/IIconContainer.java b/src/main/java/gregtech/api/interfaces/IIconContainer.java index fbb9e53519..b76b4c5e9c 100644 --- a/src/main/java/gregtech/api/interfaces/IIconContainer.java +++ b/src/main/java/gregtech/api/interfaces/IIconContainer.java @@ -28,7 +28,7 @@ public interface IIconContainer { @SideOnly(Side.CLIENT) default int getIconPasses() { return 1; - }; + } /** * @return the Default Texture File for this Icon. @@ -37,12 +37,12 @@ public interface IIconContainer { ResourceLocation getTextureFile(); @SideOnly(Side.CLIENT) - public default short[] getIconColor(int aRenderPass) { + default short[] getIconColor(int aRenderPass) { return UNCOLORED_RBGA; } @SideOnly(Side.CLIENT) - public default boolean isUsingColorModulation(int aRenderPass) { + default boolean isUsingColorModulation(int aRenderPass) { return aRenderPass == 0; } } diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java index 37a7d2fc5c..1affdb0d74 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java @@ -60,11 +60,10 @@ public interface IEnergyConnected extends IColoredTileEntity { */ public static long emitEnergyToNetwork(long aVoltage, long aAmperage, IEnergyConnected aEmitter) { long rUsedAmperes = 0; - if (!(aEmitter instanceof IHasWorldObjectAndCoords)) { + if (!(aEmitter instanceof IHasWorldObjectAndCoords emitterTile)) { return 0; } - IHasWorldObjectAndCoords emitterTile = (IHasWorldObjectAndCoords) aEmitter; for (byte i = 0, j = 0; i < 6 && aAmperage > rUsedAmperes; i++) { if (!aEmitter.outputsEnergyTo(i)) { continue; @@ -72,8 +71,7 @@ public interface IEnergyConnected extends IColoredTileEntity { j = GT_Utility.getOppositeSide(i); final TileEntity tTileEntity = emitterTile.getTileEntityAtSide(i); - if (tTileEntity instanceof PowerLogicHost) { - PowerLogicHost host = (PowerLogicHost) tTileEntity; + if (tTileEntity instanceof PowerLogicHost host) { PowerLogic logic = host.getPowerLogic(j); if (logic == null || logic.isEnergyReceiver()) { diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java index 119a1af207..1f0c7f4b1c 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IExperimentalEnergyTileEntity.java @@ -51,14 +51,14 @@ public interface IExperimentalEnergyTileEntity extends IColoredTileEntity, IHasW private static void checkAvailabilities() { if (CHECK_ALL) { try { - Class tClass = cofh.api.energy.IEnergyReceiver.class; + Class<IEnergyReceiver> tClass = cofh.api.energy.IEnergyReceiver.class; tClass.getCanonicalName(); RF_ENERGY = true; } catch (Throwable e) { /**/ } try { - Class tClass = ic2.api.energy.tile.IEnergySink.class; + Class<IEnergySink> tClass = ic2.api.energy.tile.IEnergySink.class; tClass.getCanonicalName(); IC_ENERGY = true; } catch (Throwable e) { diff --git a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java b/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java index 3830ec6e52..36dff21cb0 100644 --- a/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java +++ b/src/main/java/gregtech/api/items/GT_Block_LongDistancePipe.java @@ -115,7 +115,7 @@ public class GT_Block_LongDistancePipe 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 < 3; i++) { ItemStack aStack = new ItemStack(aItem, 1, i); if (!aStack.getDisplayName() diff --git a/src/main/java/gregtech/api/items/GT_BreederCell_Item.java b/src/main/java/gregtech/api/items/GT_BreederCell_Item.java index 3371a1a261..144fc0d39e 100644 --- a/src/main/java/gregtech/api/items/GT_BreederCell_Item.java +++ b/src/main/java/gregtech/api/items/GT_BreederCell_Item.java @@ -67,8 +67,7 @@ public class GT_BreederCell_Item extends GT_Generic_Item implements IReactorComp @Override public void onUpdate(ItemStack stack, World world, Entity entity, int slotIndex, boolean isCurrentItem) { - if ((entity instanceof EntityLivingBase)) { - EntityLivingBase entityLiving = (EntityLivingBase) entity; + if ((entity instanceof EntityLivingBase entityLiving)) { if (!GregTech_API.mIC2Classic && !GT_Utility.isWearingFullRadioHazmat(entityLiving)) { IC2Potion.radiation.applyTo(entityLiving, 20, 1); } @@ -79,19 +78,11 @@ public class GT_BreederCell_Item extends GT_Generic_Item implements IReactorComp public void addAdditionalToolTips(List<String> aList, ItemStack aStack, EntityPlayer aPlayer) { aList.add(transItem("019", "Bath with neutron in a hot reactor")); int rDmg = aStack.getItemDamage() * 4 / getMaxDamage(); - EnumChatFormatting color2; - switch (rDmg) { - case 0: - color2 = EnumChatFormatting.DARK_GRAY; - break; - case 1: - case 2: - color2 = EnumChatFormatting.GRAY; - break; - default: - color2 = EnumChatFormatting.WHITE; - break; - } + EnumChatFormatting color2 = switch (rDmg) { + case 0 -> EnumChatFormatting.DARK_GRAY; + case 1, 2 -> EnumChatFormatting.GRAY; + default -> EnumChatFormatting.WHITE; + }; aList.add( String.format( transItem("020", "Progress: %s/%s"), diff --git a/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java b/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java index 73d3dc3be8..492d009364 100644 --- a/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java +++ b/src/main/java/gregtech/api/items/GT_CoolantCellIC_Item.java @@ -51,7 +51,7 @@ public class GT_CoolantCellIC_Item extends GT_CoolantCell_Item implements IReact } tHeat += aHeat; if (tHeat > this.heatStorage) { - aReactor.setItemAt(x, y, (ItemStack) null); + aReactor.setItemAt(x, y, null); aHeat = this.heatStorage - tHeat + 1; } else { if (tHeat < 0) { diff --git a/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java b/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java index b6530df95c..1b9a6de98a 100644 --- a/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java +++ b/src/main/java/gregtech/api/items/GT_CoolantCell_Item.java @@ -54,36 +54,19 @@ public class GT_CoolantCell_Item extends GT_Generic_Item { public void addAdditionalToolTips(List<String> aList, ItemStack aStack, EntityPlayer aPlayer) { super.addAdditionalToolTips(aList, aStack, aPlayer); int rHeat = getHeatOfStack(aStack) * 10 / this.heatStorage; - EnumChatFormatting color; - switch (rHeat) { - case 0: - color = EnumChatFormatting.BLUE; - break; - case 1: - case 2: - color = EnumChatFormatting.GREEN; - break; - case 3: - case 4: - case 5: - case 6: - color = EnumChatFormatting.YELLOW; - break; - case 7: - case 8: - color = EnumChatFormatting.RED; - break; - default: - color = EnumChatFormatting.DARK_RED; - break; - } + EnumChatFormatting color = switch (rHeat) { + case 0 -> EnumChatFormatting.BLUE; + case 1, 2 -> EnumChatFormatting.GREEN; + case 3, 4, 5, 6 -> EnumChatFormatting.YELLOW; + case 7, 8 -> EnumChatFormatting.RED; + default -> EnumChatFormatting.DARK_RED; + }; aList.add( EnumChatFormatting.WHITE + String.format(transItem("000", "Stored Heat: %s"), "" + color + getHeatOfStack(aStack))); - switch (getControlTagOfStack(aStack)) { - case 1: - aList.add(StatCollector.translateToLocal("ic2.reactoritem.heatwarning.line1")); - aList.add(StatCollector.translateToLocal("ic2.reactoritem.heatwarning.line2")); + if (getControlTagOfStack(aStack) == 1) { + aList.add(StatCollector.translateToLocal("ic2.reactoritem.heatwarning.line1")); + aList.add(StatCollector.translateToLocal("ic2.reactoritem.heatwarning.line2")); } } diff --git a/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java b/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java index d9c164f3ab..d69d6d93b9 100644 --- a/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java +++ b/src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java @@ -32,7 +32,7 @@ import gregtech.api.util.GT_Utility; public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { - public static Map jumpChargeMap = new ConcurrentHashMap(); + public static Map<EntityPlayer, Float> jumpChargeMap = new ConcurrentHashMap<>(); public int mCharge, mTransfer, mTier, mDamageEnergyCost, mSpecials; public boolean mChargeProvider; public double mArmorAbsorbtionPercentage; @@ -88,7 +88,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { } @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) { aList.add("Tier: " + mTier); if ((mSpecials & 1) != 0) aList.add("Rebreather"); if ((mSpecials & 2) != 0) aList.add("Inertia Damper"); @@ -140,8 +140,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { } if (!aPlayer.worldObj.isRemote && (mSpecials & 128) != 0) { - float jumpCharge = jumpChargeMap.containsKey(aPlayer) ? ((Float) jumpChargeMap.get(aPlayer)).floatValue() - : 1.0F; + float jumpCharge = jumpChargeMap.containsKey(aPlayer) ? (Float) jumpChargeMap.get(aPlayer) : 1.0F; if (GT_ModHandler.canUseElectricItem(aStack, 1000) && aPlayer.onGround && jumpCharge < 1.0F) { jumpCharge = 1.0F; @@ -162,7 +161,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { } } - jumpChargeMap.put(aPlayer, Float.valueOf(jumpCharge)); + jumpChargeMap.put(aPlayer, jumpCharge); } if ((mSpecials & 256) != 0) { @@ -237,7 +236,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item aItem, CreativeTabs creativeTab, List outputSubItems) { + public void getSubItems(Item aItem, CreativeTabs creativeTab, List<ItemStack> outputSubItems) { ItemStack tCharged = new ItemStack(this, 1), tUncharged = new ItemStack(this, 1, getMaxDamage()); GT_ModHandler.chargeElectricItem(tCharged, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false); outputSubItems.add(tCharged); @@ -291,8 +290,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { // TODO: @ForgeSubscribe public void onEntityLivingFallEvent(LivingFallEvent event) { - if (!event.entity.worldObj.isRemote && event.entity instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entity; + if (!event.entity.worldObj.isRemote && event.entity instanceof EntityPlayer player) { for (int i = 0; i < 4; i++) { ItemStack armor = player.inventory.armorInventory[i]; if (armor != null && armor.getItem() == this && (mSpecials & 2) != 0) { @@ -350,17 +348,12 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor { private double getBaseAbsorptionRatio() { if (mArmorAbsorbtionPercentage <= 0) return 0.00; - switch (this.armorType) { - case 0: - return 0.15; - case 1: - return 0.40; - case 2: - return 0.30; - case 3: - return 0.15; - default: - return 0.00; - } + return switch (this.armorType) { + case 0 -> 0.15; + case 1 -> 0.40; + case 2 -> 0.30; + case 3 -> 0.15; + default -> 0.00; + }; } } diff --git a/src/main/java/gregtech/api/items/GT_Generic_Item.java b/src/main/java/gregtech/api/items/GT_Generic_Item.java index b8a348144c..03e42a1b41 100644 --- a/src/main/java/gregtech/api/items/GT_Generic_Item.java +++ b/src/main/java/gregtech/api/items/GT_Generic_Item.java @@ -96,7 +96,7 @@ public class GT_Generic_Item extends Item implements IProjectileItem { @SuppressWarnings("unchecked") @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) { if (getMaxDamage() > 0 && !getHasSubtypes()) aList.add((aStack.getMaxDamage() - getDamage(aStack)) + " / " + aStack.getMaxDamage()); if (mTooltip != null) aList.add(GT_LanguageManager.getTranslation(mTooltip)); diff --git a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java index 532b500d8f..c829f563b1 100644 --- a/src/main/java/gregtech/api/items/GT_MetaBase_Item.java +++ b/src/main/java/gregtech/api/items/GT_MetaBase_Item.java @@ -37,7 +37,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpecialElectricItem, IElectricItemManager, IFluidContainerItem { /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */ - private final ConcurrentHashMap<Short, ArrayList<IItemBehaviour<GT_MetaBase_Item>>> mItemBehaviors = new ConcurrentHashMap<Short, ArrayList<IItemBehaviour<GT_MetaBase_Item>>>(); + private final ConcurrentHashMap<Short, ArrayList<IItemBehaviour<GT_MetaBase_Item>>> mItemBehaviors = new ConcurrentHashMap<>(); /** * Creates the Item using these Parameters. @@ -197,9 +197,8 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item return aStack; } - @SuppressWarnings("unchecked") @Override - public final void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + public final void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { String tKey = getUnlocalizedName(aStack) + ".tooltip"; String[] tStrings = GT_LanguageManager.getTranslation(tKey) .split("/n "); @@ -224,7 +223,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item + EnumChatFormatting.GRAY); } else { aList.add( - String.valueOf(EnumChatFormatting.AQUA) + EnumChatFormatting.AQUA + String.format( transItem("011", "%s / %s EU - Voltage: %s"), formatNumbers(tCharge), diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java index 5f906d670d..7d70ae1c8e 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java @@ -65,7 +65,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements * <p/> * You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item. */ - public static final ConcurrentHashMap<String, GT_MetaGenerated_Item> sInstances = new ConcurrentHashMap<String, GT_MetaGenerated_Item>(); + public static final ConcurrentHashMap<String, GT_MetaGenerated_Item> sInstances = new ConcurrentHashMap<>(); /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */ @@ -120,7 +120,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements mVisibleItems.set(aID); GT_LanguageManager.addStringLocalization(getUnlocalizedName(rStack) + ".name", aEnglish); GT_LanguageManager.addStringLocalization(getUnlocalizedName(rStack) + ".tooltip", aToolTip); - List<TC_AspectStack> tAspects = new ArrayList<TC_AspectStack>(); + List<TC_AspectStack> tAspects = new ArrayList<>(); // Important Stuff to do first for (Object tRandomData : aRandomData) if (tRandomData instanceof SubTag) { if (tRandomData == SubTag.INVISIBLE) { @@ -351,7 +351,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements @Override @SideOnly(Side.CLIENT) - public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) { + public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) { int j = mEnabledItems.length(); for (int i = 0; i < j; i++) if (mVisibleItems.get(i) || (D1 && mEnabledItems.get(i))) { Long[] tStats = mElectricStats.get((short) (mOffset + i)); diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java index 6615c6177b..f32c326afa 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X01.java @@ -164,7 +164,7 @@ public abstract class GT_MetaGenerated_Item_X01 extends GT_MetaGenerated_Item { @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) { for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) if (mPrefix.doGenerateItem(GregTech_API.sGeneratedMaterials[i]) && doesShowInCreative( mPrefix, diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java index a3c5814dbf..58368ba05b 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item_X32.java @@ -185,7 +185,7 @@ public abstract class GT_MetaGenerated_Item_X32 extends GT_MetaGenerated_Item { @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) { for (int i = 0; i < 32000; i++) { OrePrefixes aPrefix = mGeneratedPrefixList[i / 1000]; Materials aMaterial = GregTech_API.sGeneratedMaterials[i % 1000]; diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java index 592914a2ff..5243a7bb07 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java @@ -81,11 +81,11 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item * <p/> * You can also use the unlocalized Name gotten from getUnlocalizedName() as Key if you want to get a specific Item. */ - public static final ConcurrentHashMap<String, GT_MetaGenerated_Tool> sInstances = new ConcurrentHashMap<String, GT_MetaGenerated_Tool>(); + public static final ConcurrentHashMap<String, GT_MetaGenerated_Tool> sInstances = new ConcurrentHashMap<>(); /* ---------- CONSTRUCTOR AND MEMBER VARIABLES ---------- */ - public final ConcurrentHashMap<Short, IToolStats> mToolStats = new ConcurrentHashMap<Short, IToolStats>(); + public final ConcurrentHashMap<Short, IToolStats> mToolStats = new ConcurrentHashMap<>(); /** * Creates the Item using these Parameters. @@ -180,7 +180,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item mToolStats.put((short) (aID + 1), aToolStats); aToolStats.onStatsAddedToTool(this, aID); ItemStack rStack = new ItemStack(this, 1, aID); - List<TC_AspectStack> tAspects = new ArrayList<TC_AspectStack>(); + List<TC_AspectStack> tAspects = new ArrayList<>(); for (Object tOreDictNameOrAspect : aOreDictNamesAndAspects) { if (tOreDictNameOrAspect instanceof TC_AspectStack) ((TC_AspectStack) tOreDictNameOrAspect).addToAspectList(tAspects); @@ -271,8 +271,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item } IToolStats tStats = getToolStats(aStack); Block aBlock = aPlayer.worldObj.getBlock(aX, aY, aZ); - if (tStats.isChainsaw() && (aBlock instanceof IShearable)) { - IShearable target = (IShearable) aBlock; + if (tStats.isChainsaw() && (aBlock instanceof IShearable target)) { if ((target.isShearable(aStack, aPlayer.worldObj, aX, aY, aZ))) { ArrayList<ItemStack> drops = target.onSheared( aStack, @@ -385,7 +384,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item @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) { for (int i = 0; i < 32766; i += 2) { if (getToolStats(new ItemStack(this, 1, i)) != null) { ItemStack tStack = new ItemStack(this, 1, i); diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java index da7a6bc984..617e02cfe6 100644 --- a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java +++ b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java @@ -101,11 +101,11 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement int dheat = heat / heatAcceptors.size(); heat -= dheat; - dheat = ((IReactorComponent) ((ItemStackCoord) heatAcceptors.get(0)).stack.getItem()).alterHeat( + dheat = ((IReactorComponent) heatAcceptors.get(0).stack.getItem()).alterHeat( reactor, - ((ItemStackCoord) heatAcceptors.get(0)).stack, - ((ItemStackCoord) heatAcceptors.get(0)).x, - ((ItemStackCoord) heatAcceptors.get(0)).y, + heatAcceptors.get(0).stack, + heatAcceptors.get(0).x, + heatAcceptors.get(0).y, dheat); heat += dheat; heatAcceptors.remove(0); @@ -149,7 +149,7 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement float ReaktorOutput = 1.5F * breedereffectiveness + 1.0F; reactor.addOutput(ReaktorOutput * this.sEnergy); } else { - reactor.addOutput((float) (1.0F * this.sEnergy)); + reactor.addOutput(1.0F * this.sEnergy); } } return true; @@ -182,15 +182,14 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement @Override public void onUpdate(ItemStack stack, World world, Entity entity, int slotIndex, boolean isCurrentItem) { - if (this.sRadiation > 0 && (entity instanceof EntityLivingBase)) { - EntityLivingBase entityLiving = (EntityLivingBase) entity; + if (this.sRadiation > 0 && (entity instanceof EntityLivingBase entityLiving)) { if (!GregTech_API.mIC2Classic && !GT_Utility.isWearingFullRadioHazmat(entityLiving)) { IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10); } } } - private class ItemStackCoord { + private static class ItemStackCoord { public ItemStack stack; public int x; diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java index 4ec9ce1990..34492b6220 100644 --- a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java +++ b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java @@ -138,21 +138,11 @@ public class GT_RadioactiveCell_Item extends GT_Generic_Item implements IBoxable super.addAdditionalToolTips(aList, aStack, aPlayer); // aList.add("Time left: " + (this.maxDelay - getDurabilityOfStack(aStack)) + " secs"); int rDmg = getDurabilityOfStack(aStack) * 6 / this.maxDmg; - EnumChatFormatting color2; - switch (rDmg) { - case 0: - case 1: - color2 = EnumChatFormatting.WHITE; - break; - case 2: - case 3: - case 4: - color2 = EnumChatFormatting.GRAY; - break; - default: - color2 = EnumChatFormatting.DARK_GRAY; - break; - } + EnumChatFormatting color2 = switch (rDmg) { + case 0, 1 -> EnumChatFormatting.WHITE; + case 2, 3, 4 -> EnumChatFormatting.GRAY; + default -> EnumChatFormatting.DARK_GRAY; + }; EnumChatFormatting color1 = this instanceof GT_DepletetCell_Item ? color2 = EnumChatFormatting.DARK_GRAY : EnumChatFormatting.WHITE; aList.add( diff --git a/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java b/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java index 41581b94f8..8d8db6a52a 100644 --- a/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java +++ b/src/main/java/gregtech/api/items/GT_SolderingTool_Item.java @@ -50,9 +50,6 @@ public class GT_SolderingTool_Item extends GT_Tool_Item { public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) { super.onItemUseFirst(aStack, aPlayer, aWorld, aX, aY, aZ, aSide, hitX, hitY, hitZ); - if (aWorld.isRemote) { - return false; - } return false; } } diff --git a/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java index aa64476105..fcd291fa01 100644 --- a/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java +++ b/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java @@ -96,31 +96,24 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item { } else if (tRotationPitch <= -65) { tSide = 0; } else { - switch (MathHelper.floor_double((aPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) { - case 0: - tSide = 2; - break; - case 1: - tSide = 5; - break; - case 2: - tSide = 3; - break; - case 3: - tSide = 4; - break; - } + tSide = switch (MathHelper.floor_double((aPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3) { + case 0 -> 2; + case 1 -> 5; + case 2 -> 3; + case 3 -> 4; + default -> tSide; + }; } switch (0) { - case 0: + case 0 -> { if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ) && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); aWorld.setBlock(aX, aY, aZ, GT_Utility.getBlockFromStack(tStack), tStack.getItemDamage(), 3); return true; } - break; - case 1: + } + case 1 -> { for (byte i = 0; i < 4; i++) { if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ) && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { @@ -148,15 +141,14 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item { aZ -= ForgeDirection.getOrientation(tSide).offsetZ; } return true; - case 2: + } + case 2 -> { boolean temp = false, tXFactor = (ForgeDirection.getOrientation(tSide).offsetX == 0), tYFactor = (ForgeDirection.getOrientation(tSide).offsetY == 0), tZFactor = (ForgeDirection.getOrientation(tSide).offsetZ == 0); - aX -= (tXFactor ? 1 : 0); aY -= (tYFactor ? 1 : 0); aZ -= (tZFactor ? 1 : 0); - for (byte i = 0; i < 3; i++) for (byte j = 0; j < 3; j++) { if (GT_Utility.isBlockAir( aWorld, @@ -186,6 +178,7 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item { } } return temp; + } } } return false; diff --git a/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java index 7d863c3e89..e4e03083f5 100644 --- a/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java +++ b/src/main/java/gregtech/api/items/GT_Spray_Pepper_Item.java @@ -56,7 +56,6 @@ public class GT_Spray_Pepper_Item extends GT_Tool_Item { return false; } Block aBlock = aWorld.getBlock(aX, aY, aZ); - if (aBlock == null) return false; // byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ); // TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java index e1a83f5cc6..0bc1201827 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java @@ -346,36 +346,34 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity if (isClientSide()) { issueTextureUpdate(); switch (aEventID) { - case GregTechTileClientEvents.CHANGE_COMMON_DATA: - mConnections = (byte) aValue; - break; - case GregTechTileClientEvents.CHANGE_CUSTOM_DATA: + case GregTechTileClientEvents.CHANGE_COMMON_DATA -> mConnections = (byte) aValue; + case GregTechTileClientEvents.CHANGE_CUSTOM_DATA -> { if (hasValidMetaTileEntity()) mMetaTileEntity.onValueUpdate((byte) aValue); - break; - case GregTechTileClientEvents.CHANGE_COLOR: + } + case GregTechTileClientEvents.CHANGE_COLOR -> { if (aValue > 16 || aValue < 0) aValue = 0; mColor = (byte) aValue; - break; - case GregTechTileClientEvents.CHANGE_REDSTONE_OUTPUT: + } + case GregTechTileClientEvents.CHANGE_REDSTONE_OUTPUT -> { mSidedRedstone[0] = (byte) ((aValue & 1) == 1 ? 15 : 0); mSidedRedstone[1] = (byte) ((aValue & 2) == 2 ? 15 : 0); mSidedRedstone[2] = (byte) ((aValue & 4) == 4 ? 15 : 0); mSidedRedstone[3] = (byte) ((aValue & 8) == 8 ? 15 : 0); mSidedRedstone[4] = (byte) ((aValue & 16) == 16 ? 15 : 0); mSidedRedstone[5] = (byte) ((aValue & 32) == 32 ? 15 : 0); - break; - case GregTechTileClientEvents.DO_SOUND: + } + case GregTechTileClientEvents.DO_SOUND -> { if (hasValidMetaTileEntity() && mTickTimer > 20) mMetaTileEntity.doSound((byte) aValue, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); - break; - case GregTechTileClientEvents.START_SOUND_LOOP: + } + case GregTechTileClientEvents.START_SOUND_LOOP -> { if (hasValidMetaTileEntity() && mTickTimer > 20) mMetaTileEntity.startSoundLoop((byte) aValue, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); - break; - case GregTechTileClientEvents.STOP_SOUND_LOOP: + } + case GregTechTileClientEvents.STOP_SOUND_LOOP -> { if (hasValidMetaTileEntity() && mTickTimer > 20) mMetaTileEntity.stopSoundLoop((byte) aValue, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); - break; + } } } return true; diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 00e31ed9a0..0f908bdaa3 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -728,48 +728,46 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec if (isClientSide()) { issueTextureUpdate(); switch (aEventID) { - case GregTechTileClientEvents.CHANGE_COMMON_DATA: + case GregTechTileClientEvents.CHANGE_COMMON_DATA -> { mFacing = (byte) (aValue & 7); mActive = ((aValue & 8) != 0); mRedstone = ((aValue & 16) != 0); // mLockUpgrade = ((aValue&32) != 0); mWorks = ((aValue & 64) != 0); - break; - case GregTechTileClientEvents.CHANGE_CUSTOM_DATA: + } + case GregTechTileClientEvents.CHANGE_CUSTOM_DATA -> { if (hasValidMetaTileEntity()) { if ((aValue & 0x80) == 0) // Is texture index mMetaTileEntity.onValueUpdate((byte) (aValue & 0x7F)); else if (mMetaTileEntity instanceof GT_MetaTileEntity_Hatch) // is texture page and hatch ((GT_MetaTileEntity_Hatch) mMetaTileEntity).onTexturePageUpdate((byte) (aValue & 0x7F)); } - break; - case GregTechTileClientEvents.CHANGE_COLOR: + } + case GregTechTileClientEvents.CHANGE_COLOR -> { if (aValue > 16 || aValue < 0) aValue = 0; mColor = (byte) aValue; - break; - case GregTechTileClientEvents.CHANGE_REDSTONE_OUTPUT: + } + case GregTechTileClientEvents.CHANGE_REDSTONE_OUTPUT -> { mSidedRedstone[0] = (byte) ((aValue & 1) == 1 ? 15 : 0); mSidedRedstone[1] = (byte) ((aValue & 2) == 2 ? 15 : 0); mSidedRedstone[2] = (byte) ((aValue & 4) == 4 ? 15 : 0); mSidedRedstone[3] = (byte) ((aValue & 8) == 8 ? 15 : 0); mSidedRedstone[4] = (byte) ((aValue & 16) == 16 ? 15 : 0); mSidedRedstone[5] = (byte) ((aValue & 32) == 32 ? 15 : 0); - break; - case GregTechTileClientEvents.DO_SOUND: + } + case GregTechTileClientEvents.DO_SOUND -> { if (hasValidMetaTileEntity() && mTickTimer > 20) mMetaTileEntity.doSound((byte) aValue, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); - break; - case GregTechTileClientEvents.START_SOUND_LOOP: + } + case GregTechTileClientEvents.START_SOUND_LOOP -> { if (hasValidMetaTileEntity() && mTickTimer > 20) mMetaTileEntity.startSoundLoop((byte) aValue, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); - break; - case GregTechTileClientEvents.STOP_SOUND_LOOP: + } + case GregTechTileClientEvents.STOP_SOUND_LOOP -> { if (hasValidMetaTileEntity() && mTickTimer > 20) mMetaTileEntity.stopSoundLoop((byte) aValue, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5); - break; - case GregTechTileClientEvents.CHANGE_LIGHT: - mLightValue = (byte) aValue; - break; + } + case GregTechTileClientEvents.CHANGE_LIGHT -> mLightValue = (byte) aValue; } } return true; diff --git a/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java index 238dc6ba30..3ef732b1c8 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseTileEntity.java @@ -861,8 +861,7 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje final ItemStackHandler inventoryHandler = getInventoryHandler(); if (inventoryHandler == null) return; - if (!(this instanceof IInventory)) return; - final IInventory inv = (IInventory) this; + if (!(this instanceof IInventory inv)) return; final IConfigurationCircuitSupport ccs = getConfigurationCircuitSupport(); if (ccs == null) return; @@ -937,8 +936,7 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje final IConfigurationCircuitSupport ccs = getConfigurationCircuitSupport(); if (ccs == null) return; - if (!(this instanceof IInventory)) return; - final IInventory inv = (IInventory) this; + if (!(this instanceof IInventory inv)) return; final List<ItemStack> circuits = ccs.getConfigurationCircuits(); uiContext.openClientWindow( @@ -965,8 +963,7 @@ public abstract class BaseTileEntity extends TileEntity implements IHasWorldObje final IConfigurationCircuitSupport ccs = getConfigurationCircuitSupport(); if (ccs == null) return; - if (!(this instanceof IInventory)) return; - final IInventory inv = (IInventory) this; + if (!(this instanceof IInventory inv)) return; GT_Values.NW.sendToServer(new GT_Packet_SetConfigurationCircuit(this, selected)); // we will not do any validation on client side diff --git a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java index f2929e7e1e..4167bf1701 100644 --- a/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/CoverableTileEntity.java @@ -702,18 +702,17 @@ public abstract class CoverableTileEntity extends BaseTileEntity implements ICov .setSize(COVER_TAB_WIDTH, COVER_TAB_HEIGHT)) .addChild( new ItemDrawable( - () -> { return getCoverItemAtSide(side); }) - .asWidget() - .setPos( - (COVER_TAB_WIDTH - - ICON_SIZE) - / 2 - + (flipHorizontally - ? -1 - : 1), - (COVER_TAB_HEIGHT - - ICON_SIZE) - / 2)) + () -> getCoverItemAtSide(side)).asWidget() + .setPos( + (COVER_TAB_WIDTH + - ICON_SIZE) + / 2 + + (flipHorizontally + ? -1 + : 1), + (COVER_TAB_HEIGHT + - ICON_SIZE) + / 2)) .setEnabled(widget -> getCoverItemAtSide(side) != null)); } } diff --git a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java index cf1cb5dc1b..a42525ae45 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java @@ -1,7 +1,6 @@ package gregtech.api.metatileentity; import static gregtech.api.enums.GT_Values.GT; -import static gregtech.api.enums.GT_Values.V; import java.io.File; import java.util.ArrayList; @@ -33,6 +32,7 @@ import gnu.trove.list.TIntList; import gnu.trove.list.array.TIntArrayList; import gregtech.api.GregTech_API; import gregtech.api.enums.Dyes; +import gregtech.api.enums.GT_Values; import gregtech.api.interfaces.metatileentity.IConnectable; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IColoredTileEntity; @@ -115,7 +115,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable { ItemStack tStack = new ItemStack(GregTech_API.sBlockMachines, 1, aID); tStack.getItem() - .addInformation(tStack, null, new ArrayList<String>(), true); + .addInformation(tStack, null, new ArrayList<>(), true); } /** @@ -754,36 +754,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable { @Override public void doExplosion(long aExplosionPower) { - float tStrength = aExplosionPower < V[0] ? 1.0F - : aExplosionPower < V[1] ? 2.0F - : aExplosionPower < V[2] ? 3.0F - : aExplosionPower < V[3] ? 4.0F - : aExplosionPower < V[4] ? 5.0F - : aExplosionPower < V[4] * 2 ? 6.0F - : aExplosionPower < V[5] ? 7.0F - : aExplosionPower < V[6] ? 8.0F - : aExplosionPower < V[7] ? 9.0F - : aExplosionPower < V[8] ? 10.0F - : aExplosionPower < V[8] * 2 - ? 11.0F - : aExplosionPower < V[9] - ? 12.0F - : aExplosionPower - < V[10] ? 13.0F - : aExplosionPower - < V[11] ? 14.0F - : aExplosionPower - < V[12] ? 15.0F - : aExplosionPower - < V[12] * 2 - ? 16.0F - : aExplosionPower - < V[13] ? 17.0F - : aExplosionPower - < V[14] ? 18.0F - : aExplosionPower - < V[15] ? 19.0F - : 20.0F; + float tStrength = GT_Values.getExplosionPowerForVoltage(aExplosionPower); int tX = getBaseMetaTileEntity().getXCoord(), tY = getBaseMetaTileEntity().getYCoord(), tZ = getBaseMetaTileEntity().getZCoord(); World tWorld = getBaseMetaTileEntity().getWorld(); diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java index a017fca2e0..c929bd5677 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java @@ -1,7 +1,5 @@ package gregtech.api.metatileentity; -import static gregtech.api.enums.GT_Values.V; - import java.io.File; import java.util.ArrayList; import java.util.List; @@ -45,6 +43,7 @@ import gnu.trove.list.TIntList; import gnu.trove.list.array.TIntArrayList; import gregtech.api.GregTech_API; import gregtech.api.enums.Dyes; +import gregtech.api.enums.GT_Values; import gregtech.api.enums.SoundResource; import gregtech.api.enums.SteamVariant; import gregtech.api.gui.GT_GUIColorOverride; @@ -846,8 +845,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac @Override public void setInventorySlotContents(int aIndex, ItemStack aStack) { markDirty(); - if (this instanceof IConfigurationCircuitSupport) { - IConfigurationCircuitSupport ccs = (IConfigurationCircuitSupport) this; + if (this instanceof IConfigurationCircuitSupport ccs) { if (ccs.allowSelectCircuit() && aIndex == ccs.getCircuitSlot() && aStack != null) { mInventory[aIndex] = GT_Utility.copyAmount(0, aStack); return; @@ -1090,28 +1088,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac @Override public void doExplosion(long aExplosionPower) { - // spotless:off - float tStrength = - aExplosionPower < V[0] ? 1.0F : - aExplosionPower < V[1] ? 2.0F : - aExplosionPower < V[2] ? 3.0F : - aExplosionPower < V[3] ? 4.0F : - aExplosionPower < V[4] ? 5.0F : - aExplosionPower < V[4] * 2 ? 6.0F : - aExplosionPower < V[5] ? 7.0F : - aExplosionPower < V[6] ? 8.0F : - aExplosionPower < V[7] ? 9.0F : - aExplosionPower < V[8] ? 10.0F : - aExplosionPower < V[8] * 2 ? 11.0F : - aExplosionPower < V[9] ? 12.0F : - aExplosionPower < V[10] ? 13.0F : - aExplosionPower < V[11] ? 14.0F : - aExplosionPower < V[12] ? 15.0F : - aExplosionPower < V[12] * 2 ? 16.0F : - aExplosionPower < V[13] ? 17.0F : - aExplosionPower < V[14] ? 18.0F : - aExplosionPower < V[15] ? 19.0F : 20.0F; - // spotless:on + float tStrength = GT_Values.getExplosionPowerForVoltage(aExplosionPower); final int tX = getBaseMetaTileEntity().getXCoord(); final int tY = getBaseMetaTileEntity().getYCoord(); final int tZ = getBaseMetaTileEntity().getZCoord(); @@ -1201,9 +1178,8 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac ForgeDirection.getOrientation(mBaseMetaTileEntity.getFrontFacing()) .name())); - if (this instanceof IPowerChannelState) { + if (this instanceof IPowerChannelState state) { // adapted from PowerStateWailaDataProvider - final IPowerChannelState state = (IPowerChannelState) this; NBTTagCompound tag = accessor.getNBTData(); final boolean isActive = tag.getBoolean("isActive"); final boolean isPowered = tag.getBoolean("isPowered"); @@ -1224,9 +1200,8 @@ public abstract class MetaTileEntity implements IMetaTileEntity, IMachineCallbac @Override public void getWailaNBTData(EntityPlayerMP player, TileEntity tile, NBTTagCompound tag, World world, int x, int y, int z) { - if (this instanceof IPowerChannelState) { + if (this instanceof IPowerChannelState state) { // adapted from PowerStateWailaDataProvider - final IPowerChannelState state = (IPowerChannelState) this; final boolean isActive = state.isActive(); final boolean isPowered = state.isPowered(); final boolean isBooting = state.isBooting(); diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java index 790d4d6c1f..2a1ec3c22c 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java @@ -223,8 +223,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile public long transferElectricity(byte aSide, long aVoltage, long aAmperage, HashSet<TileEntity> aAlreadyPassedSet) { if (!getBaseMetaTileEntity().isServerSide() || !isConnectedAtSide(aSide) && aSide != 6) return 0; final BaseMetaPipeEntity tBase = (BaseMetaPipeEntity) getBaseMetaTileEntity(); - if (!(tBase.getNode() instanceof PowerNode)) return 0; - final PowerNode tNode = (PowerNode) tBase.getNode(); + if (!(tBase.getNode() instanceof PowerNode tNode)) return 0; if (tNode != null) { int tPlace = 0; final Node[] tToPower = new Node[tNode.mConsumers.size()]; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java index a3e44640e8..b428d187d7 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java @@ -159,40 +159,24 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { } protected static ITexture getRestrictorTexture(byte aMask) { - switch (aMask) { - case 1: - return TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_UP); - case 2: - return TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_DOWN); - case 3: - return TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_UD); - case 4: - return TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_LEFT); - case 5: - return TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_UL); - case 6: - return TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_DL); - case 7: - return TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_NR); - case 8: - return TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_RIGHT); - case 9: - return TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_UR); - case 10: - return TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_DR); - case 11: - return TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_NL); - case 12: - return TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_LR); - case 13: - return TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_ND); - case 14: - return TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_NU); - case 15: - return TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR); - default: - return null; - } + return switch (aMask) { + case 1 -> TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_UP); + case 2 -> TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_DOWN); + case 3 -> TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_UD); + case 4 -> TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_LEFT); + case 5 -> TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_UL); + case 6 -> TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_DL); + case 7 -> TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_NR); + case 8 -> TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_RIGHT); + case 9 -> TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_UR); + case 10 -> TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_DR); + case 11 -> TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_NL); + case 12 -> TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_LR); + case 13 -> TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_ND); + case 14 -> TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR_NU); + case 15 -> TextureFactory.of(Textures.BlockIcons.PIPE_RESTRICTOR); + default -> null; + }; } @Override @@ -349,22 +333,22 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { sendSound((byte) 9); if (tTemperature > 320) { try { - for (EntityLivingBase tLiving : (ArrayList<EntityLivingBase>) getBaseMetaTileEntity().getWorld() - .getEntitiesWithinAABB( - EntityLivingBase.class, - AxisAlignedBB.getBoundingBox( - getBaseMetaTileEntity().getXCoord() - - 2, - getBaseMetaTileEntity().getYCoord() - - 2, - getBaseMetaTileEntity().getZCoord() - - 2, - getBaseMetaTileEntity().getXCoord() - + 3, - getBaseMetaTileEntity().getYCoord() - + 3, - getBaseMetaTileEntity().getZCoord() - + 3))) { + for (EntityLivingBase tLiving : getBaseMetaTileEntity().getWorld() + .getEntitiesWithinAABB( + EntityLivingBase.class, + AxisAlignedBB.getBoundingBox( + getBaseMetaTileEntity().getXCoord() + - 2, + getBaseMetaTileEntity().getYCoord() + - 2, + getBaseMetaTileEntity().getZCoord() + - 2, + getBaseMetaTileEntity().getXCoord() + + 3, + getBaseMetaTileEntity().getYCoord() + + 3, + getBaseMetaTileEntity().getZCoord() + + 3))) { GT_Utility.applyHeatDamage(tLiving, (tTemperature - 300) / 25.0F); } } catch (Throwable e) { @@ -372,22 +356,22 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity { } } else if (tTemperature < 260) { try { - for (EntityLivingBase tLiving : (ArrayList<EntityLivingBase>) getBaseMetaTileEntity().getWorld() - .getEntitiesWithinAABB( - EntityLivingBase.class, - AxisAlignedBB.getBoundingBox( - getBaseMetaTileEntity().getXCoord() - - 2, - getBaseMetaTileEntity().getYCoord() - - 2, - getBaseMetaTileEntity().getZCoord() - - 2, - getBaseMetaTileEntity().getXCoord() - + 3, - getBaseMetaTileEntity().getYCoord() - + 3, - getBaseMetaTileEntity().getZCoord() - + 3))) { + for (EntityLivingBase tLiving : getBaseMetaTileEntity().getWorld() + .getEntitiesWithinAABB( + EntityLivingBase.class, + AxisAlignedBB.getBoundingBox( + getBaseMetaTileEntity().getXCoord() + - 2, + getBaseMetaTileEntity().getYCoord() + - 2, + getBaseMetaTileEntity().getZCoord() + - 2, + getBaseMetaTileEntity().getXCoord() + + 3, + getBaseMetaTileEntity().getYCoord() + + 3, + getBaseMetaTileEntity().getZCoord() + + 3))) { GT_Utility.applyFrostDamage(tLiving, (270 - tTemperature) / 12.5F); } } catch (Throwable e) { diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java index 7b2a4fa232..bae070f6dd 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java @@ -382,70 +382,62 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { switch (mInventory.length) { - case 4: - builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 2) - .startFromSlot(0) - .endAtSlot(3) - .slotCreator(index -> new BaseSlot(inventoryHandler, index) { - - @Override - public int getSlotStackLimit() { - return 1; - } - }) - .background(getGUITextureSet().getItemSlot()) - .build() - .setPos(70, 25)); - break; - case 9: - builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 3) - .startFromSlot(0) - .endAtSlot(8) - .slotCreator(index -> new BaseSlot(inventoryHandler, index) { - - @Override - public int getSlotStackLimit() { - return 1; - } - }) - .background(getGUITextureSet().getItemSlot()) - .build() - .setPos(61, 16)); - break; - case 16: - builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 4) - .startFromSlot(0) - .endAtSlot(15) - .slotCreator(index -> new BaseSlot(inventoryHandler, index) { - - @Override - public int getSlotStackLimit() { - return 1; - } - }) - .background(getGUITextureSet().getItemSlot()) - .build() - .setPos(52, 7)); - break; - default: - builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 1) - .startFromSlot(0) - .endAtSlot(0) - .slotCreator(index -> new BaseSlot(inventoryHandler, index) { - - @Override - public int getSlotStackLimit() { - return 1; - } - }) - .background(getGUITextureSet().getItemSlot()) - .build() - .setPos(79, 34)); - break; + case 4 -> builder.widget( + SlotGroup.ofItemHandler(inventoryHandler, 2) + .startFromSlot(0) + .endAtSlot(3) + .slotCreator(index -> new BaseSlot(inventoryHandler, index) { + + @Override + public int getSlotStackLimit() { + return 1; + } + }) + .background(getGUITextureSet().getItemSlot()) + .build() + .setPos(70, 25)); + case 9 -> builder.widget( + SlotGroup.ofItemHandler(inventoryHandler, 3) + .startFromSlot(0) + .endAtSlot(8) + .slotCreator(index -> new BaseSlot(inventoryHandler, index) { + + @Override + public int getSlotStackLimit() { + return 1; + } + }) + .background(getGUITextureSet().getItemSlot()) + .build() + .setPos(61, 16)); + case 16 -> builder.widget( + SlotGroup.ofItemHandler(inventoryHandler, 4) + .startFromSlot(0) + .endAtSlot(15) + .slotCreator(index -> new BaseSlot(inventoryHandler, index) { + + @Override + public int getSlotStackLimit() { + return 1; + } + }) + .background(getGUITextureSet().getItemSlot()) + .build() + .setPos(52, 7)); + default -> builder.widget( + SlotGroup.ofItemHandler(inventoryHandler, 1) + .startFromSlot(0) + .endAtSlot(0) + .slotCreator(index -> new BaseSlot(inventoryHandler, index) { + + @Override + public int getSlotStackLimit() { + return 1; + } + }) + .background(getGUITextureSet().getItemSlot()) + .build() + .setPos(79, 34)); } } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java index a71b94b916..182b25fb92 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java @@ -302,8 +302,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity public long getFuelValue(FluidStack aLiquid, boolean aLong) { GT_Recipe_Map tRecipes = getRecipes(); - if (aLiquid == null || !(tRecipes instanceof GT_Recipe.GT_Recipe_Map_Fuel)) return 0; - GT_Recipe.GT_Recipe_Map_Fuel tFuels = (GT_Recipe.GT_Recipe_Map_Fuel) tRecipes; + if (aLiquid == null || !(tRecipes instanceof GT_Recipe.GT_Recipe_Map_Fuel tFuels)) return 0; GT_Recipe tFuel = tFuels.findFuel(aLiquid); if (tFuel == null) return 0; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java index 78fc68ee81..49b76b1579 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java @@ -237,14 +237,37 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return mTextures[mMainFacing < 2 - ? aSide == aFacing ? aActive ? 2 : 3 - : aSide == 0 ? aActive ? 6 : 7 : aSide == 1 ? aActive ? 4 : 5 : aActive ? 0 : 1 - : aSide == mMainFacing ? aActive ? 2 : 3 - : (showPipeFacing() && aSide == aFacing) - ? aSide == 0 ? aActive ? 8 : 9 : aSide == 1 ? aActive ? 10 : 11 : aActive ? 12 : 13 - : aSide == 0 ? aActive ? 6 : 7 - : aSide == 1 ? aActive ? 4 : 5 : aActive ? 0 : 1][aColorIndex + 1]; + final int textureIndex; + if (mMainFacing < 2) { + if (aSide == aFacing) { + textureIndex = aActive ? 2 : 3; + } else { + textureIndex = switch (aSide) { + case 0 -> aActive ? 6 : 7; + case 1 -> aActive ? 4 : 5; + default -> aActive ? 0 : 1; + }; + } + } else { + if (aSide == mMainFacing) { + textureIndex = aActive ? 2 : 3; + } else { + if (showPipeFacing() && aSide == aFacing) { + textureIndex = switch (aSide) { + case 0 -> aActive ? 8 : 9; + case 1 -> aActive ? 10 : 11; + default -> aActive ? 12 : 13; + }; + } else { + textureIndex = switch (aSide) { + case 0 -> aActive ? 6 : 7; + case 1 -> aActive ? 4 : 5; + default -> aActive ? 0 : 1; + }; + } + } + } + return mTextures[textureIndex][aColorIndex + 1]; } @Override diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java index 934554dfbc..d2433e04e6 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_Bronze.java @@ -4,8 +4,6 @@ import static gregtech.api.enums.GT_Values.D1; import static gregtech.api.enums.Textures.BlockIcons.*; import static gregtech.api.objects.XSTR.XSTR_INSTANCE; -import java.util.ArrayList; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; @@ -173,31 +171,28 @@ public abstract class GT_MetaTileEntity_BasicMachine_Bronze extends GT_MetaTileE sendSound((byte) 9); mNeedsSteamVenting = false; try { - for (EntityLivingBase tLiving : (ArrayList<EntityLivingBase>) getBaseMetaTileEntity().getWorld() - .getEntitiesWithinAABB( - EntityLivingBase.class, - AxisAlignedBB.getBoundingBox( - getBaseMetaTileEntity().getOffsetX( - getBaseMetaTileEntity().getFrontFacing(), - 1), - getBaseMetaTileEntity().getOffsetY( - getBaseMetaTileEntity().getFrontFacing(), - 1), - getBaseMetaTileEntity().getOffsetZ( - getBaseMetaTileEntity().getFrontFacing(), - 1), - getBaseMetaTileEntity().getOffsetX( - getBaseMetaTileEntity().getFrontFacing(), - 1) - + 1, - getBaseMetaTileEntity().getOffsetY( - getBaseMetaTileEntity().getFrontFacing(), - 1) - + 1, - getBaseMetaTileEntity().getOffsetZ( - getBaseMetaTileEntity().getFrontFacing(), - 1) - + 1))) { + for (EntityLivingBase tLiving : getBaseMetaTileEntity().getWorld() + .getEntitiesWithinAABB( + EntityLivingBase.class, + AxisAlignedBB.getBoundingBox( + getBaseMetaTileEntity().getOffsetX( + getBaseMetaTileEntity().getFrontFacing(), + 1), + getBaseMetaTileEntity().getOffsetY( + getBaseMetaTileEntity().getFrontFacing(), + 1), + getBaseMetaTileEntity().getOffsetZ( + getBaseMetaTileEntity().getFrontFacing(), + 1), + getBaseMetaTileEntity().getOffsetX( + getBaseMetaTileEntity().getFrontFacing(), + 1) + 1, + getBaseMetaTileEntity().getOffsetY( + getBaseMetaTileEntity().getFrontFacing(), + 1) + 1, + getBaseMetaTileEntity().getOffsetZ( + getBaseMetaTileEntity().getFrontFacing(), + 1) + 1))) { GT_Utility.applyHeatDamage(tLiving, getSteamDamage()); } } catch (Throwable e) { diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java index 5331f67dca..bc756fa6a5 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java @@ -40,7 +40,6 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; -import gregtech.api.util.WorldSpawnedEventBuilder; import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder; import ic2.core.Ic2Items; @@ -231,673 +230,284 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PLATE) { switch (this.mTier) { - case 0: - case 1: - aRecipe[i] = OrePrefixes.plate.get(Materials.Steel); - break; - case 2: - aRecipe[i] = OrePrefixes.plate.get(Materials.Aluminium); - break; - case 3: - aRecipe[i] = OrePrefixes.plate.get(Materials.StainlessSteel); - break; - case 4: - aRecipe[i] = OrePrefixes.plate.get(Materials.Titanium); - break; - case 5: - aRecipe[i] = OrePrefixes.plate.get(Materials.TungstenSteel); - break; - case 6: - aRecipe[i] = OrePrefixes.plate.get(Materials.HSSG); - break; - case 7: - aRecipe[i] = OrePrefixes.plate.get(Materials.HSSE); - break; - default: - aRecipe[i] = OrePrefixes.plate.get(Materials.Neutronium); - break; + case 0, 1 -> aRecipe[i] = OrePrefixes.plate.get(Materials.Steel); + case 2 -> aRecipe[i] = OrePrefixes.plate.get(Materials.Aluminium); + case 3 -> aRecipe[i] = OrePrefixes.plate.get(Materials.StainlessSteel); + case 4 -> aRecipe[i] = OrePrefixes.plate.get(Materials.Titanium); + case 5 -> aRecipe[i] = OrePrefixes.plate.get(Materials.TungstenSteel); + case 6 -> aRecipe[i] = OrePrefixes.plate.get(Materials.HSSG); + case 7 -> aRecipe[i] = OrePrefixes.plate.get(Materials.HSSE); + default -> aRecipe[i] = OrePrefixes.plate.get(Materials.Neutronium); } continue; } if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PIPE) { switch (this.mTier) { - case 0: - case 1: - aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.Bronze); - break; - case 2: - aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.Steel); - break; - case 3: - aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.StainlessSteel); - break; - case 4: - aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.Titanium); - break; - case 5: - aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.TungstenSteel); - break; - case 6: - aRecipe[i] = OrePrefixes.pipeSmall.get(Materials.Ultimate); - break; - case 7: - aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.Ultimate); - break; - case 8: - aRecipe[i] = OrePrefixes.pipeLarge.get(Materials.Ultimate); - break; - default: - aRecipe[i] = OrePrefixes.pipeHuge.get(Materials.Ultimate); - break; + case 0, 1 -> aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.Bronze); + case 2 -> aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.Steel); + case 3 -> aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.StainlessSteel); + case 4 -> aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.Titanium); + case 5 -> aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.TungstenSteel); + case 6 -> aRecipe[i] = OrePrefixes.pipeSmall.get(Materials.Ultimate); + case 7 -> aRecipe[i] = OrePrefixes.pipeMedium.get(Materials.Ultimate); + case 8 -> aRecipe[i] = OrePrefixes.pipeLarge.get(Materials.Ultimate); + default -> aRecipe[i] = OrePrefixes.pipeHuge.get(Materials.Ultimate); } continue; } if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING) { switch (this.mTier) { - case 0: - case 1: - aRecipe[i] = OrePrefixes.wireGt02.get(Materials.AnyCopper); - break; - case 2: - aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Cupronickel); - break; - case 3: - aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Kanthal); - break; - case 4: - aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Nichrome); - break; - case 5: - aRecipe[i] = OrePrefixes.wireGt02.get(Materials.TPV); - break; - case 6: - aRecipe[i] = OrePrefixes.wireGt02.get(Materials.HSSG); - break; - case 7: - aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Naquadah); - break; - case 8: - aRecipe[i] = OrePrefixes.wireGt02.get(Materials.NaquadahAlloy); - break; - case 9: - aRecipe[i] = OrePrefixes.wireGt04.get(Materials.NaquadahAlloy); - break; - default: - aRecipe[i] = OrePrefixes.wireGt08.get(Materials.NaquadahAlloy); - break; + case 0, 1 -> aRecipe[i] = OrePrefixes.wireGt02.get(Materials.AnyCopper); + case 2 -> aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Cupronickel); + case 3 -> aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Kanthal); + case 4 -> aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Nichrome); + case 5 -> aRecipe[i] = OrePrefixes.wireGt02.get(Materials.TPV); + case 6 -> aRecipe[i] = OrePrefixes.wireGt02.get(Materials.HSSG); + case 7 -> aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Naquadah); + case 8 -> aRecipe[i] = OrePrefixes.wireGt02.get(Materials.NaquadahAlloy); + case 9 -> aRecipe[i] = OrePrefixes.wireGt04.get(Materials.NaquadahAlloy); + default -> aRecipe[i] = OrePrefixes.wireGt08.get(Materials.NaquadahAlloy); } continue; } if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_HEATING_DOUBLE) { switch (this.mTier) { - case 0: - case 1: - aRecipe[i] = OrePrefixes.wireGt04.get(Materials.AnyCopper); - break; - case 2: - aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Cupronickel); - break; - case 3: - aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Kanthal); - break; - case 4: - aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Nichrome); - break; - case 5: - aRecipe[i] = OrePrefixes.wireGt04.get(Materials.TPV); - break; - case 6: - aRecipe[i] = OrePrefixes.wireGt04.get(Materials.HSSG); - break; - case 7: - aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Naquadah); - break; - case 8: - aRecipe[i] = OrePrefixes.wireGt04.get(Materials.NaquadahAlloy); - break; - case 9: - aRecipe[i] = OrePrefixes.wireGt08.get(Materials.NaquadahAlloy); - break; - default: - aRecipe[i] = OrePrefixes.wireGt16.get(Materials.NaquadahAlloy); - break; + case 0, 1 -> aRecipe[i] = OrePrefixes.wireGt04.get(Materials.AnyCopper); + case 2 -> aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Cupronickel); + case 3 -> aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Kanthal); + case 4 -> aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Nichrome); + case 5 -> aRecipe[i] = OrePrefixes.wireGt04.get(Materials.TPV); + case 6 -> aRecipe[i] = OrePrefixes.wireGt04.get(Materials.HSSG); + case 7 -> aRecipe[i] = OrePrefixes.wireGt04.get(Materials.Naquadah); + case 8 -> aRecipe[i] = OrePrefixes.wireGt04.get(Materials.NaquadahAlloy); + case 9 -> aRecipe[i] = OrePrefixes.wireGt08.get(Materials.NaquadahAlloy); + default -> aRecipe[i] = OrePrefixes.wireGt16.get(Materials.NaquadahAlloy); } continue; } if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_DISTILLATION) { - switch (this.mTier) { - default: - aRecipe[i] = OrePrefixes.stick.get(Materials.Blaze); - break; - } + aRecipe[i] = OrePrefixes.stick.get(Materials.Blaze); continue; } if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_MAGNETIC) { switch (this.mTier) { - case 0: - case 1: - aRecipe[i] = OrePrefixes.stick.get(Materials.IronMagnetic); - break; - case 2: - case 3: - aRecipe[i] = OrePrefixes.stick.get(Materials.SteelMagnetic); - break; - case 4: - case 5: - aRecipe[i] = OrePrefixes.stick.get(Materials.NeodymiumMagnetic); - break; - case 6: - case 7: - aRecipe[i] = OrePrefixes.stick.get(Materials.SamariumMagnetic); - break; - default: - aRecipe[i] = OrePrefixes.stickLong.get(Materials.SamariumMagnetic); - break; + case 0, 1 -> aRecipe[i] = OrePrefixes.stick.get(Materials.IronMagnetic); + case 2, 3 -> aRecipe[i] = OrePrefixes.stick.get(Materials.SteelMagnetic); + case 4, 5 -> aRecipe[i] = OrePrefixes.stick.get(Materials.NeodymiumMagnetic); + case 6, 7 -> aRecipe[i] = OrePrefixes.stick.get(Materials.SamariumMagnetic); + default -> aRecipe[i] = OrePrefixes.stickLong.get(Materials.SamariumMagnetic); } continue; } if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.STICK_ELECTROMAGNETIC) { switch (this.mTier) { - case 0: - case 1: - aRecipe[i] = OrePrefixes.stick.get(Materials.AnyIron); - break; - case 2: - case 3: - aRecipe[i] = OrePrefixes.stick.get(Materials.Steel); - break; - case 4: - aRecipe[i] = OrePrefixes.stick.get(Materials.Neodymium); - break; - default: - aRecipe[i] = OrePrefixes.stick.get(Materials.VanadiumGallium); - break; + case 0, 1 -> aRecipe[i] = OrePrefixes.stick.get(Materials.AnyIron); + case 2, 3 -> aRecipe[i] = OrePrefixes.stick.get(Materials.Steel); + case 4 -> aRecipe[i] = OrePrefixes.stick.get(Materials.Neodymium); + default -> aRecipe[i] = OrePrefixes.stick.get(Materials.VanadiumGallium); } continue; } if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.COIL_ELECTRIC) { switch (this.mTier) { - case 0: - aRecipe[i] = OrePrefixes.wireGt01.get(Materials.Lead); - break; - case 1: - aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Tin); - break; - case 2: - aRecipe[i] = OrePrefixes.wireGt02.get(Materials.AnyCopper); - break; - case 3: - aRecipe[i] = OrePrefixes.wireGt04.get(Materials.AnyCopper); - break; - case 4: - aRecipe[i] = OrePrefixes.wireGt08.get(Materials.AnnealedCopper); - break; - case 5: - aRecipe[i] = OrePrefixes.wireGt16.get(Materials.AnnealedCopper); - break; - case 6: - aRecipe[i] = OrePrefixes.wireGt04.get(Materials.YttriumBariumCuprate); - break; - case 7: - aRecipe[i] = OrePrefixes.wireGt08.get(Materials.Iridium); - break; - default: - aRecipe[i] = OrePrefixes.wireGt16.get(Materials.Osmium); - break; + case 0 -> aRecipe[i] = OrePrefixes.wireGt01.get(Materials.Lead); + case 1 -> aRecipe[i] = OrePrefixes.wireGt02.get(Materials.Tin); + case 2 -> aRecipe[i] = OrePrefixes.wireGt02.get(Materials.AnyCopper); + case 3 -> aRecipe[i] = OrePrefixes.wireGt04.get(Materials.AnyCopper); + case 4 -> aRecipe[i] = OrePrefixes.wireGt08.get(Materials.AnnealedCopper); + case 5 -> aRecipe[i] = OrePrefixes.wireGt16.get(Materials.AnnealedCopper); + case 6 -> aRecipe[i] = OrePrefixes.wireGt04.get(Materials.YttriumBariumCuprate); + case 7 -> aRecipe[i] = OrePrefixes.wireGt08.get(Materials.Iridium); + default -> aRecipe[i] = OrePrefixes.wireGt16.get(Materials.Osmium); } continue; } if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM) { switch (this.mTier) { - case 0: - case 1: - aRecipe[i] = ItemList.Robot_Arm_LV; - break; - case 2: - aRecipe[i] = ItemList.Robot_Arm_MV; - break; - case 3: - aRecipe[i] = ItemList.Robot_Arm_HV; - break; - case 4: - aRecipe[i] = ItemList.Robot_Arm_EV; - break; - case 5: - aRecipe[i] = ItemList.Robot_Arm_IV; - break; - case 6: - aRecipe[i] = ItemList.Robot_Arm_LuV; - break; - case 7: - aRecipe[i] = ItemList.Robot_Arm_ZPM; - break; - case 8: - aRecipe[i] = ItemList.Robot_Arm_UV; - break; - case 9: - aRecipe[i] = ItemList.Robot_Arm_UHV; - break; - case 10: - aRecipe[i] = ItemList.Robot_Arm_UEV; - break; - case 11: - aRecipe[i] = ItemList.Robot_Arm_UIV; - break; - case 12: - aRecipe[i] = ItemList.Robot_Arm_UMV; - break; - case 13: - aRecipe[i] = ItemList.Robot_Arm_UXV; - break; - case 14: - aRecipe[i] = ItemList.Robot_Arm_MAX; - break; - default: - aRecipe[i] = ItemList.Robot_Arm_MAX; - break; + case 0, 1 -> aRecipe[i] = ItemList.Robot_Arm_LV; + case 2 -> aRecipe[i] = ItemList.Robot_Arm_MV; + case 3 -> aRecipe[i] = ItemList.Robot_Arm_HV; + case 4 -> aRecipe[i] = ItemList.Robot_Arm_EV; + case 5 -> aRecipe[i] = ItemList.Robot_Arm_IV; + case 6 -> aRecipe[i] = ItemList.Robot_Arm_LuV; + case 7 -> aRecipe[i] = ItemList.Robot_Arm_ZPM; + case 8 -> aRecipe[i] = ItemList.Robot_Arm_UV; + case 9 -> aRecipe[i] = ItemList.Robot_Arm_UHV; + case 10 -> aRecipe[i] = ItemList.Robot_Arm_UEV; + case 11 -> aRecipe[i] = ItemList.Robot_Arm_UIV; + case 12 -> aRecipe[i] = ItemList.Robot_Arm_UMV; + case 13 -> aRecipe[i] = ItemList.Robot_Arm_UXV; + case 14 -> aRecipe[i] = ItemList.Robot_Arm_MAX; + default -> aRecipe[i] = ItemList.Robot_Arm_MAX; } continue; } if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PUMP) { switch (this.mTier) { - case 0: - case 1: - aRecipe[i] = ItemList.Electric_Pump_LV; - break; - case 2: - aRecipe[i] = ItemList.Electric_Pump_MV; - break; - case 3: - aRecipe[i] = ItemList.Electric_Pump_HV; - break; - case 4: - aRecipe[i] = ItemList.Electric_Pump_EV; - break; - case 5: - aRecipe[i] = ItemList.Electric_Pump_IV; - break; - case 6: - aRecipe[i] = ItemList.Electric_Pump_LuV; - break; - case 7: - aRecipe[i] = ItemList.Electric_Pump_ZPM; - break; - case 8: - aRecipe[i] = ItemList.Electric_Pump_UV; - break; - case 9: - aRecipe[i] = ItemList.Electric_Pump_UHV; - break; - case 10: - aRecipe[i] = ItemList.Electric_Pump_UEV; - break; - case 11: - aRecipe[i] = ItemList.Electric_Pump_UIV; - break; - case 12: - aRecipe[i] = ItemList.Electric_Pump_UMV; - break; - case 13: - aRecipe[i] = ItemList.Electric_Pump_UXV; - break; - case 14: - aRecipe[i] = ItemList.Electric_Pump_MAX; - break; - default: - aRecipe[i] = ItemList.Electric_Pump_MAX; - break; + case 0, 1 -> aRecipe[i] = ItemList.Electric_Pump_LV; + case 2 -> aRecipe[i] = ItemList.Electric_Pump_MV; + case 3 -> aRecipe[i] = ItemList.Electric_Pump_HV; + case 4 -> aRecipe[i] = ItemList.Electric_Pump_EV; + case 5 -> aRecipe[i] = ItemList.Electric_Pump_IV; + case 6 -> aRecipe[i] = ItemList.Electric_Pump_LuV; + case 7 -> aRecipe[i] = ItemList.Electric_Pump_ZPM; + case 8 -> aRecipe[i] = ItemList.Electric_Pump_UV; + case 9 -> aRecipe[i] = ItemList.Electric_Pump_UHV; + case 10 -> aRecipe[i] = ItemList.Electric_Pump_UEV; + case 11 -> aRecipe[i] = ItemList.Electric_Pump_UIV; + case 12 -> aRecipe[i] = ItemList.Electric_Pump_UMV; + case 13 -> aRecipe[i] = ItemList.Electric_Pump_UXV; + case 14 -> aRecipe[i] = ItemList.Electric_Pump_MAX; + default -> aRecipe[i] = ItemList.Electric_Pump_MAX; } continue; } if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROTOR) { switch (this.mTier) { - case 0: - case 1: - aRecipe[i] = OrePrefixes.rotor.get(Materials.Tin); - break; - case 2: - aRecipe[i] = OrePrefixes.rotor.get(Materials.Bronze); - break; - case 3: - aRecipe[i] = OrePrefixes.rotor.get(Materials.Steel); - break; - case 4: - aRecipe[i] = OrePrefixes.rotor.get(Materials.StainlessSteel); - break; - case 5: - aRecipe[i] = OrePrefixes.rotor.get(Materials.TungstenSteel); - break; - case 6: - aRecipe[i] = OrePrefixes.rotor.get(Materials.Chrome); - break; - case 7: - aRecipe[i] = OrePrefixes.rotor.get(Materials.Iridium); - break; - default: - aRecipe[i] = OrePrefixes.rotor.get(Materials.Osmium); - break; + case 0, 1 -> aRecipe[i] = OrePrefixes.rotor.get(Materials.Tin); + case 2 -> aRecipe[i] = OrePrefixes.rotor.get(Materials.Bronze); + case 3 -> aRecipe[i] = OrePrefixes.rotor.get(Materials.Steel); + case 4 -> aRecipe[i] = OrePrefixes.rotor.get(Materials.StainlessSteel); + case 5 -> aRecipe[i] = OrePrefixes.rotor.get(Materials.TungstenSteel); + case 6 -> aRecipe[i] = OrePrefixes.rotor.get(Materials.Chrome); + case 7 -> aRecipe[i] = OrePrefixes.rotor.get(Materials.Iridium); + default -> aRecipe[i] = OrePrefixes.rotor.get(Materials.Osmium); } continue; } if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.MOTOR) { switch (this.mTier) { - case 0: - case 1: - aRecipe[i] = ItemList.Electric_Motor_LV; - break; - case 2: - aRecipe[i] = ItemList.Electric_Motor_MV; - break; - case 3: - aRecipe[i] = ItemList.Electric_Motor_HV; - break; - case 4: - aRecipe[i] = ItemList.Electric_Motor_EV; - break; - case 5: - aRecipe[i] = ItemList.Electric_Motor_IV; - break; - case 6: - aRecipe[i] = ItemList.Electric_Motor_LuV; - break; - case 7: - aRecipe[i] = ItemList.Electric_Motor_ZPM; - break; - case 8: - aRecipe[i] = ItemList.Electric_Motor_UV; - break; - case 9: - aRecipe[i] = ItemList.Electric_Motor_UHV; - break; - case 10: - aRecipe[i] = ItemList.Electric_Motor_UEV; - break; - case 11: - aRecipe[i] = ItemList.Electric_Motor_UIV; - break; - case 12: - aRecipe[i] = ItemList.Electric_Motor_UMV; - break; - case 13: - aRecipe[i] = ItemList.Electric_Motor_UXV; - break; - case 14: - aRecipe[i] = ItemList.Electric_Motor_MAX; - break; - default: - aRecipe[i] = ItemList.Electric_Motor_MAX; - break; + case 0, 1 -> aRecipe[i] = ItemList.Electric_Motor_LV; + case 2 -> aRecipe[i] = ItemList.Electric_Motor_MV; + case 3 -> aRecipe[i] = ItemList.Electric_Motor_HV; + case 4 -> aRecipe[i] = ItemList.Electric_Motor_EV; + case 5 -> aRecipe[i] = ItemList.Electric_Motor_IV; + case 6 -> aRecipe[i] = ItemList.Electric_Motor_LuV; + case 7 -> aRecipe[i] = ItemList.Electric_Motor_ZPM; + case 8 -> aRecipe[i] = ItemList.Electric_Motor_UV; + case 9 -> aRecipe[i] = ItemList.Electric_Motor_UHV; + case 10 -> aRecipe[i] = ItemList.Electric_Motor_UEV; + case 11 -> aRecipe[i] = ItemList.Electric_Motor_UIV; + case 12 -> aRecipe[i] = ItemList.Electric_Motor_UMV; + case 13 -> aRecipe[i] = ItemList.Electric_Motor_UXV; + case 14 -> aRecipe[i] = ItemList.Electric_Motor_MAX; + default -> aRecipe[i] = ItemList.Electric_Motor_MAX; } continue; } if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.PISTON) { switch (this.mTier) { - case 0: - case 1: - aRecipe[i] = ItemList.Electric_Piston_LV; - break; - case 2: - aRecipe[i] = ItemList.Electric_Piston_MV; - break; - case 3: - aRecipe[i] = ItemList.Electric_Piston_HV; - break; - case 4: - aRecipe[i] = ItemList.Electric_Piston_EV; - break; - case 5: - aRecipe[i] = ItemList.Electric_Piston_IV; - break; - case 6: - aRecipe[i] = ItemList.Electric_Piston_LuV; - break; - case 7: - aRecipe[i] = ItemList.Electric_Piston_ZPM; - break; - case 8: - aRecipe[i] = ItemList.Electric_Piston_UV; - break; - case 9: - aRecipe[i] = ItemList.Electric_Piston_UHV; - break; - case 10: - aRecipe[i] = ItemList.Electric_Piston_UEV; - break; - case 11: - aRecipe[i] = ItemList.Electric_Piston_UIV; - break; - case 12: - aRecipe[i] = ItemList.Electric_Piston_UMV; - break; - case 13: - aRecipe[i] = ItemList.Electric_Piston_UXV; - break; - case 14: - aRecipe[i] = ItemList.Electric_Piston_MAX; - break; - default: - aRecipe[i] = ItemList.Electric_Piston_MAX; - break; + case 0, 1 -> aRecipe[i] = ItemList.Electric_Piston_LV; + case 2 -> aRecipe[i] = ItemList.Electric_Piston_MV; + case 3 -> aRecipe[i] = ItemList.Electric_Piston_HV; + case 4 -> aRecipe[i] = ItemList.Electric_Piston_EV; + case 5 -> aRecipe[i] = ItemList.Electric_Piston_IV; + case 6 -> aRecipe[i] = ItemList.Electric_Piston_LuV; + case 7 -> aRecipe[i] = ItemList.Electric_Piston_ZPM; + case 8 -> aRecipe[i] = ItemList.Electric_Piston_UV; + case 9 -> aRecipe[i] = ItemList.Electric_Piston_UHV; + case 10 -> aRecipe[i] = ItemList.Electric_Piston_UEV; + case 11 -> aRecipe[i] = ItemList.Electric_Piston_UIV; + case 12 -> aRecipe[i] = ItemList.Electric_Piston_UMV; + case 13 -> aRecipe[i] = ItemList.Electric_Piston_UXV; + case 14 -> aRecipe[i] = ItemList.Electric_Piston_MAX; + default -> aRecipe[i] = ItemList.Electric_Piston_MAX; } continue; } if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CONVEYOR) { switch (this.mTier) { - case 0: - case 1: - aRecipe[i] = ItemList.Conveyor_Module_LV; - break; - case 2: - aRecipe[i] = ItemList.Conveyor_Module_MV; - break; - case 3: - aRecipe[i] = ItemList.Conveyor_Module_HV; - break; - case 4: - aRecipe[i] = ItemList.Conveyor_Module_EV; - break; - case 5: - aRecipe[i] = ItemList.Conveyor_Module_IV; - break; - case 6: - aRecipe[i] = ItemList.Conveyor_Module_LuV; - break; - case 7: - aRecipe[i] = ItemList.Conveyor_Module_ZPM; - break; - case 8: - aRecipe[i] = ItemList.Conveyor_Module_UV; - break; - case 9: - aRecipe[i] = ItemList.Conveyor_Module_UHV; - break; - case 10: - aRecipe[i] = ItemList.Conveyor_Module_UEV; - break; - case 11: - aRecipe[i] = ItemList.Conveyor_Module_UIV; - break; - case 12: - aRecipe[i] = ItemList.Conveyor_Module_UMV; - break; - case 13: - aRecipe[i] = ItemList.Conveyor_Module_UXV; - break; - case 14: - aRecipe[i] = ItemList.Conveyor_Module_MAX; - break; - default: - aRecipe[i] = ItemList.Conveyor_Module_MAX; - break; + case 0, 1 -> aRecipe[i] = ItemList.Conveyor_Module_LV; + case 2 -> aRecipe[i] = ItemList.Conveyor_Module_MV; + case 3 -> aRecipe[i] = ItemList.Conveyor_Module_HV; + case 4 -> aRecipe[i] = ItemList.Conveyor_Module_EV; + case 5 -> aRecipe[i] = ItemList.Conveyor_Module_IV; + case 6 -> aRecipe[i] = ItemList.Conveyor_Module_LuV; + case 7 -> aRecipe[i] = ItemList.Conveyor_Module_ZPM; + case 8 -> aRecipe[i] = ItemList.Conveyor_Module_UV; + case 9 -> aRecipe[i] = ItemList.Conveyor_Module_UHV; + case 10 -> aRecipe[i] = ItemList.Conveyor_Module_UEV; + case 11 -> aRecipe[i] = ItemList.Conveyor_Module_UIV; + case 12 -> aRecipe[i] = ItemList.Conveyor_Module_UMV; + case 13 -> aRecipe[i] = ItemList.Conveyor_Module_UXV; + case 14 -> aRecipe[i] = ItemList.Conveyor_Module_MAX; + default -> aRecipe[i] = ItemList.Conveyor_Module_MAX; } continue; } if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.EMITTER) { switch (this.mTier) { - case 0: - case 1: - aRecipe[i] = ItemList.Emitter_LV; - break; - case 2: - aRecipe[i] = ItemList.Emitter_MV; - break; - case 3: - aRecipe[i] = ItemList.Emitter_HV; - break; - case 4: - aRecipe[i] = ItemList.Emitter_EV; - break; - case 5: - aRecipe[i] = ItemList.Emitter_IV; - break; - case 6: - aRecipe[i] = ItemList.Emitter_LuV; - break; - case 7: - aRecipe[i] = ItemList.Emitter_ZPM; - break; - case 8: - aRecipe[i] = ItemList.Emitter_UV; - break; - case 9: - aRecipe[i] = ItemList.Emitter_UHV; - break; - case 10: - aRecipe[i] = ItemList.Emitter_UEV; - break; - case 11: - aRecipe[i] = ItemList.Emitter_UIV; - break; - case 12: - aRecipe[i] = ItemList.Emitter_UMV; - break; - case 13: - aRecipe[i] = ItemList.Emitter_UXV; - break; - case 14: - aRecipe[i] = ItemList.Emitter_MAX; - break; - default: - aRecipe[i] = ItemList.Emitter_MAX; - break; + case 0, 1 -> aRecipe[i] = ItemList.Emitter_LV; + case 2 -> aRecipe[i] = ItemList.Emitter_MV; + case 3 -> aRecipe[i] = ItemList.Emitter_HV; + case 4 -> aRecipe[i] = ItemList.Emitter_EV; + case 5 -> aRecipe[i] = ItemList.Emitter_IV; + case 6 -> aRecipe[i] = ItemList.Emitter_LuV; + case 7 -> aRecipe[i] = ItemList.Emitter_ZPM; + case 8 -> aRecipe[i] = ItemList.Emitter_UV; + case 9 -> aRecipe[i] = ItemList.Emitter_UHV; + case 10 -> aRecipe[i] = ItemList.Emitter_UEV; + case 11 -> aRecipe[i] = ItemList.Emitter_UIV; + case 12 -> aRecipe[i] = ItemList.Emitter_UMV; + case 13 -> aRecipe[i] = ItemList.Emitter_UXV; + case 14 -> aRecipe[i] = ItemList.Emitter_MAX; + default -> aRecipe[i] = ItemList.Emitter_MAX; } continue; } if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.SENSOR) { switch (this.mTier) { - case 0: - case 1: - aRecipe[i] = ItemList.Sensor_LV; - break; - case 2: - aRecipe[i] = ItemList.Sensor_MV; - break; - case 3: - aRecipe[i] = ItemList.Sensor_HV; - break; - case 4: - aRecipe[i] = ItemList.Sensor_EV; - break; - case 5: - aRecipe[i] = ItemList.Sensor_IV; - break; - case 6: - aRecipe[i] = ItemList.Sensor_LuV; - break; - case 7: - aRecipe[i] = ItemList.Sensor_ZPM; - break; - case 8: - aRecipe[i] = ItemList.Sensor_UV; - break; - case 9: - aRecipe[i] = ItemList.Sensor_UHV; - break; - case 10: - aRecipe[i] = ItemList.Sensor_UEV; - break; - case 11: - aRecipe[i] = ItemList.Sensor_UIV; - break; - case 12: - aRecipe[i] = ItemList.Sensor_UMV; - break; - case 13: - aRecipe[i] = ItemList.Sensor_UXV; - break; - case 14: - aRecipe[i] = ItemList.Sensor_MAX; - break; - default: - aRecipe[i] = ItemList.Sensor_MAX; - break; + case 0, 1 -> aRecipe[i] = ItemList.Sensor_LV; + case 2 -> aRecipe[i] = ItemList.Sensor_MV; + case 3 -> aRecipe[i] = ItemList.Sensor_HV; + case 4 -> aRecipe[i] = ItemList.Sensor_EV; + case 5 -> aRecipe[i] = ItemList.Sensor_IV; + case 6 -> aRecipe[i] = ItemList.Sensor_LuV; + case 7 -> aRecipe[i] = ItemList.Sensor_ZPM; + case 8 -> aRecipe[i] = ItemList.Sensor_UV; + case 9 -> aRecipe[i] = ItemList.Sensor_UHV; + case 10 -> aRecipe[i] = ItemList.Sensor_UEV; + case 11 -> aRecipe[i] = ItemList.Sensor_UIV; + case 12 -> aRecipe[i] = ItemList.Sensor_UMV; + case 13 -> aRecipe[i] = ItemList.Sensor_UXV; + case 14 -> aRecipe[i] = ItemList.Sensor_MAX; + default -> aRecipe[i] = ItemList.Sensor_MAX; } continue; } if (aRecipe[i] == GT_MetaTileEntity_BasicMachine_GT_Recipe.X.FIELD_GENERATOR) { switch (this.mTier) { - case 0: - case 1: - aRecipe[i] = ItemList.Field_Generator_LV; - break; - case 2: - aRecipe[i] = ItemList.Field_Generator_MV; - break; - case 3: - aRecipe[i] = ItemList.Field_Generator_HV; - break; - case 4: - aRecipe[i] = ItemList.Field_Generator_EV; - break; - case 5: - aRecipe[i] = ItemList.Field_Generator_IV; - break; - case 6: - aRecipe[i] = ItemList.Field_Generator_LuV; - break; - case 7: - aRecipe[i] = ItemList.Field_Generator_ZPM; - break; - case 8: - aRecipe[i] = ItemList.Field_Generator_UV; - break; - case 9: - aRecipe[i] = ItemList.Field_Generator_UHV; - break; - case 10: - aRecipe[i] = ItemList.Field_Generator_UEV; - break; - case 11: - aRecipe[i] = ItemList.Field_Generator_UIV; - break; - case 12: - aRecipe[i] = ItemList.Field_Generator_UMV; - break; - case 13: - aRecipe[i] = ItemList.Field_Generator_UXV; - break; - case 14: - aRecipe[i] = ItemList.Field_Generator_MAX; - break; - default: - aRecipe[i] = ItemList.Field_Generator_MAX; - break; + case 0, 1 -> aRecipe[i] = ItemList.Field_Generator_LV; + case 2 -> aRecipe[i] = ItemList.Field_Generator_MV; + case 3 -> aRecipe[i] = ItemList.Field_Generator_HV; + case 4 -> aRecipe[i] = ItemList.Field_Generator_EV; + case 5 -> aRecipe[i] = ItemList.Field_Generator_IV; + case 6 -> aRecipe[i] = ItemList.Field_Generator_LuV; + case 7 -> aRecipe[i] = ItemList.Field_Generator_ZPM; + case 8 -> aRecipe[i] = ItemList.Field_Generator_UV; + case 9 -> aRecipe[i] = ItemList.Field_Generator_UHV; + case 10 -> aRecipe[i] = ItemList.Field_Generator_UEV; + case 11 -> aRecipe[i] = ItemList.Field_Generator_UIV; + case 12 -> aRecipe[i] = ItemList.Field_Generator_UMV; + case 13 -> aRecipe[i] = ItemList.Field_Generator_UXV; + case 14 -> aRecipe[i] = ItemList.Field_Generator_MAX; + default -> aRecipe[i] = ItemList.Field_Generator_MAX; } continue; } @@ -1063,9 +673,10 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ ItemStack aStack) { if (!super.allowPutStackValidated(aBaseMetaTileEntity, aIndex, aSide, aStack)) return false; switch (this.mInputSlotCount) { - case 0: + case 0 -> { return false; - case 1: + } + case 1 -> { if (this.getFillableStack() == null) return !this.mRequiresFluidForFiltering && this.getRecipeList() .containsInput( aStack); @@ -1080,7 +691,8 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ this.getSpecialSlot(), appendSelectedCircuit(aStack)) != null; - case 2: + } + case 2 -> { return (!this.mRequiresFluidForFiltering || this.getFillableStack() != null) && (((this.getInputAt(0) != null && this.getInputAt(1) != null) || (this.getInputAt(0) == null && this.getInputAt(1) == null ? this.getRecipeList() @@ -1100,17 +712,18 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ ? appendSelectedCircuit(aStack, this.getInputAt(1)) : appendSelectedCircuit(this.getInputAt(0), aStack)) != null)))); - default: { + } + default -> { int tID = this.getBaseMetaTileEntity() .getMetaTileID(); if (tID >= 211 && tID <= 218 || tID >= 1180 && tID <= 1187 || tID >= 10780 && tID <= 10786) { // assembler - // lv-iv; - // circuit - // asseblers - // lv - - // uv; - // assemblers - // luv-uev + // lv-iv; + // circuit + // asseblers + // lv - + // uv; + // assemblers + // luv-uev if (GT_Utility.isStackValid(aStack)) for (int oreID : OreDictionary.getOreIDs(aStack)) { if (OreDictionary.getOreName(oreID) .startsWith("circuit")) @@ -1134,34 +747,26 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ if (aBaseMetaTileEntity.isClientSide() && aBaseMetaTileEntity.isActive()) { // noinspection SwitchStatementWithTooFewBranches switch (this.mSpecialEffect) { - case TOP_SMOKE: + case TOP_SMOKE -> { final byte topFacing = (byte) ForgeDirection.UP.ordinal(); - if (aBaseMetaTileEntity.getFrontFacing() != topFacing && aBaseMetaTileEntity.getCoverIDAtSide(topFacing) == 0 && !aBaseMetaTileEntity.getOpacityAtSide(topFacing)) { - new WorldSpawnedEventBuilder.ParticleEventBuilder().setMotion(0.0D, 0.0D, 0.0D) - .setIdentifier(ParticleFX.SMOKE) - .setPosition( - aBaseMetaTileEntity.getXCoord() - + 0.8F - - XSTR_INSTANCE.nextFloat() - * 0.6F, - aBaseMetaTileEntity.getYCoord() - + 0.9F - + XSTR_INSTANCE.nextFloat() - * 0.2F, - aBaseMetaTileEntity.getZCoord() - + 0.8F - - XSTR_INSTANCE.nextFloat() - * 0.6F) - .setWorld(aBaseMetaTileEntity.getWorld()) - .run(); + new ParticleEventBuilder().setMotion(0.0D, 0.0D, 0.0D) + .setIdentifier(ParticleFX.SMOKE) + .setPosition( + aBaseMetaTileEntity.getXCoord() + 0.8F + - XSTR_INSTANCE.nextFloat() * 0.6F, + aBaseMetaTileEntity.getYCoord() + 0.9F + + XSTR_INSTANCE.nextFloat() * 0.2F, + aBaseMetaTileEntity.getZCoord() + 0.8F + - XSTR_INSTANCE.nextFloat() * 0.6F) + .setWorld(aBaseMetaTileEntity.getWorld()) + .run(); } - break; - default: - break; + } + default -> {} } } } @@ -1177,7 +782,7 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ // noinspection SwitchStatementWithTooFewBranches switch (this.mSpecialEffect) { - case MAIN_RANDOM_SPARKS: + case MAIN_RANDOM_SPARKS -> { // Random Sparkles at main face if (aBaseMetaTileEntity.isActive() && XSTR_INSTANCE.nextInt(3) == 0) { @@ -1227,9 +832,8 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ .run(); } } - break; - default: - break; + } + default -> {} } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java index 1138b0a51d..1b451f3108 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Buffer.java @@ -105,57 +105,63 @@ public abstract class GT_MetaTileEntity_Buffer extends GT_MetaTileEntity_TieredM if (side == facing) return mTextures[FRONT_INDEX][colorIndex]; if (ForgeDirection.OPPOSITES[aSide] == aFacing) return mTextures[OUTPUT_INDEX][colorIndex]; switch (facing) { - case DOWN: + case DOWN -> { return mTextures[ARROW_UP_INDEX][colorIndex]; // ARROW_UP - case UP: + } + case UP -> { return mTextures[ARROW_DOWN_INDEX][colorIndex]; // ARROW_DOWN - case NORTH: + } + case NORTH -> { switch (side) { - case DOWN: - case UP: + case DOWN, UP -> { return mTextures[ARROW_DOWN_INDEX][colorIndex]; // ARROW_DOWN - case WEST: + } + case WEST -> { return mTextures[ARROW_RIGHT_INDEX][colorIndex]; // ARROW_RIGHT - case EAST: + } + case EAST -> { return mTextures[ARROW_LEFT_INDEX][colorIndex]; // ARROW_LEFT - default: + } + default -> {} } - break; - case SOUTH: + } + case SOUTH -> { switch (side) { - case DOWN: - case UP: + case DOWN, UP -> { return mTextures[ARROW_UP_INDEX][colorIndex]; // ARROW_UP - case WEST: + } + case WEST -> { return mTextures[ARROW_LEFT_INDEX][colorIndex]; // ARROW_LEFT - case EAST: + } + case EAST -> { return mTextures[ARROW_RIGHT_INDEX][colorIndex]; // ARROW_RIGHT - default: + } + default -> {} } - break; - case WEST: + } + case WEST -> { switch (side) { - case UP: - case SOUTH: + case UP, SOUTH -> { return mTextures[ARROW_RIGHT_INDEX][colorIndex]; // ARROW_RIGHT - case DOWN: - case NORTH: + } + case DOWN, NORTH -> { return mTextures[ARROW_LEFT_INDEX][colorIndex]; // ARROW_LEFT - default: + } + default -> {} } - break; - case EAST: + } + case EAST -> { switch (side) { - case UP: - case SOUTH: + case UP, SOUTH -> { return mTextures[ARROW_LEFT_INDEX][colorIndex]; // ARROW_LEFT - case DOWN: - case NORTH: + } + case DOWN, NORTH -> { return mTextures[ARROW_RIGHT_INDEX][colorIndex]; // ARROW_RIGHT - default: + } + default -> {} } - break; - default: + } + default -> {} } return mTextures[FRONT_INDEX][colorIndex]; } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java index d9c32911b7..700732f033 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_CubicMultiBlockBase.java @@ -39,7 +39,7 @@ public abstract class GT_MetaTileEntity_CubicMultiBlockBase<T extends GT_MetaTil extends GT_MetaTileEntity_EnhancedMultiBlockBase<T> implements ISurvivalConstructable { protected static final String STRUCTURE_PIECE_MAIN = "main"; - protected static final ClassValue<IStructureDefinition<GT_MetaTileEntity_CubicMultiBlockBase<?>>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_CubicMultiBlockBase<?>>>() { + protected static final ClassValue<IStructureDefinition<GT_MetaTileEntity_CubicMultiBlockBase<?>>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<GT_MetaTileEntity_CubicMultiBlockBase<?>> computeValue(Class<?> type) { diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java index cfc1ce6558..99b5c6c550 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java @@ -192,7 +192,7 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T extends GT + StatCollector.translateToLocal("GT5U.multiblock.efficiency") + ": " + EnumChatFormatting.YELLOW - + Float.toString(mEfficiency / 100.0F) + + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", /* 6 */ StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java index fc6dce9e70..9adc250f73 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DataAccess.java @@ -143,19 +143,16 @@ public class GT_MetaTileEntity_Hatch_DataAccess extends GT_MetaTileEntity_Hatch @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - switch (mTier) { - case 4: - getBaseMetaTileEntity().add2by2Slots( - builder, - getGUITextureSet().getItemSlot(), - GT_UITextures.OVERLAY_SLOT_CIRCUIT); - break; - default: - getBaseMetaTileEntity().add4by4Slots( - builder, - getGUITextureSet().getItemSlot(), - GT_UITextures.OVERLAY_SLOT_CIRCUIT); - break; + if (mTier == 4) { + getBaseMetaTileEntity().add2by2Slots( + builder, + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_CIRCUIT); + } else { + getBaseMetaTileEntity().add4by4Slots( + builder, + getGUITextureSet().getItemSlot(), + GT_UITextures.OVERLAY_SLOT_CIRCUIT); } } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java index 42abf4839b..a9235ba430 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBus.java @@ -269,18 +269,10 @@ public class GT_MetaTileEntity_Hatch_InputBus extends GT_MetaTileEntity_Hatch @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { switch (mTier) { - case 0: - getBaseMetaTileEntity().add1by1Slot(builder); - break; - case 1: - getBaseMetaTileEntity().add2by2Slots(builder); - break; - case 2: - getBaseMetaTileEntity().add3by3Slots(builder); - break; - default: - getBaseMetaTileEntity().add4by4Slots(builder); - break; + case 0 -> getBaseMetaTileEntity().add1by1Slot(builder); + case 1 -> getBaseMetaTileEntity().add2by2Slots(builder); + case 2 -> getBaseMetaTileEntity().add3by3Slots(builder); + default -> getBaseMetaTileEntity().add4by4Slots(builder); } } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java index d380baf8ed..a2d30a9d72 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java @@ -280,8 +280,7 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch getBaseMetaTileEntity().setActive(false); aStack.stackSize--; } - if (mSolderingTool && aPlayer instanceof EntityPlayerMP) { - EntityPlayerMP tPlayer = (EntityPlayerMP) aPlayer; + if (mSolderingTool && aPlayer instanceof EntityPlayerMP tPlayer) { try { GT_Mod.achievements.issueAchievement(tPlayer, "maintainance"); } catch (Exception ignored) {} diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java index 4a8e745a25..b55350a97e 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java @@ -252,39 +252,39 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch impl } final String inBrackets; switch (mMode) { - case 0: + case 0 -> { GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("108", "Outputs misc. Fluids, Steam and Items")); this.setLockedFluidName(null); - break; - case 1: + } + case 1 -> { GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("109", "Outputs Steam and Items")); this.setLockedFluidName(null); - break; - case 2: + } + case 2 -> { GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("110", "Outputs Steam and misc. Fluids")); this.setLockedFluidName(null); - break; - case 3: + } + case 3 -> { GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("111", "Outputs Steam")); this.setLockedFluidName(null); - break; - case 4: + } + case 4 -> { GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("112", "Outputs misc. Fluids and Items")); this.setLockedFluidName(null); - break; - case 5: + } + case 5 -> { GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("113", "Outputs only Items")); this.setLockedFluidName(null); - break; - case 6: + } + case 6 -> { GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("114", "Outputs only misc. Fluids")); this.setLockedFluidName(null); - break; - case 7: + } + case 7 -> { GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("115", "Outputs nothing")); this.setLockedFluidName(null); - break; - case 8: + } + case 8 -> { playerThatLockedfluid = new WeakReference<>(aPlayer); if (mFluid == null) { this.setLockedFluidName(null); @@ -305,8 +305,8 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch impl "%s (%s)", GT_Utility.trans("151.1", "Outputs items and 1 specific Fluid"), inBrackets)); - break; - case 9: + } + case 9 -> { playerThatLockedfluid = new WeakReference<>(aPlayer); if (mFluid == null) { this.setLockedFluidName(null); @@ -324,7 +324,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch impl GT_Utility.sendChatToPlayer( aPlayer, String.format("%s (%s)", GT_Utility.trans("151.2", "Outputs 1 specific Fluid"), inBrackets)); - break; + } } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java index c970b64cb9..633d82566c 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java @@ -113,7 +113,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch i /** * Attempt to store as many items as possible into the internal inventory of this output bus. If you need atomicity * you should use {@link gregtech.api.interfaces.tileentity.IHasInventory#addStackToSlot(int, ItemStack)} - * + * * @param aStack Assume valid. Will be mutated. Take over the ownership. Caller should not retain a reference to * this stack if the call returns true. * @return true if stack is fully accepted. false is stack is partially accepted or nothing is accepted @@ -193,18 +193,10 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch i @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { switch (mTier) { - case 0: - getBaseMetaTileEntity().add1by1Slot(builder); - break; - case 1: - getBaseMetaTileEntity().add2by2Slots(builder); - break; - case 2: - getBaseMetaTileEntity().add3by3Slots(builder); - break; - default: - getBaseMetaTileEntity().add4by4Slots(builder); - break; + case 0 -> getBaseMetaTileEntity().add1by1Slot(builder); + case 1 -> getBaseMetaTileEntity().add2by2Slots(builder); + case 2 -> getBaseMetaTileEntity().add3by3Slots(builder); + default -> getBaseMetaTileEntity().add4by4Slots(builder); } } } diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index d2083fc87c..e26029b629 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -513,13 +513,17 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity public void doSound(byte aIndex, double aX, double aY, double aZ) { super.doSound(aIndex, aX, aY, aZ); switch (aIndex) { - case PROCESS_START_SOUND_INDEX: + case PROCESS_START_SOUND_INDEX -> { if (getProcessStartSound() != null) GT_Utility.doSoundAtClient(getProcessStartSound(), getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ); - break; - case INTERRUPT_SOUND_INDEX: - GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_INTERRUPT_ONE, 100, 1.0F, aX, aY, aZ); - break; + } + case INTERRUPT_SOUND_INDEX -> GT_Utility.doSoundAtClient( + SoundResource.IC2_MACHINES_INTERRUPT_ONE, + 100, + 1.0F, + aX, + aY, + aZ); } } @@ -678,24 +682,12 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity mRuntime = 0; if (getBaseMetaTileEntity().getRandomNumber(6000) == 0) { switch (getBaseMetaTileEntity().getRandomNumber(6)) { - case 0: - mWrench = false; - break; - case 1: - mScrewdriver = false; - break; - case 2: - mSoftHammer = false; - break; - case 3: - mHardHammer = false; - break; - case 4: - mSolderingTool = false; - break; - case 5: - mCrowbar = false; - break; + case 0 -> mWrench = false; + case 1 -> mScrewdriver = false; + case 2 -> mSoftHammer = false; + case 3 -> mHardHammer = false; + case 4 -> mSolderingTool = false; + case 5 -> mCrowbar = false; } } if (mInventory[1] != null && getBaseMetaTileEntity().getRandomNumber(2) == 0 @@ -1184,9 +1176,8 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity if (aTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch hatch && GT_ExoticEnergyInputHelper.isExoticEnergyInput(aMetaTileEntity)) { - GT_MetaTileEntity_Hatch hatch = (GT_MetaTileEntity_Hatch) aMetaTileEntity; hatch.updateTexture(aBaseCasingIndex); return mExoticEnergyHatches.add(hatch); } @@ -1333,7 +1324,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity + StatCollector.translateToLocal("GT5U.multiblock.efficiency") + ": " + EnumChatFormatting.YELLOW - + Float.toString(mEfficiency / 100.0F) + + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", /* 6 */ StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java index cb98e202ad..c7b9c66b70 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java @@ -179,7 +179,7 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi ForgeDirection.getOrientation(GT_Utility.getOppositeSide(i)), 1, true) == 1) { - long tEU = (long) ((IEnergyProvider) tTileEntity).extractEnergy( + long tEU = ((IEnergyProvider) tTileEntity).extractEnergy( ForgeDirection.getOrientation(GT_Utility.getOppositeSide(i)), GT_Utility.safeInt(maxEUInput() * 100L / GregTech_API.mRFtoEU), false); @@ -187,7 +187,7 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi aBaseMetaTileEntity.injectEnergyUnits((byte) 6, Math.min(tEU, maxEUInput()), 1); } else if (tTileEntity instanceof IEnergyStorage && ((IEnergyStorage) tTileEntity).extractEnergy(1, true) == 1) { - long tEU = (long) ((IEnergyStorage) tTileEntity).extractEnergy( + long tEU = ((IEnergyStorage) tTileEntity).extractEnergy( GT_Utility.safeInt(maxEUInput() * 100L / GregTech_API.mRFtoEU), false); tEU = tEU * GregTech_API.mRFtoEU / 100; diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java index 81997c1e76..2e6bdca647 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java @@ -243,8 +243,8 @@ public class MultiTileEntityBlock extends Block @Override @SuppressWarnings("unchecked") - public final void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB aAABB, List aList, - Entity aEntity) { + public final void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB aAABB, + List<AxisAlignedBB> aList, Entity aEntity) { final TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (aTileEntity instanceof IMultiTileEntity) ((IMultiTileEntity) aTileEntity).addCollisionBoxesToList(aAABB, aList, aEntity); @@ -444,9 +444,8 @@ public class MultiTileEntityBlock extends Block @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(); @@ -469,9 +468,8 @@ public class MultiTileEntityBlock extends Block @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(); @@ -518,7 +516,7 @@ public class MultiTileEntityBlock extends Block } @Override - public final void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List aList) { + public final void getSubBlocks(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) { /**/ } diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlockInternal.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlockInternal.java index 690430b673..91855aae55 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlockInternal.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityBlockInternal.java @@ -74,7 +74,7 @@ public class MultiTileEntityBlockInternal extends Block implements IRenderedBloc // TileEntity should not refresh yet! -Greg ((IMultiTileEntity) aMTEContainer.mTileEntity).setShouldRefresh(false); // Fake-Set the TileEntity first, bypassing a lot of checks. -Greg - setTileEntity(aWorld, aX, aY, aZ, (TileEntity) aMTEContainer.mTileEntity, false); + setTileEntity(aWorld, aX, aY, aZ, aMTEContainer.mTileEntity, false); // Now set the Block with the REAL MetaData. -Greg setTileEntity(aWorld, aX, aY, aZ, aMTEContainer.mBlock, aMTEContainer.mBlockMetaData, 0, false); // When the TileEntity is set now it SHOULD refresh! -Greg @@ -85,7 +85,7 @@ public class MultiTileEntityBlockInternal extends Block implements IRenderedBloc return false; } // And finally properly set the TileEntity for real! -Greg - setTileEntity(aWorld, aX, aY, aZ, (TileEntity) aMTEContainer.mTileEntity, aCauseBlockUpdates); + setTileEntity(aWorld, aX, aY, aZ, aMTEContainer.mTileEntity, aCauseBlockUpdates); // Yep, all this just to set one Block and its TileEntity properly... -Greg try { diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityItemInternal.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityItemInternal.java index 23ad00dabd..1f3c2dd5ca 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityItemInternal.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityItemInternal.java @@ -49,7 +49,7 @@ public class MultiTileEntityItemInternal extends ItemBlock implements IFluidCont @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) { final MultiTileEntityContainer tTileEntityContainer = mBlock.mMultiTileEntityRegistry.getNewTileEntityContainer( aStack); if (tTileEntityContainer == null) { @@ -71,7 +71,7 @@ public class MultiTileEntityItemInternal extends ItemBlock implements IFluidCont @Override @SideOnly(Side.CLIENT) @SuppressWarnings("unchecked") - public void getSubItems(Item aItem, CreativeTabs aTab, List aList) { + public void getSubItems(Item aItem, CreativeTabs aTab, List<ItemStack> aList) { for (MultiTileEntityClassContainer tClass : mBlock.mMultiTileEntityRegistry.mRegistrations) { if (!tClass.mHidden) { if (((IMultiTileEntity) tClass.mCanonicalTileEntity).getSubItems( diff --git a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java index 56414dfb4e..1aeed1b3de 100644 --- a/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java +++ b/src/main/java/gregtech/api/multitileentity/MultiTileEntityRegistry.java @@ -219,7 +219,7 @@ public class MultiTileEntityRegistry { public TileEntity getNewTileEntity(int aID) { final MultiTileEntityContainer tContainer = getNewTileEntityContainer(null, 0, 0, 0, aID, null); - return tContainer == null ? null : (TileEntity) tContainer.mTileEntity; + return tContainer == null ? null : tContainer.mTileEntity; } public MultiTileEntityContainer getNewTileEntityContainer(World aWorld, int aX, int aY, int aZ, int aID, diff --git a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java index 8d96ff58f5..740496a8b6 100644 --- a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java +++ b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java @@ -451,7 +451,7 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl /** * Runs only on server side - * + * * @param tick The current tick of the machine */ protected void runMachine(long tick) { @@ -483,7 +483,7 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl /** * Runs only on server side - * + * * @param tick The current tick of the machine */ protected void runningTick(long tick) { @@ -569,13 +569,17 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl public void doSound(byte aIndex, double aX, double aY, double aZ) { switch (aIndex) { - case PROCESS_START_SOUND_INDEX: + case PROCESS_START_SOUND_INDEX -> { if (getProcessStartSound() != null) GT_Utility.doSoundAtClient(getProcessStartSound(), getTimeBetweenProcessSounds(), 1.0F, aX, aY, aZ); - break; - case INTERRUPT_SOUND_INDEX: - GT_Utility.doSoundAtClient(SoundResource.IC2_MACHINES_INTERRUPT_ONE, 100, 1.0F, aX, aY, aZ); - break; + } + case INTERRUPT_SOUND_INDEX -> GT_Utility.doSoundAtClient( + SoundResource.IC2_MACHINES_INTERRUPT_ONE, + 100, + 1.0F, + aX, + aY, + aZ); } } @@ -854,7 +858,7 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl this.soundEventValue = soundEventValue; if (isClientSide()) { switch (soundEventValue) { - case PROCESS_START_SOUND_INDEX: + case PROCESS_START_SOUND_INDEX -> { if (getProcessStartSound() != null) GT_Utility.doSoundAtClient( getProcessStartSound(), getTimeBetweenProcessSounds(), @@ -862,16 +866,14 @@ public abstract class MultiTileBasicMachine extends TickableMultiTileEntity impl getXCoord(), getYCoord(), getZCoord()); - break; - case INTERRUPT_SOUND_INDEX: - GT_Utility.doSoundAtClient( - SoundResource.IC2_MACHINES_INTERRUPT_ONE, - 100, - 1.0F, - getXCoord(), - getYCoord(), - getZCoord()); - break; + } + case INTERRUPT_SOUND_INDEX -> GT_Utility.doSoundAtClient( + SoundResource.IC2_MACHINES_INTERRUPT_ONE, + 100, + 1.0F, + getXCoord(), + getYCoord(), + getZCoord()); } } } diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockController.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockController.java index 72e766d54c..b76dc1b4bc 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockController.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockController.java @@ -656,9 +656,8 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex @Override public boolean check(S t, World world, int x, int y, int z) { final TileEntity tileEntity = world.getTileEntity(x, y, z); - if (!(tileEntity instanceof MultiBlockPart)) return false; + if (!(tileEntity instanceof MultiBlockPart part)) return false; - final MultiBlockPart part = (MultiBlockPart) tileEntity; if (registryID != part.getMultiTileEntityRegistryID() || meta != part.getMultiTileEntityID()) return false; @@ -974,7 +973,7 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex if (tInv == null) return false; final int tSlot = tInv.getRight(); - final IItemHandlerModifiable inv = tInv.getLeft();; + final IItemHandlerModifiable inv = tInv.getLeft(); return inv.getStackInSlot(tSlot) == null || GT_Utility.areStacksEqual(aStack, inv.getStackInSlot(tSlot)); // && // allowPutStack(getBaseMetaTileEntity(), @@ -1441,7 +1440,7 @@ public abstract class MultiBlockController<T extends MultiBlockController<T>> ex buttons.setSize(16, 167) .setPos(7, 86); buttons.addChild(createPowerSwitchButton()) - .addChild(new FakeSyncWidget.BooleanSyncer(() -> isAllowedToWork(), val -> { + .addChild(new FakeSyncWidget.BooleanSyncer(this::isAllowedToWork, val -> { if (val) enableWorking(); else disableWorking(); })) diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java index 0ea8cd77c8..953fc42f56 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java @@ -674,18 +674,16 @@ public abstract class MultiBlockPart extends NonTickableMultiTileEntity DropDownWidget dropDown = new DropDownWidget(); dropDown.addDropDownItemsSimple( controller.getInventoryNames(this), - (buttonWidget, index, label, setSelected) -> { - buttonWidget.setOnClick((clickData, widget) -> { - if (getNameOfInventoryFromIndex(controller, index).equals("all")) { - mLockedInventory = GT_Values.E; - mLockedInventoryIndex = 0; - } else { - mLockedInventory = getNameOfInventoryFromIndex(controller, index); - mLockedInventoryIndex = index; - } - setSelected.run(); - }); - }, + (buttonWidget, index, label, setSelected) -> buttonWidget.setOnClick((clickData, widget) -> { + if (getNameOfInventoryFromIndex(controller, index).equals("all")) { + mLockedInventory = GT_Values.E; + mLockedInventoryIndex = 0; + } else { + mLockedInventory = getNameOfInventoryFromIndex(controller, index); + mLockedInventoryIndex = index; + } + setSelected.run(); + }), true); builder.widget( dropDown.setSelected(mLockedInventoryIndex) diff --git a/src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java b/src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java index dbc72042a3..bf1a7e4af7 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java +++ b/src/main/java/gregtech/api/net/GT_Packet_GtTileEntityGuiRequest.java @@ -88,9 +88,8 @@ public class GT_Packet_GtTileEntityGuiRequest extends GT_Packet_New { final World world = DimensionManager.getWorld(this.dimId); if (world == null) return; final TileEntity tile = world.getTileEntity(this.mX, this.mY, this.mZ); - if (!(tile instanceof BaseTileEntity) || ((BaseTileEntity) tile).isDead()) return; + if (!(tile instanceof BaseTileEntity baseTile) || ((BaseTileEntity) tile).isDead()) return; - final BaseTileEntity baseTile = ((BaseTileEntity) tile); final EntityPlayerMP player = (EntityPlayerMP) world.getEntityByID(playerId); final CoverableTileEntity coverableTile = (baseTile instanceof CoverableTileEntity) ? (CoverableTileEntity) baseTile diff --git a/src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java b/src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java index 98f6f11aec..b31355adad 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java +++ b/src/main/java/gregtech/api/net/GT_Packet_MultiTileEntity.java @@ -100,7 +100,7 @@ public class GT_Packet_MultiTileEntity extends GT_Packet_New { } /** - * + * * @param boolToSync each bit of the integer will be a boolean. */ public void setBooleans(int boolToSync) { @@ -213,11 +213,13 @@ public class GT_Packet_MultiTileEntity extends GT_Packet_New { } if ((packetFeatures & INVENTORY_NAME) == INVENTORY_NAME) { int tLength = aData.readInt(); - String tName = ""; + String tName; if (tLength > 0) { + StringBuilder tNameBuilder = new StringBuilder(); for (int i = 0; i < tLength; i++) { - tName += aData.readChar(); + tNameBuilder.append(aData.readChar()); } + tName = tNameBuilder.toString(); } else { tName = null; } @@ -241,8 +243,7 @@ public class GT_Packet_MultiTileEntity extends GT_Packet_New { final TileEntity tTileEntity = aWorld.getTileEntity(mX, mY, mZ); try { final Block tBlock = aWorld.getBlock(mX, mY, mZ); - if (tBlock instanceof MultiTileEntityBlock) { - final MultiTileEntityBlock mteBlock = (MultiTileEntityBlock) tBlock; + if (tBlock instanceof MultiTileEntityBlock mteBlock) { final IMultiTileEntity mte = mteBlock.receiveMultiTileEntityData(aWorld, mX, mY, mZ, mRID, mID); if (mte == null) return; mte.receiveClientEvent(GregTechTileClientEvents.CHANGE_COMMON_DATA, mCommonData); @@ -255,8 +256,7 @@ public class GT_Packet_MultiTileEntity extends GT_Packet_New { mte.receiveClientEvent(GregTechTileClientEvents.CHANGE_REDSTONE_OUTPUT, mRedstone); } - if ((features & MODES) == MODES && mte instanceof IMultiTileEntity.IMTE_HasModes) { - final IMultiTileEntity.IMTE_HasModes mteModes = (IMultiTileEntity.IMTE_HasModes) mte; + if ((features & MODES) == MODES && mte instanceof IMultiTileEntity.IMTE_HasModes mteModes) { mteModes.setMode(mMode); mteModes.setAllowedModes(mAllowedModes); } @@ -271,8 +271,7 @@ public class GT_Packet_MultiTileEntity extends GT_Packet_New { mtePart.setLockedInventoryIndex(mLockedInventoryIndex); } - if ((features & INVENTORY_NAME) == INVENTORY_NAME && mte instanceof InventoryUpgrade) { - final InventoryUpgrade invUpg = (InventoryUpgrade) mte; + if ((features & INVENTORY_NAME) == INVENTORY_NAME && mte instanceof InventoryUpgrade invUpg) { invUpg.setInventoryName(mInventoryName); } diff --git a/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java b/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java index e997c8feb9..e1ac057aa4 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java +++ b/src/main/java/gregtech/api/net/GT_Packet_RequestCoverData.java @@ -102,8 +102,7 @@ public class GT_Packet_RequestCoverData extends GT_Packet_New { final World world = DimensionManager.getWorld(mPlayer.dimension); if (world != null) { final TileEntity tile = world.getTileEntity(mX, mY, mZ); - if (tile instanceof CoverableTileEntity) { - final CoverableTileEntity te = (CoverableTileEntity) tile; + if (tile instanceof CoverableTileEntity te) { if (!te.isDead() && te.getCoverIDAtSide(side) == coverID) { te.issueCoverUpdate(side); } diff --git a/src/main/java/gregtech/api/net/GT_Packet_SetLockedFluid.java b/src/main/java/gregtech/api/net/GT_Packet_SetLockedFluid.java index a96d33bda6..0252201ba3 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_SetLockedFluid.java +++ b/src/main/java/gregtech/api/net/GT_Packet_SetLockedFluid.java @@ -80,10 +80,9 @@ public class GT_Packet_SetLockedFluid extends GT_Packet_New { TileEntity tile = world.getTileEntity(mX, mY, mZ); if (!(tile instanceof IGregTechTileEntity) || ((IGregTechTileEntity) tile).isDead()) return; IMetaTileEntity mte = ((IGregTechTileEntity) tile).getMetaTileEntity(); - if (!(mte instanceof IFluidLockable)) return; + if (!(mte instanceof IFluidLockable mteToLock)) return; Fluid tFluid = FluidRegistry.getFluid(mFluidID); if (tFluid == null) return; - IFluidLockable mteToLock = (IFluidLockable) mte; if (!mteToLock.allowChangingLockedFluid(tFluid.getName())) return; mteToLock.lockFluid(true); diff --git a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java index 86321f9287..25d4adf8e1 100644 --- a/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java +++ b/src/main/java/gregtech/api/net/GT_Packet_TileEntityCoverGUI.java @@ -191,8 +191,7 @@ public class GT_Packet_TileEntityCoverGUI extends GT_Packet_New { // Using EntityPlayer instead of EntityClientPlayerMP so both client and server can load this final EntityPlayer thePlayer = ((EntityPlayer) ((World) aWorld).getEntityByID(playerID)); final TileEntity tile = aWorld.getTileEntity(mX, mY, mZ); - if (tile instanceof IGregTechTileEntity && !((IGregTechTileEntity) tile).isDead()) { - final IGregTechTileEntity gtTile = ((IGregTechTileEntity) tile); + if (tile instanceof IGregTechTileEntity gtTile && !((IGregTechTileEntity) tile).isDead()) { gtTile.setCoverDataAtSide(side, coverData); // Set it client side to read later. GT_CoverBehaviorBase<?> cover = gtTile.getCoverBehaviorAtSideNew(side); diff --git a/src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java b/src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java index 06ab3788b3..6bbab251ba 100644 --- a/src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java +++ b/src/main/java/gregtech/api/objects/AE2DigitalChestHandler.java @@ -16,7 +16,7 @@ public class AE2DigitalChestHandler implements appeng.api.storage.IExternalStora } @Override - public appeng.api.storage.IMEInventory getInventory(final TileEntity te, final ForgeDirection d, + public appeng.api.storage.IMEInventory<?> getInventory(final TileEntity te, final ForgeDirection d, final appeng.api.storage.StorageChannel chan, final appeng.api.networking.security.BaseActionSource src) { if (chan == appeng.api.storage.StorageChannel.ITEMS) { return ((GT_MetaTileEntity_DigitalChestBase) (((BaseMetaTileEntity) te).getMetaTileEntity())); diff --git a/src/main/java/gregtech/api/objects/GT_ArrayList.java b/src/main/java/gregtech/api/objects/GT_ArrayList.java index 50eb3ebcc1..9124ef8616 100644 --- a/src/main/java/gregtech/api/objects/GT_ArrayList.java +++ b/src/main/java/gregtech/api/objects/GT_ArrayList.java @@ -19,6 +19,7 @@ public class GT_ArrayList<E> extends ArrayList<E> { mAllowNulls = aAllowNulls; } + @SafeVarargs public GT_ArrayList(boolean aAllowNulls, E... aArray) { super(Arrays.asList(aArray)); mAllowNulls = aAllowNulls; diff --git a/src/main/java/gregtech/api/objects/GT_HashSet.java b/src/main/java/gregtech/api/objects/GT_HashSet.java index 1f12b669b3..64ff0f10b0 100644 --- a/src/main/java/gregtech/api/objects/GT_HashSet.java +++ b/src/main/java/gregtech/api/objects/GT_HashSet.java @@ -38,7 +38,7 @@ public class GT_HashSet<E extends GT_ItemStack> extends AbstractSet<E> { GregTech_API.sItemStackMappings.add(map); } - public HashMap getMap() { + public Map<GT_ItemStack, Object> getMap() { return map; } diff --git a/src/main/java/gregtech/api/objects/ItemData.java b/src/main/java/gregtech/api/objects/ItemData.java index 72d5cc5900..4fe0320ca7 100644 --- a/src/main/java/gregtech/api/objects/ItemData.java +++ b/src/main/java/gregtech/api/objects/ItemData.java @@ -11,7 +11,7 @@ public class ItemData { private static final MaterialStack[] EMPTY_MATERIALSTACK_ARRAY = new MaterialStack[0]; - public final List<Object> mExtraData = new GT_ArrayList<Object>(false, 1); + public final List<Object> mExtraData = new GT_ArrayList<>(false, 1); public final OrePrefixes mPrefix; public final MaterialStack mMaterial; public final MaterialStack[] mByProducts; @@ -41,10 +41,10 @@ public class ItemData { MaterialStack[] tByProducts = aByProducts.length < 1 ? EMPTY_MATERIALSTACK_ARRAY : new MaterialStack[aByProducts.length]; int j = 0; - for (int i = 0; i < aByProducts.length; i++) if (aByProducts[i] != null && aByProducts[i].mMaterial != null) - tByProducts[j++] = aByProducts[i].clone(); + for (MaterialStack aByProduct : aByProducts) + if (aByProduct != null && aByProduct.mMaterial != null) tByProducts[j++] = aByProduct.clone(); mByProducts = j > 0 ? new MaterialStack[j] : EMPTY_MATERIALSTACK_ARRAY; - for (int i = 0; i < mByProducts.length; i++) mByProducts[i] = tByProducts[i]; + System.arraycopy(tByProducts, 0, mByProducts, 0, mByProducts.length); } } @@ -60,7 +60,7 @@ public class ItemData { mPrefix = null; mBlackListed = true; - ArrayList<MaterialStack> aList = new ArrayList<MaterialStack>(), rList = new ArrayList<MaterialStack>(); + ArrayList<MaterialStack> aList = new ArrayList<>(), rList = new ArrayList<>(); for (ItemData tData : aData) if (tData != null) { if (tData.hasValidMaterialData() && tData.mMaterial.mAmount > 0) aList.add(tData.mMaterial.clone()); @@ -77,13 +77,7 @@ public class ItemData { if (temp) rList.add(aMaterial.clone()); } - Collections.sort(rList, new Comparator<MaterialStack>() { - - @Override - public int compare(MaterialStack a, MaterialStack b) { - return a.mAmount == b.mAmount ? 0 : a.mAmount > b.mAmount ? -1 : +1; - } - }); + rList.sort((a, b) -> Long.compare(b.mAmount, a.mAmount)); if (rList.isEmpty()) { mMaterial = null; @@ -92,7 +86,7 @@ public class ItemData { rList.remove(0); } - mByProducts = rList.toArray(new MaterialStack[rList.size()]); + mByProducts = rList.toArray(new MaterialStack[0]); } public final boolean hasValidPrefixMaterialData() { @@ -108,7 +102,7 @@ public class ItemData { } public final ArrayList<MaterialStack> getAllMaterialStacks() { - ArrayList<MaterialStack> rList = new ArrayList(); + ArrayList<MaterialStack> rList = new ArrayList<>(); if (hasValidMaterialData()) rList.add(mMaterial); rList.addAll(Arrays.asList(mByProducts)); return rList; diff --git a/src/main/java/gregtech/api/util/ColorsMetadataSectionSerializer.java b/src/main/java/gregtech/api/util/ColorsMetadataSectionSerializer.java index 41b6e0013e..ae480343b2 100644 --- a/src/main/java/gregtech/api/util/ColorsMetadataSectionSerializer.java +++ b/src/main/java/gregtech/api/util/ColorsMetadataSectionSerializer.java @@ -11,7 +11,6 @@ import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; -import com.google.gson.JsonSerializer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -20,7 +19,7 @@ import gregtech.api.GregTech_API; import gregtech.api.enums.Dyes; @SideOnly(Side.CLIENT) -public class ColorsMetadataSectionSerializer extends BaseMetadataSectionSerializer implements JsonSerializer { +public class ColorsMetadataSectionSerializer extends BaseMetadataSectionSerializer { public ColorsMetadataSection deserialize(JsonElement metadataColors, Type type, JsonDeserializationContext context) { diff --git a/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java b/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java index 9f648fa7e0..7dc15f994d 100644 --- a/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java +++ b/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java @@ -28,15 +28,15 @@ public class GT_AssemblyLineUtils { /** * A cache of Recipes using the Output as Key. */ - private static HashMap<GT_ItemStack, GT_Recipe_AssemblyLine> sRecipeCacheByOutput = new HashMap<GT_ItemStack, GT_Recipe_AssemblyLine>(); + private static HashMap<GT_ItemStack, GT_Recipe_AssemblyLine> sRecipeCacheByOutput = new HashMap<>(); /** * A cache of Recipes using the Recipe Hash String as Key. */ - private static HashMap<String, GT_Recipe_AssemblyLine> sRecipeCacheByRecipeHash = new HashMap<String, GT_Recipe_AssemblyLine>(); + private static HashMap<String, GT_Recipe_AssemblyLine> sRecipeCacheByRecipeHash = new HashMap<>(); /** * Checks the DataStick for deprecated/invalid recipes, updating them as required. - * + * * @param aDataStick - The DataStick to process * @return Is this DataStick now valid with a current recipe? */ @@ -57,7 +57,7 @@ public class GT_AssemblyLineUtils { /** * Finds an Assembly Line recipe from a DataStick. - * + * * @param aDataStick - The DataStick to check. * @return The GT_Recipe_AssemblyLine recipe contained on the DataStick, if any. */ @@ -67,7 +67,7 @@ public class GT_AssemblyLineUtils { /** * Finds an Assembly Line recipe from a DataStick. - * + * * @param aDataStick - The DataStick to check. * @param aReturnBuiltRecipe - Do we return a GT_Recipe_AssemblyLine built from the data on the Data Stick instead * of searching the Recipe Map? @@ -197,7 +197,7 @@ public class GT_AssemblyLineUtils { /** * Finds a GT_Recipe_AssemblyLine based on the expected output ItemStack. - * + * * @param aOutput - The Output of a GT_Recipe_AssemblyLine. * @return First found GT_Recipe_AssemblyLine with matching output. */ @@ -321,7 +321,7 @@ public class GT_AssemblyLineUtils { /** * Get the Output ItemStack from a Data Stick. - * + * * @param aDataStick - The Data Stick to check. * @return Output ItemStack contained on the Data Stick. */ diff --git a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java b/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java index fa58c1d614..7a1515ec0c 100644 --- a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java +++ b/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java @@ -16,10 +16,10 @@ import gregtech.api.enums.MaterialsBotania; public class GT_Assemblyline_Server { - public static LinkedHashMap<String, String> lServerNames = new LinkedHashMap<String, String>(); - private static LinkedHashMap<String, String> internal2 = new LinkedHashMap<String, String>(), - internal3 = new LinkedHashMap<String, String>(), internal4 = new LinkedHashMap<String, String>(); - private static HashMap<String, Property> internal = new HashMap<String, Property>(); + public static LinkedHashMap<String, String> lServerNames = new LinkedHashMap<>(); + private static LinkedHashMap<String, String> internal2 = new LinkedHashMap<>(), internal3 = new LinkedHashMap<>(), + internal4 = new LinkedHashMap<>(); + private static HashMap<String, Property> internal = new HashMap<>(); public static void fillMap(FMLPreInitializationEvent aEvent) { @@ -224,71 +224,54 @@ public class GT_Assemblyline_Server { t = t.substring(0, 1); int i = Integer.parseInt(t); switch (i) { - case 1: - mMats = new Materials[] { Materials.Adamantium, Materials.Aluminium, - Materials.Americium, Materials.AnnealedCopper, Materials.Antimony, - Materials.Arsenic, Materials.AstralSilver, Materials.BatteryAlloy, - Materials.Beryllium, Materials.Bismuth, Materials.BismuthBronze, - Materials.BlackBronze, Materials.BlackSteel, Materials.BlueAlloy, - Materials.BlueSteel, Materials.Brass }; - break; - case 2: - mMats = new Materials[] { Materials.Bronze, Materials.Caesium, - Materials.Cerium, Materials.Chrome, Materials.ChromiumDioxide, - Materials.Cobalt, Materials.CobaltBrass, Materials.Copper, - Materials.Cupronickel, Materials.DamascusSteel, Materials.DarkIron, - Materials.DeepIron, Materials.Desh, Materials.Duranium, - Materials.Dysprosium, Materials.Electrum }; - break; - case 3: - mMats = new Materials[] { Materials.ElectrumFlux, Materials.Enderium, - Materials.Erbium, Materials.Europium, Materials.FierySteel, - Materials.Gadolinium, Materials.Gallium, Materials.Holmium, - Materials.HSLA, Materials.Indium, Materials.InfusedGold, - Materials.Invar, Materials.Iridium, Materials.IronMagnetic, - Materials.IronWood, Materials.Kanthal }; - break; - case 4: - mMats = new Materials[] { Materials.Knightmetal, Materials.Lanthanum, - Materials.Lead, Materials.Lutetium, Materials.Magnalium, - Materials.Magnesium, Materials.Manganese, Materials.MeteoricIron, - Materials.MeteoricSteel, Materials.Trinium, Materials.Mithril, - Materials.Molybdenum, Materials.Naquadah, Materials.NaquadahAlloy, - Materials.NaquadahEnriched, Materials.Naquadria }; - break; - case 5: - mMats = new Materials[] { Materials.Neodymium, Materials.NeodymiumMagnetic, - Materials.Neutronium, Materials.Nichrome, Materials.Nickel, - Materials.Niobium, Materials.NiobiumNitride, - Materials.NiobiumTitanium, Materials.Osmiridium, Materials.Osmium, - Materials.Palladium, Materials.PigIron, Materials.Platinum, - Materials.Plutonium, Materials.Plutonium241, - Materials.Praseodymium }; - break; - case 6: - mMats = new Materials[] { Materials.Promethium, Materials.RedAlloy, - Materials.RedSteel, Materials.RoseGold, Materials.Rubidium, - Materials.Samarium, Materials.Scandium, Materials.ShadowIron, - Materials.ShadowSteel, Materials.Silicon, Materials.Silver, - Materials.SolderingAlloy, Materials.StainlessSteel, Materials.Steel, - Materials.SteelMagnetic, Materials.SterlingSilver }; - break; - case 7: - mMats = new Materials[] { Materials.Sunnarium, Materials.Tantalum, - Materials.Tellurium, Materials.Terbium, Materials.Thaumium, - Materials.Thorium, Materials.Thulium, Materials.Tin, - Materials.TinAlloy, Materials.Titanium, Materials.Tritanium, - Materials.Tungsten, Materials.TungstenSteel, Materials.Ultimet, - Materials.Uranium, Materials.Uranium235 }; - break; - case 8: - mMats = new Materials[] { Materials.Vanadium, Materials.VanadiumGallium, - Materials.WroughtIron, Materials.Ytterbium, Materials.Yttrium, - Materials.YttriumBariumCuprate, Materials.Zinc, - Materials.TungstenCarbide, Materials.VanadiumSteel, Materials.HSSG, - Materials.HSSE, Materials.HSSS, Materials.Steeleaf, - Materials.Ichorium, Materials.Firestone }; - break; + case 1 -> mMats = new Materials[] { Materials.Adamantium, Materials.Aluminium, + Materials.Americium, Materials.AnnealedCopper, Materials.Antimony, + Materials.Arsenic, Materials.AstralSilver, Materials.BatteryAlloy, + Materials.Beryllium, Materials.Bismuth, Materials.BismuthBronze, + Materials.BlackBronze, Materials.BlackSteel, Materials.BlueAlloy, + Materials.BlueSteel, Materials.Brass }; + case 2 -> mMats = new Materials[] { Materials.Bronze, Materials.Caesium, + Materials.Cerium, Materials.Chrome, Materials.ChromiumDioxide, + Materials.Cobalt, Materials.CobaltBrass, Materials.Copper, + Materials.Cupronickel, Materials.DamascusSteel, Materials.DarkIron, + Materials.DeepIron, Materials.Desh, Materials.Duranium, + Materials.Dysprosium, Materials.Electrum }; + case 3 -> mMats = new Materials[] { Materials.ElectrumFlux, Materials.Enderium, + Materials.Erbium, Materials.Europium, Materials.FierySteel, + Materials.Gadolinium, Materials.Gallium, Materials.Holmium, + Materials.HSLA, Materials.Indium, Materials.InfusedGold, + Materials.Invar, Materials.Iridium, Materials.IronMagnetic, + Materials.IronWood, Materials.Kanthal }; + case 4 -> mMats = new Materials[] { Materials.Knightmetal, Materials.Lanthanum, + Materials.Lead, Materials.Lutetium, Materials.Magnalium, + Materials.Magnesium, Materials.Manganese, Materials.MeteoricIron, + Materials.MeteoricSteel, Materials.Trinium, Materials.Mithril, + Materials.Molybdenum, Materials.Naquadah, Materials.NaquadahAlloy, + Materials.NaquadahEnriched, Materials.Naquadria }; + case 5 -> mMats = new Materials[] { Materials.Neodymium, + Materials.NeodymiumMagnetic, Materials.Neutronium, Materials.Nichrome, + Materials.Nickel, Materials.Niobium, Materials.NiobiumNitride, + Materials.NiobiumTitanium, Materials.Osmiridium, Materials.Osmium, + Materials.Palladium, Materials.PigIron, Materials.Platinum, + Materials.Plutonium, Materials.Plutonium241, Materials.Praseodymium }; + case 6 -> mMats = new Materials[] { Materials.Promethium, Materials.RedAlloy, + Materials.RedSteel, Materials.RoseGold, Materials.Rubidium, + Materials.Samarium, Materials.Scandium, Materials.ShadowIron, + Materials.ShadowSteel, Materials.Silicon, Materials.Silver, + Materials.SolderingAlloy, Materials.StainlessSteel, Materials.Steel, + Materials.SteelMagnetic, Materials.SterlingSilver }; + case 7 -> mMats = new Materials[] { Materials.Sunnarium, Materials.Tantalum, + Materials.Tellurium, Materials.Terbium, Materials.Thaumium, + Materials.Thorium, Materials.Thulium, Materials.Tin, Materials.TinAlloy, + Materials.Titanium, Materials.Tritanium, Materials.Tungsten, + Materials.TungstenSteel, Materials.Ultimet, Materials.Uranium, + Materials.Uranium235 }; + case 8 -> mMats = new Materials[] { Materials.Vanadium, + Materials.VanadiumGallium, Materials.WroughtIron, Materials.Ytterbium, + Materials.Yttrium, Materials.YttriumBariumCuprate, Materials.Zinc, + Materials.TungstenCarbide, Materials.VanadiumSteel, Materials.HSSG, + Materials.HSSE, Materials.HSSS, Materials.Steeleaf, Materials.Ichorium, + Materials.Firestone }; } t = entry.getKey() .substring( @@ -307,28 +290,22 @@ public class GT_Assemblyline_Server { t = t.substring(0, 1); int i = Integer.parseInt(t); switch (i) { - case 1: - mMats = new Materials[] { Materials.InfusedAir, Materials.Amber, - Materials.Amethyst, Materials.InfusedWater, Materials.BlueTopaz, - Materials.CertusQuartz, Materials.Dilithium, Materials.EnderEye, - Materials.EnderPearl, Materials.FoolsRuby, Materials.Force, - Materials.Forcicium, Materials.Forcillium, Materials.GreenSapphire, - Materials.InfusedFire, Materials.Jasper, MaterialsBotania.ManaDiamond, - MaterialsBotania.BotaniaDragonstone }; - break; - case 2: - mMats = new Materials[] { Materials.Lazurite, Materials.Lignite, - Materials.Monazite, Materials.Niter, Materials.Olivine, Materials.Opal, - Materials.InfusedOrder, Materials.InfusedEntropy, Materials.Phosphorus, - Materials.Quartzite, Materials.GarnetRed, Materials.Ruby, - Materials.Sapphire, Materials.Sodalite, Materials.Tanzanite, - Materials.InfusedEarth }; - break; - case 3: - mMats = new Materials[] { Materials.Topaz, Materials.Vinteum, - Materials.GarnetYellow, Materials.NetherStar, Materials.Charcoal, - Materials.Blaze }; - break; + case 1 -> mMats = new Materials[] { Materials.InfusedAir, Materials.Amber, + Materials.Amethyst, Materials.InfusedWater, Materials.BlueTopaz, + Materials.CertusQuartz, Materials.Dilithium, Materials.EnderEye, + Materials.EnderPearl, Materials.FoolsRuby, Materials.Force, + Materials.Forcicium, Materials.Forcillium, Materials.GreenSapphire, + Materials.InfusedFire, Materials.Jasper, MaterialsBotania.ManaDiamond, + MaterialsBotania.BotaniaDragonstone }; + case 2 -> mMats = new Materials[] { Materials.Lazurite, Materials.Lignite, + Materials.Monazite, Materials.Niter, Materials.Olivine, Materials.Opal, + Materials.InfusedOrder, Materials.InfusedEntropy, Materials.Phosphorus, + Materials.Quartzite, Materials.GarnetRed, Materials.Ruby, + Materials.Sapphire, Materials.Sodalite, Materials.Tanzanite, + Materials.InfusedEarth }; + case 3 -> mMats = new Materials[] { Materials.Topaz, Materials.Vinteum, + Materials.GarnetYellow, Materials.NetherStar, Materials.Charcoal, + Materials.Blaze }; } t = entry.getKey() .substring( diff --git a/src/main/java/gregtech/api/util/GT_BaseCrop.java b/src/main/java/gregtech/api/util/GT_BaseCrop.java index e66866cd8f..a586ad672e 100644 --- a/src/main/java/gregtech/api/util/GT_BaseCrop.java +++ b/src/main/java/gregtech/api/util/GT_BaseCrop.java @@ -3,6 +3,7 @@ package gregtech.api.util; import static gregtech.api.enums.GT_Values.E; import static gregtech.api.enums.ModIDs.IC2CropPlugin; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; @@ -27,11 +28,18 @@ import ic2.api.crops.ICropTile; public class GT_BaseCrop extends CropCard implements ICropCardInfo { - public static ArrayList<GT_BaseCrop> sCropList = new ArrayList<GT_BaseCrop>(); - private String mName = E, mDiscoveredBy = "Gregorius Techneticies", mAttributes[]; - private int mTier = 0, mMaxSize = 0, mAfterHarvestSize = 0, mHarvestSize = 0, mStats[] = new int[5], - mGrowthSpeed = 0; - private ItemStack mDrop = null, mSpecialDrops[] = null; + public static ArrayList<GT_BaseCrop> sCropList = new ArrayList<>(); + private String mName = E; + private String mDiscoveredBy = "Gregorius Techneticies"; + private String[] mAttributes; + private int mTier = 0; + private int mMaxSize = 0; + private int mAfterHarvestSize = 0; + private int mHarvestSize = 0; + private int[] mStats = new int[5]; + private int mGrowthSpeed = 0; + private ItemStack mDrop = null; + private ItemStack[] mSpecialDrops = null; private Materials mBlock = null; private static boolean bIc2NeiLoaded = IC2CropPlugin.isModLoaded(); @@ -123,19 +131,8 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { Class.forName("speiger.src.crops.api.CropPluginAPI") .getField("instance"), this); - } catch (IllegalAccessException ex) { - bIc2NeiLoaded = false; - } catch (IllegalArgumentException ex) { - bIc2NeiLoaded = false; - } catch (java.lang.reflect.InvocationTargetException ex) { - bIc2NeiLoaded = false; - } catch (NoSuchFieldException ex) { - bIc2NeiLoaded = false; - } catch (NoSuchMethodException ex) { - bIc2NeiLoaded = false; - } catch (SecurityException ex) { - bIc2NeiLoaded = false; - } catch (ClassNotFoundException ex) { + } catch (IllegalAccessException | ClassNotFoundException | SecurityException | NoSuchMethodException + | NoSuchFieldException | InvocationTargetException | IllegalArgumentException ex) { bIc2NeiLoaded = false; } } @@ -294,7 +291,7 @@ public class GT_BaseCrop extends CropCard implements ICropCardInfo { @Override public List<String> getCropInformation() { if (mBlock != null) { - ArrayList<String> result = new ArrayList<String>(1); + ArrayList<String> result = new ArrayList<>(1); result.add( String.format( "Requires %s Ore or Block of %s as soil block to reach full growth.", diff --git a/src/main/java/gregtech/api/util/GT_CLS_Compat.java b/src/main/java/gregtech/api/util/GT_CLS_Compat.java index a7cae35d59..4dff5f65f9 100644 --- a/src/main/java/gregtech/api/util/GT_CLS_Compat.java +++ b/src/main/java/gregtech/api/util/GT_CLS_Compat.java @@ -105,11 +105,11 @@ public class GT_CLS_Compat { if (nextBakingMsgAt < now) { nextBakingMsgAt = now + bakingMsgEvery; GT_Mod.GT_FML_LOGGER.info( - String.format("%s - Baking: %d%%", materialsType, (Integer) (currentStep * 100 / sizeStep))); + String.format("%s - Baking: %d%%", materialsType, currentStep * 100 / sizeStep)); } action.accept(m); currentStep += 1; - } ; + } GT_Mod.GT_FML_LOGGER.info(String.format("%s - Baking: Done", materialsType)); try { progressBarStep.set(progressBar, currentStep); @@ -130,7 +130,7 @@ public class GT_CLS_Compat { mEvents, progressBar, m -> m.mMaterial, - m -> GT_Proxy.registerRecipes(m)); + GT_Proxy::registerRecipes); ProgressManager.pop(progressBar); isRegisteringGTmaterials.set(null, false); } @@ -147,7 +147,7 @@ public class GT_CLS_Compat { replacedVanillaItemsSet, progressBar, m -> m.mDefaultLocalName, - m -> GT_PostLoad.doActualRegistration(m)); + GT_PostLoad::doActualRegistration); } public static void pushToDisplayProgress() throws InvocationTargetException, IllegalAccessException { diff --git a/src/main/java/gregtech/api/util/GT_ChunkAssociatedData.java b/src/main/java/gregtech/api/util/GT_ChunkAssociatedData.java index 113d8cc420..afbcf6145f 100644 --- a/src/main/java/gregtech/api/util/GT_ChunkAssociatedData.java +++ b/src/main/java/gregtech/api/util/GT_ChunkAssociatedData.java @@ -189,7 +189,7 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID } private void saveRegions(Stream<SuperRegion> stream) { - stream.filter(r -> r.isDirty()) + stream.filter(SuperRegion::isDirty) .map(c -> (Runnable) c::save) .map(r -> CompletableFuture.runAsync(r, IO_WORKERS)) .reduce(CompletableFuture::allOf) @@ -447,12 +447,10 @@ public abstract class GT_ChunkAssociatedData<T extends GT_ChunkAssociatedData.ID World world = Objects.requireNonNull(this.world.get(), "Attempting to load region of another world!"); try (DataInputStream input = new DataInputStream(new FileInputStream(file))) { byte b = input.readByte(); - switch (b) { - case 0: - loadV0(input, world); - break; - default: - GT_Log.err.printf("Unknown ChunkAssociatedData version %d\n", b); + if (b == 0) { + loadV0(input, world); + } else { + GT_Log.err.printf("Unknown ChunkAssociatedData version %d\n", b); } } } diff --git a/src/main/java/gregtech/api/util/GT_HatchElementBuilder.java b/src/main/java/gregtech/api/util/GT_HatchElementBuilder.java index 6c6ac4bc62..c3057f3caa 100644 --- a/src/main/java/gregtech/api/util/GT_HatchElementBuilder.java +++ b/src/main/java/gregtech/api/util/GT_HatchElementBuilder.java @@ -268,7 +268,7 @@ public class GT_HatchElementBuilder<T> { * This will clear the sides set by previous call to this or {@link #allowOnly(ForgeDirection...)} * <p> * Usually mandatory for multis with multiple slices, and otherwise not needed if it contains a single slice only. - * + * * @param facings disallowed direction in ABC coordinate system */ public GT_HatchElementBuilder<T> disallowOnly(ForgeDirection... facings) { @@ -284,7 +284,7 @@ public class GT_HatchElementBuilder<T> { * This will clear the sides set by previous call to this or {@link #disallowOnly(ForgeDirection...)} * <p> * Usually mandatory for multis with multiple slices, and otherwise not needed if it contains a single slice only. - * + * * @param facings allowed direction in ABC coordinate system */ public GT_HatchElementBuilder<T> allowOnly(ForgeDirection... facings) { @@ -376,7 +376,7 @@ public class GT_HatchElementBuilder<T> { } if (mHatchItemFilter == null) { // no item filter -> no placement - return new IStructureElementNoPlacement<T>() { + return new IStructureElementNoPlacement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -392,7 +392,7 @@ public class GT_HatchElementBuilder<T> { } }; } - return new IStructureElement<T>() { + return new IStructureElement<>() { private String mHint = mHatchItemType == null ? "unspecified GT hatch" : mHatchItemType.get(); diff --git a/src/main/java/gregtech/api/util/GT_Log.java b/src/main/java/gregtech/api/util/GT_Log.java index db7edf7779..2d00c2e061 100644 --- a/src/main/java/gregtech/api/util/GT_Log.java +++ b/src/main/java/gregtech/api/util/GT_Log.java @@ -25,7 +25,7 @@ public class GT_Log { public static class LogBuffer extends PrintStream { - public final List<String> mBufferedOreDictLog = new ArrayList<String>(); + public final List<String> mBufferedOreDictLog = new ArrayList<>(); public LogBuffer() { super(new OutputStream() { diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java index ec3f8a2b70..3dff430782 100644 --- a/src/main/java/gregtech/api/util/GT_ModHandler.java +++ b/src/main/java/gregtech/api/util/GT_ModHandler.java @@ -706,42 +706,34 @@ public class GT_ModHandler { .contains("ic2.itemPurifiedCrushed")))) continue; switch (aGTRecipeMap.mUnlocalizedName) { - case "gt.recipe.macerator": - case "gt.recipe.extractor": - case "gt.recipe.compressor": - aGTRecipeMap.addRecipe( - true, - new ItemStack[] { GT_Utility.copyAmount( - iRecipeInputRecipeOutputEntry.getKey() - .getAmount(), - tStack) }, - iRecipeInputRecipeOutputEntry.getValue().items.toArray( - new ItemStack[0]), - null, - null, - null, - null, - 300, - 2, - 0); - break; - case "gt.recipe.thermalcentrifuge": - aGTRecipeMap.addRecipe( - true, - new ItemStack[] { GT_Utility.copyAmount( - iRecipeInputRecipeOutputEntry.getKey() - .getAmount(), - tStack) }, - iRecipeInputRecipeOutputEntry.getValue().items.toArray( - new ItemStack[0]), - null, - null, - null, - null, - 500, - 48, - 0); - break; + case "gt.recipe.macerator", "gt.recipe.extractor", "gt.recipe.compressor" -> aGTRecipeMap.addRecipe( + true, + new ItemStack[] { GT_Utility.copyAmount( + iRecipeInputRecipeOutputEntry.getKey() + .getAmount(), + tStack) }, + iRecipeInputRecipeOutputEntry.getValue().items.toArray(new ItemStack[0]), + null, + null, + null, + null, + 300, + 2, + 0); + case "gt.recipe.thermalcentrifuge" -> aGTRecipeMap.addRecipe( + true, + new ItemStack[] { GT_Utility.copyAmount( + iRecipeInputRecipeOutputEntry.getKey() + .getAmount(), + tStack) }, + iRecipeInputRecipeOutputEntry.getValue().items.toArray(new ItemStack[0]), + null, + null, + null, + null, + 500, + 48, + 0); } } catch (Exception e) { System.err.println(e); @@ -1066,7 +1058,7 @@ public class GT_ModHandler { for (byte i = 0; i < aRecipe.length; i++) { if (aRecipe[i] instanceof IItemContainer) aRecipe[i] = ((IItemContainer) aRecipe[i]).get(1); - else if (aRecipe[i] instanceof Enum) aRecipe[i] = ((Enum) aRecipe[i]).name(); + else if (aRecipe[i] instanceof Enum) aRecipe[i] = ((Enum<?>) aRecipe[i]).name(); else if (!(aRecipe[i] == null || aRecipe[i] instanceof ItemStack || aRecipe[i] instanceof ItemData || aRecipe[i] instanceof String @@ -1092,62 +1084,62 @@ public class GT_ModHandler { for (char c : s.toString() .toCharArray()) { switch (c) { - case 'b': + case 'b' -> { tRecipeList.add(c); tRecipeList.add(ToolDictNames.craftingToolBlade.name()); - break; - case 'c': + } + case 'c' -> { tRecipeList.add(c); tRecipeList.add(ToolDictNames.craftingToolCrowbar.name()); - break; - case 'd': + } + case 'd' -> { tRecipeList.add(c); tRecipeList.add(ToolDictNames.craftingToolScrewdriver.name()); - break; - case 'f': + } + case 'f' -> { tRecipeList.add(c); tRecipeList.add(ToolDictNames.craftingToolFile.name()); - break; - case 'h': + } + case 'h' -> { tRecipeList.add(c); tRecipeList.add(ToolDictNames.craftingToolHardHammer.name()); - break; - case 'i': + } + case 'i' -> { tRecipeList.add(c); tRecipeList.add(ToolDictNames.craftingToolSolderingIron.name()); - break; - case 'j': + } + case 'j' -> { tRecipeList.add(c); tRecipeList.add(ToolDictNames.craftingToolSolderingMetal.name()); - break; - case 'k': + } + case 'k' -> { tRecipeList.add(c); tRecipeList.add(ToolDictNames.craftingToolKnife.name()); - break; - case 'm': + } + case 'm' -> { tRecipeList.add(c); tRecipeList.add(ToolDictNames.craftingToolMortar.name()); - break; - case 'p': + } + case 'p' -> { tRecipeList.add(c); tRecipeList.add(ToolDictNames.craftingToolDrawplate.name()); - break; - case 'r': + } + case 'r' -> { tRecipeList.add(c); tRecipeList.add(ToolDictNames.craftingToolSoftHammer.name()); - break; - case 's': + } + case 's' -> { tRecipeList.add(c); tRecipeList.add(ToolDictNames.craftingToolSaw.name()); - break; - case 'w': + } + case 'w' -> { tRecipeList.add(c); tRecipeList.add(ToolDictNames.craftingToolWrench.name()); - break; - case 'x': + } + case 'x' -> { tRecipeList.add(c); tRecipeList.add(ToolDictNames.craftingToolWireCutter.name()); - break; + } } } } @@ -1175,28 +1167,17 @@ public class GT_ModHandler { } Character chr = (Character) aRecipe[idx]; Object in = aRecipe[idx + 1]; - if (in instanceof ItemStack) { - ItemStack is = (ItemStack) in; + if (in instanceof ItemStack is) { tItemStackMap.put(chr, GT_Utility.copyOrNull(is)); tItemDataMap.put(chr, GT_OreDictUnificator.getItemData(is)); } else if (in instanceof ItemData) { String tString = in.toString(); switch (tString) { - case "plankWood": - tItemDataMap.put(chr, new ItemData(Materials.Wood, M)); - break; - case "stoneNetherrack": - tItemDataMap.put(chr, new ItemData(Materials.Netherrack, M)); - break; - case "stoneObsidian": - tItemDataMap.put(chr, new ItemData(Materials.Obsidian, M)); - break; - case "stoneEndstone": - tItemDataMap.put(chr, new ItemData(Materials.Endstone, M)); - break; - default: - tItemDataMap.put(chr, (ItemData) in); - break; + case "plankWood" -> tItemDataMap.put(chr, new ItemData(Materials.Wood, M)); + case "stoneNetherrack" -> tItemDataMap.put(chr, new ItemData(Materials.Netherrack, M)); + case "stoneObsidian" -> tItemDataMap.put(chr, new ItemData(Materials.Obsidian, M)); + case "stoneEndstone" -> tItemDataMap.put(chr, new ItemData(Materials.Endstone, M)); + default -> tItemDataMap.put(chr, (ItemData) in); } ItemStack tStack = GT_OreDictUnificator.getFirstOre(in, 1); if (tStack == null) tRemoveRecipe = false; @@ -1360,7 +1341,7 @@ public class GT_ModHandler { if (aRecipe == null || aRecipe.length <= 0) return false; for (byte i = 0; i < aRecipe.length; i++) { if (aRecipe[i] instanceof IItemContainer) aRecipe[i] = ((IItemContainer) aRecipe[i]).get(1); - else if (aRecipe[i] instanceof Enum) aRecipe[i] = ((Enum) aRecipe[i]).name(); + else if (aRecipe[i] instanceof Enum) aRecipe[i] = ((Enum<?>) aRecipe[i]).name(); else if (!(aRecipe[i] == null || aRecipe[i] instanceof ItemStack || aRecipe[i] instanceof String || aRecipe[i] instanceof Character)) @@ -1424,10 +1405,10 @@ public class GT_ModHandler { */ public static boolean removeFurnaceSmelting(ItemStack aInput) { if (aInput != null) { - for (Object tInput : FurnaceRecipes.smelting() - .getSmeltingList() - .keySet()) { - if (GT_Utility.isStackValid(tInput) && GT_Utility.areStacksEqual(aInput, (ItemStack) tInput, true)) { + for (ItemStack tInput : FurnaceRecipes.smelting() + .getSmeltingList() + .keySet()) { + if (GT_Utility.isStackValid(tInput) && GT_Utility.areStacksEqual(aInput, tInput, true)) { FurnaceRecipes.smelting() .getSmeltingList() .remove(tInput); @@ -1448,7 +1429,7 @@ public class GT_ModHandler { .values() .removeIf( tOutput -> GT_Utility.isStackValid(tOutput) - && GT_Utility.areStacksEqual(aOutput, (ItemStack) tOutput, true)); + && GT_Utility.areStacksEqual(aOutput, tOutput, true)); } return false; } @@ -1692,7 +1673,7 @@ public class GT_ModHandler { int tNewDamage = tStack1.getMaxDamage() + tStack1.getItemDamage() - tStack2.getItemDamage() + tStack1.getMaxDamage() / 20; - return new ItemStack(tStack1.getItem(), 1, tNewDamage < 0 ? 0 : tNewDamage); + return new ItemStack(tStack1.getItem(), 1, Math.max(tNewDamage, 0)); } } @@ -1767,8 +1748,8 @@ public class GT_ModHandler { if (!GregTech_API.sPostloadStarted || GregTech_API.sPostloadFinished) sSingleNonBlockDamagableRecipeList.clear(); if (sSingleNonBlockDamagableRecipeList.isEmpty()) { - for (IRecipe tRecipe : (ArrayList<IRecipe>) CraftingManager.getInstance() - .getRecipeList()) { + for (IRecipe tRecipe : CraftingManager.getInstance() + .getRecipeList()) { ItemStack tStack = tRecipe.getRecipeOutput(); if (GT_Utility.isStackValid(tStack) && tStack.getMaxStackSize() == 1 && tStack.getMaxDamage() > 0 @@ -1787,7 +1768,7 @@ public class GT_ModHandler { temp = false; break; } - if (tObject instanceof List && ((List) tObject).isEmpty()) { + if (tObject instanceof List && ((List<?>) tObject).isEmpty()) { temp = false; break; } @@ -1843,27 +1824,26 @@ public class GT_ModHandler { */ public static List<ItemStack> getRecipeOutputsBuffered(ItemStack... aRecipe) { - if (bufferedRecipes == null) bufferedRecipes = (List<IRecipe>) CraftingManager.getInstance() - .getRecipeList() - .stream() - .filter( - tRecipe -> !(tRecipe instanceof ShapelessRecipes) - && !(tRecipe instanceof ShapelessOreRecipe) - && !(tRecipe instanceof IGT_CraftingRecipe)) - .filter(tRecipe -> { - try { - ItemStack tOutput = ((IRecipe) tRecipe).getRecipeOutput(); - if (tOutput.stackSize == 1 - && tOutput.getMaxDamage() - > 0 - && tOutput.getMaxStackSize() - == 1) { - return true; - } - } catch (Exception ignored) {} - return false; - }) - .collect(Collectors.toList()); + if (bufferedRecipes == null) bufferedRecipes = CraftingManager.getInstance() + .getRecipeList() + .stream() + .filter( + tRecipe -> !(tRecipe instanceof ShapelessRecipes) + && !(tRecipe instanceof ShapelessOreRecipe) + && !(tRecipe instanceof IGT_CraftingRecipe)) + .filter(tRecipe -> { + try { + ItemStack tOutput = tRecipe.getRecipeOutput(); + if (tOutput.stackSize == 1 + && tOutput.getMaxDamage() > 0 + && tOutput.getMaxStackSize() + == 1) { + return true; + } + } catch (Exception ignored) {} + return false; + }) + .collect(Collectors.toList()); return getRecipeOutputs(bufferedRecipes, false, aRecipe); } @@ -2209,8 +2189,7 @@ public class GT_ModHandler { public static boolean useSolderingIron(ItemStack aStack, EntityLivingBase aPlayer, IInventory aExternalInventory) { if (aPlayer == null || aStack == null) return false; if (GT_Utility.isStackInList(aStack, GregTech_API.sSolderingToolList)) { - if (aPlayer instanceof EntityPlayer) { - EntityPlayer tPlayer = (EntityPlayer) aPlayer; + if (aPlayer instanceof EntityPlayer tPlayer) { if (tPlayer.capabilities.isCreativeMode) return true; if (isElectricItem(aStack) && ic2.api.item.ElectricItem.manager.getCharge(aStack) > 1000.0d) { if (consumeSolderingMaterial(tPlayer) diff --git a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java index 6670b86363..b8072f7b3b 100644 --- a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java +++ b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java @@ -305,7 +305,7 @@ public class GT_OreDictUnificator { ItemStack[] aStacks = {}; if (obj instanceof ItemStack) aStacks = new ItemStack[] { (ItemStack) obj }; else if (obj instanceof ItemStack[]) aStacks = (ItemStack[]) obj; - else if (obj instanceof List) aStacks = (ItemStack[]) ((List) obj).toArray(new ItemStack[0]); + else if (obj instanceof List) aStacks = (ItemStack[]) ((List<?>) obj).toArray(new ItemStack[0]); List<ItemStack> rList = new ArrayList<>(); for (ItemStack aStack : aStacks) { if (aStack == null) continue; diff --git a/src/main/java/gregtech/api/util/GT_ParallelHelper.java b/src/main/java/gregtech/api/util/GT_ParallelHelper.java index c12f8ec378..0914d2be29 100644 --- a/src/main/java/gregtech/api/util/GT_ParallelHelper.java +++ b/src/main/java/gregtech/api/util/GT_ParallelHelper.java @@ -32,7 +32,7 @@ public class GT_ParallelHelper { /** * @mMachineMulti a MultiTileEntity Controller */ - private MultiBlockController mMachineMulti; + private MultiBlockController<?> mMachineMulti; /** * @mRecipe Recipe used when trying to calculate parallels */ @@ -87,7 +87,7 @@ public class GT_ParallelHelper { /** * Enables void protection on a multitile multiblock. Experimental! Still needs to be worked on */ - public GT_ParallelHelper enableVoidProtection(MultiBlockController aMachineMulti) { + public GT_ParallelHelper enableVoidProtection(MultiBlockController<?> aMachineMulti) { mVoidProtection = true; mMachineMulti = aMachineMulti; return this; diff --git a/src/main/java/gregtech/api/util/GT_ProcessingArray_Manager.java b/src/main/java/gregtech/api/util/GT_ProcessingArray_Manager.java index 50014afdd1..66bc16cae3 100644 --- a/src/main/java/gregtech/api/util/GT_ProcessingArray_Manager.java +++ b/src/main/java/gregtech/api/util/GT_ProcessingArray_Manager.java @@ -7,7 +7,7 @@ import gregtech.api.util.GT_Recipe.GT_Recipe_Map; public class GT_ProcessingArray_Manager { - private static final HashMap<String, GT_Recipe_Map> mRecipeSaves = new HashMap<String, GT_Recipe_Map>(); + private static final HashMap<String, GT_Recipe_Map> mRecipeSaves = new HashMap<>(); private static final HashMap<String, SoundResource> machineSounds = new HashMap<>(); // Adds recipe Maps to the PA using the machines unlocalized name. diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index 7f39ef694d..b5603619af 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -317,31 +317,27 @@ public class GT_Recipe implements Comparable<GT_Recipe> { if (mInputs.length > 0 && aSpecialValue > 0) { switch (aType) { // Diesel Generator - case 0: + case 0 -> { GT_Recipe_Map.sDieselFuels.addRecipe(this); GT_Recipe_Map.sLargeBoilerFakeFuels.addDieselRecipe(this); - break; + } // Gas Turbine - case 1: - GT_Recipe_Map.sTurbineFuels.addRecipe(this); - break; + case 1 -> GT_Recipe_Map.sTurbineFuels.addRecipe(this); + // Thermal Generator - case 2: - GT_Recipe_Map.sHotFuels.addRecipe(this); - break; + case 2 -> GT_Recipe_Map.sHotFuels.addRecipe(this); + // Plasma Generator - case 4: - GT_Recipe_Map.sPlasmaFuels.addRecipe(this); - break; + case 4 -> GT_Recipe_Map.sPlasmaFuels.addRecipe(this); + // Magic Generator - case 5: - GT_Recipe_Map.sMagicFuels.addRecipe(this); - break; + case 5 -> GT_Recipe_Map.sMagicFuels.addRecipe(this); + // Fluid Generator. Usually 3. Every wrong Type ends up in the Semifluid Generator - default: + default -> { GT_Recipe_Map.sDenseLiquidFuels.addRecipe(this); GT_Recipe_Map.sLargeBoilerFakeFuels.addDenseLiquidRecipe(this); - break; + } } } } @@ -889,7 +885,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> { public static class GT_Recipe_AssemblyLine { - public static final ArrayList<GT_Recipe_AssemblyLine> sAssemblylineRecipes = new ArrayList<GT_Recipe_AssemblyLine>(); + public static final ArrayList<GT_Recipe_AssemblyLine> sAssemblylineRecipes = new ArrayList<>(); static { if (!Boolean.getBoolean("com.gtnh.gt5u.ignore-invalid-assline-recipe")) @@ -993,10 +989,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> { if (this == obj) { return true; } - if (!(obj instanceof GT_Recipe_AssemblyLine)) { + if (!(obj instanceof GT_Recipe_AssemblyLine other)) { return false; } - GT_Recipe_AssemblyLine other = (GT_Recipe_AssemblyLine) obj; if (this.mInputs.length != other.mInputs.length) { return false; } @@ -1244,13 +1239,12 @@ public class GT_Recipe implements Comparable<GT_Recipe> { public IDrawable getOverlayForSlot(boolean isFluid, boolean isOutput, int index, boolean isSpecial) { if (isOutput) { switch (index) { - case 0: - case 2: - case 6: - case 8: + case 0, 2, 6, 8 -> { return GT_UITextures.OVERLAY_SLOT_CIRCUIT; - case 4: + } + case 4 -> { return GT_UITextures.OVERLAY_SLOT_WRENCH; + } } } return super.getOverlayForSlot(isFluid, isOutput, index, isSpecial); @@ -4057,15 +4051,11 @@ public class GT_Recipe implements Comparable<GT_Recipe> { if (progressBarImageSize != 0) { return progressBarImageSize; } - switch (progressBarDirection) { - case UP: - case DOWN: - return progressBarSize.height; - case CIRCULAR_CW: - return Math.max(progressBarSize.width, progressBarSize.height); - default: - return progressBarSize.width; - } + return switch (progressBarDirection) { + case UP, DOWN -> progressBarSize.height; + case CIRCULAR_CW -> Math.max(progressBarSize.width, progressBarSize.height); + default -> progressBarSize.width; + }; } /** diff --git a/src/main/java/gregtech/api/util/GT_RecipeBuilder.java b/src/main/java/gregtech/api/util/GT_RecipeBuilder.java index dc3dd8bba1..eeeb60de94 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeBuilder.java +++ b/src/main/java/gregtech/api/util/GT_RecipeBuilder.java @@ -141,8 +141,7 @@ public class GT_RecipeBuilder { alts[i] = new ItemStack[] { (ItemStack) input }; } else if (input instanceof ItemStack[]) { alts[i] = ((ItemStack[]) input).clone(); - } else if (input instanceof Object[]) { - Object[] arr = (Object[]) input; + } else if (input instanceof Object[]arr) { if (arr.length != 2) continue; List<ItemStack> ores = GT_OreDictUnificator.getOres(arr[0]); if (ores.isEmpty()) continue; diff --git a/src/main/java/gregtech/api/util/GT_RecipeConstants.java b/src/main/java/gregtech/api/util/GT_RecipeConstants.java index 701e1ee4a8..206cb38118 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeConstants.java +++ b/src/main/java/gregtech/api/util/GT_RecipeConstants.java @@ -149,8 +149,7 @@ public class GT_RecipeConstants { tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(alt, true, false); } tPersistentHash *= 31; - } else if (input instanceof Object[]) { - Object[] objs = (Object[]) input; + } else if (input instanceof Object[]objs) { Arrays.sort( alts, Comparator.<ItemStack, String>comparing( diff --git a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java index b6a4b960c7..19afbb9ff0 100644 --- a/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/src/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -40,7 +40,7 @@ public class GT_RecipeRegistrator { * List of Materials, which are used in the Creation of Sticks. All Rod Materials are automatically added to this * List. */ - public static final List<Materials> sRodMaterialList = new ArrayList<Materials>(); + public static final List<Materials> sRodMaterialList = new ArrayList<>(); private static final ItemStack sMt1 = new ItemStack(Blocks.dirt, 1, 0), sMt2 = new ItemStack(Blocks.dirt, 1, 0); private static final String s_H = "h", s_F = "f", s_I = "I", s_P = "P", s_R = "R"; @@ -591,31 +591,23 @@ public class GT_RecipeRegistrator { true)) { if (null != (tStack = GT_ModHandler.removeRecipe(tRecipe.shape))) { switch (sShapesA[i].length) { - case 2: - GT_ModHandler.addCraftingRecipe( - tStack, - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { sShapesA[i][1], s_P.charAt(0), aPlate, s_R.charAt(0), - OrePrefixes.stick.get(tMaterial), s_I.charAt(0), - aItemData }); - break; - case 3: - GT_ModHandler.addCraftingRecipe( - tStack, - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { sShapesA[i][1], sShapesA[i][2], s_P.charAt(0), - aPlate, s_R.charAt(0), OrePrefixes.stick.get(tMaterial), - s_I.charAt(0), aItemData }); - break; - default: - GT_ModHandler.addCraftingRecipe( - tStack, - GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { sShapesA[i][1], sShapesA[i][2], sShapesA[i][3], - s_P.charAt(0), aPlate, s_R.charAt(0), - OrePrefixes.stick.get(tMaterial), s_I.charAt(0), - aItemData }); - break; + case 2 -> GT_ModHandler.addCraftingRecipe( + tStack, + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { sShapesA[i][1], s_P.charAt(0), aPlate, s_R.charAt(0), + OrePrefixes.stick.get(tMaterial), s_I.charAt(0), aItemData }); + case 3 -> GT_ModHandler.addCraftingRecipe( + tStack, + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { sShapesA[i][1], sShapesA[i][2], s_P.charAt(0), aPlate, + s_R.charAt(0), OrePrefixes.stick.get(tMaterial), s_I.charAt(0), + aItemData }); + default -> GT_ModHandler.addCraftingRecipe( + tStack, + GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { sShapesA[i][1], sShapesA[i][2], sShapesA[i][3], + s_P.charAt(0), aPlate, s_R.charAt(0), + OrePrefixes.stick.get(tMaterial), s_I.charAt(0), aItemData }); } } } @@ -628,7 +620,7 @@ public class GT_RecipeRegistrator { /** * Registers wiremill recipes for given material using integrated circuits. - * + * * @param aMaterial material to register * @param baseDuration base duration ticks for ingot -> 1x wire recipe * @param aEUt EU/t for recipe If you provide a proper EU tier for recipe processing then aEUt will be @@ -646,7 +638,7 @@ public class GT_RecipeRegistrator { /** * Registers wiremill recipes for given material using integrated circuits. - * + * * @param aMaterial material to register * @param baseDuration base duration ticks for ingot -> 1x wire recipe * @param aEUt EU/t for recipe diff --git a/src/main/java/gregtech/api/util/GT_RenderingWorld.java b/src/main/java/gregtech/api/util/GT_RenderingWorld.java index b8caa59554..4ada7decab 100644 --- a/src/main/java/gregtech/api/util/GT_RenderingWorld.java +++ b/src/main/java/gregtech/api/util/GT_RenderingWorld.java @@ -3,6 +3,7 @@ package gregtech.api.util; import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import java.util.Objects; import java.util.Set; import net.minecraft.block.Block; @@ -181,7 +182,7 @@ public class GT_RenderingWorld implements IBlockAccess { BlockInfo blockInfo = (BlockInfo) o; if (meta != blockInfo.meta) return false; - return block != null ? block.equals(blockInfo.block) : blockInfo.block == null; + return Objects.equals(block, blockInfo.block); } @Override diff --git a/src/main/java/gregtech/api/util/GT_StructureUtility.java b/src/main/java/gregtech/api/util/GT_StructureUtility.java index 80fc64a8c3..703e056bc9 100644 --- a/src/main/java/gregtech/api/util/GT_StructureUtility.java +++ b/src/main/java/gregtech/api/util/GT_StructureUtility.java @@ -59,15 +59,14 @@ public class GT_StructureUtility { public static <T> IStructureElement<T> ofFrame(Materials aFrameMaterial) { if (aFrameMaterial == null) throw new IllegalArgumentException(); - return new IStructureElement<T>() { + return new IStructureElement<>() { private IIcon[] mIcons; @Override public boolean check(T t, World world, int x, int y, int z) { TileEntity tBase = world.getTileEntity(x, y, z); - if (tBase instanceof BaseMetaPipeEntity) { - BaseMetaPipeEntity tPipeBase = (BaseMetaPipeEntity) tBase; + if (tBase instanceof BaseMetaPipeEntity tPipeBase) { if (tPipeBase.isInvalidTileEntity()) return false; if (tPipeBase.getMetaTileEntity() instanceof GT_MetaPipeEntity_Frame) return aFrameMaterial == ((GT_MetaPipeEntity_Frame) tPipeBase.getMetaTileEntity()).mMaterial; @@ -88,9 +87,9 @@ public class GT_StructureUtility { @Override public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { ItemStack tFrameStack = getFrameStack(); - if (!GT_Utility.isStackValid(tFrameStack) || !(tFrameStack.getItem() instanceof ItemBlock)) + if (!GT_Utility.isStackValid(tFrameStack) + || !(tFrameStack.getItem() instanceof ItemBlock tFrameStackItem)) return false; - ItemBlock tFrameStackItem = (ItemBlock) tFrameStack.getItem(); return tFrameStackItem.placeBlockAt( tFrameStack, null, @@ -171,7 +170,7 @@ public class GT_StructureUtility { if (aHatchAdder == null || aHintBlock == null) { throw new IllegalArgumentException(); } - return new IStructureElementNoPlacement<T>() { + return new IStructureElementNoPlacement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -194,7 +193,7 @@ public class GT_StructureUtility { if (aHatchAdder == null) { throw new IllegalArgumentException(); } - return new IStructureElement<T>() { + return new IStructureElement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -280,7 +279,7 @@ public class GT_StructureUtility { if (aHatchAdder == null) { throw new IllegalArgumentException(); } - return new IStructureElement<T>() { + return new IStructureElement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -379,7 +378,7 @@ public class GT_StructureUtility { if (aHatchAdder == null || aHintBlock == null) { throw new IllegalArgumentException(); } - return new IStructureElement<T>() { + return new IStructureElement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { @@ -446,7 +445,7 @@ public class GT_StructureUtility { if (aHeatingCoilSetter == null || aHeatingCoilGetter == null) { throw new IllegalArgumentException(); } - return new IStructureElement<T>() { + return new IStructureElement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { diff --git a/src/main/java/gregtech/api/util/GT_TooltipDataCache.java b/src/main/java/gregtech/api/util/GT_TooltipDataCache.java index 699517d288..cb702688cf 100644 --- a/src/main/java/gregtech/api/util/GT_TooltipDataCache.java +++ b/src/main/java/gregtech/api/util/GT_TooltipDataCache.java @@ -72,7 +72,7 @@ public class GT_TooltipDataCache { * @return The lines for the key and all of it's subkeys */ private List<String> getAllLines(String key, Object... args) { - List<String> lines = new ArrayList<String>(); + List<String> lines = new ArrayList<>(); String keyToLookup = key; int i = 1; // First loop has no .number postfix while (StatCollector.canTranslate(keyToLookup)) { diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 859c1ab84b..12e5022ef0 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -82,6 +82,8 @@ import net.minecraftforge.fluids.IFluidContainerItem; import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.oredict.OreDictionary; +import buildcraft.api.transport.IPipeTile; +import cofh.api.energy.IEnergyReceiver; import cofh.api.transport.IItemDuct; import com.google.auto.value.AutoValue; @@ -212,7 +214,7 @@ public class GT_Utility { return rField; } - public static Field getField(Class aObject, String aField) { + public static Field getField(Class<?> aObject, String aField) { Field rField = null; try { rField = aObject.getDeclaredField(aField); @@ -223,7 +225,7 @@ public class GT_Utility { return rField; } - public static Method getMethod(Class aObject, String aMethod, Class<?>... aParameterTypes) { + public static Method getMethod(Class<?> aObject, String aMethod, Class<?>... aParameterTypes) { Method rMethod = null; try { rMethod = aObject.getMethod(aMethod, aParameterTypes); @@ -248,7 +250,7 @@ public class GT_Utility { public static Field getField(Object aObject, String aField, boolean aPrivate, boolean aLogErrors) { try { - Field tField = (aObject instanceof Class) ? ((Class) aObject).getDeclaredField(aField) + Field tField = (aObject instanceof Class) ? ((Class<?>) aObject).getDeclaredField(aField) : (aObject instanceof String) ? Class.forName((String) aObject) .getDeclaredField(aField) : aObject.getClass() @@ -263,7 +265,7 @@ public class GT_Utility { public static Object getFieldContent(Object aObject, String aField, boolean aPrivate, boolean aLogErrors) { try { - Field tField = (aObject instanceof Class) ? ((Class) aObject).getDeclaredField(aField) + Field tField = (aObject instanceof Class) ? ((Class<?>) aObject).getDeclaredField(aField) : (aObject instanceof String) ? Class.forName((String) aObject) .getDeclaredField(aField) : aObject.getClass() @@ -290,7 +292,7 @@ public class GT_Utility { Class<?>[] tParameterTypes = new Class<?>[aParameters.length]; for (byte i = 0; i < aParameters.length; i++) { if (aParameters[i] instanceof Class) { - tParameterTypes[i] = (Class) aParameters[i]; + tParameterTypes[i] = (Class<?>) aParameters[i]; aParameters[i] = null; } else { tParameterTypes[i] = aParameters[i].getClass(); @@ -306,7 +308,7 @@ public class GT_Utility { } } - Method tMethod = (aObject instanceof Class) ? ((Class) aObject).getMethod(aMethod, tParameterTypes) + Method tMethod = (aObject instanceof Class) ? ((Class<?>) aObject).getMethod(aMethod, tParameterTypes) : aObject.getClass() .getMethod(aMethod, tParameterTypes); if (aPrivate) tMethod.setAccessible(true); @@ -375,7 +377,7 @@ public class GT_Utility { } } - if (tPotionHashmap != null) return ((HashMap) tPotionHashmap.get(aPlayer)).get(aPotionIndex) != null; + if (tPotionHashmap != null) return ((HashMap<?, ?>) tPotionHashmap.get(aPlayer)).get(aPotionIndex) != null; } catch (Throwable e) { if (D1) e.printStackTrace(GT_Log.err); } @@ -406,7 +408,7 @@ public class GT_Utility { } } - if (tPotionHashmap != null) ((HashMap) tPotionHashmap.get(aPlayer)).remove(aPotionIndex); + if (tPotionHashmap != null) ((HashMap<?, ?>) tPotionHashmap.get(aPlayer)).remove(aPotionIndex); } catch (Throwable e) { if (D1) e.printStackTrace(GT_Log.err); } @@ -436,7 +438,7 @@ public class GT_Utility { public static ItemStack suckOneItemStackAt(World aWorld, double aX, double aY, double aZ, double aL, double aH, double aW) { - for (EntityItem tItem : (ArrayList<EntityItem>) aWorld.getEntitiesWithinAABB( + for (EntityItem tItem : aWorld.getEntitiesWithinAABB( EntityItem.class, AxisAlignedBB.getBoundingBox(aX, aY, aZ, aX + aL, aY + aH, aZ + aW))) { if (!tItem.isDead) { @@ -477,21 +479,21 @@ public class GT_Utility { public static void checkAvailabilities() { if (CHECK_ALL) { try { - Class tClass = IItemDuct.class; + Class<IItemDuct> tClass = IItemDuct.class; tClass.getCanonicalName(); TE_CHECK = true; } catch (Throwable e) { /**/ } try { - Class tClass = buildcraft.api.transport.IPipeTile.class; + Class<IPipeTile> tClass = buildcraft.api.transport.IPipeTile.class; tClass.getCanonicalName(); BC_CHECK = true; } catch (Throwable e) { /**/ } try { - Class tClass = cofh.api.energy.IEnergyReceiver.class; + Class<IEnergyReceiver> tClass = cofh.api.energy.IEnergyReceiver.class; tClass.getCanonicalName(); RF_CHECK = true; } catch (Throwable e) { @@ -820,8 +822,7 @@ public class GT_Utility { } // if target is an inventory, e.g. chest, machine, drawers... - if (aTileEntity2 instanceof IInventory) { - final IInventory tPutInventory = (IInventory) aTileEntity2; + if (aTileEntity2 instanceof IInventory tPutInventory) { // partially filled slot spare space mapping. // value is the sum of all spare space left not counting completely empty slot @@ -1261,8 +1262,7 @@ public class GT_Utility { if (tMovedItemCount > 0) return tMovedItemCount; } - if (aDoCheckChests && aTileEntity1 instanceof TileEntityChest) { - TileEntityChest tTileEntity1 = (TileEntityChest) aTileEntity1; + if (aDoCheckChests && aTileEntity1 instanceof TileEntityChest tTileEntity1) { if (tTileEntity1.adjacentChestChecked) { byte tAmount = 0; if (tTileEntity1.adjacentChestXNeg != null) { @@ -1321,8 +1321,7 @@ public class GT_Utility { if (tAmount != 0) return tAmount; } } - if (aDoCheckChests && aTileEntity2 instanceof TileEntityChest) { - TileEntityChest tTileEntity2 = (TileEntityChest) aTileEntity2; + if (aDoCheckChests && aTileEntity2 instanceof TileEntityChest tTileEntity2) { if (tTileEntity2.adjacentChestChecked) { byte tAmount = 0; if (tTileEntity2.adjacentChestXNeg != null) { @@ -1566,8 +1565,7 @@ public class GT_Utility { } if (tMovedItemCount > 0) return tMovedItemCount; - if (aDoCheckChests && toTile instanceof TileEntityChest) { - TileEntityChest tTileEntity2 = (TileEntityChest) toTile; + if (aDoCheckChests && toTile instanceof TileEntityChest tTileEntity2) { if (tTileEntity2.adjacentChestChecked) { if (tTileEntity2.adjacentChestXNeg != null) { tMovedItemCount = moveFromSlotToSide( @@ -2342,11 +2340,12 @@ public class GT_Utility { return listContains(aObject, Arrays.asList(aObjects)); } - public static boolean listContains(Object aObject, Collection aObjects) { + public static boolean listContains(Object aObject, Collection<?> aObjects) { if (aObjects == null) return false; return aObjects.contains(aObject); } + @SafeVarargs public static <T> boolean arrayContainsNonNull(T... aArray) { if (aArray != null) for (Object tObject : aArray) if (tObject != null) return true; return false; @@ -2355,6 +2354,7 @@ public class GT_Utility { /** * Note: use {@link ArrayExt#withoutNulls(Object[], IntFunction)} if you want an array as a result. */ + @SafeVarargs public static <T> ArrayList<T> getArrayListWithoutNulls(T... aArray) { if (aArray == null) return new ArrayList<>(); ArrayList<T> rList = new ArrayList<>(Arrays.asList(aArray)); @@ -2365,6 +2365,7 @@ public class GT_Utility { /** * Note: use {@link ArrayExt#withoutTrailingNulls(Object[], IntFunction)} if you want an array as a result. */ + @SafeVarargs public static <T> ArrayList<T> getArrayListWithoutTrailingNulls(T... aArray) { if (aArray == null) return new ArrayList<>(); ArrayList<T> rList = new ArrayList<>(Arrays.asList(aArray)); @@ -2731,7 +2732,7 @@ public class GT_Utility { Map<Integer, Integer> tEnchantments = EnchantmentHelper.getEnchantments(aStack); Integer tLevel = tEnchantments.get(Enchantment_Hazmat.INSTANCE.effectId); - if (tLevel != null && tLevel.intValue() >= 1) { + if (tLevel != null && tLevel >= 1) { return true; } return false; @@ -3002,6 +3003,7 @@ public class GT_Utility { return aList.get(aIndex); } + @SafeVarargs public static <E> E selectItemInList(int aIndex, E aReplacement, E... aList) { if (aList == null || aList.length == 0) return aReplacement; if (aList.length <= aIndex) return aList[aList.length - 1]; @@ -3053,7 +3055,7 @@ public class GT_Utility { /** * Why the fuck do neither Java nor Guava have a Function to do this? */ - public static <X, Y extends Comparable> LinkedHashMap<X, Y> sortMapByValuesDescending(Map<X, Y> aMap) { + public static <X, Y extends Comparable<Y>> LinkedHashMap<X, Y> sortMapByValuesDescending(Map<X, Y> aMap) { List<Map.Entry<X, Y>> tEntrySet = new LinkedList<>(aMap.entrySet()); tEntrySet.sort((aValue1, aValue2) -> { return aValue2.getValue() @@ -3101,9 +3103,9 @@ public class GT_Utility { if (entity.riddenByEntity != null) entity.riddenByEntity.mountEntity(null); World startWorld = entity.worldObj; - World destinationWorld = FMLCommonHandler.instance() - .getMinecraftServerInstance() - .worldServerForDimension(aDimension); + WorldServer destinationWorld = FMLCommonHandler.instance() + .getMinecraftServerInstance() + .worldServerForDimension(aDimension); if (destinationWorld == null) { return false; @@ -3143,7 +3145,7 @@ public class GT_Utility { entity.setLocationAndAngles(aX, aY, aZ, entity.rotationYaw, entity.rotationPitch); - ((WorldServer) destinationWorld).theChunkProviderServer.loadChunk((int) aX >> 4, (int) aZ >> 4); + destinationWorld.theChunkProviderServer.loadChunk((int) aX >> 4, (int) aZ >> 4); destinationWorld.theProfiler.startSection("placing"); if (interDimensional) { @@ -3171,7 +3173,7 @@ public class GT_Utility { EntityPlayerMP player = (EntityPlayerMP) entity; if (interDimensional) { player.mcServer.getConfigurationManager() - .func_72375_a(player, (WorldServer) destinationWorld); + .func_72375_a(player, destinationWorld); } player.playerNetServerHandler.setPlayerLocation(aX, aY, aZ, player.rotationYaw, player.rotationPitch); } @@ -3180,13 +3182,13 @@ public class GT_Utility { if (((entity instanceof EntityPlayerMP)) && interDimensional) { EntityPlayerMP player = (EntityPlayerMP) entity; - player.theItemInWorldManager.setWorld((WorldServer) destinationWorld); + player.theItemInWorldManager.setWorld(destinationWorld); player.mcServer.getConfigurationManager() - .updateTimeAndWeatherForPlayer(player, (WorldServer) destinationWorld); + .updateTimeAndWeatherForPlayer(player, destinationWorld); player.mcServer.getConfigurationManager() .syncPlayerInventory(player); - for (PotionEffect potionEffect : (Iterable<PotionEffect>) player.getActivePotionEffects()) { + for (PotionEffect potionEffect : player.getActivePotionEffects()) { player.playerNetServerHandler.sendPacket(new S1DPacketEntityEffect(player.getEntityId(), potionEffect)); } @@ -3500,9 +3502,8 @@ public class GT_Utility { if (D1) e.printStackTrace(GT_Log.err); } try { - if (tTileEntity instanceof ic2.api.crops.ICropTile) { + if (tTileEntity instanceof ic2.api.crops.ICropTile crop) { rEUAmount += 1000; - final ic2.api.crops.ICropTile crop = (ic2.api.crops.ICropTile) tTileEntity; if (crop.getScanLevel() < 4) crop.setScanLevel((byte) 4); if (crop.getCrop() != null) { tList.add( @@ -3548,8 +3549,7 @@ public class GT_Utility { } try { - if (tTileEntity instanceof forestry.arboriculture.tiles.TileLeaves) { - final forestry.arboriculture.tiles.TileLeaves tileLeaves = (forestry.arboriculture.tiles.TileLeaves) tTileEntity; + if (tTileEntity instanceof forestry.arboriculture.tiles.TileLeaves tileLeaves) { final forestry.api.arboriculture.ITree tree = tileLeaves.getTree(); if (tree != null) { rEUAmount += 1000; @@ -3638,22 +3638,15 @@ public class GT_Utility { * like on the Texture Sheet. return values should always be between [0.0F and 0.99F]. */ public static float[] getClickedFacingCoords(byte aSide, float aX, float aY, float aZ) { - switch (aSide) { - case 0: - return new float[] { Math.min(0.99F, Math.max(0, 1 - aX)), Math.min(0.99F, Math.max(0, aZ)) }; - case 1: - return new float[] { Math.min(0.99F, Math.max(0, aX)), Math.min(0.99F, Math.max(0, aZ)) }; - case 2: - return new float[] { Math.min(0.99F, Math.max(0, 1 - aX)), Math.min(0.99F, Math.max(0, 1 - aY)) }; - case 3: - return new float[] { Math.min(0.99F, Math.max(0, aX)), Math.min(0.99F, Math.max(0, 1 - aY)) }; - case 4: - return new float[] { Math.min(0.99F, Math.max(0, aZ)), Math.min(0.99F, Math.max(0, 1 - aY)) }; - case 5: - return new float[] { Math.min(0.99F, Math.max(0, 1 - aZ)), Math.min(0.99F, Math.max(0, 1 - aY)) }; - default: - return new float[] { 0.5F, 0.5F }; - } + return switch (aSide) { + case 0 -> new float[] { Math.min(0.99F, Math.max(0, 1 - aX)), Math.min(0.99F, Math.max(0, aZ)) }; + case 1 -> new float[] { Math.min(0.99F, Math.max(0, aX)), Math.min(0.99F, Math.max(0, aZ)) }; + case 2 -> new float[] { Math.min(0.99F, Math.max(0, 1 - aX)), Math.min(0.99F, Math.max(0, 1 - aY)) }; + case 3 -> new float[] { Math.min(0.99F, Math.max(0, aX)), Math.min(0.99F, Math.max(0, 1 - aY)) }; + case 4 -> new float[] { Math.min(0.99F, Math.max(0, aZ)), Math.min(0.99F, Math.max(0, 1 - aY)) }; + case 5 -> new float[] { Math.min(0.99F, Math.max(0, 1 - aZ)), Math.min(0.99F, Math.max(0, 1 - aY)) }; + default -> new float[] { 0.5F, 0.5F }; + }; } /** @@ -3663,8 +3656,7 @@ public class GT_Utility { public static byte determineWrenchingSide(byte aSide, float aX, float aY, float aZ) { byte tBack = getOppositeSide(aSide); switch (aSide) { - case 0: - case 1: + case 0, 1 -> { if (aX < 0.25) { if (aZ < 0.25) return tBack; if (aZ > 0.75) return tBack; @@ -3678,8 +3670,8 @@ public class GT_Utility { if (aZ < 0.25) return 2; if (aZ > 0.75) return 3; return aSide; - case 2: - case 3: + } + case 2, 3 -> { if (aX < 0.25) { if (aY < 0.25) return tBack; if (aY > 0.75) return tBack; @@ -3693,8 +3685,8 @@ public class GT_Utility { if (aY < 0.25) return 0; if (aY > 0.75) return 1; return aSide; - case 4: - case 5: + } + case 4, 5 -> { if (aZ < 0.25) { if (aY < 0.25) return tBack; if (aY > 0.75) return tBack; @@ -3708,6 +3700,7 @@ public class GT_Utility { if (aY < 0.25) return 0; if (aY > 0.75) return 1; return aSide; + } } return -1; } @@ -3846,14 +3839,14 @@ public class GT_Utility { return; } ArrayList<String> tTagsToRemove = new ArrayList<>(); - for (Object tKey : aNBT.func_150296_c()) { - NBTBase tValue = aNBT.getTag((String) tKey); + for (String tKey : aNBT.func_150296_c()) { + NBTBase tValue = aNBT.getTag(tKey); if (tValue == null || (tValue instanceof NBTPrimitive && ((NBTPrimitive) tValue).func_150291_c() == 0) || (tValue instanceof NBTTagString && isStringInvalid(((NBTTagString) tValue).func_150285_a_()))) - tTagsToRemove.add((String) tKey); + tTagsToRemove.add(tKey); } - for (Object tKey : tTagsToRemove) aNBT.removeTag((String) tKey); + for (String tKey : tTagsToRemove) aNBT.removeTag(tKey); aStack.setTagCompound(aNBT.hasNoTags() ? null : aNBT); } @@ -4074,17 +4067,17 @@ public class GT_Utility { if (tOils != null) fillBookWithList(tNBTList, "Oils%s\n\n", "\n", 9, tOils); - tPageText = "Oil notes\n\n" + "Prospects from NW to SE 576 chunks" - + "(9 8x8 oilfields)\n around and gives min-max amount" - + "\n\n" - + "[1][2][3]" - + "\n" - + "[4][5][6]" - + "\n" - + "[7][8][9]" - + "\n" - + "\n" - + "[5] - Prospector in this 8x8 area"; + tPageText = """ + Oil notes + + Prospects from NW to SE 576 chunks(9 8x8 oilfields) + around and gives min-max amount + + [1][2][3] + [4][5][6] + [7][8][9] + + [5] - Prospector in this 8x8 area"""; tNBTList.appendTag(new NBTTagString(tPageText)); tPageText = "Corners of [5] are \n" + tOilsPosStr + "\n" + "P - Prospector in 8x8 field"; @@ -4373,8 +4366,7 @@ public class GT_Utility { ItemStack toAdd = ((ItemStack) o.getKey()).copy(); toAdd.stackSize = amount; inputs.add(toAdd); - } else if (o.getKey() instanceof String) { - final String dictName = (String) o.getKey(); + } else if (o.getKey() instanceof String dictName) { // Do not register tools dictName in inputs if (ToolDictNames.contains(dictName)) continue; ItemStack stack = GT_OreDictUnificator.get(dictName, null, amount, false, true); @@ -4434,7 +4426,7 @@ public class GT_Utility { } public static int clamp(int val, int lo, int hi) { - return val > hi ? hi : val < lo ? lo : val; + return MathHelper.clamp_int(val, lo, hi); } public static int ceilDiv(int lhs, int rhs) { diff --git a/src/main/java/gregtech/api/util/LightingHelper.java b/src/main/java/gregtech/api/util/LightingHelper.java index 25897487d2..986ac9d3aa 100644 --- a/src/main/java/gregtech/api/util/LightingHelper.java +++ b/src/main/java/gregtech/api/util/LightingHelper.java @@ -307,22 +307,15 @@ public class LightingHelper { * @see #setupLightingZPos(Block, int, int, int) */ public LightingHelper setupLighting(Block block, int x, int y, int z, byte facing) { - switch (facing) { - case 0: - return setupLightingYNeg(block, x, y, z); - case 1: - return setupLightingYPos(block, x, y, z); - case 2: - return setupLightingZNeg(block, x, y, z); - case 3: - return setupLightingZPos(block, x, y, z); - case 4: - return setupLightingXNeg(block, x, y, z); - case 5: - return setupLightingXPos(block, x, y, z); - default: - throw new IllegalArgumentException("Unknown side: " + facing); - } + return switch (facing) { + case 0 -> setupLightingYNeg(block, x, y, z); + case 1 -> setupLightingYPos(block, x, y, z); + case 2 -> setupLightingZNeg(block, x, y, z); + case 3 -> setupLightingZPos(block, x, y, z); + case 4 -> setupLightingXNeg(block, x, y, z); + case 5 -> setupLightingXPos(block, x, y, z); + default -> throw new IllegalArgumentException("Unknown side: " + facing); + }; } /** diff --git a/src/main/java/gregtech/api/world/GT_Worldgen.java b/src/main/java/gregtech/api/world/GT_Worldgen.java index 742651b02a..ae6fc930a4 100644 --- a/src/main/java/gregtech/api/world/GT_Worldgen.java +++ b/src/main/java/gregtech/api/world/GT_Worldgen.java @@ -14,8 +14,9 @@ public abstract class GT_Worldgen { public final String mWorldGenName; public final boolean mEnabled; - private final Map<String, Boolean> mDimensionMap = new ConcurrentHashMap<String, Boolean>(); + private final Map<String, Boolean> mDimensionMap = new ConcurrentHashMap<>(); + @SuppressWarnings({ "unchecked", "rawtypes" }) // The adding of "this" needs a List<this> which does not exist public GT_Worldgen(String aName, List aList, boolean aDefault) { mWorldGenName = aName; mEnabled = GregTech_API.sWorldgenFile.get("worldgen", mWorldGenName, aDefault); diff --git a/src/main/java/gregtech/api/world/GT_Worldgen_Ore.java b/src/main/java/gregtech/api/world/GT_Worldgen_Ore.java index d3aa6b0e10..c40b3dfe13 100644 --- a/src/main/java/gregtech/api/world/GT_Worldgen_Ore.java +++ b/src/main/java/gregtech/api/world/GT_Worldgen_Ore.java @@ -27,7 +27,7 @@ public abstract class GT_Worldgen_Ore extends GT_Worldgen { mSize = GregTech_API.sWorldgenFile.get(aTextWorldgen + mWorldGenName, "Size", aSize); mMinY = GregTech_API.sWorldgenFile.get(aTextWorldgen + mWorldGenName, "MinHeight", aMinY); mMaxY = GregTech_API.sWorldgenFile.get(aTextWorldgen + mWorldGenName, "MaxHeight", aMaxY); - if (aBiomeList == null) mBiomeList = new ArrayList<String>(); + if (aBiomeList == null) mBiomeList = new ArrayList<>(); else mBiomeList = aBiomeList; mAllowToGenerateinVoid = aAllowToGenerateinVoid; } 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() { diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 7970dd695f..c7ca40e111 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -390,9 +390,8 @@ public class GT_Achievements { AchievementPage.registerAchievementPage( new AchievementPage( "GregTech 5", - (Achievement[]) this.achievementList.values() - .toArray( - new Achievement[this.achievementList.size()]))); + this.achievementList.values() + .toArray(new Achievement[0]))); MinecraftForge.EVENT_BUS.register(this); FMLCommonHandler.instance() .bus() @@ -425,7 +424,7 @@ public class GT_Achievements { boolean special) { if (!GT_Mod.gregtechproxy.mAchievements) { return null; - } ; + } Achievement achievement = new Achievement( textId, textId, @@ -481,12 +480,12 @@ public class GT_Achievements { if (entityplayer == null || !GT_Mod.gregtechproxy.mAchievements) { return; } - entityplayer.triggerAchievement((StatBase) this.achievementList.get(textId)); + entityplayer.triggerAchievement(this.achievementList.get(textId)); } public Achievement getAchievement(String textId) { if (this.achievementList.containsKey(textId)) { - return (Achievement) this.achievementList.get(textId); + return this.achievementList.get(textId); } return null; } @@ -533,24 +532,12 @@ public class GT_Achievements { } switch (fluid.getFluid() .getUnlocalizedName()) { - case "fluid.plasma.helium": - issueAchievement(player, "fusion"); - break; - case "fluid.molten.europium": - issueAchievement(player, "advancing"); - break; - case "fluid.molten.naquadah": - issueAchievement(player, "stargateliquid"); - break; - case "fluid.molten.americium": - issueAchievement(player, "tothelimit"); - break; - case "fluid.molten.neutronium": - issueAchievement(player, "denseaspossible"); - break; - case "fluid.plasma.nitrogen": - issueAchievement(player, "higherefficency"); - break; + case "fluid.plasma.helium" -> issueAchievement(player, "fusion"); + case "fluid.molten.europium" -> issueAchievement(player, "advancing"); + case "fluid.molten.naquadah" -> issueAchievement(player, "stargateliquid"); + case "fluid.molten.americium" -> issueAchievement(player, "tothelimit"); + case "fluid.molten.neutronium" -> issueAchievement(player, "denseaspossible"); + case "fluid.plasma.nitrogen" -> issueAchievement(player, "higherefficency"); } } @@ -570,34 +557,18 @@ public class GT_Achievements { if (stack.getUnlocalizedName() .startsWith("gt.metaitem.")) { switch (stack.getUnlocalizedName()) { - case "gt.metaitem.01.2300": - issueAchievement(player, "bronze"); - break; - case "gt.metaitem.01.32700": - issueAchievement(player, "smallparts"); - break; - case "gt.metaitem.01.32702": - issueAchievement(player, "bettercircuits"); - break; - case "gt.metaitem.01.23354": - issueAchievement(player, "magneticiron"); - break; - case "gt.metaitem.01.32600": + case "gt.metaitem.01.2300" -> issueAchievement(player, "bronze"); + case "gt.metaitem.01.32700" -> issueAchievement(player, "smallparts"); + case "gt.metaitem.01.32702" -> issueAchievement(player, "bettercircuits"); + case "gt.metaitem.01.23354" -> issueAchievement(player, "magneticiron"); + case "gt.metaitem.01.32600" -> { issueAchievement(player, "lvmotor"); issueAchievement(player, "buildCable"); - break; - case "gt.metaitem.01.32610": - issueAchievement(player, "pumpcover"); - break; - case "gt.metaitem.01.32630": - issueAchievement(player, "transport"); - break; - case "gt.metaitem.01.32650": - issueAchievement(player, "complexmachines"); - break; - case "gt.metaitem.01.32670": - issueAchievement(player, "hightech"); - break; + } + case "gt.metaitem.01.32610" -> issueAchievement(player, "pumpcover"); + case "gt.metaitem.01.32630" -> issueAchievement(player, "transport"); + case "gt.metaitem.01.32650" -> issueAchievement(player, "complexmachines"); + case "gt.metaitem.01.32670" -> issueAchievement(player, "hightech"); } } else if (stack.getUnlocalizedName() .equals("ic2.blockCrop")) { @@ -943,87 +914,33 @@ public class GT_Achievements { if (stack.getUnlocalizedName() .startsWith("gt.metaitem.")) { switch (stack.getUnlocalizedName()) { - case "gt.metaitem.02.32500": - issueAchievement(player, "havestlead"); - break; - case "gt.metaitem.02.32501": - issueAchievement(player, "havestsilver"); - break; - case "gt.metaitem.02.32503": - issueAchievement(player, "havestiron"); - break; - case "gt.metaitem.02.32504": - issueAchievement(player, "havestgold"); - break; - case "gt.metaitem.02.32530": - issueAchievement(player, "havestcopper"); - break; - case "gt.metaitem.02.32540": - issueAchievement(player, "havesttin"); - break; - case "gt.metaitem.02.32510": - issueAchievement(player, "havestoil"); - break; - case "gt.metaitem.02.32511": - issueAchievement(player, "havestemeralds"); - break; - case "gt.metaitem.03.32082": - issueAchievement(player, "energyflow"); - break; - case "gt.metaitem.01.32702": - issueAchievement(player, "bettercircuits"); - break; - case "gt.metaitem.01.32707": - issueAchievement(player, "datasaving"); - break; - case "gt.metaitem.01.32597": - issueAchievement(player, "orbs"); - break; - case "gt.metaitem.01.32599": - issueAchievement(player, "thatspower"); - break; - case "gt.metaitem.01.32598": - issueAchievement(player, "luck"); - break; - case "gt.metaitem.01.32749": - issueAchievement(player, "closeit"); - break; - case "gt.metaitem.01.32730": - issueAchievement(player, "manipulation"); - break; - case "gt.metaitem.01.32729": - issueAchievement(player, "filterregulate"); - break; - case "gt.metaitem.01.32605": - issueAchievement(player, "whatnow"); - break; - case "gt.metaitem.01.32736": - issueAchievement(player, "zpmage"); - break; - case "gt.metaitem.01.32737": - issueAchievement(player, "uvage"); - break; - case "gt.metaitem.03.32030": - issueAchievement(player, "gtmonosilicon"); - break; - case "gt.metaitem.03.32036": - issueAchievement(player, "gtlogicwafer"); - break; - case "gt.metaitem.01.32701": - issueAchievement(player, "gtlogiccircuit"); - break; - case "gt.metaitem.03.32085": - issueAchievement(player, "gtquantumprocessor"); - break; - case "gt.metaitem.03.32089": - issueAchievement(player, "gtcrystalprocessor"); - break; - case "gt.metaitem.03.32092": - issueAchievement(player, "gtwetware"); - break; - case "gt.metaitem.03.32095": - issueAchievement(player, "gtwetmain"); - break; + case "gt.metaitem.02.32500" -> issueAchievement(player, "havestlead"); + case "gt.metaitem.02.32501" -> issueAchievement(player, "havestsilver"); + case "gt.metaitem.02.32503" -> issueAchievement(player, "havestiron"); + case "gt.metaitem.02.32504" -> issueAchievement(player, "havestgold"); + case "gt.metaitem.02.32530" -> issueAchievement(player, "havestcopper"); + case "gt.metaitem.02.32540" -> issueAchievement(player, "havesttin"); + case "gt.metaitem.02.32510" -> issueAchievement(player, "havestoil"); + case "gt.metaitem.02.32511" -> issueAchievement(player, "havestemeralds"); + case "gt.metaitem.03.32082" -> issueAchievement(player, "energyflow"); + case "gt.metaitem.01.32702" -> issueAchievement(player, "bettercircuits"); + case "gt.metaitem.01.32707" -> issueAchievement(player, "datasaving"); + case "gt.metaitem.01.32597" -> issueAchievement(player, "orbs"); + case "gt.metaitem.01.32599" -> issueAchievement(player, "thatspower"); + case "gt.metaitem.01.32598" -> issueAchievement(player, "luck"); + case "gt.metaitem.01.32749" -> issueAchievement(player, "closeit"); + case "gt.metaitem.01.32730" -> issueAchievement(player, "manipulation"); + case "gt.metaitem.01.32729" -> issueAchievement(player, "filterregulate"); + case "gt.metaitem.01.32605" -> issueAchievement(player, "whatnow"); + case "gt.metaitem.01.32736" -> issueAchievement(player, "zpmage"); + case "gt.metaitem.01.32737" -> issueAchievement(player, "uvage"); + case "gt.metaitem.03.32030" -> issueAchievement(player, "gtmonosilicon"); + case "gt.metaitem.03.32036" -> issueAchievement(player, "gtlogicwafer"); + case "gt.metaitem.01.32701" -> issueAchievement(player, "gtlogiccircuit"); + case "gt.metaitem.03.32085" -> issueAchievement(player, "gtquantumprocessor"); + case "gt.metaitem.03.32089" -> issueAchievement(player, "gtcrystalprocessor"); + case "gt.metaitem.03.32092" -> issueAchievement(player, "gtwetware"); + case "gt.metaitem.03.32095" -> issueAchievement(player, "gtwetmain"); } } else if (stack.getUnlocalizedName() .equals("gt.Thoriumcell")) { diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java index c6ac61d95c..84260a32fa 100644 --- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java +++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java @@ -1063,7 +1063,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { AlleleHelper.instance.set(template, HUMIDITY_TOLERANCE, Tolerance.BOTH_1); AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORT); AlleleHelper.instance.set(template, FLOWER_PROVIDER, getFlowers(EXTRABEES, "rock")); - }, new Consumer<GT_BeeDefinition>() { + }, new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -1633,33 +1633,31 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); - }, template -> AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectIgnition), - new Consumer<GT_BeeDefinition>() { + }, template -> AlleleHelper.instance.set(template, EFFECT, AlleleEffect.effectIgnition), new Consumer<>() { - @Override - public void accept(GT_BeeDefinition dis) { - IBeeMutationCustom tMutation = dis.registerMutation(MARS, TITANIUM, 9); - tMutation.requireResource(GregTech_API.sBlockMetal2, 12); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(29, "Mars")); // Mars Dim - } - }), + @Override + public void accept(GT_BeeDefinition dis) { + IBeeMutationCustom tMutation = dis.registerMutation(MARS, TITANIUM, 9); + tMutation.requireResource(GregTech_API.sBlockMetal2, 12); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(29, "Mars")); // Mars Dim + } + }), LEDOX(GT_BranchDefinition.SPACE, "Ledox", false, new Color(0x0000CD), new Color(0x0074FF), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.10f); beeSpecies.addSpecialty(GT_Bees.combs.getStackForType(CombType.LEDOX), 0.10f); beeSpecies.setHumidity(EnumHumidity.NORMAL); beeSpecies.setTemperature(COLD); beeSpecies.setHasEffect(); - }, template -> AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "freezing")), - new Consumer<GT_BeeDefinition>() { + }, template -> AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "freezing")), new Consumer<>() { - @Override - public void accept(GT_BeeDefinition dis) { - IBeeMutationCustom tMutation = dis.registerMutation(CALLISTO, LEAD, 7); - if (NewHorizonsCoreMod.isModLoaded()) - tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.Ledox"), 0); - tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(35, "Europa")); // Europa Dim - } - }), + @Override + public void accept(GT_BeeDefinition dis) { + IBeeMutationCustom tMutation = dis.registerMutation(CALLISTO, LEAD, 7); + if (NewHorizonsCoreMod.isModLoaded()) + tMutation.requireResource(GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.Ledox"), 0); + tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(35, "Europa")); // Europa Dim + } + }), CALLISTOICE(GT_BranchDefinition.SPACE, "CallistoIce", false, new Color(0x0074FF), new Color(0x1EB1FF), beeSpecies -> { beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SPACE), 0.10f); @@ -1668,7 +1666,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(ICY); beeSpecies.setHasEffect(); }, template -> AlleleHelper.instance.set(template, EFFECT, getEffect(EXTRABEES, "freezing")), - new Consumer<GT_BeeDefinition>() { + new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -1677,7 +1675,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.CallistoColdIce"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(45, "Callisto")); // Callisto - // Dim + // Dim } }), MYTRYL(GT_BranchDefinition.SPACE, "Mytryl", false, new Color(0xDAA520), new Color(0xF26404), beeSpecies -> { @@ -1687,7 +1685,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(EnumTemperature.NORMAL); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, template -> {}, new Consumer<GT_BeeDefinition>() { + }, template -> {}, new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -1704,7 +1702,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(HOT); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, template -> {}, new Consumer<GT_BeeDefinition>() { + }, template -> {}, new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -1720,7 +1718,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setHumidity(DAMP); beeSpecies.setTemperature(COLD); beeSpecies.setHasEffect(); - }, template -> {}, new Consumer<GT_BeeDefinition>() { + }, template -> {}, new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -1738,7 +1736,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(ICY); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, template -> {}, new Consumer<GT_BeeDefinition>() { + }, template -> {}, new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -1747,7 +1745,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { GameRegistry.findBlock(NewHorizonsCoreMod.modID, "tile.MysteriousCrystal"), 0); tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(41, "Enceladus")); // Enceladus - // Dim + // Dim } }), BLACKPLUTONIUM(GT_BranchDefinition.SPACE, "BlackPlutonium", false, new Color(0x000000), new Color(0x323232), @@ -1758,7 +1756,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(HELLISH); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, template -> {}, new Consumer<GT_BeeDefinition>() { + }, template -> {}, new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -1776,7 +1774,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { beeSpecies.setTemperature(COLD); beeSpecies.setNocturnal(); beeSpecies.setHasEffect(); - }, template -> AlleleHelper.instance.set(template, SPEED, GT_Bees.speedBlinding), new Consumer<GT_BeeDefinition>() { + }, template -> AlleleHelper.instance.set(template, SPEED, GT_Bees.speedBlinding), new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -2137,7 +2135,7 @@ public enum GT_BeeDefinition implements IBeeDefinition { 0.10f); beeSpecies.setHumidity(ARID); beeSpecies.setTemperature(HELLISH); - }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), new Consumer<GT_BeeDefinition>() { + }, template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST), new Consumer<>() { @Override public void accept(GT_BeeDefinition dis) { @@ -2630,68 +2628,35 @@ public enum GT_BeeDefinition implements IBeeDefinition { } static IAlleleBeeEffect getEffect(byte modid, String name) { - String s; - switch (modid) { - case EXTRABEES: - s = "extrabees.effect." + name; - break; - case GENDUSTRY: - s = "gendustry.effect." + name; - break; - case MAGICBEES: - s = "magicbees.effect" + name; - break; - case GREGTECH: - s = "gregtech.effect" + name; - break; - default: - s = "forestry.effect" + name; - break; - } + String s = switch (modid) { + case EXTRABEES -> "extrabees.effect." + name; + case GENDUSTRY -> "gendustry.effect." + name; + case MAGICBEES -> "magicbees.effect" + name; + case GREGTECH -> "gregtech.effect" + name; + default -> "forestry.effect" + name; + }; return (IAlleleBeeEffect) AlleleManager.alleleRegistry.getAllele(s); } static IAlleleFlowers getFlowers(byte modid, String name) { - String s; - switch (modid) { - case EXTRABEES: - s = "extrabees.flower." + name; - break; - case GENDUSTRY: - s = "gendustry.flower." + name; - break; - case MAGICBEES: - s = "magicbees.flower" + name; - break; - case GREGTECH: - s = "gregtech.flower" + name; - break; - default: - s = "forestry.flowers" + name; - break; - } + String s = switch (modid) { + case EXTRABEES -> "extrabees.flower." + name; + case GENDUSTRY -> "gendustry.flower." + name; + case MAGICBEES -> "magicbees.flower" + name; + case GREGTECH -> "gregtech.flower" + name; + default -> "forestry.flowers" + name; + }; return (IAlleleFlowers) AlleleManager.alleleRegistry.getAllele(s); } private static IAlleleBeeSpecies getSpecies(byte modid, String name) { - String s; - switch (modid) { - case EXTRABEES: - s = "extrabees.species." + name; - break; - case GENDUSTRY: - s = "gendustry.bee." + name; - break; - case MAGICBEES: - s = "magicbees.species" + name; - break; - case GREGTECH: - s = "gregtech.species" + name; - break; - default: - s = "forestry.species" + name; - break; - } + String s = switch (modid) { + case EXTRABEES -> "extrabees.species." + name; + case GENDUSTRY -> "gendustry.bee." + name; + case MAGICBEES -> "magicbees.species" + name; + case GREGTECH -> "gregtech.species" + name; + default -> "forestry.species" + name; + }; IAlleleBeeSpecies ret = (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele(s); if (ret == null) { ret = NAQUADRIA.species; diff --git a/src/main/java/gregtech/loaders/misc/GT_Bees.java b/src/main/java/gregtech/loaders/misc/GT_Bees.java index c79702d72e..aba1fefc1b 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Bees.java +++ b/src/main/java/gregtech/loaders/misc/GT_Bees.java @@ -72,7 +72,7 @@ public class GT_Bees { noWork = new AlleleFloat("speedUnproductive", 0, false); superSpeed = new AlleleFloat("speedAccelerated", 4F, false); - speedBlinding = (IAlleleFloat) AlleleManager.alleleRegistry.getAllele("magicbees.speedBlinding") == null + speedBlinding = AlleleManager.alleleRegistry.getAllele("magicbees.speedBlinding") == null ? new AlleleFloat("speedBlinding", 2f, false) : (IAlleleFloat) AlleleManager.alleleRegistry.getAllele("magicbees.speedBlinding"); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java index c9345964f1..212459ab9c 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBlock.java @@ -127,20 +127,14 @@ public class ProcessingBlock implements gregtech.api.interfaces.IOreRecipeRegist } switch (aMaterial.mName) { - case "Mercury": - System.err.println( - "'blockQuickSilver'?, In which Ice Desert can you actually place this as a solid Block? On Pluto Greg :)"); - break; - case "Iron": - case "WroughtIron": - case "Steel": - GT_Values.RA.addAssemblerRecipe( - ItemList.IC2_Compressed_Coal_Ball.get(8L), - GT_Utility.copyAmount(1L, aStack), - ItemList.IC2_Compressed_Coal_Chunk.get(1L), - 400, - 4); - break; + case "Mercury" -> System.err.println( + "'blockQuickSilver'?, In which Ice Desert can you actually place this as a solid Block? On Pluto Greg :)"); + case "Iron", "WroughtIron", "Steel" -> GT_Values.RA.addAssemblerRecipe( + ItemList.IC2_Compressed_Coal_Ball.get(8L), + GT_Utility.copyAmount(1L, aStack), + ItemList.IC2_Compressed_Coal_Chunk.get(1L), + 400, + 4); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java index e088330204..c7c92b8daf 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java @@ -25,7 +25,7 @@ public class ProcessingCell implements IOreRecipeRegistrator { public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { switch (aPrefix) { - case cell: + case cell -> { if (aMaterial == Materials.Empty) { GT_ModHandler.removeRecipeByOutputDelayed(aStack); if (aModName.equalsIgnoreCase("AtomicScience")) { @@ -145,8 +145,8 @@ public class ProcessingCell implements IOreRecipeRegistrator { } } } - break; - case cellPlasma: + } + case cellPlasma -> { if (aMaterial == Materials.Empty) { GT_ModHandler.removeRecipeByOutputDelayed(aStack); } else { @@ -159,12 +159,11 @@ public class ProcessingCell implements IOreRecipeRegistrator { 4); GT_Values.RA.addVacuumFreezerRecipe( GT_Utility.copyAmount(1L, aStack), - gregtech.api.util.GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), + GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), (int) Math.max(aMaterial.getMass() * 2L, 1L)); } - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java index 643d6af903..ec380c5c32 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java @@ -19,22 +19,12 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi ItemStack aStack) { if (gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack) && aModName.equals("gregtech")) return; switch (aMaterial.mName) { - case "Good": - case "Data": - case "Elite": - case "Master": - case "Ultimate": - case "Superconductor": - case "Infinite": - case "Bio": - if (!gregtech.api.util.GT_OreDictUnificator.isBlacklisted(aStack) && !aModName.equals("gregtech")) + case "Good", "Data", "Elite", "Master", "Ultimate", "Superconductor", "Infinite", "Bio" -> { + if (!GT_OreDictUnificator.isBlacklisted(aStack) && !aModName.equals("gregtech")) GT_ModHandler.removeRecipeByOutputDelayed(aStack); - break; - case "Primitive": - case "Advanced": - GT_ModHandler.removeRecipeByOutputDelayed(aStack); - break; - case "Basic": + } + case "Primitive", "Advanced" -> GT_ModHandler.removeRecipeByOutputDelayed(aStack); + case "Basic" -> { GT_ModHandler.removeRecipeByOutputDelayed(aStack); GT_ModHandler.addCraftingRecipe( aStack, @@ -47,7 +37,7 @@ public class ProcessingCircuit implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.addShapelessCraftingRecipe( GT_ModHandler.getIC2Item("electronicCircuit", 1L), new Object[] { ItemList.Circuit_Integrated.getWildcard(1L) }); - break; + } } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java index 8ff11d5121..e56888c64f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java @@ -23,25 +23,20 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { switch (aOreDictName) { - case "craftingQuartz": - GT_Values.RA.addAssemblerRecipe( - new ItemStack(Blocks.redstone_torch, 3, 32767), - GT_Utility.copyAmount(1L, aStack), - Materials.Concrete.getMolten(144L), - new ItemStack(net.minecraft.init.Items.comparator, 1, 0), - 800, - 1); - break; - case "craftingWireCopper": - case "craftingWireTin": - GT_Values.RA.addAssemblerRecipe( - ItemList.Circuit_Basic.get(1L), - GT_Utility.copyAmount(1L, aStack), - GT_ModHandler.getIC2Item("frequencyTransmitter", 1L), - 800, - 1); - break; - case "craftingLensBlue": + case "craftingQuartz" -> GT_Values.RA.addAssemblerRecipe( + new ItemStack(Blocks.redstone_torch, 3, 32767), + GT_Utility.copyAmount(1L, aStack), + Materials.Concrete.getMolten(144L), + new ItemStack(net.minecraft.init.Items.comparator, 1, 0), + 800, + 1); + case "craftingWireCopper", "craftingWireTin" -> GT_Values.RA.addAssemblerRecipe( + ItemList.Circuit_Basic.get(1L), + GT_Utility.copyAmount(1L, aStack), + GT_ModHandler.getIC2Item("frequencyTransmitter", 1L), + 800, + 1); + case "craftingLensBlue" -> { GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), @@ -89,8 +84,8 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg 2400, 500000, true); - break; - case "craftingLensYellow": + } + case "craftingLensYellow" -> { GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), @@ -138,8 +133,8 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg 300, 30720, true); - break; - case "craftingLensOrange": + } + case "craftingLensOrange" -> { GT_Values.RA.addLaserEngraverRecipe( ItemList.Circuit_Silicon_Wafer.get(1), GT_Utility.copyAmount(0L, aStack), @@ -168,8 +163,8 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg 300, 4096, false); - break; - case "craftingLensCyan": + } + case "craftingLensCyan" -> { GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), @@ -217,8 +212,8 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg 150, 30720, true); - break; - case "craftingLensRed": + } + case "craftingLensRed" -> { GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Redstone, 1L), GT_Utility.copyAmount(0L, aStack), @@ -266,8 +261,8 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg 1500, 122880, true); - break; - case "craftingLensGreen": + } + case "craftingLensGreen" -> { GT_Values.RA.addLaserEngraverRecipe( ItemList.Circuit_Parts_Crystal_Chip_Elite.get(1L), GT_Utility.copyAmount(0L, aStack), @@ -317,8 +312,8 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg 1200, 30720, true); - break; - case "craftingLensWhite": + } + case "craftingLensWhite" -> { GT_Values.RA.addLaserEngraverRecipe( GT_OreDictUnificator.get(OrePrefixes.block, Materials.Iron, 1L), GT_Utility.copyAmount(0L, aStack), @@ -331,7 +326,6 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg GT_ModHandler.getModItem("appliedenergistics2", "item.ItemMultiMaterial", 1L, 19), 2000, 1920); - GT_Values.RA.addLaserEngraverRecipe( new ItemStack(Blocks.sandstone, 1, 2), GT_Utility.copyAmount(0L, aStack), @@ -391,7 +385,7 @@ public class ProcessingCrafting implements gregtech.api.interfaces.IOreRecipeReg 150, 30720, true); - break; + } } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java index 79c5ca9874..d280492e01 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java @@ -23,7 +23,7 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist boolean aSpecialRecipeReq2 = aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING); switch (aPrefix) { - case crateGtDust: + case crateGtDust -> { GT_Values.RA.addBoxingRecipe( GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L)), ItemList.Crate_Empty.get(1L), @@ -40,8 +40,8 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), GT_Proxy.tBits, new Object[] { "Xc", 'X', OrePrefixes.crateGtDust.get(aMaterial) }); - break; - case crateGtIngot: + } + case crateGtIngot -> { GT_Values.RA.addBoxingRecipe( GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L)), ItemList.Crate_Empty.get(1L), @@ -58,8 +58,8 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L), GT_Proxy.tBits, new Object[] { "Xc", 'X', OrePrefixes.crateGtIngot.get(aMaterial) }); - break; - case crateGtGem: + } + case crateGtGem -> { GT_Values.RA.addBoxingRecipe( GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L)), ItemList.Crate_Empty.get(1L), @@ -76,8 +76,8 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L), GT_Proxy.tBits, new Object[] { "Xc", 'X', OrePrefixes.crateGtGem.get(aMaterial) }); - break; - case crateGtPlate: + } + case crateGtPlate -> { GT_Values.RA.addBoxingRecipe( GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L)), ItemList.Crate_Empty.get(1L), @@ -94,9 +94,8 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L), GT_Proxy.tBits, new Object[] { "Xc", 'X', OrePrefixes.crateGtPlate.get(aMaterial) }); - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java index 2a6678c485..4d582564f4 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrop.java @@ -22,7 +22,7 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr gregtech.api.util.GT_Utility.copyAmount(8L, aStack), ItemList.IC2_PlantballCompressed.get(1L)); switch (aOreDictName) { - case "cropTea": + case "cropTea" -> { GT_Values.RA.addBrewingRecipe(aStack, FluidRegistry.WATER, FluidRegistry.getFluid("potion.tea"), false); GT_Values.RA.addBrewingRecipe( aStack, @@ -30,8 +30,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .getFluid(), FluidRegistry.getFluid("potion.tea"), false); - break; - case "cropGrape": + } + case "cropGrape" -> { GT_Values.RA.addBrewingRecipe( aStack, FluidRegistry.WATER, @@ -43,18 +43,14 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .getFluid(), FluidRegistry.getFluid("potion.grapejuice"), false); - break; - case "cropChilipepper": - GT_ModHandler.addPulverisationRecipe( - aStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)); - break; - case "cropCoffee": - GT_ModHandler.addPulverisationRecipe( - aStack, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)); - break; - case "cropPotato": + } + case "cropChilipepper" -> GT_ModHandler.addPulverisationRecipe( + aStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)); + case "cropCoffee" -> GT_ModHandler.addPulverisationRecipe( + aStack, + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)); + case "cropPotato" -> { GT_Values.RA.addSlicerRecipe( aStack, ItemList.Shape_Slicer_Flat.get(0L), @@ -78,8 +74,8 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr .getFluid(), FluidRegistry.getFluid("potion.potatojuice"), true); - break; - case "cropLemon": + } + case "cropLemon" -> { GT_Values.RA.addSlicerRecipe( aStack, ItemList.Shape_Slicer_Flat.get(0L), @@ -102,31 +98,25 @@ public class ProcessingCrop implements gregtech.api.interfaces.IOreRecipeRegistr FluidRegistry.getFluid("potion.vodka"), FluidRegistry.getFluid("potion.leninade"), true); - break; - case "cropTomato": - GT_Values.RA.addSlicerRecipe( - aStack, - ItemList.Shape_Slicer_Flat.get(0L), - ItemList.Food_Sliced_Tomato.get(4L), - 64, - 4); - break; - case "cropCucumber": - GT_Values.RA.addSlicerRecipe( - aStack, - ItemList.Shape_Slicer_Flat.get(0L), - ItemList.Food_Sliced_Cucumber.get(4L), - 64, - 4); - break; - case "cropOnion": - GT_Values.RA.addSlicerRecipe( - aStack, - ItemList.Shape_Slicer_Flat.get(0L), - ItemList.Food_Sliced_Onion.get(4L), - 64, - 4); - break; + } + case "cropTomato" -> GT_Values.RA.addSlicerRecipe( + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Tomato.get(4L), + 64, + 4); + case "cropCucumber" -> GT_Values.RA.addSlicerRecipe( + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Cucumber.get(4L), + 64, + 4); + case "cropOnion" -> GT_Values.RA.addSlicerRecipe( + aStack, + ItemList.Shape_Slicer_Flat.get(0L), + ItemList.Food_Sliced_Onion.get(4L), + 64, + 4); } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java index 77d20209b8..627cdc10d8 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java @@ -20,7 +20,7 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { switch (aPrefix) { - case crushedCentrifuged: + case crushedCentrifuged -> { GT_Values.RA.addForgeHammerRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L), @@ -35,8 +35,8 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR 1L), 10, false); - break; - case crushedPurified: + } + case crushedPurified -> { GT_ModHandler.addThermalCentrifugeRecipe( GT_Utility.copyAmount(1L, aStack), new int[] { 10000, 1111 }, @@ -50,55 +50,35 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR OrePrefixes.dust, GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts), 1L)); - ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L); if (tGem != null) { switch (aMaterial.mName) { - case "Tanzanite": - case "Sapphire": - case "Olivine": - case "GreenSapphire": - case "Opal": - case "Amethyst": - case "Emerald": - case "Ruby": - case "Amber": - case "Diamond": - case "FoolsRuby": - case "BlueTopaz": - case "GarnetRed": - case "Topaz": - case "Jasper": - case "GarnetYellow": - GT_Values.RA.addSifterRecipe( - GT_Utility.copyAmount(1L, aStack), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), - tGem, GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) }, - new int[] { 300, 1200, 4500, 1400, 2800, 3500 }, - 800, - 16); - break; - default: - GT_Values.RA.addSifterRecipe( - GT_Utility.copyAmount(1L, aStack), - new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), - tGem, GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) }, - new int[] { 100, 400, 1500, 2000, 4000, 5000 }, - 800, - 16); + case "Tanzanite", "Sapphire", "Olivine", "GreenSapphire", "Opal", "Amethyst", "Emerald", "Ruby", "Amber", "Diamond", "FoolsRuby", "BlueTopaz", "GarnetRed", "Topaz", "Jasper", "GarnetYellow" -> GT_Values.RA.addSifterRecipe( + GT_Utility.copyAmount(1L, aStack), + new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), tGem, + GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) }, + new int[] { 300, 1200, 4500, 1400, 2800, 3500 }, + 800, + 16); + default -> GT_Values.RA.addSifterRecipe( + GT_Utility.copyAmount(1L, aStack), + new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, tGem, 1L), tGem, + GT_OreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.gemChipped, aMaterial, tGem, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, tGem, 1L) }, + new int[] { 100, 400, 1500, 2000, 4000, 5000 }, + 800, + 16); } } - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index 8df5270399..9be8efb946 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -32,7 +32,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { switch (aPrefix) { - case dust: + case dust -> { if (aMaterial.mFuelPower > 0) GT_Values.RA.addFuel( GT_Utility.copyAmount(1L, aStack), null, @@ -59,7 +59,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr null); } } - ItemStack tDustStack; if ((null != (tDustStack = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mSmeltInto, 1L))) && (!aMaterial.contains(SubTag.NO_SMELTING))) { @@ -111,7 +110,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L)); } } - if ((aMaterial.mMaterialList.size() > 0) && ((aMaterial.mExtraData & 0x3) != 0)) { long tItemAmount = 0L; long tCapsuleCount = 0L; @@ -157,11 +155,10 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr int tList_sS = tList.size(); for (int i = 0; i < tList_sS; i++) { if ((!ItemList.Cell_Air.isStackEqual(tList.get(i))) - && ((tFluid = GT_Utility.getFluidForFilledItem((ItemStack) tList.get(i), true)) - != null)) { + && ((tFluid = GT_Utility.getFluidForFilledItem(tList.get(i), true)) != null)) { tFluid.amount *= tList.get(i).stackSize; tCapsuleCount -= GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize( - (ItemStack) tList.get(i)); + tList.get(i)); tList.remove(i); break; } @@ -171,12 +168,12 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr tCapsuleCount > 0L ? ItemList.Cell_Empty.get(tCapsuleCount) : null, null, tFluid, - tList.size() < 1 ? null : (ItemStack) tList.get(0), - tList.size() < 2 ? null : (ItemStack) tList.get(1), - tList.size() < 3 ? null : (ItemStack) tList.get(2), - tList.size() < 4 ? null : (ItemStack) tList.get(3), - tList.size() < 5 ? null : (ItemStack) tList.get(4), - tList.size() < 6 ? null : (ItemStack) tList.get(5), + tList.size() < 1 ? null : tList.get(0), + tList.size() < 2 ? null : tList.get(1), + tList.size() < 3 ? null : tList.get(2), + tList.size() < 4 ? null : tList.get(3), + tList.size() < 5 ? null : tList.get(4), + tList.size() < 6 ? null : tList.get(5), null, (int) Math.max(1L, Math.abs(aMaterial.getProtons() * 2L * tItemAmount)), Math.min(4, tList.size()) * 30); @@ -186,12 +183,12 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr tCapsuleCount > 0L ? ItemList.Cell_Empty.get(tCapsuleCount) : null, null, tFluid, - tList.size() < 1 ? null : (ItemStack) tList.get(0), - tList.size() < 2 ? null : (ItemStack) tList.get(1), - tList.size() < 3 ? null : (ItemStack) tList.get(2), - tList.size() < 4 ? null : (ItemStack) tList.get(3), - tList.size() < 5 ? null : (ItemStack) tList.get(4), - tList.size() < 6 ? null : (ItemStack) tList.get(5), + tList.size() < 1 ? null : tList.get(0), + tList.size() < 2 ? null : tList.get(1), + tList.size() < 3 ? null : tList.get(2), + tList.size() < 4 ? null : tList.get(3), + tList.size() < 5 ? null : tList.get(4), + tList.size() < 6 ? null : tList.get(5), null, (int) Math.max(1L, Math.abs(aMaterial.getMass() * 4L * tItemAmount)), Math.min(4, tList.size()) * 5); @@ -227,7 +224,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr 24, false); } - switch (aMaterial.mName) { case "NULL": break; @@ -309,15 +305,12 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L)); } - break; - case dustPure: - case dustImpure: - case dustRefined: - Materials tByProduct = (Materials) GT_Utility.selectItemInList( + } + case dustPure, dustImpure, dustRefined -> { + Materials tByProduct = GT_Utility.selectItemInList( aPrefix == OrePrefixes.dustRefined ? 2 : aPrefix == OrePrefixes.dustPure ? 1 : 0, aMaterial, aMaterial.mOreByProducts); - if (aPrefix == OrePrefixes.dustPure) { if (aMaterial.contains(SubTag.ELECTROMAGNETIC_SEPERATION_GOLD)) GT_Values.RA.addElectromagneticSeparatorRecipe( @@ -361,7 +354,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr GT_Values.RA.addAutoclaveRecipe( GT_Utility.copyAmount(1L, aStack), GT_Utility.getIntegratedCircuit(2), - gregtech.api.util.GT_ModHandler.getDistilledWater(100L), + GT_ModHandler.getDistilledWater(100L), GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), 9500, 1500, @@ -377,7 +370,6 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr 24, false); } - ItemStack tImpureStack = GT_OreDictUnificator.get( OrePrefixes.dustTiny, tByProduct, @@ -479,8 +471,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr (int) Math.max(1L, aMaterial.getMass() * 8L), 5); } - break; - case dustSmall: + } + case dustSmall -> { GT_Values.RA.addBoxingRecipe( GT_Utility.copyAmount(4L, aStack), ItemList.Schematic_Dust.get(0L), @@ -499,8 +491,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr null); } } - break; - case dustTiny: + } + case dustTiny -> { GT_Values.RA.addBoxingRecipe( GT_Utility.copyAmount(9L, aStack), ItemList.Schematic_Dust.get(0L), @@ -519,14 +511,13 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr null); } } - if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMELTING)) { + if (!aMaterial.contains(SubTag.NO_SMELTING)) { if (aMaterial.mBlastFurnaceRequired) { GT_ModHandler.removeFurnaceSmelting(aStack); } } - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java index 27a11896f6..ae606caaab 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFood.java @@ -20,7 +20,7 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { switch (aOreDictName) { - case "foodCheese": + case "foodCheese" -> { GT_Values.RA.addSlicerRecipe( aStack, ItemList.Shape_Slicer_Flat.get(0L), @@ -28,15 +28,14 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr 64, 4); GT_OreDictUnificator.addItemData(aStack, new gregtech.api.objects.ItemData(Materials.Cheese, 3628800L)); - break; - case "foodDough": + } + case "foodDough" -> { GT_ModHandler.removeFurnaceSmelting(aStack); GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Food_Flat_Dough.get(1L), 16, 4); - GT_Values.RA.addMixerRecipe( aStack, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L), @@ -67,7 +66,6 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr ItemList.Food_Dough_Chocolate.get(2L), 32, 8); - GT_Values.RA.addFormingPressRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Mold_Bun.get(0L), @@ -86,6 +84,7 @@ public class ProcessingFood implements gregtech.api.interfaces.IOreRecipeRegistr ItemList.Food_Raw_Baguette.get(1L), 384, 4); + } } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java index c1e767b9b5..ed0fa7fe94 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGear.java @@ -22,7 +22,7 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { switch (aPrefix) { - case gearGt: + case gearGt -> { GT_ModHandler.removeRecipeByOutputDelayed(aStack); if (aMaterial.mStandardMoltenFluid != null) if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { @@ -36,21 +36,17 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { switch (aMaterial.mName) { - case "Wood": - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "SPS", "PsP", "SPS", 'P', OrePrefixes.plank.get(aMaterial), 'S', - OrePrefixes.stick.get(aMaterial) }); - break; - case "Stone": - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "SPS", "PfP", "SPS", 'P', OrePrefixes.stoneSmooth, 'S', - new ItemStack(Blocks.stone_button, 1, 32767) }); - break; - default: + case "Wood" -> GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "SPS", "PsP", "SPS", 'P', OrePrefixes.plank.get(aMaterial), 'S', + OrePrefixes.stick.get(aMaterial) }); + case "Stone" -> GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "SPS", "PfP", "SPS", 'P', OrePrefixes.stoneSmooth, 'S', + new ItemStack(Blocks.stone_button, 1, 32767) }); + default -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial, 1L), @@ -58,10 +54,11 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr new Object[] { "SPS", "PwP", "SPS", 'P', OrePrefixes.plate.get(aMaterial), 'S', OrePrefixes.stick.get(aMaterial) }); } + } } } - break; - case gearGtSmall: + } + case gearGtSmall -> { if (aMaterial.mStandardMoltenFluid != null) if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { GT_Values.RA.addFluidSolidifierRecipe( @@ -74,19 +71,15 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { switch (aMaterial.mName) { - case "Wood": - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "P ", " s", 'P', OrePrefixes.plank.get(aMaterial) }); - break; - case "Stone": - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), - GT_Proxy.tBits, - new Object[] { "P ", " f", 'P', OrePrefixes.stoneSmooth }); - break; - default: + case "Wood" -> GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "P ", " s", 'P', OrePrefixes.plank.get(aMaterial) }); + case "Stone" -> GT_ModHandler.addCraftingRecipe( + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), + GT_Proxy.tBits, + new Object[] { "P ", " f", 'P', OrePrefixes.stoneSmooth }); + default -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial, 1L), @@ -94,11 +87,11 @@ public class ProcessingGear implements gregtech.api.interfaces.IOreRecipeRegistr new Object[] { " S ", "hPx", " S ", 'S', OrePrefixes.stick.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial) }); } + } } } - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java index 5bc183a1da..04ef7c4731 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java @@ -35,7 +35,7 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra boolean aFuelPower = aMaterial.mFuelPower > 0; switch (aPrefix) { - case gem: + case gem -> { if (aFuelPower) { GT_Values.RA.addFuel( GT_Utility.copyAmount(1L, aStack), @@ -96,7 +96,6 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra (int) Math.max(aMaterialMass * 9L, 1L), calculateRecipeEU(aMaterial, 96)); } - if (aNoWorking) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_Values.RA.addLatheRecipe( @@ -135,8 +134,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra break; case "Coal": case "Charcoal": - if (gregtech.api.GregTech_API.sRecipeFile.get( - gregtech.api.enums.ConfigCategories.Recipes.disabledrecipes, + if (GregTech_API.sRecipeFile.get( + ConfigCategories.Recipes.disabledrecipes, "torchesFromCoal", false)) { GT_ModHandler.removeRecipeDelayed( @@ -160,8 +159,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra 30); } for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver - // Recipe - // adder + // Recipe + // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( GT_Utility.copyAmount(3L, aStack), @@ -170,8 +169,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra 1200, 480); } - break; - case gemChipped: + } + case gemChipped -> { if (aFuelPower) GT_Values.RA.addFuel( GT_Utility.copyAmount(1L, aStack), null, @@ -201,8 +200,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra } } for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver - // Recipe - // adder + // Recipe + // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( GT_Utility.copyAmount(3L, aStack), @@ -211,8 +210,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra 600, 30); } - break; - case gemExquisite: + } + case gemExquisite -> { if (aFuelPower) GT_Values.RA.addFuel( GT_Utility.copyAmount(1L, aStack), null, @@ -230,8 +229,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra GT_OreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 2L), 64, 16); - break; - case gemFlawed: + } + case gemFlawed -> { if (aFuelPower) GT_Values.RA.addFuel( GT_Utility.copyAmount(1L, aStack), null, @@ -266,8 +265,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra 64, 16); for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver - // Recipe - // adder + // Recipe + // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( GT_Utility.copyAmount(3L, aStack), @@ -276,8 +275,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra 600, 120); } - break; - case gemFlawless: + } + case gemFlawless -> { if (aFuelPower) GT_Values.RA.addFuel( GT_Utility.copyAmount(1L, aStack), null, @@ -314,8 +313,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra 64, 16); for (ItemStack is : OreDictionary.getOres("craftingLens" + aMaterial.mColor.mName.replace(" ", ""))) { // Engraver - // Recipe - // adder + // Recipe + // adder is.stackSize = 0; GT_Values.RA.addLaserEngraverRecipe( GT_Utility.copyAmount(3L, aStack), @@ -324,9 +323,8 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra 2400, 2000); } - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java index 31c75fbcbb..baa760dd3b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLens.java @@ -21,8 +21,7 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { switch (aMaterial.mName) { - case "Diamond": - case "Glass": + case "Diamond", "Glass" -> { GT_Values.RA.addLatheRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), @@ -35,15 +34,13 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L), 2400, 16); - break; - case "ChromaticGlass": - GT_Values.RA.addCompressorRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), - GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), - 600 * 20, - 1966080); - break; - default: + } + case "ChromaticGlass" -> GT_Values.RA.addCompressorRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L), + GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), + 600 * 20, + 1966080); + default -> { GT_Values.RA.addLatheRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.lens, aMaterial, 1L), @@ -64,6 +61,7 @@ public class ProcessingLens implements gregtech.api.interfaces.IOreRecipeRegistr aStack, TextureFactory.of(Textures.BlockIcons.MACHINE_CASINGS[2][0], lensCoverTexture), new gregtech.common.covers.GT_Cover_Lens(aMaterial.mColor.mIndex, lensCoverTexture)); + } } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index ca585feab6..cba50285a6 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -15,7 +15,7 @@ import gregtech.api.util.GT_Utility; public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistrator { - private ArrayList<Materials> mAlreadyListedOres = new ArrayList(1000); + private ArrayList<Materials> mAlreadyListedOres = new ArrayList<>(1000); public ProcessingOre() { for (OrePrefixes tPrefix : OrePrefixes.values()) if ((tPrefix.name() @@ -114,7 +114,7 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra aMaterial.mOreMultiplier * aMultiplier); } - ArrayList<ItemStack> tByProductStacks = new ArrayList(); + ArrayList<ItemStack> tByProductStacks = new ArrayList<>(); for (Materials tMat : aMaterial.mOreByProducts) { ItemStack tByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); @@ -140,7 +140,7 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra gregtech.api.util.GT_Recipe.GT_Recipe_Map.sByProductList.addFakeRecipe( false, new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ore, aMaterial, aOreStack, 1L) }, - (ItemStack[]) tByProductStacks.toArray(new ItemStack[0]), + tByProductStacks.toArray(new ItemStack[0]), null, null, null, diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java index c9c7b25419..58f0c6e29b 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPipe.java @@ -31,11 +31,7 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { switch (aPrefix) { - case pipeHuge: - case pipeLarge: - case pipeMedium: - case pipeSmall: - case pipeTiny: + case pipeHuge, pipeLarge, pipeMedium, pipeSmall, pipeTiny -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( @@ -80,23 +76,17 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "DhD", "D D", "DwD", 'D', OrePrefixes.plateDouble.get(aMaterial) }); } - break; - case pipeRestrictiveHuge: - case pipeRestrictiveLarge: - case pipeRestrictiveMedium: - case pipeRestrictiveSmall: - case pipeRestrictiveTiny: - RA.addAssemblerRecipe( - GT_OreDictUnificator.get(aOreDictName.replaceFirst("Restrictive", ""), null, 1L, false, true), - GT_OreDictUnificator.get( - OrePrefixes.ring, - Materials.Steel, - aPrefix.mSecondaryMaterial.mAmount / OrePrefixes.ring.mMaterialAmount), - GT_Utility.copyAmount(1L, aStack), - (int) (aPrefix.mSecondaryMaterial.mAmount * 400L / OrePrefixes.ring.mMaterialAmount), - 4); - break; - case pipeQuadruple: + } + case pipeRestrictiveHuge, pipeRestrictiveLarge, pipeRestrictiveMedium, pipeRestrictiveSmall, pipeRestrictiveTiny -> RA.addAssemblerRecipe( + GT_OreDictUnificator.get(aOreDictName.replaceFirst("Restrictive", ""), null, 1L, false, true), + GT_OreDictUnificator.get( + OrePrefixes.ring, + Materials.Steel, + aPrefix.mSecondaryMaterial.mAmount / OrePrefixes.ring.mMaterialAmount), + GT_Utility.copyAmount(1L, aStack), + (int) (aPrefix.mSecondaryMaterial.mAmount * 400L / OrePrefixes.ring.mMaterialAmount), + 4); + case pipeQuadruple -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( @@ -105,15 +95,14 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr new Object[] { "MM ", "MM ", " ", 'M', GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 1) }); } - RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeMedium, aMaterial, 4), GT_Utility.getIntegratedCircuit(9), GT_OreDictUnificator.get(OrePrefixes.pipeQuadruple, aMaterial, 1), 60, calculateRecipeEU(aMaterial, 4)); - break; - case pipeNonuple: + } + case pipeNonuple -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( @@ -127,16 +116,14 @@ public class ProcessingPipe implements gregtech.api.interfaces.IOreRecipeRegistr false, true) }); } - RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.pipeSmall, aMaterial, 9), GT_Utility.getIntegratedCircuit(9), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, aMaterial, 1), 60, calculateRecipeEU(aMaterial, 8)); - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java index 0fa3ac1082..da12900bfd 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java @@ -55,32 +55,15 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist final long aMaterialMass = aMaterial.getMass(); switch (aPrefix) { - case plate: - registerPlate(aMaterial, aStack, aNoSmashing); - break; - case plateDouble: - registerPlateDouble(aMaterial, aStack, aNoSmashing, aMaterialMass); - break; - case plateTriple: - registerPlateTriple(aMaterial, aStack, aNoSmashing, aMaterialMass); - break; - case plateQuadruple: - registerPlateQuadruple(aMaterial, aStack, aNoSmashing, aMaterialMass, aNoWorking); - break; - case plateQuintuple: - registerPlateQuintuple(aMaterial, aStack, aNoSmashing, aMaterialMass); - break; - case plateDense: - registerPlateDense(aMaterial, aStack, aNoSmashing, aMaterialMass); - break; - case itemCasing: - registerItemCasing(aPrefix, aMaterial, aStack, aNoSmashing); - break; - case plateAlloy: - registerPlateAlloy(aOreDictName, aStack); - break; - default: - break; + case plate -> registerPlate(aMaterial, aStack, aNoSmashing); + case plateDouble -> registerPlateDouble(aMaterial, aStack, aNoSmashing, aMaterialMass); + case plateTriple -> registerPlateTriple(aMaterial, aStack, aNoSmashing, aMaterialMass); + case plateQuadruple -> registerPlateQuadruple(aMaterial, aStack, aNoSmashing, aMaterialMass, aNoWorking); + case plateQuintuple -> registerPlateQuintuple(aMaterial, aStack, aNoSmashing, aMaterialMass); + case plateDense -> registerPlateDense(aMaterial, aStack, aNoSmashing, aMaterialMass); + case itemCasing -> registerItemCasing(aPrefix, aMaterial, aStack, aNoSmashing); + case plateAlloy -> registerPlateAlloy(aOreDictName, aStack); + default -> {} } } @@ -478,14 +461,13 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist private void registerPlateAlloy(final String aOreDictName, final ItemStack aStack) { switch (aOreDictName) { - case "plateAlloyCarbon": + case "plateAlloyCarbon" -> { RA.addAssemblerRecipe( GT_ModHandler.getIC2Item("generator", 1L), GT_Utility.copyAmount(4L, aStack), GT_ModHandler.getIC2Item("windMill", 1L), 6400, 8); - GT_ModHandler.addAlloySmelterRecipe( GT_Utility.copyAmount(1L, aStack), new ItemStack(Blocks.glass, 3, W), @@ -493,7 +475,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist 400, 4, false); - GT_ModHandler.addAlloySmelterRecipe( GT_Utility.copyAmount(1L, aStack), Materials.Glass.getDust(3), @@ -501,10 +482,8 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist 400, 4, false); - - break; - - case "plateAlloyAdvanced": + } + case "plateAlloyAdvanced" -> { GT_ModHandler.addAlloySmelterRecipe( GT_Utility.copyAmount(1L, aStack), new ItemStack(Blocks.glass, 3, W), @@ -512,7 +491,6 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist 400, 4, false); - GT_ModHandler.addAlloySmelterRecipe( GT_Utility.copyAmount(1L, aStack), Materials.Glass.getDust(3), @@ -520,18 +498,12 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist 400, 4, false); - - break; - - case "plateAlloyIridium": + } + case "plateAlloyIridium" -> // Remove IC2 Shaped recipe for Iridium Reinforced Plate GT_ModHandler.removeRecipeByOutputDelayed(aStack); - - break; - - default: - break; + default -> {} } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index 011bdf3bc8..aa12ca42ea 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -243,55 +243,55 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Extruder_Sword.get(0L, new Object[0]), + ItemList.Shape_Extruder_Sword.get(0L), GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(3L, aStack), - ItemList.Shape_Extruder_Pickaxe.get(0L, new Object[0]), + ItemList.Shape_Extruder_Pickaxe.get(0L), GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 3L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), - ItemList.Shape_Extruder_Shovel.get(0L, new Object[0]), + ItemList.Shape_Extruder_Shovel.get(0L), GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 1L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(3L, aStack), - ItemList.Shape_Extruder_Axe.get(0L, new Object[0]), + ItemList.Shape_Extruder_Axe.get(0L), GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 3L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Extruder_Hoe.get(0L, new Object[0]), + ItemList.Shape_Extruder_Hoe.get(0L), GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(6L, aStack), - ItemList.Shape_Extruder_Hammer.get(0L, new Object[0]), + ItemList.Shape_Extruder_Hammer.get(0L), GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 6L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Extruder_File.get(0L, new Object[0]), + ItemList.Shape_Extruder_File.get(0L), GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(2L, aStack), - ItemList.Shape_Extruder_Saw.get(0L, new Object[0]), + ItemList.Shape_Extruder_Saw.get(0L), GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(4L, aStack), - ItemList.Shape_Extruder_Gear.get(0L, new Object[0]), + ItemList.Shape_Extruder_Gear.get(0L), GT_OreDictUnificator.get(OrePrefixes.gearGt, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 5L * tAmount, tAmount), calculateRecipeEU(aMaterial, 8 * tVoltageMultiplier)); @@ -328,7 +328,7 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi } switch (aMaterial.mSmeltInto.mName) { - case "Glass": + case "Glass" -> { GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Bottle.get(0L), @@ -341,8 +341,8 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi new ItemStack(Items.glass_bottle, 1), tAmount * 64, 4); - break; - case "Steel": + } + case "Steel" -> { GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Cell.get(0L), @@ -361,9 +361,8 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.getIC2Item("casingadviron", tAmount * 3), tAmount * 128, 1 * tVoltageMultiplier); - break; - case "Iron": - case "WroughtIron": + } + case "Iron", "WroughtIron" -> { GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Cell.get(0L), @@ -388,8 +387,8 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi new ItemStack(Blocks.anvil, 1, 0), tAmount * 512, 4 * tVoltageMultiplier); - break; - case "Tin": + } + case "Tin" -> { GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(2L, aStack), ItemList.Shape_Extruder_Cell.get(0L), @@ -408,8 +407,8 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.getIC2Item("casingtin", tAmount * 3), tAmount * 128, 1 * tVoltageMultiplier); - break; - case "Lead": + } + case "Lead" -> { if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Casing.get(0L), @@ -422,9 +421,8 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.getIC2Item("casinglead", tAmount * 3), tAmount * 128, 1 * tVoltageMultiplier); - break; - case "Copper": - case "AnnealedCopper": + } + case "Copper", "AnnealedCopper" -> { if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Casing.get(0L), @@ -437,8 +435,8 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.getIC2Item("casingcopper", tAmount * 3), tAmount * 128, 1 * tVoltageMultiplier); - break; - case "Bronze": + } + case "Bronze" -> { if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Casing.get(0L), @@ -451,8 +449,8 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.getIC2Item("casingbronze", tAmount * 3), tAmount * 128, 1 * tVoltageMultiplier); - break; - case "Gold": + } + case "Gold" -> { if (tAmount * 2 <= 64) GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Casing.get(0L), @@ -465,15 +463,14 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi GT_ModHandler.getIC2Item("casinggold", tAmount * 3), tAmount * 128, 1 * tVoltageMultiplier); - break; - case "Polytetrafluoroethylene": // Recipe for cells from PTFE, why is it here? + } + case "Polytetrafluoroethylene" -> // Recipe for cells from PTFE, why is it here? GT_Values.RA.addExtruderRecipe( GT_Utility.copyAmount(1L, aStack), ItemList.Shape_Extruder_Cell.get(0L), ItemList.Cell_Empty.get(tAmount * 4), tAmount * 128, 30); - break; } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java index 31260c1308..178a5f9e77 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingToolHead.java @@ -43,7 +43,7 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg && !aMaterial.contains(SubTag.NO_WORKING); boolean aNoWorking = aMaterial.contains(SubTag.NO_WORKING); switch (aPrefix) { - case toolHeadArrow: + case toolHeadArrow -> { if (aMaterial.mStandardMoltenFluid != null) if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { GT_Values.RA.addFluidSolidifierRecipe( @@ -64,8 +64,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg new Object[] { (aMaterial.contains(SubTag.WOOD) ? 115 : 'x') + "Pf", 'P', OrePrefixes.plate.get(aMaterial) }); } - break; - case toolHeadAxe: + } + case toolHeadAxe -> { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.AXE, @@ -96,8 +96,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.toolHeadAxe, aMaterial, 1L), GT_Proxy.tBits, new Object[] { "GG ", "G ", "f ", 'G', OrePrefixes.gem.get(aMaterial) }); - break; - case toolHeadBuzzSaw: + } + case toolHeadBuzzSaw -> { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.BUZZSAW_LV, @@ -228,8 +228,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.toolHeadBuzzSaw, aMaterial, 1L), GT_Proxy.tBits, new Object[] { "wXh", "X X", "fXx", 'X', OrePrefixes.plate.get(aMaterial) }); - break; - case toolHeadChainsaw: + } + case toolHeadChainsaw -> { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.CHAINSAW_LV, @@ -361,8 +361,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Proxy.tBits, new Object[] { "SRS", "XhX", "SRS", 'X', OrePrefixes.plate.get(aMaterial), 'S', OrePrefixes.plate.get(Materials.Steel), 'R', OrePrefixes.ring.get(Materials.Steel) }); - break; - case toolHeadDrill: + } + case toolHeadDrill -> { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.DRILL_LV, @@ -557,8 +557,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg calculateRecipeEU(aMaterial, (int) GT_Values.VP[2])); } } - break; - case toolHeadFile: + } + case toolHeadFile -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( @@ -586,7 +586,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg } } } - GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadFile, aMaterial, 1L), @@ -600,9 +599,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg null), 200, calculateRecipeEU(aMaterial, 120)); - - break; - case toolHeadHoe: + } + case toolHeadHoe -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( @@ -635,8 +633,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.toolHeadHoe, aMaterial, 1L), GT_Proxy.tBits, new Object[] { "GG ", "f ", " ", 'G', OrePrefixes.gem.get(aMaterial) }); - break; - case toolHeadPickaxe: + } + case toolHeadPickaxe -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( @@ -659,7 +657,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Proxy.tBits, new Object[] { "GGG", "f ", 'G', OrePrefixes.gem.get(aMaterial) }); } - GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadPickaxe, aMaterial, 1L), @@ -673,9 +670,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg null), 200, 120); - - break; - case toolHeadPlow: + } + case toolHeadPlow -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( @@ -697,7 +693,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Proxy.tBits, new Object[] { "GG", "GG", " f", 'G', OrePrefixes.gem.get(aMaterial) }); } - GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadPlow, aMaterial, 1L), @@ -711,9 +706,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg null), 200, calculateRecipeEU(aMaterial, 120)); - - break; - case toolHeadSaw: + } + case toolHeadSaw -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( @@ -736,7 +730,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Proxy.tBits, new Object[] { "GGf", 'G', OrePrefixes.gem.get(aMaterial) }); } - GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadSaw, aMaterial, 1L), @@ -750,9 +743,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg null), 200, calculateRecipeEU(aMaterial, 120)); - - break; - case toolHeadSense: + } + case toolHeadSense -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( @@ -775,7 +767,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Proxy.tBits, new Object[] { "GGG", " f ", " ", 'G', OrePrefixes.gem.get(aMaterial) }); } - GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadSense, aMaterial, 1L), @@ -789,9 +780,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg null), 200, calculateRecipeEU(aMaterial, 120)); - - break; - case toolHeadShovel: + } + case toolHeadShovel -> { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.SHOVEL, @@ -822,8 +812,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.toolHeadShovel, aMaterial, 1L), GT_Proxy.tBits, new Object[] { "fG", 'G', OrePrefixes.gem.get(aMaterial) }); - break; - case toolHeadSword: + } + case toolHeadSword -> { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addShapelessCraftingRecipe( @@ -846,7 +836,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Proxy.tBits, new Object[] { " G", "fG", 'G', OrePrefixes.gem.get(aMaterial) }); } - GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadSword, aMaterial, 1L), @@ -860,8 +849,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg null), 200, calculateRecipeEU(aMaterial, 120)); - break; - case toolHeadUniversalSpade: + } + case toolHeadUniversalSpade -> { GT_ModHandler.addShapelessCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.UNIVERSALSPADE, @@ -889,8 +878,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_OreDictUnificator.get(OrePrefixes.toolHeadUniversalSpade, aMaterial, 1L), GT_Proxy.tBits, new Object[] { "fX", 'X', OrePrefixes.toolHeadShovel.get(aMaterial) }); - break; - case toolHeadWrench: + } + case toolHeadWrench -> { GT_ModHandler.addCraftingRecipe( GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats( GT_MetaGenerated_Tool_01.WRENCH_LV, @@ -1152,9 +1141,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg new Object[] { "hXW", "XRX", "WXd", 'X', OrePrefixes.plate.get(aMaterial), 'S', OrePrefixes.plate.get(Materials.Steel), 'R', OrePrefixes.ring.get(Materials.Steel), 'W', OrePrefixes.screw.get(Materials.Steel) }); - break; - case toolHeadHammer: - case toolHeadMallet: + } + case toolHeadHammer, toolHeadMallet -> { GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mHandleMaterial, 1L), GT_OreDictUnificator.get(OrePrefixes.toolHeadHammer, aMaterial, 1L), @@ -1216,8 +1204,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_Proxy.tBits, new Object[] { "II ", "IIh", "II ", 'P', OrePrefixes.plate.get(aMaterial), 'I', OrePrefixes.ingot.get(aMaterial) }); - break; - case turbineBlade: + } + case turbineBlade -> { GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 4L), GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Magnalium, 1L), @@ -1242,7 +1230,6 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(176, 1, aMaterial, aMaterial, null), 1280, calculateRecipeEU(aMaterial, 6400)); - if (aSpecialRecipeReq2) { if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { GT_ModHandler.addCraftingRecipe( @@ -1261,9 +1248,8 @@ public class ProcessingToolHead implements gregtech.api.interfaces.IOreRecipeReg 200, calculateRecipeEU(aMaterial, 60)); } - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java index c991fdd149..3ae77f5b91 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java @@ -49,10 +49,10 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr int cableWidth; OrePrefixes correspondingCable; switch (aPrefix) { - case wireGt01: + case wireGt01 -> { cableWidth = 1; correspondingCable = OrePrefixes.cableGt01; - if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMASHING)) { + if (!aMaterial.contains(SubTag.NO_SMASHING)) { GT_Values.RA.addBenderRecipe( GT_Utility.copyAmount(1L, aStack), GT_OreDictUnificator.get(OrePrefixes.springSmall, aMaterial, 2L), @@ -104,8 +104,8 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_OreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L), 500, calculateRecipeEU(aMaterial, 8)); - break; - case wireGt02: + } + case wireGt02 -> { cableWidth = 2; correspondingCable = OrePrefixes.cableGt02; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { @@ -116,8 +116,8 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_Utility.copyAmount(1L, aStack), new Object[] { OrePrefixes.wireGt01.get(aMaterial), OrePrefixes.wireGt01.get(aMaterial) }); } - break; - case wireGt04: + } + case wireGt04 -> { cableWidth = 4; correspondingCable = OrePrefixes.cableGt04; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { @@ -132,8 +132,8 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_Utility.copyAmount(1L, aStack), new Object[] { OrePrefixes.wireGt02.get(aMaterial), OrePrefixes.wireGt02.get(aMaterial) }); } - break; - case wireGt08: + } + case wireGt08 -> { cableWidth = 8; correspondingCable = OrePrefixes.cableGt08; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { @@ -150,8 +150,8 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_Utility.copyAmount(1L, aStack), new Object[] { OrePrefixes.wireGt04.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); } - break; - case wireGt12: + } + case wireGt12 -> { cableWidth = 12; correspondingCable = OrePrefixes.cableGt12; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { @@ -162,8 +162,8 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr GT_Utility.copyAmount(1L, aStack), new Object[] { OrePrefixes.wireGt08.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial) }); } - break; - case wireGt16: + } + case wireGt16 -> { cableWidth = 16; correspondingCable = OrePrefixes.cableGt16; if (aMaterial.getProcessingMaterialTierEU() < TierEU.IV) { @@ -182,13 +182,14 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr AE2addNewAttunement(aStack); } } - break; - default: + } + default -> { GT_Log.err.println( "OrePrefix " + aPrefix.name() + " cannot be registered as a cable for Material " + aMaterial.mName); return; + } } int costMultiplier = cableWidth / 4 + 1; diff --git a/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java b/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java index 2045172eec..204d8f53a0 100644 --- a/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_BlockResistanceLoader.java @@ -2,6 +2,7 @@ package gregtech.loaders.postload; import java.util.Set; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemAxe; @@ -13,6 +14,7 @@ import gregtech.api.util.GT_Utility; public class GT_BlockResistanceLoader implements Runnable { @Override + @SuppressWarnings("unchecked") public void run() { if (GT_Mod.gregtechproxy.mHardRock) { Blocks.stone.setHardness(16.0F); @@ -35,15 +37,15 @@ public class GT_BlockResistanceLoader implements Runnable { Blocks.sponge.setHarvestLevel("axe", 0); Blocks.monster_egg.setHarvestLevel("pickaxe", 0); - GT_Utility.callMethod(Material.tnt, "func_85158_p", true, false, false, new Object[0]); - GT_Utility.callMethod(Material.tnt, "setAdventureModeExempt", true, false, false, new Object[0]); + GT_Utility.callMethod(Material.tnt, "func_85158_p", true, false, false); + GT_Utility.callMethod(Material.tnt, "setAdventureModeExempt", true, false, false); - Set tSet = (Set) GT_Utility.getFieldContent(ItemAxe.class, "field_150917_c", true, true); + Set<Block> tSet = (Set<Block>) GT_Utility.getFieldContent(ItemAxe.class, "field_150917_c", true, true); tSet.add(Blocks.bed); tSet.add(Blocks.hay_block); tSet.add(Blocks.sponge); - tSet = (Set) GT_Utility.getFieldContent(ItemPickaxe.class, "field_150915_c", true, true); + tSet = (Set<Block>) GT_Utility.getFieldContent(ItemPickaxe.class, "field_150915_c", true, true); tSet.add(Blocks.monster_egg); tSet.add(Blocks.tnt); } diff --git a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java index 32470a7e7a..c2af777700 100644 --- a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java +++ b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java @@ -490,7 +490,7 @@ public class GT_PostLoad { @SuppressWarnings("unchecked") // Overrides legacy method with raw types @Override - public void displayAllReleventItems(List aList) { + public void displayAllReleventItems(List<ItemStack> aList) { for (int i = 0; i < 32766; i += 2) { if (GT_MetaGenerated_Tool_01.INSTANCE.getToolStats( diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java index cce0da00cd..8cbdc42301 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -80,7 +80,7 @@ public class GT_PCBFactoryRecipes { // Plastic Circuit Board for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(64)); amountOfBoards -= 64; @@ -107,7 +107,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 0.5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(64)); amountOfBoards -= 64; @@ -135,7 +135,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 1; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Plastic_Advanced.get(64)); amountOfBoards -= 64; @@ -165,7 +165,7 @@ public class GT_PCBFactoryRecipes { // Advanced Circuit Board for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(i)); amountOfBoards -= 64; @@ -192,7 +192,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1.5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(i)); amountOfBoards -= 64; @@ -220,7 +220,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 2; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 1)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Epoxy_Advanced.get(i)); amountOfBoards -= 64; @@ -250,7 +250,7 @@ public class GT_PCBFactoryRecipes { // More Advanced Circuit Board for (int tier = 3; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 3)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(i)); amountOfBoards -= 64; @@ -277,7 +277,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 3; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2.5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(i)); amountOfBoards -= 64; @@ -305,7 +305,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 3; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 2)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Fiberglass_Advanced.get(i)); amountOfBoards -= 64; @@ -335,7 +335,7 @@ public class GT_PCBFactoryRecipes { // Elite Circuit Board for (int tier = 4; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 4)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(i)); amountOfBoards -= 64; @@ -362,7 +362,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 4; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 3.5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(i)); amountOfBoards -= 64; @@ -390,7 +390,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 4; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 3)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Multifiberglass_Elite.get(i)); amountOfBoards -= 64; @@ -420,7 +420,7 @@ public class GT_PCBFactoryRecipes { // Wetware Circuit Board for (int tier = 5; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(i)); amountOfBoards -= 64; @@ -448,7 +448,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 5; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 4.5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(i)); amountOfBoards -= 64; @@ -477,7 +477,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 5; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 4)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Wetware_Extreme.get(i)); amountOfBoards -= 64; @@ -508,7 +508,7 @@ public class GT_PCBFactoryRecipes { // Bioware Circuit Board for (int tier = 6; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(i)); amountOfBoards -= 64; @@ -536,7 +536,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 6; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 5.5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(i)); amountOfBoards -= 64; @@ -565,7 +565,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 6; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Bio_Ultra.get(i)); amountOfBoards -= 64; @@ -597,7 +597,7 @@ public class GT_PCBFactoryRecipes { // Optical Circuit Board for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 7)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Optical.get(i)); amountOfBoards -= 64; @@ -630,7 +630,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6.5)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Optical.get(i)); amountOfBoards -= 64; @@ -664,7 +664,7 @@ public class GT_PCBFactoryRecipes { } for (int tier = 7; tier <= GT_PCBFactoryManager.mTiersOfPlastics; tier++) { int amountOfBoards = (int) Math.ceil(8 * (Math.sqrt(Math.pow(2, tier - 6)))); - List<ItemStack> aBoards = new ArrayList<ItemStack>(); + List<ItemStack> aBoards = new ArrayList<>(); for (int i = amountOfBoards; i > 64; i -= 64) { aBoards.add(ItemList.Circuit_Board_Optical.get(i)); amountOfBoards -= 64; diff --git a/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java index a16edda7f0..10d9dee0f1 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ElectrolyzerRecipes.java @@ -138,7 +138,7 @@ public class ElectrolyzerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1)) - .outputChances(new int[] { 10000, 10000, 917 }) + .outputChances(10000, 10000, 917) .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) @@ -161,7 +161,7 @@ public class ElectrolyzerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(Materials.SodiumHydroxide.getDust(3), Materials.Empty.getCells(1)) .itemOutputs(Materials.Sodium.getDust(1), Materials.Hydrogen.getCells(1)) - .outputChances(new int[] { 10000, 10000 }) + .outputChances(10000, 10000) .noFluidInputs() .fluidOutputs(Materials.Oxygen.getGas(1000)) .duration(50 * SECONDS) diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java index a03bd1f9fe..1a965607ea 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java @@ -1265,8 +1265,8 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ItemList.Tool_Lighter_Platinum_Full.get(1L), ItemList.Tool_Lighter_Platinum_Empty.get(1L))); - Dyes.dyeBlack.addFluidDye((Fluid) GT_FluidFactory.of("squidink", "Squid Ink", LIQUID, 295)); - Dyes.dyeBlue.addFluidDye((Fluid) GT_FluidFactory.of("indigo", "Indigo Dye", LIQUID, 295)); + Dyes.dyeBlack.addFluidDye(GT_FluidFactory.of("squidink", "Squid Ink", LIQUID, 295)); + Dyes.dyeBlue.addFluidDye(GT_FluidFactory.of("indigo", "Indigo Dye", LIQUID, 295)); for (byte i = 0; i < Dyes.VALUES.length; i = (byte) (i + 1)) { Dyes tDye = Dyes.VALUES[i]; Fluid tFluid; diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java index 96ae4b8259..9949b895e6 100644 --- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java +++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java @@ -728,8 +728,7 @@ public class GT_NEI_DefaultHandler extends RecipeMapHandler { if (GT_NEI_DefaultHandler.this.mRecipeMap.useModularUI) { for (Widget child : modularWindow.getChildren()) { - if (child instanceof SlotWidget) { - SlotWidget widget = (SlotWidget) child; + if (child instanceof SlotWidget widget) { if (widget.getMcSlot() .getItemHandler() == itemInputsInventory) { |