aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/util
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-05-12 17:27:07 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-05-12 17:30:39 +1000
commitd875764bcc49df6208f43a88147c4fdb563adba9 (patch)
tree01b630c54d8ca1fe78835f031650663f86bfafa1 /src/Java/gtPlusPlus/core/util
parentd2dfc22dda794f4366ad15dc252110d69de6d0fa (diff)
downloadGT5-Unofficial-d875764bcc49df6208f43a88147c4fdb563adba9.tar.gz
GT5-Unofficial-d875764bcc49df6208f43a88147c4fdb563adba9.tar.bz2
GT5-Unofficial-d875764bcc49df6208f43a88147c4fdb563adba9.zip
% Whitespace Fixes.
$ Backported Changes from master branch.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java32
1 files changed, 15 insertions, 17 deletions
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
index e9d68ea864..98b02078c6 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java
@@ -27,11 +27,11 @@ public class MaterialUtils {
@SuppressWarnings({ "rawtypes", "unused" })
private static Class[][] commonTypes =
-{{Materials.class, int.class, TextureSet.class, float.class, int.class,
- int.class, int.class, int.class, int.class, int.class, int.class,
- String.class, int.class, int.class, int.class, int.class, boolean.class,
- boolean.class, int.class, int.class, int.class, Dyes.class, int.class,
- List.class , List.class}};
+ {{Materials.class, int.class, TextureSet.class, float.class, int.class,
+ int.class, int.class, int.class, int.class, int.class, int.class,
+ String.class, int.class, int.class, int.class, int.class, boolean.class,
+ boolean.class, int.class, int.class, int.class, Dyes.class, int.class,
+ List.class , List.class}};
public static List<?> oreDictValuesForEntry(final String oredictName){
List<?> oredictItemNames;
@@ -47,7 +47,7 @@ public class MaterialUtils {
public static Material generateMaterialFromGtENUM(final Materials material){
return generateMaterialFromGtENUM(material, null);
}
-
+
public static Material generateMaterialFromGtENUM(final Materials material, short[] customRGB){
@SuppressWarnings("deprecation")
String name = material.name();
@@ -68,12 +68,12 @@ public class MaterialUtils {
if (material.isRadioactive()){
radioactivity = 1;
}
-
+
//Weird Blacklist of Bad Chemical Strings
if (material.mElement == Element.Pb || material.mElement == Element.Na || material.mElement == Element.Ar){
chemicalFormula = StringUtils.subscript(Utils.sanitizeString(material.mElement.name()));
}
-
+
//Determine default state
Logger.MATERIALS("[Debug] Setting State of GT generated material. "+material.mDefaultLocalName);
if (material.getMolten(1) != null || material.getSolid(1) != null){
@@ -140,10 +140,10 @@ public class MaterialUtils {
return temp;
}
- public static boolean hasValidRGBA(final short[] rgba){
+ public static boolean hasValidRGBA(final short[] rgba){
if (rgba == null || rgba.length < 3 || rgba.length > 4){
return false;
- }
+ }
return true;
}
@@ -184,9 +184,9 @@ public class MaterialUtils {
}
public static Materials getMaterialByName(String materialName) {
-
+
if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK) {
- return (Materials) EnumUtils.getValue(gregtech.api.enums.Materials.class, materialName, false);
+ return (Materials) EnumUtils.getValue(gregtech.api.enums.Materials.class, materialName, false);
}
else {
for (Materials m : Materials.values()) {
@@ -197,7 +197,7 @@ public class MaterialUtils {
return null;
}
}
-
+
@SuppressWarnings("deprecation")
public static String getMaterialName(Materials mat){
String mName;
@@ -212,14 +212,12 @@ public class MaterialUtils {
}
return mName;
}
-
+
public static TextureSet getMostCommonTextureSet(List<Material> list) {
Optional<TextureSet> r = list.stream().map(Material::getTextureSet).collect(Collectors.groupingBy(Function.identity(), Collectors.counting())).entrySet().stream().max(Map.Entry.comparingByValue()).map(Map.Entry::getKey);
TextureSet o = (r != null && r.isPresent() && r.get() != null) ? r.get() : null;
return o;
- }
-
-
}
+} \ No newline at end of file