Merge pull request #293 from WurstPlus/0.7.0

0.7.0 Merge

Author: Madmegsox1

.github/workflows/gradle.yml

@@ -31,11 +31,11 @@ jobs:
           # Artifact name
           name: WurstPlus3
           # A file, directory or wildcard pattern that describes what to upload
-          path: ./build/libs/*-release.jar
+          path: ./build/libs/*-release.jar  
       - name: Prepare Artifact for Discord upload
         env:
           RUN_ID: ${{ github.run_number }}
-        run: cp ./build/libs/*-release.jar ./build/libs/wurst-plus-three-Beta-${RUN_ID}.jar
+        run: cp ./build/libs/*-release.jar ./build/libs/wurst-plus-three-Beta-${GITHUB_SHA::6}.jar
       - name: Upload Artifact to Discord
         uses: sinshutu/upload-to-discord@master
         env:

build.gradle

@@ -14,17 +14,37 @@ buildscript {
         classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
         classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath("gradle.plugin.de.fuerstenau:BuildConfigPlugin:1.1.4")
     }
 }
 
+
+def getGitHash = { ->
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine 'git', 'rev-parse', 'HEAD'
+        standardOutput = stdout
+    }
+    return stdout.toString().trim()
+}
+
+
 apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'kotlin'
 apply plugin: 'org.spongepowered.mixin'
 apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'de.fuerstenau.buildconfig'
 
-version "0.6.1"
+version "0.7.0+${getGitHash()}"
 group project.modGroup
 
+buildConfig {
+    buildConfigField "String", "GitHash", "${getGitHash()}"
+}
+
+sourceSets.main.java.srcDirs += "build/gen/buildconfig/src/main"
+
+
 sourceCompatibility = targetCompatibility = '1.8'
 compileJava {
     sourceCompatibility = targetCompatibility = '1.8'
@@ -44,13 +64,23 @@ repositories {
         name = 'spongepowered-repo'
         url = 'https://repo.spongepowered.org/repository/maven-public/'
     }
+    maven {
+        name = 'impactdevelopment-repo'
+        url = 'https://impactdevelopment.github.io/maven/'
+    }
+    maven {
+        name = "jitpack.io"
+        url = "https://jitpack.io"
+    }
     jcenter()
     maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
 }
 
 dependencies {
     compile group: "com.googlecode.json-simple", name: "json-simple", version: "1.1.1"
     compile group: 'club.minnced', name: 'java-discord-rpc', version: '2.0.1'
+    compile 'com.github.cabaletta:baritone:1.2.14'
+    compile 'cabaletta:baritone-api:1.2'
     compile('org.spongepowered:mixin:0.7.11-SNAPSHOT') {
 
         exclude module: 'launchwrapper'
@@ -114,7 +144,8 @@ jar {
                 'FMLCorePluginContainsFMLMod': 'true',
                 'FMLCorePlugin': 'me.travis.wurstplusthree.mixin.MixinLoader',
                 'ForceLoadAsMod': 'true',
-                'FMLAT': 'wurstplusthree_at.cfg'
+                'FMLAT': 'wurstplusthree_at.cfg',
+                'Githash': getGitHash()
         )
     }
 }
@@ -130,3 +161,4 @@ compileTestKotlin {
         jvmTarget = "1.8"
     }
 }
+

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx3G
 modGroup=me.travis
-modVersion=0.6.1
+modVersion=0.7.0
 modBaseName=wurstplusthree
 forgeVersion=1.12.2-14.23.5.2768
 mcpVersion=stable_39

src/main/java/me/travis/wurstplusthree/RPC.java

@@ -18,7 +18,7 @@ public static void startRPC() {
         discordRPC.Discord_Initialize(discordID, eventHandlers, true, null);
 
         discordRichPresence.startTimestamp = System.currentTimeMillis() / 1000L;
-        discordRichPresence.details = WurstplusThree.MODVER;
+        discordRichPresence.details = WurstplusThree.INSTANCE.MODVER;
         discordRichPresence.largeImageKey = "logo";
         discordRichPresence.largeImageText = "with the_fellas";
         discordRichPresence.smallImageKey = "small";

src/main/java/me/travis/wurstplusthree/WurstplusThree.java

@@ -1,17 +1,20 @@
 package me.travis.wurstplusthree;
 
+import me.travis.BuildConfig;
 import me.travis.wurstplusthree.command.Commands;
 import me.travis.wurstplusthree.event.Events;
 import me.travis.wurstplusthree.event.processor.EventProcessor;
 import me.travis.wurstplusthree.gui.WurstplusGuiNew;
+import me.travis.wurstplusthree.gui.hud.WurstplusHudGui;
 import me.travis.wurstplusthree.gui.hud.element.HudManager;
 import me.travis.wurstplusthree.hack.Hacks;
 import me.travis.wurstplusthree.manager.*;
 import me.travis.wurstplusthree.manager.fonts.DonatorFont;
 import me.travis.wurstplusthree.manager.fonts.GuiFont;
 import me.travis.wurstplusthree.manager.fonts.MenuFont;
-import me.travis.wurstplusthree.networking.handler.ChatHandling;
-import me.travis.wurstplusthree.networking.handler.ClientHandling;
+import me.travis.wurstplusthree.networking.chat.handler.ChatHandling;
+import me.travis.wurstplusthree.networking.chat.handler.ClientHandling;
+import me.travis.wurstplusthree.networking.proxy.WurstPlusProxy;
 import me.travis.wurstplusthree.setting.Settings;
 import me.travis.wurstplusthree.util.RenderUtil2D;
 import net.minecraftforge.fml.common.Mod;
@@ -21,6 +24,12 @@
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.opengl.Display;
 
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
+
 /**
  * @author travis - began work on 8th april 2021
  */
@@ -29,7 +38,7 @@ public class WurstplusThree {
 
     public static final String MODID = "wurstplusthree";
     public static final String MODNAME = "Wurst+3";
-    public static final String MODVER = "0.6.1";
+    public static final String MODVER = "0.7.0+" + BuildConfig.GitHash;
 
     public static final Logger LOGGER = LogManager.getLogger(MODID);
 
@@ -48,9 +57,11 @@ public class WurstplusThree {
 
     // gui
     public static WurstplusGuiNew GUI2;
+    public static WurstplusHudGui HUDGUI;
 
     // managers
     public static MenuFont MENU_FONT_MANAGER;
+    public static HelpManager HELP_MANAGER;
     public static GuiFont GUI_FONT_MANAGER;
     public static DonatorFont DONATOR_FONT_MANAGER;
     public static FriendManager FRIEND_MANAGER;
@@ -67,6 +78,8 @@ public class WurstplusThree {
     public static ClientHandling CLIENT_HANDLING;
     public static ChatHandling CHAT_HANDLING;
     public static HudManager HUD_MANAGER;
+    public static KDManager KD_MANAGER;
+    public static WurstPlusProxy PROXY;
 
     // megs weird thingy
     public static RenderUtil2D RENDER_UTIL_2D;
@@ -99,6 +112,9 @@ public void load() {
         CHAT_HANDLING = new ChatHandling();
         CONFIG_MANAGER.loadConfig();
         GUI2 = new WurstplusGuiNew();
+        HUDGUI = new WurstplusHudGui();
+        //PROXY = new WurstPlusProxy(420, "0.0.0.0", WurstPlusProxy.Mode.CLIENT);
+        //PLUGIN_LOADER = new Loader();
     }
 
     public static void unLoad() {
@@ -113,13 +129,15 @@ public void loadManagers() {
         POP_MANAGER = new PopManager();
         SERVER_MANAGER = new ServerManager();
         POS_MANAGER = new PositionManager();
+        HELP_MANAGER = new HelpManager();
         ROTATION_MANAGER = new RotationManager();
         CONFIG_MANAGER = new ConfigManager();
         SONG_MANAGER = new SongManager();
         CAPE_MANAGER = new CapeManager();
         DONATOR_FONT_MANAGER = new DonatorFont();
         COSMETIC_MANAGER = new CosmeticManager();
         ALT_MANAGER = new AltManager();
+        KD_MANAGER = new KDManager();
     }
 
 }

src/main/java/me/travis/wurstplusthree/command/Command.java

@@ -10,6 +10,8 @@ public abstract class Command implements Globals {
 
     protected List<String> names;
 
+    protected List<List<String>> arguments;
+
     public Command(String name) {
         this.names = Collections.singletonList(name);
     }
@@ -18,12 +20,20 @@ public Command(String... names) {
         this.names = Arrays.asList(names.clone());
     }
 
+    public Command(List<List<String>> arguments){
+        this.arguments = arguments;
+    }
+
     public abstract void execute(String[] message);
 
     public List<String> getNames() {
         return this.names;
     }
 
+    public List<List<String>> getArguments(){
+        return this.arguments;
+    }
+
     public boolean isName(String name) {
         for (String name_ : this.names) {
             if (name_.equalsIgnoreCase(name)) {

src/main/java/me/travis/wurstplusthree/command/Commands.java

@@ -1,6 +1,6 @@
 package me.travis.wurstplusthree.command;
 
-import me.travis.wurstplusthree.command.commands.*;
+import me.travis.wurstplusthree.command.commands.BurrowBlockCommand;
 import me.travis.wurstplusthree.util.ClientMessage;
 import me.travis.wurstplusthree.util.Globals;
 import me.travis.wurstplusthree.util.ReflectionUtil;
@@ -13,6 +13,7 @@ public class Commands implements Globals {
 
     public static String prefix = ".";
     private final List<Command> commands = new ArrayList<>();
+    private String nextArgument = "";
 
     // TODO : SETTINGS COMMAND
     // TODO : CLEAR CHAT COMMAND
@@ -85,4 +86,29 @@ public BurrowBlockCommand getBurrowCommand(){
         return null;
     }
 
+    public String getNextArgument() {
+        return nextArgument;
+    }
+    /*
+    public void getNextArgument(String... text){
+        int size = text.length;
+        for(Command command : commands){
+            List<List<String>> args = command.getArguments();
+            for(int i=0; i<size; i++){
+                List<String> path = args.get(i);
+                for(Strin   g possible : path){
+                    if(possible.equals(text[i])){
+                        break;
+                    }
+                    if(possible.contains(text[i])){
+                        nextArgument = possible;
+                    }
+                }
+            }
+        }
+
+       nextArgument = "";
+    }
+     */
+
 }

src/main/java/me/travis/wurstplusthree/command/commands/ConfigCommand.java

@@ -15,7 +15,7 @@ public ConfigCommand() {
     public void execute(String[] message) {
         String folder = message[0].replaceAll("_", " ") + "/";
         if (folder.equalsIgnoreCase("/")) {
-            ClientMessage.sendErrorMessage("Invalid Folder");
+            ClientMessage.sendMessage("Current config is " + WurstplusThree.CONFIG_MANAGER.configName);
             return;
         }
         WurstplusThree.CONFIG_MANAGER.setActiveConfigFolder(folder);

src/main/java/me/travis/wurstplusthree/command/commands/DebugCommand.java

@@ -6,7 +6,6 @@
 import me.travis.wurstplusthree.event.events.TestEvent;
 import me.travis.wurstplusthree.event.processor.CommitEvent;
 import me.travis.wurstplusthree.event.processor.EventPriority;
-import me.travis.wurstplusthree.hack.hacks.client.Hud;
 import me.travis.wurstplusthree.util.ClientMessage;
 import me.travis.wurstplusthree.util.logview.Threads;
 
@@ -52,7 +51,6 @@ public void execute(String[] message) {
                 WurstplusThree.EVENT_PROCESSOR.removeEventListener(this);
                 break;
             case "hud":
-                Hud.INSTANCE.debugHud = message[1].equals("true");
                 break;
             case "capes":
                 capes = message[1].equals("true");