aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/fluid
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/fluid
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/fluid')
-rw-r--r--src/main/java/gregtech/common/fluid/GT_Fluid.java21
1 files changed, 5 insertions, 16 deletions
diff --git a/src/main/java/gregtech/common/fluid/GT_Fluid.java b/src/main/java/gregtech/common/fluid/GT_Fluid.java
index a508b5ecf1..dd3ffdfc51 100644
--- a/src/main/java/gregtech/common/fluid/GT_Fluid.java
+++ b/src/main/java/gregtech/common/fluid/GT_Fluid.java
@@ -154,22 +154,11 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R
public IGT_RegisteredFluid configureMaterials(final Materials material) {
if (material != null) {
switch (fluidState) {
- case SLURRY:
- material.mSolid = registeredFluid;
- break;
- case GAS:
- material.mGas = registeredFluid;
- break;
- case PLASMA:
- material.mPlasma = registeredFluid;
- break;
- case MOLTEN:
- material.mStandardMoltenFluid = registeredFluid;
- break;
- case LIQUID:
- default:
- material.mFluid = registeredFluid;
- break;
+ case SLURRY -> material.mSolid = registeredFluid;
+ case GAS -> material.mGas = registeredFluid;
+ case PLASMA -> material.mPlasma = registeredFluid;
+ case MOLTEN -> material.mStandardMoltenFluid = registeredFluid;
+ default -> material.mFluid = registeredFluid;
}
Materials.FLUID_MAP.put(registeredFluid, material);
}