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();
+ 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);
}
}