Format code and cleanup imports

Author: maxanier

src/main/java/amerifrance/guideapi/GuideConfig.java

@@ -3,12 +3,8 @@
 
 import amerifrance.guideapi.api.GuideAPI;
 import amerifrance.guideapi.api.impl.Book;
-import com.electronwill.nightconfig.core.CommentedConfig;
-import com.google.common.collect.Maps;
 import net.minecraftforge.common.ForgeConfigSpec;
-import net.minecraftforge.fml.ModContainer;
 import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.config.ConfigFileTypeHandler;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import org.apache.commons.lang3.tuple.Pair;
@@ -29,23 +25,23 @@ public static class Common {
         public final ForgeConfigSpec.BooleanValue canSpawnWithBook;
 
         public final ForgeConfigSpec.BooleanValue enableLogging;
-        public final Map<Book,ForgeConfigSpec.BooleanValue> SPAWN_BOOKS = new HashMap<>();
+        public final Map<Book, ForgeConfigSpec.BooleanValue> SPAWN_BOOKS = new HashMap<>();
 
 
         Common(ForgeConfigSpec.Builder builder) {
             builder.comment("Common configurations settings").push("common");
-            enableLogging = builder.comment("Enables extra information being printed to the console.").define("enableLogging",true);
-            canSpawnWithBook = builder.comment("Allows books to spawn with new players.\nThis is a global override for all books if set to false.").define("canSpawnWithBook",true);
+            enableLogging = builder.comment("Enables extra information being printed to the console.").define("enableLogging", true);
+            canSpawnWithBook = builder.comment("Allows books to spawn with new players.\nThis is a global override for all books if set to false.").define("canSpawnWithBook", true);
             builder.comment("If the player should spawn with this book").push("spawnBook");
-            for(Book book : GuideAPI.getBooks().values()){
-                SPAWN_BOOKS.put(book,builder.define(book.getRegistryName().getNamespace()+"-"+book.getRegistryName().getPath(),book.shouldSpawnWithBook()));
+            for (Book book : GuideAPI.getBooks().values()) {
+                SPAWN_BOOKS.put(book, builder.define(book.getRegistryName().getNamespace() + "-" + book.getRegistryName().getPath(), book.shouldSpawnWithBook()));
             }
             builder.pop();
             builder.pop();
         }
     }
 
-    public static void buildConfiguration(){
+    public static void buildConfiguration() {
         final Pair<Common, ForgeConfigSpec> specPair = new ForgeConfigSpec.Builder().configure(Common::new);
         ForgeConfigSpec commonSpec = specPair.getRight();
         COMMON = specPair.getLeft();

src/main/java/amerifrance/guideapi/GuideMod.java

@@ -1,23 +1,20 @@
 package amerifrance.guideapi;
 
-import amerifrance.guideapi.proxy.ClientProxy;
 import amerifrance.guideapi.api.GuideAPI;
 import amerifrance.guideapi.api.IGuideBook;
 import amerifrance.guideapi.api.impl.Book;
 import amerifrance.guideapi.network.PacketHandler;
+import amerifrance.guideapi.proxy.ClientProxy;
 import amerifrance.guideapi.proxy.CommonProxy;
 import amerifrance.guideapi.util.AnnotationHandler;
 import amerifrance.guideapi.util.ReloadCommand;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import net.minecraft.command.CommandSource;
-import net.minecraft.command.Commands;
-import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
-import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import org.apache.commons.lang3.tuple.Pair;
@@ -35,8 +32,8 @@ public class GuideMod {
 
     public static CommonProxy PROXY = DistExecutor.runForDist(() -> ClientProxy::new, () -> CommonProxy::new);
 
-    public GuideMod(){
-        INSTANCE=this;
+    public GuideMod() {
+        INSTANCE = this;
         checkDevEnv();
         GuideAPI.initialize();
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
@@ -45,14 +42,14 @@ public GuideMod(){
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onServerStarting);
     }
 
-    private void setup(final FMLCommonSetupEvent event){
-        if(GuideConfig.COMMON==null){
-           throw new IllegalStateException("Did not build configuration, before configuration load. Make sure to call GuideConfig#buildConfiguration during one of the registry events");
+    private void setup(final FMLCommonSetupEvent event) {
+        if (GuideConfig.COMMON == null) {
+            throw new IllegalStateException("Did not build configuration, before configuration load. Make sure to call GuideConfig#buildConfiguration during one of the registry events");
         }
         PacketHandler.registerPackets();
     }
 
-    private void loadComplete(final FMLLoadCompleteEvent event){
+    private void loadComplete(final FMLLoadCompleteEvent event) {
         PROXY.initColors();
 
         for (Pair<Book, IGuideBook> guide : AnnotationHandler.BOOK_CLASSES)
@@ -66,8 +63,8 @@ private void checkDevEnv() {
         }
     }
 
-    private void onServerStarting(FMLServerStartingEvent event){
-        if(inDev){
+    private void onServerStarting(FMLServerStartingEvent event) {
+        if (inDev) {
             event.getCommandDispatcher().register(LiteralArgumentBuilder.<CommandSource>literal("guide-api").then(ReloadCommand.register()));
         }
     }

src/main/java/amerifrance/guideapi/RegistrarGuideAPI.java

@@ -6,7 +6,6 @@
 import amerifrance.guideapi.item.ItemGuideBook;
 import amerifrance.guideapi.util.APISetter;
 import amerifrance.guideapi.util.AnnotationHandler;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.renderer.model.ModelResourceLocation;
 import net.minecraft.item.Item;
@@ -20,11 +19,10 @@
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-
 import net.minecraftforge.registries.ForgeRegistries;
 import org.apache.commons.lang3.tuple.Pair;
 
-@Mod.EventBusSubscriber(modid = "guideapi",bus = Mod.EventBusSubscriber.Bus.MOD)
+@Mod.EventBusSubscriber(modid = "guideapi", bus = Mod.EventBusSubscriber.Bus.MOD)
 public class RegistrarGuideAPI {
 
 
@@ -44,10 +42,10 @@ public static void registerItems(RegistryEvent.Register<Item> event) {
     @SubscribeEvent
     @OnlyIn(Dist.CLIENT)
     public static void registerModels(ModelRegistryEvent event) {
-        for (Pair<Book, IGuideBook> guide : AnnotationHandler.BOOK_CLASSES){
-            ResourceLocation loc=guide.getRight().getModel();
-            if (loc!=null){
-                ModelLoader.addSpecialModel(new ModelResourceLocation(loc,"inventory"));
+        for (Pair<Book, IGuideBook> guide : AnnotationHandler.BOOK_CLASSES) {
+            ResourceLocation loc = guide.getRight().getModel();
+            if (loc != null) {
+                ModelLoader.addSpecialModel(new ModelResourceLocation(loc, "inventory"));
             }
         }
     }
@@ -56,12 +54,12 @@ public static void registerModels(ModelRegistryEvent event) {
     @OnlyIn(Dist.CLIENT)
     public static void bakeModel(ModelBakeEvent event) {
         for (Pair<Book, IGuideBook> guide : AnnotationHandler.BOOK_CLASSES) {
-            ResourceLocation loc=guide.getRight().getModel();
-            if (loc!=null){
-                ModelResourceLocation newMrl = new ModelResourceLocation(loc,"inventory");
+            ResourceLocation loc = guide.getRight().getModel();
+            if (loc != null) {
+                ModelResourceLocation newMrl = new ModelResourceLocation(loc, "inventory");
                 Item bookItem = GuideAPI.getStackFromBook(guide.getLeft()).getItem();
-                ModelResourceLocation oldMrl = new ModelResourceLocation(bookItem.getRegistryName(),"inventory");
-                IBakedModel model= event.getModelRegistry().get(newMrl);
+                ModelResourceLocation oldMrl = new ModelResourceLocation(bookItem.getRegistryName(), "inventory");
+                IBakedModel model = event.getModelRegistry().get(newMrl);
 
                 event.getModelRegistry().put(oldMrl, model);
 

src/main/java/amerifrance/guideapi/api/BookEvent.java

@@ -5,16 +5,16 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.Style;
-import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraftforge.eventbus.api.Cancelable;
 import net.minecraftforge.eventbus.api.Event;
 
 import javax.annotation.Nonnull;
 
 /**
  * Base class for all {@link Book} related events.
- *
+ * <p>
  * {@link #book} is the book being opened.
  * {@link #stack} is the ItemStack of the Book.
  * {@link #player} is the player opening the book.
@@ -45,7 +45,7 @@ public PlayerEntity getPlayer() {
 
     /**
      * Called client side whenever a book is opened.
-     *
+     * <p>
      * {@link #canceledText} is a status message sent to the player when the book fails to open.
      */
     @Cancelable

src/main/java/amerifrance/guideapi/api/GuideAPI.java

@@ -3,15 +3,8 @@
 import amerifrance.guideapi.api.impl.Book;
 import com.google.common.collect.*;
 import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.ItemModelMesher;
-import net.minecraft.client.renderer.model.ModelResourceLocation;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
 
 import java.util.List;
 import java.util.Map;
@@ -41,7 +34,7 @@ public static ItemStack getStackFromBook(Book book) {
      */
     public static void registerInfoRenderer(Book book, IInfoRenderer infoRenderer, Class<? extends Block>... blockClasses) {
         if (!INFO_RENDERERS.containsKey(book))
-            INFO_RENDERERS.put(book, ArrayListMultimap.<Class<? extends Block>, IInfoRenderer>create());
+            INFO_RENDERERS.put(book, ArrayListMultimap.create());
 
         for (Class<? extends Block> blockClass : blockClasses)
             INFO_RENDERERS.get(book).put(blockClass, infoRenderer);

src/main/java/amerifrance/guideapi/api/IGuideBook.java

@@ -2,10 +2,10 @@
 
 import amerifrance.guideapi.api.impl.Book;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -25,8 +25,8 @@ public interface IGuideBook {
      */
     @Nullable
     @OnlyIn(Dist.CLIENT)
-    default ResourceLocation getModel(){
-        return new ResourceLocation("guideapi","guidebook");
+    default ResourceLocation getModel() {
+        return new ResourceLocation("guideapi", "guidebook");
     }
 
     /**

src/main/java/amerifrance/guideapi/api/IPage.java

@@ -1,10 +1,10 @@
 package amerifrance.guideapi.api;
 
-import amerifrance.guideapi.gui.BaseScreen;
-import amerifrance.guideapi.gui.EntryScreen;
 import amerifrance.guideapi.api.impl.Book;
 import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract;
 import amerifrance.guideapi.api.impl.abstraction.EntryAbstract;
+import amerifrance.guideapi.gui.BaseScreen;
+import amerifrance.guideapi.gui.EntryScreen;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;

src/main/java/amerifrance/guideapi/api/IRecipeRenderer.java

@@ -1,23 +1,18 @@
 package amerifrance.guideapi.api;
 
-import amerifrance.guideapi.api.util.IngredientCycler;
-import amerifrance.guideapi.gui.BaseScreen;
 import amerifrance.guideapi.api.impl.Book;
 import amerifrance.guideapi.api.impl.abstraction.CategoryAbstract;
 import amerifrance.guideapi.api.impl.abstraction.EntryAbstract;
+import amerifrance.guideapi.api.util.IngredientCycler;
+import amerifrance.guideapi.gui.BaseScreen;
 import com.google.common.collect.Lists;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.item.crafting.Ingredient;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
 import java.util.List;
-import java.util.Optional;
-import java.util.Random;
 
 public interface IRecipeRenderer {
 

src/main/java/amerifrance/guideapi/api/SubTexture.java

@@ -64,10 +64,10 @@ public void draw(int drawX, int drawY, double zLevel) {
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder vertexbuffer = tessellator.getBuffer();
         vertexbuffer.begin(7, DefaultVertexFormats.POSITION_TEX);
-        vertexbuffer.pos((double) drawX, (double) (drawY + height), zLevel).tex((double) ((float) xPos * someMagicValueFromMojang), (double) ((float) (yPos + height) * someMagicValueFromMojang)).endVertex();
-        vertexbuffer.pos((double) (drawX + width), (double) (drawY + height), zLevel).tex((double) ((float) (xPos + width) * someMagicValueFromMojang), (double) ((float) (yPos + height) * someMagicValueFromMojang)).endVertex();
-        vertexbuffer.pos((double) (drawX + width), (double) drawY, zLevel).tex((double) ((float) (xPos + width) * someMagicValueFromMojang), (double) ((float) yPos * someMagicValueFromMojang)).endVertex();
-        vertexbuffer.pos((double) drawX, (double) drawY, zLevel).tex((double) ((float) xPos * someMagicValueFromMojang), (double) ((float) yPos * someMagicValueFromMojang)).endVertex();
+        vertexbuffer.pos(drawX, drawY + height, zLevel).tex((float) xPos * someMagicValueFromMojang, (float) (yPos + height) * someMagicValueFromMojang).endVertex();
+        vertexbuffer.pos(drawX + width, drawY + height, zLevel).tex((float) (xPos + width) * someMagicValueFromMojang, (float) (yPos + height) * someMagicValueFromMojang).endVertex();
+        vertexbuffer.pos(drawX + width, drawY, zLevel).tex((float) (xPos + width) * someMagicValueFromMojang, (float) yPos * someMagicValueFromMojang).endVertex();
+        vertexbuffer.pos(drawX, drawY, zLevel).tex((float) xPos * someMagicValueFromMojang, (float) yPos * someMagicValueFromMojang).endVertex();
         tessellator.draw();
     }
 

src/main/java/amerifrance/guideapi/api/impl/Book.java

@@ -7,7 +7,7 @@
 import net.minecraft.util.ResourceLocation;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import java.awt.Color;
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
@@ -45,22 +45,22 @@ protected Book(Consumer<List<CategoryAbstract>> contentProvider, String title, S
         this.creativeTab = creativeTab;
     }
 
-    public void initializeContent(){
-        if(!isInitialized){
-            LogHelper.debug("Opening book "+registryName.toString()+" for the first time -> Initializing content");
+    public void initializeContent() {
+        if (!isInitialized) {
+            LogHelper.debug("Opening book " + registryName.toString() + " for the first time -> Initializing content");
             contentProvider.accept(categories);
-            isInitialized=true;
+            isInitialized = true;
         }
     }
 
     /**
      * Can be used to force content initialisation independent of first use regardless of if it was initialized previously.
      * Use at own risk. Might cause crashes if the book is currently open.
      */
-    public void forceInitializeContent(){
-        LogHelper.info("Force initializing book content "+registryName.toString());
+    public void forceInitializeContent() {
+        LogHelper.info("Force initializing book content " + registryName.toString());
         categories.clear();
-        isInitialized=false;
+        isInitialized = false;
         initializeContent();
     }