sa

GTNewHorizons · Oct 13, 2023 · c2c3248 · c2c3248
1 parent c8ec78d
commit c2c3248
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 69 deletions.
diff --git a/src/main/java/lumien/custommainmenu/CustomMainMenu.java b/src/main/java/lumien/custommainmenu/CustomMainMenu.java
@@ -2,10 +2,6 @@
 
 import java.io.File;
 
-import lumien.custommainmenu.configuration.Config;
-import lumien.custommainmenu.configuration.ConfigurationLoader;
-import lumien.custommainmenu.handler.CMMEventHandler;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
@@ -19,6 +15,9 @@
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import lumien.custommainmenu.configuration.Config;
+import lumien.custommainmenu.configuration.ConfigurationLoader;
+import lumien.custommainmenu.handler.CMMEventHandler;
 
 @Mod(modid = CustomMainMenu.MOD_ID, name = CustomMainMenu.MOD_NAME, version = CustomMainMenu.MOD_VERSION)
 public class CustomMainMenu {

diff --git a/src/main/java/lumien/custommainmenu/configuration/ConfigurationLoader.java b/src/main/java/lumien/custommainmenu/configuration/ConfigurationLoader.java
@@ -9,9 +9,6 @@
 import java.io.OutputStream;
 import java.io.Reader;
 
-import lumien.custommainmenu.CustomMainMenu;
-import lumien.custommainmenu.gui.GuiCustom;
-
 import org.apache.commons.io.IOUtils;
 
 import com.google.common.io.ByteStreams;
@@ -20,6 +17,9 @@
 import com.google.gson.JsonParser;
 import com.google.gson.stream.JsonReader;
 
+import lumien.custommainmenu.CustomMainMenu;
+import lumien.custommainmenu.gui.GuiCustom;
+
 public class ConfigurationLoader {
 
     Config config;

diff --git a/src/main/java/lumien/custommainmenu/configuration/GuiConfig.java b/src/main/java/lumien/custommainmenu/configuration/GuiConfig.java
@@ -6,6 +6,12 @@
 import java.util.Random;
 import java.util.Set;
 
+import org.apache.logging.log4j.Level;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+
 import lumien.custommainmenu.CustomMainMenu;
 import lumien.custommainmenu.configuration.elements.Background;
 import lumien.custommainmenu.configuration.elements.Button;
@@ -31,12 +37,6 @@
 import lumien.custommainmenu.lib.textures.TextureResourceLocation;
 import lumien.custommainmenu.lib.textures.TextureURL;
 
-import org.apache.logging.log4j.Level;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-
 public class GuiConfig {
 
     public String name;

diff --git a/src/main/java/lumien/custommainmenu/configuration/GuiEntry.java b/src/main/java/lumien/custommainmenu/configuration/GuiEntry.java
@@ -1,9 +1,9 @@
 package lumien.custommainmenu.configuration;
 
-import lumien.custommainmenu.gui.GuiCustom;
-
 import net.minecraft.client.Minecraft;
 
+import lumien.custommainmenu.gui.GuiCustom;
+
 public class GuiEntry {
 
     GuiCustom standard;

diff --git a/src/main/java/lumien/custommainmenu/gui/GuiCustom.java b/src/main/java/lumien/custommainmenu/gui/GuiCustom.java
@@ -7,21 +7,6 @@
 import java.util.List;
 import java.util.Random;
 
-import lumien.custommainmenu.CustomMainMenu;
-import lumien.custommainmenu.configuration.Alignment;
-import lumien.custommainmenu.configuration.Config;
-import lumien.custommainmenu.configuration.GuiConfig;
-import lumien.custommainmenu.configuration.elements.Background;
-import lumien.custommainmenu.configuration.elements.Button;
-import lumien.custommainmenu.configuration.elements.Image;
-import lumien.custommainmenu.configuration.elements.Panorama;
-import lumien.custommainmenu.configuration.elements.SplashText;
-import lumien.custommainmenu.configuration.elements.Text;
-import lumien.custommainmenu.lib.actions.ActionOpenLink;
-import lumien.custommainmenu.lib.textures.ITexture;
-import lumien.custommainmenu.util.GlStateManager;
-import lumien.custommainmenu.util.RenderUtil;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
@@ -43,6 +28,20 @@
 import cpw.mods.fml.common.eventhandler.Event;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import lumien.custommainmenu.CustomMainMenu;
+import lumien.custommainmenu.configuration.Alignment;
+import lumien.custommainmenu.configuration.Config;
+import lumien.custommainmenu.configuration.GuiConfig;
+import lumien.custommainmenu.configuration.elements.Background;
+import lumien.custommainmenu.configuration.elements.Button;
+import lumien.custommainmenu.configuration.elements.Image;
+import lumien.custommainmenu.configuration.elements.Panorama;
+import lumien.custommainmenu.configuration.elements.SplashText;
+import lumien.custommainmenu.configuration.elements.Text;
+import lumien.custommainmenu.lib.actions.ActionOpenLink;
+import lumien.custommainmenu.lib.textures.ITexture;
+import lumien.custommainmenu.util.GlStateManager;
+import lumien.custommainmenu.util.RenderUtil;
 
 @SideOnly(value = Side.CLIENT)
 public class GuiCustom extends GuiScreen implements GuiYesNoCallback {

diff --git a/src/main/java/lumien/custommainmenu/gui/GuiCustomButton.java b/src/main/java/lumien/custommainmenu/gui/GuiCustomButton.java
@@ -2,13 +2,6 @@
 
 import java.util.List;
 
-import lumien.custommainmenu.configuration.elements.Button;
-import lumien.custommainmenu.lib.StringReplacer;
-import lumien.custommainmenu.lib.textures.ITexture;
-import lumien.custommainmenu.util.GlStateManager;
-import lumien.custommainmenu.util.LogicUtil;
-import lumien.custommainmenu.util.RenderUtil;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.ISound;
 import net.minecraft.client.audio.PositionedSoundRecord;
@@ -18,6 +11,13 @@
 import net.minecraft.client.resources.I18n;
 import net.minecraft.util.ResourceLocation;
 
+import lumien.custommainmenu.configuration.elements.Button;
+import lumien.custommainmenu.lib.StringReplacer;
+import lumien.custommainmenu.lib.textures.ITexture;
+import lumien.custommainmenu.util.GlStateManager;
+import lumien.custommainmenu.util.LogicUtil;
+import lumien.custommainmenu.util.RenderUtil;
+
 public class GuiCustomButton extends GuiButton {
 
     public Button b;

diff --git a/src/main/java/lumien/custommainmenu/gui/GuiCustomLabel.java b/src/main/java/lumien/custommainmenu/gui/GuiCustomLabel.java
@@ -4,11 +4,6 @@
 import java.text.SimpleDateFormat;
 import java.util.List;
 
-import lumien.custommainmenu.configuration.elements.Text;
-import lumien.custommainmenu.lib.StringReplacer;
-import lumien.custommainmenu.lib.texts.TextString;
-import lumien.custommainmenu.util.GlStateManager;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.ISound;
 import net.minecraft.client.audio.PositionedSoundRecord;
@@ -21,6 +16,10 @@
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
+import lumien.custommainmenu.configuration.elements.Text;
+import lumien.custommainmenu.lib.StringReplacer;
+import lumien.custommainmenu.lib.texts.TextString;
+import lumien.custommainmenu.util.GlStateManager;
 
 public class GuiCustomLabel extends Gui {
 

diff --git a/src/main/java/lumien/custommainmenu/gui/GuiCustomWrappedButton.java b/src/main/java/lumien/custommainmenu/gui/GuiCustomWrappedButton.java
@@ -1,10 +1,10 @@
 package lumien.custommainmenu.gui;
 
-import lumien.custommainmenu.configuration.elements.Button;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 
+import lumien.custommainmenu.configuration.elements.Button;
+
 public class GuiCustomWrappedButton extends GuiCustomButton {
 
     GuiButton wrappedButton;

diff --git a/src/main/java/lumien/custommainmenu/handler/CMMEventHandler.java b/src/main/java/lumien/custommainmenu/handler/CMMEventHandler.java
@@ -5,12 +5,6 @@
 import java.util.HashMap;
 import java.util.Iterator;
 
-import lumien.custommainmenu.CustomMainMenu;
-import lumien.custommainmenu.gui.GuiCustom;
-import lumien.custommainmenu.gui.GuiCustomButton;
-import lumien.custommainmenu.gui.GuiCustomWrappedButton;
-import lumien.custommainmenu.gui.GuiFakeMain;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiMainMenu;
@@ -22,6 +16,11 @@
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import lumien.custommainmenu.CustomMainMenu;
+import lumien.custommainmenu.gui.GuiCustom;
+import lumien.custommainmenu.gui.GuiCustomButton;
+import lumien.custommainmenu.gui.GuiCustomWrappedButton;
+import lumien.custommainmenu.gui.GuiFakeMain;
 
 public class CMMEventHandler {
 

diff --git a/src/main/java/lumien/custommainmenu/lib/actions/ActionConnectToServer.java b/src/main/java/lumien/custommainmenu/lib/actions/ActionConnectToServer.java
@@ -1,11 +1,10 @@
 package lumien.custommainmenu.lib.actions;
 
-import lumien.custommainmenu.gui.GuiCustom;
-
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.multiplayer.ServerData;
 
 import cpw.mods.fml.client.FMLClientHandler;
+import lumien.custommainmenu.gui.GuiCustom;
 
 public class ActionConnectToServer implements IAction {
 

diff --git a/src/main/java/lumien/custommainmenu/lib/actions/ActionLoadWorld.java b/src/main/java/lumien/custommainmenu/lib/actions/ActionLoadWorld.java
@@ -4,8 +4,6 @@
 import java.io.FileInputStream;
 import java.io.InputStream;
 
-import lumien.custommainmenu.gui.GuiCustom;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.nbt.CompressedStreamTools;
@@ -16,6 +14,7 @@
 import cpw.mods.fml.client.GuiOldSaveLoadConfirm;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.StartupQuery;
+import lumien.custommainmenu.gui.GuiCustom;
 
 public class ActionLoadWorld implements IAction {
 

diff --git a/src/main/java/lumien/custommainmenu/lib/actions/ActionOpenFolder.java b/src/main/java/lumien/custommainmenu/lib/actions/ActionOpenFolder.java
@@ -4,10 +4,10 @@
 import java.io.File;
 import java.io.IOException;
 
-import lumien.custommainmenu.gui.GuiCustom;
-
 import net.minecraft.client.Minecraft;
 
+import lumien.custommainmenu.gui.GuiCustom;
+
 public class ActionOpenFolder implements IAction {
 
     String folderName;

diff --git a/src/main/java/lumien/custommainmenu/lib/actions/ActionOpenGUI.java b/src/main/java/lumien/custommainmenu/lib/actions/ActionOpenGUI.java
@@ -1,8 +1,5 @@
 package lumien.custommainmenu.lib.actions;
 
-import lumien.custommainmenu.CustomMainMenu;
-import lumien.custommainmenu.gui.GuiCustom;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiControls;
 import net.minecraft.client.gui.GuiCreateWorld;
@@ -22,6 +19,8 @@
 import net.minecraft.client.stream.IStream;
 
 import cpw.mods.fml.client.GuiModList;
+import lumien.custommainmenu.CustomMainMenu;
+import lumien.custommainmenu.gui.GuiCustom;
 
 public class ActionOpenGUI implements IAction {
 

diff --git a/src/main/java/lumien/custommainmenu/lib/actions/ActionOpenLink.java b/src/main/java/lumien/custommainmenu/lib/actions/ActionOpenLink.java
@@ -1,11 +1,11 @@
 package lumien.custommainmenu.lib.actions;
 
-import lumien.custommainmenu.gui.GuiCustom;
-import lumien.custommainmenu.gui.GuiCustomConfirmOpenLink;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 
+import lumien.custommainmenu.gui.GuiCustom;
+import lumien.custommainmenu.gui.GuiCustomConfirmOpenLink;
+
 public class ActionOpenLink implements IAction {
 
     String link;

diff --git a/src/main/java/lumien/custommainmenu/lib/actions/ActionRefresh.java b/src/main/java/lumien/custommainmenu/lib/actions/ActionRefresh.java
@@ -1,13 +1,13 @@
 package lumien.custommainmenu.lib.actions;
 
-import lumien.custommainmenu.CustomMainMenu;
-import lumien.custommainmenu.gui.GuiCustom;
-
 import net.minecraft.client.gui.GuiMainMenu;
 import net.minecraft.client.gui.GuiScreen;
 
 import org.lwjgl.input.Keyboard;
 
+import lumien.custommainmenu.CustomMainMenu;
+import lumien.custommainmenu.gui.GuiCustom;
+
 public class ActionRefresh implements IAction {
 
     @Override

diff --git a/src/main/java/lumien/custommainmenu/lib/textures/TextureURL.java b/src/main/java/lumien/custommainmenu/lib/textures/TextureURL.java
@@ -8,16 +8,16 @@
 
 import javax.imageio.ImageIO;
 
-import lumien.custommainmenu.CustomMainMenu;
-import lumien.custommainmenu.handler.LoadTextureURL;
-import lumien.custommainmenu.util.GlStateManager;
-
 import net.minecraft.client.renderer.texture.TextureUtil;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.logging.log4j.Level;
 import org.lwjgl.opengl.GL11;
 
+import lumien.custommainmenu.CustomMainMenu;
+import lumien.custommainmenu.handler.LoadTextureURL;
+import lumien.custommainmenu.util.GlStateManager;
+
 public class TextureURL implements ITexture {
 
     URL url;