Class lookup (move #303 to refactored branch)

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-labels: bug
+labels: bug/module
 
 ---
 

.github/ISSUE_TEMPLATE/enhancement.md

@@ -1,7 +1,7 @@
 ---
 name: Enhancement to an existing feature
 about: Suggest an idea for a feature
-labels: enhancement
+labels: enhancement/module
 
 ---
 

.github/ISSUE_TEMPLATE/featurereq.md

@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-labels: new-feature
+labels: new/module
 
 ---
 

.github/ISSUE_TEMPLATE/incompatiblity-report.md

@@ -1,12 +1,12 @@
 ---
 name: Incompatibility Report
-about: Incompatible with another mod
-labels: incompatible
+about: Incompatible with another module
+labels: -incompatible
 
 ---
 
 **What mod?**
-A clear and concise description of what mod it is.
+A clear and concise description of what module it is.
 
 **Logs**
 Please add logs or your issue will be closed.

.travis.yml

@@ -2,6 +2,8 @@ language: java
 jdk:
 - openjdk8
 before_install:
+- "./scripts/preHook.sh"
+- export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
 - chmod +x gradlew
 - "./gradlew setupDecompWorkspace"
 deploy:
@@ -14,3 +16,5 @@ deploy:
   on:
     repo: S-B99/kamiblue
     tags: true
+after_success:
+- "./scripts/hook.sh"

README.md

@@ -5,13 +5,13 @@
 ### A Minecraft utility mod for anarchy servers
 
 # 
-<a href="https://github.com/S-B99/kamiblue/releases/download/v1.1.2/KAMI-Blue-v1.1.2-release.jar">
+<a href="https://blue.bella.wtf/download">
 <img src="https://github.com/S-B99/kamiblue/blob/assets/assets/icons/download.svg" width="200"/>
 </a>
 
 ***
 
-[![Dl discord](https://img.shields.io/badge/downloads-32k-brightgreen?logo=discord&logoColor=white)](https://discord.gg/KfpqwZB)
+[![Dl discord](https://img.shields.io/badge/downloads-37k-brightgreen?logo=discord&logoColor=white)](https://discord.gg/KfpqwZB)
 [![Dl Github](https://img.shields.io/github/downloads/S-B99/kamiblue/total?label=downloads&logo=github)](https://github.com/S-B99/kamiblue/releases)
 
 [![Build Status features-master](https://img.shields.io/travis/com/S-B99/kamiblue/feature/master?logo=gradle&label=build)](https://travis-ci.com/S-B99/kamiblue/)

build.gradle

@@ -1,31 +1,4 @@
-// make folders
-
-task mkdir {
-    group = "kami"
-    doLast {
-        mkdir System.getProperty("user.home") + "/.minecraft/mods/1.12.2/"
-    }
-}
-
-// delete old versions
-
-task rmOld(type: Delete) {
-    group = "kami"
-    delete fileTree(System.getProperty("user.home") + "/.minecraft/mods/1.12.2/").matching {
-        include "k*-release.jar"
-    }
-}
-
-// copy file
-
-task copy(type: Copy) {
-    group = "kami"
-    from file("build/libs/")
-    include 'k*-release.jar'
-    into file(System.getProperty("user.home") + "/.minecraft/mods/1.12.2/")
-}
-
-// forge's stuff 
+// forge's stuff
 
 buildscript {
     repositories {
@@ -102,6 +75,8 @@ dependencies {
         exclude group: 'com.google.guava', module: 'guava'
     }
     compile 'club.minnced:java-discord-rpc:v2.0.1'
+    compile 'com.github.MrPowerGamerBR:TemmieWebhook:-SNAPSHOT'
+    compile 'com.github.kevinsawicki:http-request:http-request-6.0'
 }
 
 processResources {
@@ -135,6 +110,8 @@ shadowJar {
         include(dependency('org.yaml:snakeyaml'))
         include(dependency('org.reflections:reflections'))
         include(dependency('org.javassist:javassist'))
+        include(dependency('com.github.MrPowerGamerBR:TemmieWebhook'))
+        include(dependency('com.github.kevinsawicki:http-request'))
     }
     exclude 'dummyThing' // can someone explain why this is here
     classifier = 'release'

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx3G
 modGroup=me.zeroeightsix
-modVersion=v1.1.2-03-07-01
+modVersion=1.1.2-beta
 modBaseName=kamiblue
 forgeVersion=1.12.2-14.23.5.2847
 mcpVersion=stable_39

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Thu Mar 26 18:02:24 EDT 2020
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

scripts/curBeta

@@ -0,0 +1 @@
+\-beta

scripts/curVer

@@ -0,0 +1 @@
+v1.1.2

scripts/hook.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+if [[ "$TRAVIS_PULL_REQUEST" == "true" ]]; then exit 0; else echo "">/dev/null; fi
+
+COMMIT_TRIM="${TRAVIS_COMMIT::7}"
+COMMIT_MSG="$TRAVIS_COMMIT_MESSAGE"
+
+if [[ "$BRANCH" == "feature/master" ]]; then
+    # Send message with branch name
+    curl -H "Content-Type: application/json" -X POST -d '{"embeds": [{"title": "","color": 10195199,"description": "**Changelog:** '"$COMMIT_MSG"'\nBranch: `'"$BRANCH"'`\nCommit: ['${COMMIT_TRIM}'](https://github.com/S-B99/kamiblue/commits/'${COMMIT_TRIM}') Full: ['${COMMIT_TRIM}'-](https://github.com/S-B99/kamiblue/commit/'${TRAVIS_COMMIT}') "}]}' "$WEBHOOK"
+
+    # Upload the release file
+    BUILD_DIR="$(readlink -f ./build/libs/)"
+    JAR_DIR="$(ls "$BUILD_DIR" | grep "release")"
+    curl -F content=@"$BUILD_DIR/$JAR_DIR" "$WEBHOOK"
+else
+    exit 0
+fi

scripts/preHook.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+CUR_VER="$(cat ./scripts/curVer)"
+COMMIT_TRIM="${TRAVIS_COMMIT::7}"
+
+sed -i "s/modVersion=.*/modVersion=${CUR_VER:1}-$COMMIT_TRIM/" gradle.properties
+sed -i "s/\"version\": \".*\",/\"version\": \"${CUR_VER:1}-$COMMIT_TRIM\",/" src/main/resources/mcmod.info
+sed -i "s/MODVER = \".*\";/MODVER = \"$CUR_VER-$COMMIT_TRIM\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java

scripts/ver.sh

@@ -1,16 +1,16 @@
 #!/bin/sh
 
 # Created by S-B99 on 19/02/20
-# echo "Usage: ./ver.sh v2.0.0 01"
+# echo "Usage: ./ver.sh"
 
-dateM=$(date +'%m')
-dateD=$(date +'%d')
+CUR_VER="$(cat ./scripts/curVer)"
+CUR_BETA="$(cat ./scripts/curBeta)"
 
-sed -i "s/modVersion=.*/modVersion=$1\-${dateM}\-${dateD}\-$2/" gradle.properties
-sed -i "s/MODVER = \".*\";/MODVER = \"$1\-${dateM}\-${dateD}\-$2\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
-sed -i "s/\"version\": \".*\",/\"version\": \"${1:1}\-${dateM}\-${dateD}\-$2\",/" src/main/resources/mcmod.info
-sed -i "s/MODVERSMALL = \".*\";/MODVERSMALL = \"$1\-beta\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
+sed -i "s/modVersion=.*/modVersion=${CUR_VER:1}$CUR_BETA/" gradle.properties
+sed -i "s/MODVER = \".*\";/MODVER = \"$CUR_VER$CUR_BETA\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
+sed -i "s/MODVERSMALL = \".*\";/MODVERSMALL = \"$CUR_VER$CUR_BETA\";/" src/main/java/me/zeroeightsix/kami/KamiMod.java
+sed -i "s/\"version\": \".*\",/\"version\": \"${CUR_VER:1}$CUR_BETA\",/" src/main/resources/mcmod.info
 
 git reset
 git add gradle.properties src/main/java/me/zeroeightsix/kami/KamiMod.java src/main/resources/mcmod.info
-git commit -m "[BOT] New beta: $1-${dateD}-${dateM}-$2"
+git commit -m "[BOT] New release: $CUR_VER$CUR_BETA"

src/main/java/me/zeroeightsix/kami/DiscordPresence.java

@@ -3,12 +3,11 @@
 import club.minnced.discord.rpc.DiscordEventHandlers;
 import club.minnced.discord.rpc.DiscordRPC;
 import club.minnced.discord.rpc.DiscordRichPresence;
-import me.zeroeightsix.kami.module.ModuleManager;
 import me.zeroeightsix.kami.module.modules.misc.DiscordSettings;
 
 import static me.zeroeightsix.kami.KamiMod.APP_ID;
 
-/***
+/**
  * @author S-B99
  * Updated by S-B99 on 13/01/20
  */
@@ -42,7 +41,7 @@ private static void setRpcFromSettingsNonInt() {
         while (!Thread.currentThread().isInterrupted()) {
             try {
                 DiscordPresence.rpc.Discord_RunCallbacks();
-                discordSettings = ((DiscordSettings) ModuleManager.getModuleByName("DiscordSettings"));
+                discordSettings = ((DiscordSettings) KamiMod.MODULE_MANAGER.getModule(DiscordSettings.class));
                 String separator = " | ";
                 details = discordSettings.getLine(discordSettings.line1Setting.getValue()) + separator + discordSettings.getLine(discordSettings.line3Setting.getValue());
                 state = discordSettings.getLine(discordSettings.line2Setting.getValue()) + separator + discordSettings.getLine(discordSettings.line4Setting.getValue());
@@ -56,7 +55,7 @@ private static void setRpcFromSettingsNonInt() {
         }
     }
     private static void setRpcFromSettings() {
-        discordSettings = ((DiscordSettings) ModuleManager.getModuleByName("DiscordSettings"));
+        discordSettings = ((DiscordSettings) KamiMod.MODULE_MANAGER.getModule(DiscordSettings.class));
         details = discordSettings.getLine(discordSettings.line1Setting.getValue()) + " " + discordSettings.getLine(discordSettings.line3Setting.getValue());
         state = discordSettings.getLine(discordSettings.line2Setting.getValue()) + " " + discordSettings.getLine(discordSettings.line4Setting.getValue());
         DiscordPresence.presence.details = details;