diff options
| author | Raven Szewczyk <git@eigenraven.me> | 2023-04-01 20:06:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-01 19:06:12 +0000 |
| commit | b088958c9f6935d356b6c087c8e8106b400aa24f (patch) | |
| tree | be608fac08ba158f1226a4fb9f5b1ed459bac2a9 /src/main/java/gregtech/api/metatileentity/implementations | |
| parent | e52cd9c3458584e58073df5cd9cde1302994f266 (diff) | |
| download | GT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.tar.gz GT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.tar.bz2 GT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.zip | |
Jabel, Generic injection and mostly automatic code cleanup (#1829)
* Enable Jabel&Generic injection, fix type error caused by this
* add missing <>
* Infer generic types automatically
* Parametrize cast types
* Use enhanced for loops
* Unnecessary boxing
* Unnecessary unboxing
* Use Objects.equals
* Explicit type can be replaced with `<>`
* Collapse identical catch blocks
* Add SafeVarargs where applicable
* Anonymous type can be replaced with lambda
* Use List.sort directly
* Lambda can be a method reference
* Statement lambda can be an expression lambda
* Use string switches
* Instanceof pattern matching
* Text block can be used
* Migrate to enhanced switch
* Java style array declarations
* Unnecessary toString()
* More unnecessary String conversions
* Unnecessary modifiers
* Unnecessary semicolons
* Fix duplicate conditions
* Extract common code from if branches
* Replace switches with ifs for 1-2 cases
* Inner class may be static
* Minor performance issues
* Replace string appending in loops with string builders
* Fix IntelliJ using the wrong empty list method
* Use Long.compare
* Generic arguments: getSubItems
* Generic arguments: getSubBlocks
* Raw types warnings
* Fix remaining missing generics
* Too weak variable type leads to unnecessary cast
* Redundant type casts
* Redundant array length check
* Redundant vararg arrays
* Manual min/max implementations
* A couple missed inspections
* Goodbye explosion power ternary ladder
* Apply spotless
* Get rid of the other two big ternary ladders
* Binary search explosion power
* Don't overcomplicate things
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
17 files changed, 474 insertions, 901 deletions
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; |