Update 1.0.0

Author: Fox2Code

.gitignore

@@ -1,6 +1,7 @@
 *.iml
 /.idea
 /build
+/lib/*
 /.gradle/
 /.settings/
 /bin/

README.md

@@ -4,7 +4,9 @@ ModLoader for Minecraft ReIndev
 
 ## Community
 
-You can join the official ReIndev Discord [here](https://discord.gg/38Vfes6NpR)
+You can [join the official ReIndev Discord here](https://discord.gg/38Vfes6NpR)
+
+A feature missing to make your mod? [Just open an issue!](https://github.com/Fox2Code/FoxLoader/issues)
 
 ## Documentation
 

betacraft/build.gradle

@@ -4,6 +4,18 @@ version project['foxloader.version']
 dependencies {
     // compileOnly("com.github.Vatuu:discord-rpc:1.6.2")
     // compileOnly("aaaaaaaa:bbbbbbb:1.0.0") something.repo/aaaaaaaa/bbbbbbb/1.0.0/bbbbbbb-1.0.0.pom
+
+    // Let's use betacraft project fir client dev runs.
+    implementation(project(":client"))
+
+    //noinspection GradlePackageUpdate
+    implementation("net.java.jinput:jinput:2.0.5")
+    //noinspection GradlePackageUpdate
+    implementation("org.lwjgl.lwjgl:lwjgl:2.9.3")
+    //noinspection GradlePackageUpdate
+    implementation("org.lwjgl.lwjgl:lwjgl_util:2.9.3")
+    //noinspection GradlePackageUpdate
+    implementation("org.lwjgl.lwjgl:lwjgl-platform:2.9.3")
 }
 
 tasks.withType(Jar) {

betacraft/src/main/java/FoxLoader.java

@@ -1,13 +1,11 @@
+import com.fox2code.foxloader.launcher.ClientMain;
 import org.betacraft.Wrapper;
 
 import java.awt.*;
 import java.io.*;
-import java.net.Proxy;
 import java.net.URL;
-import java.net.URLStreamHandler;
 import java.util.ArrayList;
 import java.util.Map;
-import java.util.Properties;
 
 public class FoxLoader extends Wrapper {
     static {
@@ -16,6 +14,10 @@ public class FoxLoader extends Wrapper {
         System.out.println("FoxLoader BetaCraft wrapper loaded!");
     }
 
+    public static void main(String[] args) throws Exception {
+        ClientMain.main(args);
+    }
+
     private static boolean checkAllowDiscordRpc(String mainFolder) {
         // Let allow mods to disable BetaCraft RPC
         return !new File(mainFolder + File.separator + "config" +

client/build.gradle

@@ -6,17 +6,17 @@ dependencies {
     api(project(":common"))
 
     // Do not use API here
-    implementation(fileTree(dir: 'libs', include: ['*.jar']))
+    implementation(fileTree(dir: 'libs', include: [project['reindev.clientJar'] as String]))
 
     //noinspection GradlePackageUpdate
-    api("net.java.jinput:jinput:2.0.5")
+    compileOnly("net.java.jinput:jinput:2.0.5")
     //noinspection GradlePackageUpdate
-    api("org.lwjgl.lwjgl:lwjgl:2.9.3")
+    compileOnly("org.lwjgl.lwjgl:lwjgl:2.9.3")
     //noinspection GradlePackageUpdate
-    api("org.lwjgl.lwjgl:lwjgl_util:2.9.3")
+    compileOnly("org.lwjgl.lwjgl:lwjgl_util:2.9.3")
     //noinspection GradlePackageUpdate
-    api("org.lwjgl.lwjgl:lwjgl-platform:2.9.3")
+    compileOnly("org.lwjgl.lwjgl:lwjgl-platform:2.9.3")
 
     // Do no expose spark APIs to mods
-    implementation(project['spark.dependency'] as String)
+    compileOnly(project['spark.dependency'] as String)
 }

client/src/main/java/com/fox2code/foxloader/client/ClientCommandWrapper.java

@@ -17,4 +17,14 @@ public ClientCommandWrapper(CommandCompat commandCompat) {
     public void onExecute(String[] args, EntityPlayerSP commandExecutor) {
         this.commandCompat.onExecute(args, (NetworkPlayer) commandExecutor);
     }
+
+    @Override
+    public void printHelpInformation(EntityPlayerSP entityPlayerSP) {
+        this.commandCompat.printHelpInformation((NetworkPlayer) entityPlayerSP);
+    }
+
+    @Override
+    public String commandSyntax() {
+        return this.commandCompat.commandSyntax();
+    }
 }

client/src/main/java/com/fox2code/foxloader/client/gui/GuiModList.java

@@ -3,6 +3,7 @@
 import com.fox2code.foxloader.loader.ModContainer;
 import com.fox2code.foxloader.loader.ModLoader;
 import com.fox2code.foxloader.updater.UpdateManager;
+import net.minecraft.client.Minecraft;
 import net.minecraft.src.client.gui.*;
 import org.lwjgl.Sys;
 
@@ -11,6 +12,7 @@ public class GuiModList extends GuiScreen {
     private GuiModListContainer modListContainer;
     private GuiSmallButton guiUpdateAll, guiConfigureMod;
     private boolean doSingleUpdate;
+    private GuiScreen guiScreen;
 
     public GuiModList(GuiScreen parent) {
         this.parent = parent;
@@ -55,6 +57,8 @@ protected void actionPerformed(GuiButton var1) {
         } else if (var1.id == 3) {
             if (this.doSingleUpdate) {
                 UpdateManager.getInstance().doUpdates();
+            } else if (this.guiScreen != null) {
+                Minecraft.getInstance().displayGuiScreen(this.guiScreen);
             }
         } else {
             this.modListContainer.actionPerformed(var1);
@@ -70,11 +74,15 @@ void updateGuiState() {
         final ModContainer modContainer = this.modListContainer.getSelectedModContainer();
         this.guiUpdateAll.enabled = UpdateManager.getInstance().hasUpdates();
         this.doSingleUpdate = false;
+        this.guiScreen = null;
         this.guiConfigureMod.displayString = st.translateKey("mods.configureMod");
         if (UpdateManager.getInstance().hasUpdate(modContainer.id)) {
             this.doSingleUpdate = true;
             this.guiConfigureMod.enabled = true;
             this.guiConfigureMod.displayString = st.translateKey("mods.updateMod");
+        } else if (modContainer.getConfigObject() instanceof GuiScreen) {
+            this.guiScreen = (GuiScreen) modContainer.getConfigObject();
+            this.guiConfigureMod.enabled = true;
         } else {
             this.guiConfigureMod.enabled = false;
         }

client/src/main/java/com/fox2code/foxloader/client/gui/GuiModListContainer.java

@@ -54,7 +54,11 @@ protected void drawSlot(int i, int i1, int i2, int i3, Tessellator tessellator)
         ModContainer modContainer = this.mods[i];
 
         String name = UpdateManager.getInstance().getUpdateState(modContainer.id).colorPrefix +
-                modContainer.name + " " + modContainer.version + ChatColors.RESET;
+                modContainer.name + " " + modContainer.version;
+        if (modContainer.unofficial) {
+            name += ChatColors.GRAY + " (Unofficial)";
+        }
+        name += ChatColors.RESET;
         String id = modContainer.description;
         String file = modContainer.getFileName() + " (id: " + modContainer.id + ")";
 

client/src/main/java/com/fox2code/foxloader/client/mixins/MixinEntityClientPlayerMP.java

@@ -1,11 +1,12 @@
 package com.fox2code.foxloader.client.mixins;
 
-import com.fox2code.foxloader.client.network.Packet250PluginMessage;
+import com.fox2code.foxloader.client.network.NetClientHandlerExtensions;
 import com.fox2code.foxloader.loader.ModContainer;
 import com.fox2code.foxloader.network.NetworkPlayer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.src.client.Session;
 import net.minecraft.src.client.packets.NetClientHandler;
+import net.minecraft.src.client.packets.Packet250PluginMessage;
 import net.minecraft.src.client.player.EntityClientPlayerMP;
 import net.minecraft.src.client.player.EntityPlayerSP;
 import net.minecraft.src.game.level.World;
@@ -26,7 +27,7 @@ public MixinEntityClientPlayerMP(Minecraft var1, World var2, Session var3, int v
     @Inject(at = @At("RETURN"), method = "<init>")
     public void onNewMixinEntityClientPlayerMP(
             Minecraft var1, World var2, Session var3, NetClientHandler var4, CallbackInfo ci) {
-        Packet250PluginMessage.isSupported = false;
+
     }
 
     @Override
@@ -36,9 +37,7 @@ public ConnectionType getConnectionType() {
 
     @Override
     public void sendNetworkData(ModContainer modContainer, byte[] data) {
-        if (Packet250PluginMessage.isSupported) {
-            sendQueue.addToSendQueue(new Packet250PluginMessage(modContainer.id, data));
-        }
+        sendQueue.addToSendQueue(new Packet250PluginMessage(modContainer.id, data));
     }
 
     @Override
@@ -48,7 +47,7 @@ public void displayChatMessage(String chatMessage) {
 
     @Override
     public boolean hasFoxLoader() {
-        return Packet250PluginMessage.isSupported;
+        return sendQueue != null && ((NetClientHandlerExtensions) sendQueue).isFoxLoader();
     }
 
     @Override

client/src/main/java/com/fox2code/foxloader/client/mixins/MixinGuiMainMenu.java

@@ -3,6 +3,7 @@
 import com.fox2code.foxloader.client.gui.GuiModList;
 import com.fox2code.foxloader.client.gui.GuiUpdateButton;
 import com.fox2code.foxloader.launcher.BuildConfig;
+import com.fox2code.foxloader.loader.ModLoader;
 import net.minecraft.src.client.gui.*;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -13,7 +14,7 @@
 public abstract class MixinGuiMainMenu extends GuiScreen {
     @Inject(method = "initGui", at = @At(value = "RETURN"))
     public void onInitGui(CallbackInfo ci) {
-        this.controlList.add(new GuiUpdateButton(500, this.width - 61, 25, 60, 20, "Mods"));
+        this.controlList.add(new GuiUpdateButton(500, this.width - 62, 2, 60, 20, "Mods"));
     }
 
     @Inject(method = "actionPerformed", at = @At(value = "HEAD"), cancellable = true)
@@ -27,8 +28,10 @@ public void onActionPerformed(GuiButton var1, CallbackInfo ci) {
     @Inject(method = "drawScreen", at = @At(value = "INVOKE",
             target = "Lnet/minecraft/src/client/gui/GuiScreen;drawScreen(IIF)V"))
     public void onDrawGuiScreen(int n, int n2, float deltaTicks, CallbackInfo ci) {
-        this.drawString(this.fontRenderer, "FoxLoader " + BuildConfig.FOXLOADER_VERSION, 2, this.height - 34, 16777215);
-        this.drawCenteredString(this.fontRenderer,
-                "You are using an Experimental Version of FoxLoader", this.width / 2, this.height / 4 + 36, 16764108);
+        this.drawString(this.fontRenderer, "FoxLoader " + BuildConfig.FOXLOADER_VERSION, 2, this.height - 20, 16777215);
+        if (ModLoader.I_AM_EXPERIMENTAL) {
+            this.drawCenteredString(this.fontRenderer, "You are using an Experimental Version of FoxLoader",
+                    this.width / 2, this.height / 4 + 36, 16764108);
+        }
     }
 }