diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..c20fd31 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,31 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "Minecraft Client (:1.8.9-forge)", + "request": "launch", + "cwd": "${workspaceFolder}/versions\\1.8.9-forge/run", + "console": "internalConsole", + "stopOnEntry": false, + "mainClass": "net.fabricmc.devlaunchinjector.Main", + "vmArgs": "\"-Dfabric.dli.config\u003dC:\\Users\\Zesta\\Documents\\Projects\\Coding\\Active\\JVM\\Minecraft\\Mods\\Forge\\Lilase\\versions\\1.8.9-forge\\.gradle\\loom-cache\\launch.cfg\" \"-Dfabric.dli.env\u003dclient\" \"-Dfabric.dli.main\u003dnet.minecraft.launchwrapper.Launch\"", + "args": "", + "env": {}, + "projectName": "1.8.9-forge" + }, + { + "type": "java", + "name": "Minecraft Server (:1.8.9-forge)", + "request": "launch", + "cwd": "${workspaceFolder}/versions\\1.8.9-forge/run", + "console": "internalConsole", + "stopOnEntry": false, + "mainClass": "net.fabricmc.devlaunchinjector.Main", + "vmArgs": "\"-Dfabric.dli.config\u003dC:\\Users\\Zesta\\Documents\\Projects\\Coding\\Active\\JVM\\Minecraft\\Mods\\Forge\\Lilase\\versions\\1.8.9-forge\\.gradle\\loom-cache\\launch.cfg\" \"-Dfabric.dli.env\u003dserver\" \"-Dfabric.dli.main\u003dnet.minecraft.launchwrapper.Launch\"", + "args": "\"nogui\"", + "env": {}, + "projectName": "1.8.9-forge" + } + ] +} \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 598e250..0000000 --- a/build.gradle +++ /dev/null @@ -1,140 +0,0 @@ -buildscript { - ext.kotlin_version = "1.6.10" - repositories { - jcenter() - maven { - name = "forge" - url = "https://files.minecraftforge.net/maven" - } - maven { url "https://jitpack.io" } - maven { url "https://repo.spongepowered.org/repository/maven-public/" } - } - dependencies { - classpath "com.github.Skytils:ForgeGradle:41dfce0a70" - classpath "com.github.jengelman.gradle.plugins:shadow:6.1.0" - classpath "com.github.debuggingss:MixinGradle:0.6-SNAPSHOT" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} -apply plugin: "kotlin" -apply plugin: "net.minecraftforge.gradle.forge" -apply plugin: "com.github.johnrengelman.shadow" -apply plugin: "org.spongepowered.mixin" - -version = "1.0.21" -group = "me.night0721.lilase" -archivesBaseName = "Lilase" -sourceCompatibility = 1.8 -compileJava.options.encoding = "UTF-8" -sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaVersion.VERSION_1_8 - -minecraft { - version = "1.8.9-11.15.1.2318-1.8.9" - runDir = "run" - mappings = "stable_22" - makeObfSourceJar = false - - replace "@VERSION@": project.version - - clientRunArgs += ["--tweakClass cc.polyfrost.oneconfig.loader.stage0.LaunchWrapperTweaker", "--mixin mixins.night0721.json"] -} - -configurations { - include - implementation.extendsFrom(include) -} - -repositories { - mavenCentral() - maven { url "https://jitpack.io/" } - maven { url "https://repo.spongepowered.org/repository/maven-public/" } - maven { url "https://repo.sk1er.club/repository/maven-public" } - maven { url "https://repo.sk1er.club/repository/maven-releases/" } - maven { url "https://storehouse.okaeri.eu/repository/maven-public/" } - maven { url "https://repo.polyfrost.cc/releases" } -} - -dependencies { - compileOnly("gg.essential:essential-1.8.9-forge:2581") - include("gg.essential:loader-launchwrapper:1.1.3") - implementation("org.spongepowered:mixin:0.7.11-SNAPSHOT") - annotationProcessor("org.spongepowered:mixin:0.7.11-SNAPSHOT") - include("org.apache.commons:commons-collections4:4.4") - include("org.json:json:20220924") - - compileOnly('cc.polyfrost:oneconfig-1.8.9-forge:0.2.0-alpha+') - include("cc.polyfrost:oneconfig-wrapper-launchwrapper:1.0.0-beta9") - - include(fileTree(dir: "libs", include: "*.jar")) - implementation(fileTree(dir: "libs", include: "*.jar")) -} - -mixin { - disableRefMapWarning = true - defaultObfuscationEnv searge - add sourceSets.main, "mixins.night0721.refmap.json" -} - -jar { - manifest.attributes("FMLCorePluginContainsFMLMod": true, - "FMLCorePlugin": "me.night0721.lilase.mixins.MixinLoader", - "ForceLoadAsMod": true, - "MixinConfigs": "mixins.night0721.json", - "ModSide": "CLIENT", -// "TweakClass": "gg.essential.loader.stage0.EssentialSetupTweaker", - "TweakClass": "cc.polyfrost.oneconfig.loader.stage0.LaunchWrapperTweaker", - "TweakOrder": "0") - enabled = false -} - -sourceJar { - enabled = false -} -shadowJar { - archiveClassifier.set("") - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - configurations = [project.configurations.include] - - exclude "LICENSE.md" - exclude "pack.mcmeta" - exclude "dummyThing" - exclude "**/module-info.class" - exclude "*.so" - exclude "*.dylib" - exclude "*.dll" - exclude "*.jnilib" - exclude "ibxm/**" - exclude "com/jcraft/**" - exclude "org/lwjgl/**" - exclude "net/java/**" - - exclude "META-INF/proguard/**" - exclude "META-INF/maven/**" - exclude "META-INF/versions/**" - exclude "META-INF/com.android.tools/**" - - exclude "fabric.mod.json" -} -tasks.reobfJar.dependsOn tasks.shadowJar -reobf { - shadowJar { - classpath = sourceSets.main.compileClasspath - } -} - -processResources { - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - from(sourceSets.main.resources.srcDirs) { - include "mcmod.info" - expand "version": project.version, "mcversion": project.minecraft.version - } - from(sourceSets.main.resources.srcDirs) { - exclude "mcmod.info" - } -} - -sourceSets { - main { output.resourcesDir = java.outputDir } -} diff --git a/gradlew b/gradlew deleted file mode 100644 index 9aa616c..0000000 --- a/gradlew +++ /dev/null @@ -1,169 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index f955316..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 44938e9..0000000 --- a/settings.gradle +++ /dev/null @@ -1,28 +0,0 @@ -pluginManagement { - repositories { - mavenCentral() - gradlePluginPortal() - - maven { - name = "Forge" - url = "https://maven.minecraftforge.net" - } - - maven { - name = "Jitpack" - url = "https://jitpack.io/" - } - } - resolutionStrategy { - eachPlugin { - if (requested.id.id == "net.minecraftforge.gradle.forge") { - useModule("com.github.realfork:ForgeGradle:${requested.version}") - } - if (requested.id.id == "org.spongepowered.mixin") { - useModule("com.github.xcfrg:MixinGradle:${requested.version}") - } - } - } -} - -rootProject.name = "Lilase" \ No newline at end of file diff --git a/src/main/java/me/night0721/lilase/features/ah/AuctionHouse.java b/src/main/java/me/night0721/lilase/features/ah/AuctionHouse.java index 43043d5..bd7601a 100644 --- a/src/main/java/me/night0721/lilase/features/ah/AuctionHouse.java +++ b/src/main/java/me/night0721/lilase/features/ah/AuctionHouse.java @@ -40,7 +40,8 @@ public class AuctionHouse { if (!ConfigUtils.getString("item3", "Name").equals("") && !ConfigUtils.getString("item3", "Type").equals("") && !ConfigUtils.getString("item3", "Tier").equals("") && ConfigUtils.getInt("item3", "Price") != 0) items.add(new Item(ConfigUtils.getString("item3", "Name"), ItemType.valueOf(ConfigUtils.getString("item3", "Type")), ConfigUtils.getInt("item3", "Price"), ItemTier.valueOf(ConfigUtils.getString("item3", "Tier")))); webhook.setUsername("Lilase - Auction House"); - webhook.setAvatarUrl("https://wallpapercave.com/wp/wp2412537.jpg"); + //webhook.setAvatarUrl("https://wallpapercave.com/wp/wp2412537.jpg"); + webhook.setAvatarUrl("https://th.bing.com/th/id/OIP.Lk2cSujieY70GbsgPZ0TyAHaEK?w=325&h=182&c=7&r=0&o=5&pid=1.7"); } private JSONObject getHypixelData(String player) throws IOException, JSONException { diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 702b044..1962a4c 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -2,10 +2,16 @@ { "modid": "Lilase", "name": "Lilase", + "description": "AH Flipper Mod", "version": "${version}", - "mcversion": "${mcversion}", + "mcversion": "1.8.9", + "url": "https://github.com/night0721", + "updateUrl": "https://github.com/night0721", "authorList": ["night0721"], + "credits": "FarmHelper/JellyLab", + "logoFile": "", "description": "Lilac", - "url": "https://github.com/night0721" + "screenshots": [], + "dependencies": [] } ] \ No newline at end of file diff --git a/versions/mainProject b/versions/mainProject new file mode 100644 index 0000000..dd1433e --- /dev/null +++ b/versions/mainProject @@ -0,0 +1 @@ +1.8.9-forge \ No newline at end of file