diff options
Diffstat (limited to 'src/main/java/kubatech/api')
14 files changed, 132 insertions, 99 deletions
diff --git a/src/main/java/kubatech/api/ConstructableItemStack.java b/src/main/java/kubatech/api/ConstructableItemStack.java index 0d80076760..27dc2c6133 100644 --- a/src/main/java/kubatech/api/ConstructableItemStack.java +++ b/src/main/java/kubatech/api/ConstructableItemStack.java @@ -30,7 +30,7 @@ public class ConstructableItemStack { public final NBTTagCompound tagCompound; private ConstructableItemStack(GameRegistry.UniqueIdentifier itemIdentifier, int meta, int size, - NBTTagCompound tagCompound) { + NBTTagCompound tagCompound) { this.itemIdentifier = itemIdentifier; this.meta = meta; this.size = size; @@ -104,9 +104,9 @@ public class ConstructableItemStack { } catch (Exception ignored) {} } return new ConstructableItemStack( - new GameRegistry.UniqueIdentifier(modid + ":" + name), - meta, - stacksize, - nbtTagCompound); + new GameRegistry.UniqueIdentifier(modid + ":" + name), + meta, + stacksize, + nbtTagCompound); } } diff --git a/src/main/java/kubatech/api/Variables.java b/src/main/java/kubatech/api/Variables.java index 74312d6fb7..b52a228543 100644 --- a/src/main/java/kubatech/api/Variables.java +++ b/src/main/java/kubatech/api/Variables.java @@ -20,27 +20,30 @@ import net.minecraft.util.EnumChatFormatting; public class Variables { public static final String Author = "Author: " - + StringUtils.applyRainbow("kuba6000", 0, EnumChatFormatting.BOLD.toString()); + + StringUtils.applyRainbow("kuba6000", 0, EnumChatFormatting.BOLD.toString()); public static String buildAuthorList(String... authors) { if (authors.length == 0) return "Author: Unknown"; StringBuilder b = new StringBuilder("Author: ") - .append(StringUtils.applyRainbow(authors[0], 0, EnumChatFormatting.BOLD.toString())); + .append(StringUtils.applyRainbow(authors[0], 0, EnumChatFormatting.BOLD.toString())); for (int i = 1; i < authors.length; i++) { String author = authors[i]; - b.append(EnumChatFormatting.RESET).append(" & ").append(EnumChatFormatting.GOLD).append(author); + b.append(EnumChatFormatting.RESET) + .append(" & ") + .append(EnumChatFormatting.GOLD) + .append(author); } return b.toString(); } public static final String StructureHologram = "To see the structure, use a " + EnumChatFormatting.BLUE - + "Structure" - + EnumChatFormatting.DARK_BLUE - + "Lib" - + EnumChatFormatting.RESET - + "" - + EnumChatFormatting.GRAY - + " Hologram Projector on the Controller!"; + + "Structure" + + EnumChatFormatting.DARK_BLUE + + "Lib" + + EnumChatFormatting.RESET + + "" + + EnumChatFormatting.GRAY + + " Hologram Projector on the Controller!"; public static final double ln4 = Math.log(4d); public static final double ln2 = Math.log(2d); diff --git a/src/main/java/kubatech/api/enums/ItemList.java b/src/main/java/kubatech/api/enums/ItemList.java index 9176c6b207..41a57f988f 100644 --- a/src/main/java/kubatech/api/enums/ItemList.java +++ b/src/main/java/kubatech/api/enums/ItemList.java @@ -152,8 +152,12 @@ public enum ItemList implements IItemContainer { StringBuilder tCamelCasedDisplayNameBuilder = new StringBuilder(); final String[] tDisplayNameWords = aDisplayName.split("\\W"); for (String tWord : tDisplayNameWords) { - if (tWord.length() > 0) tCamelCasedDisplayNameBuilder.append(tWord.substring(0, 1).toUpperCase(Locale.US)); - if (tWord.length() > 1) tCamelCasedDisplayNameBuilder.append(tWord.substring(1).toLowerCase(Locale.US)); + if (tWord.length() > 0) tCamelCasedDisplayNameBuilder.append( + tWord.substring(0, 1) + .toUpperCase(Locale.US)); + if (tWord.length() > 1) tCamelCasedDisplayNameBuilder.append( + tWord.substring(1) + .toLowerCase(Locale.US)); } if (tCamelCasedDisplayNameBuilder.length() == 0) { // CamelCased DisplayName is empty, so use hash of aDisplayName diff --git a/src/main/java/kubatech/api/helpers/InfernalHelper.java b/src/main/java/kubatech/api/helpers/InfernalHelper.java index a2842d66a7..a842255807 100644 --- a/src/main/java/kubatech/api/helpers/InfernalHelper.java +++ b/src/main/java/kubatech/api/helpers/InfernalHelper.java @@ -44,7 +44,7 @@ public class InfernalHelper { try { if (checkEntityClassForced == null) { checkEntityClassForced = InfernalMobsCore.class - .getDeclaredMethod("checkEntityClassForced", EntityLivingBase.class); + .getDeclaredMethod("checkEntityClassForced", EntityLivingBase.class); checkEntityClassForced.setAccessible(true); } return (boolean) checkEntityClassForced.invoke(InfernalMobsCore.instance(), e); diff --git a/src/main/java/kubatech/api/helpers/ProgressBarWrapper.java b/src/main/java/kubatech/api/helpers/ProgressBarWrapper.java index f1243c4d46..676ddba91e 100644 --- a/src/main/java/kubatech/api/helpers/ProgressBarWrapper.java +++ b/src/main/java/kubatech/api/helpers/ProgressBarWrapper.java @@ -37,14 +37,14 @@ public class ProgressBarWrapper { else { steps++; try { - ProgressDisplayer.displayProgress( - Tags.MODNAME + ": " + name + " -> " + message, - (float) steps / (float) maxSteps); + ProgressDisplayer + .displayProgress(Tags.MODNAME + ": " + name + " -> " + message, (float) steps / (float) maxSteps); } catch (IOException e) { throw new RuntimeException(e); } // Prevent game freeze - FMLCommonHandler.instance().processWindowMessages(); + FMLCommonHandler.instance() + .processWindowMessages(); } } diff --git a/src/main/java/kubatech/api/helpers/ReflectionHelper.java b/src/main/java/kubatech/api/helpers/ReflectionHelper.java index 19b8ecd026..69c54f29b6 100644 --- a/src/main/java/kubatech/api/helpers/ReflectionHelper.java +++ b/src/main/java/kubatech/api/helpers/ReflectionHelper.java @@ -100,7 +100,8 @@ public class ReflectionHelper { Class<?>[] argsTypes = new Class<?>[args.length]; for (int i = 0; i < args.length; i++) { Class<?> arg = args[i].getClass(); - builder.append(";").append(arg.getSimpleName()); + builder.append(";") + .append(arg.getSimpleName()); argsTypes[i] = arg; } String methodNameUnique = builder.toString(); diff --git a/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java b/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java index 43ce98009d..befa20f2ff 100644 --- a/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java +++ b/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java @@ -30,37 +30,40 @@ import gregtech.api.metatileentity.BaseMetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase; public abstract class KubaTechGTMultiBlockBase<T extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T>> - extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T> { + extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T> { @Deprecated public final int mEUt = 0; @SuppressWarnings("unchecked") protected static <K extends KubaTechGTMultiBlockBase<?>> UIInfo<?, ?> createKTMetaTileEntityUI( - KTContainerConstructor<K> containerConstructor) { - return UIBuilder.of().container((player, world, x, y, z) -> { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof BaseMetaTileEntity) { - IMetaTileEntity mte = ((BaseMetaTileEntity) te).getMetaTileEntity(); - if (!(mte instanceof KubaTechGTMultiBlockBase)) return null; - final UIBuildContext buildContext = new UIBuildContext(player); - final ModularWindow window = ((ITileWithModularUI) te).createWindow(buildContext); - return containerConstructor.of(new ModularUIContext(buildContext, te::markDirty), window, (K) mte); - } - return null; - }).gui(((player, world, x, y, z) -> { - if (!world.isRemote) return null; - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof BaseMetaTileEntity) { - IMetaTileEntity mte = ((BaseMetaTileEntity) te).getMetaTileEntity(); - if (!(mte instanceof KubaTechGTMultiBlockBase)) return null; - final UIBuildContext buildContext = new UIBuildContext(player); - final ModularWindow window = ((ITileWithModularUI) te).createWindow(buildContext); - return new ModularGui( + KTContainerConstructor<K> containerConstructor) { + return UIBuilder.of() + .container((player, world, x, y, z) -> { + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof BaseMetaTileEntity) { + IMetaTileEntity mte = ((BaseMetaTileEntity) te).getMetaTileEntity(); + if (!(mte instanceof KubaTechGTMultiBlockBase)) return null; + final UIBuildContext buildContext = new UIBuildContext(player); + final ModularWindow window = ((ITileWithModularUI) te).createWindow(buildContext); + return containerConstructor.of(new ModularUIContext(buildContext, te::markDirty), window, (K) mte); + } + return null; + }) + .gui(((player, world, x, y, z) -> { + if (!world.isRemote) return null; + TileEntity te = world.getTileEntity(x, y, z); + if (te instanceof BaseMetaTileEntity) { + IMetaTileEntity mte = ((BaseMetaTileEntity) te).getMetaTileEntity(); + if (!(mte instanceof KubaTechGTMultiBlockBase)) return null; + final UIBuildContext buildContext = new UIBuildContext(player); + final ModularWindow window = ((ITileWithModularUI) te).createWindow(buildContext); + return new ModularGui( containerConstructor.of(new ModularUIContext(buildContext, null), window, (K) mte)); - } - return null; - })).build(); + } + return null; + })) + .build(); } @FunctionalInterface @@ -96,7 +99,7 @@ public abstract class KubaTechGTMultiBlockBase<T extends GT_MetaTileEntity_Exten @Override protected void calculateOverclockedNessMultiInternal(long aEUt, int aDuration, int mAmperage, long maxInputVoltage, - boolean perfectOC) { + boolean perfectOC) { calculateOverclock(aEUt, aDuration, getMaxInputEu(), perfectOC); } @@ -116,7 +119,7 @@ public abstract class KubaTechGTMultiBlockBase<T extends GT_MetaTileEntity_Exten return 0; } int durationTiers = (int) Math - .ceil(Math.log((double) aDuration / (double) minDuration) / (isPerfect ? ln4 : ln2)); + .ceil(Math.log((double) aDuration / (double) minDuration) / (isPerfect ? ln4 : ln2)); if (durationTiers < 0) durationTiers = 0; // We do not support downclocks (yet) if (durationTiers > tiers) durationTiers = tiers; if (!isOverclockingInfinite()) { diff --git a/src/main/java/kubatech/api/mobhandler/MobDrop.java b/src/main/java/kubatech/api/mobhandler/MobDrop.java index 554e36bd6a..3c0bd636df 100644 --- a/src/main/java/kubatech/api/mobhandler/MobDrop.java +++ b/src/main/java/kubatech/api/mobhandler/MobDrop.java @@ -50,7 +50,7 @@ public class MobDrop { private MobDrop() {} public MobDrop(ItemStack stack, DropType type, int chance, Integer enchantable, HashMap<Integer, Integer> damages, - boolean lootable, boolean playerOnly) { + boolean lootable, boolean playerOnly) { this.stack = stack; this.reconstructableStack = new ConstructableItemStack(stack); this.type = type; diff --git a/src/main/java/kubatech/api/network/LoadConfigPacket.java b/src/main/java/kubatech/api/network/LoadConfigPacket.java index 04a8f68770..ba3bb3732b 100644 --- a/src/main/java/kubatech/api/network/LoadConfigPacket.java +++ b/src/main/java/kubatech/api/network/LoadConfigPacket.java @@ -45,9 +45,8 @@ public class LoadConfigPacket implements IMessage { for (int i = 0; i < overridessize; i++) { byte[] sbytes = new byte[buf.readInt()]; buf.readBytes(sbytes); - mobsOverrides.put( - new String(sbytes, StandardCharsets.UTF_8), - OverridesConfig.MobOverride.readFromByteBuf(buf)); + mobsOverrides + .put(new String(sbytes, StandardCharsets.UTF_8), OverridesConfig.MobOverride.readFromByteBuf(buf)); } } } diff --git a/src/main/java/kubatech/api/tea/TeaNetwork.java b/src/main/java/kubatech/api/tea/TeaNetwork.java index 298982ce9d..286dde6b33 100644 --- a/src/main/java/kubatech/api/tea/TeaNetwork.java +++ b/src/main/java/kubatech/api/tea/TeaNetwork.java @@ -63,7 +63,8 @@ public class TeaNetwork { } public boolean canAdd(BigInteger toAdd) { - return teaAmount.add(toAdd).compareTo(teaLimit) <= 0; + return teaAmount.add(toAdd) + .compareTo(teaLimit) <= 0; } public void registerTeaStorageExtender(TeaStorageTile storageTile) { 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<String, String> classNamesToModIDs = new HashMap<>(); private static final Map.Entry<String, String> 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<ModContainer> modlist = (ArrayList<ModContainer>) ((ArrayList<ModContainer>) 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<ModContainer> modlist = (ArrayList<ModContainer>) ((ArrayList<ModContainer>) 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(); } |