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/CommonProxy.java | 4 +- .../java/kubatech/api/ConstructableItemStack.java | 10 +- src/main/java/kubatech/api/Variables.java | 23 +- src/main/java/kubatech/api/enums/ItemList.java | 8 +- .../java/kubatech/api/helpers/InfernalHelper.java | 2 +- .../kubatech/api/helpers/ProgressBarWrapper.java | 8 +- .../kubatech/api/helpers/ReflectionHelper.java | 3 +- .../implementations/KubaTechGTMultiBlockBase.java | 55 +- src/main/java/kubatech/api/mobhandler/MobDrop.java | 2 +- .../kubatech/api/network/LoadConfigPacket.java | 5 +- src/main/java/kubatech/api/tea/TeaNetwork.java | 3 +- 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 +- .../java/kubatech/client/effect/CropRenderer.java | 16 +- .../kubatech/client/effect/EntityRenderer.java | 12 +- .../client/effect/MegaApiaryBeesRenderer.java | 27 +- src/main/java/kubatech/commands/CommandBees.java | 22 +- src/main/java/kubatech/commands/CommandConfig.java | 14 +- .../java/kubatech/commands/CommandHandler.java | 12 +- src/main/java/kubatech/commands/CommandHelp.java | 6 +- src/main/java/kubatech/commands/CommandTea.java | 3 +- src/main/java/kubatech/config/Config.java | 63 +- src/main/java/kubatech/config/OverridesConfig.java | 30 +- src/main/java/kubatech/kubatech.java | 36 +- src/main/java/kubatech/loaders/ItemLoader.java | 2 +- .../java/kubatech/loaders/MobRecipeLoader.java | 246 +++--- src/main/java/kubatech/loaders/RecipeLoader.java | 331 ++++----- src/main/java/kubatech/loaders/TCLoader.java | 84 ++- .../java/kubatech/loaders/block/BlockProxy.java | 7 +- .../java/kubatech/loaders/block/KubaBlock.java | 59 +- .../java/kubatech/loaders/block/KubaItemBlock.java | 11 +- src/main/java/kubatech/loaders/item/ItemProxy.java | 36 +- src/main/java/kubatech/loaders/item/KubaItems.java | 7 +- src/main/java/kubatech/loaders/item/items/Tea.java | 3 +- .../kubatech/loaders/item/items/TeaCollection.java | 70 +- .../kubatech/loaders/item/items/TeaUltimate.java | 208 +++--- src/main/java/kubatech/mixin/Mixin.java | 8 +- src/main/java/kubatech/mixin/MixinPlugin.java | 9 +- src/main/java/kubatech/mixin/TargetedMod.java | 15 +- .../mixins/minecraft/EnchantmentHelperMixin.java | 2 +- src/main/java/kubatech/nei/IMCForNEI.java | 2 +- src/main/java/kubatech/nei/Mob_Handler.java | 112 +-- .../java/kubatech/savedata/PlayerDataManager.java | 10 +- .../java/kubatech/tileentity/TeaAcceptorTile.java | 73 +- ...MetaTileEntity_ExtremeExterminationChamber.java | 433 ++++++----- ...MetaTileEntity_ExtremeIndustrialGreenhouse.java | 827 +++++++++++---------- .../GT_MetaTileEntity_MegaIndustrialApiary.java | 760 ++++++++++--------- 49 files changed, 2040 insertions(+), 1751 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/kubatech/CommonProxy.java b/src/main/java/kubatech/CommonProxy.java index 37bd924579..5533cf0beb 100644 --- a/src/main/java/kubatech/CommonProxy.java +++ b/src/main/java/kubatech/CommonProxy.java @@ -33,7 +33,9 @@ public class CommonProxy { Config.init(event.getModConfigurationDirectory()); Config.synchronizeConfiguration(); - FMLCommonHandler.instance().bus().register(new FMLEventHandler()); + FMLCommonHandler.instance() + .bus() + .register(new FMLEventHandler()); MinecraftForge.EVENT_BUS.register(new PlayerDataManager()); registerItems(); registerBlocks(); 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> - extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase { + extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase { @Deprecated public final int mEUt = 0; @SuppressWarnings("unchecked") protected static > UIInfo createKTMetaTileEntityUI( - KTContainerConstructor 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 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 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 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 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(); } diff --git a/src/main/java/kubatech/client/effect/CropRenderer.java b/src/main/java/kubatech/client/effect/CropRenderer.java index c57f8a8590..6434d02f5e 100644 --- a/src/main/java/kubatech/client/effect/CropRenderer.java +++ b/src/main/java/kubatech/client/effect/CropRenderer.java @@ -44,20 +44,19 @@ public class CropRenderer extends EntityFX { @Override public void renderParticle(Tessellator p_70539_1_, float p_70539_2_, float p_70539_3_, float p_70539_4_, - float p_70539_5_, float p_70539_6_, float p_70539_7_) { + float p_70539_5_, float p_70539_6_, float p_70539_7_) { Tessellator tessellator = Tessellator.instance; - Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.locationBlocksTexture); + Minecraft.getMinecraft() + .getTextureManager() + .bindTexture(TextureMap.locationBlocksTexture); tessellator.startDrawingQuads(); tessellator.disableColor(); GL11.glColor4f(1.f, 1.f, 1.f, 1.f); GL11.glEnable(GL11.GL_ALPHA_TEST); GL11.glDepthMask(true); tessellator.setBrightness( - Blocks.wheat.getMixedBrightnessForBlock( - this.worldObj, - (int) this.posX + 1, - (int) this.posY, - (int) this.posZ)); + Blocks.wheat + .getMixedBrightnessForBlock(this.worldObj, (int) this.posX + 1, (int) this.posY, (int) this.posZ)); tessellator.setColorRGBA(255, 255, 255, 255); double f12 = this.posY - interpPosY; int i = 0; @@ -65,7 +64,8 @@ public class CropRenderer extends EntityFX { if (x == 0 && z == 0) continue; double f11 = (this.posX + (double) x) - interpPosX; double f13 = (this.posZ + (double) z) - interpPosZ; - RenderBlocks.getInstance().renderBlockCropsImpl(Blocks.wheat, meta[i++], f11, f12, f13); + RenderBlocks.getInstance() + .renderBlockCropsImpl(Blocks.wheat, meta[i++], f11, f12, f13); } tessellator.draw(); } diff --git a/src/main/java/kubatech/client/effect/EntityRenderer.java b/src/main/java/kubatech/client/effect/EntityRenderer.java index c357d61000..85a6625816 100644 --- a/src/main/java/kubatech/client/effect/EntityRenderer.java +++ b/src/main/java/kubatech/client/effect/EntityRenderer.java @@ -85,7 +85,7 @@ public class EntityRenderer extends EntityFX { @Override public void renderParticle(Tessellator p_70539_1_, float p_70539_2_, float p_70539_3_, float p_70539_4_, - float p_70539_5_, float p_70539_6_, float p_70539_7_) { + float p_70539_5_, float p_70539_6_, float p_70539_7_) { if (entityToRender == null) return; GL11.glEnable(GL11.GL_LIGHTING); @@ -128,7 +128,7 @@ public class EntityRenderer extends EntityFX { float p_147936_2_ = 0.5f; float f1 = entityToRender.prevRotationYaw - + (entityToRender.rotationYaw - entityToRender.prevRotationYaw) * p_147936_2_; + + (entityToRender.rotationYaw - entityToRender.prevRotationYaw) * p_147936_2_; int i = entityToRender.getBrightnessForRender(p_147936_2_); if (entityToRender.isBurning()) { @@ -147,9 +147,9 @@ public class EntityRenderer extends EntityFX { int stackdepth = GL11.glGetInteger(GL11.GL_MODELVIEW_STACK_DEPTH); GL11.glPushMatrix(); GL11.glTranslatef( - (float) (this.posX - renderPosX), - (float) (this.posY - renderPosY), - (float) (this.posZ - renderPosZ)); + (float) (this.posX - renderPosX), + (float) (this.posY - renderPosY), + (float) (this.posZ - renderPosZ)); GL11.glEnable(GL12.GL_RESCALE_NORMAL); float desiredScale = MobUtils.getDesiredScale(entityToRender, 2f); if (desiredScale < 1f) GL11.glScalef(desiredScale, desiredScale, desiredScale); @@ -182,7 +182,7 @@ public class EntityRenderer extends EntityFX { int err; while ((err = GL11.glGetError()) != GL11.GL_NO_ERROR) if (Config.Debug.showRenderErrors) LOG.error( - EntityList.getEntityString(entityToRender) + " | GL ERROR: " + err + " / " + GLU.gluErrorString(err)); + EntityList.getEntityString(entityToRender) + " | GL ERROR: " + err + " / " + GLU.gluErrorString(err)); GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_COLOR_MATERIAL); diff --git a/src/main/java/kubatech/client/effect/MegaApiaryBeesRenderer.java b/src/main/java/kubatech/client/effect/MegaApiaryBeesRenderer.java index 6758cf73df..7ea38af856 100644 --- a/src/main/java/kubatech/client/effect/MegaApiaryBeesRenderer.java +++ b/src/main/java/kubatech/client/effect/MegaApiaryBeesRenderer.java @@ -52,7 +52,7 @@ public class MegaApiaryBeesRenderer extends EntityFX { @Override public void renderParticle(Tessellator p_70539_1_, float p_70539_2_, float p_70539_3_, float p_70539_4_, - float p_70539_5_, float p_70539_6_, float p_70539_7_) { + float p_70539_5_, float p_70539_6_, float p_70539_7_) { GL11.glDisable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_BLEND); @@ -60,13 +60,15 @@ public class MegaApiaryBeesRenderer extends EntityFX { GL11.glPushMatrix(); GL11.glTranslatef( - (float) (this.posX - renderPosX), - (float) (this.posY - renderPosY), - (float) (this.posZ - renderPosZ)); + (float) (this.posX - renderPosX), + (float) (this.posY - renderPosY), + (float) (this.posZ - renderPosZ)); GL11.glEnable(GL12.GL_RESCALE_NORMAL); GL11.glRotatef(180f, 1f, 0f, 0f); - Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.locationItemsTexture); + Minecraft.getMinecraft() + .getTextureManager() + .bindTexture(TextureMap.locationItemsTexture); GL11.glDisable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_ALPHA_TEST); @@ -74,33 +76,38 @@ public class MegaApiaryBeesRenderer extends EntityFX { GL11.glColor4f(1f, 1f, 1f, 1F); - IIcon icon = ItemList.Beeeeee.get(1).getIconIndex(); + IIcon icon = ItemList.Beeeeee.get(1) + .getIconIndex(); GL11.glPushMatrix(); GL11.glTranslatef(0f, 0f, -4f); GL11.glScalef(0.1f, 0.1f, 0.1f); - RenderItem.getInstance().renderIcon(0, 0, icon, 16, 16); + RenderItem.getInstance() + .renderIcon(0, 0, icon, 16, 16); GL11.glPopMatrix(); GL11.glPushMatrix(); GL11.glTranslatef(1f, 0f, 3f); GL11.glRotatef(180f, 0f, 1f, 0f); GL11.glScalef(0.1f, 0.1f, 0.1f); - RenderItem.getInstance().renderIcon(0, 0, icon, 16, 16); + RenderItem.getInstance() + .renderIcon(0, 0, icon, 16, 16); GL11.glPopMatrix(); GL11.glPushMatrix(); GL11.glTranslatef(4f, 0f, -1f); GL11.glRotatef(-90f, 0f, 1f, 0f); GL11.glScalef(0.1f, 0.1f, 0.1f); - RenderItem.getInstance().renderIcon(0, 0, icon, 16, 16); + RenderItem.getInstance() + .renderIcon(0, 0, icon, 16, 16); GL11.glPopMatrix(); GL11.glPushMatrix(); GL11.glTranslatef(-3f, 0f, 1f); GL11.glRotatef(90f, 0f, 1f, 0f); GL11.glScalef(0.1f, 0.1f, 0.1f); - RenderItem.getInstance().renderIcon(0, 0, icon, 16, 16); + RenderItem.getInstance() + .renderIcon(0, 0, icon, 16, 16); GL11.glPopMatrix(); GL11.glPopMatrix(); diff --git a/src/main/java/kubatech/commands/CommandBees.java b/src/main/java/kubatech/commands/CommandBees.java index 660203c0ec..3cb4962ecf 100644 --- a/src/main/java/kubatech/commands/CommandBees.java +++ b/src/main/java/kubatech/commands/CommandBees.java @@ -52,9 +52,10 @@ public class CommandBees extends CommandBase { @Override public void processCommand(ICommandSender p_71515_1_, String[] p_71515_2_) { - if (!Minecraft.getMinecraft().isSingleplayer()) { - p_71515_1_.addChatMessage( - new ChatComponentText(EnumChatFormatting.RED + "This command is single-player only!")); + if (!Minecraft.getMinecraft() + .isSingleplayer()) { + p_71515_1_ + .addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "This command is single-player only!")); return; } @@ -65,7 +66,7 @@ public class CommandBees extends CommandBase { String delimer = ","; writer.write( - "Bee,CHANCE,OLD_0.6S_0UP,OLD_0.6S_8UP,OLD_1.7S_0UP,OLD_1.7S_8UP,NEW_0.6S_0UP_1T,NEW_0.6S_8UP_1T,NEW_1.7S_0UP_1T,NEW_1.7S_8UP_1T,NEW_1.7S_0UP_8T,NEW_1.7S_8UP_8T\n"); + "Bee,CHANCE,OLD_0.6S_0UP,OLD_0.6S_8UP,OLD_1.7S_0UP,OLD_1.7S_8UP,NEW_0.6S_0UP_1T,NEW_0.6S_8UP_1T,NEW_1.7S_0UP_1T,NEW_1.7S_8UP_1T,NEW_1.7S_0UP_8T,NEW_1.7S_8UP_8T\n"); List bees = beeRoot.getIndividualTemplates(); for (IBee bee : bees) { @@ -75,9 +76,12 @@ public class CommandBees extends CommandBase { IBeeGenome genome = bee.getGenome(); IAlleleBeeSpecies primary = genome.getPrimary(); IAlleleBeeSpecies secondary = genome.getSecondary(); - primary.getProductChances().forEach((k, v) -> printData("[PRIMARY]", k, v, delimer, b)); - secondary.getProductChances().forEach((k, v) -> printData("[SECONDARY]", k, v / 2f, delimer, b)); - primary.getSpecialtyChances().forEach((k, v) -> printData("[SPECIALITY]", k, v, delimer, b)); + primary.getProductChances() + .forEach((k, v) -> printData("[PRIMARY]", k, v, delimer, b)); + secondary.getProductChances() + .forEach((k, v) -> printData("[SECONDARY]", k, v / 2f, delimer, b)); + primary.getSpecialtyChances() + .forEach((k, v) -> printData("[SPECIALITY]", k, v, delimer, b)); writer.write(b.toString()); } @@ -125,8 +129,8 @@ public class CommandBees extends CommandBase { chance *= 100f; float productionModifier = (float) upgradeCount * 0.25f; return (float) (((1f + t / 6f) * Math.sqrt(chance) * 2f * (1f + beeSpeed) - + Math.pow(productionModifier, Math.cbrt(chance)) - - 3f) / 100f); + + Math.pow(productionModifier, Math.cbrt(chance)) + - 3f) / 100f); } private double productChanceOld(int upgradeCount, double beeSpeed, double chance) { diff --git a/src/main/java/kubatech/commands/CommandConfig.java b/src/main/java/kubatech/commands/CommandConfig.java index b2d9fb09e7..6a15c23379 100644 --- a/src/main/java/kubatech/commands/CommandConfig.java +++ b/src/main/java/kubatech/commands/CommandConfig.java @@ -35,7 +35,8 @@ public class CommandConfig extends CommandBase { final String key; Translations() { - key = "command.config." + this.name().toLowerCase(); + key = "command.config." + this.name() + .toLowerCase(); } public String get() { @@ -80,11 +81,12 @@ public class CommandConfig extends CommandBase { } Config.synchronizeConfiguration(); MobRecipeLoader.processMobRecipeMap(); - MinecraftServer.getServer().getConfigurationManager().playerEntityList.forEach(p -> { - if (!(p instanceof EntityPlayerMP)) return; - kubatech.info("Sending config to " + ((EntityPlayerMP) p).getDisplayName()); - kubatech.NETWORK.sendTo(LoadConfigPacket.instance, (EntityPlayerMP) p); - }); + MinecraftServer.getServer() + .getConfigurationManager().playerEntityList.forEach(p -> { + if (!(p instanceof EntityPlayerMP)) return; + kubatech.info("Sending config to " + ((EntityPlayerMP) p).getDisplayName()); + kubatech.NETWORK.sendTo(LoadConfigPacket.instance, (EntityPlayerMP) p); + }); p_71515_1_.addChatMessage(new ChatComponentText(SUCCESS.get())); } } diff --git a/src/main/java/kubatech/commands/CommandHandler.java b/src/main/java/kubatech/commands/CommandHandler.java index 4694b9ca2f..0da2969abe 100644 --- a/src/main/java/kubatech/commands/CommandHandler.java +++ b/src/main/java/kubatech/commands/CommandHandler.java @@ -34,7 +34,8 @@ public class CommandHandler extends CommandBase { final String key; Translations() { - key = "commandhandler." + this.name().toLowerCase(); + key = "commandhandler." + this.name() + .toLowerCase(); } public String get() { @@ -90,12 +91,13 @@ public class CommandHandler extends CommandBase { ICommand cmd = commands.get(p_71515_2_[0]); if (!cmd.canCommandSenderUseCommand(p_71515_1_)) { ChatComponentTranslation chatcomponenttranslation2 = new ChatComponentTranslation( - "commands.generic.permission"); - chatcomponenttranslation2.getChatStyle().setColor(EnumChatFormatting.RED); + "commands.generic.permission"); + chatcomponenttranslation2.getChatStyle() + .setColor(EnumChatFormatting.RED); p_71515_1_.addChatMessage(chatcomponenttranslation2); } else cmd.processCommand( - p_71515_1_, - p_71515_2_.length > 1 ? Arrays.copyOfRange(p_71515_2_, 1, p_71515_2_.length) : new String[0]); + p_71515_1_, + p_71515_2_.length > 1 ? Arrays.copyOfRange(p_71515_2_, 1, p_71515_2_.length) : new String[0]); } @Override diff --git a/src/main/java/kubatech/commands/CommandHelp.java b/src/main/java/kubatech/commands/CommandHelp.java index 822c56dd5a..c258c31edf 100644 --- a/src/main/java/kubatech/commands/CommandHelp.java +++ b/src/main/java/kubatech/commands/CommandHelp.java @@ -28,7 +28,8 @@ public class CommandHelp extends CommandBase { final String key; Translations() { - key = "command.help." + this.name().toLowerCase(); + key = "command.help." + this.name() + .toLowerCase(); } public String get() { @@ -67,7 +68,8 @@ public class CommandHelp extends CommandBase { @Override public void processCommand(ICommandSender p_71515_1_, String[] p_71515_2_) { p_71515_1_.addChatMessage(new ChatComponentText(POSSIBLE_COMMANDS.get())); - CommandHandler.commands.values().forEach( + CommandHandler.commands.values() + .forEach( c -> p_71515_1_.addChatMessage(new ChatComponentText("/kubatech " + c.getCommandUsage(p_71515_1_)))); } } diff --git a/src/main/java/kubatech/commands/CommandTea.java b/src/main/java/kubatech/commands/CommandTea.java index 4fff7f0a40..c8541294c1 100644 --- a/src/main/java/kubatech/commands/CommandTea.java +++ b/src/main/java/kubatech/commands/CommandTea.java @@ -37,7 +37,8 @@ public class CommandTea extends CommandBase { final String key; Translations() { - key = "command.tea." + this.name().toLowerCase(); + key = "command.tea." + this.name() + .toLowerCase(); } public String get() { diff --git a/src/main/java/kubatech/config/Config.java b/src/main/java/kubatech/config/Config.java index 7b2520bccc..cbb95085dd 100644 --- a/src/main/java/kubatech/config/Config.java +++ b/src/main/java/kubatech/config/Config.java @@ -62,41 +62,45 @@ public class Config { private static void load(Configuration configuration) { Category category = Category.MOB_HANDLER; - mobHandlerEnabled = configuration.get( - category.get(), - "Enabled", - true, - "Enable \"Mob Drops\" NEI page and Extreme Extermination Chamber").getBoolean(); + mobHandlerEnabled = configuration + .get(category.get(), "Enabled", true, "Enable \"Mob Drops\" NEI page and Extreme Extermination Chamber") + .getBoolean(); StringBuilder c = new StringBuilder("When will cache regeneration trigger? "); - for (_CacheRegenerationTrigger value : _CacheRegenerationTrigger.values()) - c.append(value.ordinal()).append(" - ").append(value.name()).append(", "); + for (_CacheRegenerationTrigger value : _CacheRegenerationTrigger.values()) c.append(value.ordinal()) + .append(" - ") + .append(value.name()) + .append(", "); regenerationTrigger = _CacheRegenerationTrigger.get( - configuration.get( - category.get(), - "CacheRegenerationTrigger", - _CacheRegenerationTrigger.ModAdditionRemovalChange.ordinal(), - c.toString()).getInt()); + configuration + .get( + category.get(), + "CacheRegenerationTrigger", + _CacheRegenerationTrigger.ModAdditionRemovalChange.ordinal(), + c.toString()) + .getInt()); includeEmptyMobs = configuration - .get(category.get(), "IncludeEmptyMobs", true, "Include mobs that have no drops in NEI") - .getBoolean(); - mobBlacklist = configuration.get( + .get(category.get(), "IncludeEmptyMobs", true, "Include mobs that have no drops in NEI") + .getBoolean(); + mobBlacklist = configuration + .get( category.get(), "MobBlacklist", new String[] { "Giant", "Thaumcraft.TravelingTrunk", "chisel.snowman", "OpenBlocks.Luggage", - "OpenBlocks.MiniMe", "SpecialMobs.SpecialCreeper", "SpecialMobs.SpecialZombie", - "SpecialMobs.SpecialPigZombie", "SpecialMobs.SpecialSlime", "SpecialMobs.SpecialSkeleton", - "SpecialMobs.SpecialEnderman", "SpecialMobs.SpecialCaveSpider", "SpecialMobs.SpecialGhast", - "SpecialMobs.SpecialWitch", "SpecialMobs.SpecialSpider", "TwilightForest.HydraHead", - "TwilightForest.RovingCube", "TwilightForest.Harbinger Cube", "TwilightForest.Adherent", - "SpecialMobs.SpecialSilverfish", }, - "These mobs will be skipped when generating recipe map").getStringList(); + "OpenBlocks.MiniMe", "SpecialMobs.SpecialCreeper", "SpecialMobs.SpecialZombie", + "SpecialMobs.SpecialPigZombie", "SpecialMobs.SpecialSlime", "SpecialMobs.SpecialSkeleton", + "SpecialMobs.SpecialEnderman", "SpecialMobs.SpecialCaveSpider", "SpecialMobs.SpecialGhast", + "SpecialMobs.SpecialWitch", "SpecialMobs.SpecialSpider", "TwilightForest.HydraHead", + "TwilightForest.RovingCube", "TwilightForest.Harbinger Cube", "TwilightForest.Adherent", + "SpecialMobs.SpecialSilverfish", }, + "These mobs will be skipped when generating recipe map") + .getStringList(); playerOnlyDropsModifier = configuration - .get( - category.get(), - "PlayerOnlyDropsModifier", - .1d, - "Hard player only loot (such as core mod drops) will be multiplied by this number") - .getDouble(); + .get( + category.get(), + "PlayerOnlyDropsModifier", + .1d, + "Hard player only loot (such as core mod drops) will be multiplied by this number") + .getDouble(); } } @@ -106,7 +110,8 @@ public class Config { private static void load(Configuration configuration) { Category category = Category.DEBUG; - showRenderErrors = configuration.get(category.get(), "ShowRenderErrors", false).getBoolean(); + showRenderErrors = configuration.get(category.get(), "ShowRenderErrors", false) + .getBoolean(); } } diff --git a/src/main/java/kubatech/config/OverridesConfig.java b/src/main/java/kubatech/config/OverridesConfig.java index 3c7e93c92f..9c0a455e93 100644 --- a/src/main/java/kubatech/config/OverridesConfig.java +++ b/src/main/java/kubatech/config/OverridesConfig.java @@ -139,15 +139,16 @@ public class OverridesConfig { reader = Files.newReader(overrideFile, StandardCharsets.UTF_8); overrides = gson.fromJson(reader, new TypeToken>() {}.getType()); overrides.remove("ExampleMob"); - overrides.values().forEach(o -> o.additions.forEach(MobDrop::reconstructStack)); + overrides.values() + .forEach(o -> o.additions.forEach(MobDrop::reconstructStack)); if (LoaderReference.GTNHCoreMod) { LOG.info("Detected GTNH Core Mod, parsing custom drops from there."); CustomDrops coredrops = ReflectionHelper - .getField(MainRegistry.Module_CustomDrops, "_mCustomDrops", null); + .getField(MainRegistry.Module_CustomDrops, "_mCustomDrops", null); if (coredrops != null) { @SuppressWarnings("unchecked") ArrayList customdrops = (ArrayList) ((ArrayList) coredrops - .getCustomDrops()).clone(); + .getCustomDrops()).clone(); for (CustomDrops.CustomDrop customdrop : customdrops) { try { Class eclass = Class.forName(customdrop.getEntityName()); @@ -156,7 +157,8 @@ public class OverridesConfig { if (ename == null) continue; MobOverride override = overrides.computeIfAbsent(ename, k -> new MobOverride()); for (CustomDrops.CustomDrop.Drop drop : customdrop.getDrops()) { - String[] parts = drop.getItemName().split(":"); + String[] parts = drop.getItemName() + .split(":"); ItemStack stack = GameRegistry.findItemStack(parts[0], parts[1], 1); if (stack == null) continue; if (parts.length > 2) stack.setItemDamage(Integer.parseInt(parts[2])); @@ -181,8 +183,8 @@ public class OverridesConfig { } stack.stackSize = amount; // Drops from coremod are player only - override.additions.add( - new MobDrop(stack, MobDrop.DropType.Normal, chance, null, null, false, true)); + override.additions + .add(new MobDrop(stack, MobDrop.DropType.Normal, chance, null, null, false, true)); } } catch (Exception e) { e.printStackTrace(); @@ -213,14 +215,14 @@ public class OverridesConfig { exdamages.put(2, 5); exdamages.put(3, 10); ex1.additions.add( - new MobDrop( - new ItemStack(Items.diamond_sword), - MobDrop.DropType.Rare, - 500, - 20, - exdamages, - true, - false)); + new MobDrop( + new ItemStack(Items.diamond_sword), + MobDrop.DropType.Rare, + 500, + 20, + exdamages, + true, + false)); example.put("ExampleMob", ex1); gson.toJson(example, writer); writer.flush(); diff --git a/src/main/java/kubatech/kubatech.java b/src/main/java/kubatech/kubatech.java index 2ec2da2e7b..c375cecc5a 100644 --- a/src/main/java/kubatech/kubatech.java +++ b/src/main/java/kubatech/kubatech.java @@ -33,24 +33,24 @@ import cpw.mods.fml.relauncher.Side; @SuppressWarnings("unused") @Mod( - modid = Tags.MODID, - version = Tags.VERSION, - name = Tags.MODNAME, - acceptedMinecraftVersions = "[1.7.10]", - dependencies = "required-after: gregtech; " + "required-after: gtnhmixins@[2.0.1,); " - + "required-after: modularui; " - + "after: EnderIO; " - + "after: AWWayofTime; " - + "after: ExtraUtilities; " - + "after: InfernalMobs; " - + "after: Thaumcraft; " - + "after: MineTweaker3; " - + "after: miscutils; " - + "after: harvestcraft; " - + "after: Forestry; " - + "after: DraconicEvolution; " - + "after: Avaritia; " - + " after: dreamcraft; ") + modid = Tags.MODID, + version = Tags.VERSION, + name = Tags.MODNAME, + acceptedMinecraftVersions = "[1.7.10]", + dependencies = "required-after: gregtech; " + "required-after: gtnhmixins@[2.0.1,); " + + "required-after: modularui; " + + "after: EnderIO; " + + "after: AWWayofTime; " + + "after: ExtraUtilities; " + + "after: InfernalMobs; " + + "after: Thaumcraft; " + + "after: MineTweaker3; " + + "after: miscutils; " + + "after: harvestcraft; " + + "after: Forestry; " + + "after: DraconicEvolution; " + + "after: Avaritia; " + + " after: dreamcraft; ") public class kubatech { public static kubatech instance = null; diff --git a/src/main/java/kubatech/loaders/ItemLoader.java b/src/main/java/kubatech/loaders/ItemLoader.java index a0f28dc391..68c62226c7 100644 --- a/src/main/java/kubatech/loaders/ItemLoader.java +++ b/src/main/java/kubatech/loaders/ItemLoader.java @@ -67,7 +67,7 @@ public class ItemLoader { PartiallyOxidizedTeaLeaf.set(kubaitems.registerProxyItem(new TeaIngredient("partially_oxidized_tea_leaf"))); TeaAcceptorResearchNote - .set(kubaitems.registerProxyItem(new ItemProxy("tea_acceptor_research_note", "research_note"))); + .set(kubaitems.registerProxyItem(new ItemProxy("tea_acceptor_research_note", "research_note"))); Beeeeee.set(kubaitems.registerProxyItem(new ItemProxy("beeeeee", "beeeeee"))); } } diff --git a/src/main/java/kubatech/loaders/MobRecipeLoader.java b/src/main/java/kubatech/loaders/MobRecipeLoader.java index dde418aaac..8b652410d1 100644 --- a/src/main/java/kubatech/loaders/MobRecipeLoader.java +++ b/src/main/java/kubatech/loaders/MobRecipeLoader.java @@ -110,20 +110,20 @@ public class MobRecipeLoader { @SuppressWarnings("unchecked") public MobRecipe copy() { return new MobRecipe( - (ArrayList) mOutputs.clone(), - mDuration, - mMaxDamageChance, - infernalityAllowed, - alwaysinfernal, - isPeacefulAllowed, - entity, - maxEntityHealth, - isUsable); + (ArrayList) mOutputs.clone(), + mDuration, + mMaxDamageChance, + infernalityAllowed, + alwaysinfernal, + isPeacefulAllowed, + entity, + maxEntityHealth, + isUsable); } private MobRecipe(ArrayList mOutputs, int mDuration, int mMaxDamageChance, boolean infernalityAllowed, - boolean alwaysinfernal, boolean isPeacefulAllowed, EntityLiving entity, float maxEntityHealth, - boolean isUsable) { + boolean alwaysinfernal, boolean isPeacefulAllowed, EntityLiving entity, float maxEntityHealth, + boolean isUsable) { this.mOutputs = mOutputs; this.mDuration = mDuration; this.mMaxDamageChance = mMaxDamageChance; @@ -145,42 +145,47 @@ public class MobRecipeLoader { infernaldrops = new droplist(); LOG.info("Generating Infernal drops"); ArrayList> modifierLoaders = (ArrayList>) InfernalHelper - .getModifierLoaders().clone(); + .getModifierLoaders() + .clone(); int i = 0; for (ModifierLoader modifierLoader : modifierLoaders) { MobModifier nextMod = modifierLoader.make(null); - if (nextMod.getBlackListMobClasses() != null) for (Class cl : nextMod.getBlackListMobClasses()) - if (e.getClass().isAssignableFrom(cl)) break; + if (nextMod.getBlackListMobClasses() != null) + for (Class cl : nextMod.getBlackListMobClasses()) if (e.getClass() + .isAssignableFrom(cl)) break; i++; } if (i > 0) { double chance = InfernalHelper.checkEntityClassForced(e) ? 1d - : (1d / InfernalHelper.getEliteRarity()); + : (1d / InfernalHelper.getEliteRarity()); ArrayList elitelist = InfernalHelper.getDropIdListElite(); for (ItemStack stack : elitelist) { dropinstance instance = infernaldrops - .add(new dropinstance(stack.copy(), infernaldrops), chance / elitelist.size()); + .add(new dropinstance(stack.copy(), infernaldrops), chance / elitelist.size()); instance.isEnchatmentRandomized = true; // noinspection ConstantConditions - instance.enchantmentLevel = stack.getItem().getItemEnchantability(); + instance.enchantmentLevel = stack.getItem() + .getItemEnchantability(); } ArrayList ultralist = InfernalHelper.getDropIdListUltra(); chance *= 1d / InfernalHelper.getUltraRarity(); for (ItemStack stack : ultralist) { dropinstance instance = infernaldrops - .add(new dropinstance(stack.copy(), infernaldrops), chance / ultralist.size()); + .add(new dropinstance(stack.copy(), infernaldrops), chance / ultralist.size()); instance.isEnchatmentRandomized = true; // noinspection ConstantConditions - instance.enchantmentLevel = stack.getItem().getItemEnchantability(); + instance.enchantmentLevel = stack.getItem() + .getItemEnchantability(); } ArrayList infernallist = InfernalHelper.getDropIdListInfernal(); chance *= 1d / InfernalHelper.getInfernoRarity(); for (ItemStack stack : infernallist) { dropinstance instance = infernaldrops - .add(new dropinstance(stack.copy(), infernaldrops), chance / infernallist.size()); + .add(new dropinstance(stack.copy(), infernaldrops), chance / infernallist.size()); instance.isEnchatmentRandomized = true; // noinspection ConstantConditions - instance.enchantmentLevel = stack.getItem().getItemEnchantability(); + instance.enchantmentLevel = stack.getItem() + .getItemEnchantability(); } } } else if (infernaldrops == null) infernaldrops = new droplist(); @@ -206,7 +211,7 @@ public class MobRecipeLoader { } public ItemStack[] generateOutputs(Random rnd, GT_MetaTileEntity_ExtremeExterminationChamber MTE, - double attackDamage, int lootinglevel, boolean preferInfernalDrops) { + double attackDamage, int lootinglevel, boolean preferInfernalDrops) { MTE.lEUt = mEUt; MTE.mMaxProgresstime = Math.max(MOB_SPAWN_INTERVAL, (int) ((maxEntityHealth / attackDamage) * 10d)); ArrayList stacks = new ArrayList<>(mOutputs.size()); @@ -245,8 +250,10 @@ public class MobRecipeLoader { } if (infernalityAllowed && mEUt * 8 < MTE.getMaxInputVoltage() - && !InfernalHelper.getDimensionBlackList() - .contains(MTE.getBaseMetaTileEntity().getWorld().provider.dimensionId)) { + && !InfernalHelper.getDimensionBlackList() + .contains( + MTE.getBaseMetaTileEntity() + .getWorld().provider.dimensionId)) { int p = 0; int mods = 0; if (alwaysinfernal || (preferInfernalDrops && rnd.nextInt(InfernalHelper.getEliteRarity()) == 0)) { @@ -268,13 +275,18 @@ public class MobRecipeLoader { mods = InfernalHelper.getMinInfernoModifiers(); } if (infernalstacks != null) { - ItemStack infernalstack = infernalstacks.get(rnd.nextInt(infernalstacks.size())).copy(); + ItemStack infernalstack = infernalstacks.get(rnd.nextInt(infernalstacks.size())) + .copy(); // noinspection ConstantConditions - EnchantmentHelper - .addRandomEnchantment(rnd, infernalstack, infernalstack.getItem().getItemEnchantability()); + EnchantmentHelper.addRandomEnchantment( + rnd, + infernalstack, + infernalstack.getItem() + .getItemEnchantability()); stacks.add(infernalstack); MTE.lEUt *= 8L; - MTE.mMaxProgresstime *= mods * InfernalMobsCore.instance().getMobModHealthFactor(); + MTE.mMaxProgresstime *= mods * InfernalMobsCore.instance() + .getMobModHealthFactor(); } } @@ -338,7 +350,8 @@ public class MobRecipeLoader { return 0; } chance /= bound; - return nexts.get(walkCounter++).getInt(); + return nexts.get(walkCounter++) + .getInt(); } @Override @@ -354,7 +367,8 @@ public class MobRecipeLoader { return 0f; } chance /= 10; - return nexts.get(walkCounter++).getFloat(); + return nexts.get(walkCounter++) + .getFloat(); } @Override @@ -369,7 +383,8 @@ public class MobRecipeLoader { return false;