aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/blocks
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2023-04-01 20:06:12 +0100
committerGitHub <noreply@github.com>2023-04-01 19:06:12 +0000
commitb088958c9f6935d356b6c087c8e8106b400aa24f (patch)
treebe608fac08ba158f1226a4fb9f5b1ed459bac2a9 /src/main/java/gregtech/common/blocks
parente52cd9c3458584e58073df5cd9cde1302994f266 (diff)
downloadGT5-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/common/blocks')
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings1.java18
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings2.java54
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings3.java60
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings4.java143
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings5.java146
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings6.java49
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings8.java114
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings9.java12
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Machines.java18
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores.java41
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java33
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java41
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java10
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Storage.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Cyclotron_Coils.java33
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings2.java7
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings5.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Casings_Abstract.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Concretes.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_LongDistancePipe.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Machines.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Ores.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Stones_Abstract.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Item_Storage.java2
25 files changed, 323 insertions, 476 deletions
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();