diff options
author | Glease <4586901+Glease@users.noreply.github.com> | 2021-11-17 11:17:55 +0800 |
---|---|---|
committer | Glease <4586901+Glease@users.noreply.github.com> | 2021-11-17 11:25:36 +0800 |
commit | 449f9506ee48a19fd89a632779f30bc999a69b9e (patch) | |
tree | 1c9386100290e5064948cfe5a83b43d0e533bd4d /src/main/java/gregtech/api/util | |
parent | 44b9f91081c628b28f8ca6dd8f2ac94b7d52d374 (diff) | |
download | GT5-Unofficial-449f9506ee48a19fd89a632779f30bc999a69b9e.tar.gz GT5-Unofficial-449f9506ee48a19fd89a632779f30bc999a69b9e.tar.bz2 GT5-Unofficial-449f9506ee48a19fd89a632779f30bc999a69b9e.zip |
Rename GT_CoverBehavior_New to GT_CoverBehaviorBase
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r-- | src/main/java/gregtech/api/util/GT_CoverBehavior.java | 2 | ||||
-rw-r--r-- | src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java (renamed from src/main/java/gregtech/api/util/GT_CoverBehavior_New.java) | 4 | ||||
-rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 13 |
3 files changed, 5 insertions, 14 deletions
diff --git a/src/main/java/gregtech/api/util/GT_CoverBehavior.java b/src/main/java/gregtech/api/util/GT_CoverBehavior.java index db68a50cd2..9972331eb3 100644 --- a/src/main/java/gregtech/api/util/GT_CoverBehavior.java +++ b/src/main/java/gregtech/api/util/GT_CoverBehavior.java @@ -14,7 +14,7 @@ import static gregtech.api.enums.GT_Values.E; /** * For Covers with a special behavior. Has fixed storage format of 4 byte. Not very convenient... */ -public abstract class GT_CoverBehavior extends GT_CoverBehavior_New<ISerializableObject.LegacyCoverData> { +public abstract class GT_CoverBehavior extends GT_CoverBehaviorBase<ISerializableObject.LegacyCoverData> { public EntityPlayer lastPlayer = null; diff --git a/src/main/java/gregtech/api/util/GT_CoverBehavior_New.java b/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java index 3e2c2f856f..50ef2632d9 100644 --- a/src/main/java/gregtech/api/util/GT_CoverBehavior_New.java +++ b/src/main/java/gregtech/api/util/GT_CoverBehaviorBase.java @@ -18,12 +18,12 @@ import static gregtech.api.enums.GT_Values.E; * * @author glease */ -public abstract class GT_CoverBehavior_New<T extends ISerializableObject> { +public abstract class GT_CoverBehaviorBase<T extends ISerializableObject> { public EntityPlayer lastPlayer = null; private final Class<T> typeToken; - protected GT_CoverBehavior_New(Class<T> typeToken) { + protected GT_CoverBehaviorBase(Class<T> typeToken) { this.typeToken = typeToken; } diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 08b10e4fdf..a07868ec68 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -104,16 +104,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.text.NumberFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; import java.util.Objects; import java.util.Optional; @@ -2157,7 +2148,7 @@ public class GT_Utility { try { if (tTileEntity instanceof ICoverable) { rEUAmount += 300; - String tString = ((ICoverable) tTileEntity).getCoverBehaviorAtSideNew((byte) aSide).getDescription((byte) aSide, ((ICoverable) tTileEntity).getCoverIDAtSide((byte) aSide), ((ICoverable) tTileEntity).getCoverDataAtSideNew((byte) aSide), (ICoverable) tTileEntity); + String tString = ((ICoverable) tTileEntity).getCoverBehaviorAtSideNew((byte) aSide).getDescription((byte) aSide, ((ICoverable) tTileEntity).getCoverIDAtSide((byte) aSide), ((ICoverable) tTileEntity).getComplexCoverDataAtSide((byte) aSide), (ICoverable) tTileEntity); if (tString != null && !tString.equals(E)) tList.add(tString); } } catch (Throwable e) { |