aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks
diff options
context:
space:
mode:
authorConnor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>2023-10-18 17:03:23 +0100
committerGitHub <noreply@github.com>2023-10-18 18:03:23 +0200
commitfbdbb388c369fae549cfde3eed38b536f7461d90 (patch)
treeb46f7fc949d7e4c6e3be910b81ed725e6dc1648e /src/main/java/gtPlusPlus/xmod/gregtech/common/blocks
parentb670446fdf49991093b485f0aa14050039632775 (diff)
downloadGT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.tar.gz
GT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.tar.bz2
GT5-Unofficial-fbdbb388c369fae549cfde3eed38b536f7461d90.zip
Cleaning up (#767)
* Kill playerAPI * Gut more events and compat that is now obsolete * Remove commented out code * Remove final modifier from methods * Make more stuff final * Remove slow building ring * Protected -> private in final classes * More cleaning * More cleaning v2 * Purging * Clean DevHelper * Clean DevHelper 2 * delete DevHelper * remove useless IFMLLoadingPlugin.MCVersion annotation from @Mod files * check for obfuscation only once in the IFMLloadingPlugin.injectData * don't instantiate the static class ASMConfig * delete unused and empty implementation of IFMLCallHook * delete empty class * delete ClassesToTransform class that just holds the class names constants * delete unused methods and unsless logging in dummymod container * delete unused transformer ClassTransformer_TT_ThaumicRestorer * spotless * Clean * Clean utils * Build checkpoint * Purge * Stage 2 * Stage 3 * Stage 4 * Stage 5 * Stage 6 * Spotless * Imports * Stage idk * Stage 1 * Fix issue * Spotless * Format numbers --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Co-authored-by: Connor Colenso <colen@CONNORSPC>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/blocks')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java48
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java22
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java18
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java54
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java30
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java26
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java56
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java51
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java68
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler6.java17
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java15
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java15
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java4
15 files changed, 192 insertions, 238 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
index c38b7d4282..5a16d0a20d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
@@ -65,7 +65,7 @@ public class GregtechMetaCasingBlocks3 extends GregtechMetaCasingBlocksAbstract
GT_LanguageManager
.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (UV)");
GT_LanguageManager
- .addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (MAX)");
+ .addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (UHV)");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Advanced Cryogenic Casing");
GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Volcanus Casing");
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
index 99228b6ed3..26c747e50e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java
@@ -81,53 +81,69 @@ public class GregtechMetaCasingBlocks5 extends GregtechMetaCasingBlocksAbstract
public static IIcon getStaticIcon(final int ordinalSide, final int aMeta) {
if ((aMeta >= 0) && (aMeta < 16)) {
switch (aMeta) {
- case 0:
+ case 0 -> {
return TexturesGtBlock.TEXTURE_PIPE_GRINDING_MILL.getIcon();
- case 1:
+ }
+ case 1 -> {
return TexturesGtBlock.TEXTURE_CASING_GRINDING_MILL.getIcon();
- case 2:
+ }
+ case 2 -> {
return TexturesGtBlock.TEXTURE_GEARBOX_GRINDING_MILL.getIcon();
- case 3:
+ }
+ case 3 -> {
return TexturesGtBlock.TEXTURE_TECH_PANEL_D.getIcon();
- case 4:
+ }
+ case 4 -> {
return TexturesGtBlock.Casing_Machine_Metal_Sheet_H.getIcon();
- case 5:
+ }
+ case 5 -> {
return TexturesGtBlock.Casing_Machine_Metal_Sheet_I.getIcon();
- case 6:
+ }
+ case 6 -> {
return TexturesGtBlock.TEXTURE_TECH_PANEL_H.getIcon();
- case 7:
+ }
+ case 7 -> {
if (ordinalSide == 0 || ordinalSide == 1) {
return TexturesGtBlock.Manipulator_Top.getIcon();
}
return TexturesGtBlock.NeutronPulseManipulator.getIcon();
- case 8:
+ }
+ case 8 -> {
if (ordinalSide == 0 || ordinalSide == 1) {
return TexturesGtBlock.Manipulator_Top.getIcon();
}
return TexturesGtBlock.CosmicFabricManipulator.getIcon();
- case 9:
+ }
+ case 9 -> {
if (ordinalSide == 0 || ordinalSide == 1) {
return TexturesGtBlock.Manipulator_Top.getIcon();
}
return TexturesGtBlock.InfinityInfusedManipulator.getIcon();
- case 10:
+ }
+ case 10 -> {
if (ordinalSide == 0 || ordinalSide == 1) {
return TexturesGtBlock.Manipulator_Top.getIcon();
}
return TexturesGtBlock.SpaceTimeContinuumRipper.getIcon();
- case 11:
+ }
+ case 11 -> {
return TexturesGtBlock.NeutronShieldingCore.getIcon();
- case 12:
+ }
+ case 12 -> {
return TexturesGtBlock.CosmicFabricShieldingCore.getIcon();
- case 13:
+ }
+ case 13 -> {
return TexturesGtBlock.InfinityInfusedShieldingCore.getIcon();
- case 14:
+ }
+ case 14 -> {
return TexturesGtBlock.SpaceTimeBendingCore.getIcon();
- case 15:
+ }
+ case 15 -> {
if (ordinalSide == 0 || ordinalSide == 1) {
return TexturesGtBlock.Blank.getIcon();
}
return TexturesGtBlock.ForceFieldGlass.getIcon();
+ }
}
}
return Textures.BlockIcons.RENDERING_ERROR.getIcon();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java
index f6c53e875e..17b5507416 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java
@@ -15,7 +15,7 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
public class GregtechMetaCasingBlocksPipeGearbox extends GregtechMetaCasingBlocksAbstract {
- private static HashMap<Integer, Integer> sMaterialMapping = new HashMap<Integer, Integer>();
+ private static HashMap<Integer, Integer> sMaterialMapping = new HashMap<>();
public GregtechMetaCasingBlocksPipeGearbox() {
super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.pipesgears", GT_Material_Casings.INSTANCE);
@@ -60,24 +60,12 @@ public class GregtechMetaCasingBlocksPipeGearbox extends GregtechMetaCasingBlock
public IIcon getIcon(final int ordinalSide, final int meta) {
if ((meta >= 0) && (meta < 16)) {
switch (meta) {
- case 0:
- case 1:
- case 2:
- case 3:
- case 4:
- case 5:
- case 6:
- case 7:
+ case 0, 1, 2, 3, 4, 5, 6, 7 -> {
return TexturesGtBlock.TEXTURE_GEARBOX_GENERIC.getIcon();
- case 8:
- case 9:
- case 10:
- case 11:
- case 12:
- case 13:
- case 14:
- case 15:
+ }
+ case 8, 9, 10, 11, 12, 13, 14, 15 -> {
return TexturesGtBlock.TEXTURE_PIPE_GENERIC.getIcon();
+ }
}
}
return Textures.BlockIcons.RENDERING_ERROR.getIcon();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
index b16868aeb2..a8ea05ddbc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java
@@ -65,16 +65,12 @@ public class GregtechMetaSpecialMachineCasings extends GregtechMetaCasingBlocksA
@Override
public IIcon getIcon(int ordinalSide, int aMeta) {
- switch (aMeta) {
- case 0:
- return Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon();
- case 1:
- return Textures.BlockIcons.MACHINE_CASING_FROST_PROOF.getIcon();
- case 2:
- return TexturesGtBlock.Casing_Material_Laurenium.getIcon();
- case 3:
- return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon();
- }
- return Textures.BlockIcons.RENDERING_ERROR.getIcon();
+ return switch (aMeta) {
+ case 0 -> Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon();
+ case 1 -> Textures.BlockIcons.MACHINE_CASING_FROST_PROOF.getIcon();
+ case 2 -> TexturesGtBlock.Casing_Material_Laurenium.getIcon();
+ case 3 -> Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon();
+ default -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
+ };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
index 61e74fc56a..411fef65d3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java
@@ -97,40 +97,24 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs
}
public static IIcon getStaticIcon(final int ordinalSide, final byte aMeta) {
- switch (aMeta) {
- case 0:
- return TexturesGtBlock.Casing_Redox_1.getIcon();
- case 1:
- return Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon();
- case 2:
- return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
- case 3:
- return Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon();
- case 4:
- return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
- case 5:
- return TexturesGtBlock.Casing_Material_RedSteel.getIcon();
- case 6:
- return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon();
- case 7:
- return TexturesGtBlock.Casing_Material_Stellite.getIcon();
- case 8:
- return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon();
- case 9:
- return TexturesGtBlock.TEXTURE_CASING_FLOTATION.getIcon();
- case 10:
- return TexturesGtBlock.Casing_Material_Talonite.getIcon();
- case 11:
- return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon();
- case 12:
- return TexturesGtBlock.Casing_Redox_5.getIcon();
- case 13:
- return TexturesGtBlock.TEXTURE_MAGIC_PANEL_B.getIcon();
- case 14:
- return TexturesGtBlock.Casing_Material_Talonite.getIcon();
- case 15:
- return TexturesGtBlock.Turbine_SC_Material_Casing.getIcon();
- }
- return Textures.BlockIcons.RENDERING_ERROR.getIcon();
+ return switch (aMeta) {
+ case 0 -> TexturesGtBlock.Casing_Redox_1.getIcon();
+ case 1 -> Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon();
+ case 2 -> Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
+ case 3 -> Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon();
+ case 4 -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
+ case 5 -> TexturesGtBlock.Casing_Material_RedSteel.getIcon();
+ case 6 -> TexturesGtBlock.Casing_Material_MaragingSteel.getIcon();
+ case 7 -> TexturesGtBlock.Casing_Material_Stellite.getIcon();
+ case 8 -> TexturesGtBlock.Casing_Machine_Simple_Top.getIcon();
+ case 9 -> TexturesGtBlock.TEXTURE_CASING_FLOTATION.getIcon();
+ case 10 -> TexturesGtBlock.Casing_Material_Talonite.getIcon();
+ case 11 -> Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon();
+ case 12 -> TexturesGtBlock.Casing_Redox_5.getIcon();
+ case 13 -> TexturesGtBlock.TEXTURE_MAGIC_PANEL_B.getIcon();
+ case 14 -> TexturesGtBlock.Casing_Material_Talonite.getIcon();
+ case 15 -> TexturesGtBlock.Turbine_SC_Material_Casing.getIcon();
+ default -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
+ };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java
index 1cc2403973..d9ae7fc1c6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java
@@ -84,24 +84,16 @@ public class GregtechMetaSpecialMultiCasings2 extends GregtechMetaCasingBlocksAb
}
public static IIcon getStaticIcon(final byte aSide, final byte aMeta) {
- switch (aMeta) {
- case 0:
- return TexturesGtBlock.Casing_Resonance_1.getIcon();
- case 1:
- return TexturesGtBlock.Casing_Resonance_2.getIcon();
- case 2:
- return TexturesGtBlock.Casing_Resonance_3.getIcon();
- case 3:
- return TexturesGtBlock.Casing_Resonance_4.getIcon();
- case 4:
- return TexturesGtBlock.Casing_Modulator_1.getIcon();
- case 5:
- return TexturesGtBlock.Casing_Modulator_2.getIcon();
- case 6:
- return TexturesGtBlock.Casing_Modulator_3.getIcon();
- case 7:
- return TexturesGtBlock.Casing_Modulator_4.getIcon();
- }
- return Textures.BlockIcons.RENDERING_ERROR.getIcon();
+ return switch (aMeta) {
+ case 0 -> TexturesGtBlock.Casing_Resonance_1.getIcon();
+ case 1 -> TexturesGtBlock.Casing_Resonance_2.getIcon();
+ case 2 -> TexturesGtBlock.Casing_Resonance_3.getIcon();
+ case 3 -> TexturesGtBlock.Casing_Resonance_4.getIcon();
+ case 4 -> TexturesGtBlock.Casing_Modulator_1.getIcon();
+ case 5 -> TexturesGtBlock.Casing_Modulator_2.getIcon();
+ case 6 -> TexturesGtBlock.Casing_Modulator_3.getIcon();
+ case 7 -> TexturesGtBlock.Casing_Modulator_4.getIcon();
+ default -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
+ };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java
index c9f748e171..7ddab1c471 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java
@@ -63,7 +63,7 @@ public class GregtechMetaTieredCasingBlocks1 extends GregtechMetaCasingBlocksAbs
GregtechItemList.GTPP_Casing_LuV.set(new ItemStack(this, 1, 6));
GregtechItemList.GTPP_Casing_ZPM.set(new ItemStack(this, 1, 7));
GregtechItemList.GTPP_Casing_UV.set(new ItemStack(this, 1, 8));
- GregtechItemList.GTPP_Casing_MAX.set(new ItemStack(this, 1, 9));
+ GregtechItemList.GTPP_Casing_UHV.set(new ItemStack(this, 1, 9));
}
@Override
@@ -71,20 +71,14 @@ public class GregtechMetaTieredCasingBlocks1 extends GregtechMetaCasingBlocksAbs
if (aMeta < 10) {
return TexturesGtBlock.TIERED_MACHINE_HULLS[aMeta].getIcon();
}
- switch (aMeta) {
- case 10:
- return Textures.BlockIcons.RENDERING_ERROR.getIcon();
- case 11:
- return Textures.BlockIcons.RENDERING_ERROR.getIcon();
- case 12:
- return Textures.BlockIcons.RENDERING_ERROR.getIcon();
- case 13:
- return Textures.BlockIcons.RENDERING_ERROR.getIcon();
- case 14:
- return Textures.BlockIcons.RENDERING_ERROR.getIcon();
- case 15:
- return Textures.BlockIcons.RENDERING_ERROR.getIcon();
- }
- return Textures.BlockIcons.RENDERING_ERROR.getIcon();
+ return switch (aMeta) {
+ case 10 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
+ case 11 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
+ case 12 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
+ case 13 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
+ case 14 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
+ case 15 -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
+ default -> Textures.BlockIcons.RENDERING_ERROR.getIcon();
+ };
}
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
index ec1ee2a226..3409277f91 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
@@ -13,57 +13,39 @@ public class CasingTextureHandler {
public static IIcon getIcon(final int ordinalSide, final int aMeta) { // Texture ID's. case 0 == ID[57]
if ((aMeta >= 0) && (aMeta < 16)) {
- switch (aMeta) {
+ return switch (aMeta) {
// Centrifuge
- case 0:
- return TexturesGtBlock.Casing_Material_Centrifuge.getIcon();
+ case 0 -> TexturesGtBlock.Casing_Material_Centrifuge.getIcon();
// Coke Oven Frame
- case 1:
- return TexturesGtBlock.Casing_Material_Tantalloy61.getIcon();
+ case 1 -> TexturesGtBlock.Casing_Material_Tantalloy61.getIcon();
// Coke Oven Casing Tier 1
- case 2:
- return Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon();
+ case 2 -> Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon();
// Coke Oven Casing Tier 2
- case 3:
- return Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon();
+ case 3 -> Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon();
// Material Press Casings
- case 4:
- return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
+ case 4 -> Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
// Electrolyzer Casings
- case 5:
- return TexturesGtBlock.Casing_Material_Potin.getIcon();
+ case 5 -> TexturesGtBlock.Casing_Material_Potin.getIcon();
// Broken Blue Fusion Casings
- case 6:
- return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon();
+ case 6 -> TexturesGtBlock.Casing_Material_MaragingSteel.getIcon();
// Maceration Stack Casings
- case 7:
- return TexturesGtBlock.Casing_Material_Tumbaga.getIcon();
+ case 7 -> TexturesGtBlock.Casing_Material_Tumbaga.getIcon();
// Broken Pink Fusion Casings
- case 8:
- return TexturesGtBlock.TEXTURE_ORGANIC_PANEL_A_GLOWING.getIcon();
+ case 8 -> TexturesGtBlock.TEXTURE_ORGANIC_PANEL_A_GLOWING.getIcon();
// Matter Fabricator Casings
- case 9:
- return TexturesGtBlock.TEXTURE_METAL_PANEL_F.getIcon();
+ case 9 -> TexturesGtBlock.TEXTURE_METAL_PANEL_F.getIcon();
// Iron Blast Fuance Textures
- case 10:
- return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon();
+ case 10 -> TexturesGtBlock.Casing_Machine_Simple_Top.getIcon();
// Multitank Exterior Casing
- case 11:
- return TexturesGtBlock.Casing_Material_Grisium.getIcon();
+ case 11 -> TexturesGtBlock.Casing_Material_Grisium.getIcon();
// Reactor Casing I
- case 12:
- return TexturesGtBlock.Casing_Material_Stellite.getIcon();
+ case 12 -> TexturesGtBlock.Casing_Material_Stellite.getIcon();
// Reactor Casing II
- case 13:
- return TexturesGtBlock.Casing_Material_Zeron100.getIcon();
- case 14:
- return TexturesGtBlock.Casing_Staballoy_Firebox.getIcon();
- case 15:
- return TexturesGtBlock.Casing_Material_ZirconiumCarbide.getIcon();
-
- default:
- return Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon();
- }
+ case 13 -> TexturesGtBlock.Casing_Material_Zeron100.getIcon();
+ case 14 -> TexturesGtBlock.Casing_Staballoy_Firebox.getIcon();
+ case 15 -> TexturesGtBlock.Casing_Material_ZirconiumCarbide.getIcon();
+ default -> Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon();
+ };
}
return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TUNGSTENSTEEL.getIcon();
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
index e02a9ffbd3..1da572fb35 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
@@ -9,44 +9,61 @@ public class CasingTextureHandler2 {
public static IIcon getIcon(final int ordinalSide, final int aMeta) { // Texture ID's. case 0 == ID[57]
if ((aMeta >= 0) && (aMeta < 16)) {
switch (aMeta) {
- case 0:
+ case 0 -> {
return TexturesGtBlock.Casing_Material_RedSteel.getIcon();
- case 1:
+ }
+ case 1 -> {
return TexturesGtBlock.Casing_Material_HastelloyX.getIcon();
- case 2:
+ }
+ case 2 -> {
return TexturesGtBlock.Casing_Material_HastelloyN.getIcon();
- case 3:
+ }
+ case 3 -> {
return TexturesGtBlock.Casing_Material_Fluid_IncoloyDS.getIcon();
- case 4:
+ }
+ case 4 -> {
return TexturesGtBlock.Casing_Material_Grisium.getIcon();
- case 5:
+ }
+ case 5 -> {
return TexturesGtBlock.Casing_Machine_Metal_Panel_A.getIcon();
- case 6:
+ }
+ case 6 -> {
return TexturesGtBlock.Casing_Machine_Metal_Grate_A.getIcon();
- case 7:
+ }
+ case 7 -> {
return TexturesGtBlock.Casing_Redox_1.getIcon();
- case 8:
+ }
+ case 8 -> {
return TexturesGtBlock.Casing_Machine_Metal_Sheet_A.getIcon();
- case 9:
+ }
+ case 9 -> {
return TexturesGtBlock.Overlay_Machine_Cyber_A.getIcon();
- case 10:
+ }
+ case 10 -> {
return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon();
- case 11:
+ }
+ case 11 -> {
return TexturesGtBlock.Casing_Material_Tantalloy61.getIcon();
- case 12:
+ }
+ case 12 -> {
return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon();
- case 13:
+ }
+ case 13 -> {
if (ordinalSide < 2) {
return TexturesGtBlock.TEXTURE_TECH_A.getIcon();
} else {
return TexturesGtBlock.TEXTURE_TECH_B.getIcon();
}
- case 14:
+ }
+ case 14 -> {
return Textures.BlockIcons.RENDERING_ERROR.getIcon();
- case 15:
+ }
+ case 15 -> {
return TexturesGtBlock.Casing_Machine_Acacia_Log.getIcon();
- default:
+ }
+ default -> {
return TexturesGtBlock.Overlay_UU_Matter.getIcon();
+ }
}
}
return TexturesGtBlock._PlaceHolder.getIcon();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
index 9ffbbd6a85..6b2627ec39 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
@@ -8,55 +8,49 @@ public class CasingTextureHandler3 {
public static IIcon getIcon(final int ordinalSide, final int aMeta) { // Texture ID's. case 0 == ID[57]
if ((aMeta >= 0) && (aMeta < 16)) {
- switch (aMeta) {
- case 0:
+ return switch (aMeta) {
+ case 0 ->
// Aquatic Casing
- return TexturesGtBlock.TEXTURE_METAL_PANEL_B.getIcon();
- case 1:
+ TexturesGtBlock.TEXTURE_METAL_PANEL_B.getIcon();
+ case 1 ->
// Inconel Reinforced Casing
- return TexturesGtBlock.TEXTURE_METAL_PANEL_D.getIcon();
- case 2:
+ TexturesGtBlock.TEXTURE_METAL_PANEL_D.getIcon();
+ case 2 ->
// Multi-Use Casing
- return TexturesGtBlock.TEXTURE_METAL_PANEL_C.getIcon();
- case 3:
+ TexturesGtBlock.TEXTURE_METAL_PANEL_C.getIcon();
+ case 3 ->
// Trinium Plated Mining Platform Casing
- return TexturesGtBlock.Casing_Trinium_Naquadah_Vent.getIcon();
- case 4:
+ TexturesGtBlock.Casing_Trinium_Naquadah_Vent.getIcon();
+ case 4 ->
// Vanadium Redox IV
- return TexturesGtBlock.Casing_Redox_2.getIcon();
- case 5:
+ TexturesGtBlock.Casing_Redox_2.getIcon();
+ case 5 ->
// Vanadium Redox LuV
- return TexturesGtBlock.Casing_Redox_3.getIcon();
- case 6:
+ TexturesGtBlock.Casing_Redox_3.getIcon();
+ case 6 ->
// Vanadium Redox ZPM
- return TexturesGtBlock.Casing_Redox_4.getIcon();
- case 7:
+ TexturesGtBlock.Casing_Redox_4.getIcon();
+ case 7 ->
// Vanadium Redox UV
- return TexturesGtBlock.Casing_Redox_5.getIcon();
- case 8:
+ TexturesGtBlock.Casing_Redox_5.getIcon();
+ case 8 ->
// Vanadium Redox MAX
- return TexturesGtBlock.Casing_Redox_6.getIcon();
- case 9:
+ TexturesGtBlock.Casing_Redox_6.getIcon();
+ case 9 ->
// Amazon Warehouse Casing
- return TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon();
- case 10:
+ TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon();
+ case 10 ->
// Adv. Vac. Freezer
- return TexturesGtBlock.TEXTURE_CASING_ADVANCED_CRYOGENIC.getIcon();
- case 11:
+ TexturesGtBlock.TEXTURE_CASING_ADVANCED_CRYOGENIC.getIcon();
+ case 11 ->
// Adv. EBF
- return TexturesGtBlock.TEXTURE_CASING_ADVANCED_VOLCNUS.getIcon();
- case 12:
- return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II.getIcon();
- case 13:
- return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II_INNER.getIcon();
- case 14:
- return TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA.getIcon();
- case 15:
- return TexturesGtBlock.TEXTURE_MAGIC_PANEL_A.getIcon();
-
- default:
- return TexturesGtBlock._PlaceHolder.getIcon();
- }
+ TexturesGtBlock.TEXTURE_CASING_ADVANCED_VOLCNUS.getIcon();
+ case 12 -> TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II.getIcon();
+ case 13 -> TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II_INNER.getIcon();
+ case 14 -> TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA.getIcon();
+ case 15 -> TexturesGtBlock.TEXTURE_MAGIC_PANEL_A.getIcon();
+ default -> TexturesGtBlock._PlaceHolder.getIcon();
+ };
}
return TexturesGtBlock._PlaceHolder.getIcon();
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler6.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler6.java
index e33099b09a..b8d5a024df 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler6.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler6.java
@@ -8,17 +8,12 @@ public class CasingTextureHandler6 {
public static IIcon getIcon(final int ordinalSide, final int aMeta) { // Texture ID's. case 0 == ID[57]
if ((aMeta >= 0) && (aMeta < 16)) {
- switch (aMeta) {
- case 0:
- return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_III.getIcon();
- case 1:
- return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_III_INNER.getIcon();
- case 2:
- return TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_HYPER.getIcon();
- default:
- return TexturesGtBlock._PlaceHolder.getIcon();
-
- }
+ return switch (aMeta) {
+