diff options
45 files changed, 746 insertions, 486 deletions
@@ -4,12 +4,12 @@ eclipse/* build/* - -logs/* -config/* -crash-reports/* +jars/* +runtime/logs/* +runtime/config/* +runtime/crash-reports/* run/* -screenshots/* +runtime/screenshots/* DEBUG/* sdk/* essential/* @@ -25,17 +25,17 @@ gradle-app.setting # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 # gradle/wrapper/gradle-wrapper.properties -mods/* +runtime/modsss/* /modcore/config.toml /modcore/Sk1er Modcore-0.1.47 (1.8.9).jar /.mixin.out/audit/mixin_implementation_report.csv /.mixin.out/audit/mixin_implementation_report.txt /modcore/metadata.json -/.ReAuth.cfg +/runtime/.ReAuth.cfg /libdiscord-rpc.so -options.txt -servers.dat -/saves/* -/usernamecache.json -/usercache.json +runtime/options.txt +runtime/servers.dat +/runtime/saves/* +/runtime/usernamecache.json +/runtime/usercache.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..b3e96bec --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,4 @@ +{ + "version": "0.2.0", + "configurations": [] +}
\ No newline at end of file diff --git a/build.gradle b/build.gradle index 7b66999b..5987721e 100755 --- a/build.gradle +++ b/build.gradle @@ -1,112 +1,8 @@ -/* - * Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod - * Copyright (C) 2021 cyoung06 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <https://www.gnu.org/licenses/>. - */ -buildscript { - repositories { - gradlePluginPortal() - mavenCentral() - maven { - name = "forge" - url = "https://maven.minecraftforge.net/" - } - maven { url "https://jitpack.io" } - } - dependencies { - classpath "com.github.Skytils:ForgeGradle:6f5327" - classpath "com.github.jengelman.gradle.plugins:shadow:6.1.0" - } -} -apply plugin: "net.minecraftforge.gradle.forge" -apply plugin: "com.github.johnrengelman.shadow" -version = "3.0" -group = "kr.syeyoung.dungeonsguide" -archivesBaseName = "dungeonsguide" - -sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 - -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" -} - -minecraft { - version = "1.8.9-11.15.1.2318-1.8.9" - runDir = "run" - - mappings = "stable_22" - makeObfSourceJar = false -} - -repositories { - mavenCentral() - maven { url "https://jitpack.io" } -} -dependencies { - implementation "org.jetbrains:annotations-java5:19.0.0" - implementation "org.java-websocket:Java-WebSocket:1.5.1" - implementation "org.json:json:20171018" - implementation "com.twelvemonkeys.imageio:imageio-bmp:3.7.0" - - - compileOnly project(':wrapper') - compileOnly "org.projectlombok:lombok:1.18.20" - compileOnly files("mods/Hychat-1.12.1-BETA.jar") - annotationProcessor "org.projectlombok:lombok:1.18.16" - - testCompileOnly "org.projectlombok:lombok:1.18.20" - testAnnotationProcessor "org.projectlombok:lombok:1.18.20" -} - -shadowJar { - - archiveFileName = jar.archiveFileName - - relocate "org.java_websocket", "kr.syeyoung.org.java_websocket" - - dependencies { - include(dependency("org.java-websocket:Java-WebSocket:1.5.1")) - include(dependency("org.slf4j:slf4j-api:1.7.25")) - include(dependency("org.json:json:20171018")) - include(dependency("com.twelvemonkeys..*:.*")) - } -} - -reobf { - shadowJar { - mappingType = "SEARGE" - } -} - -processResources { - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include "mcmod.info" - - // replace version and mcversion - expand "version": project.version, "mcversion": project.minecraft.version - } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude "mcmod.info" - } +tasks.wrapper { + gradleVersion = "7.4" + // You can either download the binary-only version of Gradle (BIN) or + // the full version (with sources and documentation) of Gradle (ALL) + distributionType = Wrapper.DistributionType.ALL }
\ No newline at end of file diff --git a/gradle.properties b/gradle.properties index bf86fb71..6c41dec1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,2 @@ -org.gradle.jvmargs=-Xmx2G
\ No newline at end of file +org.gradle.jvmargs=-Xmx2G +loom.platform=forge
\ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex 758de960..41d9927a 100755..100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8cf6eb5a..b1159fc5 100755..100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # 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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${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="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # 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 - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -89,84 +140,95 @@ 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 +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac 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 +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# 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\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg 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 -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# 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 +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f9553162..107acd32 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @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= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @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 +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ 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% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/loader/.gitignore b/loader/.gitignore new file mode 100755 index 00000000..d2944636 --- /dev/null +++ b/loader/.gitignore @@ -0,0 +1,41 @@ +.gradle +.idea + +eclipse/* + +build/* +jars/* +runtime/logs/* +runtime/config/* +runtime/crash-reports/* +run/* +runtime/screenshots/* +DEBUG/* +sdk/* +essential/* +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +runtime/modsss/* +/modcore/config.toml +/modcore/Sk1er Modcore-0.1.47 (1.8.9).jar +/.mixin.out/audit/mixin_implementation_report.csv +/.mixin.out/audit/mixin_implementation_report.txt +/modcore/metadata.json +/runtime/.ReAuth.cfg +/libdiscord-rpc.so + +runtime/options.txt +runtime/servers.dat +/runtime/saves/* +/runtime/usernamecache.json +/runtime/usercache.json diff --git a/loader/build.gradle b/loader/build.gradle new file mode 100644 index 00000000..a86269ce --- /dev/null +++ b/loader/build.gradle @@ -0,0 +1,106 @@ +plugins { + id "idea" + id "java" + id "com.github.johnrengelman.shadow" version "7.1.2" + id "dev.architectury.architectury-pack200" version "0.1.3" + id "gg.essential.loom" version "0.10.0.+" +} + +version = "4.0.0" +group = "kr.syeyoung.dungeonsguide" +archivesBaseName = "dungeonsguide" + +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(8)) +} + +loom { + launchConfigs { + "client" { + // probably will have to my own mixin tweaker, due to dungeonsguide's weird dynamic loading stuff +// property("mixin.debug", "true") +// property("asmhelper.verbose", "true") +// arg("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker") +// arg("--mixin", "mixins.examplemod.json") + } + } + forge { + pack200Provider.set(new dev.architectury.pack200.java.Pack200Adapter()) + } +} + + +sourceSets.main { + output.setResourcesDir(file("$buildDir/classes/java/main")) +} + + +repositories { + mavenCentral() + maven { url "https://jitpack.io" } +} + +configurations { + implementation.extendsFrom shadowImpl +} + + +dependencies { + minecraft("com.mojang:minecraft:1.8.9") + mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9") + forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9") + + implementation "org.jetbrains:annotations-java5:19.0.0" + implementation "org.json:json:20171018" + implementation 'io.nayuki:qrcodegen:1.4.0' + + + compileOnly "org.projectlombok:lombok:1.18.20" + annotationProcessor "org.projectlombok:lombok:1.18.16" + + testCompileOnly "org.projectlombok:lombok:1.18.20" + testAnnotationProcessor "org.projectlombok:lombok:1.18.20" + + runtimeOnly project(":mod") +} + + +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} + +tasks.withType(Jar) { + archiveBaseName = "examplemod" + manifest { + attributes["FMLCorePluginContainsFMLMod"] = "true" + attributes["ForceLoadAsMod"] = "true" + + // If you don't want mixins, remove these lines +// this["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker" +// this["MixinConfigs"] = "mixins.examplemod.json" + } +} + + +tasks.shadowJar { + + archiveFileName = jar.archiveFileName + + relocate "org.java_websocket", "kr.syeyoung.org.java_websocket" + + dependencies { + include(dependency("org.java-websocket:Java-WebSocket:1.5.1")) + include(dependency("org.slf4j:slf4j-api:1.7.25")) + include(dependency("org.json:json:20171018")) + include(dependency("com.twelvemonkeys..*:.*")) + } +} + +tasks.named("remapJar") { + archiveClassifier = "all" + from(tasks.shadowJar) + input = tasks.shadowJar.archiveFile +} + + +tasks.assemble.dependsOn tasks.remapJar diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/DGInterface.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/DGInterface.java index c88a3cbf..c88a3cbf 100755 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/DGInterface.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/DGInterface.java diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/DungeonsGuideReloadListener.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/DungeonsGuideReloadListener.java index 7252a9db..7252a9db 100644 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/DungeonsGuideReloadListener.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/DungeonsGuideReloadListener.java diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/Main.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/Main.java index bb3e5909..c279d812 100755 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/Main.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/Main.java @@ -18,17 +18,19 @@ package kr.syeyoung.dungeonsguide.launcher; -import com.mojang.authlib.exceptions.AuthenticationException; +import kr.syeyoung.dungeonsguide.launcher.exceptions.AuthServerException; import kr.syeyoung.dungeonsguide.launcher.authentication.Authenticator; import kr.syeyoung.dungeonsguide.launcher.branch.ModDownloader; import kr.syeyoung.dungeonsguide.launcher.exceptions.NoSuitableLoaderFoundException; import kr.syeyoung.dungeonsguide.launcher.exceptions.PrivacyPolicyRequiredException; import kr.syeyoung.dungeonsguide.launcher.exceptions.ReferenceLeakedException; import kr.syeyoung.dungeonsguide.launcher.exceptions.TokenExpiredException; +import kr.syeyoung.dungeonsguide.launcher.gui.GuiLoadingError; import kr.syeyoung.dungeonsguide.launcher.loader.IDGLoader; import kr.syeyoung.dungeonsguide.launcher.loader.JarLoader; import kr.syeyoung.dungeonsguide.launcher.loader.LocalLoader; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiErrorScreen; import net.minecraft.client.gui.GuiMainMenu; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.IReloadableResourceManager; @@ -39,13 +41,11 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.ProgressManager; import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.EventPriority; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import java.io.*; -import java.security.*; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -53,9 +53,9 @@ import java.util.Objects; @Mod(modid = Main.MOD_ID, version = Main.VERSION) public class Main { - public static final String MOD_ID = "skyblock_dungeons_guide"; + public static final String MOD_ID = "dungeons_guide_wrapper"; public static final String VERSION = "1.0"; - public static final String DOMAIN = "http://testmachine:8080"; + public static final String DOMAIN = "http://testmachine:8080/panel/api"; private static Main main; @@ -89,7 +89,14 @@ public class Main if (dgInterface != null) { try { dgInterface.init(configDir); + + for (DungeonsGuideReloadListener listener : listeners) { + listener.onLoad(dgInterface); + } } catch (Exception e) { + e.printStackTrace(); + lastError = e; + tryOpenError(); } } } @@ -119,12 +126,19 @@ public class Main listener.onLoad(dgInterface); } } + private void partialLoad(IDGLoader newLoader) throws ClassNotFoundException, InstantiationException, IllegalAccessException { + if (dgInterface != null) throw new IllegalStateException("DG is loaded"); + newLoader.loadJar(authenticator); + dgInterface = newLoader.getInstance(); + currentLoader = newLoader; + } public void reload(IDGLoader newLoader) { try { unload(); load(newLoader); } catch (Exception e) { + e.printStackTrace(); lastError = e; dgInterface = null; currentLoader = null; @@ -133,10 +147,25 @@ public class Main } public void tryOpenError() { - Minecraft.getMinecraft().displayGuiScreen(obtainErrorGUI()); + if (isMcLoaded) Minecraft.getMinecraft().displayGuiScreen(obtainErrorGUI()); } public GuiScreen obtainErrorGUI() { + if (lastError instanceof PrivacyPolicyRequiredException) { + + } else if (lastError instanceof TokenExpiredException) { + + } else if (lastError instanceof NoSuitableLoaderFoundException) { + + } else if (lastError instanceof ReferenceLeakedException) { + + } else if (lastError instanceof AuthServerException) { + + } else if (lastError != null){ + return new GuiLoadingError(lastError, () -> {lastError = null;}); + } + if (lastError != null) + lastError.printStackTrace(); // when gets called init and stuff remove thing return null; } @@ -192,16 +221,20 @@ public class Main Configuration configuration = new Configuration(f); bar.step("Instantiating..."); - load(obtainLoader(configuration)); + partialLoad(obtainLoader(configuration)); configuration.save(); } catch (Throwable t) { + t.printStackTrace(); lastError = t; dgInterface = null; currentLoader = null; tryOpenError(); } finally { - if (bar != null) ProgressManager.pop(bar); + if (bar != null) { + while(bar.getStep() < bar.getSteps()) bar.step(""); + ProgressManager.pop(bar); + } } ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(a -> { diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/authentication/Authenticator.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/authentication/Authenticator.java index 8adcc7e6..627a058f 100755 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/authentication/Authenticator.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/authentication/Authenticator.java @@ -21,6 +21,7 @@ package kr.syeyoung.dungeonsguide.launcher.authentication; import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.minecraft.MinecraftSessionService; import kr.syeyoung.dungeonsguide.launcher.Main; +import kr.syeyoung.dungeonsguide.launcher.exceptions.AuthServerException; import kr.syeyoung.dungeonsguide.launcher.exceptions.PrivacyPolicyRequiredException; import kr.syeyoung.dungeonsguide.launcher.exceptions.TokenExpiredException; import lombok.Getter; @@ -41,8 +42,6 @@ import java.security.spec.InvalidKeySpecException; import java.security.spec.X509EncodedKeySpec; import java.time.Instant; import java.util.UUID; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -72,7 +71,7 @@ public class Authenticator { repeatAuthenticate(5); } catch (Throwable t) { Main.getMain().setLastError(t); - throw new TokenExpiredException(); + throw new TokenExpiredException(t); } } return token; @@ -92,6 +91,7 @@ public class Authenticator { reauthenticate(); break; } catch (IOException | AuthenticationException | NoSuchAlgorithmException e) { + e.printStackTrace(); if (cnt == tries) throw new RuntimeException(e); try { Thread.sleep((long) Math.max(Math.pow(2, tries)* 100, 1000 * 10)); @@ -168,7 +168,7 @@ public class Authenticator { } private String requestAuth(UUID uuid, String nickname) throws IOException { - HttpsURLConnection urlConnection = (HttpsURLConnection) request("POST", "/auth/v2/requestAuth"); + HttpURLConnection urlConnection = request("POST", "/auth/v2/requestAuth"); urlConnection.setRequestProperty("Content-Type", "application/json"); urlConnection.getOutputStream().write(("{\"uuid\":\""+uuid.toString()+"\",\"nickname\":\""+nickname+"\"}").getBytes()); @@ -187,7 +187,7 @@ public class Authenticator { } } private JSONObject verifyAuth(String tempToken, byte[] secret) throws IOException { - HttpsURLConnection urlConnection = (HttpsURLConnection) request("POST", "/auth/v2/authenticate"); + HttpURLConnection urlConnection = request("POST", "/auth/v2/authenticate"); urlConnection.getOutputStream().write(("{\"jwt\":\""+tempToken+"\",\"sharedSecret\":\""+Base64.encodeBase64URLSafeString(secret)+"}").getBytes()); try (InputStream is = obtainInputStream(urlConnection)) { @@ -203,7 +203,7 @@ public class Authenticator { } } private JSONObject acceptPrivacyPolicy(String tempToken) throws IOException { - HttpsURLConnection urlConnection = (HttpsURLConnection) request("POST", "/auth/v2/acceptPrivacyPolicy"); + HttpURLConnection urlConnection = request("POST", "/auth/v2/acceptPrivacyPolicy"); urlConnection.getOutputStream().write(tempToken.getBytes()); try (InputStream is = obtainInputStream(urlConnection)) { @@ -239,15 +239,14 @@ public class Authenticator { return inputStream; } public HttpURLConnection request(String method, String url) throws IOException { - HttpsURLConnection urlConnection = (HttpsURLConnection) new URL(Main.DOMAIN+url).openConnection(); + HttpURLConnection urlConnection = (HttpURLConnection) new URL(Main.DOMAIN+url).openConnection(); urlConnection.setRequestMethod(method); urlConnection.setRequestProperty("User-Agent", "DungeonsGuide/1.0"); urlConnection.setDoInput(true); urlConnection.setDoOutput(true); urlConnection.setAllowUserInteraction(true); - String token = getUnexpiredToken(); if (tokenStatus == TokenStatus.AUTHENTICATED) - urlConnection.setRequestProperty("Authorization", "Bearer "+token); + urlConnection.setRequestProperty("Authorization", "Bearer "+getUnexpiredToken()); return urlConnection; } } diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/authentication/TokenStatus.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/authentication/TokenStatus.java index a83818b8..a83818b8 100644 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/authentication/TokenStatus.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/authentication/TokenStatus.java diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/ModDownloader.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/ModDownloader.java index 45eacee5..45eacee5 100644 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/ModDownloader.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/ModDownloader.java diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/Update.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/Update.java index 565ac5aa..565ac5aa 100644 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/Update.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/Update.java diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/UpdateBranch.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/UpdateBranch.java index f0b05ee4..f0b05ee4 100644 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/UpdateBranch.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/branch/UpdateBranch.java diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/authentication/AuthServerException.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/AuthServerException.java index 3ffc491b..22b851a8 100644 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/authentication/AuthServerException.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/AuthServerException.java @@ -16,7 +16,7 @@ * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -package kr.syeyoung.dungeonsguide.launcher.authentication; +package kr.syeyoung.dungeonsguide.launcher.exceptions; import lombok.AllArgsConstructor; import org.json.JSONObject; diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/NoSuitableLoaderFoundException.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/NoSuitableLoaderFoundException.java index e5f50754..e5f50754 100644 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/NoSuitableLoaderFoundException.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/NoSuitableLoaderFoundException.java diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/PrivacyPolicyRequiredException.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/PrivacyPolicyRequiredException.java index 006e03ca..006e03ca 100644 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/PrivacyPolicyRequiredException.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/PrivacyPolicyRequiredException.java diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/ReferenceLeakedException.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/ReferenceLeakedException.java index 3a88b862..3a88b862 100644 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/ReferenceLeakedException.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/ReferenceLeakedException.java diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/TokenExpiredException.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/TokenExpiredException.java index d44d72fd..2c115e2f 100644 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/TokenExpiredException.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/exceptions/TokenExpiredException.java @@ -19,4 +19,8 @@ package kr.syeyoung.dungeonsguide.launcher.exceptions; public class TokenExpiredException extends RuntimeException{ + + public TokenExpiredException(Throwable parent) { + super(parent); + } } diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/gui/GuiLoadingError.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/gui/GuiLoadingError.java new file mode 100644 index 00000000..f7cc5972 --- /dev/null +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/gui/GuiLoadingError.java @@ -0,0 +1,141 @@ +/* + * Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod + * Copyright (C) 2021 cyoung06 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +package kr.syeyoung.dungeonsguide.launcher.gui; + +import kr.syeyoung.dungeonsguide.launcher.util.QRCodeGenerator; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.*; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.texture.DynamicTexture; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.FMLCommonHandler; +import org.lwjgl.opengl.GL11; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.Base64; +import java.util.zip.GZIPOutputStream; + +public class GuiLoadingError extends GuiScreen { + private String stacktrace; + private Throwable throwable; + + private DynamicTexture texture; + private ResourceLocation location; + private BufferedImage qrCode; + private Runnable clear; + + public GuiLoadingError(Throwable t, Runnable clear) { + this.throwable = t; + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + t.printStackTrace(pw); + stacktrace = sw.toString(); + + + try { + qrCode = QRCodeGenerator.generateQRCode(stacktrace.getBytes()); + } catch (IOException e) { + throw new RuntimeException(e); + } + texture = new DynamicTexture(qrCode.getWidth(), qrCode.getHeight()); + location = Minecraft.getMinecraft().getTextureManager().getDynamicTextureLocation("dg/errorqr", texture); + + qrCode.getRGB(0,0,qrCode.getWidth(), qrCode.getHeight(), texture.getTextureData(), 0, qrCode.getWidth()); + + texture.updateDynamicTexture(); + this.clear = clear; + } + + @Override + public void initGui() { + ScaledResolution sr = new ScaledResolution(Minecraft.getMinecraft()); + this.buttonList.add(new GuiButton(0, sr.getScaledWidth()/2-100,sr.getScaledHeight()-40 ,"Close Minecraft")); + this.buttonList.add(new GuiButton(1, sr.getScaledWidth()/2-100,sr.getScaledHeight()-70 ,"Play Without DG")); + clear.run(); + } + + @Override + protected void actionPerformed(GuiButton button) throws IOException { + super.actionPerformed(button); + if (button.id == 0) { + FMLCommonHandler.instance().exitJava(-1,true); + } else if (button.id == 1) { + Minecraft.getMinecraft().displayGuiScreen(null); + } + } + + @Override + public void drawScreen(int mouseX, int mouseY, float partialTicks) { + super.drawBackground(1); + + ScaledResolution sr = new ScaledResolution(Minecraft.getMinecraft()); + FontRenderer fontRenderer = Minecraft.getMinecraft().fontRendererObj; + fontRenderer.drawString("DungeonsGuide has ran into unknown error while loading itself", (sr.getScaledWidth()-fontRenderer.getStringWidth("DungeonsGuide has ran into unknown error while loading itself"))/2,40,0xFFFF0000); + fontRenderer.drawString("Please contact DungeonsGuide support with this screen", (sr.getScaledWidth()-fontRenderer.getStringWidth("Please contact DungeonsGuide support with this screen"))/2, (int) (40+fontRenderer.FONT_HEIGHT*1.5),0xFFFF0000); + + int tenth = sr.getScaledWidth() / 10; + + Gui.drawRect(tenth, 70,sr.getScaledWidth()-tenth, sr.getScaledHeight()-80, 0xFF5B5B5B); + String[] split = stacktrace.split("\n"); + clip(sr, tenth, 70,sr.getScaledWidth()-2*tenth, sr.getScaledHeight()-150); + GL11.glEnable(GL11.GL_SCISSOR_TEST); + for (int i = 0; i < split.length; i++) { + fontRenderer.drawString(split[i].replace("\t", " "), tenth+2,i*fontRenderer.FONT_HEIGHT + 72, 0xFFFFFFFF); + } + GL11.glDisable(GL11.GL_SCISSOR_TEST); + + + GlStateManager.pushMatrix(); + GlStateManager.scale(1.0/sr.getScaleFactor(), 1.0/sr.getScaleFactor(), 1); + GlStateManager.translate(0, Minecraft.getMinecraft().displayHeight - qrCode.getHeight() * 3, 0); + Tessellator tessellator = Tessellator.getInstance(); + WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + float f = 0.0F; + Minecraft.getMinecraft().getTextureManager().bindTexture(this.location); + GlStateManager.enableBlend(); + GlStateManager.tryBlendFuncSeparate(1, 771, 0, 1); + GlStateManager.disableAlpha(); + worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX); + worldrenderer.pos(0, qrCode.getHeight()*3, 0).tex(0.0D, 1.0D).endVertex(); + worldrenderer.pos(qrCode.getWidth()*3, qrCode.getHeight()*3, 0).tex(1.0D, 1.0D).endVertex(); + worldrenderer.pos(qrCode.getWidth()*3, 0, 0).tex(1.0D, 0.0D).endVertex(); + worldrenderer.pos(0, 0, 0).tex(0.0D, 0.0D).endVertex(); + tessellator.draw(); + GlStateManager.enableAlpha(); + GlStateManager.disableBlend(); + GlStateManager.popMatrix(); + + super.drawScreen(mouseX, mouseY, partialTicks); + } + + public static void clip(ScaledResolution resolution, int x, int y, int width, int height) { + if (width < 0 || height < 0) return; + + int scale = resolution.getScaleFactor(); + GL11.glScissor((x ) * scale, Minecraft.getMinecraft().displayHeight - (y + height) * scale, (width) * scale, height * scale); + } +} diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/loader/IDGLoader.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/loader/IDGLoader.java index ceff437e..ceff437e 100644 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/loader/IDGLoader.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/loader/IDGLoader.java diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/loader/JarLoader.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/loader/JarLoader.java index 2012412a..2012412a 100644 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/loader/JarLoader.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/loader/JarLoader.java diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/loader/LocalLoader.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/loader/LocalLoader.java index 67c43ad5..67c43ad5 100644 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/loader/LocalLoader.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/loader/LocalLoader.java diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/url/DGConnection.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/url/DGConnection.java index e8e40ebe..649dfdc5 100755 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/url/DGConnection.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/url/DGConnection.java @@ -39,8 +39,8 @@ public class DGConnection extends URLConnection { public InputStream getInputStream() throws IOException { if (authenticator != null) { String path = url.getPath().substring(1); - if (!authenticator.getResources().containsKey(path)) throw new FileNotFoundException(); - return new ByteArrayInputStream(authenticator.getResources().get(path)); +// if (!authenticator.getResources().containsKey(path)) throw new FileNotFoundException(); +// return new ByteArrayInputStream(authenticator.getResources().get(path)); } throw new FileNotFoundException(); } diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/url/DGStreamHandler.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/url/DGStreamHandler.java index 82ddff18..82ddff18 100755 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/url/DGStreamHandler.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/url/DGStreamHandler.java diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/url/DGStreamHandlerFactory.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/url/DGStreamHandlerFactory.java index a7b50046..a7b50046 100755 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/url/DGStreamHandlerFactory.java +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/url/DGStreamHandlerFactory.java diff --git a/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/util/QRCodeGenerator.java b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/util/QRCodeGenerator.java new file mode 100644 index 00000000..d0c3306a --- /dev/null +++ b/loader/src/main/java/kr/syeyoung/dungeonsguide/launcher/util/QRCodeGenerator.java @@ -0,0 +1,43 @@ +/* + * Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod + * Copyright (C) 2021 cyoung06 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published + * by the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +package kr.syeyoung.dungeonsguide.launcher.util; + +import io.nayuki.qrcodegen.QrCode; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.zip.GZIPOutputStream; + +public class QRCodeGenerator { + public static BufferedImage generateQRCode(byte[] bytes) throws IOException { + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + GZIPOutputStream gzipOutputStream = new GZIPOutputStream(byteArrayOutputStream); + gzipOutputStream.write(bytes); + gzipOutputStream.flush(); + gzipOutputStream.close(); + + + byte[] array = byteArrayOutputStream.toByteArray(); + + QrCode qrCode = QrCode.encodeBinary(array, QrCode.Ecc.LOW); + return qrCode.toImage(1, 0); + } +} diff --git a/wrapper/src/main/resources/mcmod.info b/loader/src/main/resources/mcmod.info index 70df65aa..70df65aa 100755 --- a/wrapper/src/main/resources/mcmod.info +++ b/loader/src/main/resources/mcmod.info diff --git a/mod/.gitignore b/mod/.gitignore new file mode 100755 index 00000000..d2944636 --- /dev/null +++ b/mod/.gitignore @@ -0,0 +1,41 @@ +.gradle +.idea + +eclipse/* + +build/* +jars/* +runtime/logs/* +runtime/config/* +runtime/crash-reports/* +run/* +runtime/screenshots/* +DEBUG/* +sdk/* +essential/* +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +runtime/modsss/* +/modcore/config.toml +/modcore/Sk1er Modcore-0.1.47 (1.8.9).jar +/.mixin.out/audit/mixin_implementation_report.csv +/.mixin.out/audit/mixin_implementation_report.txt +/modcore/metadata.json +/runtime/.ReAuth.cfg +/libdiscord-rpc.so + +runtime/options.txt +runtime/servers.dat +/runtime/saves/* +/runtime/usernamecache.json +/runtime/usercache.json diff --git a/mod/build.gradle b/mod/build.gradle index bae9614d..bbbc033a 100644 --- a/mod/build.gradle +++ b/mod/build.gradle @@ -1,63 +1,90 @@ -buildscript { - repositories { - gradlePluginPortal() - mavenCentral() - maven { - name = "forge" - url = "https://maven.minecraftforge.net/" - } - maven { url "https://jitpack.io" } - } - dependencies { - classpath "com.github.Skytils:ForgeGradle:6f5327" - classpath "com.github.jengelman.gradle.plugins:shadow:6.1.0" - } - +plugins { + id "idea" + id "java" + id "com.github.johnrengelman.shadow" version "7.1.2" + id "dev.architectury.architectury-pack200" version "0.1.3" + id "gg.essential.loom" version "0.10.0.+" } -apply plugin: "net.minecraftforge.gradle.forge" -apply plugin: "com.github.johnrengelman.shadow" -apply plugin: "java" -version = "3.0" +version = "4.0.0" group = "kr.syeyoung.dungeonsguide" archivesBaseName = "dungeonsguide" -sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 +java { + toolchain.languageVersion.set(JavaLanguageVersion.of(8)) +} -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" +loom { + launchConfigs { + "client" { + // probably will have to my own mixin tweaker, due to dungeonsguide's weird dynamic loading stuff +// property("mixin.debug", "true") +// property("asmhelper.verbose", "true") +// arg("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker") +// arg("--mixin", "mixins.examplemod.json") + } + } + forge { + pack200Provider.set(new dev.architectury.pack200.java.Pack200Adapter()) + } } -minecraft { - version = "1.8.9-11.15.1.2318-1.8.9" - runDir = "run" - mappings = "stable_22" - makeObfSourceJar = false +sourceSets.main { + output.setResourcesDir(file("$buildDir/classes/java/main")) } + repositories { mavenCentral() maven { url "https://jitpack.io" } } + +configurations { + implementation.extendsFrom shadowImpl +} + + dependencies { + minecraft("com.mojang:minecraft:1.8.9") + mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9") + forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9") + + implementation "org.jetbrains:annotations-java5:19.0.0" implementation "org.java-websocket:Java-WebSocket:1.5.1" implementation "org.json:json:20171018" implementation "com.twelvemonkeys.imageio:imageio-bmp:3.7.0" - compileOnly project(':wrapper') + compileOnly project(':loader') compileOnly "org.projectlombok:lombok:1.18.20" - compileOnly files("mods/Hychat-1.12.1-BETA.jar") + compileOnly files("../jars/Hychat-1.12.1-BETA.jar") annotationProcessor "org.projectlombok:lombok:1.18.16" testCompileOnly "org.projectlombok:lombok:1.18.20" testAnnotationProcessor "org.projectlombok:lombok:1.18.20" } -shadowJar { +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} + +tasks.withType(Jar) { + archiveBaseName = "examplemod" + manifest { + attributes["FMLCorePluginContainsFMLMod"] = "true" + attributes["ForceLoadAsMod"] = "true" + + // If you don't want mixins, remove these lines +// this["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker" +// this["MixinConfigs"] = "mixins.examplemod.json" + } +} + + +tasks.shadowJar { archiveFileName = jar.archiveFileName @@ -71,15 +98,11 @@ shadowJar { } } -reobf { - shadowJar { - mappingType = "SEARGE" - } +tasks.named("remapJar") { + archiveClassifier = "all" + from(tasks.shadowJar) + input = tasks.shadowJar.archiveFile } -processResources { - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude "mcmod.info" - } -}
\ No newline at end of file + +tasks.assemble.dependsOn tasks.remapJar diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/chat/PartyManager.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/chat/PartyManager.java index f1a40098..3053c74c 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/chat/PartyManager.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/chat/PartyManager.java @@ -21,6 +21,7 @@ package kr.syeyoung.dungeonsguide.chat; import kr.syeyoung.dungeonsguide.DungeonsGuide; import kr.syeyoung.dungeonsguide.events.HypixelJoinedEvent; import kr.syeyoung.dungeonsguide.events.StompConnectedEvent; +import kr.syeyoung.dungeonsguide.stomp.*; import kr.syeyoung.dungeonsguide.utils.TextUtils; import lombok.Getter; import lombok.Setter; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/cosmetics/CosmeticsManager.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/cosmetics/CosmeticsManager.java index c91a0895..790a3bee 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/cosmetics/CosmeticsManager.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/cosmetics/CosmeticsManager.java @@ -23,6 +23,7 @@ import kr.syeyoung.dungeonsguide.DungeonsGuide; import kr.syeyoung.dungeonsguide.cosmetics.chatreplacers.*; import kr.syeyoung.dungeonsguide.events.PlayerListItemPacketEvent; import kr.syeyoung.dungeonsguide.events.StompConnectedEvent; +import kr.syeyoung.dungeonsguide.stomp.*; import lombok.Getter; import lombok.Setter; import net.minecraft.client.Minecraft; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoom.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoom.java index 83dbb889..dfdd59cb 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoom.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoom.java @@ -29,6 +29,7 @@ import kr.syeyoung.dungeonsguide.dungeon.DungeonContext; import kr.syeyoung.dungeonsguide.dungeon.MapProcessor; import kr.syeyoung.dungeonsguide.dungeon.doorfinder.DungeonDoor; import kr.syeyoung.dungeonsguide.features.FeatureRegistry; +import kr.syeyoung.dungeonsguide.pathfinding.*; import kr.syeyoung.dungeonsguide.roomedit.EditingContext; import kr.syeyoung.dungeonsguide.roomprocessor.ProcessorFactory; import kr.syeyoung.dungeonsguide.roomprocessor.RoomProcessor; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/DungeonListener.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/DungeonListener.java index 21ea0bb4..ba126ac7 100755 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/DungeonListener.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/DungeonListener.java @@ -25,6 +25,7 @@ import kr.syeyoung.dungeonsguide.dungeon.DungeonContext; import kr.syeyoung.dungeonsguide.dungeon.DungeonActionManager; import kr.syeyoung.dungeonsguide.dungeon.doorfinder.DungeonDoor; import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom; +import kr.syeyoung.dungeonsguide.events.*; import kr.syeyoung.dungeonsguide.features.FeatureRegistry; import kr.syeyoung.dungeonsguide.roomedit.EditingContext; import kr.syeyoung.dungeonsguide.roomedit.gui.GuiDungeonAddSet; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/FeatureListener.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/FeatureListener.java index cc9fe5b6..9df4498a 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/FeatureListener.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/FeatureListener.java @@ -21,6 +21,9 @@ package kr.syeyoung.dungeonsguide.eventlistener; import kr.syeyoung.dungeonsguide.DungeonsGuide; import kr.syeyoung.dungeonsguide.SkyblockStatus; import kr.syeyoung.dungeonsguide.config.guiconfig.location.GuiGuiLocationConfig; +import kr.syeyoung.dungeonsguide.events.*; +import kr.syeyoung.dungeonsguide.features.FeatureRegistry; +import kr.syeyoung.dungeonsguide.features.GuiFeature; import kr.syeyoung.dungeonsguide.features.listener.*; import kr.syeyoung.dungeonsguide.features.AbstractFeature; import kr.syeyoung.dungeonsguide.features.listener.*; diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/PacketListener.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/PacketListener.java index 3ae0b7f5..183f7f6c 100644 --- a/mod/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/PacketListener.java +++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/eventlistener/PacketListener.java @@ -25,6 +25,10 @@ import io.netty.channel.ChannelPromise; import kr.syeyoung.dungeonsguide.SkyblockStatus; import kr.syeyoung.dungeonsguide.DungeonsGuide; import kr.syeyoung.dungeonsguide.cosmetics.CustomPacketPlayerListItem; +import kr.syeyoung.dungeonsguide.events.BlockUpdateEvent; +import kr.syeyoung.dungeonsguide.events.PlayerInteractEntityEvent; +import kr.syeyoung.dungeonsguide.events.TitleEvent; +import kr.syeyoung.dungeonsguide.events.WindowUpdateEvent; import kr.syeyoung.dungeonsguide.features.FeatureRegistry; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; diff --git a/runtime/.mixin.out/audit/mixin_implementation_report.csv b/runtime/.mixin.out/audit/mixin_implementation_report.csv new file mode 100644 index 00000000..41cb2712 --- /dev/null +++ b/runtime/.mixin.out/audit/mixin_implementation_report.csv @@ -0,0 +1 @@ +Class,Method,Signature,Interface diff --git a/runtime/.mixin.out/audit/mixin_implementation_report.txt b/runtime/.mixin.out/audit/mixin_implementation_report.txt new file mode 100644 index 00000000..2501c7b4 --- /dev/null +++ b/runtime/.mixin.out/audit/mixin_implementation_report.txt @@ -0,0 +1 @@ +Mixin Implementation Report generated on 2022-05-21 23:55:14 diff --git a/settings.gradle b/settings.gradle index 0d9b8e6b..a3178245 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,24 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + maven{ url "https://oss.sonatype.org/content/repositories/snapshots"} + maven{ url "https://maven.architectury.dev/"} + maven{ url "https://maven.fabricmc.net"} + maven{ url "https://maven.minecraftforge.net/"} + maven{ url "https://repo.spongepowered.org/maven/"} + maven{ url "https://repo.sk1er.club/repository/maven-releases/"} + } + resolutionStrategy { + eachPlugin { + if (requested.id.id == "gg.essential.loom") { + useModule("gg.essential:architectury-loom:${requested.version}") + } + } + } +} + + include 'mod' -include 'wrapper' +include 'loader' diff --git a/wrapper/build.gradle b/wrapper/build.gradle deleted file mode 100644 index 13ea4088..00000000 --- a/wrapper/build.gradle +++ /dev/null @@ -1,89 +0,0 @@ - - -buildscript { - repositories { - gradlePluginPortal() - mavenCentral() - maven { - name = "forge" - url = "https://maven.minecraftforge.net/" - } - maven { url "https://jitpack.io" } - } - dependencies { - classpath "com.github.Skytils:ForgeGradle:6f5327" - classpath "com.github.jengelman.gradle.plugins:shadow:6.1.0" - } -} -apply plugin: "net.minecraftforge.gradle.forge" -apply plugin: "com.github.johnrengelman.shadow" -apply plugin: "java" - - -version = "3.0" -group = "kr.syeyoung.dungeonsguide" -archivesBaseName = "dungeonsguide" - -sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8 - -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" -} - -minecraft { - version = "1.8.9-11.15.1.2318-1.8.9" - runDir = "run" - - mappings = "stable_22" - makeObfSourceJar = false -} - -repositories { - mavenCentral() - maven { url "https://jitpack.io" } -} -dependencies { - implementation "org.jetbrains:annotations-java5:19.0.0" - implementation "org.json:json:20171018" - - - compileOnly "org.projectlombok:lombok:1.18.20" - annotationProcessor "org.projectlombok:lombok:1.18.16" - - testCompileOnly "org.projectlombok:lombok:1.18.20" - testAnnotationProcessor "org.projectlombok:lombok:1.18.20" -} - -shadowJar { - - archiveFileName = jar.archiveFileName - - dependencies { - include(dependency("org.json:json:20171018")) - } -} - -reobf { - shadowJar { - mappingType = "SEARGE" - } -} - -processResources { - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include "mcmod.info" - - // replace version and mcversion - expand "version": project.version, "mcversion": project.minecraft.version - } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude "mcmod.info" - } -}
\ No newline at end of file diff --git a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/GuiLoadingError.java b/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/GuiLoadingError.java deleted file mode 100644 index 965f9163..00000000 --- a/wrapper/src/main/java/kr/syeyoung/dungeonsguide/launcher/GuiLoadingError.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Dungeons Guide - The most intelligent Hypixel Skyblock Dungeons Mod - * Copyright (C) 2021 cyoung06 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <https://www.gnu.org/licenses/>. - */ - -package kr.syeyoung.dungeonsguide.launcher; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.*; -import net.minecraftforge.fml.common.FMLCommonHandler; -import org.lwjgl.opengl.GL11; - -import java.io.IOException; - -public class GuiLoadingError extends GuiScreen { - private String stacktrace; - private Throwable throwable; - private GuiScreen originalGUI; - public GuiLoadingError(Throwable t, String stacktrace, GuiScreen originalGUI) { - this.throwable = t; - this.stacktrace = stacktrace; - this.originalGUI = originalGUI; - } - - @Override - public void initGui() { - ScaledResolution sr = new ScaledResolution(Minecraft.getMinecraft()); - this.buttonList.add(new GuiButton(0, sr.getScaledWidth()/2-100,sr.getScaledHeight()-70 ,"Close Minecraft")); - this.buttonList.add(new GuiButton(1, sr.getScaledWidth()/2-100,sr.getScaledHeight()-40 ,"Play Without DG")); - } - - @Override - protected void actionPerformed(GuiButton button) throws IOException { - super.actionPerformed(button); - if (button.id == 0) { - FMLCommonHandler.instance().exitJava(-1,true); - } else if (button.id == 1) { - Minecraft.getMinecraft().displayGuiScreen(originalGUI); - } - } - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { - super.drawBackground(1); - - ScaledResolution sr = new ScaledResolution(Minecraft.getMinecraft()); - FontRenderer fontRenderer = Minecraft.getMinecraft().fontRendererObj; - fontRenderer.drawString("DungeonsGuide has ran into error while loading itself", (sr.getScaledWidth()-fontRenderer.getStringWidth("DungeonsGuide has ran into error while loading itself"))/2,40,0xFFFF0000); - fontRenderer.drawString("Please contact DungeonsGuide support with this screen", (sr.getScaledWidth()-fontRenderer.getStringWidth("Please contact developer with this screen"))/2, (int) (40+fontRenderer.FONT_HEIGHT*1.5),0xFFFF0000); - - int tenth = sr.getScaledWidth() / 10; - - Gui.drawRect(tenth, 70,sr.getScaledWidth()-tenth, sr.getScaledHeight()-80, 0xFF5B5B5B); - String[] split = stacktrace.split("\n"); - clip(sr, tenth, 70,sr.getScaledWidth()-2*tenth, sr.getScaledHeight()-150); - GL11.glEnable(GL11.GL_SCISSOR_TEST); - for (int i = 0; i < split.length; i++) { - fontRenderer.drawString(split[i].replace("\t", " "), tenth+2,i*fontRenderer.FONT_HEIGHT + 72, 0xFFFFFFFF); - } - GL11.glDisable(GL11.GL_SCISSOR_TEST); - - super.drawScreen(mouseX, mouseY, partialTicks); - } - - public static void clip(ScaledResolution resolution, int x, int y, int width, int height) { - if (width < 0 || height < 0) return; - - int scale = resolution.getScaleFactor(); - GL11.glScissor((x ) * scale, Minecraft.getMinecraft().displayHeight - (y + height) * scale, (width) * scale, height * scale); - } -} |