Compare commits
No commits in common. "e41df01aa998dba7e7f042125124b7119aed68b6" and "c94f03e0e06183ee1789c33f4f9853c5a2208fc4" have entirely different histories.
e41df01aa9
...
c94f03e0e0
49
.github/workflows/build.yml
vendored
49
.github/workflows/build.yml
vendored
|
|
@ -1,49 +0,0 @@
|
|||
name: Build
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
- name: Setup java
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
distribution: "temurin"
|
||||
java-version: "21"
|
||||
cache: "gradle"
|
||||
- name: Validate Gradle wrapper
|
||||
uses: gradle/actions/wrapper-validation@v3
|
||||
- name: Compile code to javascript
|
||||
run: ./gradlew generateJavaScript
|
||||
- name: Compile assets
|
||||
run: bash ./CompileEPK.sh
|
||||
- name: Zip web files
|
||||
run: zip -r web_files.zip javascript/*
|
||||
- name: Upload github-pages artifact
|
||||
if: github.ref == 'refs/heads/main'
|
||||
uses: actions/upload-pages-artifact@v3
|
||||
with:
|
||||
path: javascript/
|
||||
- name: Commit changes
|
||||
if: github.ref == 'refs/heads/main' # this is a temporary fix, and wont work on other branches; find a way to trigger on push and not pull request
|
||||
uses: stefanzweifel/git-auto-commit-action@v5
|
||||
|
||||
deploy:
|
||||
needs: build
|
||||
if: github.ref == 'refs/heads/main'
|
||||
concurrency:
|
||||
group: "pages"
|
||||
permissions:
|
||||
pages: write
|
||||
id-token: write
|
||||
environment:
|
||||
name: github-pages
|
||||
url: ${{ steps.deployment.outputs.page_url }}
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Deploy to github pages
|
||||
uses: actions/deploy-pages@v4
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 475 B |
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -1,7 +1,5 @@
|
|||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
|||
284
gradlew
vendored
Executable file → Normal file
284
gradlew
vendored
Executable file → Normal file
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
#!/usr/bin/env sh
|
||||
|
||||
#
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
# Copyright 2015 the original author or authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
|
|
@ -17,111 +17,78 @@
|
|||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# 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/HEAD/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/.
|
||||
#
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
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
|
||||
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
|
||||
|
||||
# This is normally unused
|
||||
# shellcheck disable=SC2034
|
||||
APP_BASE_NAME=${0##*/}
|
||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||
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='"-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 ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
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
|
||||
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
|
||||
|
|
@ -130,120 +97,87 @@ Please set the JAVA_HOME variable in your environment to match the
|
|||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
if ! command -v java >/dev/null 2>&1
|
||||
then
|
||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
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
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||
# shellcheck disable=SC2039,SC3045
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
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
|
||||
|
||||
# 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 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 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" )
|
||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
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
|
||||
# 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
|
||||
# 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=`expr $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
|
||||
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
APP_ARGS=`save "$@"`
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Collect all arguments for the java command:
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||
# and any embedded shellness will be escaped.
|
||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||
# treated as '${Hostname}' itself on the command line.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Stop when "xargs" is not available.
|
||||
if ! command -v xargs >/dev/null 2>&1
|
||||
then
|
||||
die "xargs is not available"
|
||||
fi
|
||||
|
||||
# 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' ' '
|
||||
)" '"$@"'
|
||||
# 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"
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
|
|
|
|||
58
gradlew.bat
vendored
58
gradlew.bat
vendored
|
|
@ -14,7 +14,7 @@
|
|||
@rem limitations under the License.
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
|
|
@ -25,14 +25,10 @@
|
|||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@rem This is normally unused
|
||||
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="-Xmx64m" "-Xms64m"
|
||||
|
||||
|
|
@ -41,13 +37,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
|||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if %ERRORLEVEL% equ 0 goto execute
|
||||
if "%ERRORLEVEL%" == "0" goto init
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
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
|
||||
|
||||
|
|
@ -55,36 +51,48 @@ goto fail
|
|||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
if exist "%JAVA_EXE%" goto init
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
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 %*
|
||||
"%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% equ 0 goto mainEnd
|
||||
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!
|
||||
set EXIT_CODE=%ERRORLEVEL%
|
||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||
exit /b %EXIT_CODE%
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
|
|
|||
|
|
@ -410,9 +410,6 @@ function displayGui() {
|
|||
addBtn.innerHTML = "Add new";
|
||||
addBtn.addEventListener("click", () => {
|
||||
var newMod = window.prompt("URL of Mod: ", "http://example.com/example.js");
|
||||
if (!newMod) {
|
||||
return; //User pressed cancel
|
||||
}
|
||||
Mods.push(
|
||||
newMod
|
||||
);
|
||||
|
|
@ -522,7 +519,7 @@ ${classes_js}
|
|||
setTimeout(() => { document.getElementById("launch_countdown_screen").remove(); main(); }, 50);
|
||||
}
|
||||
</script>
|
||||
<link type="image/png" rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABB0lEQVQ4y52TvU7DMBSFP0dean4nRogqpKpFYuGNOuQNEF0QZUGwMTP0sSp1qQQjD9DNPgyJIzukVCSSpdzznXt95WsbgOfZTAz4ntZrY5bT6aBkAAHWD06vS1gptGG12GT443XSq0cmA4UXePWbqsWGfR16QRDYQO6YP1wAsHr7BiDlkQHcnQsENhw4g3281oX1hAzcnp02f3UHKY9dvb9c4wkYgVVnh0NxqgWEDR3HX3E8g5sTNYX+WaCriZ4p3D9uc3PCJ8dHuSYovISXshGlLfukg+htF2CqshTAdrfrHdfYuZaNncuYAYrQ3Khy5H4llyOX3YPojctLGID55dWgJ7X6+jQ/jsSgi/K94KoAAAAASUVORK5CYII=" />
|
||||
<link type="image/png" rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAR/SURBVEhLtZXZK3ZRFMYPcqXc+gv413DHxVuGIpIhkciQWaRccCNjSCkligwXSOZ5nmfv9zvn2e8+58V753sudmuvvdZ61l5r7XOc8H+GS/D19aUNkPz5+aktQH5/f//4+LBKZKuRkpUtQjCUYG5gD2T38vLy/PwsDfL9/f3Dw8PT05M0b29vnKLhCKCBT4L4gvBLBIei4//4+Hh1dUVEQutUuLu7E83FxQUGnKLBWKfQaA3S+AREVxaEOD8/Pzk50XpzcyMDcH19zdZG3N3d3dzc3Nvb01aX5pQUpQGGQJxcQpfNysoKhUIdHR1o1tbWbInYAgxIPDMzMy8vLzc3FxqOdMoRqwJK8G8ALUYIhHMiSEhIwI6CyIb0qQzC4eGhsXCc1tZWnZIEKzdQJQSXgKxfX18RCM3Z5eWlcfVAxKOjo+Pj49PTU88lTOk2NjbMsePc3t6SAfcgFdszOyMuAdeBg0CQi2lhYUHOeOLDCisN8FzcPFZXV3t7ezHY3t5GQ+6it+2xMASsKhEEWKsmRLRBBUpPvpJ/TpFKFBwKYAiITmicsbYhdHfJAltqhUCVsCQhwslmeXmZxiBQT9c0Ar9E2O3v72sYSE0N1yQArkKy0kBMXLqlZqIZHR3t6empqqqSDcBdhXEJSJ/bUc3q6uq+vj629GB9fR1WsLW1NTs7u7S0RN2locMjIyOEm5ubQ7+4uJienk4/+vv77Y1hwhLBEKhwWHitdVFfX9/Y2Gg2HuLi4owUAysrK8yCG97rh0+ApP5Q2ZycHFlPTExUVFRIBvn5+WhKSkp2dnaMKhptbW2426GgQ/rwuAQCZ1hwFayLiork9hMFBQV1dXVmE0BLS4vqw3QFB8kn4IAxoGPkYpxi4FeDmpqas7Mz4pClAgqGwD48rjY2NmacYqC0tJQ1KSlJWyE5OZkpUKkBAxZVIntAoZh04+Q48fHxPNGBgYHExMT29naj9cBodnZ2mo3jlJWVMeW2OGQck4B1amqqoaGhqamJjx2lGxwcpL0mUgR8fJhsWqJtSkoKU2SbHHUDpkhPBujd8xuQG6PJRM/Pz09PT7O1NNnZ2Tw3fgZkXVhYKCUlUhBATP+hCVyKZGky17RV0g04laayslJ6hlVeFHB4eFhKaogGd0LxtmTgE+hbhKDnPjMzgw8E3qGL2tpaBWpubjYqj2BoaEj6rq4uNATRZ0ZwCbiL6gXEzINk5vCBQJ9rMD4+rkA8QNK036uDg4Py8vLu7m680KjIBNR3zBDoWQM1g98snyB+VSoRW8C/UwR81/SvhgNj9JOTkwwVERUdRBEI0BAdLRVERkhLS8vIyEDQlrsTPTU1lVFhKxARvZgUlFLbegCf4BvIsbi4mIg4E5EogIHhiKCMtU0WUFiVy06j5fAJIDdSBDQw+PegDfBRcbOPwH4F9LuFWIIQdQNKwWqzIE0aoFUaBsw+SQuFw0uNtC9A+F4i3QNrbg3IDn+SAsHh+wYiEpeyBEMLv/cAO6KzAijxxB+Y4wisBhssJUhjEbPJf4Nw+B+JXqLW3bw+wQAAAABJRU5ErkJggg==" />
|
||||
</head>
|
||||
<body style="margin:0px;width:100vw;height:100vh;overflow:hidden;" id="game_frame">
|
||||
<div style="margin:0px;width:100%;height:100%;font-family:sans-serif;display:flex;align-items:center;user-select:none;" id="launch_countdown_screen">
|
||||
|
|
|
|||
Binary file not shown.
114213
javascript/classes.js
114213
javascript/classes.js
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
Binary file not shown.
|
Before Width: | Height: | Size: 320 B After Width: | Height: | Size: 1.2 KiB |
|
|
@ -385,9 +385,6 @@ function displayGui() {
|
|||
addBtn.innerHTML = "Add new";
|
||||
addBtn.addEventListener("click", () => {
|
||||
var newMod = window.prompt("URL of Mod: ", "http://example.com/example.js");
|
||||
if (!newMod) {
|
||||
return; //User pressed cancel
|
||||
}
|
||||
Mods.push(
|
||||
newMod
|
||||
);
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ public class GameSettings {
|
|||
public boolean viewBobbing = true;
|
||||
public boolean anaglyph;
|
||||
public boolean fboEnable = true;
|
||||
public int limitFramerate = 120;
|
||||
public int limitFramerate = 260;
|
||||
/**+
|
||||
* Clouds flag
|
||||
*/
|
||||
|
|
@ -298,7 +298,6 @@ public class GameSettings {
|
|||
this.language = EagRuntime.getConfiguration().getDefaultLocale();
|
||||
this.forceUnicodeFont = false;
|
||||
this.mc = mcIn;
|
||||
this.limitFramerate = (int)GameSettings.Options.FRAMERATE_LIMIT.getValueMax();
|
||||
GameSettings.Options.RENDER_DISTANCE.setValueMax(18.0F);
|
||||
|
||||
this.renderDistanceChunks = 4;
|
||||
|
|
@ -355,12 +354,6 @@ public class GameSettings {
|
|||
|
||||
if (parOptions == GameSettings.Options.FRAMERATE_LIMIT) {
|
||||
this.limitFramerate = (int) parFloat1;
|
||||
this.enableVsync = false;
|
||||
|
||||
if (this.limitFramerate <= 0) {
|
||||
this.limitFramerate = (int)GameSettings.Options.FRAMERATE_LIMIT.getValueMax();
|
||||
this.enableVsync = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (parOptions == GameSettings.Options.CHAT_OPACITY) {
|
||||
|
|
@ -929,6 +922,10 @@ public class GameSettings {
|
|||
this.mc.getRenderManager().setEnableFNAWSkins(this.mc.getEnableFNAWSkins());
|
||||
}
|
||||
|
||||
if (parOptions == GameSettings.Options.EAGLER_VSYNC) {
|
||||
this.enableVsync = !this.enableVsync;
|
||||
}
|
||||
|
||||
if(parOptions == GameSettings.Options.FULLBRIGHT) {
|
||||
this.fullBright = !this.fullBright;
|
||||
}
|
||||
|
|
@ -974,7 +971,7 @@ public class GameSettings {
|
|||
: (parOptions == GameSettings.Options.CHAT_HEIGHT_UNFOCUSED ? this.chatHeightUnfocused
|
||||
: (parOptions == GameSettings.Options.CHAT_SCALE ? this.chatScale
|
||||
: (parOptions == GameSettings.Options.CHAT_WIDTH ? this.chatWidth
|
||||
: (parOptions == GameSettings.Options.FRAMERATE_LIMIT ? ((float)this.limitFramerate == GameSettings.Options.FRAMERATE_LIMIT.getValueMax() && this.enableVsync ? 0.0F : (float)this.limitFramerate)
|
||||
: (parOptions == GameSettings.Options.FRAMERATE_LIMIT ? (float) this.limitFramerate
|
||||
: (parOptions == GameSettings.Options.MIPMAP_LEVELS ? (float) this.mipmapLevels
|
||||
: (parOptions == GameSettings.Options.RENDER_DISTANCE ? (float) this.renderDistanceChunks
|
||||
: (parOptions == GameSettings.Options.AO_LEVEL ? this.ofAoLevel
|
||||
|
|
@ -1085,6 +1082,8 @@ public class GameSettings {
|
|||
return hidePassword;
|
||||
case FNAW_SKINS:
|
||||
return this.enableFNAWSkins;
|
||||
case EAGLER_VSYNC:
|
||||
return this.enableVsync;
|
||||
case FULLBRIGHT:
|
||||
return this.fullBright;
|
||||
case LEFT_HAND:
|
||||
|
|
@ -1138,7 +1137,7 @@ public class GameSettings {
|
|||
float f = parOptions.normalizeValue(f1);
|
||||
return parOptions == GameSettings.Options.SENSITIVITY ? (f == 0.0F ? s + I18n.format("options.sensitivity.min", new Object[0]) : (f == 1.0F ? s + I18n.format("options.sensitivity.max", new Object[0]) : s + (int) (f * 200.0F) + "%"))
|
||||
: (parOptions == GameSettings.Options.FOV ? (f1 == 70.0F ? s + I18n.format("options.fov.min", new Object[0]) : (f1 == 110.0F ? s + I18n.format("options.fov.max", new Object[0]) : s + (int) f1))
|
||||
: (parOptions == GameSettings.Options.FRAMERATE_LIMIT ? (f1 == 0.0f ? s + "VSync" : f1 == parOptions.valueMax ? s + I18n.format("options.framerateLimit.max", new Object[0]) : s + (int)f1 + " fps")
|
||||
: (parOptions == GameSettings.Options.FRAMERATE_LIMIT ? (f1 == parOptions.valueMax ? s + I18n.format("options.framerateLimit.max", new Object[0]) : s + (int) f1 + " fps")
|
||||
: (parOptions == GameSettings.Options.RENDER_CLOUDS ? (f1 == parOptions.valueMin ? s + I18n.format("options.cloudHeight.min", new Object[0]) : s + ((int) f1 + 128))
|
||||
: (parOptions == GameSettings.Options.GAMMA ? (f == 0.0F ? s + I18n.format("options.gamma.min", new Object[0]) : (f == 1.0F ? s + I18n.format("options.gamma.max", new Object[0]) : s + "+" + (int) (f * 100.0F) + "%"))
|
||||
: (parOptions == GameSettings.Options.SATURATION ? s + (int) (f * 400.0F) + "%"
|
||||
|
|
@ -1455,12 +1454,6 @@ public class GameSettings {
|
|||
|
||||
if (astring[0].equals("maxFps")) {
|
||||
this.limitFramerate = Integer.parseInt(astring[1]);
|
||||
this.enableVsync = false;
|
||||
|
||||
if (this.limitFramerate <= 0) {
|
||||
this.limitFramerate = (int)GameSettings.Options.FRAMERATE_LIMIT.getValueMax();
|
||||
this.enableVsync = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (astring[0].equals("fboEnable")) {
|
||||
|
|
@ -1565,7 +1558,7 @@ public class GameSettings {
|
|||
}
|
||||
|
||||
if (astring[0].equals("enableVsyncEag")) {
|
||||
//this.enableVsync = astring[1].equals("true");
|
||||
this.enableVsync = astring[1].equals("true");
|
||||
}
|
||||
|
||||
if (astring[0].equals("hideServerAddress")) {
|
||||
|
|
@ -2106,7 +2099,7 @@ public class GameSettings {
|
|||
printwriter.println("chatLinksPrompt:" + this.chatLinksPrompt);
|
||||
printwriter.println("chatOpacity:" + this.chatOpacity);
|
||||
printwriter.println("snooperEnabled:" + this.snooperEnabled);
|
||||
//printwriter.println("enableVsyncEag:" + this.enableVsync);
|
||||
printwriter.println("enableVsyncEag:" + this.enableVsync);
|
||||
printwriter.println("hideServerAddress:" + this.hideServerAddress);
|
||||
printwriter.println("advancedItemTooltips:" + this.advancedItemTooltips);
|
||||
printwriter.println("pauseOnLostFocus:" + this.pauseOnLostFocus);
|
||||
|
|
@ -2315,7 +2308,7 @@ public class GameSettings {
|
|||
RENDER_DISTANCE("options.renderDistance", true, false, 1.0F, 16.0F, 1.0F),
|
||||
VIEW_BOBBING("options.viewBobbing", false, true),
|
||||
ANAGLYPH("options.anaglyph", false, true),
|
||||
FRAMERATE_LIMIT("options.framerateLimit", true, false, 0.0F, 260.0F, 5.0F),
|
||||
FRAMERATE_LIMIT("options.framerateLimit", true, false, 10.0F, 260.0F, 10.0F),
|
||||
FBO_ENABLE("options.fboEnable", false, true),
|
||||
RENDER_CLOUDS("options.renderClouds", false, false),
|
||||
GRAPHICS("options.graphics", false, false),
|
||||
|
|
@ -2419,6 +2412,7 @@ public class GameSettings {
|
|||
CUSTOM_COLORS("Custom Colors", false, false),
|
||||
HIDE_PASSWORD("Hide Password", false, false),
|
||||
FNAW_SKINS("options.skinCustomisation.enableFNAWSkins", false, true),
|
||||
EAGLER_VSYNC("options.vsync", false, true),
|
||||
FULLBRIGHT("Fullbright", false, true),
|
||||
LEFT_HAND("Main Hand", false, true),
|
||||
ENTITY_CULLING("Entity Culling", false, true),
|
||||
|
|
|
|||
|
|
@ -20,29 +20,28 @@ import net.minecraft.util.ResourceLocation;
|
|||
public enum DefaultCapes {
|
||||
|
||||
NO_CAPE(0, "No Cape", null),
|
||||
OPTIFINE(1, "Optifine", new ResourceLocation("eagler:capes/optifine.png")),
|
||||
MINECON_2011(2, "Minecon 2011", new ResourceLocation("eagler:capes/01.minecon_2011.png")),
|
||||
MINECON_2012(3, "Minecon 2012", new ResourceLocation("eagler:capes/02.minecon_2012.png")),
|
||||
MINECON_2013(4, "Minecon 2013", new ResourceLocation("eagler:capes/03.minecon_2013.png")),
|
||||
MINECON_2015(5, "Minecon 2015", new ResourceLocation("eagler:capes/04.minecon_2015.png")),
|
||||
MINECON_2016(6, "Minecon 2016", new ResourceLocation("eagler:capes/05.minecon_2016.png")),
|
||||
MICROSOFT_ACCOUNT(7, "Microsoft Account", new ResourceLocation("eagler:capes/06.microsoft_account.png")),
|
||||
MAPMAKER(8, "Realms Mapmaker", new ResourceLocation("eagler:capes/07.mapmaker.png")),
|
||||
MOJANG_OLD(9, "Mojang Old", new ResourceLocation("eagler:capes/08.mojang_old.png")),
|
||||
MOJANG_NEW(10, "Mojang New", new ResourceLocation("eagler:capes/09.mojang_new.png")),
|
||||
JIRA_MOD(11, "Jira Moderator", new ResourceLocation("eagler:capes/10.jira_mod.png")),
|
||||
MOJANG_VERY_OLD(12, "Mojang Very Old", new ResourceLocation("eagler:capes/11.mojang_very_old.png")),
|
||||
SCROLLS(13, "Scrolls", new ResourceLocation("eagler:capes/12.scrolls.png")),
|
||||
COBALT(14, "Cobalt", new ResourceLocation("eagler:capes/13.cobalt.png")),
|
||||
TRANSLATOR(15, "Lang Translator", new ResourceLocation("eagler:capes/14.translator.png")),
|
||||
MILLIONTH_ACCOUNT(16, "Millionth Player", new ResourceLocation("eagler:capes/15.millionth_account.png")),
|
||||
PRISMARINE(17, "Prismarine", new ResourceLocation("eagler:capes/16.prismarine.png")),
|
||||
SNOWMAN(18, "Snowman", new ResourceLocation("eagler:capes/17.snowman.png")),
|
||||
SPADE(19, "Spade", new ResourceLocation("eagler:capes/18.spade.png")),
|
||||
BIRTHDAY(20, "Birthday", new ResourceLocation("eagler:capes/19.birthday.png")),
|
||||
DB(21, "dB", new ResourceLocation("eagler:capes/20.db.png"));
|
||||
MINECON_2011(1, "Minecon 2011", new ResourceLocation("eagler:capes/01.minecon_2011.png")),
|
||||
MINECON_2012(2, "Minecon 2012", new ResourceLocation("eagler:capes/02.minecon_2012.png")),
|
||||
MINECON_2013(3, "Minecon 2013", new ResourceLocation("eagler:capes/03.minecon_2013.png")),
|
||||
MINECON_2015(4, "Minecon 2015", new ResourceLocation("eagler:capes/04.minecon_2015.png")),
|
||||
MINECON_2016(5, "Minecon 2016", new ResourceLocation("eagler:capes/05.minecon_2016.png")),
|
||||
MICROSOFT_ACCOUNT(6, "Microsoft Account", new ResourceLocation("eagler:capes/06.microsoft_account.png")),
|
||||
MAPMAKER(7, "Realms Mapmaker", new ResourceLocation("eagler:capes/07.mapmaker.png")),
|
||||
MOJANG_OLD(8, "Mojang Old", new ResourceLocation("eagler:capes/08.mojang_old.png")),
|
||||
MOJANG_NEW(9, "Mojang New", new ResourceLocation("eagler:capes/09.mojang_new.png")),
|
||||
JIRA_MOD(10, "Jira Moderator", new ResourceLocation("eagler:capes/10.jira_mod.png")),
|
||||
MOJANG_VERY_OLD(11, "Mojang Very Old", new ResourceLocation("eagler:capes/11.mojang_very_old.png")),
|
||||
SCROLLS(12, "Scrolls", new ResourceLocation("eagler:capes/12.scrolls.png")),
|
||||
COBALT(13, "Cobalt", new ResourceLocation("eagler:capes/13.cobalt.png")),
|
||||
TRANSLATOR(14, "Lang Translator", new ResourceLocation("eagler:capes/14.translator.png")),
|
||||
MILLIONTH_ACCOUNT(15, "Millionth Player", new ResourceLocation("eagler:capes/15.millionth_account.png")),
|
||||
PRISMARINE(16, "Prismarine", new ResourceLocation("eagler:capes/16.prismarine.png")),
|
||||
SNOWMAN(17, "Snowman", new ResourceLocation("eagler:capes/17.snowman.png")),
|
||||
SPADE(18, "Spade", new ResourceLocation("eagler:capes/18.spade.png")),
|
||||
BIRTHDAY(19, "Birthday", new ResourceLocation("eagler:capes/19.birthday.png")),
|
||||
DB(20, "dB", new ResourceLocation("eagler:capes/20.db.png"));
|
||||
|
||||
public static final DefaultCapes[] defaultCapesMap = new DefaultCapes[22];
|
||||
public static final DefaultCapes[] defaultCapesMap = new DefaultCapes[21];
|
||||
|
||||
public final int id;
|
||||
public final String name;
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ public class GuiVideoSettings extends GuiScreen {
|
|||
GameSettings.Options.AO_LEVEL,
|
||||
GameSettings.Options.VIEW_BOBBING,
|
||||
GameSettings.Options.GUI_SCALE,
|
||||
GameSettings.Options.USE_VBO,
|
||||
GameSettings.Options.EAGLER_VSYNC,
|
||||
GameSettings.Options.GAMMA,
|
||||
GameSettings.Options.BLOCK_ALTERNATIVES,
|
||||
GameSettings.Options.FOG_FANCY,
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ public class GameSettings extends ModData {
|
|||
public boolean viewBobbing = true;
|
||||
public boolean anaglyph;
|
||||
public boolean fboEnable = true;
|
||||
public int limitFramerate = 120;
|
||||
public int limitFramerate = 260;
|
||||
/**+
|
||||
* Clouds flag
|
||||
*/
|
||||
|
|
@ -300,7 +300,6 @@ public class GameSettings extends ModData {
|
|||
this.language = EagRuntime.getConfiguration().getDefaultLocale();
|
||||
this.forceUnicodeFont = false;
|
||||
this.mc = mcIn;
|
||||
this.limitFramerate = (int)GameSettings.Options.FRAMERATE_LIMIT.getValueMax();
|
||||
GameSettings.Options.RENDER_DISTANCE.setValueMax(18.0F);
|
||||
|
||||
this.renderDistanceChunks = 4;
|
||||
|
|
@ -519,12 +518,6 @@ public class GameSettings extends ModData {
|
|||
|
||||
if (parOptions == GameSettings.Options.FRAMERATE_LIMIT) {
|
||||
this.limitFramerate = (int) parFloat1;
|
||||
this.enableVsync = false;
|
||||
|
||||
if (this.limitFramerate <= 0) {
|
||||
this.limitFramerate = (int)GameSettings.Options.FRAMERATE_LIMIT.getValueMax();
|
||||
this.enableVsync = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (parOptions == GameSettings.Options.CHAT_OPACITY) {
|
||||
|
|
@ -1093,6 +1086,10 @@ public class GameSettings extends ModData {
|
|||
this.mc.getRenderManager().setEnableFNAWSkins(this.mc.getEnableFNAWSkins());
|
||||
}
|
||||
|
||||
if (parOptions == GameSettings.Options.EAGLER_VSYNC) {
|
||||
this.enableVsync = !this.enableVsync;
|
||||
}
|
||||
|
||||
if(parOptions == GameSettings.Options.FULLBRIGHT) {
|
||||
this.fullBright = !this.fullBright;
|
||||
}
|
||||
|
|
@ -1138,7 +1135,7 @@ public class GameSettings extends ModData {
|
|||
: (parOptions == GameSettings.Options.CHAT_HEIGHT_UNFOCUSED ? this.chatHeightUnfocused
|
||||
: (parOptions == GameSettings.Options.CHAT_SCALE ? this.chatScale
|
||||
: (parOptions == GameSettings.Options.CHAT_WIDTH ? this.chatWidth
|
||||
: (parOptions == GameSettings.Options.FRAMERATE_LIMIT ? ((float)this.limitFramerate == GameSettings.Options.FRAMERATE_LIMIT.getValueMax() && this.enableVsync ? 0.0F : (float)this.limitFramerate)
|
||||
: (parOptions == GameSettings.Options.FRAMERATE_LIMIT ? (float) this.limitFramerate
|
||||
: (parOptions == GameSettings.Options.MIPMAP_LEVELS ? (float) this.mipmapLevels
|
||||
: (parOptions == GameSettings.Options.RENDER_DISTANCE ? (float) this.renderDistanceChunks
|
||||
: (parOptions == GameSettings.Options.AO_LEVEL ? this.ofAoLevel
|
||||
|
|
@ -1247,6 +1244,8 @@ public class GameSettings extends ModData {
|
|||
return this.ofCustomColors;
|
||||
case FNAW_SKINS:
|
||||
return this.enableFNAWSkins;
|
||||
case EAGLER_VSYNC:
|
||||
return this.enableVsync;
|
||||
case FULLBRIGHT:
|
||||
return this.fullBright;
|
||||
case LEFT_HAND:
|
||||
|
|
@ -1302,7 +1301,7 @@ public class GameSettings extends ModData {
|
|||
float f = parOptions.normalizeValue(f1);
|
||||
return parOptions == GameSettings.Options.SENSITIVITY ? (f == 0.0F ? s + I18n.format("options.sensitivity.min", new Object[0]) : (f == 1.0F ? s + I18n.format("options.sensitivity.max", new Object[0]) : s + (int) (f * 200.0F) + "%"))
|
||||
: (parOptions == GameSettings.Options.FOV ? (f1 == 70.0F ? s + I18n.format("options.fov.min", new Object[0]) : (f1 == 110.0F ? s + I18n.format("options.fov.max", new Object[0]) : s + (int) f1))
|
||||
: (parOptions == GameSettings.Options.FRAMERATE_LIMIT ? (f1 == 0.0f ? s + "VSync" : f1 == parOptions.valueMax ? s + I18n.format("options.framerateLimit.max", new Object[0]) : s + (int)f1 + " fps")
|
||||
: (parOptions == GameSettings.Options.FRAMERATE_LIMIT ? (f1 == parOptions.valueMax ? s + I18n.format("options.framerateLimit.max", new Object[0]) : s + (int) f1 + " fps")
|
||||
: (parOptions == GameSettings.Options.RENDER_CLOUDS ? (f1 == parOptions.valueMin ? s + I18n.format("options.cloudHeight.min", new Object[0]) : s + ((int) f1 + 128))
|
||||
: (parOptions == GameSettings.Options.GAMMA ? (f == 0.0F ? s + I18n.format("options.gamma.min", new Object[0]) : (f == 1.0F ? s + I18n.format("options.gamma.max", new Object[0]) : s + "+" + (int) (f * 100.0F) + "%"))
|
||||
: (parOptions == GameSettings.Options.SATURATION ? s + (int) (f * 400.0F) + "%"
|
||||
|
|
@ -1619,12 +1618,6 @@ public class GameSettings extends ModData {
|
|||
|
||||
if (astring[0].equals("maxFps")) {
|
||||
this.limitFramerate = Integer.parseInt(astring[1]);
|
||||
this.enableVsync = false;
|
||||
|
||||
if (this.limitFramerate <= 0) {
|
||||
this.limitFramerate = (int)GameSettings.Options.FRAMERATE_LIMIT.getValueMax();
|
||||
this.enableVsync = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (astring[0].equals("fboEnable")) {
|
||||
|
|
@ -1729,7 +1722,7 @@ public class GameSettings extends ModData {
|
|||
}
|
||||
|
||||
if (astring[0].equals("enableVsyncEag")) {
|
||||
//this.enableVsync = astring[1].equals("true");
|
||||
this.enableVsync = astring[1].equals("true");
|
||||
}
|
||||
|
||||
if (astring[0].equals("hideServerAddress")) {
|
||||
|
|
@ -2270,7 +2263,7 @@ public class GameSettings extends ModData {
|
|||
printwriter.println("chatLinksPrompt:" + this.chatLinksPrompt);
|
||||
printwriter.println("chatOpacity:" + this.chatOpacity);
|
||||
printwriter.println("snooperEnabled:" + this.snooperEnabled);
|
||||
//printwriter.println("enableVsyncEag:" + this.enableVsync);
|
||||
printwriter.println("enableVsyncEag:" + this.enableVsync);
|
||||
printwriter.println("hideServerAddress:" + this.hideServerAddress);
|
||||
printwriter.println("advancedItemTooltips:" + this.advancedItemTooltips);
|
||||
printwriter.println("pauseOnLostFocus:" + this.pauseOnLostFocus);
|
||||
|
|
@ -2479,7 +2472,7 @@ public class GameSettings extends ModData {
|
|||
RENDER_DISTANCE("options.renderDistance", true, false, 1.0F, 16.0F, 1.0F),
|
||||
VIEW_BOBBING("options.viewBobbing", false, true),
|
||||
ANAGLYPH("options.anaglyph", false, true),
|
||||
FRAMERATE_LIMIT("options.framerateLimit", true, false, 0.0F, 260.0F, 5.0F),
|
||||
FRAMERATE_LIMIT("options.framerateLimit", true, false, 10.0F, 260.0F, 10.0F),
|
||||
FBO_ENABLE("options.fboEnable", false, true),
|
||||
RENDER_CLOUDS("options.renderClouds", false, false),
|
||||
GRAPHICS("options.graphics", false, false),
|
||||
|
|
@ -2583,6 +2576,7 @@ public class GameSettings extends ModData {
|
|||
CUSTOM_COLORS("Custom Colors", false, false),
|
||||
HIDE_PASSWORD("Hide Password", false, false),
|
||||
FNAW_SKINS("options.skinCustomisation.enableFNAWSkins", false, true),
|
||||
EAGLER_VSYNC("options.vsync", false, true),
|
||||
FULLBRIGHT("Fullbright", false, true),
|
||||
LEFT_HAND("Main Hand", false, true),
|
||||
ENTITY_CULLING("Entity Culling", false, true),
|
||||
|
|
|
|||
BIN
web_files.zip
BIN
web_files.zip
Binary file not shown.
Loading…
Reference in New Issue
Block a user