fixed my env for spotless to run again

rndmorris · Jan 27, 2025 · 6b04fcd · 6b04fcd
1 parent 9f0a2fd
commit 6b04fcd
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 15 deletions.
diff --git a/src/main/java/dev/rndmorris/salisarcana/common/CustomResearch.java b/src/main/java/dev/rndmorris/salisarcana/common/CustomResearch.java
@@ -8,14 +8,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import cpw.mods.fml.common.FMLCommonHandler;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagByte;
 import net.minecraftforge.oredict.OreDictionary;
 
 import org.spongepowered.libraries.com.google.gson.JsonSyntaxException;
 
+import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 import dev.rndmorris.salisarcana.common.item.PlaceholderItem;
 import dev.rndmorris.salisarcana.config.ConfigModuleRoot;
@@ -44,7 +44,9 @@ public class CustomResearch {
     public static ResearchItem replaceCoreResearch;
 
     public static void registerResearchFromFiles() {
-        if (FMLCommonHandler.instance().getSide().isClient()) {
+        if (FMLCommonHandler.instance()
+            .getSide()
+            .isClient()) {
             return;
         }
         List<ResearchEntry> researches = new ArrayList<>();

diff --git a/src/main/java/dev/rndmorris/salisarcana/common/commands/CommandExportResearch.java b/src/main/java/dev/rndmorris/salisarcana/common/commands/CommandExportResearch.java
@@ -10,14 +10,14 @@
 
 import javax.annotation.Nonnull;
 
-import dev.rndmorris.salisarcana.common.commands.arguments.handlers.ResearchHandler;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ChatComponentTranslation;
 
 import dev.rndmorris.salisarcana.common.commands.arguments.ArgumentProcessor;
 import dev.rndmorris.salisarcana.common.commands.arguments.annotations.FlagArg;
 import dev.rndmorris.salisarcana.common.commands.arguments.annotations.NamedArg;
 import dev.rndmorris.salisarcana.common.commands.arguments.handlers.IArgumentHandler;
+import dev.rndmorris.salisarcana.common.commands.arguments.handlers.ResearchHandler;
 import dev.rndmorris.salisarcana.common.commands.arguments.handlers.ResearchKeyHandler;
 import dev.rndmorris.salisarcana.common.commands.arguments.handlers.flag.FlagHandler;
 import dev.rndmorris.salisarcana.config.ConfigModuleRoot;
@@ -57,7 +57,8 @@ protected void process(ICommandSender sender, CommandExportResearch.Arguments ar
         }
         for (ResearchItem research : arguments.researches) {
             String researchKey = research.key;
-            File file = Paths.get("config/salisarcana/research/export/" + researchKey + ".json").toFile();
+            File file = Paths.get("config/salisarcana/research/export/" + researchKey + ".json")
+                .toFile();
             if (file.exists() && !arguments.overwrite) {
                 continue;
             }

diff --git a/src/main/java/dev/rndmorris/salisarcana/config/settings/ResearchEntry.java b/src/main/java/dev/rndmorris/salisarcana/config/settings/ResearchEntry.java
@@ -67,7 +67,16 @@ public ResearchEntry(ResearchItem research) {
         this.category = research.category;
         this.name = research.getName();
         this.tooltip = research.getText();
-        this.aspects = research.tags.aspects.entrySet() .stream() .map(entry -> { var aspectEntry = new AspectEntry(); aspectEntry.aspect = entry.getKey() .getTag(); aspectEntry.amount = entry.getValue(); return aspectEntry; }) .toArray(AspectEntry[]::new);
+        this.aspects = research.tags.aspects.entrySet()
+            .stream()
+            .map(entry -> {
+                var aspectEntry = new AspectEntry();
+                aspectEntry.aspect = entry.getKey()
+                    .getTag();
+                aspectEntry.amount = entry.getValue();
+                return aspectEntry;
+            })
+            .toArray(AspectEntry[]::new);
         this.parents = research.parents;
         this.parentsHidden = research.parentsHidden;
         this.siblings = research.siblings;
@@ -322,12 +331,15 @@ public ResearchPageEntry(ResearchPage page, int index) {
             case ASPECTS:
                 type = "aspect";
                 number = index;
-                aspects = page.aspects.aspects.entrySet() .stream()
+                aspects = page.aspects.aspects.entrySet()
+                    .stream()
                     .map(entry -> {
                         var aspectEntry = new AspectEntry();
-                        aspectEntry.aspect = entry.getKey() .getTag();
+                        aspectEntry.aspect = entry.getKey()
+                            .getTag();
                         aspectEntry.amount = entry.getValue();
-                        return aspectEntry; })
+                        return aspectEntry;
+                    })
                     .toArray(AspectEntry[]::new);
                 return;
         }

diff --git a/src/main/java/dev/rndmorris/salisarcana/lib/AssetHelper.java b/src/main/java/dev/rndmorris/salisarcana/lib/AssetHelper.java
@@ -25,15 +25,17 @@ public class AssetHelper {
         var localizedName = "field_74839_a";
         var languageList = "field_74816_c";
         if (Arrays.stream(StatCollector.class.getDeclaredFields())
-            .anyMatch(f -> f.getName().equals("localizedName"))) {
+            .anyMatch(
+                f -> f.getName()
+                    .equals("localizedName"))) {
             // use deobfuscated names
             localizedName = "localizedName";
             languageList = "languageList";
         }
         // noinspection unchecked
         LANGUAGE = R.of(
-                R.of(StatCollector.class)
-                    .get(localizedName, StringTranslate.class))
+            R.of(StatCollector.class)
+                .get(localizedName, StringTranslate.class))
             .get(languageList, Map.class);
     }
 

diff --git a/src/main/java/dev/rndmorris/salisarcana/lib/ResearchHelper.java b/src/main/java/dev/rndmorris/salisarcana/lib/ResearchHelper.java
@@ -11,6 +11,8 @@
 import java.util.Collection;
 import java.util.function.Predicate;
 
+import javax.annotation.Nonnull;
+
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.event.ClickEvent;
 import net.minecraft.event.HoverEvent;
@@ -38,11 +40,10 @@
 import thaumcraft.common.lib.network.playerdata.PacketPlayerCompleteToServer;
 import thaumcraft.common.lib.research.ResearchManager;
 
-import javax.annotation.Nonnull;
-
 public class ResearchHelper {
 
     private static Gson _researchGson;
+
     public static synchronized Gson researchGson() {
         if (_researchGson == null) {
             _researchGson = new GsonBuilder().setPrettyPrinting()

diff --git a/src/main/java/dev/rndmorris/salisarcana/network/MessageSendResearch.java b/src/main/java/dev/rndmorris/salisarcana/network/MessageSendResearch.java
@@ -15,15 +15,16 @@ public class MessageSendResearch implements IMessage, IMessageHandler<MessageSen
 
     private ResearchEntry research;
     private static Gson gson = new Gson();
-    // We don't want to use ResearchHelper's gson instance because it's set up to pretty print, which is wasteful for network messages
+
+    // We don't want to use ResearchHelper's gson instance because it's set up to pretty print, which is wasteful for
+    // network messages
     private static synchronized Gson getGson() {
         if (gson == null) {
             gson = new Gson();
         }
         return gson;
     }
 
-
     public MessageSendResearch() {
 
     }