From 74a9bcc5a0b7e179a71932e7dba88794deeb4c99 Mon Sep 17 00:00:00 2001 From: kuba6000 Date: Mon, 10 Apr 2023 21:03:52 +0200 Subject: Update spotless formatting --- src/main/java/kubatech/api/utils/GSONUtils.java | 19 +++--- src/main/java/kubatech/api/utils/MobUtils.java | 2 +- src/main/java/kubatech/api/utils/ModUtils.java | 72 ++++++++++++++--------- src/main/java/kubatech/api/utils/StringUtils.java | 19 +++--- 4 files changed, 67 insertions(+), 45 deletions(-) (limited to 'src/main/java/kubatech/api/utils') diff --git a/src/main/java/kubatech/api/utils/GSONUtils.java b/src/main/java/kubatech/api/utils/GSONUtils.java index 99580ad803..636dc7d6ce 100644 --- a/src/main/java/kubatech/api/utils/GSONUtils.java +++ b/src/main/java/kubatech/api/utils/GSONUtils.java @@ -57,7 +57,8 @@ public class GSONUtils { try { if (!(json instanceof JsonArray)) return null; byte[] bytes = new byte[((JsonArray) json).size()]; - for (int i = 0; i < bytes.length; i++) bytes[i] = ((JsonArray) json).get(i).getAsByte(); + for (int i = 0; i < bytes.length; i++) bytes[i] = ((JsonArray) json).get(i) + .getAsByte(); return CompressedStreamTools.func_152457_a(bytes, new NBTSizeTracker(2097152L)); } catch (IOException e) { throw new RuntimeException(e); @@ -65,11 +66,15 @@ public class GSONUtils { }; public static final GsonBuilder GSON_BUILDER = new GsonBuilder().addSerializationExclusionStrategy(GSONStrategy) - .addDeserializationExclusionStrategy(GSONStrategy) - .registerTypeAdapter(NBTTagCompound.class, NBTTagCompoundDeserializer) - .registerTypeAdapter(NBTTagCompound.class, NBTTagCompoundSerializer).serializeNulls(); + .addDeserializationExclusionStrategy(GSONStrategy) + .registerTypeAdapter(NBTTagCompound.class, NBTTagCompoundDeserializer) + .registerTypeAdapter(NBTTagCompound.class, NBTTagCompoundSerializer) + .serializeNulls(); public static final GsonBuilder GSON_BUILDER_PRETTY = new GsonBuilder() - .addSerializationExclusionStrategy(GSONStrategy).addDeserializationExclusionStrategy(GSONStrategy) - .registerTypeAdapter(NBTTagCompound.class, NBTTagCompoundDeserializer) - .registerTypeAdapter(NBTTagCompound.class, NBTTagCompoundSerializer).serializeNulls().setPrettyPrinting(); + .addSerializationExclusionStrategy(GSONStrategy) + .addDeserializationExclusionStrategy(GSONStrategy) + .registerTypeAdapter(NBTTagCompound.class, NBTTagCompoundDeserializer) + .registerTypeAdapter(NBTTagCompound.class, NBTTagCompoundSerializer) + .serializeNulls() + .setPrettyPrinting(); } diff --git a/src/main/java/kubatech/api/utils/MobUtils.java b/src/main/java/kubatech/api/utils/MobUtils.java index 0a6881edeb..4090813248 100644 --- a/src/main/java/kubatech/api/utils/MobUtils.java +++ b/src/main/java/kubatech/api/utils/MobUtils.java @@ -42,7 +42,7 @@ public class MobUtils { try { if (mainmodelfield == null) { mainmodelfield = RendererLivingEntity.class - .getDeclaredField(ModUtils.isDeobfuscatedEnvironment ? "mainModel" : "field_77045_g"); + .getDeclaredField(ModUtils.isDeobfuscatedEnvironment ? "mainModel" : "field_77045_g"); mainmodelfield.setAccessible(true); } float eheight = e.height; diff --git a/src/main/java/kubatech/api/utils/ModUtils.java b/src/main/java/kubatech/api/utils/ModUtils.java index 394a59ca10..90c0a7e81b 100644 --- a/src/main/java/kubatech/api/utils/ModUtils.java +++ b/src/main/java/kubatech/api/utils/ModUtils.java @@ -26,7 +26,7 @@ import cpw.mods.fml.common.ModContainer; public class ModUtils { public static final boolean isDeobfuscatedEnvironment = (boolean) Launch.blackboard - .get("fml.deobfuscatedEnvironment"); + .get("fml.deobfuscatedEnvironment"); public static boolean isClientSided = false; private static final HashMap classNamesToModIDs = new HashMap<>(); private static final Map.Entry emptyEntry = new AbstractMap.SimpleEntry<>("", ""); @@ -34,20 +34,27 @@ public class ModUtils { public static String getModNameFromClassName(String classname) { if (classNamesToModIDs.size() == 0) { classNamesToModIDs.put("net.minecraft", "Minecraft"); - Loader.instance().getActiveModList().forEach(m -> { - Object Mod = m.getMod(); - if (Mod != null) { - Package modPackage = Mod.getClass().getPackage(); - if (modPackage == null) { // HOW CAN THIS EVEN HAPPEN ?! - kubatech.warn("Mod " + m.getModId() + " package is not loaded yet!"); - return; + Loader.instance() + .getActiveModList() + .forEach(m -> { + Object Mod = m.getMod(); + if (Mod != null) { + Package modPackage = Mod.getClass() + .getPackage(); + if (modPackage == null) { // HOW CAN THIS EVEN HAPPEN ?! + kubatech.warn("Mod " + m.getModId() + " package is not loaded yet!"); + return; + } + classNamesToModIDs.put(modPackage.getName(), m.getName()); } - classNamesToModIDs.put(modPackage.getName(), m.getName()); - } - }); + }); } - return classNamesToModIDs.entrySet().stream().filter(e -> classname.startsWith(e.getKey())).findAny() - .orElse(emptyEntry).getValue(); + return classNamesToModIDs.entrySet() + .stream() + .filter(e -> classname.startsWith(e.getKey())) + .findAny() + .orElse(emptyEntry) + .getValue(); } private static String modListVersion = null; @@ -56,18 +63,21 @@ public class ModUtils { if (modListVersion != null) return modListVersion; @SuppressWarnings("unchecked") ArrayList modlist = (ArrayList) ((ArrayList) Loader.instance() - .getActiveModList()).clone(); - String sortedList = modlist.stream().filter(m -> m.getMod() != null) - .sorted(Comparator.comparing(ModContainer::getModId)) - .collect( - StringBuilder::new, - (a, b) -> a.append(b.getModId()).append(b.getVersion()), - (a, b) -> a.append(", ").append(b)) - .toString(); + .getActiveModList()).clone(); + String sortedList = modlist.stream() + .filter(m -> m.getMod() != null) + .sorted(Comparator.comparing(ModContainer::getModId)) + .collect( + StringBuilder::new, + (a, b) -> a.append(b.getModId()) + .append(b.getVersion()), + (a, b) -> a.append(", ") + .append(b)) + .toString(); try { MessageDigest md = MessageDigest.getInstance("MD5"); modListVersion = DatatypeConverter.printHexBinary(md.digest(sortedList.getBytes(StandardCharsets.UTF_8))) - .toUpperCase(); + .toUpperCase(); return modListVersion; } catch (Exception e) { modListVersion = sortedList; @@ -81,15 +91,21 @@ public class ModUtils { if (modListVersionIgnoringModVersions != null) return modListVersionIgnoringModVersions; @SuppressWarnings("unchecked") ArrayList modlist = (ArrayList) ((ArrayList) Loader.instance() - .getActiveModList()).clone(); - String sortedList = modlist.stream().filter(m -> m.getMod() != null) - .sorted(Comparator.comparing(ModContainer::getModId)) - .collect(StringBuilder::new, (a, b) -> a.append(b.getModId()), (a, b) -> a.append(", ").append(b)) - .toString(); + .getActiveModList()).clone(); + String sortedList = modlist.stream() + .filter(m -> m.getMod() != null) + .sorted(Comparator.comparing(ModContainer::getModId)) + .collect( + StringBuilder::new, + (a, b) -> a.append(b.getModId()), + (a, b) -> a.append(", ") + .append(b)) + .toString(); try { MessageDigest md = MessageDigest.getInstance("MD5"); modListVersionIgnoringModVersions = DatatypeConverter - .printHexBinary(md.digest(sortedList.getBytes(StandardCharsets.UTF_8))).toUpperCase(); + .printHexBinary(md.digest(sortedList.getBytes(StandardCharsets.UTF_8))) + .toUpperCase(); return modListVersionIgnoringModVersions; } catch (Exception e) { modListVersionIgnoringModVersions = sortedList; diff --git a/src/main/java/kubatech/api/utils/StringUtils.java b/src/main/java/kubatech/api/utils/StringUtils.java index 066fa69d4f..72e4540ad1 100644 --- a/src/main/java/kubatech/api/utils/StringUtils.java +++ b/src/main/java/kubatech/api/utils/StringUtils.java @@ -15,19 +15,20 @@ import net.minecraft.util.EnumChatFormatting; public class StringUtils { private static final String[] rainbow = new String[] { EnumChatFormatting.DARK_RED.toString(), - EnumChatFormatting.RED.toString(), EnumChatFormatting.GOLD.toString(), EnumChatFormatting.YELLOW.toString(), - EnumChatFormatting.DARK_GREEN.toString(), EnumChatFormatting.GREEN.toString(), - EnumChatFormatting.AQUA.toString(), EnumChatFormatting.DARK_AQUA.toString(), - EnumChatFormatting.DARK_BLUE.toString(), EnumChatFormatting.BLUE.toString(), - EnumChatFormatting.LIGHT_PURPLE.toString(), EnumChatFormatting.DARK_PURPLE.toString(), - EnumChatFormatting.WHITE.toString(), EnumChatFormatting.GRAY.toString(), - EnumChatFormatting.DARK_GRAY.toString(), EnumChatFormatting.BLACK.toString(), }; + EnumChatFormatting.RED.toString(), EnumChatFormatting.GOLD.toString(), EnumChatFormatting.YELLOW.toString(), + EnumChatFormatting.DARK_GREEN.toString(), EnumChatFormatting.GREEN.toString(), + EnumChatFormatting.AQUA.toString(), EnumChatFormatting.DARK_AQUA.toString(), + EnumChatFormatting.DARK_BLUE.toString(), EnumChatFormatting.BLUE.toString(), + EnumChatFormatting.LIGHT_PURPLE.toString(), EnumChatFormatting.DARK_PURPLE.toString(), + EnumChatFormatting.WHITE.toString(), EnumChatFormatting.GRAY.toString(), + EnumChatFormatting.DARK_GRAY.toString(), EnumChatFormatting.BLACK.toString(), }; public static String applyRainbow(String str, int offset, String additional) { StringBuilder final_string = new StringBuilder(); int i = offset; - for (char c : str.toCharArray()) - final_string.append(rainbow[i++ % rainbow.length]).append(additional).append(c); + for (char c : str.toCharArray()) final_string.append(rainbow[i++ % rainbow.length]) + .append(additional) + .append(c); return final_string.toString(); } -- cgit