chore: fmt

sousuke0422 · Sep 4, 2024 · afee37b · afee37b
1 parent b72c26c
commit afee37b
Show file tree

Hide file tree

Showing 284 changed files with 4,143 additions and 4,025 deletions.
diff --git a/src/api/java/invtweaks/api/IItemTree.java b/src/api/java/invtweaks/api/IItemTree.java
@@ -50,7 +50,7 @@ public interface IItemTree {
     void addCategory(String parentCategory, IItemTreeCategory newCategory) throws NullPointerException;
 
     IItemTreeItem addItem(String parentCategory, String name, String id, int damage, int order)
-            throws NullPointerException;
+        throws NullPointerException;
 
     void addItem(String parentCategory, IItemTreeItem newItem) throws NullPointerException;
 

diff --git a/src/main/java/moze_intel/projecte/PECore.java b/src/main/java/moze_intel/projecte/PECore.java
@@ -4,30 +4,6 @@
 import java.util.List;
 import java.util.UUID;
 
-import moze_intel.projecte.config.CustomEMCParser;
-import moze_intel.projecte.config.NBTWhitelistParser;
-import moze_intel.projecte.config.ProjectEConfig;
-import moze_intel.projecte.emc.EMCMapper;
-import moze_intel.projecte.events.ConnectionHandler;
-import moze_intel.projecte.events.PlayerEvents;
-import moze_intel.projecte.events.TickEvents;
-import moze_intel.projecte.gameObjs.ObjHandler;
-import moze_intel.projecte.handlers.PlayerChecks;
-import moze_intel.projecte.handlers.TileEntityHandler;
-import moze_intel.projecte.impl.IMCHandler;
-import moze_intel.projecte.integration.Integration;
-import moze_intel.projecte.network.PacketHandler;
-import moze_intel.projecte.network.ThreadCheckUUID;
-import moze_intel.projecte.network.ThreadCheckUpdate;
-import moze_intel.projecte.network.commands.ProjectECMD;
-import moze_intel.projecte.playerData.Transmutation;
-import moze_intel.projecte.playerData.TransmutationOffline;
-import moze_intel.projecte.proxies.IProxy;
-import moze_intel.projecte.utils.AchievementHandler;
-import moze_intel.projecte.utils.Constants;
-import moze_intel.projecte.utils.GuiHandler;
-import moze_intel.projecte.utils.PELogger;
-
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraftforge.common.MinecraftForge;
@@ -51,6 +27,29 @@
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
+import moze_intel.projecte.config.CustomEMCParser;
+import moze_intel.projecte.config.NBTWhitelistParser;
+import moze_intel.projecte.config.ProjectEConfig;
+import moze_intel.projecte.emc.EMCMapper;
+import moze_intel.projecte.events.ConnectionHandler;
+import moze_intel.projecte.events.PlayerEvents;
+import moze_intel.projecte.events.TickEvents;
+import moze_intel.projecte.gameObjs.ObjHandler;
+import moze_intel.projecte.handlers.PlayerChecks;
+import moze_intel.projecte.handlers.TileEntityHandler;
+import moze_intel.projecte.impl.IMCHandler;
+import moze_intel.projecte.integration.Integration;
+import moze_intel.projecte.network.PacketHandler;
+import moze_intel.projecte.network.ThreadCheckUUID;
+import moze_intel.projecte.network.ThreadCheckUpdate;
+import moze_intel.projecte.network.commands.ProjectECMD;
+import moze_intel.projecte.playerData.Transmutation;
+import moze_intel.projecte.playerData.TransmutationOffline;
+import moze_intel.projecte.proxies.IProxy;
+import moze_intel.projecte.utils.AchievementHandler;
+import moze_intel.projecte.utils.Constants;
+import moze_intel.projecte.utils.GuiHandler;
+import moze_intel.projecte.utils.PELogger;
 
 @Mod(modid = PECore.MODID, name = PECore.MODNAME, version = PECore.VERSION)
 public class PECore {
@@ -59,17 +58,17 @@ public class PECore {
     public static final String MODNAME = "ProjectE";
     public static final String VERSION = "1.7.10-PE1.10.1";
     public static final GameProfile FAKEPLAYER_GAMEPROFILE = new GameProfile(
-            UUID.fromString("590e39c7-9fb6-471b-a4c2-c0e539b2423d"),
-            "[ProjectE]");
+        UUID.fromString("590e39c7-9fb6-471b-a4c2-c0e539b2423d"),
+        "[ProjectE]");
     public static File CONFIG_DIR;
     public static File PREGENERATED_EMC_FILE;
 
     @Instance(MODID)
     public static PECore instance;
 
     @SidedProxy(
-            clientSide = "moze_intel.projecte.proxies.ClientProxy",
-            serverSide = "moze_intel.projecte.proxies.ServerProxy")
+        clientSide = "moze_intel.projecte.proxies.ClientProxy",
+        serverSide = "moze_intel.projecte.proxies.ServerProxy")
     public static IProxy proxy;
 
     public static final List<String> uuids = Lists.newArrayList();
@@ -95,10 +94,16 @@ public void preInit(FMLPreInitializationEvent event) {
 
         PlayerEvents pe = new PlayerEvents();
         MinecraftForge.EVENT_BUS.register(pe);
-        FMLCommonHandler.instance().bus().register(pe);
+        FMLCommonHandler.instance()
+            .bus()
+            .register(pe);
 
-        FMLCommonHandler.instance().bus().register(new TickEvents());
-        FMLCommonHandler.instance().bus().register(new ConnectionHandler());
+        FMLCommonHandler.instance()
+            .bus()
+            .register(new TickEvents());
+        FMLCommonHandler.instance()
+            .bus()
+            .register(new ConnectionHandler());
 
         proxy.registerClientOnlyEvents();
 
@@ -143,12 +148,17 @@ public void serverStarting(FMLServerStartingEvent event) {
         EMCMapper.map();
 
         PELogger.logInfo(
-                "Registered " + EMCMapper.emc.size()
-                        + " EMC values. (took "
-                        + (System.currentTimeMillis() - start)
-                        + " ms)");
-
-        File dir = new File(event.getServer().getEntityWorld().getSaveHandler().getWorldDirectory(), "ProjectE");
+            "Registered " + EMCMapper.emc.size()
+                + " EMC values. (took "
+                + (System.currentTimeMillis() - start)
+                + " ms)");
+
+        File dir = new File(
+            event.getServer()
+                .getEntityWorld()
+                .getSaveHandler()
+                .getWorldDirectory(),
+            "ProjectE");
 
         if (!dir.exists()) {
             dir.mkdirs();
@@ -204,10 +214,10 @@ public void remap(FMLMissingMappingsEvent event) {
                         if (remappedItem != null) {
                             mapping.remap(remappedItem);
                             PELogger.logInfo(
-                                    String.format(
-                                            "Remapped ProjectE ItemBlock from %s to %s",
-                                            mapping.name,
-                                            PECore.MODID + ":" + newSubName));
+                                String.format(
+                                    "Remapped ProjectE ItemBlock from %s to %s",
+                                    mapping.name,
+                                    PECore.MODID + ":" + newSubName));
                         } else {
                             PELogger.logFatal("Failed to remap ProjectE ItemBlock: " + mapping.name);
                         }
@@ -221,10 +231,10 @@ public void remap(FMLMissingMappingsEvent event) {
                     if (remappedBlock != null) {
                         mapping.remap(remappedBlock);
                         PELogger.logInfo(
-                                String.format(
-                                        "Remapped ProjectE Block from %s to %s",
-                                        mapping.name,
-                                        PECore.MODID + ":" + newSubName));
+                            String.format(
+                                "Remapped ProjectE Block from %s to %s",
+                                mapping.name,
+                                PECore.MODID + ":" + newSubName));
                     } else {
                         PELogger.logFatal("Failed to remap PE Block: " + mapping.name);
                     }

diff --git a/src/main/java/moze_intel/projecte/api/ProjectEAPI.java b/src/main/java/moze_intel/projecte/api/ProjectEAPI.java
@@ -1,10 +1,10 @@
 package moze_intel.projecte.api;
 
+import cpw.mods.fml.common.FMLLog;
 import moze_intel.projecte.api.proxy.IBlacklistProxy;
 import moze_intel.projecte.api.proxy.IConversionProxy;
 import moze_intel.projecte.api.proxy.IEMCProxy;
 import moze_intel.projecte.api.proxy.ITransmutationProxy;
-import cpw.mods.fml.common.FMLLog;
 
 public final class ProjectEAPI {
 
@@ -24,10 +24,11 @@ public static IEMCProxy getEMCProxy() {
         if (emcProxy == null) {
             try {
                 Class<?> clazz = Class.forName("moze_intel.projecte.impl.EMCProxyImpl");
-                emcProxy = (IEMCProxy) clazz.getField("instance").get(null);
+                emcProxy = (IEMCProxy) clazz.getField("instance")
+                    .get(null);
             } catch (ReflectiveOperationException ex) {
                 FMLLog.warning(
-                        "[ProjectEAPI] Error retrieving EMCProxyImpl, ProjectE may be absent, damaged, or outdated.");
+                    "[ProjectEAPI] Error retrieving EMCProxyImpl, ProjectE may be absent, damaged, or outdated.");
             }
         }
         return emcProxy;
@@ -42,10 +43,11 @@ public static IConversionProxy getConversionProxy() {
         if (recipeProxy == null) {
             try {
                 Class<?> clazz = Class.forName("moze_intel.projecte.impl.ConversionProxyImpl");
-                recipeProxy = (IConversionProxy) clazz.getField("instance").get(null);
+                recipeProxy = (IConversionProxy) clazz.getField("instance")
+                    .get(null);
             } catch (ReflectiveOperationException ex) {
                 FMLLog.warning(
-                        "[ProjectEAPI] Error retrieving ConversionProxyImpl, ProjectE may be absent, damaged, or outdated.");
+                    "[ProjectEAPI] Error retrieving ConversionProxyImpl, ProjectE may be absent, damaged, or outdated.");
             }
         }
         return recipeProxy;
@@ -60,10 +62,11 @@ public static ITransmutationProxy getTransmutationProxy() {
         if (transProxy == null) {
             try {
                 Class<?> clazz = Class.forName("moze_intel.projecte.impl.TransmutationProxyImpl");
-                transProxy = (ITransmutationProxy) clazz.getField("instance").get(null);
+                transProxy = (ITransmutationProxy) clazz.getField("instance")
+                    .get(null);
             } catch (ReflectiveOperationException ex) {
                 FMLLog.warning(
-                        "[ProjectEAPI] Error retrieving TransmutationProxyImpl, ProjectE may be absent, damaged, or outdated.");
+                    "[ProjectEAPI] Error retrieving TransmutationProxyImpl, ProjectE may be absent, damaged, or outdated.");
             }
         }
         return transProxy;
@@ -78,10 +81,11 @@ public static IBlacklistProxy getBlacklistProxy() {
         if (blacklistProxy == null) {
             try {
                 Class<?> clazz = Class.forName("moze_intel.projecte.impl.BlacklistProxyImpl");
-                blacklistProxy = (IBlacklistProxy) clazz.getField("instance").get(null);
+                blacklistProxy = (IBlacklistProxy) clazz.getField("instance")
+                    .get(null);
             } catch (ReflectiveOperationException ex) {
                 FMLLog.warning(
-                        "[ProjectEAPI] Error retrieving BlacklistProxyImpl, ProjectE may be absent, damaged, or outdated.");
+                    "[ProjectEAPI] Error retrieving BlacklistProxyImpl, ProjectE may be absent, damaged, or outdated.");
             }
         }
         return blacklistProxy;

diff --git a/src/main/java/moze_intel/projecte/api/proxy/ITransmutationProxy.java b/src/main/java/moze_intel/projecte/api/proxy/ITransmutationProxy.java
@@ -23,7 +23,7 @@ public interface ITransmutationProxy {
      * @return Whether the registration succeeded. It may fail if transmutations already exist for block origin
      */
     boolean registerWorldTransmutation(Block origin, int originMeta, Block result1, int result1Meta,
-            @Nullable Block result2, int result2meta);
+        @Nullable Block result2, int result2meta);
 
     /**
      * Queries the knowledge of the provided player Can be called on both sides, only if the client player exists or the

diff --git a/src/main/java/moze_intel/projecte/config/CustomEMCParser.java b/src/main/java/moze_intel/projecte/config/CustomEMCParser.java
@@ -10,18 +10,18 @@
 import java.util.List;
 import java.util.Map;
 
-import moze_intel.projecte.PECore;
-import moze_intel.projecte.emc.NormalizedSimpleStack;
-import moze_intel.projecte.utils.FileHelper;
-import moze_intel.projecte.utils.ItemHelper;
-import moze_intel.projecte.utils.PELogger;
-
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
+import moze_intel.projecte.PECore;
+import moze_intel.projecte.emc.NormalizedSimpleStack;
+import moze_intel.projecte.utils.FileHelper;
+import moze_intel.projecte.utils.ItemHelper;
+import moze_intel.projecte.utils.PELogger;
+
 public final class CustomEMCParser {
 
     private static final String VERSION = "#0.2";
@@ -97,7 +97,8 @@ public static void readUserData() {
                     }
                     userValues.put(NormalizedSimpleStack.getFor(stack), (entry.emc > 0 ? entry.emc : 0));
                 } else {
-                    if (OreDictionary.getOres(entry.name).isEmpty()) {
+                    if (OreDictionary.getOres(entry.name)
+                        .isEmpty()) {
                         PELogger.logFatal("Error in custom EMC file: no OD entry for " + entry.name);
                         PELogger.logFatal("At line number: " + reader.getLineNumber());
                         continue;
@@ -348,9 +349,9 @@ private static void writeDefaultFile() {
             writer.println(VERSION);
             writer.println("Custom EMC file");
             writer.println(
-                    "This file is used for custom EMC registration, it is recommended that you do not modify it manually.");
-            writer.println(
-                    "In game commands are avaliable to set custom values. Type /projecte in game for usage info.");
+                "This file is used for custom EMC registration, it is recommended that you do not modify it manually.");
+            writer
+                .println("In game commands are avaliable to set custom values. Type /projecte in game for usage info.");
         } catch (IOException e) {
             e.printStackTrace();
         } finally {

diff --git a/src/main/java/moze_intel/projecte/config/NBTWhitelistParser.java b/src/main/java/moze_intel/projecte/config/NBTWhitelistParser.java
@@ -7,14 +7,14 @@
 import java.io.LineNumberReader;
 import java.io.PrintWriter;
 
+import net.minecraft.item.ItemStack;
+
 import moze_intel.projecte.PECore;
 import moze_intel.projecte.utils.FileHelper;
 import moze_intel.projecte.utils.ItemHelper;
 import moze_intel.projecte.utils.NBTWhitelist;
 import moze_intel.projecte.utils.PELogger;
 
-import net.minecraft.item.ItemStack;
-
 public final class NBTWhitelistParser {
 
     private static final String VERSION = "#0.1a";