diff --git a/installer/launch4j/LICENSE.txt b/installer/launch4j/LICENSE.txt index bf03c83..38af528 100644 --- a/installer/launch4j/LICENSE.txt +++ b/installer/launch4j/LICENSE.txt @@ -1,7 +1,7 @@ Launch4j (http://launch4j.sourceforge.net/) Cross-platform Java application wrapper for creating Windows native executables. -Copyright (c) 2004, 2015 Grzegorz Kowal +Copyright (c) 2004, 2017 Grzegorz Kowal All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/installer/launch4j/demo/ConsoleApp/ConsoleApp.exe b/installer/launch4j/demo/ConsoleApp/ConsoleApp.exe index ad6cb45..c6ef711 100644 Binary files a/installer/launch4j/demo/ConsoleApp/ConsoleApp.exe and b/installer/launch4j/demo/ConsoleApp/ConsoleApp.exe differ diff --git a/installer/launch4j/demo/ConsoleApp/ConsoleApp.jar b/installer/launch4j/demo/ConsoleApp/ConsoleApp.jar index 4ce267d..e10435c 100644 Binary files a/installer/launch4j/demo/ConsoleApp/ConsoleApp.jar and b/installer/launch4j/demo/ConsoleApp/ConsoleApp.jar differ diff --git a/installer/launch4j/demo/ConsoleApp/build.xml b/installer/launch4j/demo/ConsoleApp/build.xml index 78be0ae..b53d77f 100644 --- a/installer/launch4j/demo/ConsoleApp/build.xml +++ b/installer/launch4j/demo/ConsoleApp/build.xml @@ -42,7 +42,7 @@ - + diff --git a/installer/launch4j/demo/SimpleApp/SimpleApp.exe b/installer/launch4j/demo/SimpleApp/SimpleApp.exe index 8b8e67e..8af3f35 100644 Binary files a/installer/launch4j/demo/SimpleApp/SimpleApp.exe and b/installer/launch4j/demo/SimpleApp/SimpleApp.exe differ diff --git a/installer/launch4j/demo/SimpleApp/SimpleApp.jar b/installer/launch4j/demo/SimpleApp/SimpleApp.jar index 777fece..aca3235 100644 Binary files a/installer/launch4j/demo/SimpleApp/SimpleApp.jar and b/installer/launch4j/demo/SimpleApp/SimpleApp.jar differ diff --git a/installer/launch4j/demo/SimpleApp/l4j/SimpleApp.xml b/installer/launch4j/demo/SimpleApp/l4j/SimpleApp.xml index bb5804d..eacd757 100644 --- a/installer/launch4j/demo/SimpleApp/l4j/SimpleApp.xml +++ b/installer/launch4j/demo/SimpleApp/l4j/SimpleApp.xml @@ -1,6 +1,7 @@ gui - ../SimpleApp.jar + SimpleApp.jar + true ../SimpleApp.exe SimpleApp . diff --git a/installer/launch4j/head/head.o b/installer/launch4j/head/head.o index d5d63d6..849299f 100644 Binary files a/installer/launch4j/head/head.o and b/installer/launch4j/head/head.o differ diff --git a/installer/launch4j/head_jni_BETA/head.o b/installer/launch4j/head_jni_BETA/head.o index f9e9f90..bd99219 100644 Binary files a/installer/launch4j/head_jni_BETA/head.o and b/installer/launch4j/head_jni_BETA/head.o differ diff --git a/installer/launch4j/head_jni_BETA/jnihead.o b/installer/launch4j/head_jni_BETA/jnihead.o index 1512568..5b65824 100644 Binary files a/installer/launch4j/head_jni_BETA/jnihead.o and b/installer/launch4j/head_jni_BETA/jnihead.o differ diff --git a/installer/launch4j/head_src/head.c b/installer/launch4j/head_src/head.c index d36873f..659bb89 100644 --- a/installer/launch4j/head_src/head.c +++ b/installer/launch4j/head_src/head.c @@ -207,6 +207,7 @@ BOOL loadString(const int resID, char* buffer) HRSRC hResource; HGLOBAL hResourceLoaded; LPBYTE lpBuffer; + debugAll("Resource %d:\t", resID); hResource = FindResourceEx(hModule, RT_RCDATA, MAKEINTRESOURCE(resID), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT)); @@ -224,10 +225,7 @@ BOOL loadString(const int resID, char* buffer) buffer[x] = (char) lpBuffer[x]; } while (buffer[x++] != 0); - if (debugAll) - { - debug("Resource %d:\t%s\n", resID, buffer); - } + debugAll("%s\n", buffer); return TRUE; } } @@ -237,6 +235,8 @@ BOOL loadString(const int resID, char* buffer) SetLastError(0); buffer[0] = 0; } + + debugAll("\n"); return FALSE; } @@ -312,27 +312,118 @@ BOOL regQueryValue(const char* regPath, unsigned char* buffer, return result; } +int findNextVersionPart(const char* startAt) +{ + if (startAt == NULL || strlen(startAt) == 0) + { + return 0; + } + + char* firstSeparatorA = strchr(startAt, '.'); + char* firstSeparatorB = strchr(startAt, '_'); + char* firstSeparator; + if (firstSeparatorA == NULL) + { + firstSeparator = firstSeparatorB; + } + else if (firstSeparatorB == NULL) + { + firstSeparator = firstSeparatorA; + } + else + { + firstSeparator = min(firstSeparatorA, firstSeparatorB); + } + + if (firstSeparator == NULL) + { + return strlen(startAt); + } + + return firstSeparator - startAt; +} + +/** + * This method will take java version from `originalVersion` string and convert/format it + * into `version` string that can be used for string comparison with other versions. + * + * Due to different version schemas <=8 vs. >=9 it will "normalize" versions to 1 format + * so we can directly compare old and new versions. + */ void formatJavaVersion(char* version, const char* originalVersion) { - char* updatePart = strchr(originalVersion, '_'); + strcpy(version, ""); + if (originalVersion == NULL || strlen(originalVersion) == 0) + { + return; + } + + int partsAdded = 0; + int i; + char* pos = (char*) originalVersion; + int curPartLen; - if (updatePart != NULL) + while ((curPartLen = findNextVersionPart(pos)) > 0) { - // skip underscore - updatePart++; + char number[curPartLen + 1]; + memset(number, 0, curPartLen + 1); + strncpy(number, pos, curPartLen); - if (strlen(updatePart) < 3) + if (partsAdded == 0 && (curPartLen != 1 || number[0] != '1')) { - const int majorVersionLength = updatePart - originalVersion; - strncpy(version, originalVersion, majorVersionLength); - *(version + majorVersionLength) = 0; - strcat(version, "0"); - strcat(version, updatePart); - return; - } - } - - strcpy(version, originalVersion); + // NOTE: When it's java 9+ we'll add "1" as the first part of the version + strcpy(version, "1"); + partsAdded++; + } + + if (partsAdded < 3) + { + if (partsAdded > 0) + { + strcat(version, "."); + } + for (i = 0; + (partsAdded > 0) + && (i < JRE_VER_MAX_DIGITS_PER_PART - strlen(number)); + i++) + { + strcat(version, "0"); + } + strcat(version, number); + } + else if (partsAdded == 3) + { + // add as an update + strcat(version, "_"); + for (i = 0; i < JRE_VER_MAX_DIGITS_PER_PART - strlen(number); i++) + { + strcat(version, "0"); + } + strcat(version, number); + } + else if (partsAdded >= 4) + { + debug("Warning:\tformatJavaVersion() too many parts added.\n"); + break; + } + partsAdded++; + + pos += curPartLen + 1; + if (pos >= originalVersion + strlen(originalVersion)) + { + break; + } + } + + for (i = partsAdded; i < 3; i++) + { + strcat(version, "."); + int j; + for (j = 0; j < JRE_VER_MAX_DIGITS_PER_PART; j++) + { + strcat(version, "0"); + } + } } void regSearch(const char* keyName, const int searchType) @@ -419,10 +510,6 @@ BOOL isJavaHomeValid(const char* keyName, const int searchType) path[i] = buffer[i]; } while (path[i++] != 0); - if (searchType & FOUND_SDK) - { - appendPath(path, "jre"); - } valid = isLauncherPathValid(path); } RegCloseKey(hKey); @@ -511,6 +598,10 @@ void regSearchWow(const char* keyName, const int searchType) case USE_32_BIT_RUNTIME: regSearch(keyName, searchType); break; + + default: + debug("Runtime bits:\tFailed to load.\n"); + break; } } @@ -538,10 +629,25 @@ void regSearchJreSdk(const char* jreKeyName, const char* sdkKeyName, BOOL findJavaHome(char* path, const int jdkPreference) { + debugAll("findJavaHome()\n"); regSearchJreSdk("SOFTWARE\\JavaSoft\\Java Runtime Environment", "SOFTWARE\\JavaSoft\\Java Development Kit", jdkPreference); + // Java 9 support + regSearchJreSdk("SOFTWARE\\JavaSoft\\JRE", + "SOFTWARE\\JavaSoft\\JDK", + jdkPreference); + + // IBM Java 1.8 + if (search.foundJava == NO_JAVA_FOUND) + { + regSearchJreSdk("SOFTWARE\\IBM\\Java Runtime Environment", + "SOFTWARE\\IBM\\Java Development Kit", + jdkPreference); + } + + // IBM Java 1.7 and earlier if (search.foundJava == NO_JAVA_FOUND) { regSearchJreSdk("SOFTWARE\\IBM\\Java2 Runtime Environment", @@ -648,6 +754,10 @@ BOOL expandVars(char *dst, const char *src, const char *exePath, const int pathL else if (strstr(varName, HKEY_STR) == varName) { regQueryValue(varName, dst + strlen(dst), BIG_STR); + } + else if (strcmp(varName, "") == 0) + { + strcat(dst, "%"); } else if (GetEnvironmentVariable(varName, varValue, MAX_VAR_SIZE) > 0) { @@ -768,6 +878,7 @@ BOOL createMutex() if (*mutexName) { + debug("Create mutex:\t%s\n", mutexName); SECURITY_ATTRIBUTES security; security.nLength = sizeof(SECURITY_ATTRIBUTES); security.bInheritHandle = TRUE; @@ -802,8 +913,16 @@ void setWorkingDirectory(const char *exePath, const int pathLen) BOOL bundledJreSearch(const char *exePath, const int pathLen) { + debugAll("bundledJreSearch()\n"); char tmpPath[_MAX_PATH] = {0}; + BOOL is64BitJre = loadBool(BUNDLED_JRE_64_BIT); + if (!wow64 && is64BitJre) + { + debug("Bundled JRE:\tCannot use 64-bit runtime on 32-bit OS.\n"); + return FALSE; + } + if (loadString(JRE_PATH, tmpPath)) { char jrePath[MAX_ARGS] = {0}; @@ -824,9 +943,7 @@ BOOL bundledJreSearch(const char *exePath, const int pathLen) if (isLauncherPathValid(launcher.cmd)) { - search.foundJava = (wow64 && loadBool(BUNDLED_JRE_64_BIT)) - ? FOUND_BUNDLED | KEY_WOW64_64KEY - : FOUND_BUNDLED; + search.foundJava = is64BitJre ? FOUND_BUNDLED | KEY_WOW64_64KEY : FOUND_BUNDLED; strcpy(search.foundJavaHome, launcher.cmd); return TRUE; } @@ -837,6 +954,7 @@ BOOL bundledJreSearch(const char *exePath, const int pathLen) BOOL installedJreSearch() { + debugAll("installedJreSearch()\n"); return *search.javaMinVer && findJavaHome(launcher.cmd, loadInt(JDK_PREFERENCE)); } @@ -883,13 +1001,16 @@ void createJreSearchError() BOOL jreSearch(const char *exePath, const int pathLen) { + debugAll("jreSearch()\n"); BOOL result = TRUE; search.bundledJreAsFallback = loadBool(BUNDLED_JRE_AS_FALLBACK); loadString(JAVA_MIN_VER, search.originalJavaMinVer); formatJavaVersion(search.javaMinVer, search.originalJavaMinVer); + debug("Java min ver:\t%s\n", search.javaMinVer); loadString(JAVA_MAX_VER, search.originalJavaMaxVer); formatJavaVersion(search.javaMaxVer, search.originalJavaMaxVer); + debug("Java max ver:\t%s\n", search.javaMaxVer); if (search.bundledJreAsFallback) { @@ -978,6 +1099,8 @@ void setMainClassAndClassPath(const char *exePath, const int pathLen) if (loadString(MAIN_CLASS, launcher.mainClass)) { + debug("Main class:\t%s\n", launcher.mainClass); + if (!loadString(CLASSPATH, classPath)) { debug("Info:\t\tClasspath not defined.\n"); diff --git a/installer/launch4j/head_src/head.h b/installer/launch4j/head_src/head.h index 682af3b..6e2057b 100644 --- a/installer/launch4j/head_src/head.h +++ b/installer/launch4j/head_src/head.h @@ -54,7 +54,9 @@ #include #define LAUNCH4j "Launch4j" -#define VERSION "3.9" +#define VERSION "3.12" + +#define JRE_VER_MAX_DIGITS_PER_PART 3 #define NO_JAVA_FOUND 0 #define FOUND_JRE 1 @@ -91,6 +93,7 @@ #define ERROR_FORMAT "Error:\t\t%s\n" #define debug(args...) if (hLog != NULL) fprintf(hLog, ## args); +#define debugAll(args...) if (debugAll && hLog != NULL) fprintf(hLog, ## args); typedef void (WINAPI *LPFN_ISWOW64PROCESS) (HANDLE, PBOOL); diff --git a/installer/launch4j/head_src/jnihead.c b/installer/launch4j/head_src/jnihead.c index 4b88601..16464dd 100644 --- a/installer/launch4j/head_src/jnihead.c +++ b/installer/launch4j/head_src/jnihead.c @@ -35,7 +35,6 @@ JavaVM* g_pJavaVM = NULL; JNIEnv* g_pJNIEnv = NULL; JavaVMInitArgs g_sJavaVMInitArgs; char g_rgcMnClsArgs[MAX_ARGS] = {0}; -char g_rgcClsPth[MAX_ARGS] = {0}; char g_rgcMnCls[_MAX_PATH] = {0}; char g_rgcCurrJrePth[_MAX_PATH] = {0}; HINSTANCE g_hInstance; @@ -67,6 +66,8 @@ void saveJvmOptions(const char *jrePath, const char *mainClass, const char *pcOp char *pcCurrOpt; char **prgcVmArgs = NULL; strncpy(rgcOptCpy, pcOpts, MAX_ARGS - 1); + + iArgCnt = getArgCount(rgcOptCpy); if (iArgCnt > 0) { @@ -80,6 +81,7 @@ void saveJvmOptions(const char *jrePath, const char *mainClass, const char *pcOp /* Allocat iArgCnt JavaVMOptions for the g_sJavaVMInitArgs struct */ g_sJavaVMInitArgs.options = malloc(iArgCnt * sizeof(JavaVMOption)); memset(g_sJavaVMInitArgs.options, 0, iArgCnt * sizeof(JavaVMOption)); + char* rgcClsPth = 0; /* Copy the tokenized array into the allocated JavaVMOption array, * with some special handling for classpath related arguments */ for (iCurrArg = 0; iCurrArg < iArgCnt; iCurrArg++) @@ -100,16 +102,18 @@ void saveJvmOptions(const char *jrePath, const char *mainClass, const char *pcOp rgcTmp[strlen(rgcTmp)-1] = '\0'; /* If we haven't defined a classpath yet start one, otherwise * we just append the this classpath to it */ - if (g_rgcClsPth[0] == '\0') + if (!rgcClsPth) { - sprintf(g_rgcClsPth,"-Djava.class.path=%s", rgcTmp); - g_sJavaVMInitArgs.options[iCurrArg - iSkipArgCnt].optionString = g_rgcClsPth; + rgcClsPth = malloc(MAX_ARGS * sizeof(char)); + memset(rgcClsPth, 0, MAX_ARGS * sizeof(char)); + sprintf(rgcClsPth,"-Djava.class.path=%s", rgcTmp); + g_sJavaVMInitArgs.options[iCurrArg - iSkipArgCnt].optionString = rgcClsPth; } else { iSkipArgCnt++; - strcat(g_rgcClsPth,";"); - strcat(g_rgcClsPth,rgcTmp); + strcat(rgcClsPth,";"); + strcat(rgcClsPth,rgcTmp); } } diff --git a/installer/launch4j/launch4j.exe b/installer/launch4j/launch4j.exe index ad1ccd6..9acf516 100644 Binary files a/installer/launch4j/launch4j.exe and b/installer/launch4j/launch4j.exe differ diff --git a/installer/launch4j/launch4j.jar b/installer/launch4j/launch4j.jar index 6daad70..f4d6774 100644 Binary files a/installer/launch4j/launch4j.jar and b/installer/launch4j/launch4j.jar differ diff --git a/installer/launch4j/launch4jc.exe b/installer/launch4j/launch4jc.exe index 736e37c..d63fbce 100644 Binary files a/installer/launch4j/launch4jc.exe and b/installer/launch4j/launch4jc.exe differ diff --git a/installer/launch4j/maven/assembly/assemble-linux.xml b/installer/launch4j/maven/assembly/assemble-linux.xml index aa4abd0..94d4cf9 100644 --- a/installer/launch4j/maven/assembly/assemble-linux.xml +++ b/installer/launch4j/maven/assembly/assemble-linux.xml @@ -44,7 +44,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ${finalName}-workdir-linux w32api/**/* + w32api_jni/**/* head/**/* + head_jni_BETA/**/* diff --git a/installer/launch4j/maven/assembly/assemble-linux64.xml b/installer/launch4j/maven/assembly/assemble-linux64.xml new file mode 100644 index 0000000..d116be7 --- /dev/null +++ b/installer/launch4j/maven/assembly/assemble-linux64.xml @@ -0,0 +1,53 @@ + + + + workdir-linux64 + + jar + + false + + + bin/bin-linux64 + ${finalName}-workdir-linux64/bin + + + ${finalName}-workdir-linux64 + + w32api/**/* + w32api_jni/**/* + head/**/* + head_jni_BETA/**/* + + + + diff --git a/installer/launch4j/maven/assembly/assemble-mac.xml b/installer/launch4j/maven/assembly/assemble-mac.xml index 30453be..e813f72 100644 --- a/installer/launch4j/maven/assembly/assemble-mac.xml +++ b/installer/launch4j/maven/assembly/assemble-mac.xml @@ -44,7 +44,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ${finalName}-workdir-mac w32api/**/* + w32api_jni/**/* head/**/* + head_jni_BETA/**/* diff --git a/installer/launch4j/maven/assembly/assemble-win32.xml b/installer/launch4j/maven/assembly/assemble-win32.xml index 5f382fc..4680f89 100644 --- a/installer/launch4j/maven/assembly/assemble-win32.xml +++ b/installer/launch4j/maven/assembly/assemble-win32.xml @@ -41,11 +41,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ${finalName}-workdir-win32/bin - ${finalName}-workdir-win32 w32api/**/* + w32api_jni/**/* head/**/* + head_jni_BETA/**/* diff --git a/installer/launch4j/maven/maven-readme.txt b/installer/launch4j/maven/maven-readme.txt index 8429754..c977ad8 100644 --- a/installer/launch4j/maven/maven-readme.txt +++ b/installer/launch4j/maven/maven-readme.txt @@ -5,6 +5,4 @@ Windows: mvn -P dist,win32 clean package Linux: mvn -P dist,linux clean package -MacOsX 10.8: mvn -P dist,macosx-x86-10.8 clean package - MacOsX: mvn -P dist,macosx-x86 clean package diff --git a/installer/launch4j/maven/pom.xml b/installer/launch4j/maven/pom.xml index 0b8b72e..b9f0db5 100644 --- a/installer/launch4j/maven/pom.xml +++ b/installer/launch4j/maven/pom.xml @@ -236,9 +236,9 @@ assembly/assemble-linux.xml + assembly/assemble-linux64.xml assembly/assemble-win32.xml assembly/assemble-mac.xml - assembly/assemble-osx.xml @@ -360,13 +360,6 @@ - - - macosx-x86-10.8 - - bin-macosx-x86-10.8 - - macosx-x86 @@ -419,7 +412,7 @@ ${versionNumber} ${version} Cross-platform Java application wrapper - Copyright (C) 2004, 2014 Grzegorz Kowal + Copyright (C) 2004, 2017 Grzegorz Kowal launch4j http://launch4j.sourceforge.net/ GUI launcher diff --git a/installer/launch4j/src/LICENSE.txt b/installer/launch4j/src/LICENSE.txt index bf03c83..38af528 100644 --- a/installer/launch4j/src/LICENSE.txt +++ b/installer/launch4j/src/LICENSE.txt @@ -1,7 +1,7 @@ Launch4j (http://launch4j.sourceforge.net/) Cross-platform Java application wrapper for creating Windows native executables. -Copyright (c) 2004, 2015 Grzegorz Kowal +Copyright (c) 2004, 2017 Grzegorz Kowal All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/installer/launch4j/src/launch4j.properties b/installer/launch4j/src/launch4j.properties index 7268b62..a14697f 100644 --- a/installer/launch4j/src/launch4j.properties +++ b/installer/launch4j/src/launch4j.properties @@ -1,2 +1,2 @@ -versionNumber=3.9.0.0 -version=3.9 +versionNumber=3.12.0.0 +version=3.12 diff --git a/installer/launch4j/src/net/sf/launch4j/Main.java b/installer/launch4j/src/net/sf/launch4j/Main.java index 4a139b5..820f4be 100644 --- a/installer/launch4j/src/net/sf/launch4j/Main.java +++ b/installer/launch4j/src/net/sf/launch4j/Main.java @@ -86,7 +86,7 @@ private static void setDescription(Properties props) { " (http://launch4j.sourceforge.net/)\n" + "Cross-platform Java application wrapper" + " for creating Windows native executables.\n\n" + - "Copyright (C) 2004, 2015 Grzegorz Kowal\n\n" + + "Copyright (C) 2004, 2018 Grzegorz Kowal\n\n" + "Launch4j comes with ABSOLUTELY NO WARRANTY.\n" + "This is free software, licensed under the BSD License.\n" + "This product includes software developed by the Apache Software Foundation" + diff --git a/installer/launch4j/src/net/sf/launch4j/RcBuilder.java b/installer/launch4j/src/net/sf/launch4j/RcBuilder.java index 11188b0..45f2339 100644 --- a/installer/launch4j/src/net/sf/launch4j/RcBuilder.java +++ b/installer/launch4j/src/net/sf/launch4j/RcBuilder.java @@ -112,7 +112,7 @@ public class RcBuilder { public static final int INSTANCE_ALREADY_EXISTS_MSG = 105; private final StringBuffer _sb = new StringBuffer(); - + public String getContent() { return _sb.toString(); } diff --git a/installer/launch4j/src/net/sf/launch4j/config/Jre.java b/installer/launch4j/src/net/sf/launch4j/config/Jre.java index ceb2801..cd91661 100644 --- a/installer/launch4j/src/net/sf/launch4j/config/Jre.java +++ b/installer/launch4j/src/net/sf/launch4j/config/Jre.java @@ -54,8 +54,8 @@ public class Jre implements IValidatable { public static final String ARGS = "jvmArgs"; // __________________________________________________________________________________ - public static final String VERSION_PATTERN = "(\\d\\.){2}\\d(_\\d+)?"; - + public static final String VERSION_PATTERN = "(1\\.\\d\\.\\d(_\\d{1,3})?)|[1-9][0-9]{0,2}(\\.\\d{1,3}){0,2}"; + public static final String JDK_PREFERENCE_JRE_ONLY = "jreOnly"; public static final String JDK_PREFERENCE_PREFER_JRE = "preferJre"; public static final String JDK_PREFERENCE_PREFER_JDK = "preferJdk"; @@ -98,9 +98,9 @@ public class Jre implements IValidatable { private List options; public void checkInvariants() { - Validator.checkOptString(minVersion, 10, VERSION_PATTERN, + Validator.checkOptString(minVersion, 20, VERSION_PATTERN, "jre.minVersion", Messages.getString("Jre.min.version")); - Validator.checkOptString(maxVersion, 10, VERSION_PATTERN, + Validator.checkOptString(maxVersion, 20, VERSION_PATTERN, "jre.maxVersion", Messages.getString("Jre.max.version")); if (Validator.isEmpty(path)) { Validator.checkFalse(bundledJre64Bit, "jre.bundledJre64Bit", @@ -116,7 +116,7 @@ public void checkInvariants() { if (!Validator.isEmpty(maxVersion)) { Validator.checkFalse(Validator.isEmpty(minVersion), "jre.minVersion", Messages.getString("Jre.specify.min.version")); - Validator.checkTrue(minVersion.compareTo(maxVersion) < 0, + Validator.checkTrue(JreVersion.parseString(minVersion).compareTo(JreVersion.parseString(maxVersion)) < 0, "jre.maxVersion", Messages.getString("Jre.max.greater.than.min")); } Validator.checkTrue(initialHeapSize == null || maxHeapSize != null, @@ -155,7 +155,7 @@ public void checkInvariants() { Validator.checkOptStrings(options, Validator.MAX_ARGS, Validator.MAX_ARGS, - "[^%]*|([^%]*([^%]*%[^%]+%[^%]*)+[^%]*)*", + "[^%]*|([^%]*([^%]*%[^%]*%[^%]*)+[^%]*)*", "jre.options", Messages.getString("Jre.jvm.options"), Messages.getString("Jre.jvm.options.variable")); diff --git a/installer/launch4j/src/net/sf/launch4j/config/JreVersion.java b/installer/launch4j/src/net/sf/launch4j/config/JreVersion.java new file mode 100644 index 0000000..185257e --- /dev/null +++ b/installer/launch4j/src/net/sf/launch4j/config/JreVersion.java @@ -0,0 +1,124 @@ +package net.sf.launch4j.config; + +/** + * This class will abstract application from JRE versioning schema and provide + * comparing capabilities + * + * @author sergeyk + * + */ +public class JreVersion implements Comparable { + private int x1; + private int x2; + private int x3; + private int x4; + + public static JreVersion parseString(String versionStr) { + JreVersion ret = new JreVersion(); + if (versionStr == null || versionStr.trim().length() == 0) { + return ret; + } + if (!versionStr.matches(Jre.VERSION_PATTERN)) { + // NOTE: This is actually shouldn't happen because version format had to be + // checked by Jre#checkInvariants BEFORE calling this method + throw new IllegalArgumentException("JRE version is not in a right format."); + } + + String[] parts = versionStr.split("[\\._]"); + int first = Integer.parseInt(parts[0]); + if (first > 1) { + // java 9+ version schema + ret.x1 = 1; + ret.x2 = first; + if (parts.length >= 2) { + ret.x3 = Integer.parseInt(parts[1]); + if (parts.length >= 3) { + ret.x4 = Integer.parseInt(parts[2]); + } + } + } else { + // java <= 1.8 version schema + ret.x1 = first; + if (parts.length >= 2) { + ret.x2 = Integer.parseInt(parts[1]); + if (parts.length >= 3) { + ret.x3 = Integer.parseInt(parts[2]); + if (parts.length == 4) { + ret.x4 = Integer.parseInt(parts[3]); + } + } + } + } + + return ret; + } + + @Override + public String toString() { + if (x2 >= 9) { + return x2 + "." + x3 + "." + x4; + } + + return x1 + "." + x2 + "." + x3 + (x4 > 0 ? "_" + x4 : ""); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + x1; + result = prime * result + x2; + result = prime * result + x3; + result = prime * result + x4; + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + JreVersion other = (JreVersion) obj; + if (x1 != other.x1) { + return false; + } + if (x2 != other.x2) { + return false; + } + if (x3 != other.x3) { + return false; + } + if (x4 != other.x4) { + return false; + } + return true; + } + + @Override + public int compareTo(JreVersion o) { + if (this.equals(o)) { + return 0; + } + + if (x1 != o.x1) { + return x1 - o.x1; + } + if (x2 != o.x2) { + return x2 - o.x2; + } + if (x3 != o.x3) { + return x3 - o.x3; + } + if (x4 != o.x4) { + return x4 - o.x4; + } + + throw new IllegalStateException("If you see this exception it means JreVersion::equals() method is buggy"); + } +} diff --git a/installer/launch4j/src/net/sf/launch4j/config/messages.properties b/installer/launch4j/src/net/sf/launch4j/config/messages.properties index 560554c..b2eecc4 100644 --- a/installer/launch4j/src/net/sf/launch4j/config/messages.properties +++ b/installer/launch4j/src/net/sf/launch4j/config/messages.properties @@ -69,8 +69,8 @@ VersionInfo.internal.name.not.exe=Internal name shouldn't have the .exe extensio VersionInfo.original.filename=Original filename VersionInfo.original.filename.exe=Original filename should end with the .exe extension. -Jre.min.version=Minimum JRE version should be x.x.x[_xx] -Jre.max.version=Maximum JRE version should be x.x.x[_xx] +Jre.min.version=Minimum JRE version should be 1.x.x[_xxx] or the Java 9 new version scheme xxx[.xxx[.xxx]], e.g., 1.5, 1.8.0_121, 10.0.1 +Jre.max.version=Maximum JRE version should be 1.x.x[_xxx] or the Java 9 new version scheme xxx[.xxx[.xxx]], e.g., 1.5, 1.8.0_121, 10.0.1 Jre.specify.jre.min.version.or.path=Specify minimum JRE version and/or bundled JRE path. Jre.bundled.path=Bundled JRE path Jre.bundled.64bit.invalid=The bundled JRE 64-bit option can only be used if the JRE path is specified. diff --git a/installer/launch4j/src/net/sf/launch4j/messages.properties b/installer/launch4j/src/net/sf/launch4j/messages.properties index 9895ca3..db2f9cc 100644 --- a/installer/launch4j/src/net/sf/launch4j/messages.properties +++ b/installer/launch4j/src/net/sf/launch4j/messages.properties @@ -35,7 +35,7 @@ Main.usage=usage Builder.compiling.resources=Compiling resources Builder.linking=Linking -Builder.wrapping=Wrapping +Builder.wrapping=Wrapping\nWARNING: Sign the executable to minimize antivirus false positives or use launching instead of wrapping. Builder.success=Successfully created Builder.generated.resource.file=Generated resource file...\n Builder.line.has.errors=Line {0} has errors... diff --git a/installer/launch4j/web/changelog.html b/installer/launch4j/web/changelog.html index c753be4..450a2c0 100644 --- a/installer/launch4j/web/changelog.html +++ b/installer/launch4j/web/changelog.html @@ -11,7 +11,7 @@
- launch4j 3.9 + launch4j 3.12

Changelog

+

Changes in version 3.12 (17-05-2018)

+
    +
  • Ticket #179, #183 The generated executable fully supports Java 9 and newer (Sergey Karpushin).
    • +
  • Ticket #161 Support of update version higher than 99 (Sergey Karpushin).
    • +
  • Ticket #177 Launching on Java 9 JDK and newer is now possible (not just JRE).
    • +
  • Known issue: launch4j itself does not support Java 9 Early Access, use a public release instead or Java 10.
    • +
+ +

Changes in version 3.11 (27-06-2017)

+
    +
  • Log more regarding Java search and missing resources.
    • +
  • Log resource file during build.
    • +
  • Added basic Java 9 support (only major version is detected right now due to version scheme change).
    • +
  • Ticket #145 Allow literal use of % in JRE options and set environment variables, use %% (blueskyhigh).
    • +
  • Added Linux 64-bit binaries (Sebastian Bögl).
    • +
  • Added IBM Java 1.8 support.
    • +
  • JNI header: fixed a crash where launch4j would try to `free` non-heap memory (Alexander Floh).
    • +
  • Ticket #160 Removed old Mac OS X package which caused problems on newer versions of the system.
    • +
+

Changes in version 3.9 (20-07-2016)

    -
  • Ticket #146 Fixed java version check where the update number was greater than 99 (e.g. 1.8.0_101).
    • +
  • Ticket #146 Fixed java version check where the update number was greater than 99 (e.g. 1.8.0_101).
  • Enlarged the total classpath length to 30KB.
  • Ticket #142 Unbound VersionInfo returns wrong LanguageID (Sebastian Bögl).
  • Ticket #141 Ensure encoding of resource file to be iso-8859-1 (Thomas Scheithauer).
    • @@ -438,7 +458,7 @@

    Changes in version 1.2.0 (10-09-2004)

All trademarks mentioned are properties of their respective owners.
- Copyright © 2005-2015 Grzegorz Kowal + Copyright © 2005-2017 Grzegorz Kowal

Download Launch4j Executable Wrapper

diff --git a/installer/launch4j/web/docs.html b/installer/launch4j/web/docs.html index ee0a0e0..bd4f6f4 100644 --- a/installer/launch4j/web/docs.html +++ b/installer/launch4j/web/docs.html @@ -11,7 +11,7 @@
- launch4j 3.9 + launch4j 3.12
@@ -100,8 +100,8 @@

Configuration file

<path>bundled JRE path (%VAR%)</path> <bundledJre64Bit>true|false</bundledJre64Bit> <bundledJreAsFallback>true|false</bundledJreAsFallback> - <minVersion>x.x.x[_xx]</minVersion> - <maxVersion>x.x.x[_xx]</maxVersion> + <minVersion>1.x.x[_xxx]|xxx[.xxx[.xxx]]</minVersion> + <maxVersion>1.x.x[_xxx]|xxx[.xxx[.xxx]]</maxVersion> <jdkPreference>jreOnly|preferJre|preferJdk|jdkOnly</jdkPreference> <runtimeBits>64|64/32|32/64|32</runtimeBits> <!-- Heap sizes in MB and % of available memory. --> @@ -321,7 +321,7 @@

Configuration file

use the <minVersion> property, you may also specify the <maxVersion> to prevent it from using higher Java versions. Launch4j will always use the highest version available (in the min/max range of course). - If a Sun's JRE is not available or does not satisfy the search criteria, + If an Oracle's JRE is not available or does not satisfy the search criteria, the search will be repeated on IBM runtimes. You can also combine these properties to change the startup process... @@ -341,6 +341,30 @@

Configuration file

+
+
+
<minVersion>, <maxVersion> format - Java < 9
+
The traditional version scheme supported by launch4j is 1.x.x[_xxx] and requires at least 3 parts, for example: +
+1.6.0
+1.7.0_51
+1.8.0_121
+
+
+
+
+
+
+
<minVersion>, <maxVersion> format - Java >= 9
+
The new version format is xxx[.xxx[.xxx]] where only 1 part is required and the update version after the underscore is not allowed. +
+1.6
+9
+10.0.1
+
+
+
+
<bundledJre64Bit>
@@ -708,7 +732,7 @@

Settings

All trademarks mentioned are properties of their respective owners.
- Copyright © 2005-2015 Grzegorz Kowal + Copyright © 2005-2017 Grzegorz Kowal

Download Launch4j Executable Wrapper

diff --git a/installer/launch4j/web/index.html b/installer/launch4j/web/index.html index 8be37d6..ac3a0b9 100644 --- a/installer/launch4j/web/index.html +++ b/installer/launch4j/web/index.html @@ -11,7 +11,7 @@
- launch4j 3.9 + launch4j 3.12
@@ -112,7 +112,7 @@

Info

All trademarks mentioned are properties of their respective owners.
- Copyright © 2005-2015 Grzegorz Kowal + Copyright © 2005-2017 Grzegorz Kowal

Download Launch4j Executable Wrapper

diff --git a/installer/launch4j/web/links.html b/installer/launch4j/web/links.html index a912fbf..8aa9c4e 100644 --- a/installer/launch4j/web/links.html +++ b/installer/launch4j/web/links.html @@ -11,7 +11,7 @@
- launch4j 3.9 + launch4j 3.12
@@ -50,7 +50,7 @@

Windows native installers

All trademarks mentioned are properties of their respective owners.
- Copyright © 2005-2015 Grzegorz Kowal + Copyright © 2005-2017 Grzegorz Kowal

Download Launch4j Executable Wrapper

diff --git a/minecriftversion.py b/minecriftversion.py index 856954e..677f3f6 100644 --- a/minecriftversion.py +++ b/minecriftversion.py @@ -3,9 +3,9 @@ of_file_name = "1.12.2_HD_U_F5" of_json_name = "1.12.2_HD_U_F5" of_file_md5 = "043ac1db6f7441ea4cf31bcb621aff0b" -of_build_md5 = "25b60b1b97ab50f07723e5d3c55dd06b" +of_build_md5 = "3c3d75fd20ebef6ac0091d358d01b4bb" minecrift_version_num = "1.12.2" -minecrift_build = "jrbudda-10-r2" +minecrift_build = "jrbudda-11-r1" of_file_extension = ".jar" mcp_version = "mcp940" mcp_uses_generics = True diff --git a/patches/net/minecraft/client/Minecraft.java.patch b/patches/net/minecraft/client/Minecraft.java.patch index a05b51a..18dbd35 100644 --- a/patches/net/minecraft/client/Minecraft.java.patch +++ b/patches/net/minecraft/client/Minecraft.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/Minecraft.java +++ b/net/minecraft/client/Minecraft.java -@@ -1,51 +1,123 @@ +@@ -1,51 +1,125 @@ package net.minecraft.client; -import com.google.common.collect.Lists; @@ -58,6 +58,7 @@ import javax.annotation.Nullable; import javax.imageio.ImageIO; + ++import net.optifine.Lang; +import org.apache.commons.io.Charsets; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.Validate; @@ -92,6 +93,7 @@ +import org.vivecraft.gameplay.trackers.ClimbTracker; +import org.vivecraft.gameplay.trackers.EatingTracker; +import org.vivecraft.gameplay.trackers.HorseTracker; ++import org.vivecraft.gameplay.trackers.InteractTracker; +import org.vivecraft.gameplay.trackers.JumpTracker; +import org.vivecraft.gameplay.trackers.RowTracker; +import org.vivecraft.gameplay.trackers.RunTracker; @@ -140,7 +142,7 @@ import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiChat; -@@ -80,6 +152,7 @@ +@@ -80,6 +154,7 @@ import net.minecraft.client.renderer.BlockRendererDispatcher; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.EntityRenderer; @@ -148,7 +150,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; -@@ -163,6 +236,7 @@ +@@ -163,6 +238,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.integrated.IntegratedServer; import net.minecraft.server.management.PlayerProfileCache; @@ -156,7 +158,7 @@ import net.minecraft.stats.RecipeBook; import net.minecraft.stats.StatisticsManager; import net.minecraft.tileentity.TileEntity; -@@ -187,12 +261,14 @@ +@@ -187,12 +263,14 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; @@ -171,7 +173,7 @@ import net.minecraft.world.EnumDifficulty; import net.minecraft.world.WorldProviderEnd; import net.minecraft.world.WorldProviderHell; -@@ -201,25 +277,88 @@ +@@ -201,25 +279,89 @@ import net.minecraft.world.storage.ISaveFormat; import net.minecraft.world.storage.ISaveHandler; import net.minecraft.world.storage.WorldInfo; @@ -211,6 +213,7 @@ + public RowTracker rowTracker = new RowTracker(this); + public TeleportTracker teleportTracker = new TeleportTracker(this); + public SwingTracker swingTracker = new SwingTracker(this); ++ public InteractTracker interactTracker = new InteractTracker(this); + public HorseTracker horseTracker = new HorseTracker(this); + public VehicleTracker vehicleTracker = new VehicleTracker(this); + // VIVE END - teleport movement @@ -269,14 +272,14 @@ + * The minecriftVerString will be automatically updated by the build scripts, do not modify here. + * Modify minecriftversion.py in root minecrift dir. + */ -+ public final String minecriftVerString = "Vivecraft 1.12.2 jrbudda-10-r2"; ++ public final String minecriftVerString = "Vivecraft 1.12.2 jrbudda-11-r1"; + /* end version */ + /** END MINECRIFT */ + private static final Logger LOGGER = LogManager.getLogger(); private static final ResourceLocation LOCATION_MOJANG_PNG = new ResourceLocation("textures/gui/title/mojang.png"); public static final boolean IS_RUNNING_ON_MAC = Util.getOSType() == Util.EnumOS.OSX; -@@ -240,7 +379,7 @@ +@@ -240,7 +382,7 @@ private ServerData currentServerData; /** The RenderEngine instance used by Minecraft */ @@ -285,7 +288,7 @@ /** The instance of the Minecraft Client, set in the constructor. */ private static Minecraft instance; -@@ -257,7 +396,7 @@ +@@ -257,7 +399,7 @@ /** True if the player is connected to a realms server */ private boolean connectedToRealms; @@ -294,7 +297,7 @@ /** Instance of PlayerUsageSnooper. */ private final Snooper usageSnooper = new Snooper("client", this, MinecraftServer.getCurrentTimeMillis()); -@@ -357,7 +496,7 @@ +@@ -357,7 +499,7 @@ private final boolean jvm64bit; private final boolean isDemo; @Nullable @@ -303,7 +306,7 @@ private boolean integratedServerIsRunning; /** The profiler instance */ -@@ -369,15 +508,16 @@ +@@ -369,15 +511,16 @@ private long debugCrashKeyPressTime = -1L; private IReloadableResourceManager mcResourceManager; private final MetadataSerializer metadataSerializer_ = new MetadataSerializer(); @@ -324,7 +327,7 @@ private MusicTicker mcMusicTicker; private ResourceLocation mojangLogo; private final MinecraftSessionService sessionService; -@@ -390,7 +530,7 @@ +@@ -390,7 +533,7 @@ * The BlockRenderDispatcher instance that will be used based off gamesettings */ private BlockRendererDispatcher blockRenderDispatcher; @@ -333,7 +336,7 @@ /** * Set to true to keep the game loop running. Set to false by shutdown() to allow the game loop to exit cleanly. -@@ -412,10 +552,23 @@ +@@ -412,10 +555,23 @@ /** Profiler currently displayed in the debug screen pie chart */ private String debugProfilerName = "root"; @@ -359,7 +362,7 @@ this.mcDataDir = gameConfig.folderInfo.mcDataDir; this.fileAssets = gameConfig.folderInfo.assetsDir; this.fileResourcepacks = gameConfig.folderInfo.resourcePacksDir; -@@ -428,12 +581,14 @@ +@@ -428,12 +584,14 @@ this.sessionService = (new YggdrasilAuthenticationService(this.proxy, UUID.randomUUID().toString())).createMinecraftSessionService(); this.session = gameConfig.userInfo.session; LOGGER.info("Setting user: {}", (Object)this.session.getUsername()); @@ -379,7 +382,7 @@ this.fullscreen = gameConfig.displayInfo.fullscreen; this.jvm64bit = isJvm64bit(); this.integratedServer = null; -@@ -451,6 +606,15 @@ +@@ -451,6 +609,15 @@ this.dataFixer = DataFixesManager.createFixer(); this.toastGui = new GuiToast(this); this.tutorial = new Tutorial(this); @@ -395,7 +398,7 @@ } public void run() -@@ -528,6 +692,7 @@ +@@ -528,6 +695,7 @@ */ private void init() throws LWJGLException, IOException { @@ -403,7 +406,7 @@ this.gameSettings = new GameSettings(this, this.mcDataDir); this.creativeSettings = new CreativeSettings(this, this.mcDataDir); this.defaultResourcePacks.add(this.mcDefaultResourcePack); -@@ -543,6 +708,8 @@ +@@ -543,6 +711,8 @@ this.setWindowIcon(); this.setInitialDisplayMode(); this.createDisplay(); @@ -412,7 +415,7 @@ OpenGlHelper.initializeTextures(); this.framebufferMc = new Framebuffer(this.displayWidth, this.displayHeight, true); this.framebufferMc.setFramebufferColor(0.0F, 0.0F, 0.0F, 0.0F); -@@ -551,10 +718,31 @@ +@@ -551,10 +721,31 @@ this.mcResourceManager = new SimpleReloadableResourceManager(this.metadataSerializer_); this.mcLanguageManager = new LanguageManager(this.metadataSerializer_, this.gameSettings.language); this.mcResourceManager.registerReloadListener(this.mcLanguageManager); @@ -446,7 +449,7 @@ this.skinManager = new SkinManager(this.renderEngine, new File(this.fileAssets, "skins"), this.sessionService); this.saveLoader = new AnvilSaveConverter(new File(this.mcDataDir, "saves"), this.dataFixer); this.mcSoundHandler = new SoundHandler(this.mcResourceManager, this.gameSettings); -@@ -567,12 +755,29 @@ +@@ -567,12 +758,29 @@ this.fontRenderer.setUnicodeFlag(this.isUnicode()); this.fontRenderer.setBidiFlag(this.mcLanguageManager.isCurrentLanguageBidirectional()); } @@ -477,7 +480,7 @@ this.mouseHelper = new MouseHelper(); this.checkGLError("Pre startup"); GlStateManager.enableTexture2D(); -@@ -587,19 +792,26 @@ +@@ -587,19 +795,26 @@ GlStateManager.loadIdentity(); GlStateManager.matrixMode(5888); this.checkGLError("Startup"); @@ -505,7 +508,7 @@ this.entityRenderer = new EntityRenderer(this, this.mcResourceManager); this.mcResourceManager.registerReloadListener(this.entityRenderer); this.blockRenderDispatcher = new BlockRendererDispatcher(this.modelManager.getBlockModelShapes(), this.blockColors); -@@ -610,23 +822,68 @@ +@@ -610,23 +825,68 @@ this.mcResourceManager.registerReloadListener(this.searchTreeManager); GlStateManager.viewport(0, 0, this.displayWidth, this.displayHeight); this.effectRenderer = new ParticleManager(this.world, this.renderEngine); @@ -578,7 +581,7 @@ if (this.gameSettings.fullScreen && !this.fullscreen) { this.toggleFullscreen(); -@@ -634,15 +891,21 @@ +@@ -634,15 +894,21 @@ try { @@ -603,7 +606,7 @@ } /** -@@ -788,6 +1051,21 @@ +@@ -788,6 +1054,21 @@ return false; } @@ -625,7 +628,7 @@ public Framebuffer getFramebuffer() { return this.framebufferMc; -@@ -848,22 +1126,30 @@ +@@ -848,22 +1129,30 @@ File file1 = new File(getMinecraft().mcDataDir, "crash-reports"); File file2 = new File(file1, "crash-" + (new SimpleDateFormat("yyyy-MM-dd_HH.mm.ss")).format(new Date()) + "-client.txt"); Bootstrap.printToSYSOUT(crashReportIn.getCompleteReport()); @@ -660,7 +663,7 @@ } public boolean isUnicode() -@@ -981,8 +1267,8 @@ +@@ -981,8 +1270,8 @@ this.displayWidth = displaymode.getWidth(); this.displayHeight = displaymode.getHeight(); } @@ -671,7 +674,7 @@ { ScaledResolution scaledresolution = new ScaledResolution(this); int i = scaledresolution.getScaleFactor(); -@@ -1075,7 +1361,8 @@ +@@ -1075,7 +1364,8 @@ */ public void displayGuiScreen(@Nullable GuiScreen guiScreenIn) { @@ -681,7 +684,7 @@ { this.currentScreen.onGuiClosed(); } -@@ -1089,13 +1376,32 @@ +@@ -1089,13 +1379,32 @@ guiScreenIn = new GuiGameOver((ITextComponent)null); } @@ -715,7 +718,7 @@ if (guiScreenIn != null) { -@@ -1128,7 +1434,8 @@ +@@ -1128,7 +1437,8 @@ /** * Checks for an OpenGL error. If there is one, prints the error ID and error string. */ @@ -725,7 +728,7 @@ { int i = GlStateManager.glGetError(); -@@ -1165,6 +1472,7 @@ +@@ -1165,6 +1475,7 @@ finally { Display.destroy(); @@ -733,7 +736,7 @@ if (!this.hasCrashed) { -@@ -1181,14 +1489,73 @@ +@@ -1181,14 +1492,73 @@ private void runGameLoop() throws IOException { long i = System.nanoTime(); @@ -778,7 +781,7 @@ + GL11.glViewport(0, 0, this.displayWidth, this.displayHeight); + GlStateManager.clearColor(0, 0, 0, 1); + GlStateManager.clear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT); -+ entityRenderer.displayNotificationText("Render Setup Failed " + " " + e.error, "", "", this.displayWidth, this.displayHeight, false, true); ++ entityRenderer.displayNotificationText(LangHelper.get("vivecraft.messages.rendersetupfailed", e.error), "", "", this.displayWidth, this.displayHeight, false, true); + this.updateDisplay(); + if (this.frameIndex % 300 == 0) + System.out.println(e.title + " " + e.error); @@ -807,7 +810,7 @@ this.mcProfiler.startSection("scheduledExecutables"); synchronized (this.scheduledTasks) -@@ -1200,69 +1567,196 @@ +@@ -1200,69 +1570,196 @@ } this.mcProfiler.endSection(); @@ -1053,7 +1056,7 @@ if (this.isGamePaused != flag) { -@@ -1297,14 +1791,16 @@ +@@ -1297,14 +1794,16 @@ } } @@ -1077,7 +1080,7 @@ } public void updateDisplay() -@@ -1422,7 +1918,7 @@ +@@ -1422,7 +1921,7 @@ /** * Parameter appears to be unused */ @@ -1086,7 +1089,7 @@ { if (this.mcProfiler.profilingEnabled) { -@@ -1432,7 +1928,7 @@ +@@ -1432,7 +1931,7 @@ GlStateManager.matrixMode(5889); GlStateManager.enableColorMaterial(); GlStateManager.loadIdentity(); @@ -1095,7 +1098,7 @@ GlStateManager.matrixMode(5888); GlStateManager.loadIdentity(); GlStateManager.translate(0.0F, 0.0F, -2000.0F); -@@ -1559,7 +2055,8 @@ +@@ -1559,7 +2058,8 @@ } this.inGameHasFocus = true; @@ -1105,7 +1108,7 @@ this.displayGuiScreen((GuiScreen)null); this.leftClickCounter = 10000; } -@@ -1594,84 +2091,98 @@ +@@ -1594,84 +2094,98 @@ } } @@ -1259,7 +1262,7 @@ { this.rightClickDelayTimer = 4; -@@ -1679,7 +2190,7 @@ +@@ -1679,7 +2193,7 @@ { if (this.objectMouseOver == null) { @@ -1268,7 +1271,7 @@ } for (EnumHand enumhand : EnumHand.values()) -@@ -1706,7 +2217,7 @@ +@@ -1706,7 +2220,7 @@ case BLOCK: BlockPos blockpos = this.objectMouseOver.getBlockPos(); @@ -1277,7 +1280,7 @@ { int i = itemstack.getCount(); EnumActionResult enumactionresult = this.playerController.processRightClickBlock(this.player, this.world, blockpos, this.objectMouseOver.sideHit, this.objectMouseOver.hitVec, enumhand); -@@ -1714,10 +2225,14 @@ +@@ -1714,10 +2228,14 @@ if (enumactionresult == EnumActionResult.SUCCESS) { this.player.swingArm(enumhand); @@ -1293,7 +1296,7 @@ } return; -@@ -1745,7 +2260,7 @@ +@@ -1745,7 +2263,7 @@ { this.fullscreen = !this.fullscreen; this.gameSettings.fullScreen = this.fullscreen; @@ -1302,7 +1305,7 @@ if (this.fullscreen) { this.updateDisplayMode(); -@@ -1801,29 +2316,16 @@ +@@ -1801,29 +2319,16 @@ /** * Called to resize the current screen. */ @@ -1337,7 +1340,7 @@ } /** -@@ -1839,11 +2341,21 @@ +@@ -1839,11 +2344,21 @@ */ public void runTick() throws IOException { @@ -1360,7 +1363,7 @@ this.mcProfiler.startSection("gui"); if (!this.isGamePaused) -@@ -1852,7 +2364,7 @@ +@@ -1852,7 +2367,7 @@ } this.mcProfiler.endSection(); @@ -1369,7 +1372,7 @@ this.tutorial.onMouseHover(this.world, this.objectMouseOver); this.mcProfiler.startSection("gameMode"); -@@ -1863,10 +2375,17 @@ +@@ -1863,10 +2378,17 @@ this.mcProfiler.endStartSection("textures"); @@ -1390,7 +1393,7 @@ if (this.currentScreen == null && this.player != null) { -@@ -1930,25 +2449,42 @@ +@@ -1930,25 +2452,42 @@ } } } @@ -1442,7 +1445,7 @@ ++this.joinPlayerCounter; if (this.joinPlayerCounter == 30) -@@ -1956,10 +2492,22 @@ +@@ -1956,10 +2495,22 @@ this.joinPlayerCounter = 0; this.world.joinEntityInSurroundings(this.player); } @@ -1456,7 +1459,7 @@ + this.vrPlayer.updateFreeMove(); + if (this.vrPlayer.teleportWarningTimer >= 0) { + if (--this.vrPlayer.teleportWarningTimer == 0) { -+ printChatMessage("This server does not support teleporting. Restricted movement mode (fallback to free move) has been enabled."); ++ printChatMessage(Lang.get("vivecraft.messages.noserverplugin")); + } } @@ -1466,7 +1469,7 @@ if (!this.isGamePaused) { this.entityRenderer.updateRenderer(); -@@ -1989,6 +2537,9 @@ +@@ -1989,6 +2540,9 @@ this.entityRenderer.stopUseShader(); } @@ -1476,7 +1479,7 @@ if (!this.isGamePaused) { this.mcMusicTicker.update(); -@@ -2043,8 +2594,12 @@ +@@ -2043,8 +2597,12 @@ this.mcProfiler.endStartSection("pendingConnection"); this.myNetworkManager.processReceivedPackets(); } @@ -1490,7 +1493,7 @@ this.systemTime = getSystemTime(); } -@@ -2079,6 +2634,14 @@ +@@ -2079,6 +2637,14 @@ this.currentScreen.handleKeyboardInput(); } @@ -1505,7 +1508,7 @@ boolean flag = Keyboard.getEventKeyState(); if (flag) -@@ -2088,6 +2651,8 @@ +@@ -2088,6 +2654,8 @@ this.entityRenderer.switchUseShader(); } @@ -1514,7 +1517,7 @@ boolean flag1 = false; if (this.currentScreen == null) -@@ -2095,6 +2660,7 @@ +@@ -2095,6 +2663,7 @@ if (i == 1) { this.displayInGameMenu(); @@ -1522,7 +1525,7 @@ } flag1 = Keyboard.isKeyDown(61) && this.processKeyF3(i); -@@ -2102,7 +2668,7 @@ +@@ -2102,7 +2671,7 @@ if (i == 59) { @@ -1531,7 +1534,7 @@ } } -@@ -2150,6 +2716,11 @@ +@@ -2150,6 +2719,11 @@ } } } @@ -1543,7 +1546,7 @@ } this.processKeyBinds(); -@@ -2253,22 +2824,9 @@ +@@ -2253,22 +2827,9 @@ private void processKeyBinds() { for (; this.gameSettings.keyBindTogglePerspective.isPressed(); this.renderGlobal.setDisplayListEntitiesDirty()) @@ -1569,7 +1572,7 @@ } while (this.gameSettings.keyBindSmoothCamera.isPressed()) -@@ -2335,23 +2893,24 @@ +@@ -2335,23 +2896,24 @@ boolean flag2 = this.gameSettings.chatVisibility != EntityPlayer.EnumChatVisibility.HIDDEN; if (flag2) @@ -1603,7 +1606,7 @@ } label109: -@@ -2377,13 +2936,23 @@ +@@ -2377,13 +2939,23 @@ } } } @@ -1633,7 +1636,7 @@ while (this.gameSettings.keyBindUseItem.isPressed()) { this.rightClickMouse(); -@@ -2395,18 +2964,23 @@ +@@ -2395,18 +2967,23 @@ } } @@ -1660,7 +1663,7 @@ int i = Mouse.getEventButton(); KeyBinding.setKeyBindState(i - 100, Mouse.getEventButtonState()); -@@ -2421,6 +2995,11 @@ +@@ -2421,6 +2998,11 @@ KeyBinding.onTick(i - 100); } } @@ -1672,7 +1675,7 @@ long j = getSystemTime() - this.systemTime; -@@ -2456,6 +3035,10 @@ +@@ -2456,6 +3038,10 @@ { this.setIngameFocus(); } @@ -1683,7 +1686,7 @@ } else if (this.currentScreen != null) { -@@ -2475,6 +3058,15 @@ +@@ -2475,6 +3061,15 @@ */ public void launchIntegratedServer(String folderName, String worldName, @Nullable WorldSettings worldSettingsIn) { @@ -1699,7 +1702,7 @@ this.loadWorld((WorldClient)null); System.gc(); ISaveHandler isavehandler = this.saveLoader.getSaveLoader(folderName, false); -@@ -2517,6 +3109,16 @@ +@@ -2517,6 +3112,16 @@ while (!this.integratedServer.serverIsInRunLoop()) { @@ -1716,7 +1719,7 @@ String s = this.integratedServer.getUserMessage(); if (s != null) -@@ -2537,12 +3139,20 @@ +@@ -2537,12 +3142,20 @@ ; } } @@ -1739,7 +1742,7 @@ networkmanager.sendPacket(new CPacketLoginStart(this.getSession().getProfile())); this.myNetworkManager = networkmanager; } -@@ -2552,6 +3162,9 @@ +@@ -2552,6 +3165,9 @@ */ public void loadWorld(@Nullable WorldClient worldClientIn) { @@ -1749,7 +1752,7 @@ this.loadWorld(worldClientIn, ""); } -@@ -2560,6 +3173,11 @@ +@@ -2560,6 +3176,11 @@ */ public void loadWorld(@Nullable WorldClient worldClientIn, String loadingMessage) { @@ -1761,7 +1764,7 @@ if (worldClientIn == null) { NetHandlerPlayClient nethandlerplayclient = this.getConnection(); -@@ -2572,6 +3190,22 @@ +@@ -2572,6 +3193,22 @@ if (this.integratedServer != null && this.integratedServer.isAnvilFileSet()) { this.integratedServer.initiateShutdown(); @@ -1784,7 +1787,7 @@ } this.integratedServer = null; -@@ -2595,6 +3229,11 @@ +@@ -2595,6 +3232,11 @@ this.ingameGUI.resetPlayersOverlayFooterHeader(); this.setServerData((ServerData)null); this.integratedServerIsRunning = false; @@ -1796,7 +1799,7 @@ } this.mcSoundHandler.stopSounds(); -@@ -2665,6 +3304,7 @@ +@@ -2665,6 +3307,7 @@ EntityPlayerSP entityplayersp = this.player; this.player = this.playerController.createPlayer(this.world, this.player == null ? new StatisticsManager() : this.player.getStatFileWriter(), this.player == null ? new RecipeBook() : this.player.getRecipeBook()); this.player.getDataManager().setEntryValues(entityplayersp.getDataManager().getAll()); @@ -1804,7 +1807,7 @@ this.player.dimension = dimension; this.renderViewEntity = this.player; this.player.preparePlayerToSpawn(); -@@ -2701,6 +3341,7 @@ +@@ -2701,6 +3344,7 @@ return instance == null || !instance.gameSettings.hideGUI; } @@ -1812,7 +1815,7 @@ public static boolean isFancyGraphicsEnabled() { return instance != null && instance.gameSettings.fancyGraphics; -@@ -2717,8 +3358,14 @@ +@@ -2717,8 +3361,14 @@ /** * Called when user clicked he's mouse middle button (pick block) */ @@ -1828,7 +1831,7 @@ if (this.objectMouseOver != null && this.objectMouseOver.typeOfHit != RayTraceResult.Type.MISS) { boolean flag = this.player.capabilities.isCreativeMode; -@@ -2882,7 +3529,8 @@ +@@ -2882,7 +3532,8 @@ } } @@ -1838,7 +1841,7 @@ { NBTTagCompound nbttagcompound = te.writeToNBT(new NBTTagCompound()); -@@ -3212,6 +3860,11 @@ +@@ -3212,6 +3863,11 @@ */ public static int getGLMaximumTextureSize() { @@ -1850,7 +1853,7 @@ for (int i = 16384; i > 0; i >>= 1) { GlStateManager.glTexImage2D(32868, 0, 6408, i, i, 0, 6408, 5121, (IntBuffer)null); -@@ -3400,7 +4053,7 @@ +@@ -3400,7 +4056,7 @@ } public void dispatchKeypresses() @@ -1859,7 +1862,7 @@ int i = Keyboard.getEventKey() == 0 ? Keyboard.getEventCharacter() + 256 : Keyboard.getEventKey(); if (i != 0 && !Keyboard.isRepeatEvent()) -@@ -3582,4 +4235,679 @@ +@@ -3582,4 +4238,680 @@ { return this.tutorial; } @@ -2177,7 +2180,8 @@ + vrPlayer.registerTracker(teleportTracker); + vrPlayer.registerTracker(horseTracker); + vrPlayer.registerTracker(vehicleTracker); -+ ++ vrPlayer.registerTracker(interactTracker); ++ + //TODO: init new steroerenderer + + nativeMouseCursor = Mouse.getNativeCursor(); diff --git a/patches/net/minecraft/client/entity/EntityPlayerSP.java.patch b/patches/net/minecraft/client/entity/EntityPlayerSP.java.patch index c43f336..0a13ba2 100644 --- a/patches/net/minecraft/client/entity/EntityPlayerSP.java.patch +++ b/patches/net/minecraft/client/entity/EntityPlayerSP.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/entity/EntityPlayerSP.java +++ b/net/minecraft/client/entity/EntityPlayerSP.java -@@ -2,6 +2,18 @@ +@@ -2,6 +2,19 @@ import java.util.List; import javax.annotation.Nullable; @@ -16,10 +16,11 @@ +import io.netty.buffer.Unpooled; +import net.minecraft.block.Block; +import net.minecraft.block.SoundType; ++import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.ElytraSound; -@@ -26,6 +38,7 @@ +@@ -26,6 +39,7 @@ import net.minecraft.client.gui.inventory.GuiFurnace; import net.minecraft.client.gui.inventory.GuiScreenHorseInventory; import net.minecraft.client.gui.inventory.GuiShulkerBox; @@ -27,7 +28,7 @@ import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.entity.Entity; import net.minecraft.entity.IJumpingMount; -@@ -35,11 +48,14 @@ +@@ -35,11 +49,14 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.entity.passive.AbstractHorse; @@ -42,7 +43,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemElytra; import net.minecraft.item.ItemStack; -@@ -49,6 +65,7 @@ +@@ -49,6 +66,7 @@ import net.minecraft.network.play.client.CPacketChatMessage; import net.minecraft.network.play.client.CPacketClientStatus; import net.minecraft.network.play.client.CPacketCloseWindow; @@ -50,7 +51,7 @@ import net.minecraft.network.play.client.CPacketEntityAction; import net.minecraft.network.play.client.CPacketInput; import net.minecraft.network.play.client.CPacketPlayer; -@@ -58,6 +75,7 @@ +@@ -58,6 +76,7 @@ import net.minecraft.network.play.client.CPacketVehicleMove; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -58,7 +59,7 @@ import net.minecraft.stats.RecipeBook; import net.minecraft.stats.StatBase; import net.minecraft.stats.StatisticsManager; -@@ -70,6 +88,7 @@ +@@ -70,6 +89,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MovementInput; @@ -66,7 +67,7 @@ import net.minecraft.util.SoundEvent; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -@@ -141,6 +160,20 @@ +@@ -141,6 +161,20 @@ */ protected int sprintToggleTimer; @@ -87,7 +88,7 @@ /** Ticks left before sprinting is disabled. */ public int sprintingTicksLeft; public float renderArmYaw; -@@ -170,13 +203,43 @@ +@@ -170,13 +204,43 @@ this.recipeBook = p_i47378_5_; this.mc = p_i47378_1_; this.dimension = 0; @@ -131,7 +132,7 @@ return false; } -@@ -187,6 +250,8 @@ +@@ -187,6 +251,8 @@ { } @@ -140,7 +141,7 @@ public boolean startRiding(Entity entityIn, boolean force) { if (!super.startRiding(entityIn, force)) -@@ -204,22 +269,30 @@ +@@ -204,22 +270,30 @@ { this.prevRotationYaw = entityIn.rotationYaw; this.rotationYaw = entityIn.rotationYaw; @@ -176,7 +177,7 @@ /** * interpolated look vector */ -@@ -292,6 +365,7 @@ +@@ -292,6 +366,7 @@ this.serverSneakState = flag1; } @@ -184,7 +185,7 @@ if (this.isCurrentViewEntity()) { AxisAlignedBB axisalignedbb = this.getEntityBoundingBox(); -@@ -304,26 +378,39 @@ +@@ -304,26 +379,39 @@ boolean flag2 = d0 * d0 + d1 * d1 + d2 * d2 > 9.0E-4D || this.positionUpdateTicks >= 20; boolean flag3 = d3 != 0.0D || d4 != 0.0D; @@ -244,7 +245,7 @@ } if (flag2) -@@ -341,10 +428,19 @@ +@@ -341,10 +429,19 @@ } this.prevOnGround = this.onGround; @@ -264,7 +265,7 @@ @Nullable /** -@@ -358,11 +454,23 @@ +@@ -358,11 +455,23 @@ return null; } @@ -290,7 +291,7 @@ /** * Sends a chat message from the player. */ -@@ -545,72 +653,129 @@ +@@ -545,72 +654,129 @@ } } @@ -484,7 +485,7 @@ } /** -@@ -618,7 +783,11 @@ +@@ -618,7 +784,11 @@ */ private boolean isOpenBlockSpace(BlockPos pos) { @@ -497,7 +498,7 @@ } /** -@@ -682,7 +851,19 @@ +@@ -682,7 +852,19 @@ public void playSound(SoundEvent soundIn, float volume, float pitch) { @@ -518,7 +519,7 @@ } /** -@@ -975,6 +1156,9 @@ +@@ -975,6 +1157,9 @@ float f = 0.8F; boolean flag2 = this.movementInput.moveForward >= 0.8F; this.movementInput.updatePlayerMoveState(); @@ -528,7 +529,7 @@ this.mc.getTutorial().handleMovement(this.movementInput); if (this.isHandActive() && !this.isRiding()) -@@ -994,10 +1178,19 @@ +@@ -994,10 +1179,19 @@ } AxisAlignedBB axisalignedbb = this.getEntityBoundingBox(); @@ -552,7 +553,7 @@ boolean flag4 = (float)this.getFoodStats().getFoodLevel() > 6.0F || this.capabilities.allowFlying; if (this.onGround && !flag1 && !flag2 && this.movementInput.moveForward >= 0.8F && !this.isSprinting() && flag4 && !this.isHandActive() && !this.isPotionActive(MobEffects.BLINDNESS)) -@@ -1032,7 +1225,7 @@ +@@ -1032,7 +1226,7 @@ this.sendPlayerAbilities(); } } @@ -561,7 +562,7 @@ { if (this.flyToggleTimer == 0) { -@@ -1120,6 +1313,10 @@ +@@ -1120,6 +1314,10 @@ super.onLivingUpdate(); @@ -572,7 +573,7 @@ if (this.onGround && this.capabilities.isFlying && !this.mc.playerController.isSpectatorMode()) { this.capabilities.isFlying = false; -@@ -1139,7 +1336,7 @@ +@@ -1139,7 +1337,7 @@ { EntityBoat entityboat = (EntityBoat)this.getRidingEntity(); entityboat.updateInputs(this.movementInput.leftKeyDown, this.movementInput.rightKeyDown, this.movementInput.forwardKeyDown, this.movementInput.backKeyDown); @@ -581,7 +582,7 @@ } } -@@ -1170,10 +1367,47 @@ +@@ -1170,10 +1368,47 @@ */ public void move(MoverType type, double x, double y, double z) { @@ -633,7 +634,7 @@ } public boolean isAutoJumpEnabled() -@@ -1199,12 +1433,16 @@ +@@ -1199,12 +1434,16 @@ float f = this.getAIMoveSpeed(); float f1 = (float)vec3d2.lengthSquared(); @@ -652,7 +653,7 @@ vec3d2 = new Vec3d((double)(f2 * f5 - f3 * f4), vec3d2.y, (double)(f3 * f5 + f2 * f4)); f1 = (float)vec3d2.lengthSquared(); -@@ -1324,4 +1562,380 @@ +@@ -1324,4 +1563,383 @@ } } } @@ -838,14 +839,13 @@ + directionVec = directionVec.rotatePitch(con.vrdata_world_pre.getController(1).getPitch() * PIOVER180); + break; + case VRSettings.FREEMOVE_HMD: -+ directionVec = directionVec.rotatePitch(con.vrdata_world_pre.hmd.getPitch() * PIOVER180); -+ break; + case VRSettings.FREEMOVE_RUNINPLACE: ++ case VRSettings.FREEMOVE_ROOM: + //hmd pitch -+ directionVec = directionVec.rotatePitch(con.vrdata_world_pre.hmd.getPitch()* PIOVER180); -+ break; -+ } ++ directionVec = directionVec.rotatePitch(con.vrdata_world_pre.hmd.getPitch()* PIOVER180); ++ break; + } ++ } + + if(mc.jumpTracker.isjumping()){ + directionVec=directionVec.rotateYaw(-con.vrdata_world_pre.hmd.getYaw() * PIOVER180); @@ -861,6 +861,10 @@ + directionVec = directionVec.rotateYaw((float) (-mc.runTracker.getYaw() * PIOVER180)); + directionVec = directionVec.scale(mc.runTracker.getSpeed()); + break; ++ case VRSettings.FREEMOVE_ROOM: ++ directionVec = directionVec.rotateYaw((180+mc.vrSettings.vrWorldRotation) * PIOVER180); ++ break; ++ + } + } + } @@ -1018,7 +1022,7 @@ + this.world.playSound((EntityPlayer)null, soundPos.x, soundPos.y, soundPos.z, soundIn, this.getSoundCategory(), volume, pitch); + } + } -+ ++ + // FORGE + public void updateSyncFields(EntityPlayerSP old) + { diff --git a/patches/net/minecraft/client/gui/GuiIngame.java.patch b/patches/net/minecraft/client/gui/GuiIngame.java.patch index 0748866..291d471 100644 --- a/patches/net/minecraft/client/gui/GuiIngame.java.patch +++ b/patches/net/minecraft/client/gui/GuiIngame.java.patch @@ -92,15 +92,49 @@ { GameSettings gamesettings = this.mc.gameSettings; -@@ -592,6 +594,7 @@ +@@ -592,25 +594,45 @@ int j = 182; int k = 91; this.zLevel = -90.0F; + GlStateManager.enableAlpha(); this.drawTexturedModalRect(i - 91, sr.getScaledHeight() - 22, 0, 0, 182, 22); this.drawTexturedModalRect(i - 91 - 1 + entityplayer.inventory.currentItem * 20, sr.getScaledHeight() - 22 - 1, 0, 22, 24, 22); +- +- if (!itemstack.isEmpty()) ++ ++ //Vivecraft - render hotbar context selection. ++ if(mc.interactTracker.hotbar >= 0 && mc.interactTracker.hotbar < 9 && entityplayer.inventory.currentItem != mc.interactTracker.hotbar) { ++ GlStateManager.color(0.0F, 1.0F, 0.0F, 1.0F); ++ this.drawTexturedModalRect(i - 91 - 1 + mc.interactTracker.hotbar * 20, sr.getScaledHeight() - 22 - 1, 0, 22, 24, 22); ++ GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); ++ } ++ // ++ ++ if (!itemstack.isEmpty() || mc.vrSettings.vrTouchHotbar) + { + if (enumhandside == EnumHandSide.LEFT) + { +- this.drawTexturedModalRect(i - 91 - 29, sr.getScaledHeight() - 23, 24, 22, 29, 24); ++ if(mc.interactTracker.hotbar == 9 ) { ++ GlStateManager.color(0.0F, 0.0F, 1.0F, 1.0F); ++ this.drawTexturedModalRect(i - 91 - 29, sr.getScaledHeight() - 23, 24, 22, 29, 24); ++ GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); ++ } else { ++ this.drawTexturedModalRect(i - 91 - 29, sr.getScaledHeight() - 23, 24, 22, 29, 24); ++ } + } + else + { +- this.drawTexturedModalRect(i + 91, sr.getScaledHeight() - 23, 53, 22, 29, 24); ++ if(mc.interactTracker.hotbar == 9) { ++ GlStateManager.color(0.0F, 0.0F, 1.0F, 1.0F); ++ this.drawTexturedModalRect(i + 91, sr.getScaledHeight() - 23, 53, 22, 29, 24); ++ GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); ++ } else ++ this.drawTexturedModalRect(i + 91, sr.getScaledHeight() - 23, 53, 22, 29, 24); + } + } -@@ -610,7 +613,7 @@ this.zLevel = f; GlStateManager.enableRescaleNormal(); GlStateManager.enableBlend(); @@ -109,7 +143,7 @@ RenderHelper.enableGUIStandardItemLighting(); CustomItems.setRenderOffHand(false); -@@ -788,7 +791,7 @@ +@@ -788,7 +810,7 @@ this.mc.mcProfiler.endSection(); } @@ -118,7 +152,7 @@ { Scoreboard scoreboard = objective.getScoreboard(); Collection collection = scoreboard.getSortedScores(objective); -@@ -846,11 +849,11 @@ +@@ -846,11 +868,11 @@ } } @@ -132,7 +166,7 @@ int i = MathHelper.ceil(entityplayer.getHealth()); boolean flag = this.healthUpdateCounter > (long)this.updateCounter && (this.healthUpdateCounter - (long)this.updateCounter) / 3L % 2L == 1L; -@@ -1005,7 +1008,7 @@ +@@ -1005,7 +1027,7 @@ } } } @@ -141,7 +175,7 @@ Entity entity = entityplayer.getRidingEntity(); if (entity == null || !(entity instanceof EntityLivingBase)) -@@ -1069,7 +1072,7 @@ +@@ -1069,7 +1091,7 @@ } } @@ -150,7 +184,7 @@ { if (this.mc.getRenderViewEntity() instanceof EntityPlayer) { -@@ -1123,7 +1126,7 @@ +@@ -1123,7 +1145,7 @@ } } @@ -159,7 +193,7 @@ { GlStateManager.disableDepth(); GlStateManager.depthMask(false); -@@ -1150,6 +1153,8 @@ +@@ -1150,6 +1172,8 @@ */ private void renderVignette(float lightLevel, ScaledResolution scaledRes) { @@ -168,7 +202,7 @@ if (!Config.isVignetteEnabled()) { GlStateManager.enableDepth(); -@@ -1203,38 +1208,9 @@ +@@ -1203,38 +1227,9 @@ } } @@ -209,7 +243,7 @@ } private void renderHotbarItem(int p_184044_1_, int p_184044_2_, float p_184044_3_, EntityPlayer player, ItemStack stack) -@@ -1429,4 +1405,55 @@ +@@ -1429,4 +1424,55 @@ { return this.overlayBoss; } diff --git a/patches/net/minecraft/client/gui/GuiIngameMenu.java.patch b/patches/net/minecraft/client/gui/GuiIngameMenu.java.patch index 34dd3f0..47ad932 100644 --- a/patches/net/minecraft/client/gui/GuiIngameMenu.java.patch +++ b/patches/net/minecraft/client/gui/GuiIngameMenu.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/gui/GuiIngameMenu.java +++ b/net/minecraft/client/gui/GuiIngameMenu.java -@@ -1,11 +1,20 @@ +@@ -1,11 +1,21 @@ package net.minecraft.client.gui; import java.io.IOException; @@ -17,11 +17,12 @@ import net.minecraft.client.resources.I18n; +import net.minecraft.client.settings.KeyBinding; import net.minecraft.realms.RealmsBridge; ++import net.optifine.Lang; +import net.optifine.reflect.Reflector; public class GuiIngameMenu extends GuiScreen { -@@ -19,22 +28,41 @@ +@@ -19,22 +29,41 @@ public void initGui() { this.saveStep = 0; @@ -46,18 +47,18 @@ - this.buttonList.add(new GuiButton(6, this.width / 2 + 2, this.height / 4 + 48 + -16, 98, 20, I18n.format("gui.stats"))); + this.buttonList.add(new GuiButton(4, this.width / 2 - 100, this.height / 4 + 24 + var1, I18n.format("menu.returnToGame", new Object[0]))); + this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 + 96 + var1, 98, 20, I18n.format("menu.options", new Object[0]))); -+ this.buttonList.add(new GuiButton(100, this.width / 2 -100, this.height / 4 + 72 + var1,98,20, "Chat")); -+ this.buttonList.add(new GuiButton(101, this.width / 2 + 2, this.height / 4 + 72 + var1, 98, 20, "Commands")); -+ this.buttonList.add(new GuiButton(102, this.width / 2 - 100,this.height / 4 + 120 + var1, 49, 20, "Overlay")); -+ this.buttonList.add(new GuiButton(103, this.width / 2 - 50,this.height / 4 + 120 + var1, 49, 20, "Profiler")); -+ this.buttonList.add(new GuiButton(104, this.width / 2 + 2,this.height / 4 + 120 + var1, 98, 20, "Screenshot")); ++ this.buttonList.add(new GuiButton(100, this.width / 2 -100, this.height / 4 + 72 + var1,98,20, Lang.get("vivecraft.gui.chat"))); ++ this.buttonList.add(new GuiButton(101, this.width / 2 + 2, this.height / 4 + 72 + var1, 98, 20, Lang.get("vivecraft.gui.commands"))); ++ this.buttonList.add(new GuiButton(102, this.width / 2 - 100,this.height / 4 + 120 + var1, 49, 20, Lang.get("vivecraft.gui.overlay"))); ++ this.buttonList.add(new GuiButton(103, this.width / 2 - 50,this.height / 4 + 120 + var1, 49, 20, Lang.get("vivecraft.gui.profiler"))); ++ this.buttonList.add(new GuiButton(104, this.width / 2 + 2,this.height / 4 + 120 + var1, 98, 20, Lang.get("vivecraft.gui.screenshot"))); + // this.buttonList.add(new GuiButton(999, this.width / 2 + 100,this.height / 4 + 72 + var1, 98, 20, "DEMO MODE")); + + if(Reflector.forgeExists()) //todo: test position. -+ this.buttonList.add(new GuiButton(12, this.width / 2 -50, this.height / 4 + 144 + var1, 98, 20, "Mod Options...")); ++ this.buttonList.add(new GuiButton(12, this.width / 2 -50, this.height / 4 + 144 + var1, 98, 20, I18n.format("fml.menu.modoptions"))); + + if(mc.vrSettings.seated == false) -+ this.buttonList.add(new GuiButton(105, this.width / 2 - 100, this.height / 4 + 144 + var1, "Calibrate Height")); ++ this.buttonList.add(new GuiButton(105, this.width / 2 - 100, this.height / 4 + 144 + var1, Lang.get("vivecraft.gui.calibrateheight"))); + + GuiButton guibutton = this.addButton(new GuiButton(7, this.width / 2 + 2, this.height / 4 + 96 + var1, 98, 20, I18n.format("menu.shareToLan"))); + guibutton.enabled = this.mc.isSingleplayer() && !this.mc.getIntegratedServer().getPublic(); @@ -65,12 +66,12 @@ + this.buttonList.add(new GuiButton(6, this.width / 2 + 2, this.height / 4 + 48 + var1, 98, 20, I18n.format("gui.stats"))); + + if(Main.katvr) -+ this.buttonList.add(new GuiButton(106, this.width / 2 + 100,this.height / 4 + var1, 98, 20, "Align KAT WALK")); ++ this.buttonList.add(new GuiButton(106, this.width / 2 + 100,this.height / 4 + var1, 98, 20, Lang.get("vivecraft.gui.alignkatwalk"))); + } /** -@@ -71,24 +99,66 @@ +@@ -71,24 +100,66 @@ case 2: case 3: diff --git a/patches/net/minecraft/client/gui/GuiOptions.java.patch b/patches/net/minecraft/client/gui/GuiOptions.java.patch index 6f219f0..c81269d 100644 --- a/patches/net/minecraft/client/gui/GuiOptions.java.patch +++ b/patches/net/minecraft/client/gui/GuiOptions.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/gui/GuiOptions.java +++ b/net/minecraft/client/gui/GuiOptions.java -@@ -1,6 +1,9 @@ +@@ -1,12 +1,16 @@ package net.minecraft.client.gui; import java.io.IOException; @@ -10,7 +10,14 @@ import net.minecraft.client.resources.I18n; import net.minecraft.client.settings.GameSettings; import net.minecraft.util.text.ITextComponent; -@@ -21,6 +24,7 @@ + import net.minecraft.util.text.TextComponentString; + import net.minecraft.util.text.TextComponentTranslation; + import net.minecraft.world.EnumDifficulty; ++import net.optifine.Lang; + + public class GuiOptions extends GuiScreen + { +@@ -21,6 +25,7 @@ public GuiOptions(GuiScreen p_i1046_1_, GameSettings p_i1046_2_) { @@ -18,7 +25,7 @@ this.lastScreen = p_i1046_1_; this.settings = p_i1046_2_; } -@@ -31,6 +35,7 @@ +@@ -31,6 +36,7 @@ */ public void initGui() { @@ -26,7 +33,7 @@ this.title = I18n.format("options.title"); int i = 0; -@@ -38,11 +43,21 @@ +@@ -38,11 +44,21 @@ { if (gamesettings$options.isFloat()) { @@ -35,7 +42,7 @@ + /** MINECRIFT */ + if (gamesettings$options.getTranslation().equalsIgnoreCase("options.fov")) + { -+ GuiOptionButton var7 = new GuiOptionButton(666, this.width / 2 - 155 + var1 % 2 * 160, this.height / 6 - 12 + 24 * (var1 >> 1), "VR Settings..."); ++ GuiOptionButton var7 = new GuiOptionButton(666, this.width / 2 - 155 + var1 % 2 * 160, this.height / 6 - 12 + 24 * (var1 >> 1), Lang.get("vivecraft.options.screen.main.button")); + this.buttonList.add(var7); + } + else @@ -51,7 +58,7 @@ this.buttonList.add(guioptionbutton); } -@@ -199,6 +214,14 @@ +@@ -199,6 +215,14 @@ this.mc.gameSettings.saveOptions(); this.mc.displayGuiScreen(new GuiScreenOptionsSounds(this, this.settings)); } diff --git a/patches/net/minecraft/client/network/NetHandlerPlayClient.java.patch b/patches/net/minecraft/client/network/NetHandlerPlayClient.java.patch index c28d1a0..81b5c2d 100644 --- a/patches/net/minecraft/client/network/NetHandlerPlayClient.java.patch +++ b/patches/net/minecraft/client/network/NetHandlerPlayClient.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/client/network/NetHandlerPlayClient.java +++ b/net/minecraft/client/network/NetHandlerPlayClient.java -@@ -1,17 +1,28 @@ +@@ -1,17 +1,29 @@ package net.minecraft.client.network; +import com.google.common.base.Charsets; @@ -13,6 +13,7 @@ +import org.vivecraft.gameplay.OpenVRPlayer; +import org.vivecraft.render.PlayerModelController; +import org.vivecraft.utils.BlockWithData; ++import org.vivecraft.utils.LangHelper; + import io.netty.buffer.Unpooled; + @@ -29,7 +30,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Iterator; -@@ -20,7 +31,6 @@ +@@ -20,7 +32,6 @@ import java.util.Random; import java.util.UUID; import java.util.Map.Entry; @@ -37,15 +38,16 @@ import javax.annotation.Nullable; import net.minecraft.advancements.Advancement; import net.minecraft.block.Block; -@@ -224,6 +234,7 @@ +@@ -224,6 +235,8 @@ import net.minecraft.scoreboard.Scoreboard; import net.minecraft.scoreboard.Team; import net.minecraft.stats.RecipeBook; ++import net.optifine.Lang; +import net.optifine.reflect.Reflector; import net.minecraft.stats.StatBase; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityBanner; -@@ -246,6 +257,7 @@ +@@ -246,6 +259,7 @@ import net.minecraft.util.StringUtils; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -53,7 +55,7 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; -@@ -256,6 +268,7 @@ +@@ -256,6 +270,7 @@ import net.minecraft.world.WorldSettings; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.storage.MapData; @@ -61,7 +63,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -@@ -309,6 +322,10 @@ +@@ -309,6 +324,10 @@ this.netManager = networkManagerIn; this.profile = profileIn; this.advancementManager = new ClientAdvancementManager(mcIn); @@ -72,7 +74,7 @@ } /** -@@ -327,7 +344,19 @@ +@@ -327,7 +346,19 @@ { PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.gameController); this.gameController.playerController = new PlayerControllerMP(this.gameController, this); @@ -93,7 +95,7 @@ this.gameController.gameSettings.difficulty = packetIn.getDifficulty(); this.gameController.loadWorld(this.clientWorldController); this.gameController.player.dimension = packetIn.getDimension(); -@@ -338,6 +367,10 @@ +@@ -338,6 +369,10 @@ this.gameController.playerController.setGameType(packetIn.getGameType()); this.gameController.gameSettings.sendSettingsToServer(); this.netManager.sendPacket(new CPacketCustomPayload("MC|Brand", (new PacketBuffer(Unpooled.buffer())).writeString(ClientBrandRetriever.getClientModName()))); @@ -104,7 +106,7 @@ } /** -@@ -837,10 +870,15 @@ +@@ -837,10 +872,15 @@ BlockPos blockpos = new BlockPos(nbttagcompound.getInteger("x"), nbttagcompound.getInteger("y"), nbttagcompound.getInteger("z")); TileEntity tileentity = this.clientWorldController.getTileEntity(blockpos); @@ -121,7 +123,7 @@ } } -@@ -864,7 +902,11 @@ +@@ -864,7 +904,11 @@ */ public void handleDisconnect(SPacketDisconnect packetIn) { @@ -134,7 +136,7 @@ } /** -@@ -916,8 +958,8 @@ +@@ -916,8 +960,8 @@ else { this.clientWorldController.playSound(entity.posX, entity.posY, entity.posZ, SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.2F, (this.avRandomizer.nextFloat() - this.avRandomizer.nextFloat()) * 1.4F + 2.0F, false); @@ -145,7 +147,7 @@ if (entity instanceof EntityItem) { ((EntityItem)entity).getItem().setCount(packetIn.getAmount()); -@@ -934,7 +976,24 @@ +@@ -934,7 +978,24 @@ public void handleChat(SPacketChat packetIn) { PacketThreadUtil.checkThreadAndEnqueue(packetIn, this, this.gameController); @@ -171,7 +173,7 @@ } /** -@@ -1077,7 +1136,14 @@ +@@ -1077,7 +1138,14 @@ if (entity1 == this.gameController.player && !flag) { @@ -187,7 +189,7 @@ } } } -@@ -1160,11 +1226,16 @@ +@@ -1160,11 +1228,16 @@ { this.doneLoadingTerrain = false; Scoreboard scoreboard = this.clientWorldController.getScoreboard(); @@ -205,7 +207,7 @@ } this.gameController.setDimensionAndSpawnPlayer(packetIn.getDimensionID()); -@@ -1355,7 +1426,19 @@ +@@ -1355,7 +1428,19 @@ { tileentity.readFromNBT(packetIn.getNbtCompound()); } @@ -226,7 +228,7 @@ if (flag && this.gameController.currentScreen instanceof GuiCommandBlock) { ((GuiCommandBlock)this.gameController.currentScreen).updateGui(); -@@ -1469,15 +1552,41 @@ +@@ -1469,15 +1554,41 @@ } else if (f == 101.0F) { @@ -271,7 +273,7 @@ } } else if (i == 6) -@@ -1647,7 +1756,7 @@ +@@ -1647,7 +1758,7 @@ if (entity instanceof EntityLivingBase) { @@ -280,7 +282,7 @@ if (potion != null) { -@@ -2029,6 +2138,7 @@ +@@ -2029,6 +2140,7 @@ } finally { @@ -288,7 +290,7 @@ packetbuffer.release(); } } -@@ -2068,6 +2178,111 @@ +@@ -2068,6 +2180,111 @@ String s1 = packetbuffer3.readString(256); this.gameController.getSoundHandler().stop(s1, SoundCategory.getByName(s)); } @@ -309,7 +311,7 @@ + String v = packetbuffer.readString(1024); + this.gameController.vrPlayer.setTeleportSupported(true); + this.gameController.vrPlayer.teleportWarningTimer = -1; -+ this.gameController.printChatMessage("Vivecraft server mod detected: " + v); ++ this.gameController.printChatMessage(LangHelper.get("vivecraft.messages.serverplugin", v)); + break; + case REQUESTDATA: + NetworkHelper.serverWantsData = true; @@ -400,7 +402,7 @@ } /** -@@ -2358,4 +2573,12 @@ +@@ -2358,4 +2575,12 @@ { return this.advancementManager; } diff --git a/patches/net/minecraft/client/renderer/EntityRenderer.java.patch b/patches/net/minecraft/client/renderer/EntityRenderer.java.patch index e744391..a90fc87 100644 --- a/patches/net/minecraft/client/renderer/EntityRenderer.java.patch +++ b/patches/net/minecraft/client/renderer/EntityRenderer.java.patch @@ -664,8 +664,7 @@ + public void setupCameraTransform(float partialTicks, int pass, boolean isClouds) { - this.farPlaneDistance = (float)(this.mc.gameSettings.renderDistanceChunks * 16); -+ /** MINECRIFT */ - +- - if (Config.isFogFancy()) - { - this.farPlaneDistance *= 0.95F; @@ -691,7 +690,8 @@ - { - this.clipDistance = 173.0F; - } -- ++ /** MINECRIFT */ + - if (this.cameraZoom != 1.0D) - { - GlStateManager.translate((float)this.cameraYaw, (float)(-this.cameraPitch), 0.0F); @@ -1020,7 +1020,8 @@ - { - this.frameInit(); - boolean flag = Display.isActive(); -- ++ {// called each eye + - if (!flag && this.mc.gameSettings.pauseOnLostFocus && (!this.mc.gameSettings.touchscreen || !Mouse.isButtonDown(1))) - { - if (Minecraft.getSystemTime() - this.prevFrameTime > 500L) @@ -1034,7 +1035,9 @@ - } - - this.mc.mcProfiler.startSection("mouse"); -- ++ if(mc.currentPass == RenderPass.LEFT) //contains all the stuff that was in this method that only needs to be called once per frame. ++ updateCameraAndRender_OnePass(partialTicks); + - if (flag && Minecraft.IS_RUNNING_ON_MAC && this.mc.inGameHasFocus && !Mouse.isInsideWindow()) - { - Mouse.setGrabbed(false); @@ -1051,15 +1054,12 @@ - float f2 = (float)this.mc.mouseHelper.deltaX * f1; - float f3 = (float)this.mc.mouseHelper.deltaY * f1; - int i = 1; -+ {// called each eye - +- - if (this.mc.gameSettings.invertMouse) - { - i = -1; - } -+ if(mc.currentPass == RenderPass.LEFT) //contains all the stuff that was in this method that only needs to be called once per frame. -+ updateCameraAndRender_OnePass(partialTicks); - +- - if (this.mc.gameSettings.smoothCamera) - { - this.smoothCamYaw += f2; @@ -1075,6 +1075,32 @@ - this.smoothCamYaw = 0.0F; - this.smoothCamPitch = 0.0F; - this.mc.player.turn(f2, f3 * (float)i); +- } +- } +- +- this.mc.mcProfiler.endSection(); +- +- if (!this.mc.skipRenderWorld) +- { +- anaglyphEnable = this.mc.gameSettings.anaglyph; +- final ScaledResolution scaledresolution = new ScaledResolution(this.mc); +- int i1 = scaledresolution.getScaledWidth(); +- int j1 = scaledresolution.getScaledHeight(); +- final int k1 = Mouse.getX() * i1 / this.mc.displayWidth; +- final int l1 = j1 - Mouse.getY() * j1 / this.mc.displayHeight - 1; +- int i2 = this.mc.gameSettings.limitFramerate; +- +- if (this.mc.world == null) +- { +- GlStateManager.viewport(0, 0, this.mc.displayWidth, this.mc.displayHeight); +- GlStateManager.matrixMode(5889); +- GlStateManager.loadIdentity(); +- GlStateManager.matrixMode(5888); +- GlStateManager.loadIdentity(); +- this.setupOverlayRendering(); +- this.renderEndNanoTime = System.nanoTime(); +- TileEntityRendererDispatcher.instance.renderEngine = this.mc.getTextureManager(); +- TileEntityRendererDispatcher.instance.fontRenderer = this.mc.fontRenderer; + if (!this.mc.skipRenderWorld) + {//RENDER WORLD + /** MINECRIFT */ @@ -1161,38 +1187,6 @@ + else + render2D(partialTicks, KeyboardHandler.Framebuffer, KeyboardHandler.Pos_room, KeyboardHandler.Rotation_room); } -- } - -- this.mc.mcProfiler.endSection(); -+ if( mc.currentPass != RenderPass.THIRD || mc.vrSettings.mixedRealityRenderHands){ -+ // VIVE START - render controllers in main menu -+ this.mc.mcProfiler.startSection("mainMenuHands"); -+ renderMainMenuHands(partialTicks); -+ this.mc.mcProfiler.endSection(); -+ } - -- if (!this.mc.skipRenderWorld) -- { -- anaglyphEnable = this.mc.gameSettings.anaglyph; -- final ScaledResolution scaledresolution = new ScaledResolution(this.mc); -- int i1 = scaledresolution.getScaledWidth(); -- int j1 = scaledresolution.getScaledHeight(); -- final int k1 = Mouse.getX() * i1 / this.mc.displayWidth; -- final int l1 = j1 - Mouse.getY() * j1 / this.mc.displayHeight - 1; -- int i2 = this.mc.gameSettings.limitFramerate; -- -- if (this.mc.world == null) -- { -- GlStateManager.viewport(0, 0, this.mc.displayWidth, this.mc.displayHeight); -- GlStateManager.matrixMode(5889); -- GlStateManager.loadIdentity(); -- GlStateManager.matrixMode(5888); -- GlStateManager.loadIdentity(); -- this.setupOverlayRendering(); -- this.renderEndNanoTime = System.nanoTime(); -- TileEntityRendererDispatcher.instance.renderEngine = this.mc.getTextureManager(); -- TileEntityRendererDispatcher.instance.fontRenderer = this.mc.fontRenderer; -- } - else - { - this.mc.mcProfiler.startSection("level"); @@ -1201,26 +1195,21 @@ - long k = System.nanoTime() - nanoTime; - long l = Math.max((long)(1000000000 / j / 4) - k, 0L); - this.renderWorld(partialTicks, System.nanoTime() + l); -+ this.mc.mcProfiler.endSection(); -+ } - +- - if (this.mc.isSingleplayer() && this.timeWorldIcon < Minecraft.getSystemTime() - 1000L) - { - this.timeWorldIcon = Minecraft.getSystemTime(); - +- - if (!this.mc.getIntegratedServer().isWorldIconSet()) - { - this.createWorldIcon(); - } - } -+ // Minecrift - handle notification text -+ handleNotificationText(); - +- - if (OpenGlHelper.shadersSupported) - { - this.mc.renderGlobal.renderEntityOutlineFramebuffer(); -+ this.renderEndNanoTime = System.nanoTime(); - +- - if (this.shaderGroup != null && this.useShader) - { - GlStateManager.matrixMode(5890); @@ -1235,7 +1224,7 @@ - - this.renderEndNanoTime = System.nanoTime(); - this.mc.mcProfiler.endStartSection("gui"); -- + - if (!this.mc.gameSettings.hideGUI || this.mc.currentScreen != null) - { - GlStateManager.alphaFunc(516, 0.1F); @@ -1247,16 +1236,24 @@ - { - Config.drawFps(); - } -- ++ if( mc.currentPass != RenderPass.THIRD || mc.vrSettings.mixedRealityRenderHands){ ++ // VIVE START - render controllers in main menu ++ this.mc.mcProfiler.startSection("mainMenuHands"); ++ renderMainMenuHands(partialTicks); ++ this.mc.mcProfiler.endSection(); ++ } + - if (this.mc.gameSettings.showDebugInfo) - { - Lagometer.showLagometer(scaledresolution); - } - } -- ++ this.mc.mcProfiler.endSection(); ++ } + - this.mc.mcProfiler.endSection(); - } -- + - if (this.mc.currentScreen != null) - { - GlStateManager.clear(256); @@ -1301,11 +1298,14 @@ - } - } - } -- ++ // Minecrift - handle notification text ++ handleNotificationText(); + - this.frameFinish(); - this.waitForServerThread(); - Lagometer.updateLagometer(); -- ++ this.renderEndNanoTime = System.nanoTime(); + - if (this.mc.gameSettings.ofProfiler) - { - this.mc.gameSettings.showDebugProfilerChart = true; @@ -1461,14 +1461,12 @@ this.mc.mcProfiler.endStartSection("camera"); + this.setupCameraTransform(partialTicks, pass); -+ applyCameraDepth(false); //neat - +- - if (flag) -+ if (shadersMod) - { - Shaders.setCamera(partialTicks); - } - +- { +- Shaders.setCamera(partialTicks); +- } +- - if (Reflector.ActiveRenderInfo_updateRenderInfo2.exists()) - { - Reflector.call(Reflector.ActiveRenderInfo_updateRenderInfo2, this.mc.getRenderViewEntity(), this.mc.gameSettings.thirdPersonView == 2); @@ -1477,6 +1475,13 @@ - { - ActiveRenderInfo.updateRenderInfo(this.mc.player, this.mc.gameSettings.thirdPersonView == 2); - } ++ applyCameraDepth(false); //neat ++ ++ if (shadersMod) ++ { ++ Shaders.setCamera(partialTicks); ++ } ++ +// /** MINECRIFT */ // Save our projection and modelview matrices ---- why... +// GL11.glMatrixMode(GL11.GL_PROJECTION); +// GL11.glPushMatrix(); @@ -1575,7 +1580,7 @@ - if (entity.posY + (double)entity.getEyeHeight() < 128.0D + (double)(this.mc.gameSettings.ofCloudsHeight * 128.0F)) + //VIVE NO EYE HEIGHT -+ if (entity.posY < 128.0D + (double)(this.mc.gameSettings.ofCloudsHeight * 128.0F)) ++ if (entity.posY < 128.0D + (double)(this.mc.gameSettings.ofCloudsHeight * 128.0F)) { this.renderCloudsCheck(renderglobal, partialTicks, pass, d0, d1, d2); } @@ -1654,7 +1659,7 @@ { ShadersRender.endTerrain(); } -@@ -1750,40 +1916,36 @@ +@@ -1750,75 +1916,130 @@ GlStateManager.shadeModel(7424); GlStateManager.alphaFunc(516, 0.1F); @@ -1687,34 +1692,52 @@ - RenderHelper.disableStandardItemLighting(); - this.disableLightmap(); - } - +- - GlStateManager.matrixMode(5888); - GlStateManager.popMatrix(); ++ + this.mc.mcProfiler.endStartSection("outline"); -+ -+ boolean renderOutline = this.isDrawBlockOutline(); - if (flag1 && this.mc.objectMouseOver != null && !entity.isInsideOfMaterial(Material.WATER)) -+ if (renderOutline && this.mc.objectMouseOver != null && !itemRenderer.isInsideOfMaterial(mc.vrPlayer.vrdata_world_render.getEye(mc.currentPass).getPosition(), Material.WATER)) - { - EntityPlayer entityplayer = (EntityPlayer)entity; - GlStateManager.disableAlpha(); +- { +- EntityPlayer entityplayer = (EntityPlayer)entity; +- GlStateManager.disableAlpha(); - this.mc.mcProfiler.endStartSection("outline"); - +- - if (!Reflector.ForgeHooksClient_onDrawBlockHighlight.exists() || !Reflector.callBoolean(Reflector.ForgeHooksClient_onDrawBlockHighlight, renderglobal, entityplayer, this.mc.objectMouseOver, Integer.valueOf(0), partialTicks)) -+ if (!Reflector.ForgeHooksClient_onDrawBlockHighlight.exists() || !Reflector.callBoolean(Reflector.ForgeHooksClient_onDrawBlockHighlight, new Object[] {renderglobal, entityplayer, this.mc.objectMouseOver, Integer.valueOf(0), Float.valueOf(partialTicks)})) - { - renderglobal.drawSelectionBox(entityplayer, this.mc.objectMouseOver, 0, partialTicks); - } -@@ -1793,32 +1955,91 @@ - - if (this.mc.debugRenderer.shouldRender()) - { +- { +- renderglobal.drawSelectionBox(entityplayer, this.mc.objectMouseOver, 0, partialTicks); +- } +- +- GlStateManager.enableAlpha(); +- } +- +- if (this.mc.debugRenderer.shouldRender()) +- { - boolean flag2 = GlStateManager.isFogEnabled(); - GlStateManager.disableFog(); - this.mc.debugRenderer.renderDebug(partialTicks, finishTimeNano); +- this.mc.debugRenderer.renderDebug(partialTicks, finishTimeNano); - GlStateManager.setFogEnabled(flag2); - } +- } ++ boolean renderOutline = this.isDrawBlockOutline(); ++ ++ if (renderOutline && this.mc.objectMouseOver != null && !entity.isInsideOfMaterial(Material.WATER)) ++ { ++ EntityPlayer entityplayer = (EntityPlayer)entity; ++ GlStateManager.disableAlpha(); ++ ++ if (!Reflector.ForgeHooksClient_onDrawBlockHighlight.exists() || !Reflector.callBoolean(Reflector.ForgeHooksClient_onDrawBlockHighlight, new Object[] {renderglobal, entityplayer, this.mc.objectMouseOver, Integer.valueOf(0), Float.valueOf(partialTicks)})) ++ { ++ renderglobal.drawSelectionBox(entityplayer, this.mc.objectMouseOver, 0, partialTicks); ++ } ++ ++ GlStateManager.enableAlpha(); ++ } ++ ++ if (this.mc.debugRenderer.shouldRender()) ++ { ++ this.mc.debugRenderer.renderDebug(partialTicks, finishTimeNano); ++ } + this.mc.mcProfiler.endStartSection("destroyProgress"); if (!renderglobal.damagedBlocks.isEmpty()) diff --git a/resources/assets/vivecraft/input/knuckles_defaults.json b/resources/assets/vivecraft/input/knuckles_defaults.json index 647853a..c98b933 100644 --- a/resources/assets/vivecraft/input/knuckles_defaults.json +++ b/resources/assets/vivecraft/input/knuckles_defaults.json @@ -72,7 +72,13 @@ "output" : "/actions/contextual/in/vivecraft.key.vrinteract" } }, - "mode" : "grab", + "mode" : "button", + "parameters" : { + "click_activate_threshold" : "0.85", + "click_deactivate_threshold" : "0.35", + "force_input" : "force", + "haptic_amplitude": "0" + }, "path" : "/user/hand/left/input/grip" }, { @@ -81,7 +87,13 @@ "output" : "/actions/contextual/in/vivecraft.key.vrinteract" } }, - "mode" : "grab", + "mode" : "button", + "parameters" : { + "click_activate_threshold" : "0.85", + "click_deactivate_threshold" : "0.35", + "force_input" : "force", + "haptic_amplitude": "0" + }, "path" : "/user/hand/right/input/grip" }, { @@ -151,10 +163,7 @@ } }, "mode" : "button", - "parameters" : { - "click_activate_threshold" : "0.5" - }, - "path" : "/user/hand/left/input/trackpad" + "path" : "/user/hand/left/input/a" } ] }, @@ -168,7 +177,7 @@ }, "mode" : "button", "parameters" : { - "click_activate_threshold" : "0.8", + "click_activate_threshold" : "0.6", "click_deactivate_threshold" : "0.2", "force_input" : "force" }, @@ -182,7 +191,7 @@ }, "mode" : "button", "parameters" : { - "click_activate_threshold" : "0.8", + "click_activate_threshold" : "0.6", "click_deactivate_threshold" : "0.2", "force_input" : "force" }, @@ -217,6 +226,18 @@ "click_activate_threshold" : "0.5" }, "path" : "/user/hand/right/input/trackpad" + }, + { + "inputs" : { + "scroll" : { + "output" : "/actions/gui/in/vivecraft.key.guiscrollaxis" + } + }, + "parameters": { + "discrete_scroll_trackpad_slideandhold_enabled": "false" + }, + "mode" : "scroll", + "path" : "/user/hand/right/input/trackpad" } ] }, @@ -229,7 +250,12 @@ } }, "mode" : "button", - "path" : "/user/hand/right/input/a" + "parameters" : { + "click_activate_threshold" : "0.85", + "click_deactivate_threshold" : "0.35", + "force_input" : "force" + }, + "path" : "/user/hand/right/input/grip" }, { "inputs" : { @@ -269,6 +295,9 @@ }, { "inputs" : { + "click" : { + "output" : "/actions/ingame/in/key.jump" + }, "position" : { "output" : "/actions/ingame/in/vivecraft.key.freemovestrafe" } @@ -292,7 +321,12 @@ } }, "mode" : "button", - "path" : "/user/hand/left/input/a" + "parameters" : { + "click_activate_threshold" : "0.85", + "click_deactivate_threshold" : "0.35", + "force_input" : "force" + }, + "path" : "/user/hand/left/input/grip" }, { "inputs" : { @@ -313,26 +347,7 @@ } }, "mode" : "button", - "parameters" : { - "click_activate_threshold" : "0.8", - "click_deactivate_threshold" : "0.2", - "force_input" : "force" - }, - "path" : "/user/hand/left/input/grip" - }, - { - "inputs" : { - "click" : { - "output" : "/actions/ingame/in/key.jump" - } - }, - "mode" : "button", - "parameters" : { - "click_activate_threshold" : "0.8", - "click_deactivate_threshold" : "0.2", - "force_input" : "force" - }, - "path" : "/user/hand/right/input/grip" + "path" : "/user/hand/right/input/a" } ] }, @@ -364,7 +379,7 @@ }, "mode" : "button", "parameters" : { - "click_activate_threshold" : "0.8", + "click_activate_threshold" : "0.6", "click_deactivate_threshold" : "0.2", "force_input" : "force" }, @@ -378,7 +393,7 @@ }, "mode" : "button", "parameters" : { - "click_activate_threshold" : "0.8", + "click_activate_threshold" : "0.6", "click_deactivate_threshold" : "0.2", "force_input" : "force" }, diff --git a/resources/assets/vivecraft/input/knuckles_defaults_reversed.json b/resources/assets/vivecraft/input/knuckles_defaults_reversed.json index ff5a4f3..e85babc 100644 --- a/resources/assets/vivecraft/input/knuckles_defaults_reversed.json +++ b/resources/assets/vivecraft/input/knuckles_defaults_reversed.json @@ -72,7 +72,13 @@ "output" : "/actions/contextual/in/vivecraft.key.vrinteract" } }, - "mode" : "grab", + "mode" : "button", + "parameters" : { + "click_activate_threshold" : "0.85", + "click_deactivate_threshold" : "0.35", + "force_input" : "force", + "haptic_amplitude": "0" + }, "path" : "/user/hand/left/input/grip" }, { @@ -81,7 +87,13 @@ "output" : "/actions/contextual/in/vivecraft.key.vrinteract" } }, - "mode" : "grab", + "mode" : "button", + "parameters" : { + "click_activate_threshold" : "0.85", + "click_deactivate_threshold" : "0.35", + "force_input" : "force", + "haptic_amplitude": "0" + }, "path" : "/user/hand/right/input/grip" }, { @@ -151,10 +163,7 @@ } }, "mode" : "button", - "parameters" : { - "click_activate_threshold" : "0.5" - }, - "path" : "/user/hand/right/input/trackpad" + "path" : "/user/hand/right/input/a" } ] }, @@ -168,7 +177,7 @@ }, "mode" : "button", "parameters" : { - "click_activate_threshold" : "0.8", + "click_activate_threshold" : "0.6", "click_deactivate_threshold" : "0.2", "force_input" : "force" }, @@ -182,7 +191,7 @@ }, "mode" : "button", "parameters" : { - "click_activate_threshold" : "0.8", + "click_activate_threshold" : "0.6", "click_deactivate_threshold" : "0.2", "force_input" : "force" }, @@ -217,6 +226,18 @@ "click_activate_threshold" : "0.5" }, "path" : "/user/hand/left/input/trackpad" + }, + { + "inputs" : { + "scroll" : { + "output" : "/actions/gui/in/vivecraft.key.guiscrollaxis" + } + }, + "parameters": { + "discrete_scroll_trackpad_slideandhold_enabled": "false" + }, + "mode" : "scroll", + "path" : "/user/hand/left/input/trackpad" } ] }, @@ -229,7 +250,12 @@ } }, "mode" : "button", - "path" : "/user/hand/right/input/a" + "parameters" : { + "click_activate_threshold" : "0.85", + "click_deactivate_threshold" : "0.35", + "force_input" : "force" + }, + "path" : "/user/hand/right/input/grip" }, { "inputs" : { @@ -269,6 +295,9 @@ }, { "inputs" : { + "click" : { + "output" : "/actions/ingame/in/key.jump" + }, "position" : { "output" : "/actions/ingame/in/vivecraft.key.freemovestrafe" } @@ -292,7 +321,12 @@ } }, "mode" : "button", - "path" : "/user/hand/left/input/a" + "parameters" : { + "click_activate_threshold" : "0.85", + "click_deactivate_threshold" : "0.35", + "force_input" : "force" + }, + "path" : "/user/hand/left/input/grip" }, { "inputs" : { @@ -313,26 +347,7 @@ } }, "mode" : "button", - "parameters" : { - "click_activate_threshold" : "0.8", - "click_deactivate_threshold" : "0.2", - "force_input" : "force" - }, - "path" : "/user/hand/right/input/grip" - }, - { - "inputs" : { - "click" : { - "output" : "/actions/ingame/in/key.jump" - } - }, - "mode" : "button", - "parameters" : { - "click_activate_threshold" : "0.8", - "click_deactivate_threshold" : "0.2", - "force_input" : "force" - }, - "path" : "/user/hand/left/input/grip" + "path" : "/user/hand/left/input/a" } ] }, @@ -364,7 +379,7 @@ }, "mode" : "button", "parameters" : { - "click_activate_threshold" : "0.8", + "click_activate_threshold" : "0.6", "click_deactivate_threshold" : "0.2", "force_input" : "force" }, @@ -378,7 +393,7 @@ }, "mode" : "button", "parameters" : { - "click_activate_threshold" : "0.8", + "click_activate_threshold" : "0.6", "click_deactivate_threshold" : "0.2", "force_input" : "force" }, diff --git a/resources/assets/vivecraft/lang/en_us.lang b/resources/assets/vivecraft/lang/en_us.lang index e22068c..6f5fa3d 100644 --- a/resources/assets/vivecraft/lang/en_us.lang +++ b/resources/assets/vivecraft/lang/en_us.lang @@ -52,3 +52,525 @@ vivecraft.actionset.contextual=Contextual vivecraft.actionset.keyboard=Keyboard vivecraft.actionset.mixedReality=Mixed Reality vivecraft.actionset.technical=Technical + +# Option screens +vivecraft.options.screen.main=VR Settings +vivecraft.options.screen.freemove=Free Move Settings +vivecraft.options.screen.gui=HUD and GUI Settings +vivecraft.options.screen.menuworld=Menu World Settings +vivecraft.options.screen.guiother=Chat/Crosshair Settings +vivecraft.options.screen.quickcommands=Quick Commands +vivecraft.options.screen.radialmenu=Radial Menu Configuration +vivecraft.options.screen.stereorendering=Stereo Renderer Settings +vivecraft.options.screen.roomscale=Roomscale Interactions Settings +vivecraft.options.screen.seated=Seated Settings +vivecraft.options.screen.standing=Standing Locomotion Settings +vivecraft.options.screen.teleport=Teleport Settings +vivecraft.options.screen.controls=Controller Settings + +# Buttons that lead to the screen +vivecraft.options.screen.main.button=VR Settings... +vivecraft.options.screen.gui.button=HUD and GUI Settings... +vivecraft.options.screen.stereorendering.button=Stereo Rendering... +vivecraft.options.screen.quickcommands.button=Quick Commands... +vivecraft.options.screen.guiother.button=Chat & Crosshair Settings... +vivecraft.options.screen.standing.button=Locomotion Settings... +vivecraft.options.screen.roomscale.button=Interaction Settings... +vivecraft.options.screen.controls.button=Controller Settings... +vivecraft.options.screen.radialmenu.button=Radial Menu... +vivecraft.options.screen.seated.button=Seated Settings... +vivecraft.options.screen.menuworld.button=Menu World Settings... +vivecraft.options.screen.teleport.button=Teleport Settings... +vivecraft.options.screen.freemove.button=Free Move Settings... + +# Option names +vivecraft.options.HUD_SCALE=Head HUD Size +vivecraft.options.HUD_DISTANCE=Head HUD Distance +vivecraft.options.HUD_LOCK_TO=HUD Orientation Lock +vivecraft.options.HUD_OPACITY=HUD Opacity +vivecraft.options.HUD_HIDE=Hide HUD (F1) +vivecraft.options.RENDER_MENU_BACKGROUND=HUD/GUI Background +vivecraft.options.HUD_OCCLUSION=HUD Occlusion +vivecraft.options.MENU_ALWAYS_FOLLOW_FACE=Main Menu Follow +vivecraft.options.CROSSHAIR_OCCLUSION=Crosshair Occlusion +vivecraft.options.CROSSHAIR_SCALE=Crosshair Size +vivecraft.options.MENU_CROSSHAIR_SCALE=Menu Crosshair Size +vivecraft.options.RENDER_CROSSHAIR_MODE=Show Crosshair +vivecraft.options.CHAT_NOTIFICATIONS=Chat Notifications +vivecraft.options.CHAT_NOTIFICATION_SOUND=Notification Sound +vivecraft.options.CROSSHAIR_SCALES_WITH_DISTANCE=Crosshair Scaling +vivecraft.options.RENDER_BLOCK_OUTLINE_MODE=Show Block Outline +vivecraft.options.AUTO_OPEN_KEYBOARD=Always Open Keyboard +vivecraft.options.RADIAL_MODE_HOLD=Radial Menu Mode +vivecraft.options.PHYSICAL_KEYBOARD=Keyboard Type +vivecraft.options.PHYSICAL_KEYBOARD_SCALE=Keyboard Size +vivecraft.options.GUI_APPEAR_OVER_BLOCK=Appear Over Block +vivecraft.options.FSAA=Lanczos Scaler +vivecraft.options.MIRROR_DISPLAY=Desktop Mirror +vivecraft.options.MIRROR_EYE=Mirror Eye +vivecraft.options.MIXED_REALITY_KEY_COLOR=Key Color +vivecraft.options.MIXED_REALITY_RENDER_HANDS=Show Hands +vivecraft.options.MIXED_REALITY_UNITY_LIKE=Layout +vivecraft.options.MIXED_REALITY_UNDISTORTED=Undistorted Pass +vivecraft.options.MIXED_REALITY_ALPHA_MASK=Alpha Mask +vivecraft.options.MIXED_REALITY_FOV=Camera FOV +vivecraft.options.WALK_UP_BLOCKS=Walk Up Blocks +vivecraft.options.MOVEMENT_MULTIPLIER=Move. Speed Multiplier +vivecraft.options.INERTIA_FACTOR=Player Inertia +vivecraft.options.SIMULATE_FALLING=Simulate Falling +vivecraft.options.WEAPON_COLLISION=Weapon Collision +vivecraft.options.ALLOW_CRAWLING=Roomscale Crawling +vivecraft.options.LIMIT_TELEPORT=Limit in Survival +vivecraft.options.REVERSE_HANDS=Reverse Hands +vivecraft.options.STENCIL_ON=Use Eye Stencil +vivecraft.options.BCB_ON=Show Body Position +vivecraft.options.WORLD_SCALE=World Scale +vivecraft.options.WORLD_ROTATION=World Rotation +vivecraft.options.WORLD_ROTATION_INCREMENT=Rotation Increment +vivecraft.options.TOUCH_HOTBAR=Touch Hotbar Enabled +vivecraft.options.PLAY_MODE_SEATED=Play Mode +vivecraft.options.RENDER_SCALEFACTOR=Resolution +vivecraft.options.MONO_FOV=Undistorted FOV +vivecraft.options.REALISTIC_JUMP=Roomscale Jumping +vivecraft.options.REALISTIC_SNEAK=Roomscale Sneaking +vivecraft.options.PHYSICAL_GUI=Physical GUIs +vivecraft.options.REALISTIC_CLIMB=Roomscale Climbing +vivecraft.options.REALISTIC_SWIM=Roomscale Swimming +vivecraft.options.REALISTIC_ROW=Roomscale Rowing +vivecraft.options.WALK_MULTIPLIER=Walking Multiplier +vivecraft.options.FREEMOVE_MODE=Free Move Type +vivecraft.options.VEHICLE_ROTATION=Vehicle Rotation +vivecraft.options.RESET_ORIGIN=Reset Origin +vivecraft.options.X_SENSITIVITY=Rotation Speed +vivecraft.options.Y_SENSITIVITY=Y Sensitivity +vivecraft.options.KEYHOLE=Keyhole +vivecraft.options.FOV_REDUCTION=FOV Comfort Reduction +vivecraft.options.FOV_REDUCTION_MIN=FOV Reduction Size +vivecraft.options.FOV_REDUCTION_OFFSET=FOV Reduction Offset +vivecraft.options.SEATED_HMD=Forward Direction +vivecraft.options.SEATED_HUD_XHAIR=HUD Follows +vivecraft.options.BACKPACK_SWITCH=Backpack Switching +vivecraft.options.ANALOG_MOVEMENT=Analog Movement +vivecraft.options.AUTO_SPRINT=Auto-Sprint +vivecraft.options.AUTO_SPRINT_THRESHOLD=Auto-Sprint Threshold +vivecraft.options.BOW_MODE=Roomscale Bow Mode +vivecraft.options.TELEPORT_DOWN_LIMIT=Down Limit +vivecraft.options.TELEPORT_UP_LIMIT=Up Limit +vivecraft.options.TELEPORT_HORIZ_LIMIT=Distance Limit +vivecraft.options.ALLOW_STANDING_ORIGIN_OFFSET=Allow Origin Offset +vivecraft.options.SEATED_FREE_MOVE=Movement Type +vivecraft.options.FORCE_STANDING_FREE_MOVE=Force Free Move +vivecraft.options.ALLOW_ADVANCED_BINDINGS=Show Advanced Bindings +vivecraft.options.MENU_WORLD_SELECTION=Worlds +vivecraft.options.HRTF_SELECTION=HRTF +vivecraft.options.RELOAD_EXTERNAL_CAMERA=Reload External Camera +vivecraft.options.RIGHT_CLICK_DELAY=Right Click Repeat +vivecraft.options.ANIMAL_TOUCHING=Animal Touching + +# Option tooltips +vivecraft.options.HUD_SCALE.tooltip=Relative size HUD takes up in field-of-view.\n\ +The units are just relative, not in degrees \ +or a fraction of FOV or anything. + +vivecraft.options.HUD_DISTANCE.tooltip=Distance the floating HUD is drawn in front of your body.\n\ +The relative size of the HUD is unchanged by this.\n\ +Distance is in meters (though isn't obstructed by blocks). + +vivecraft.options.HUD_LOCK_TO.tooltip=Specifies which orientation the HUD is locked to.\n\ + Hand: The HUD will appear just above your off-hand.\n\ + Head: The HUD will always appear in your field of view straight ahead.\n\ + Wrist: The HUD will appear on the inside of your off-hand arm. It will "pop out" when looked at. + +vivecraft.options.HUD_OPACITY.tooltip=How transparent to draw the in-game HUD and UI. + +vivecraft.options.RENDER_MENU_BACKGROUND.tooltip=Specifies whether the in game GUI menus have a \ +semi-transparent background or not.\n\ + ON: Semi-transparent background on in-game menus.\n\ + OFF: No background on in-game menus. + +vivecraft.options.HUD_OCCLUSION.tooltip=Specifies whether the HUD is occluded by closer objects.\n\ + ON: The HUD will be hidden by closer objects. May be hidden completely in confined environments!\n\ + OFF: The HUD is always visible. Stereo depth issues may be noticeable. + +vivecraft.options.MENU_ALWAYS_FOLLOW_FACE.tooltip=Specifies when the main menu follows your look direction.\n\ + Seated: The main menu will only follow in seated mode.\n\ + Always: The main menu will always follow. + +vivecraft.options.CROSSHAIR_SCALE.tooltip=Sets the size of the in-game crosshair. + +vivecraft.options.MENU_CROSSHAIR_SCALE.tooltip=Sets the size of the menu crosshair. + +vivecraft.options.RENDER_CROSSHAIR_MODE.tooltip=Set the in-game crosshair display mode.\n\ + Always: The crosshair is always shown even if the HUD is disabled.\n\ + With HUD: The crosshair is only shown when the HUD is enabled.\n\ + Never: The crosshair is never shown. + +vivecraft.options.CHAT_NOTIFICATIONS.tooltip=Sets what happens when you recieve a chat message.\n\ + None: Nothing!\n\ + Haptic: Pulse on left controller.\n\ + Sound: Plays the Chat Notification Sound.\n\ + Both: Both haptic and sound. + +vivecraft.options.CHAT_NOTIFICATION_SOUND.tooltip=Sets the chat notification sound. + +vivecraft.options.CROSSHAIR_SCALES_WITH_DISTANCE.tooltip=Determines how the crosshair changes with distance.\n\ + ON: The crosshair will grow larger in the distance to remain the same apparent size from your viewpoint.\n\ + OFF: The crosshair will always be the same size in the world and appear to shrink with distance. + +vivecraft.options.RENDER_BLOCK_OUTLINE_MODE.tooltip=Sets the in-game block outline display mode.\n\ + Always: The block outline is always shown even if the HUD is disabled.\n\ + With HUD: The block outline is only shown when the HUD is enabled.\n\ + Never: The block outline is never shown. + +vivecraft.options.AUTO_OPEN_KEYBOARD.tooltip=If disabled, the keyboard will only open when you \ +click a text field, or if a text field can't lose focus.\n\ +\n\ +If enabled, the keyboard will open automatically \ +any time a text field comes into focus. Enabling this will \ +cause it to open in unwanted situations with mods. + +vivecraft.options.RADIAL_MODE_HOLD.tooltip=Behavior of the radial menu when pressing the button.\n\ + Hold: Hold radial menu button, hover over selection and release.\n\ + Press: Press radial menu button, click buttons, press radial menu button again to dismiss. + +vivecraft.options.PHYSICAL_KEYBOARD.tooltip=Which type of VR keyboard to use for typing.\n\ + Physical: A keyboard which you can type on like a real keyboard.\n\ + Pointer: A keyboard which you can use by pointing either controller's crosshair at and pressing buttons. + +vivecraft.options.PHYSICAL_KEYBOARD_SCALE.tooltip=How large the physical keyboard should be, relative to its base size. + +vivecraft.options.GUI_APPEAR_OVER_BLOCK.tooltip=If enabled, the GUI for blocks (such as chests and \ +furnaces) will be placed above the block. Otherwise, it will be at the usual position. + +vivecraft.options.FSAA.tooltip=Uses a fancier method of resampling the \ +game before sending it to the HMD. Works best at high render scales. + +vivecraft.options.MIRROR_DISPLAY.tooltip=Mirrors image on HMD to separate desktop window.\n\ +Can be set to OFF, single or dual hmd-view, \ +first-person undistorted, third person undistorted \ +and mixed reality. The undistorted and mixed reality views have \ +a performance cost. + +vivecraft.options.MIRROR_EYE.tooltip=Which eye to use in cropped and single modes. + +vivecraft.options.MIXED_REALITY_KEY_COLOR.tooltip=The color drawn to the "transparent" areas of the \ +mixed reality view. Other colors in-game will be \ +prevented from matching this so it doesn't cause \ +weirdness. + +vivecraft.options.MIXED_REALITY_RENDER_HANDS.tooltip=Render hands on the mixed reality view. Only \ +toggles rendering of the actual hand models, items will still be rendered. + +vivecraft.options.MIXED_REALITY_UNITY_LIKE.tooltip=Choose between Unity-style 4-pane layout, or 2-pane \ +side-by-side. + +vivecraft.options.MIXED_REALITY_UNDISTORTED.tooltip=Include an undistorted view in 4-pane layout Requires \ +an extra render pass. Otherwise the HMD view will be used. + +vivecraft.options.MIXED_REALITY_ALPHA_MASK.tooltip=In Unity layout, if yes, will draw a grayscale alpha mask \ +to the upper-right quadrant (like Unity) for use in \ +masking the foreground layer. Otherwise, foreground will \ +be drawn with key color for use with color key effect. + +vivecraft.options.MIXED_REALITY_FOV.tooltip=The FOV used for the mixed reality mirror mode. + +vivecraft.options.WALK_UP_BLOCKS.tooltip=Allows you to set the ability to walk up blocks without \ +having to jump. Hotkey: RCtrl+B\n\ +§cWARNING: May trigger anti-cheat warnings if on a multiplayer server!!\n\ + OFF: (Default) You will have to jump up blocks.\n\ + ON: You can walk up single blocks. May reduce locomotion induced simulator sickness for some. + +vivecraft.options.MOVEMENT_MULTIPLIER.tooltip=Sets a movement multiplier, allowing slower movement \ +than default. This may help reduce locomotion induced simulator sickness.\n\ +§cWARNING: May trigger anti-cheat warnings if on a multiplayer server!!\n\ +Defaults to standard Minecraft movement (1.0) speed. + +vivecraft.options.INERTIA_FACTOR.tooltip=Sets the player's movement inertia in single player \ +mode. Lower inertia means faster acceleration, higher \ +inertia slower acceleration. High inertia may reduce \ +motion sickness for some, but beware of cliff edges!\n\ + Normal: (Default) Standard Minecraft player movement.\n\ + Automan < Normal < A lot < Even More. Does not affect lava, water or jumping movement currently. + +vivecraft.options.SIMULATE_FALLING.tooltip=If enabled the player will fall to the ground in teleport mode \ +when standing above empty space. Also allows jumping. + +vivecraft.options.WEAPON_COLLISION.tooltip=Enables hitting blocks and entities in roomscale.\n\ +Auto is on in survival and off in creative. + +vivecraft.options.ALLOW_CRAWLING.tooltip=If enabled the player will be able to duck under block. + +vivecraft.options.LIMIT_TELEPORT.tooltip=If enabled the arc teleporter will be have restrictions \ +in survival mode. It will not be able to jump up the side \ +of blocks, it will consume food, and it will have an energy \ +bar that refills over time. + +vivecraft.options.REVERSE_HANDS.tooltip=Swap left/right hands as dominant.\n\ + ON: Left dominant\n\ + OFF: Right dominant\n\ +\n\ +To swap the buttons, restart the game and make \ +sure default bindings are selected in SteamVR. + +vivecraft.options.STENCIL_ON.tooltip=Mask out areas of the screen outside the FOV.\n\ +Improves performance. + +vivecraft.options.BCB_ON.tooltip=Shows your body position as a square shadow on the ground.\n\ +This is your Square Shadow Buddy™.\n\ +Do not lose your Square Shadow Buddy. + +vivecraft.options.WORLD_SCALE.tooltip=Scales the player in the world.\n\ +Above one makes you larger\n\ +And below one makes you small\n\ +And the ones that mother gives you\n\ +don't do anything at all. + +vivecraft.options.WORLD_ROTATION.tooltip=Adds extra rotation to your HMD.\n\ +More useful bound to a button or changed with the arrow keys. + +vivecraft.options.WORLD_ROTATION_INCREMENT.tooltip=How many degrees to rotate when rotating the world. + +vivecraft.options.TOUCH_HOTBAR.tooltip=If enabled allow you to touch the hotbar with \ +your main hand to select an item. + +vivecraft.options.PLAY_MODE_SEATED.tooltip=Standing or seated play mode.\n\ +Standing is vastly superior. + +vivecraft.options.RENDER_SCALEFACTOR.tooltip=The internal rendering scale of the game, relative \ +to the native HMD display. Higher values improve visual \ +quality at the cost of performance. + +vivecraft.options.MONO_FOV.tooltip=The FOV used for the undistorted mirror mode. + +vivecraft.options.REALISTIC_JUMP.tooltip=If turned on, once you jump in real life \ +your player will also jump. Also enables Jump Boots. + +vivecraft.options.REALISTIC_SNEAK.tooltip=If turned on, once you duck in real life \ +your player will also sneak. + +vivecraft.options.PHYSICAL_GUI.tooltip=If turned on, GUIs will be replaced \ +with 3d interactable models.\n\ +If Backpack tracking is enabled, reaching on your back \ +will bring out your inventory bag. + +vivecraft.options.REALISTIC_CLIMB.tooltip=If turned on, allow climbing ladders and vines \ +by touching them. Also enables Climb Claws. + +vivecraft.options.REALISTIC_SWIM.tooltip=If turned on, allow swimming by doing the breaststroke \ +with the controllers. + +vivecraft.options.REALISTIC_ROW.tooltip=Row, row, row your boat... by flapping your arms like mad. + +vivecraft.options.WALK_MULTIPLIER.tooltip=Multiplies your position in the room by a factor.\n\ +Allows you to walk around more, but may cause motion sickness. + +vivecraft.options.FREEMOVE_MODE.tooltip=The source for freemove direction.\n\ +\n\ + Controller: Offhand controller pointing direction.\n\ + HMD: Headset look direction.\n\ + Run-In-Place: Yaw is based on how controllers are swinging. Pitch is your Headset.\n\ + Room: Yaw is relative to your VR room forward. Pitch is your Headset. This mode is best only for 180 setups. + +vivecraft.options.VEHICLE_ROTATION.tooltip=Riding in a vehicle will rotate the world \ +as the vehicle rotates. May be disorienting. + +vivecraft.options.RESET_ORIGIN.tooltip=Recenter the player's feet in the world to 1.62m below \ +the current HMD position. For non-absolute tracking systems or seated play. + +vivecraft.options.X_SENSITIVITY.tooltip=Speed the view will rotate when pushed on the edge of the keyhole. + +vivecraft.options.Y_SENSITIVITY.tooltip=Vertical speed of the crosshair related to the mouse. + +vivecraft.options.KEYHOLE.tooltip=The number of degrees to the left and right of center \ +where the view will begin to rotate. + +vivecraft.options.FOV_REDUCTION.tooltip=Shrinks the field of view while moving. Can help with \ +motion sickness. + +vivecraft.options.FOV_REDUCTION_MIN.tooltip=The final size of FOV reduction. + +vivecraft.options.FOV_REDUCTION_OFFSET.tooltip=Horizontally offsets the center of the FOV reduction for non-standard HMDs. + +vivecraft.options.SEATED_HMD.tooltip=The direction the forward (W) key will go.\n\ +HMD view direction or crosshair pointing direction. + +vivecraft.options.SEATED_HUD_XHAIR.tooltip=The direction the HUD will be placed.\n\ +HMD view direction or crosshair pointing direction. + +vivecraft.options.BACKPACK_SWITCH.tooltip=If turned on, reaching behind your head with the right \ +controller will swap to the 1st hotbar slot, or back to the \ +previous slot. Doing the same with the left controller will \ +swap the left and right hand items. + +vivecraft.options.ANALOG_MOVEMENT.tooltip=Walking speed will be determined by the controller button \ +axis, if the bound button has a variable axis.\n\ +\n\ +For full analog control it is better to use "Move/Strafe" or "Move/Rotate". + +vivecraft.options.AUTO_SPRINT.tooltip=While using freemove, sprint will automatically activate \ +when the axis reaches the configured threshold. + +vivecraft.options.AUTO_SPRINT_THRESHOLD.tooltip=The axis threshold at which auto-sprint activates. + +vivecraft.options.BOW_MODE.tooltip=Sets when to use Roomscale Archery\n\ + OFF: Never.\n\ + Vanilla: Only for the vanilla bow, no mod items.\n\ + ON: Always for any item that uses the "bow" action. + +vivecraft.options.TELEPORT_DOWN_LIMIT.tooltip=Limit the number of blocks you can teleport below you. + +vivecraft.options.TELEPORT_UP_LIMIT.tooltip=Limit the number of blocks you can teleport above you. + +vivecraft.options.TELEPORT_HORIZ_LIMIT.tooltip=Limit the number of blocks you can teleport sideways you. + +vivecraft.options.ALLOW_STANDING_ORIGIN_OFFSET.tooltip=Allows the "Reset Origin" button to be used in \ +standing mode, for those that wish to play physically \ +seated while using tracked controllers. + +vivecraft.options.SEATED_FREE_MOVE.tooltip=Which locomotion mode to use in seated mode.\n\ +\n\ + Teleport: Press any direction to activate.\n\ + Free Move: WASD movement like vanilla Minecraft. + +vivecraft.options.FORCE_STANDING_FREE_MOVE.tooltip=Forces the use of the fallback walk forwards \ +binding (left trigger by default). For more movement \ +options, edit the SteamVR controller bindings.\n\ +\n\ +Note that this disables the teleport binding. + +vivecraft.options.ALLOW_ADVANCED_BINDINGS.tooltip=Unhides additional SteamVR bindings for climbey, \ +keyboard and mixed reality.\n\ +\n\ +Requires a restart to take effect. + +vivecraft.options.MENU_WORLD_SELECTION.tooltip=Which menu worlds to load on startup.\n\ +\n\ +If no custom worlds are found, official worlds \ +will be used regardless. + +vivecraft.options.HRTF_SELECTION.tooltip=HRTF profile to use for positional 3D audio. \ +Quality may vary by device and driver.\n\ +\n\ + OFF: Explicitly disable HRTF.\n\ + Default: Use the default HRTF profile.\n\ + Others: Use a specific HRTF profile. + +vivecraft.options.RELOAD_EXTERNAL_CAMERA.tooltip=Reloads the camera config from ExternalCamera.cfg + +vivecraft.options.RIGHT_CLICK_DELAY.tooltip=The number of game ticks between "right clicks" \ +while holding the button down. + +vivecraft.options.ANIMAL_TOUCHING.tooltip=If enabled, touching a passive mob (animal) without a \ +weapon will right-click (interact) instead of attacking.\n\ +Turn off for Piggy Slapping, Josh. + +# Option values +vivecraft.options.gamma.cantseeshitcaptain=I Can't See +vivecraft.options.yes=YES +vivecraft.options.no=NO +vivecraft.options.auto=Auto +vivecraft.options.default=Default +vivecraft.options.opaque=Opaque +vivecraft.options.mirror.off=OFF (fast) +vivecraft.options.mirror.dual=Dual (fast) +vivecraft.options.mirror.single=Single (fast) +vivecraft.options.mirror.firstperson=1st Person (slow) +vivecraft.options.mirror.thirdperson=3rd Person (slow) +vivecraft.options.mirror.mixedreality=Mixed Reality (slow) +vivecraft.options.mirror.cropped=Cropped (fast) +vivecraft.options.left=Left +vivecraft.options.right=Right +vivecraft.options.color.black=Black +vivecraft.options.color.red=Red +vivecraft.options.color.yellow=Yellow +vivecraft.options.color.green=Green +vivecraft.options.color.cyan=Cyan +vivecraft.options.color.blue=Blue +vivecraft.options.color.magenta=Magenta +vivecraft.options.unity=Unity +vivecraft.options.sidebyside=Side-by-Side +vivecraft.options.hand=Hand +vivecraft.options.head=Head +vivecraft.options.wrist=Wrist +vivecraft.options.body=Body +vivecraft.options.withhud=With HUD +vivecraft.options.always=Always +vivecraft.options.never=Never +vivecraft.options.chatnotification.none=None +vivecraft.options.chatnotification.haptic=Haptic +vivecraft.options.chatnotification.sound=Sound +vivecraft.options.chatnotification.both=Both +vivecraft.options.seated=Seated +vivecraft.options.standing=Standing +vivecraft.options.inertia.none=Automan +vivecraft.options.inertia.normal=Normal +vivecraft.options.inertia.large=A Lot +vivecraft.options.inertia.massive=Even More +vivecraft.options.smooth=Smooth +vivecraft.options.hmd=HMD +vivecraft.options.crosshair=Crosshair +vivecraft.options.controller=Controller +vivecraft.options.runinplace=Run-In-Place +vivecraft.options.room=Room +vivecraft.options.hold=Hold +vivecraft.options.press=Press +vivecraft.options.keyboard.physical=Physical +vivecraft.options.keyboard.pointer=Pointer +vivecraft.options.vanilla=Vanilla +vivecraft.options.teleportlimit=%d Blocks +vivecraft.options.teleport=Teleport +vivecraft.options.freemove=Free Move +vivecraft.options.menuworld.both=Official & Custom +vivecraft.options.menuworld.custom=Custom Only +vivecraft.options.menuworld.official=Official Only +vivecraft.options.menuworld.none=None +vivecraft.options.rightclickdelay.slow=Slow +vivecraft.options.rightclickdelay.slower=Slower +vivecraft.options.rightclickdelay.slowest=Slowest + +# Button text +vivecraft.gui.ok=OK +vivecraft.gui.clear=Clear +vivecraft.gui.loaddefaults=Load Defaults +vivecraft.gui.menuworld.refresh=Refresh Menu World +vivecraft.gui.menuworld.loadnew=Load New Menu World +vivecraft.gui.radialmenu.mainset=Main Set +vivecraft.gui.radialmenu.alternateset=Alternate Set +vivecraft.gui.chat=Chat +vivecraft.gui.commands=Commands +vivecraft.gui.overlay=Overlay +vivecraft.gui.profiler=Profiler +vivecraft.gui.screenshot=Screenshot +vivecraft.gui.calibrateheight=Calibrate Height +vivecraft.gui.alignkatwalk=Align KAT WALK +vivecraft.gui.movethirdpersoncam=Move Third Cam + +# Items +vivecraft.item.jumpboots=Jump Boots +vivecraft.item.climbclaws=Climb Claws +vivecraft.item.telescope=Eye of the Farseer + +# Messages +vivecraft.messages.seatedmode=Switching to Seated Mode will disable controller input. Continue? +vivecraft.messages.radialmenubind.1=Make sure Open Radial Menu is bound. +vivecraft.messages.radialmenubind.2=Hold (Keyboard Shift) with the radial menu open to switch to this set. +vivecraft.messages.controls.1=Bindings are handled by SteamVR Input. +vivecraft.messages.controls.2=Go to Settings > Controllers > Manage Controller Bindings in the dashboard. +vivecraft.messages.controls.3=§6Steam must be running §obefore§r§6 SteamVR is started, or bindings will not save. +vivecraft.messages.serverplugin=Vivecraft server mod detected: %s +vivecraft.messages.noserverplugin=Vivecraft server mod not detected. This server may not support teleporting. Restricted movement mode (fallback to free move) has been enabled. +vivecraft.messages.calibrateheight=Please calibrate your height in the pause menu. +vivecraft.messages.rendersetupfailed=Render setup failed: %s +vivecraft.messages.intelgraphics=Intel Integrated Graphics are not supported. If this is a laptop, please force the high-performance GPU. Detected GPU: %s +vivecraft.messages.menuworldexportcomplete.1=World export complete... area size: %d +vivecraft.messages.menuworldexportcomplete.2=Saved to %s +vivecraft.messages.menuworldexportclientwarning=WARNING: Saving menu world using a client world. Data may be incomplete. It is recommended to save menu worlds in singleplayer. +vivecraft.messages.teleportdisabled=Restricted movement enabled (no teleporting) +vivecraft.messages.teleportenabled=Restricted movement disabled (teleporting allowed) +vivecraft.messages.walkupblocks=Walk up blocks (RCTRL+B): %s +vivecraft.messages.showaim=Show aim (RCTRL+RSHIFT): enabled +vivecraft.messages.playerinertia=Player movement inertia (LCTRL+I): %s +vivecraft.messages.movementmodeswitch=Movement mode switched to: %s +vivecraft.messages.coords=X: %.2f Y: %.2f Z: %.2f +vivecraft.messages.angles=Pitch: %.1f Yaw: %.1f Roll: %.1f +vivecraft.messages.heightset=User height set to %d%% diff --git a/src/org/vivecraft/control/VRInputAction.java b/src/org/vivecraft/control/VRInputAction.java index 52be271..8fa865b 100644 --- a/src/org/vivecraft/control/VRInputAction.java +++ b/src/org/vivecraft/control/VRInputAction.java @@ -32,7 +32,7 @@ public class VRInputAction { public final VRInputActionSet actionSet; private int priority = 0; - private boolean enabled = true; + private boolean[] enabled = new boolean[ControllerType.values().length]; private List listeners = new ArrayList<>(); private ControllerType currentHand = ControllerType.RIGHT; @@ -51,6 +51,7 @@ public VRInputAction(KeyBinding keyBinding, String requirement, String type, VRI this.name = this.actionSet.name + "/in/" + keyBinding.getKeyDescription().replace('/', '_'); for (int i = 0; i < ControllerType.values().length; i++) { + enabled[i] = true; digitalData[i] = new InputDigitalActionData_t.ByReference(); digitalData[i].setAutoRead(false); digitalData[i].setAutoWrite(false); @@ -246,17 +247,21 @@ public VRInputAction setPriority(int priority) { return this; } + /** + * If this is a handed binding, applies to the hand from {@link VRInputAction#setCurrentHand(ControllerType)} + */ public boolean isEnabled() { - if (!enabled) return false; + if (!isEnabledRaw(currentHand)) return false; long lastOrigin = this.getLastOrigin(); + ControllerType hand = MCOpenVR.getOriginControllerType(lastOrigin); + if (hand == null) + return false; + for (VRInputAction action : MCOpenVR.getInputActions()) { - if (action != this && action.enabled && action.isActive() && action.getPriority() > this.getPriority() && action.getOrigins().contains(lastOrigin)) { - if (action.isHanded()) { - ControllerType hand = MCOpenVR.getOriginControllerType(lastOrigin); - if (hand != null) + if (action != this && action.isEnabledRaw(hand) && action.isActive() && action.getPriority() > this.getPriority() && action.getOrigins().contains(lastOrigin)) { + if (action.isHanded()) return !((HandedKeyBinding)action.keyBinding).isPriorityOnController(hand); - } return false; } } @@ -264,12 +269,31 @@ public boolean isEnabled() { return true; } + public boolean isEnabledRaw(ControllerType hand) { + if (isHanded()) + return enabled[hand.ordinal()]; + else + return enabled[0]; + } + public boolean isEnabledRaw() { - return enabled; + return Arrays.stream(ControllerType.values()).anyMatch(this::isEnabledRaw); + } + + public VRInputAction setEnabled(ControllerType hand, boolean enabled) { + if (!isHanded()) + throw new IllegalStateException("Not a handed key binding!"); + this.enabled[hand.ordinal()] = enabled; + return this; } public VRInputAction setEnabled(boolean enabled) { - this.enabled = enabled; + if (isHanded()) { + for (ControllerType hand : ControllerType.values()) + this.enabled[hand.ordinal()] = enabled; + } else { + this.enabled[0] = enabled; + } return this; } diff --git a/src/org/vivecraft/gameplay/OpenVRPlayer.java b/src/org/vivecraft/gameplay/OpenVRPlayer.java index 75d3a07..f47cd26 100644 --- a/src/org/vivecraft/gameplay/OpenVRPlayer.java +++ b/src/org/vivecraft/gameplay/OpenVRPlayer.java @@ -587,12 +587,12 @@ public void doLookOverride(VRData data){ if((entity.isSprinting() && entity.movementInput.jump) || entity.isElytraFlying() || (entity.isRiding() && entity.moveForward > 0)){ //us needed for server side movement. - if(mc.vrSettings.vrFreeMoveMode == mc.vrSettings.FREEMOVE_HMD ){ - entity.rotationYawHead = entity.rotationYaw = data.hmd.getYaw(); - entity.rotationPitch = -data.hmd.getPitch(); - }else{ - entity.rotationYawHead = entity.rotationYaw = data.getController(1).getYaw(); + if(mc.vrSettings.vrFreeMoveMode == mc.vrSettings.FREEMOVE_CONTROLLER ){ + entity.rotationYaw = data.getController(1).getYaw(); entity.rotationPitch = -data.getController(1).getPitch(); + }else{ + entity.rotationYaw = data.hmd.getYaw(); + entity.rotationPitch = -data.hmd.getPitch(); } } else if(i.getItem() == Items.SNOWBALL || i.getItem() == Items.EGG || diff --git a/src/org/vivecraft/gameplay/trackers/InteractTracker.java b/src/org/vivecraft/gameplay/trackers/InteractTracker.java new file mode 100644 index 0000000..6de5a26 --- /dev/null +++ b/src/org/vivecraft/gameplay/trackers/InteractTracker.java @@ -0,0 +1,216 @@ +package org.vivecraft.gameplay.trackers; + +import java.util.HashSet; + +import org.vivecraft.api.NetworkHelper; +import org.vivecraft.control.ControllerType; +import org.vivecraft.provider.MCOpenVR; + +import net.minecraft.block.Block; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.EntityPlayerSP; +import net.minecraft.entity.Entity; + +import net.minecraft.entity.projectile.ProjectileHelper; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.network.play.client.CPacketPlayerDigging; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.EnumHand; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; + +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; + +public class InteractTracker extends Tracker{ + + //public boolean[] bukkit= new boolean[2]; + public int hotbar = -1; + + public InteractTracker(Minecraft mc) { + super(mc); + } + + public boolean isActive(EntityPlayerSP p){ + if(mc.playerController == null) return false; + if(p == null) return false; + if(p.isDead) return false; + if(p.isPlayerSleeping()) return false; + Minecraft mc = Minecraft.getMinecraft(); + if (mc.vrSettings.seated) + return false; + if(p.isActiveItemStackBlocking() && hotbar < 0){ + return false; + } + if (mc.bowTracker.isNotched()) + return false; + return true; + } + +// public BlockRayTraceResult[] inBlockHit = new BlockRayTraceResult[2]; +// BlockPos[] inBlockPos = new BlockPos[2]; +// Entity[] inEntity = new Entity[2]; +// private EntityRayTraceResult[] inEntityHit = new EntityRayTraceResult[2]; + boolean[] active = new boolean[2]; + boolean[] wasactive = new boolean[2]; + + @Override + public void reset(EntityPlayerSP player) { + for(int c =0 ;c<2;c++){ +// inBlockPos[c] = null; +// inBlockHit[c] = null; +// inEntity[c] = null; +// inEntityHit[c] = null; + active[c] = false; + MCOpenVR.getInputAction(MCOpenVR.keyVRInteract).setEnabled(ControllerType.values()[c], false); + } + } + + private HashSet rightClickable = null; + + @SuppressWarnings("unused") + public void doProcess(EntityPlayerSP player){ //on tick + +// if(rightClickable == null) { +// //compile a list of blocks that explicitly declare OnBlockActivated (right click) +// rightClickable = new HashSet(); +// for (Object b : Registry.BLOCK) { +// Class c = b.getClass(); +// try { // constructor throws an exception if method doesn't exist +// ReflectionMethod r = new MCReflection.ReflectionMethod(c, MCReflection.BlockState_OnBlockActivated, BlockState.class, World.class, BlockPos.class, PlayerEntity.class, Hand.class, BlockRayTraceResult.class); +// rightClickable.add(c); +// } catch (Throwable e) { +// } +// c = c.getSuperclass(); +// try { +// ReflectionMethod r = new MCReflection.ReflectionMethod(c, MCReflection.BlockState_OnBlockActivated, BlockState.class, World.class, BlockPos.class, PlayerEntity.class, Hand.class, BlockRayTraceResult.class); +// rightClickable.add(c); +// } catch (Throwable e) { +// } +// } +// rightClickable.remove(Block.class); +// rightClickable.remove(AbstractBlock.class); +// rightClickable.remove(AbstractBlock.AbstractBlockState.class); +// } + + Vec3d forward = new Vec3d(0,0,-1); + + reset(player); + + for(int c =0 ;c<2;c++){ + + if(c == 0) { + if(hotbar >= 0) { + active[c] = true; + } + } + +// Vec3d hmdPos = mc.vrPlayer.vrdata_world_pre.getHeadPivot(); +// Vec3d handPos = mc.vrPlayer.vrdata_world_pre.getController(c).getPosition(); +// Vec3d handDirection = mc.vrPlayer.vrdata_world_pre.getHand(c).getCustomVector(forward); +// ItemStack is = player.getHeldItem(c==0?Hand.MAIN_HAND:Hand.OFF_HAND); +// Item item = null; +// +// if(!active[c]) { +// +// int bx = (int) MathHelper.floor(handPos.x); +// int by = (int) MathHelper.floor(handPos.y); +// int bz = (int) MathHelper.floor(handPos.z); +// +// Vec3d extWeapon = new Vec3d( +// handPos.x + handDirection.x * (-.1), +// handPos.y + handDirection.y * (-.1), +// handPos.z + handDirection.z * (-.1)); +// +// AxisAlignedBB weaponBB = new AxisAlignedBB(handPos, extWeapon); +// +// +// inEntityHit[c] = ProjectileHelper.rayTraceEntities(mc.getRenderViewEntity(), hmdPos, handPos, weaponBB, (e) -> +// { +// return !e.isSpectator() && e.canBeCollidedWith() && !(e == mc.getRenderViewEntity().getRidingEntity()); +// }, 0); +// +// if(inEntityHit[c]!=null) { +// Entity hitEntity = inEntityHit[c].getEntity(); +// inEntity[c] = hitEntity; +// active[c] = true; +// } +// } + +// if(!active[c]) { +// BlockPos bp =null; +// bp = new BlockPos(handPos); +// BlockState block = mc.world.getBlockState(bp); +// // Material material = block.getMaterial(); +// +// BlockRayTraceResult hit = block.getRenderShapeTrue(mc.world, bp).rayTrace(hmdPos, handPos, bp); +// inBlockPos[c] = bp; +// inBlockHit[c] = hit; +// +// active[c] = hit !=null && (rightClickable.contains(block.getBlock().getClass()) || +// rightClickable.contains(block.getBlock().getClass().getSuperclass())); +// +// bukkit[c] = false; +// if(!active[c] && is.getItem() == Items.BUCKET) { +// if(block.getMaterial().isLiquid()) { +// active[c] = true; +// bukkit[c] = true; +// } +// } +// } + + if(!wasactive[c] && active[c]) { + MCOpenVR.triggerHapticPulse(c, 250); + } + + MCOpenVR.getInputAction(MCOpenVR.keyVRInteract).setEnabled(ControllerType.values()[c], active[c]); + + wasactive[c] = active[c]; + } + } + + public boolean isInteractActive(int controller) { + return active[controller]; + } + + public void processBindings() { + for(int c =0 ;c<2;c++){ + if(MCOpenVR.keyVRInteract.isPressed(ControllerType.values()[c])) { + if (!active[c]) + continue; //how tho? + EnumHand hand = EnumHand.values()[c]; + boolean success = false; + + if(hotbar >= 0 && hotbar < 9 && mc.player.inventory.currentItem != hotbar && hand == EnumHand.MAIN_HAND) { + mc.player.inventory.currentItem = hotbar; + success = true; + } + else if(hotbar == 9 && hand == EnumHand.MAIN_HAND) { + mc.player.connection.sendPacket(new CPacketPlayerDigging(CPacketPlayerDigging.Action.SWAP_HELD_ITEMS, BlockPos.ORIGIN, EnumFacing.DOWN)); + success = true; + } +// else if(inEntityHit[c]!=null) { +// success = true; +// if (!mc.playerController.interactWithEntity(mc.player, inEntity[c], inEntityHit[c], hand).isSuccessOrConsume()) +// if (!mc.playerController.interactWithEntity(mc.player, inEntity[c], hand).isSuccessOrConsume()) { +// success = false; +// } +// } +// else if (inBlockHit[c]!=null) { +// success = mc.playerController.func_217292_a(mc.player, (ClientWorld) mc.player.world, hand, inBlockHit[c]).isSuccessOrConsume(); +// } else if (bukkit[c]) { +// success =mc.playerController.processRightClick(mc.player, (ClientWorld) mc.player.world, hand).isSuccessOrConsume(); +// } + + if(success){ + //mc.player.swingArm(hand); + MCOpenVR.triggerHapticPulse(c, 750); + } + } + } + } +} + diff --git a/src/org/vivecraft/gameplay/trackers/SwingTracker.java b/src/org/vivecraft/gameplay/trackers/SwingTracker.java index 9cc87da..d050daf 100644 --- a/src/org/vivecraft/gameplay/trackers/SwingTracker.java +++ b/src/org/vivecraft/gameplay/trackers/SwingTracker.java @@ -2,6 +2,7 @@ import java.util.List; +import org.vivecraft.api.Vec3History; import org.vivecraft.control.ControllerType; import org.vivecraft.provider.MCOpenVR; import org.vivecraft.utils.MCReflection; @@ -38,7 +39,8 @@ public class SwingTracker extends Tracker{ private boolean[] lastWeaponSolid = new boolean[2]; private Vec3d[] weaponEnd= new Vec3d[2]; private Vec3d[] weaponEndlast= new Vec3d[]{new Vec3d(0, 0, 0), new Vec3d(0,0,0)}; - + public Vec3History[] tipHistory = new Vec3History[] { new Vec3History(), new Vec3History()}; + public boolean[] shouldIlookatMyHand= new boolean[2]; public boolean[] IAmLookingAtMyHand= new boolean[2]; @@ -49,32 +51,34 @@ public SwingTracker(Minecraft mc) { } public boolean isActive(EntityPlayerSP p){ - if(p == null) return false; - if(p.isDead) return false; - if(p.isPlayerSleeping()) return false; - Minecraft mc = Minecraft.getMinecraft(); - if (!mc.vrSettings.weaponCollision) - return false; - if (mc.vrSettings.seated) - return false; - if(mc.vrSettings.vrFreeMoveMode == mc.vrSettings.FREEMOVE_RUNINPLACE && p.moveForward > 0){ - return false; //dont hit things while RIPing. - } - if(p.isActiveItemStackBlocking()){ - return false; //dont hit things while blocking. - } - if(mc.jumpTracker.isjumping()) - return false; - return true; - } + if(p == null) return false; + if(p.isDead) return false; + if(p.isPlayerSleeping()) return false; + Minecraft mc = Minecraft.getMinecraft(); + if (mc.vrSettings.weaponCollision == 0) + return false; + if (mc.vrSettings.weaponCollision == 2) + return !p.isCreative(); + if (mc.vrSettings.seated) + return false; + if(mc.vrSettings.vrFreeMoveMode == mc.vrSettings.FREEMOVE_RUNINPLACE && p.moveForward > 0){ + return false; //dont hit things while RIPing. + } + if(p.isActiveItemStackBlocking()){ + return false; //dont hit things while blocking. + } + if(mc.jumpTracker.isjumping()) + return false; + return true; + } + private double speedthresh = 2.0f; + Vec3d forward = new Vec3d(0,0,-1); public void doProcess(EntityPlayerSP player){ //on tick - mc.mcProfiler.startSection("updateSwingAttack"); - Vec3d forward = new Vec3d(0,0,-1); for(int c =0 ;c<2;c++){ @@ -86,7 +90,6 @@ public void doProcess(EntityPlayerSP player){ //on tick ItemStack is = player.getHeldItem(c==0?EnumHand.MAIN_HAND:EnumHand.OFF_HAND); Item item = null; - double speedthresh = 1.8f; float weaponLength; float entityReachAdd; @@ -116,12 +119,12 @@ else if(item !=null && Reflector.forgeExists()){ //tinkers hack } if (sword){ - entityReachAdd = 2.5f; - weaponLength = 0.3f; + entityReachAdd = 1.8f; + weaponLength = 0.7f; tool = true; } else if (tool){ - entityReachAdd = 1.8f; - weaponLength = 0.3f; + entityReachAdd = 1.0f; + weaponLength = 0.5f; tool = true; } else if (item !=null){ weaponLength = 0.1f; @@ -130,13 +133,15 @@ else if(item !=null && Reflector.forgeExists()){ //tinkers hack weaponLength = 0.0f; entityReachAdd = 0.3f; } - + weaponLength *= mc.vrPlayer.vrdata_world_pre.worldScale; weaponEnd[c] = new Vec3d( handPos.x + handDirection.x * weaponLength, handPos.y + handDirection.y * weaponLength, handPos.z + handDirection.z * weaponLength); + + tipHistory[c].add(weaponEnd[c].subtract(mc.vrPlayer.vrdata_world_pre.origin)); if (disableSwing > 0 ) { disableSwing--; @@ -146,7 +151,7 @@ else if(item !=null && Reflector.forgeExists()){ //tinkers hack } - float speed = (float) MCOpenVR.controllerHistory[c].averageSpeed(0.1); + float speed = (float) tipHistory[c].averageSpeed(0.33); weaponEndlast[c] = new Vec3d(weaponEnd[c].x, weaponEnd[c].y, weaponEnd[c].z); @@ -167,14 +172,7 @@ else if(item !=null && Reflector.forgeExists()){ //tinkers hack //Check EntityCollisions first //experiment. - AxisAlignedBB weaponBB = new AxisAlignedBB( - handPos.x < extWeapon.x ? handPos.x : extWeapon.x , - handPos.y < extWeapon.y ? handPos.y : extWeapon.y , - handPos.z < extWeapon.z ? handPos.z : extWeapon.z , - handPos.x > extWeapon.x ? handPos.x : extWeapon.x , - handPos.y > extWeapon.y ? handPos.y : extWeapon.y , - handPos.z > extWeapon.z ? handPos.z : extWeapon.z - ); + AxisAlignedBB weaponBB = new AxisAlignedBB(handPos, extWeapon); List entities = mc.world.getEntitiesWithinAABBExcludingEntity( mc.player, weaponBB); @@ -207,7 +205,7 @@ else if(item !=null && Reflector.forgeExists()){ //tinkers hack if(c == 0 && MCOpenVR.keyClimbeyGrab.isKeyDown(ControllerType.RIGHT) || !tool ) continue; if(c == 1 && MCOpenVR.keyClimbeyGrab.isKeyDown(ControllerType.LEFT) || !tool ) continue; } - + BlockPos bp =null; bp = new BlockPos(weaponEnd[c]); IBlockState block = mc.world.getBlockState(bp); @@ -217,9 +215,9 @@ else if(item !=null && Reflector.forgeExists()){ //tinkers hack // and damage the block it collides with... RayTraceResult col = mc.world.rayTraceBlocks(lastWeaponEndAir[c], weaponEnd[c], true, false, true); - + if (col != null) mc.playerController.hitVecOverride = col.hitVec; - + boolean flag = col!=null && col.getBlockPos().equals(bp); //fix ladder but prolly break everything else. if (flag && (shouldIlookatMyHand[c] || (col != null && col.typeOfHit == Type.BLOCK))) { @@ -244,47 +242,34 @@ else if(item !=null && Reflector.forgeExists()){ //tinkers hack Minecraft.getMinecraft().playerController. processRightClickBlock(player, (WorldClient) player.world,bp,col.sideHit, col.hitVec, c==0?EnumHand.MAIN_HAND:EnumHand.OFF_HAND); }else{ - p += (speed - speedthresh) / 2; - - for (int i = 0; i < p; i++) - { - //set delay to 0 - clearBlockHitDelay(); - boolean test = mc.climbTracker.isGrabbingLadder(); - //all this comes from plaeyrControllerMP clickMouse and friends. - - //all this does is sets the block you're currently hitting, has no effect in survival mode after that. - //but if in creaive mode will clickCreative on the block - mc.playerController.clickBlock(col.getBlockPos(), col.sideHit); + p += Math.min((speed - speedthresh), 4); - if(!getIsHittingBlock()) //seems to be the only way to tell it broke. - break; + mc.playerController.clickBlock(col.getBlockPos(), col.sideHit); + if(getIsHittingBlock()) { //seems to be the only way to tell it didnt insta-broke. + for (int i = 0; i < p; i++) + { //send multiple ticks worth of 'holding left click' to it. - //apply destruction for survival only - mc.playerController.onPlayerDamageBlock(col.getBlockPos(), col.sideHit); + if(mc.playerController.onPlayerDamageBlock(col.getBlockPos(), col.sideHit)) + mc.effectRenderer.addBlockHitEffects(col.getBlockPos(), col.sideHit); - if(!getIsHittingBlock()) //seems to be the only way to tell it broke. - break; - - //something effects - mc.effectRenderer.addBlockHitEffects(col.getBlockPos(), col.sideHit); + clearBlockHitDelay(); + if(!getIsHittingBlock()) //seems to be the only way to tell it broke. + break; + } } - + mc.vrPlayer.blockDust(col.hitVec.x, col.hitVec.y, col.hitVec.z, 3*p, block); + lastWeaponSolid[c] = true; } - mc.vrPlayer.blockDust(col.hitVec.x, col.hitVec.y, col.hitVec.z, 3*p, block); - MCOpenVR.triggerHapticPulse(c, 250*p); - // System.out.println("Hit block speed =" + speed + " mot " + mot + " thresh " + speedthresh) ; - lastWeaponSolid[c] = true; + insolidBlock = true; } - insolidBlock = true; } } + mc.playerController.hitVecOverride = null; } - mc.playerController.hitVecOverride = null; } - + if ((!inAnEntity && !insolidBlock ) || lastWeaponEndAir[c].lengthVector() ==0) { this.lastWeaponEndAir[c] = new Vec3d( diff --git a/src/org/vivecraft/gui/PhysicalKeyboard.java b/src/org/vivecraft/gui/PhysicalKeyboard.java index 1ce53fd..0c61d57 100644 --- a/src/org/vivecraft/gui/PhysicalKeyboard.java +++ b/src/org/vivecraft/gui/PhysicalKeyboard.java @@ -36,12 +36,21 @@ public class PhysicalKeyboard { private boolean shiftSticky; private List keys; - private int rows = 4; - private int columns = 13; - private float spacing = .008f; - private float keyWidth = .05f; - private float keyHeight = .05f; - private float keyWidthSpecial = keyWidth * 2 + spacing; + // base values + private static final int ROWS = 4; + private static final int COLUMNS = 13; + private static final float SPACING = .0064f; + private static final float KEY_WIDTH = .04f; + private static final float KEY_HEIGHT = .04f; + private static final float KEY_WIDTH_SPECIAL = KEY_WIDTH * 2 + SPACING; + + private int rows; + private int columns; + private float spacing; + private float keyWidth; + private float keyHeight; + private float keyWidthSpecial; + private float scale = 1.0f; private KeyButton[] pressedKey = new KeyButton[2]; private long[] pressTime = new long[2]; @@ -60,6 +69,13 @@ public PhysicalKeyboard() { public void init() { this.keys.clear(); + rows = ROWS; + columns = COLUMNS; + spacing = SPACING * scale; + keyWidth = KEY_WIDTH * scale; + keyHeight = KEY_HEIGHT * scale; + keyWidthSpecial = KEY_WIDTH_SPECIAL * scale; + String chars = mc.vrSettings.keyboardKeys; if (this.shift) chars = mc.vrSettings.keyboardKeysShift; @@ -83,6 +99,10 @@ public void onPressed() { GuiKeyboard.pressKey(Character.toString(chr)); if (!shiftSticky) setShift(false, false); + if (chr == '/' && mc.currentScreen == null && Display.isActive()) { // this is dumb but whatever + KeyboardSimulator.pressRaw(KeyEvent.VK_SLASH); + KeyboardSimulator.unpressRaw(KeyEvent.VK_SLASH); + } } }); } @@ -264,7 +284,7 @@ public void process() { public void processBindings() { if (GuiHandler.keyKeyboardShift.isPressed()) { - setShift(true, false); + setShift(true, true); lastPressedShift = true; } if (!GuiHandler.keyKeyboardShift.isKeyDown() && lastPressedShift) { @@ -330,19 +350,18 @@ public void render() { } } + // Shaders goes crazy without this + // TODO: How the fuck do I load this on 1.12? + mc.getTextureManager().bindTexture(new ResourceLocation("/assets/vivecraft/textures/white.png")); + Tessellator tess = Tessellator.getInstance(); + BufferBuilder buf = tess.getBuffer(); + buf.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR_NORMAL); for (KeyButton key : keys) { AxisAlignedBB box = key.getRenderBoundingBox(); GlStateManager.Color color = key.getRenderColor(); - // Shaders goes crazy without this - // TODO: How the fuck do I load this on 1.12? - mc.getTextureManager().bindTexture(new ResourceLocation("/assets/vivecraft/textures/white.png")); - // Alright let's draw a box - BufferBuilder buf = tess.getBuffer(); - buf.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR_NORMAL); - buf.pos(box.minX, box.minY, box.minZ).color(color.red, color.green, color.blue, color.alpha).normal(0, 0, -1).endVertex(); buf.pos(box.minX, box.maxY, box.minZ).color(color.red, color.green, color.blue, color.alpha).normal(0, 0, -1).endVertex(); buf.pos(box.maxX, box.maxY, box.minZ).color(color.red, color.green, color.blue, color.alpha).normal(0, 0, -1).endVertex(); @@ -372,16 +391,19 @@ public void render() { buf.pos(box.maxX, box.minY, box.maxZ).color(color.red, color.green, color.blue, color.alpha).normal(1, 0, 0).endVertex(); buf.pos(box.maxX, box.minY, box.minZ).color(color.red, color.green, color.blue, color.alpha).normal(1, 0, 0).endVertex(); buf.pos(box.maxX, box.maxY, box.minZ).color(color.red, color.green, color.blue, color.alpha).normal(1, 0, 0).endVertex(); - // Woo that was fun - tess.draw(); + } - FontRenderer fontRenderer = mc.fontRenderer; - GlStateManager.enableTexture2D(); - GlStateManager.disableLighting(); + tess.draw(); + GlStateManager.enableTexture2D(); + GlStateManager.disableLighting(); + + FontRenderer fontRenderer = mc.fontRenderer; + for (KeyButton key : keys) { + AxisAlignedBB box = key.getRenderBoundingBox(); // Calculate text position - float textScale = 0.0025F; + float textScale = 0.002F * scale; float stringWidth = fontRenderer.getStringWidth(key.label) * textScale; float stringHeight = fontRenderer.FONT_HEIGHT * textScale; float textX = (float)box.minX + ((float)box.maxX - (float)box.minX) / 2 - stringWidth / 2; @@ -391,21 +413,18 @@ public void render() { // Draw the text GlStateManager.translate(0, 0, textZ); GlStateManager.scale(textScale, textScale, 1.0F); - fontRenderer.drawStringWithShadow(key.label, textX / textScale, textY / textScale, 0xFFFFFFFF); + fontRenderer.drawString(key.label, textX / textScale, textY / textScale, 0xFFFFFFFF, false); GlStateManager.scale(1.0F / textScale, 1.0F / textScale, 1.0F); GlStateManager.translate(0, 0, -textZ); - - GlStateManager.disableTexture2D(); - GlStateManager.enableLighting(); } - GlStateManager.enableTexture2D(); GlStateManager.enableCull(); } public void show() { if (!this.shiftSticky) this.shift = false; + this.scale = this.mc.vrSettings.physicalKeyboardScale; this.reinit = true; } @@ -430,6 +449,15 @@ public void setShift(boolean shift, boolean sticky) { } } + public float getScale() { + return scale; + } + + public void setScale(float scale) { + this.scale = scale; + this.reinit = true; + } + private abstract class KeyButton { public final int id; public final String label; @@ -440,18 +468,18 @@ private abstract class KeyButton { public KeyButton(int id, String label, float x, float y, float width, float height) { this.id = id; this.label = label; - this.boundingBox = new AxisAlignedBB(x, y, 0.0, x + width, y + height, 0.035); + this.boundingBox = new AxisAlignedBB(x, y, 0.0, x + width, y + height, 0.028 * scale); } public AxisAlignedBB getRenderBoundingBox() { if (pressed) - return boundingBox.offset(0, 0, 0.015); + return boundingBox.offset(0, 0, 0.012 * scale); return boundingBox; } public AxisAlignedBB getCollisionBoundingBox() { if (pressed) - return boundingBox.expand(0, 0, 0.05); + return boundingBox.expand(0, 0, 0.08); return boundingBox; } diff --git a/src/org/vivecraft/gui/framework/BaseGuiSettings.java b/src/org/vivecraft/gui/framework/BaseGuiSettings.java index 63f6f76..9370322 100644 --- a/src/org/vivecraft/gui/framework/BaseGuiSettings.java +++ b/src/org/vivecraft/gui/framework/BaseGuiSettings.java @@ -4,10 +4,21 @@ */ package org.vivecraft.gui.framework; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import org.vivecraft.settings.VRSettings; +import org.vivecraft.utils.Utils; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.Style; +import net.minecraft.util.text.TextComponentString; +import net.minecraft.util.text.TextFormatting; +import net.optifine.Lang; public class BaseGuiSettings extends GuiScreen { @@ -65,7 +76,7 @@ public void drawScreen(int par1, int par2, float par3, boolean drawBackground) if( drawBackground) this.drawDefaultBackground(); - this.drawCenteredString(this.fontRenderer, this.screenTitle, this.width / 2, 15, 16777215); + this.drawCenteredString(this.fontRenderer, Lang.get(this.screenTitle), this.width / 2, 15, 16777215); super.drawScreen(par1, par2, par3); if (Math.abs(par1 - this.lastMouseX) <= 5 && Math.abs(par2 - this.lastMouseY) <= 5) @@ -89,7 +100,7 @@ public void drawScreen(int par1, int par2, float par3, boolean drawBackground) if (var9 != null) { String var10 = this.getButtonName(var9.displayString); - String[] var11 = this.getTooltipLines(var10, var9.id); + String[] var11 = this.getTooltipLines(var9.id, var7 - var5 - 10); if (var11 == null) { @@ -114,9 +125,51 @@ public void drawScreen(int par1, int par2, float par3, boolean drawBackground) } } - protected String[] getTooltipLines(String displayString, int buttonId ) + protected final String[] getTooltipLines(int buttonId, int boxWidth) { - return null; + VRSettings.VrOptions option = VRSettings.VrOptions.getEnumOptions(buttonId); + if (option == null) + return null; + + String key = "vivecraft.options." + option.name() + ".tooltip"; + String str = Lang.get(key, null); + + if (str == null) + return null; + + String[] lines = str.split("\\r?\\n", -1); + + List newLines = new ArrayList<>(); + for (String line : lines) { + if (line.isEmpty()) { + newLines.add(line); + continue; + } + + int spaceCount = line.indexOf(line.trim().charAt(0)); + String spaces = String.join("", Collections.nCopies(spaceCount, " ")); + List list = Utils.wrapText(new TextComponentString(line), boxWidth, Minecraft.getMinecraft().fontRenderer, true, spaces); + + StringBuilder style = new StringBuilder(); + for (ITextComponent text : list) { + newLines.add(style.toString() + text.getUnformattedText()); + + String s = text.getUnformattedText(); + for (int i = 0; i < s.length(); i++) { + if (s.charAt(i) == '\u00a7') { + if (i + 1 >= s.length()) + break; + + char c = s.charAt(i + 1); + style.append('\u00a7').append(c); + + i++; + } + } + } + } + + return newLines.toArray(new String[0]); } protected String getButtonName(String var1) diff --git a/src/org/vivecraft/gui/framework/VROption.java b/src/org/vivecraft/gui/framework/VROption.java index 1e6e0c4..24c76ca 100644 --- a/src/org/vivecraft/gui/framework/VROption.java +++ b/src/org/vivecraft/gui/framework/VROption.java @@ -3,6 +3,7 @@ import org.vivecraft.settings.VRSettings; import net.minecraft.client.Minecraft; +import net.optifine.Lang; public class VROption { @@ -77,7 +78,7 @@ public String getButtonText() return Minecraft.getMinecraft().vrSettings.getKeyBinding(_e); } - return _title; + return Lang.get(_title); } public int getOrdinal() diff --git a/src/org/vivecraft/gui/settings/GuiFreeMoveSettings.java b/src/org/vivecraft/gui/settings/GuiFreeMoveSettings.java index 6507931..fbf595e 100644 --- a/src/org/vivecraft/gui/settings/GuiFreeMoveSettings.java +++ b/src/org/vivecraft/gui/settings/GuiFreeMoveSettings.java @@ -11,6 +11,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; +import net.optifine.Lang; public class GuiFreeMoveSettings extends BaseGuiSettings implements GuiEventEx { private static VRSettings.VrOptions[] standingSettings = new VRSettings.VrOptions[] { @@ -30,15 +31,15 @@ public class GuiFreeMoveSettings extends BaseGuiSettings implements GuiEventEx { public GuiFreeMoveSettings(GuiScreen guiScreen, VRSettings settings) { super(guiScreen, settings); - screenTitle = "Free Move Settings"; + screenTitle = "vivecraft.options.screen.freemove"; } @Override public void initGui() { this.buttonList.clear(); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, "Reset To Defaults")); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, "Done")); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, Lang.get("vivecraft.gui.loaddefaults"))); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, Lang.get("gui.done"))); if (mc.vrSettings.seated) addButtons(seatedSettings, 0); @@ -76,12 +77,6 @@ private void addButtons(VRSettings.VrOptions[] buttons, int startY) { maxValue = 1.3f; increment = 0.01f; } - if (var8 == VRSettings.VrOptions.STRAFE_MULTIPLIER) - { - minValue = 0f; - maxValue = 1.0f; - increment = 0.01f; - } else if (var8 == VRSettings.VrOptions.WALK_MULTIPLIER){ minValue=1f; maxValue=10f; @@ -92,11 +87,6 @@ else if (var8 == VRSettings.VrOptions.WORLD_ROTATION_INCREMENT){ maxValue = 4f; increment = 1f; } - else if (var8 == VRSettings.VrOptions.ANALOG_DEADZONE) { - minValue = 0f; - maxValue = 0.5f; - increment = 0.01f; - } else if (var8 == VRSettings.VrOptions.AUTO_SPRINT_THRESHOLD) { minValue = 0.5f; maxValue = 1.0f; @@ -156,109 +146,6 @@ else if (par1GuiButton instanceof GuiSmallButtonEx) } } } - @Override - protected String[] getTooltipLines(String displayString, int buttonId) - { - VRSettings.VrOptions e = VRSettings.VrOptions.getEnumOptions(buttonId); - if( e != null ) - switch(e) - { - case MOVEMENT_MULTIPLIER: - return new String[] { - "Sets a movement multiplier, allowing slower movement", - "than default. This may help reduce locomotion induced", - "simulator sickness.", - "WARNING: May trigger anti-cheat warnings if on a", - "Multiplayer server!!", - "Defaults to standard Minecraft movement (1.0)", - "speed)." - } ; - case STRAFE_MULTIPLIER: - return new String[] { - "Sets an additional strafe (side-to-side) movement", - "multiplier. This is applied on top of the movement", - "multiplier. A value of zero will disable strafe.", - "This may help reduce locomotion induced simulator", - "sickness. WARNING: May trigger anti-cheat warnings", - "if on a Multiplayer server!!", - "Defaults to 0.33 (1.0 is standard Minecraft movement", - "speed)." - } ; - case WALK_UP_BLOCKS: - return new String[] { - "Allows you to set the ability to walk up blocks without", - "having to jump. HOTKEY - RCtrl-B", - "WARNING: May trigger anti-cheat warnings if on a", - "Multiplayer server!!", - " OFF: (Default) You will have to jump up blocks.", - " ON: You can walk up single blocks. May reduce", - " locomotion induced simulator sickness for some." - } ; - case INERTIA_FACTOR: - return new String[]{ - "Sets the player's movement inertia in single player", - "mode. Lower inertia means faster acceleration, higher", - "inertia slower accelaration. High inertia may reduce", - "motion sickness for some, but beware of cliff edges!!", - " Normal: (Default) Standard Minecraft player", - " movement.", - " Automan < Normal < A lot < Even More. Does not", - " affect lava, water or jumping movement currently." - }; - // VIVE START - new options - case ALLOW_CRAWLING: - return new String[] { - "If enabled the player will be able to duck under block" - } ; - case BCB_ON: - return new String[] { - "Shows your body position as a square shadow on the ground.", - "This is your Square Shadow Buddy (tm).", - "Do not lose your Square Shadow Buddy." - }; - case VEHICLE_ROTATION: - return new String[] { - "Riding in a vehicle will rotate the world", - "as the vehicle rotates. May be disorienting." - - } ; - case FOV_REDUCTION: - return new String[] { - "Shrinks the field of view while moving. Can help with", - "motion sickness." - } ; - case WORLD_ROTATION_INCREMENT: - return new String[] { - "How many degrees to rotate when", - "rotating the world. Move all the way left for Smooth." - - }; - case ANALOG_MOVEMENT: - return new String[] { - "Walking speed will be determined by the controller button", - "axis, if the bound button has a variable axis." ,"", - "For full analog control it is better to use 'Joy/Pad mode" - }; - case AUTO_SPRINT_THRESHOLD: - return new String[] { - "The axis threshold at which auto-sprint activates." - }; - default: - return null; - } - else - switch(buttonId) - { -// case 201: -// return new String[] { -// "Open this configuration screen to adjust the Head", -// " Tracker orientation (direction) settings. ", -// " Ex: Head Tracking Selection (Hydra/Oculus), Prediction" -// }; - default: - return null; - } - } @Override public boolean event(int id, VrOptions enumm) { diff --git a/src/org/vivecraft/gui/settings/GuiHUDSettings.java b/src/org/vivecraft/gui/settings/GuiHUDSettings.java index 8f37fd5..6e9ff73 100644 --- a/src/org/vivecraft/gui/settings/GuiHUDSettings.java +++ b/src/org/vivecraft/gui/settings/GuiHUDSettings.java @@ -11,6 +11,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; +import net.optifine.Lang; public class GuiHUDSettings extends BaseGuiSettings { @@ -24,15 +25,16 @@ public class GuiHUDSettings extends BaseGuiSettings //VRSettings.VrOptions.HUD_YAW, VRSettings.VrOptions.HUD_OPACITY, VRSettings.VrOptions.RENDER_MENU_BACKGROUND, - VRSettings.VrOptions.TOUCH_HOTBAR, - VRSettings.VrOptions.MENU_ALWAYS_FOLLOW_FACE, - VRSettings.VrOptions.AUTO_OPEN_KEYBOARD, + VRSettings.VrOptions.AUTO_OPEN_KEYBOARD, + VRSettings.VrOptions.TOUCH_HOTBAR, VRSettings.VrOptions.PHYSICAL_KEYBOARD, + VRSettings.VrOptions.MENU_ALWAYS_FOLLOW_FACE, + VRSettings.VrOptions.PHYSICAL_KEYBOARD_SCALE, }; public GuiHUDSettings(GuiScreen guiScreen, VRSettings guivrSettings) { super( guiScreen, guivrSettings ); - screenTitle = "HUD and GUI Settings"; + screenTitle = "vivecraft.options.screen.gui"; } /** @@ -41,10 +43,10 @@ public GuiHUDSettings(GuiScreen guiScreen, VRSettings guivrSettings) { public void initGui() { this.buttonList.clear(); - this.buttonList.add(new GuiSmallButtonEx(301, this.width / 2 - 78, this.height / 6 - 14, "Hide Hud (F1): " + mc.gameSettings.hideGUI)); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, "Reset To Defaults")); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, "Done")); - this.buttonList.add(new GuiButtonEx(302, this.width / 2 - 155 + 160, this.height / 6 +150 ,150,20, "Menu World Settings...")); + this.buttonList.add(new GuiSmallButtonEx(301, this.width / 2 - 78, this.height / 6 - 14, Lang.get("vivecraft.options." + VrOptions.HUD_HIDE.name()) + ": " + mc.gameSettings.hideGUI)); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, Lang.get("vivecraft.gui.loaddefaults"))); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, Lang.get("gui.done"))); + this.buttonList.add(new GuiButtonEx(302, this.width / 2 - 155 + 160, this.height / 6 +150 ,150,20, Lang.get("vivecraft.options.screen.menuworld.button"))); VRSettings.VrOptions[] buttons = hudOptions; @@ -75,24 +77,18 @@ else if (var8 == VRSettings.VrOptions.HUD_DISTANCE) maxValue = 5.0f; increment = 0.01f; } - else if (var8 == VRSettings.VrOptions.HUD_PITCH) - { - minValue = -45f; - maxValue = 45f; - increment = 1f; - } - else if (var8 == VRSettings.VrOptions.HUD_YAW) - { - minValue = -100f; - maxValue = 100f; - increment = 1f; - } else if (var8 == VRSettings.VrOptions.HUD_OPACITY) { minValue = 0.15f; maxValue = 1.0f; increment = 0.05f; } + else if (var8 == VRSettings.VrOptions.PHYSICAL_KEYBOARD_SCALE) + { + minValue = 0.75f; + maxValue = 1.5f; + increment = 0.01f; + } this.buttonList.add(new GuiSliderEx(var8.returnEnumOrdinal(), width, height, var8, this.guivrSettings.getKeyBinding(var8), minValue, maxValue, increment, this.guivrSettings.getOptionFloatValue(var8))); } @@ -136,6 +132,7 @@ else if (par1GuiButton.id == ID_GENERIC_DEFAULTS) this.guivrSettings.menuAlwaysFollowFace = false; this.guivrSettings.autoOpenKeyboard = true; this.guivrSettings.physicalKeyboard = true; + this.guivrSettings.physicalKeyboardScale = 1.0f; this.mc.gameSettings.hideGUI = false; Minecraft.getMinecraft().vrSettings.saveOptions(); @@ -153,111 +150,4 @@ else if (par1GuiButton.id == 302) } } } - - @Override - protected String[] getTooltipLines(String displayString, int buttonId) - { - VRSettings.VrOptions e = VRSettings.VrOptions.getEnumOptions(buttonId); - if( e != null ) - switch(e) - { - case HUD_OPACITY: - return new String[] { - "How transparent to draw the in-game HUD and UI", - }; - case HUD_SCALE: - return new String[] { - "Relative size HUD takes up in field-of-view", - " The units are just relative, not in degrees", - " or a fraction of FOV or anything" - }; - case HUD_PITCH: - return new String[] { - "The vertical offset of the HUD, in degrees.", - " Negative values are down, positive up." - }; - case HUD_YAW: - return new String[] { - "The horizontal offset of the HUD, in degrees.", - " Negative values are to the left, positive to", - " the right." - }; - case HUD_DISTANCE: - return new String[] { - "Distance the floating HUD is drawn in front of your body", - " The relative size of the HUD is unchanged by this", - " Distance is in meters (though isn't obstructed by blocks)" - }; - case HUD_OCCLUSION: - return new String[] { - "Specifies whether the HUD is occluded by closer objects.", - " ON: The HUD will be hidden by closer objects. May", - " be hidden completely in confined environments!", - " OFF: The HUD is always visible. Stereo depth issues", - " may be noticable." - }; - case MENU_ALWAYS_FOLLOW_FACE: - return new String[] { - "Specifies when the main menu follows your look direction.", - " SEATED: The main menu will only follow in seated mode.", - " ALWAYS The main menu will always follow." - }; - case RENDER_MENU_BACKGROUND: - return new String[] { - "Specifies whether the in game GUI menus have a ", - "semi-transparent background or not.", - " ON: Semi-transparent background on in-game menus.", - " OFF: No background on in-game menus." - }; - case HUD_LOCK_TO: - return new String[] { - "Specifies to which orientation the HUD is locked to.", - " HAND: The HUD will appear just above your off-hand", - " HEAD: The HUD will always appear in your field of view", - "straight ahead", - " WRIST: The HUD will appear on the inside of your off-hand", - "arm. It will 'pop out' when looked at." - }; - case OTHER_HUD_SETTINGS: - return new String[] { - "Configure Crosshair and overlay settings." - }; - case TOUCH_HOTBAR: - return new String[] { - "If enabled allow you to touch the hotbar with", - "your main hand to select an item." - }; - case AUTO_OPEN_KEYBOARD: - return new String[] { - "If disabled, the keyboard will only open when you", - "click a text field, or if a text field can't lose focus.", - "", - "If enabled, the keyboard will open automatically", - "any time a text field comes into focus. Enabling this will", - "cause it to open in unwanted situations with mods." - }; - case PHYSICAL_KEYBOARD: - return new String[] { - "Which type of VR keyboard to use for typing.", - "Physical: A keyboard which you can type on like", - "a real keyboard.", - "Pointer: A keyboard which you can use by pointing", - "either controller's crosshair at and pressing buttons." - }; - default: - return null; - } - else - switch(buttonId) - { - case 300: - return new String[] { - "Configure which controller buttons perform", - " which mouse or keyboard function while ", - " a GUI is visible." - }; - default: - return null; - } - } } diff --git a/src/org/vivecraft/gui/settings/GuiMenuWorldSettings.java b/src/org/vivecraft/gui/settings/GuiMenuWorldSettings.java index b309017..49047b3 100644 --- a/src/org/vivecraft/gui/settings/GuiMenuWorldSettings.java +++ b/src/org/vivecraft/gui/settings/GuiMenuWorldSettings.java @@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; +import net.optifine.Lang; public class GuiMenuWorldSettings extends BaseGuiSettings implements GuiEventEx { @@ -28,7 +29,7 @@ public class GuiMenuWorldSettings extends BaseGuiSettings implements GuiEventEx public GuiMenuWorldSettings(GuiScreen guiScreen, VRSettings guivrSettings) { super( guiScreen, guivrSettings ); - screenTitle = "Menu World Settings"; + screenTitle = "vivecraft.options.screen.menuworld"; } /** @@ -37,12 +38,12 @@ public GuiMenuWorldSettings(GuiScreen guiScreen, VRSettings guivrSettings) { public void initGui() { this.buttonList.clear(); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, "Reset To Defaults")); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, "Done")); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, Lang.get("vivecraft.gui.loaddefaults"))); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, Lang.get("gui.done"))); VRSettings.VrOptions[] buttons = miscSettings; addButtons(buttons,0); - this.buttonList.add(new GuiButtonEx(301, this.width / 2 - 155 , 60,150,20, "Refresh Menu World")); - this.buttonList.add(new GuiButtonEx(300, this.width / 2 + 5 , 60 ,150,20, "Load New Menu World")); + this.buttonList.add(new GuiButtonEx(301, this.width / 2 - 155 , 60,150,20, Lang.get("vivecraft.gui.menuworld.refresh"))); + this.buttonList.add(new GuiButtonEx(300, this.width / 2 + 5 , 60 ,150,20, Lang.get("vivecraft.gui.menuworld.loadnew"))); } @@ -132,7 +133,7 @@ else if (par1GuiButton instanceof GuiSmallButtonEx) this.guivrSettings.setOptionValue(((GuiSmallButtonEx)par1GuiButton).returnVrEnumOptions(), 1); par1GuiButton.displayString = this.guivrSettings.getKeyBinding(VRSettings.VrOptions.getEnumOptions(par1GuiButton.id)); - if(num == VRSettings.VrOptions.MOVE_MODE || num == VRSettings.VrOptions.FREEMOVE_MODE){ + if(num == VRSettings.VrOptions.FREEMOVE_MODE){ this.reinit = true; } if(num == VRSettings.VrOptions.LIMIT_TELEPORT){ @@ -153,36 +154,5 @@ public boolean event(int id, VRSettings.VrOptions enumm) public boolean event(int id, String s) { return true; } - - @Override - protected String[] getTooltipLines(String displayString, int buttonId) - { - VRSettings.VrOptions e = VRSettings.VrOptions.getEnumOptions(buttonId); - if( e != null ) - switch(e) - { - case MENU_WORLD_SELECTION: - return new String[] { - "Which menu worlds to load on startup.", - "", - "If no custom worlds are found, official worlds", - "will be used regardless." - } ; - default: - return null; - } - else - switch(buttonId) - { -// case 201: -// return new String[] { -// "Open this configuration screen to adjust the Head", -// " Tracker orientation (direction) settings. ", -// " Ex: Head Tracking Selection (Hydra/Oculus), Prediction" -// }; - default: - return null; - } - } } diff --git a/src/org/vivecraft/gui/settings/GuiMinecriftSettings.java b/src/org/vivecraft/gui/settings/GuiMinecriftSettings.java index 8bdd029..99b9e67 100644 --- a/src/org/vivecraft/gui/settings/GuiMinecriftSettings.java +++ b/src/org/vivecraft/gui/settings/GuiMinecriftSettings.java @@ -20,16 +20,17 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.settings.GameSettings; +import net.optifine.Lang; public class GuiMinecriftSettings extends BaseGuiSettings implements GuiEventEx { static VROption[] vrAlwaysOptions = new VROption[] { - new VROption(202,VROption.Position.POS_LEFT, 1, VROption.ENABLED, "HUD and GUI Settings..."), - new VROption(206,VROption.Position.POS_LEFT, 0, VROption.ENABLED, "Stereo Rendering..."), - new VROption(207,VROption.Position.POS_RIGHT, 0, VROption.ENABLED, "Quick Commands..."), - new VROption(210,VROption.Position.POS_RIGHT, 1, VROption.ENABLED, "Crosshair Settings..."), + new VROption(202,VROption.Position.POS_LEFT, 1, VROption.ENABLED, "vivecraft.options.screen.gui.button"), + new VROption(206,VROption.Position.POS_LEFT, 0, VROption.ENABLED, "vivecraft.options.screen.stereorendering.button"), + new VROption(207,VROption.Position.POS_RIGHT, 0, VROption.ENABLED, "vivecraft.options.screen.quickcommands.button"), + new VROption(210,VROption.Position.POS_RIGHT, 1, VROption.ENABLED, "vivecraft.options.screen.guiother.button"), new VROption(VRSettings.VrOptions.WORLD_SCALE, VROption.Position.POS_LEFT, 6f, VROption.ENABLED, null), new VROption(VRSettings.VrOptions.WORLD_ROTATION, VROption.Position.POS_RIGHT, 6f, VROption.ENABLED, null), @@ -37,23 +38,23 @@ public class GuiMinecriftSettings extends BaseGuiSettings implements GuiEventEx static VROption[] vrStandingOptions = new VROption[] { - new VROption(209,VROption.Position.POS_LEFT, 4f, VROption.ENABLED, "Locomotion Settings..."), - new VROption(221,VROption.Position.POS_RIGHT, 4f, VROption.ENABLED, "Interaction Settings..."), - new VROption(220,VROption.Position.POS_LEFT, 5f, VROption.ENABLED, "Controller Settings..."), - new VROption(224,VROption.Position.POS_RIGHT, 5f, VROption.ENABLED, "Radial Menu..."), + new VROption(209,VROption.Position.POS_LEFT, 4f, VROption.ENABLED, "vivecraft.options.screen.standing.button"), + new VROption(221,VROption.Position.POS_RIGHT, 4f, VROption.ENABLED, "vivecraft.options.screen.roomscale.button"), + new VROption(220,VROption.Position.POS_LEFT, 5f, VROption.ENABLED, "vivecraft.options.screen.controls.button"), + new VROption(224,VROption.Position.POS_RIGHT, 5f, VROption.ENABLED, "vivecraft.options.screen.radialmenu.button"), // new VROption(VRSettings.VrOptions.REVERSE_HANDS, VROption.Position.POS_RIGHT, 5f, VROption.ENABLED, null), }; static VROption[] vrSeatedOptions = new VROption[] { - new VROption(211, VROption.Position.POS_LEFT, 4f, VROption.ENABLED, "Seated Settings..."), + new VROption(211, VROption.Position.POS_LEFT, 4f, VROption.ENABLED, "vivecraft.options.screen.seated.button"), new VROption(VRSettings.VrOptions.RESET_ORIGIN, VROption.Position.POS_RIGHT, 4f, VROption.ENABLED, null), }; static VROption[] vrConfirm = new VROption[] { - new VROption(222, VROption.Position.POS_RIGHT, 2, VROption.ENABLED, "Cancel"), - new VROption(223, VROption.Position.POS_LEFT, 2, VROption.ENABLED, "OK"), + new VROption(222, VROption.Position.POS_RIGHT, 2, VROption.ENABLED, "gui.cancel"), + new VROption(223, VROption.Position.POS_LEFT, 2, VROption.ENABLED, "vivecraft.gui.ok"), }; boolean isConfirm = false; @@ -66,7 +67,7 @@ public GuiMinecriftSettings( GuiScreen par1GuiScreen, GameSettings gameSettings) { super( par1GuiScreen, par2vrSettings ); - screenTitle = "VR Settings"; + screenTitle = "vivecraft.options.screen.main"; settings = gameSettings; } @@ -79,13 +80,13 @@ public void initGui() int profileButtonWidth = 120; if(!isConfirm){ - screenTitle = "VR Settings"; + screenTitle = "vivecraft.options.screen.main"; VROption mode = new VROption(VRSettings.VrOptions.PLAY_MODE_SEATED,VROption.Position.POS_RIGHT, 2, VROption.ENABLED, null); - GuiSmallButtonEx profilesButton = new GuiSmallButtonEx(mode.getOrdinal(), (this.width / 2 - profileButtonWidth/2 ) , this.height / 4 + 24 , mode._e, mode.getButtonText()); + GuiSmallButtonEx profilesButton = new GuiSmallButtonEx(mode.getOrdinal(), (this.width / 2 - profileButtonWidth/2 ) , this.height / 4 + 24 , mode._e, Lang.get(mode.getButtonText())); profilesButton.setWidth(profileButtonWidth); this.buttonList.add(profilesButton); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, "Reset To Defaults")); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, "Done")); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, Lang.get("vivecraft.gui.loaddefaults"))); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, Lang.get("gui.done"))); VROption[] buttons = null; buttons = vrAlwaysOptions; @@ -105,7 +106,7 @@ public void initGui() } else { - this.screenTitle = "Switching to Seated Mode will disable controller input. Continue?"; + this.screenTitle = "vivecraft.messages.seatedmode"; processButtons(vrConfirm); } } @@ -276,123 +277,6 @@ else if (par1GuiButton.id == ID_GENERIC_DEFAULTS) } } - @Override - protected String[] getTooltipLines(String displayString, int buttonId) - { - VRSettings.VrOptions e = VRSettings.VrOptions.getEnumOptions(buttonId); - - if( e != null ) - switch(e) - { - case REVERSE_HANDS: - return new String[] { - "Swap left/right hands as dominant", - " ON: Left dominant", - " OFF: Right dominant", - "", - "To swap the buttons, restart the game and make", - "sure default bindings are selected in SteamVR." - }; - case WORLD_SCALE: - return new String[] { - "Scales the player in the world.", - "Above one makes you larger", - "And below one makes you small", - "And the ones that mother gives you", - "don't do anything at all." - }; - case WORLD_ROTATION: - return new String[] { - "Adds extra rotation to your HMD.", - "More useful bound to a button or ", - "changed with the arrow keys." - }; - case WORLD_ROTATION_INCREMENT: - return new String[] { - "How many degrees to rotate when", - "rotating the world." - - }; - case PLAY_MODE_SEATED: - return new String[] { - "Standing or seated play mode", - "Standing is vastly superior." - - }; - case RESET_ORIGIN: - return new String[] { - "Recenter the player's feet in the world to 1.62m below the current", - "HMD position. For non-lighthouse tracking systems." - }; - default: - return null; - } - else - switch(buttonId) - { - case 201: - return new String[] { - "Open this configuration screen to adjust the Player", - " avatar preferences, select Oculus profiles etc.", - " Ex: IPD, Player (Eye) Height" - }; - case 202: - return new String[] { - "Open this configuration screen to adjust the Heads-", - "Up Display (HUD) overlay properties.", - }; - case 203: - return new String[] { - "Open this configuration screen to adjust device", - "calibration settings.", - " Ex: Initial calibration time" - }; - case 205: - return new String[] { - "Open this configuration screen to adjust the Head", - " Tracker orientation (direction) settings. ", - " Ex: Head Tracking Selection (Hydra/Oculus), Prediction" - }; - case 206: - return new String[] { - "Options for how the game is rendered and displayed on", - "the HMD and desktop mirror." - }; - case 207: - return new String[] { - "Edit a list of commands or chat strings that will", - "be available in-game in the Quick Commands menu." - }; - case 208: - return new String[] { - "Open this configuration screen to adjust how the ", - " character is controlled. ", - " Ex: Look/move/aim decouple, joystick sensitivty, " , - " Keyhole width, Mouse-pitch-affects camera" , - }; - case 209: - return new String[] { - "Configure the locomotion based settings: movement", - "attributes, VR comfort mode etc..." - } ; - case 210: - return new String[] { - "Options for how the game crosshair displays" - } ; - case 211: - return new String[] { - "Options for Seated Play mode" - }; - case 220: - return new String[] { - "Rebind the VR motion controller buttons to in-game", - "actions" - } ; - default: - return null; - } - } - @Override public boolean event(int id, VrOptions enumm) { return false; diff --git a/src/org/vivecraft/gui/settings/GuiOtherHUDSettings.java b/src/org/vivecraft/gui/settings/GuiOtherHUDSettings.java index 60c2e5a..0d772bf 100644 --- a/src/org/vivecraft/gui/settings/GuiOtherHUDSettings.java +++ b/src/org/vivecraft/gui/settings/GuiOtherHUDSettings.java @@ -9,6 +9,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; +import net.optifine.Lang; public class GuiOtherHUDSettings extends BaseGuiSettings { @@ -29,7 +30,7 @@ public class GuiOtherHUDSettings extends BaseGuiSettings public GuiOtherHUDSettings(GuiScreen guiScreen, VRSettings guivrSettings) { super( guiScreen, guivrSettings ); - screenTitle = "Chat/Crosshair Settings"; + screenTitle = "vivecraft.options.screen.guiother"; } /** @@ -38,8 +39,8 @@ public GuiOtherHUDSettings(GuiScreen guiScreen, VRSettings guivrSettings) { public void initGui() { this.buttonList.clear(); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, "Reset To Defaults")); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, "Done")); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, Lang.get("vivecraft.gui.loaddefaults"))); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, Lang.get("gui.done"))); VRSettings.VrOptions[] buttons = hudOptions; @@ -112,76 +113,4 @@ else if (par1GuiButton instanceof GuiSmallButtonEx) } } } - - @Override - protected String[] getTooltipLines(String displayString, int buttonId) - { - VRSettings.VrOptions e = VRSettings.VrOptions.getEnumOptions(buttonId); - if( e != null ) - switch(e) - { - case RENDER_CROSSHAIR_MODE: - return new String[] { - "Set the in-game crosshair display mode", - " Always: The crosshair is always shown even if the", - " HUD is disabled", - " With HUD: The crosshair is only shown when the HUD", - " is enabled", - " Never: The crosshair is never shown" - }; - case CROSSHAIR_SCALE: - return new String[] { - "Sets the size of the in-game crosshair" - }; - case MENU_CROSSHAIR_SCALE: - return new String[] { - "Sets the size of the menu crosshair" - }; - case RENDER_BLOCK_OUTLINE_MODE: - return new String[] { - "Sets the in-game block outline display mode.", - " Always: The block outline is always shown even if", - " the HUD is disabled", - " With HUD: The block outline is only shown when the", - " HUD is enabled", - " Never: The block outline is never shown" - }; - case CROSSHAIR_ROLL: - return new String[] { - "Sets the crosshair roll behaviour.", - " With Head: The crosshair rolls with your head.", - " With HUD: The crosshair appears to roll, keeping", - " the same orientation as the HUD." - }; - case CROSSHAIR_SCALES_WITH_DISTANCE: - return new String[] { - "Determines how the crosshair changes with distance.", - " ON: The crosshair will grow larger in the distance to", - " remain the same apparent size from your viewpoint.", - " OFF: The crosshair will always be the same size", - " in the world and appear to shrink with distance." - }; - case CHAT_FADE_AWAY: - return new String[] { - "Sets the chat persistence mode.", - " Fades: The chat entries fade away with time.", - " Stays: A number of the latest chat lines will always", - " be visible." - }; - default: - return null; - } - else - switch(buttonId) - { -// case 201: -// return new String[] { -// "Open this configuration screen to adjust the Head", -// " Tracker orientation (direction) settings. ", -// " Ex: Head Tracking Selection (Hydra/Oculus), Prediction" -// }; - default: - return null; - } - } } diff --git a/src/org/vivecraft/gui/settings/GuiOtherRenderOpticsSettings.java b/src/org/vivecraft/gui/settings/GuiOtherRenderOpticsSettings.java index 8a07f4b..6d94869 100644 --- a/src/org/vivecraft/gui/settings/GuiOtherRenderOpticsSettings.java +++ b/src/org/vivecraft/gui/settings/GuiOtherRenderOpticsSettings.java @@ -32,8 +32,8 @@ public GuiOtherRenderOpticsSettings(GuiScreen guiScreen, VRSettings guivrSetting public void initGui() { // this.buttonList.clear(); -// this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, "Reset To Defaults")); -// this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, "Done")); +// this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, Lang.get("vivecraft.gui.loaddefaults"))); +// this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, Lang.get("gui.done")); // String eyeRelief = "";//String.format("Base Eye Relief: %.3fmm ", new Object[] { this.mc.entityRenderer.getBaseEyeRelief() * 1000f }); // VRSettings.VrOptions[] buttons = null; // if (Minecraft.getMinecraft().vrSettings.useHalfIpds == false) @@ -113,8 +113,6 @@ public void initGui() private boolean getEnabledState(VRSettings.VrOptions var8) { - String s = var8.getEnumString(); - return true; } @@ -169,74 +167,4 @@ public boolean event(int id, VRSettings.VrOptions enumm) public boolean event(int id, String s) { return true; } - - @Override - protected String[] getTooltipLines(String displayString, int buttonId) - { - VRSettings.VrOptions e = VRSettings.VrOptions.getEnumOptions(buttonId); - if( e != null ) - switch(e) - { -// case EYE_RELIEF_PLACEHOLDER: -// return new String[] { -// "The current un-adjusted eye relief value, as reported", -// "from the Oculus Profile.", -// "Positive values are towards your face, negative away.", -// }; -// case EYE_RELIEF_ADJUST: -// return new String[] { -// "Adjusts the eye relief value (the distance of the HMD", -// "screen from the center eye position). Positive values", -// "are towards your face, negative away.", -// " Adjust this if vertical lines do not seem to maintain", -// " their position in the world (as you slowly rotate your", -// " head from side-to-side; while keeping your gaze fixed", -// " on the line).", -// " Can account for squashed foam padding on the HMD etc.", -// }; -// case FOV_CHANGE: -// return new String[] { -// "Adjusts the position of the rendered distortion border.", -// " Positive values: reduce the size of the distortion", -// " border, possibly increasing Field-of-View (FOV) at", -// " the expense of increased rendering cost.", -// " Negative values: increase the size of the distortion", -// " border, reducing render cost at the expense of a", -// " noticeable reduction in FOV.", -// }; -// case USE_PROFILE_IPD: -// case CONFIG_IPD_MODE: -// case LEFT_HALF_IPD: -// case RIGHT_HALF_IPD: -// case TOTAL_IPD: -// return new String[] { -// "Allows adjustment of IPD if not using Oculus profile", -// "settings. NOTE: It is STRONGLY RECOMMENDED to use", -// "the Oculus Profile settings!!", -// " Select total or half IPD configuration.", -// " Adjusting the IPD manually may alter in game scale;", -// " however various HMD parameters configured by", -// " Oculus will not be correct. USE AT YOUR OWN RISK." -// }; -// case MAX_FOV: -// return new String[] { -// "Toggles use of the default Field-of-View (FOV),", -// "or the maximum FOV possible with the specified HMD.", -// " Default: Default HMD FOV. A balance of FOV versus", -// " render cost.", -// " Maximum: *MAY* enlarge viewable FOV at the expense of", -// " increased rendering cost.", -// " NOTE with the DK2, Default and Max are almost", -// " identical.", -// }; - default: - return null; - } - else - switch(buttonId) - { - default: - return null; - } - } } diff --git a/src/org/vivecraft/gui/settings/GuiQuickCommandEditor.java b/src/org/vivecraft/gui/settings/GuiQuickCommandEditor.java index f812bcf..c2c27d7 100644 --- a/src/org/vivecraft/gui/settings/GuiQuickCommandEditor.java +++ b/src/org/vivecraft/gui/settings/GuiQuickCommandEditor.java @@ -13,6 +13,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; +import net.optifine.Lang; public class GuiQuickCommandEditor extends BaseGuiSettings { @@ -21,7 +22,7 @@ public class GuiQuickCommandEditor extends BaseGuiSettings { public GuiQuickCommandEditor(GuiScreen par1GuiScreen, VRSettings par2vrSettings) { super(par1GuiScreen, par2vrSettings); - screenTitle = "Quick Commands"; + screenTitle = "vivecraft.options.screen.quickcommands"; } /** @@ -44,8 +45,8 @@ protected void keyTyped(char typedChar, int keyCode) public void initGui() { this.guiList = new GuiQuickCommandsList(this, mc); this.buttonList.clear(); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, "Reset To Defaults")); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, "Done")); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, Lang.get("vivecraft.gui.loaddefaults"))); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, Lang.get("gui.done"))); } /** diff --git a/src/org/vivecraft/gui/settings/GuiRadialConfiguration.java b/src/org/vivecraft/gui/settings/GuiRadialConfiguration.java index f883668..d615cae 100644 --- a/src/org/vivecraft/gui/settings/GuiRadialConfiguration.java +++ b/src/org/vivecraft/gui/settings/GuiRadialConfiguration.java @@ -13,6 +13,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; import net.minecraft.client.settings.KeyBinding; +import net.optifine.Lang; import org.apache.commons.lang3.ArrayUtils; public class GuiRadialConfiguration extends BaseGuiSettings @@ -26,7 +27,7 @@ public class GuiRadialConfiguration extends BaseGuiSettings public GuiRadialConfiguration(GuiScreen guiScreen, VRSettings guivrSettings) { super( guiScreen, guivrSettings ); - screenTitle = "Radial Menu Configuration"; + screenTitle = "vivecraft.options.screen.radialmenu"; } private String[] arr; @@ -65,16 +66,16 @@ public void initGui() this.buttonList.clear(); if(this.isselectmode) { - this.buttonList.add(new GuiButtonEx(251, this.width / 2 - 155 , this.height -25 ,150,20, "Clear")); - this.buttonList.add(new GuiButtonEx(250, this.width / 2 - 180 + 160, this.height -25,150,20, "Cancel")); + this.buttonList.add(new GuiButtonEx(251, this.width / 2 - 155 , this.height -25 ,150,20, Lang.get("vivecraft.gui.clear"))); + this.buttonList.add(new GuiButtonEx(250, this.width / 2 - 180 + 160, this.height -25,150,20, Lang.get("gui.cancel"))); }else { - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, "Reset To Defaults")); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 180 + 160, this.height -25,150,20, "Done")); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, Lang.get("vivecraft.gui.loaddefaults"))); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 180 + 160, this.height -25,150,20, Lang.get("gui.done"))); if(this.isShift) - this.buttonList.add(new GuiButton(201, this.width / 2 - 180+160, 32, 150, 20, "Main Set")); + this.buttonList.add(new GuiButton(201, this.width / 2 - 180+160, 32, 150, 20, Lang.get("vivecraft.gui.radialmenu.mainset"))); else - this.buttonList.add(new GuiButton(201, this.width / 2 - 180+160 ,32, 150, 20, "Alternate Set")); + this.buttonList.add(new GuiButton(201, this.width / 2 - 180+160 ,32, 150, 20, Lang.get("vivecraft.gui.radialmenu.alternateset"))); VRSettings.VrOptions[] buttons = options; @@ -209,9 +210,12 @@ public void drawScreen(int par1, int par2, float par3) { // if(!MCOpenVR.isBound(MCOpenVR.keyRadialMenu)) // this.drawCenteredString(this.fontRenderer, "The radial menu is not currently bound to a controller button.", this.width / 2, this.height - 50, 13777215); -// +// + if (!this.isselectmode) + this.drawCenteredString(this.fontRenderer, Lang.get("vivecraft.messages.radialmenubind.1"), this.width / 2, this.height - 50, 0x55FF55); + if(this.isShift) - this.drawCenteredString(this.fontRenderer, "Hold (Gui Shift) with the radial menu open to switch to this set", this.width / 2, this.height - 36, 13777015); + this.drawCenteredString(this.fontRenderer, Lang.get("vivecraft.messages.radialmenubind.2"), this.width / 2, this.height - 36, 13777015); if(this.isselectmode) list.drawScreen(par1, par2, par3); @@ -219,35 +223,6 @@ public void drawScreen(int par1, int par2, float par3) { super.drawScreen(par1, par2, par3, false); } - - @Override - protected String[] getTooltipLines(String displayString, int buttonId) - { - VRSettings.VrOptions e = VRSettings.VrOptions.getEnumOptions(buttonId); - if( e != null ) - switch(e) - { - case RADIAL_MODE_HOLD: - return new String[] { - "HOLD: Hold radial menu button, hover over", - "selection and release.", - "PRESS: Press radial menu button, click buttons,", - "press menu button again to dismiss." - }; - default: - return null; - } - else - switch(buttonId) - { - case 201: - return new String[] { - "Switch between alternate and main set of items" - }; - default: - return null; - } - } /** * Called when the mouse is clicked. Args : mouseX, mouseY, clickedButton diff --git a/src/org/vivecraft/gui/settings/GuiRenderOpticsSettings.java b/src/org/vivecraft/gui/settings/GuiRenderOpticsSettings.java index aadead6..d8bf495 100644 --- a/src/org/vivecraft/gui/settings/GuiRenderOpticsSettings.java +++ b/src/org/vivecraft/gui/settings/GuiRenderOpticsSettings.java @@ -16,6 +16,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.settings.GameSettings; +import net.optifine.Lang; import org.lwjgl.util.Color; public class GuiRenderOpticsSettings extends BaseGuiSettings implements GuiEventEx @@ -64,7 +65,7 @@ public class GuiRenderOpticsSettings extends BaseGuiSettings implements GuiEven public GuiRenderOpticsSettings(GuiScreen par1GuiScreen, VRSettings par2vrSettings, GameSettings gameSettings) { super( par1GuiScreen, par2vrSettings); - screenTitle = "Stereo Renderer Settings"; + screenTitle = "vivecraft.options.screen.stereorendering"; settings = gameSettings; this.vrSettings = par2vrSettings; this.mc = Minecraft.getMinecraft(); @@ -79,8 +80,8 @@ public void initGui() // this.screenTitle = var1.translateKey("options.videoTitle"); this.buttonList.clear(); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, "Reset To Defaults")); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, "Done")); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, Lang.get("vivecraft.gui.loaddefaults"))); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, Lang.get("gui.done"))); { VRSettings.VrOptions[] buttons = new VRSettings.VrOptions[openVRDisplayOptions.length]; @@ -218,11 +219,6 @@ else if (par1GuiButton.id == ID_GENERIC_MODE_CHANGE) // Mode Change // selectOption = new GuiSelectOption(this, this.guivrSettings, "Select StereoProvider", "Select the render provider:", pluginModeChangeButton.getPluginNames()); this.mc.displayGuiScreen(selectOption); } - else if (par1GuiButton.id == VRSettings.VrOptions.OTHER_RENDER_SETTINGS.returnEnumOrdinal()) - { - Minecraft.getMinecraft().vrSettings.saveOptions(); - this.mc.displayGuiScreen(new GuiOtherRenderOpticsSettings(this, this.guivrSettings)); - } else if (par1GuiButton instanceof GuiSmallButtonEx) { this.guivrSettings.setOptionValue(((GuiSmallButtonEx)par1GuiButton).returnVrEnumOptions(), 1); @@ -306,108 +302,8 @@ public boolean event(int id, String s) return success; } - @Override - protected String[] getTooltipLines(String displayString, int buttonId) - { - VRSettings.VrOptions e = VRSettings.VrOptions.getEnumOptions(buttonId); - if( e != null ) - switch(e) - { - case FSAA: - return new String[] { - "Uses a fancier method of resampling the", - "game before sending it to the HMD. Works best", - "at high render scales. "}; - - case RENDER_SCALEFACTOR: - return new String[] { - "The internal rendering scale of the game, relative", - "to the native HMD display. Higher values improve visual", - "quality, espeically with FSAA on, at the cost of performance" - }; - case MIRROR_DISPLAY: - return new String[] { - "Mirrors image on HMD to separate desktop window.", - "Can be set to OFF, cropped, single or dual hmd-view, ", - "first-person undistorted, third person undistorted", - "and Mixed Reality. The undistorted and MR views have", - "a performance cost" - }; - case MIRROR_EYE: - return new String[] { - "Which eye to use in cropped and single modes." - }; - case MIXED_REALITY_KEY_COLOR: - return new String[] { - "The color drawn to the \"transparent\" areas of the", - "mixed reality view. Other colors in-game will be", - "prevented from matching this so it doesn't cause", - "weirdness." - }; - case MIXED_REALITY_RENDER_HANDS: - return new String[] { - "Render hands on the mixed reality view. Only", - "toggles rendering of the actual hand models, items", - "will still be rendered." - }; - case MIXED_REALITY_UNITY_LIKE: - return new String[] { - "Choose between Unity-style 4-pane layout, or 2-pane", - "side by side" - }; - case MIXED_REALITY_UNDISTORTED: - return new String[] { - "Include an undistorted view in 4-pane layout Requires", - "an extra render pass. Otherwise the HMD view will be used." - }; - case MIXED_REALITY_ALPHA_MASK: - return new String[] { - "In Unity layout, if yes, will draw a grayscale alpha mask", - "to the upper-right quadrant (like Unity) for use in", - "maskingthe foreground layer. Otherwise, foreground will", - "be drawn with key color for use with color key effect." - }; - case MIXED_REALITY_FOV: - return new String[] { - "The FOV used for the mixed reality mirror mode." - }; - case INSIDE_BLOCK_SOLID_COLOR: - return new String[] { - "Whether to render the block texture or a solid", - "color when eye is inside of a block." - }; - case MONO_FOV: - return new String[] { - "The FOV used for the undistorted mirror mode." - }; - case OTHER_RENDER_SETTINGS: - return new String[] { - "Configure IPD and FOV border settings." - }; - case STENCIL_ON: - return new String[] { - "Mask out areas of the screen outside the FOV.", - "Improves performance." - }; - default: - return null; - } - else - switch(buttonId) - { - case ID_GENERIC_DEFAULTS: - return new String[] { - "Resets all values on this screen to their defaults" - }; - default: - return null; - } - } - private boolean getEnabledState(VRSettings.VrOptions var8) { - String s = var8.getEnumString(); - return true; } } diff --git a/src/org/vivecraft/gui/settings/GuiRoomscaleSettings.java b/src/org/vivecraft/gui/settings/GuiRoomscaleSettings.java index 447db8e..00a6ff3 100644 --- a/src/org/vivecraft/gui/settings/GuiRoomscaleSettings.java +++ b/src/org/vivecraft/gui/settings/GuiRoomscaleSettings.java @@ -10,6 +10,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; +import net.optifine.Lang; public class GuiRoomscaleSettings extends BaseGuiSettings implements GuiEventEx { @@ -28,7 +29,7 @@ public class GuiRoomscaleSettings extends BaseGuiSettings implements GuiEventEx public GuiRoomscaleSettings(GuiScreen guiScreen, VRSettings guivrSettings) { super( guiScreen, guivrSettings ); - screenTitle = "Roomscale Interactions Settings"; + screenTitle = "vivecraft.options.screen.roomscale"; } /** @@ -37,8 +38,8 @@ public GuiRoomscaleSettings(GuiScreen guiScreen, VRSettings guivrSettings) { public void initGui() { this.buttonList.clear(); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, "Reset To Defaults")); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, "Done")); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, Lang.get("vivecraft.gui.loaddefaults"))); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, Lang.get("gui.done"))); VRSettings.VrOptions[] buttons = roomscaleSettings; addButtons(buttons,0); } @@ -71,12 +72,6 @@ private void addButtons(VRSettings.VrOptions[] buttons, int startY) { maxValue = 1.3f; increment = 0.01f; } - if (var8 == VRSettings.VrOptions.STRAFE_MULTIPLIER) - { - minValue = 0f; - maxValue = 1.0f; - increment = 0.01f; - } else if (var8 == VRSettings.VrOptions.WALK_MULTIPLIER){ minValue=1f; maxValue=10f; @@ -134,7 +129,7 @@ protected void actionPerformed(GuiButton par1GuiButton) else if (par1GuiButton.id == ID_GENERIC_DEFAULTS) { //jrbudda// - vr.weaponCollision = true; + vr.weaponCollision = 2; vr.animaltouching = true; vr.realisticClimbEnabled = true; vr.realisticJumpEnabled = true; @@ -156,10 +151,6 @@ else if (par1GuiButton instanceof GuiSmallButtonEx) this.guivrSettings.setOptionValue(((GuiSmallButtonEx)par1GuiButton).returnVrEnumOptions(), 1); par1GuiButton.displayString = this.guivrSettings.getKeyBinding(VRSettings.VrOptions.getEnumOptions(par1GuiButton.id)); - if(num == VRSettings.VrOptions.MOVE_MODE){ - this.reinit = true; - } - } } } @@ -174,90 +165,4 @@ public boolean event(int id, VRSettings.VrOptions enumm) public boolean event(int id, String s) { return true; } - - @Override - protected String[] getTooltipLines(String displayString, int buttonId) - { - VRSettings.VrOptions e = VRSettings.VrOptions.getEnumOptions(buttonId); - if( e != null ) - switch(e) - { - // VIVE START - new options - case SIMULATE_FALLING: - return new String[] { - "If enabled the player will falls to the ground in TP mode", - "when standing above empty space. Also allows jumping" - } ; - case WEAPON_COLLISION: - return new String[] { - "If enabled, you can swing your pickaxe at blocks to", - "mine them, or your sword at enemies to hit them." - } ; - case ANIMAL_TOUCHING: - return new String[] { - "If enabled, touching a passive mob (animal) without a", - "weapon will right-click (interact) instead of attacking.", - "Turn off for Piggy Slapping, Josh.", - } ; - // VIVE END - new options - //JRBUDDA - case ALLOW_CRAWLING: - return new String[] { - "If enabled the player will be able to duck under block" - } ; - case REALISTIC_JUMP: - return new String[]{ - "If turned on, once you jump in real life", - "Your player will also jump. Also enables", - "Jump Boots." - }; - case REALISTIC_SNEAK: - return new String[]{ - "If turned on, once you duck in real life", - "Your player will also sneak" - }; - case REALISTIC_CLIMB: - return new String[]{ - "If turned on, allow climbing ladders and vines", - "by touching them. Also enables Climb Claws." - }; - case BACKPACK_SWITCH: - return new String[]{ - "If turned on, reaching behind your head with the right", - "controller will swap to the 1st hotbar slot, or back to the", - "previous slot. Doing the same with the left controller will", - "swap the left and right hand items." - }; - case REALISTIC_SWIM: - return new String[]{ - "If turned on, allow swimming by doing the breaststoke", - "with the controllers." - }; - case REALISTIC_ROW: - return new String[]{ - "Row, row, row your boat... by flapping your arms like mad." - }; - case BOW_MODE: - return new String[]{ - "Sets when to use Roomscale Archery", - "OFF: Never", - "Vanilla: Only for the vanilla bow, no mod items", - "ON: Always for any item that uses the 'bow' action" - }; - default: - return null; - } - else - switch(buttonId) - { -// case 201: -// return new String[] { -// "Open this configuration screen to adjust the Head", -// " Tracker orientation (direction) settings. ", -// " Ex: Head Tracking Selection (Hydra/Oculus), Prediction" -// }; - default: - return null; - } - } } diff --git a/src/org/vivecraft/gui/settings/GuiSeatedOptions.java b/src/org/vivecraft/gui/settings/GuiSeatedOptions.java index a5c8c3d..01c875c 100644 --- a/src/org/vivecraft/gui/settings/GuiSeatedOptions.java +++ b/src/org/vivecraft/gui/settings/GuiSeatedOptions.java @@ -11,6 +11,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; +import net.optifine.Lang; public class GuiSeatedOptions extends BaseGuiSettings implements GuiEventEx { @@ -27,7 +28,7 @@ public class GuiSeatedOptions extends BaseGuiSettings implements GuiEventEx public GuiSeatedOptions(GuiScreen guiScreen, VRSettings guivrSettings) { super( guiScreen, guivrSettings ); - screenTitle = "Seated Settings"; + screenTitle = "vivecraft.options.screen.seated"; } /** @@ -36,15 +37,15 @@ public GuiSeatedOptions(GuiScreen guiScreen, VRSettings guivrSettings) { public void initGui() { this.buttonList.clear(); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, "Reset To Defaults")); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, "Done")); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, Lang.get("vivecraft.gui.loaddefaults"))); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, Lang.get("gui.done"))); VRSettings.VrOptions[] buttons = seatedOptions; addButtons(buttons, 0); - this.buttonList.add(new GuiButtonEx(300, this.width / 2 - 155 , this.height / 6 + 102,150,20, "Free Move Settings...")); - this.buttonList.add(new GuiButtonEx(301, this.width / 2 + 5 , this.height / 6 + 102,150,20, "Teleport Settings...")); + this.buttonList.add(new GuiButtonEx(300, this.width / 2 - 155 , this.height / 6 + 102,150,20, Lang.get("vivecraft.options.screen.freemove.button"))); + this.buttonList.add(new GuiButtonEx(301, this.width / 2 + 5 , this.height / 6 + 102,150,20, Lang.get("vivecraft.options.screen.teleport.button"))); } @@ -161,91 +162,6 @@ else if (par1GuiButton instanceof GuiSmallButtonEx) } } - @Override - protected String[] getTooltipLines(String displayString, int buttonId) - { - VRSettings.VrOptions e = VRSettings.VrOptions.getEnumOptions(buttonId); - if( e != null ) - switch(e) - { - case KEYHOLE: - return new String[] { - "The number of degrees to the left and right of center", - "Where the view will begin to rotate." - }; - case X_SENSITIVITY: - return new String[] { - "Speed the view will rotate when pushed on the edge of the keyhole" - }; - case Y_SENSITIVITY: - return new String[] { - "Vertical speed of the crosshair related to the mouse" - }; - case MOVE_MODE: - return new String[] { - "Free Move with WASD or Teleport with W" - }; - case LIMIT_TELEPORT: - return new String[] { - "If enabled the arc teleporter will be have restrictions", - "in survival mode. It will not be able to jump up the side", - "of blocks, it will consume food, and it will have an energy", - "bar that refills over time." - } ; - case SIMULATE_FALLING: - return new String[] { - "If enabled the player will falls to the ground in TP mode", - "when standing above empty space. Also allows jumping" - } ; - case SEATED_HMD: - return new String[] { - "The direction the forward (W) key will go. You can ", - "HMD view direction or crosshair pointing direction" - } ; - case SEATED_HUD_XHAIR: - return new String[] { - "The direction the HUD will be placed.", - "HMD view direction or crosshair pointing direction" - } ; - case FOV_REDUCTION: - return new String[] { - "Shrinks the field of view while moving. Can help with", - "motion sickness." - } ; - case WORLD_ROTATION_INCREMENT: - return new String[] { - "How many degrees to rotate when", - "rotating the world." - - }; - case TELEPORT_DOWN_LIMIT: - return new String[] { - "Limit the number of blocks you can teleport below you" - }; - case TELEPORT_UP_LIMIT: - return new String[] { - "Limit the number of blocks you can teleport above you" - }; - case TELEPORT_HORIZ_LIMIT: - return new String[] { - "Limit the number of blocks you can teleport sideways you" - }; - case SEATED_FREE_MOVE: - return new String[] { - "Which locomotion mode to use in seated mode.", - "", - "Teleport: Press any direction to activate.", - "Free Move: WASD movement like vanilla Minecraft." - }; - default: - return null; - } - else{ - - } - return null; - } - @Override public boolean event(int id, VrOptions enumm) { return true; diff --git a/src/org/vivecraft/gui/settings/GuiStandingSettings.java b/src/org/vivecraft/gui/settings/GuiStandingSettings.java index ebddd2e..d1d374d 100644 --- a/src/org/vivecraft/gui/settings/GuiStandingSettings.java +++ b/src/org/vivecraft/gui/settings/GuiStandingSettings.java @@ -17,6 +17,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; +import net.optifine.Lang; public class GuiStandingSettings extends BaseGuiSettings implements GuiEventEx { @@ -33,7 +34,7 @@ public class GuiStandingSettings extends BaseGuiSettings implements GuiEventEx public GuiStandingSettings(GuiScreen guiScreen, VRSettings guivrSettings) { super( guiScreen, guivrSettings ); - screenTitle = "Standing Locomotion Settings"; + screenTitle = "vivecraft.options.screen.standing"; } /** @@ -42,12 +43,12 @@ public GuiStandingSettings(GuiScreen guiScreen, VRSettings guivrSettings) { public void initGui() { this.buttonList.clear(); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, "Reset To Defaults")); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, "Done")); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, Lang.get("vivecraft.gui.loaddefaults"))); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, Lang.get("gui.done"))); VRSettings.VrOptions[] buttons = locomotionSettings; addButtons(buttons,0); - this.buttonList.add(new GuiButtonEx(300, this.width / 2 - 155 , this.height / 6 + 102,150,20, "Free Move Settings...")); - this.buttonList.add(new GuiButtonEx(301, this.width / 2 + 5 , this.height / 6 + 102,150,20, "Teleport Settings...")); + this.buttonList.add(new GuiButtonEx(300, this.width / 2 - 155 , this.height / 6 + 102,150,20, Lang.get("vivecraft.options.screen.freemove.button"))); + this.buttonList.add(new GuiButtonEx(301, this.width / 2 + 5 , this.height / 6 + 102,150,20, Lang.get("vivecraft.options.screen.teleport.button"))); } @@ -66,10 +67,6 @@ private void addButtons(VRSettings.VrOptions[] buttons, int startY) { extra += 5; continue; } - - HardwareType hw = MCOpenVR.getHardwareType(); - if (var8 == VRSettings.VrOptions.FREEMOVE_WMR_STICK) - if(!(hw.hasTouchpad && hw.hasStick)) continue; boolean show = true; @@ -85,12 +82,6 @@ private void addButtons(VRSettings.VrOptions[] buttons, int startY) { maxValue = 1.3f; increment = 0.01f; } - if (var8 == VRSettings.VrOptions.STRAFE_MULTIPLIER) - { - minValue = 0f; - maxValue = 1.0f; - increment = 0.01f; - } else if (var8 == VRSettings.VrOptions.WALK_MULTIPLIER){ minValue=1f; maxValue=10f; @@ -101,11 +92,6 @@ else if (var8 == VRSettings.VrOptions.WORLD_ROTATION_INCREMENT){ maxValue = 4f; increment = 1f; } - else if (var8 == VRSettings.VrOptions.ANALOG_DEADZONE) { - minValue = 0f; - maxValue = 0.5f; - increment = 0.01f; - } if(show) { GuiSliderEx slider = new GuiSliderEx(var8.returnEnumOrdinal(), width, height - 20, var8, this.guivrSettings.getKeyBinding(var8), minValue, maxValue, increment, this.guivrSettings.getOptionFloatValue(var8)); slider.setEventHandler(this); @@ -181,7 +167,7 @@ else if (par1GuiButton instanceof GuiSmallButtonEx) this.guivrSettings.setOptionValue(((GuiSmallButtonEx)par1GuiButton).returnVrEnumOptions(), 1); par1GuiButton.displayString = this.guivrSettings.getKeyBinding(VRSettings.VrOptions.getEnumOptions(par1GuiButton.id)); - if(num == VRSettings.VrOptions.MOVE_MODE || num == VRSettings.VrOptions.FREEMOVE_MODE){ + if(num == VRSettings.VrOptions.FREEMOVE_MODE){ this.reinit = true; } if(num == VRSettings.VrOptions.LIMIT_TELEPORT){ @@ -202,131 +188,5 @@ public boolean event(int id, VRSettings.VrOptions enumm) public boolean event(int id, String s) { return true; } - - @Override - protected String[] getTooltipLines(String displayString, int buttonId) - { - VRSettings.VrOptions e = VRSettings.VrOptions.getEnumOptions(buttonId); - if( e != null ) - switch(e) - { - case MOVEMENT_MULTIPLIER: - return new String[] { - "Sets a movement multiplier, allowing slower movement", - "than default. This may help reduce locomotion induced", - "simulator sickness.", - "WARNING: May trigger anti-cheat warnings if on a", - "Multiplayer server!!", - "Defaults to standard Minecraft movement (1.0)", - "speed)." - } ; - case STRAFE_MULTIPLIER: - return new String[] { - "Sets an additional strafe (side-to-side) movement", - "multiplier. This is applied on top of the movement", - "multiplier. A value of zero will disable strafe.", - "This may help reduce locomotion induced simulator", - "sickness. WARNING: May trigger anti-cheat warnings", - "if on a Multiplayer server!!", - "Defaults to 0.33 (1.0 is standard Minecraft movement", - "speed)." - } ; - case WALK_UP_BLOCKS: - return new String[] { - "Allows you to set the ability to walk up blocks without", - "having to jump. HOTKEY - RCtrl-B", - "WARNING: May trigger anti-cheat warnings if on a", - "Multiplayer server!!", - " OFF: (Default) You will have to jump up blocks.", - " ON: You can walk up single blocks. May reduce", - " locomotion induced simulator sickness for some." - } ; - case INERTIA_FACTOR: - return new String[]{ - "Sets the player's movement inertia in single player", - "mode. Lower inertia means faster acceleration, higher", - "inertia slower accelaration. High inertia may reduce", - "motion sickness for some, but beware of cliff edges!!", - " Normal: (Default) Standard Minecraft player", - " movement.", - " Automan < Normal < A lot < Even More. Does not", - " affect lava, water or jumping movement currently." - }; - // VIVE START - new options - case ALLOW_CRAWLING: - return new String[] { - "If enabled the player will be able to duck under block" - } ; - case BCB_ON: - return new String[] { - "Shows your body position as a square shadow on the ground.", - "This is your Square Shadow Buddy (tm).", - "Do not lose your Square Shadow Buddy." - }; - case VEHICLE_ROTATION: - return new String[] { - "Riding in a vehicle will rotate the world", - "as the vehicle rotates. May be disorienting." - - } ; - case FOV_REDUCTION: - return new String[] { - "Shrinks the field of view while moving. Can help with", - "motion sickness." - } ; - case WORLD_ROTATION_INCREMENT: - return new String[] { - "How many degrees to rotate when", - "rotating the world. Move all the way left for Smooth." - - }; - case ANALOG_MOVEMENT: - return new String[] { - "Walking speed will be determined by the controller button", - "axis, if the bound button has a variable axis." ,"", - "For full analog control it is better to use 'Joy/Pad mode" - }; - case TELEPORT_DOWN_LIMIT: - return new String[] { - "Limit the number of blocks you can teleport below you" - }; - case TELEPORT_UP_LIMIT: - return new String[] { - "Limit the number of blocks you can teleport above you" - }; - case TELEPORT_HORIZ_LIMIT: - return new String[] { - "Limit the number of blocks you can teleport sideways you" - }; - case FORCE_STANDING_FREE_MOVE: - return new String[] { - "Forces the use of the fallback walk forwards", - "binding (left trigger by default). For more movement", - "options, edit the SteamVR controller bindings.", - "", - "Note that this disables the teleport binding." - }; - case ALLOW_STANDING_ORIGIN_OFFSET: - return new String[]{ - "Allows the \"Reset Origin\" button to be used in", - "standing mode, for those that wish to play physically", - "seated while using tracked controllers." - }; - default: - return null; - } - else - switch(buttonId) - { -// case 201: -// return new String[] { -// "Open this configuration screen to adjust the Head", -// " Tracker orientation (direction) settings. ", -// " Ex: Head Tracking Selection (Hydra/Oculus), Prediction" -// }; - default: - return null; - } - } } diff --git a/src/org/vivecraft/gui/settings/GuiTeleportSettings.java b/src/org/vivecraft/gui/settings/GuiTeleportSettings.java index e51025b..62e929e 100644 --- a/src/org/vivecraft/gui/settings/GuiTeleportSettings.java +++ b/src/org/vivecraft/gui/settings/GuiTeleportSettings.java @@ -11,6 +11,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; +import net.optifine.Lang; public class GuiTeleportSettings extends BaseGuiSettings implements GuiEventEx { private static VRSettings.VrOptions[] teleportSettings = new VRSettings.VrOptions[] { @@ -26,15 +27,15 @@ public class GuiTeleportSettings extends BaseGuiSettings implements GuiEventEx { public GuiTeleportSettings(GuiScreen guiScreen, VRSettings settings) { super(guiScreen, settings); - screenTitle = "Teleport Settings"; + screenTitle = "vivecraft.options.screen.teleport"; } @Override public void initGui() { this.buttonList.clear(); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, "Reset To Defaults")); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, "Done")); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, Lang.get("vivecraft.gui.loaddefaults"))); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, Lang.get("gui.done"))); addButtons(teleportSettings, 0); if (guivrSettings.vrLimitedSurvivalTeleport) @@ -126,41 +127,7 @@ else if (par1GuiButton instanceof GuiSmallButtonEx) } } } - @Override - protected String[] getTooltipLines(String displayString, int buttonId) - { - VRSettings.VrOptions e = VRSettings.VrOptions.getEnumOptions(buttonId); - if( e != null ) - switch(e) - { - case TELEPORT_DOWN_LIMIT: - return new String[] { - "Limit the number of blocks you can teleport below you" - }; - case TELEPORT_UP_LIMIT: - return new String[] { - "Limit the number of blocks you can teleport above you" - }; - case TELEPORT_HORIZ_LIMIT: - return new String[] { - "Limit the number of blocks you can teleport sideways you" - }; - default: - return null; - } - else - switch(buttonId) - { -// case 201: -// return new String[] { -// "Open this configuration screen to adjust the Head", -// " Tracker orientation (direction) settings. ", -// " Ex: Head Tracking Selection (Hydra/Oculus), Prediction" -// }; - default: - return null; - } - } + @Override public boolean event(int id, VrOptions enumm) { // TODO Auto-generated method stub diff --git a/src/org/vivecraft/gui/settings/GuiVRControls.java b/src/org/vivecraft/gui/settings/GuiVRControls.java index 865fc39..667b4fb 100644 --- a/src/org/vivecraft/gui/settings/GuiVRControls.java +++ b/src/org/vivecraft/gui/settings/GuiVRControls.java @@ -24,6 +24,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; import net.minecraft.util.text.TextFormatting; +import net.optifine.Lang; public class GuiVRControls extends BaseGuiSettings implements GuiEventEx{ @@ -34,7 +35,7 @@ public class GuiVRControls extends BaseGuiSettings implements GuiEventEx{ public GuiVRControls(GuiScreen par1GuiScreen, VRSettings par2vrSettings) { super(par1GuiScreen, par2vrSettings); - screenTitle = "Controller Settings"; + screenTitle = "vivecraft.options.screen.controls"; } @@ -43,8 +44,8 @@ public GuiVRControls(GuiScreen par1GuiScreen, VRSettings par2vrSettings) { */ public void initGui() { this.buttonList.clear(); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, "Reset To Defaults")); - this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, "Done")); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DEFAULTS, this.width / 2 - 155 , this.height -25 ,150,20, Lang.get("vivecraft.gui.loaddefaults"))); + this.buttonList.add(new GuiButtonEx(ID_GENERIC_DONE, this.width / 2 - 155 + 160, this.height -25,150,20, Lang.get("gui.done"))); addButtons(controlsSettings, this.height / 2 ); } @@ -74,9 +75,9 @@ private void addButtons(VRSettings.VrOptions[] buttons, int y) { */ public void drawScreen(int par1, int par2, float par3) { super.drawScreen(par1, par2, par3); - this.drawCenteredString(this.fontRenderer, "Bindings are handled by SteamVR Input.", this.width / 2, this.height / 2 - this.fontRenderer.FONT_HEIGHT / 2 - this.fontRenderer.FONT_HEIGHT - 3, 16777215); - this.drawCenteredString(this.fontRenderer, "Go to Settings > Controllers > Manage Controller Bindings in the dashboard.", this.width / 2, this.height / 2 - this.fontRenderer.FONT_HEIGHT / 2, 16777215); - this.drawCenteredString(this.fontRenderer, TextFormatting.GOLD + "Steam must be running " + TextFormatting.ITALIC + "before" + TextFormatting.RESET + TextFormatting.GOLD + " SteamVR is started, or bindings will not save.", this.width / 2, this.height / 2 - this.fontRenderer.FONT_HEIGHT / 2 + this.fontRenderer.FONT_HEIGHT + 3, 16777215); + this.drawCenteredString(this.fontRenderer, Lang.get("vivecraft.messages.controls.1"), this.width / 2, this.height / 2 - this.fontRenderer.FONT_HEIGHT / 2 - this.fontRenderer.FONT_HEIGHT - 3, 16777215); + this.drawCenteredString(this.fontRenderer, Lang.get("vivecraft.messages.controls.2"), this.width / 2, this.height / 2 - this.fontRenderer.FONT_HEIGHT / 2, 16777215); + this.drawCenteredString(this.fontRenderer, Lang.get("vivecraft.messages.controls.3"), this.width / 2, this.height / 2 - this.fontRenderer.FONT_HEIGHT / 2 + this.fontRenderer.FONT_HEIGHT + 3, 16777215); } @Override diff --git a/src/org/vivecraft/provider/MCOpenVR.java b/src/org/vivecraft/provider/MCOpenVR.java index 28b618d..39521ab 100644 --- a/src/org/vivecraft/provider/MCOpenVR.java +++ b/src/org/vivecraft/provider/MCOpenVR.java @@ -45,6 +45,7 @@ import org.vivecraft.utils.HardwareType; import org.vivecraft.utils.InputInjector; import org.vivecraft.utils.KeyboardSimulator; +import org.vivecraft.utils.LangHelper; import org.vivecraft.utils.MCReflection; import org.vivecraft.utils.Matrix4f; import org.vivecraft.utils.MenuWorldExporter; @@ -103,8 +104,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; -import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; +import net.optifine.Lang; import net.optifine.reflect.Reflector; import org.apache.commons.lang3.ArrayUtils; import org.lwjgl.input.Keyboard; @@ -160,6 +161,7 @@ public class MCOpenVR public static Vec3History hmdHistory = new Vec3History(); public static Vec3History hmdPivotHistory = new Vec3History(); public static Vec3History[] controllerHistory = new Vec3History[] { new Vec3History(), new Vec3History()}; + public static Vec3History[] controllerForwardHistory = new Vec3History[] { new Vec3History(), new Vec3History()}; /** * Do not make this public and reference it! Call the {@link #getHardwareType()} method instead! @@ -1019,14 +1021,16 @@ private static void getTransforms() { List componentNames = new ArrayList(); //TODO get the controller-specific list componentNames.add("tip"); - componentNames.add("base"); + //wmr doesnt define these... + //componentNames.add("base"); + //componentNames.add("status"); + // componentNames.add("handgrip"); - componentNames.add("status"); + boolean failed = false; for (String comp : componentNames) { controllerComponentTransforms.put(comp, new Matrix4f[2]); - Pointer p = ptrFomrString(comp); for (int i = 0; i < 2; i++) { @@ -1037,7 +1041,18 @@ private static void getTransforms() { continue; } vrsystem.GetStringTrackedDeviceProperty.apply(controllerDeviceIndex[i], JOpenVRLibrary.ETrackedDeviceProperty.ETrackedDeviceProperty_Prop_RenderModelName_String, pointer, JOpenVRLibrary.k_unMaxPropertyStringSize - 1, hmdErrorStore); - + String renderModel = pointer.getString(0); + Pointer p = ptrFomrString(comp); + + Pointer test = new Memory(JOpenVRLibrary.k_unMaxPropertyStringSize); + vrsystem.GetStringTrackedDeviceProperty.apply(controllerDeviceIndex[i], JOpenVRLibrary.ETrackedDeviceProperty.ETrackedDeviceProperty_Prop_InputProfilePath_String, test, JOpenVRLibrary.k_unMaxPropertyStringSize - 1, hmdErrorStore); + String path = test.getString(0); + boolean isWMR = path.contains("holographic"); + + if(isWMR && comp.equals("handgrip")) {// i have no idea, Microsoft, none. + // System.out.println("Apply WMR override " + i); + p = ptrFomrString("body"); + } //doing this next bit for each controller because pointer long button = vrRenderModels.GetComponentButtonMask.apply(pointer, p); if (button > 0) { //see now... wtf openvr, '0' is the system button, it cant also be the error value! (hint: it's a mask, not an index) @@ -1102,7 +1117,7 @@ public static Matrix4f getControllerComponentTransform(int controllerIndex, Stri public static Matrix4f getControllerComponentTransformFromButton(int controllerIndex, long button){ if (controllerComponentNames == null || !controllerComponentNames.containsKey(button)) - return getControllerComponentTransform(controllerIndex, "status"); + return new Matrix4f(); return getControllerComponentTransform(controllerIndex, controllerComponentNames.get(button)); } @@ -1245,13 +1260,13 @@ public static void poll(long frameIndex) private static int quickTorchPreviousSlot; private static void processHotbar() { - + mc.interactTracker.hotbar = -1; if(mc.player == null) return; if(mc.player.inventory == null) return; if(mc.climbTracker.isGrabbingLadder() && mc.climbTracker.isClaws(mc.player.getHeldItemMainhand())) return; - + if(!mc.interactTracker.isActive(mc.player)) return; Vec3d main = getAimSource(0); Vec3d off = getAimSource(1); @@ -1280,26 +1295,30 @@ private static void processHotbar() { float fact = (float) (pq.dotProduct(u) / (u.x*u.x + u.y*u.y + u.z*u.z)); - if(fact < 0) return; - + if(fact < -1) return; + Vec3d w2 = u.scale(fact).subtract(pq); Vec3d point = main.subtract(w2); - float linelen = (float) barStart.subtract(barEnd).lengthVector(); + float linelen = (float) u.lengthVector(); float ilen = (float) barStart.subtract(point).lengthVector(); - + if(fact < 0) ilen *= -1; float pos = ilen / linelen * 9; if(mc.vrSettings.vrReverseHands) pos = 9 - pos; int box = (int) Math.floor(pos); - if(pos - Math.floor(pos) < 0.1) return; if(box > 8) return; - if(box < 0) return; + if(box < 0) { + if(pos <= -0.5 && pos >= -1.5) //TODO fix reversed hands situation. + box = 9; + else + return; + } //all that maths for this. - if(box != mc.player.inventory.currentItem){ - mc.player.inventory.currentItem = box; + mc.interactTracker.hotbar = box; + if(box != mc.interactTracker.hotbar){ triggerHapticPulse(0, 750); } } @@ -1461,18 +1480,18 @@ public static void processBindings() { if (++moveModeSwitchCount == 20 * 4 || toggleMovementPressed) { if (mc.vrSettings.seated) { mc.vrSettings.seatedFreeMove = !mc.vrSettings.seatedFreeMove; - mc.printChatMessage("Movement mode switched to: " + (mc.vrSettings.seatedFreeMove ? "Free-move" : "Teleport")); + mc.printChatMessage(LangHelper.get("vivecraft.messages.movementmodeswitch", mc.vrSettings.seatedFreeMove ? Lang.get("vivecraft.options.freemove") : Lang.get("vivecraft.options.teleport"))); } else { if (mc.vrPlayer.isTeleportSupported()) { mc.vrSettings.forceStandingFreeMove = !mc.vrSettings.forceStandingFreeMove; - mc.printChatMessage("Movement mode switched to: " + (mc.vrSettings.forceStandingFreeMove ? "Free-move" : "Teleport")); + mc.printChatMessage(LangHelper.get("vivecraft.messages.movementmodeswitch", mc.vrSettings.seatedFreeMove ? Lang.get("vivecraft.options.freemove") : Lang.get("vivecraft.options.teleport"))); } else { if (mc.vrPlayer.isTeleportOverridden()) { mc.vrPlayer.setTeleportOverride(false); - mc.printChatMessage("Restricted movement enabled (no teleporting)"); + mc.printChatMessage(Lang.get("vivecraft.messages.teleportdisabled")); } else { mc.vrPlayer.setTeleportOverride(true); - mc.printChatMessage("Restricted movement disabled (teleporting allowed)"); + mc.printChatMessage(Lang.get("vivecraft.messages.teleportenabled")); } } } @@ -1714,8 +1733,8 @@ public void run() { } else { MenuWorldExporter.saveAreaToFile(mc.world, pos.getX() - size / 2, pos.getZ() - size / 2, size, size, pos.getY(), file); } - mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString("World export complete... area size: " + size)); - mc.ingameGUI.getChatGUI().printChatMessage(new TextComponentString("Saved to " + file.getAbsolutePath())); + mc.printChatMessage(LangHelper.get("vivecraft.messages.menuworldexportcomplete.1", size)); + mc.printChatMessage(LangHelper.get("vivecraft.messages.menuworldexportcomplete.2", file.getAbsolutePath())); } catch (Exception e) { e.printStackTrace(); } @@ -1733,6 +1752,7 @@ public void run() { GuiHandler.processBindingsGui(); RadialHandler.processBindings(); KeyboardHandler.processBindings(); + mc.interactTracker.processBindings(); } @@ -2477,6 +2497,8 @@ private static void updateAim() { Vec3d dir = getAimVector(0); aimPitch = (float)Math.toDegrees(Math.asin(dir.y/dir.lengthVector())); + controllerForwardHistory[0].add(dir); + } {//left controller diff --git a/src/org/vivecraft/provider/OpenVRStereoRenderer.java b/src/org/vivecraft/provider/OpenVRStereoRenderer.java index 622bb2f..3531229 100644 --- a/src/org/vivecraft/provider/OpenVRStereoRenderer.java +++ b/src/org/vivecraft/provider/OpenVRStereoRenderer.java @@ -137,6 +137,7 @@ public double getFrameTiming() { public void deleteRenderTextures() { if (LeftEyeTextureId > 0) GL11.glDeleteTextures(LeftEyeTextureId); + if (RightEyeTextureId > 0) GL11.glDeleteTextures(RightEyeTextureId); } public String getLastError() { return ""; } @@ -440,36 +441,36 @@ public void setupRenderConfiguration() throws Exception } //why? -// if (!Display.isActive() && fullscreen) -// { -// toggleFullscreen(); -// reinitFramebuffers = true; -// } - -// if (wasDisplayResized()) -// { -// //Display.update(); // This will set new display widths accordingly -// reinitFrameBuffers("Display Resized"); -// } - -// if (lastGuiScale != mc.gameSettings.guiScale) -// { -// lastGuiScale = mc.gameSettings.guiScale; -// reinitFrameBuffers("GUI Scale Changed"); -// } + // if (!Display.isActive() && fullscreen) + // { + // toggleFullscreen(); + // reinitFramebuffers = true; + // } + + // if (wasDisplayResized()) + // { + // //Display.update(); // This will set new display widths accordingly + // reinitFrameBuffers("Display Resized"); + // } + + // if (lastGuiScale != mc.gameSettings.guiScale) + // { + // lastGuiScale = mc.gameSettings.guiScale; + // reinitFrameBuffers("GUI Scale Changed"); + // } //mc.showNativeMouseCursor(!mc.isGameFocused()); // Check for changes in window handle -// if (mc.mainWindow.getHandle() != lastWindow) -// { -// lastWindow = mc.mainWindow.getHandle(); -// reinitFrameBuffers("Window Handle Changed"); -// } + // if (mc.mainWindow.getHandle() != lastWindow) + // { + // lastWindow = mc.mainWindow.getHandle(); + // reinitFrameBuffers("Window Handle Changed"); + // } -// if (lastShaderIndex != mc.vrSettings.shaderIndex) { -// reinitFramebuffers = true; -// } + // if (lastShaderIndex != mc.vrSettings.shaderIndex) { + // reinitFramebuffers = true; + // } if (lastEnableVsync != mc.gameSettings.enableVsync) { reinitFrameBuffers("VSync Changed"); @@ -484,8 +485,8 @@ public void setupRenderConfiguration() throws Exception int displayFBWidth = (mc.displayWidth< 1) ? 1 : mc.displayWidth; int displayFBHeight = (mc.displayHeight < 1) ? 1 : mc.displayHeight; - - + + int eyew, eyeh; eyew = displayFBWidth; @@ -515,23 +516,23 @@ public void setupRenderConfiguration() throws Exception framebufferUndistorted = null; } - if (framebufferEye0 != null) { - framebufferEye0.deleteFramebuffer(); - framebufferEye0 = null; - } - - if (framebufferEye1 != null) { - framebufferEye1.deleteFramebuffer(); - framebufferEye1 = null; - } - - deleteRenderTextures(); ///TODO should this do something.. ? + // if (framebufferEye0 != null) { + // framebufferEye0.deleteFramebuffer(); + // framebufferEye0 = null; + // } + // + // if (framebufferEye1 != null) { + // framebufferEye1.deleteFramebuffer(); + // framebufferEye1 = null; + // } + + // deleteRenderTextures(); if (GuiHandler.guiFramebuffer != null) { GuiHandler.guiFramebuffer.deleteFramebuffer(); GuiHandler.guiFramebuffer = null; } - + if (KeyboardHandler.Framebuffer != null) { KeyboardHandler.Framebuffer.deleteFramebuffer(); KeyboardHandler.Framebuffer = null; @@ -552,48 +553,50 @@ public void setupRenderConfiguration() throws Exception fsaaFirstPassResultFBO.deleteFramebuffer(); fsaaFirstPassResultFBO = null; } - + if (fsaaLastPassResultFBO != null) { fsaaLastPassResultFBO.deleteFramebuffer(); fsaaLastPassResultFBO = null; } - + int multiSampleCount = 0; boolean multiSample = (multiSampleCount > 0 ? true : false); checkGLError("Mirror framebuffer setup"); - createRenderTexture( - eyew, - eyeh); - - if (LeftEyeTextureId == -1) { + if(framebufferEye0 == null) { + createRenderTexture( + eyew, + eyeh); + checkGLError("Render Texture setup"); + if (LeftEyeTextureId == -1) { throw new RenderConfigException(RENDER_SETUP_FAILURE_MESSAGE + getName(), getLastError()); } - mc.print("L Render texture resolution: " + eyew + " x " + eyeh); - mc.print("Provider supplied render texture IDs:\n" + LeftEyeTextureId + " " + RightEyeTextureId); + mc.print("L Render texture resolution: " + eyew + " x " + eyeh); + mc.print("Provider supplied render texture IDs:\n" + LeftEyeTextureId + " " + RightEyeTextureId); - checkGLError("Render Texture setup"); + framebufferEye0 = new Framebuffer("L Eye", eyew, eyeh, true, false, true, false, 0, LeftEyeTextureId, false); + mc.print(framebufferEye0.toString()); + checkGLError("Left Eye framebuffer setup"); + } + + if(framebufferEye1 == null) { + framebufferEye1 = new Framebuffer("R Eye", eyew, eyeh, true, false, true, false,0, RightEyeTextureId, false); + mc.print(framebufferEye1.toString()); + checkGLError("Right Eye framebuffer setup"); + } - framebufferEye0 = new Framebuffer("L Eye", eyew, eyeh, true, false, true, false, 0, LeftEyeTextureId, false); - mc.print(framebufferEye0.toString()); - checkGLError("Left Eye framebuffer setup"); - - framebufferEye1 = new Framebuffer("R Eye", eyew, eyeh, true, false, true, false,0, RightEyeTextureId, false); - mc.print(framebufferEye1.toString()); - checkGLError("Right Eye framebuffer setup"); - MCOpenVR.texType0.depth.handle = Pointer.createConstant(framebufferEye0.depthBuffer); MCOpenVR.texType1.depth.handle = Pointer.createConstant(framebufferEye1.depthBuffer); this.renderScale = (float)Math.sqrt(mc.vrSettings.renderScaleFactor); displayFBWidth = (int) Math.ceil(eyew * renderScale); displayFBHeight = (int) Math.ceil(eyeh * renderScale); - + framebufferVrRender = new Framebuffer("3D Render", displayFBWidth , displayFBHeight, true, false, true); mc.print(framebufferVrRender.toString()); checkGLError("3D framebuffer setup"); - + mirrorFBWidth = mc.displayWidth; mirrorFBHeight = mc.displayHeight; if (mc.vrSettings.displayMirrorMode == VRSettings.MIRROR_MIXED_REALITY) { @@ -613,20 +616,20 @@ public void setupRenderConfiguration() throws Exception for (RenderPass renderPass : renderPasses) { System.out.println("Passes: " + renderPass.toString()); } - + if (renderPasses.contains(RenderPass.THIRD)) { framebufferMR = new Framebuffer("Mixed Reality Render", mirrorFBWidth, mirrorFBHeight, true, false, false); mc.print(framebufferMR.toString()); checkGLError("Mixed reality framebuffer setup"); } - + if (renderPasses.contains(RenderPass.CENTER)) { framebufferUndistorted = new Framebuffer("Undistorted View Render", mirrorFBWidth, mirrorFBHeight, true, false, false); mc.print(framebufferUndistorted.toString()); checkGLError("Undistorted view framebuffer setup"); } - - + + GuiHandler.guiFramebuffer = new Framebuffer("GUI", mc.displayWidth, mc.displayHeight, true, true, true); mc.print(GuiHandler.guiFramebuffer.toString()); checkGLError("GUI framebuffer setup"); @@ -640,7 +643,7 @@ public void setupRenderConfiguration() throws Exception checkGLError("Radial framebuffer setup"); checkGLError("post color"); - + mc.entityRenderer.setupClipPlanes(); eyeproj[0] = getProjectionMatrix(0, mc.entityRenderer.minClipDistance, mc.entityRenderer.clipDistance).transposed().toFloatBuffer(); @@ -660,7 +663,7 @@ public void setupRenderConfiguration() throws Exception fsaaFirstPassResultFBO = new Framebuffer("FSAA Pass1 FBO",eyew, displayFBHeight, true, false, false, false, 0, -1, true); //TODO: ugh, support multiple color attachments in Framebuffer.... fsaaLastPassResultFBO = new Framebuffer("FSAA Pass2 FBO",eyew, eyeh, true, false, false, false, 0, -1, true); - + mc.print(fsaaFirstPassResultFBO.toString()); mc.print(fsaaLastPassResultFBO.toString()); @@ -681,23 +684,23 @@ public void setupRenderConfiguration() throws Exception return; } } - + try { //setup other shaders mc.framebufferMc = this.framebufferVrRender; VRShaders.setupDepthMask(); ShaderHelper.checkGLError("init depth shader"); VRShaders.setupFOVReduction(); ShaderHelper.checkGLError("init FOV shader"); - mc.renderGlobal.makeEntityOutlineShader(); + mc.renderGlobal.makeEntityOutlineShader(); } catch (Exception e) { System.out.println(e.getMessage()); System.exit(-1); } - + // Init screen size if (mc.currentScreen != null) { - ScaledResolution scaledresolution = new ScaledResolution(mc); + ScaledResolution scaledresolution = new ScaledResolution(mc); int k = scaledresolution.getScaledWidth(); int l = scaledresolution.getScaledHeight(); mc.currentScreen.setWorldAndResolution(mc, k, l); @@ -715,11 +718,11 @@ public void setupRenderConfiguration() throws Exception "\nRender target width: " + displayFBWidth + ", height: " + displayFBHeight + " [Render scale: " + Math.round(mc.vrSettings.renderScaleFactor * 100) + "%, " + String.format("%.1f", (displayFBWidth * displayFBHeight) / 1000000F) + " MP]" + "\nMain window width: " + mc.displayWidth + ", height: " + mc.displayHeight + " [" + String.format("%.1f", mainWindowPixels / 1000000F) + " MP]" + "\nTotal shaded pixels per frame: " + String.format("%.1f", pixelsPerFrame / 1000000F) + " MP (eye stencil not accounted for)" - ); + ); //loadingScreen = new LoadingScreenRenderer(this); - + lastDisplayFBWidth = displayFBWidth; lastDisplayFBHeight = displayFBHeight; reinitFramebuffers = false; diff --git a/src/org/vivecraft/render/MenuWorldRenderer.java b/src/org/vivecraft/render/MenuWorldRenderer.java index 4a895a8..66f6043 100644 --- a/src/org/vivecraft/render/MenuWorldRenderer.java +++ b/src/org/vivecraft/render/MenuWorldRenderer.java @@ -102,13 +102,13 @@ public void init() { } else { System.out.println("Failed to load any main menu world, falling back to old menu room"); } - } catch (Exception e) { - System.out.println("Exception thrown when loading main menu world, falling back to old menu room"); - e.printStackTrace(); - destroy(); - setWorld(null); - } catch (OutOfMemoryError e) { // Only effective way of preventing crash on poop computers with low heap size - System.out.println("OutOfMemoryError while loading main menu world. Low heap size or 32-bit Java?"); + } catch (Throwable e) { + if (e instanceof OutOfMemoryError || e.getCause() instanceof OutOfMemoryError) { + System.out.println("OutOfMemoryError while loading main menu world. Low heap size or 32-bit Java?"); + } else { + System.out.println("Exception thrown when loading main menu world, falling back to old menu room"); + e.printStackTrace(); + } destroy(); setWorld(null); } diff --git a/src/org/vivecraft/settings/VRHotkeys.java b/src/org/vivecraft/settings/VRHotkeys.java index 0d0c18b..c962e73 100644 --- a/src/org/vivecraft/settings/VRHotkeys.java +++ b/src/org/vivecraft/settings/VRHotkeys.java @@ -9,6 +9,7 @@ import org.vivecraft.settings.VRSettings.VrOptions; import org.vivecraft.utils.Angle; import org.vivecraft.utils.Axis; +import org.vivecraft.utils.LangHelper; import org.vivecraft.utils.Quaternion; import org.vivecraft.utils.Utils; import org.vivecraft.utils.Vector3; @@ -17,6 +18,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.TextComponentString; +import net.optifine.Lang; import org.lwjgl.input.Keyboard; public class VRHotkeys { @@ -68,7 +70,7 @@ public static boolean handleKeyboardInputs(Minecraft mc) if (Keyboard.getEventKey() == Keyboard.KEY_RSHIFT && Keyboard.isKeyDown(Keyboard.KEY_RCONTROL)) { mc.vrSettings.storeDebugAim = true; - mc.printChatMessage("Show aim (RCTRL+RSHIFT): done"); + mc.printChatMessage(Lang.get("vivecraft.messages.showaim")); gotKey = true; } @@ -76,7 +78,7 @@ public static boolean handleKeyboardInputs(Minecraft mc) if (Keyboard.getEventKey() == Keyboard.KEY_B && Keyboard.isKeyDown(Keyboard.KEY_RCONTROL)) { mc.vrSettings.walkUpBlocks = !mc.vrSettings.walkUpBlocks; - mc.printChatMessage("Walk up blocks (RCTRL+B): " + (mc.vrSettings.walkUpBlocks ? "YES" : "NO")); + mc.printChatMessage(LangHelper.get("vivecraft.messages.walkupblocks", mc.vrSettings.walkUpBlocks ? LangHelper.getYes() : LangHelper.getNo())); gotKey = true; } @@ -89,23 +91,23 @@ public static boolean handleKeyboardInputs(Minecraft mc) switch (mc.vrSettings.inertiaFactor) { case VRSettings.INERTIA_NONE: - mc.printChatMessage("Player player movement inertia (LCTRL-I): None"); + mc.printChatMessage(LangHelper.get("vivecraft.messages.playerinertia", Lang.get("vivecraft.options.inertia.none"))); break; case VRSettings.INERTIA_NORMAL: - mc.printChatMessage("Player player movement inertia (LCTRL-I): Normal"); + mc.printChatMessage(LangHelper.get("vivecraft.messages.playerinertia", Lang.get("vivecraft.options.inertia.normal"))); break; case VRSettings.INERTIA_LARGE: - mc.printChatMessage("Player player movement inertia (LCTRL-I): Large"); + mc.printChatMessage(LangHelper.get("vivecraft.messages.playerinertia", Lang.get("vivecraft.options.inertia.large"))); break; case VRSettings.INERTIA_MASSIVE: - mc.printChatMessage("Player player movement inertia (LCTRL-I): Massive"); + mc.printChatMessage(LangHelper.get("vivecraft.messages.playerinertia", Lang.get("vivecraft.options.inertia.massive"))); break; } gotKey = true; } // Render full player model or just an disembodied hand... - if (Keyboard.getEventKey() == Keyboard.KEY_H && Keyboard.isKeyDown(Keyboard.KEY_RCONTROL)) + /*if (Keyboard.getEventKey() == Keyboard.KEY_H && Keyboard.isKeyDown(Keyboard.KEY_RCONTROL)) { mc.vrSettings.renderFullFirstPersonModelMode++; if (mc.vrSettings.renderFullFirstPersonModelMode > VRSettings.RENDER_FIRST_PERSON_NONE) @@ -124,7 +126,7 @@ public static boolean handleKeyboardInputs(Minecraft mc) break; } gotKey = true; - } + }*/ // VIVE START - hotkeys // Testing different movement styles @@ -158,10 +160,10 @@ public static boolean handleKeyboardInputs(Minecraft mc) // for testing restricted client mode if (mc.vrPlayer.isTeleportOverridden()) { mc.vrPlayer.setTeleportOverride(false); - mc.printChatMessage("Restricted movement enabled (no teleporting)"); + mc.printChatMessage(Lang.get("vivecraft.messages.teleportdisabled")); } else { mc.vrPlayer.setTeleportOverride(true); - mc.printChatMessage("Restricted movement disabled (teleporting allowed)"); + mc.printChatMessage(Lang.get("vivecraft.messages.teleportenabled")); } gotKey = true; @@ -280,13 +282,13 @@ public static void handleMRKeys() { if(gotKey) { mc.vrSettings.saveOptions(); if (MCOpenVR.mrMovingCamActive) { - Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString("X: " + mc.vrSettings.mrMovingCamOffsetX + " Y: " + mc.vrSettings.mrMovingCamOffsetY + " Z: " + mc.vrSettings.mrMovingCamOffsetZ)); + Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString(LangHelper.get("vivecraft.messages.coords", mc.vrSettings.mrMovingCamOffsetX, mc.vrSettings.mrMovingCamOffsetY, mc.vrSettings.mrMovingCamOffsetZ))); Angle angle = mc.vrSettings.mrMovingCamOffsetRotQuat.toEuler(); - Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString("Pitch: " + angle.getPitch() + " Yaw: " + angle.getYaw() + " Roll: " + angle.getRoll())); + Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString(LangHelper.get("vivecraft.messages.angles", angle.getPitch(), angle.getYaw(), angle.getRoll()))); } else { - Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString("X: " + mc.vrSettings.vrFixedCamposX + " Y: " + mc.vrSettings.vrFixedCamposY + " Z: " + mc.vrSettings.vrFixedCamposZ)); + Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString(LangHelper.get("vivecraft.messages.coords", mc.vrSettings.vrFixedCamposX, mc.vrSettings.vrFixedCamposY, mc.vrSettings.vrFixedCamposZ))); Angle angle = mc.vrSettings.vrFixedCamrotQuat.toEuler(); - Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString("Pitch: " + angle.getPitch() + " Yaw: " + angle.getYaw() + " Roll: " + angle.getRoll())); + Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessage(new TextComponentString(LangHelper.get("vivecraft.messages.angles", angle.getPitch(), angle.getYaw(), angle.getRoll()))); } } } diff --git a/src/org/vivecraft/settings/VRSettings.java b/src/org/vivecraft/settings/VRSettings.java index d63bbf3..74e5cf7 100644 --- a/src/org/vivecraft/settings/VRSettings.java +++ b/src/org/vivecraft/settings/VRSettings.java @@ -19,6 +19,7 @@ import org.vivecraft.settings.profile.ProfileManager; import org.vivecraft.settings.profile.ProfileReader; import org.vivecraft.settings.profile.ProfileWriter; +import org.vivecraft.utils.LangHelper; import org.vivecraft.utils.Quaternion; import org.vivecraft.utils.Vector3; @@ -27,6 +28,7 @@ import net.minecraft.client.settings.KeyBinding; import net.minecraft.client.shader.Framebuffer; import net.minecraft.util.Tuple; +import net.optifine.Lang; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.JSONObject; @@ -81,7 +83,8 @@ public class VRSettings public static final int FREEMOVE_HMD= 2; public static final int FREEMOVE_RUNINPLACE= 3; public static final int FREEMOVE_JOYPAD = 4; - + public static final int FREEMOVE_ROOM = 5; + public static final int MENU_WORLD_BOTH = 0; public static final int MENU_WORLD_CUSTOM = 1; public static final int MENU_WORLD_OFFICIAL = 2; @@ -129,7 +132,7 @@ public class VRSettings public int inertiaFactor = INERTIA_NORMAL; public boolean walkUpBlocks = true; // VIVE default to enable climbing public boolean simulateFalling = true; // VIVE if HMD is over empty space, fall - public boolean weaponCollision = true; // VIVE weapon hand collides with blocks/enemies + public int weaponCollision = 2; // VIVE weapon hand collides with blocks/enemies public float movementSpeedMultiplier = 1.0f; // VIVE - use full speed by default public int vrFreeMoveMode = this.FREEMOVE_CONTROLLER; public boolean vrLimitedSurvivalTeleport = true; @@ -215,6 +218,7 @@ public class VRSettings public int forceHardwareDetection = 0; // 0 = off, 1 = vive, 2 = oculus public boolean radialModeHold = true; public boolean physicalKeyboard = true; + public float physicalKeyboardScale = 1.0f; public boolean allowAdvancedBindings = false; // @@ -475,9 +479,9 @@ public void loadOptions(JSONObject theProfiles) { this.simulateFalling = optionTokens[1].equals("true"); } - if (optionTokens[0].equals("weaponCollision")) + if (optionTokens[0].equals("weaponCollisionNew")) { - this.weaponCollision = optionTokens[1].equals("true"); + this.weaponCollision = Integer.parseInt(optionTokens[1]); } if (optionTokens[0].equals("animalTouching")) { @@ -703,6 +707,10 @@ public void loadOptions(JSONObject theProfiles) this.physicalKeyboard = optionTokens[1].equals("true"); } + if(optionTokens[0].equals("physicalKeyboardScale")){ + this.physicalKeyboardScale = parseFloat(optionTokens[1]); + } + if(optionTokens[0].equals("originOffset")){ String[] split = optionTokens[1].split(","); MCOpenVR.offset = new Vector3(Float.parseFloat(split[0]), Float.parseFloat(split[1]), Float.parseFloat(split[2])); @@ -832,198 +840,182 @@ public void resetSettings() public String getKeyBinding( VRSettings.VrOptions par1EnumOptions ) { - String var2 = par1EnumOptions.getEnumString(); + String var2 = Lang.get("vivecraft.options." + par1EnumOptions.name()); String var3 = var2 + ": "; String var4 = var3; String var5; switch( par1EnumOptions) { - case OTHER_HUD_SETTINGS: - return var2; - case OTHER_RENDER_SETTINGS: - return var2; - case LOCOMOTION_SETTINGS: - return var2; case MOVEMENT_MULTIPLIER: return var4 + String.format("%.2f", this.movementSpeedMultiplier); case HUD_OPACITY: if( this.hudOpacity > 0.99) - return var4 + "Opaque"; + return var4 + Lang.get("vivecraft.options.opaque"); return var4 + String.format("%.2f", this.hudOpacity); case RENDER_MENU_BACKGROUND: - return this.menuBackground ? var4 + "ON" : var4 + "OFF"; - case RENDER_FULL_FIRST_PERSON_MODEL_MODE: - if (this.renderFullFirstPersonModelMode == RENDER_FIRST_PERSON_FULL) - return var4 + "Full"; - else if (this.renderFullFirstPersonModelMode == RENDER_FIRST_PERSON_HAND) - return var4 + "Hand"; - else if (this.renderFullFirstPersonModelMode == RENDER_FIRST_PERSON_NONE) - return var4 + "None"; + return this.menuBackground ? var4 + Lang.getOn() : var4 + Lang.getOff(); case MIRROR_DISPLAY: switch(this.displayMirrorMode) { case MIRROR_OFF: default: - return var4 + "OFF"; + return var4 + Lang.get("vivecraft.options.mirror.off"); case MIRROR_ON_DUAL: - return var4 + "Dual"; + return var4 + Lang.get("vivecraft.options.mirror.dual"); case MIRROR_ON_SINGLE: - return var4 + "Single"; + return var4 + Lang.get("vivecraft.options.mirror.single"); case MIRROR_FIRST_PERSON: - return var4 + "1st Person"; + return var4 + Lang.get("vivecraft.options.mirror.firstperson"); case MIRROR_THIRD_PERSON: - return var4 + "3rd Person"; + return var4 + Lang.get("vivecraft.options.mirror.thirdperson"); case MIRROR_MIXED_REALITY: - return var4 + "Mixed Reality"; + return var4 + Lang.get("vivecraft.options.mirror.mixedreality"); case MIRROR_ON_CROPPED: - return var4 + "Cropped"; + return var4 + Lang.get("vivecraft.options.mirror.cropped"); } case MIRROR_EYE: - return this.displayMirrorLeftEye ? var4 + "Left" : var4 + "Right"; + return this.displayMirrorLeftEye ? var4 + Lang.get("vivecraft.options.left") : var4 + Lang.get("vivecraft.options.right"); case MIXED_REALITY_KEY_COLOR: if (this.mixedRealityKeyColor.equals(new Color(0, 0, 0))) { - return var4 + "Black"; + return var4 + Lang.get("vivecraft.options.color.black"); } else if (this.mixedRealityKeyColor.equals(new Color(255, 0, 0))) { - return var4 + "Red"; + return var4 + Lang.get("vivecraft.options.color.red"); } else if (this.mixedRealityKeyColor.equals(new Color(255, 255, 0))) { - return var4 + "Yellow"; + return var4 + Lang.get("vivecraft.options.color.yellow"); } else if (this.mixedRealityKeyColor.equals(new Color(0, 255, 0))) { - return var4 + "Green"; + return var4 + Lang.get("vivecraft.options.color.green"); } else if (this.mixedRealityKeyColor.equals(new Color(0, 255, 255))) { - return var4 + "Cyan"; + return var4 + Lang.get("vivecraft.options.color.cyan"); } else if (this.mixedRealityKeyColor.equals(new Color(0, 0, 255))) { - return var4 + "Blue"; + return var4 + Lang.get("vivecraft.options.color.blue"); } else if (this.mixedRealityKeyColor.equals(new Color(255, 0, 255))) { - return var4 + "Magenta"; + return var4 + Lang.get("vivecraft.options.color.magenta"); } return var4 + this.mixedRealityKeyColor.getRed() + " " + this.mixedRealityKeyColor.getGreen() + " " + this.mixedRealityKeyColor.getBlue(); case MIXED_REALITY_RENDER_HANDS: - return this.mixedRealityRenderHands ? var4 + "ON" : var4 + "OFF"; + return this.mixedRealityRenderHands ? var4 + Lang.getOn() : var4 + Lang.getOff(); case MIXED_REALITY_UNITY_LIKE: - return this.mixedRealityUnityLike ? var4 + "Unity" : var4 + "Side-by-Side"; + return this.mixedRealityUnityLike ? var4 + Lang.get("vivecraft.options.unity") : var4 + Lang.get("vivecraft.options.sidebyside"); case MIXED_REALITY_UNDISTORTED: - return this.mixedRealityMRPlusUndistorted ? var4 + "ON" : var4 + "OFF"; + return this.mixedRealityMRPlusUndistorted ? var4 + Lang.getOn() : var4 + Lang.getOff(); case MIXED_REALITY_ALPHA_MASK: - return this.mixedRealityAlphaMask ? var4 + "ON" : var4 + "OFF"; + return this.mixedRealityAlphaMask ? var4 + Lang.getOn() : var4 + Lang.getOff(); case MIXED_REALITY_FOV: return var4 + String.format("%.0f\u00B0", this.mc.vrSettings.mixedRealityFov); - case INSIDE_BLOCK_SOLID_COLOR: - return this.insideBlockSolidColor ? var4 + "Solid Color" : var4 + "Texture"; case WALK_UP_BLOCKS: - return this.walkUpBlocks ? var4 + "ON" : var4 + "OFF"; + return this.walkUpBlocks ? var4 + Lang.getOn() : var4 + Lang.getOff(); case HUD_SCALE: return var4 + String.format("%.2f", this.hudScale); case HUD_LOCK_TO: switch (this.vrHudLockMode) { // VIVE - lock to hand instead of body case HUD_LOCK_HAND: - return var4 + "Hand"; + return var4 + Lang.get("vivecraft.options.hand"); case HUD_LOCK_HEAD: - return var4 + "Head"; + return var4 + Lang.get("vivecraft.options.head"); case HUD_LOCK_WRIST: - return var4 + "Wrist"; + return var4 + Lang.get("vivecraft.options.wrist"); case HUD_LOCK_BODY: - return var4 + "Body"; + return var4 + Lang.get("vivecraft.options.body"); } case HUD_DISTANCE: return var4 + String.format("%.2f", this.hudDistance); - case HUD_PITCH: - return var4 + String.format("%.0f", this.hudPitchOffset); - case HUD_YAW: - return var4 + String.format("%.0f", this.hudYawOffset); case HUD_HIDE: - return this.mc.gameSettings.hideGUI ? var4 + "YES" : var4 + "NO"; + return this.mc.gameSettings.hideGUI ? var4 + LangHelper.getYes() : var4 + LangHelper.getNo(); case RENDER_SCALEFACTOR: Framebuffer eye0 = mc.stereoProvider.framebufferEye0; return var4 + Math.round(this.renderScaleFactor * 100) + "% (" + (int)Math.ceil(eye0.framebufferWidth * Math.sqrt(this.renderScaleFactor)) + "x" + (int)Math.ceil(eye0.framebufferHeight * Math.sqrt(this.renderScaleFactor)) + ")"; case FSAA: - return this.useFsaa ? var4 + "ON" : var4 + "OFF"; + return this.useFsaa ? var4 + Lang.getOn() : var4 + Lang.getOff(); case CROSSHAIR_SCALE: return var4 + String.format("%.2f", this.crosshairScale); case MENU_CROSSHAIR_SCALE: return var4 + String.format("%.2f", this.menuCrosshairScale); case CROSSHAIR_SCALES_WITH_DISTANCE: - return this.crosshairScalesWithDistance ? var4 + "ON" : var4 + "OFF"; + return this.crosshairScalesWithDistance ? var4 + Lang.getOn() : var4 + Lang.getOff(); case RENDER_CROSSHAIR_MODE: if (this.renderInGameCrosshairMode == RENDER_CROSSHAIR_MODE_HUD) - return var4 + "With HUD"; + return var4 + Lang.get("vivecraft.options.withhud"); else if (this.renderInGameCrosshairMode == RENDER_CROSSHAIR_MODE_ALWAYS) - return var4 + "Always"; + return var4 + Lang.get("vivecraft.options.always"); else if (this.renderInGameCrosshairMode == RENDER_CROSSHAIR_MODE_NEVER) - return var4 + "Never"; + return var4 + Lang.get("vivecraft.options.never"); case RENDER_BLOCK_OUTLINE_MODE: if (this.renderBlockOutlineMode == RENDER_BLOCK_OUTLINE_MODE_HUD) - return var4 + "With HUD"; + return var4 + Lang.get("vivecraft.options.withhud"); else if (this.renderBlockOutlineMode == RENDER_BLOCK_OUTLINE_MODE_ALWAYS) - return var4 + "Always"; + return var4 + Lang.get("vivecraft.options.always"); else if (this.renderBlockOutlineMode == RENDER_BLOCK_OUTLINE_MODE_NEVER) - return var4 + "Never"; + return var4 + Lang.get("vivecraft.options.never"); case HUD_OCCLUSION: - return this.hudOcclusion ? var4 + "ON" : var4 + "OFF"; + return this.hudOcclusion ? var4 + Lang.getOn() : var4 + Lang.getOff(); case MENU_ALWAYS_FOLLOW_FACE: - return this.menuAlwaysFollowFace ? var4 + "Always" : var4 + "Seated"; + return this.menuAlwaysFollowFace ? var4 + Lang.get("vivecraft.options.always") : var4 + Lang.get("vivecraft.options.seated"); case CROSSHAIR_OCCLUSION: - return this.useCrosshairOcclusion ? var4 + "ON" : var4 + "OFF"; + return this.useCrosshairOcclusion ? var4 + Lang.getOn() : var4 + Lang.getOff(); case MONO_FOV: return var4 + String.format("%.0f\u00B0", this.mc.gameSettings.fovSetting); case INERTIA_FACTOR: - if (this.inertiaFactor == INERTIA_NONE) - return var4 + "Automan"; - else if (this.inertiaFactor == INERTIA_NORMAL) - return var4 + "Normal"; + if (this.inertiaFactor == INERTIA_NONE) + return var4 + Lang.get("vivecraft.options.inertia.none"); + else if (this.inertiaFactor == INERTIA_NORMAL) + return var4 + Lang.get("vivecraft.options.inertia.normal"); else if (this.inertiaFactor == INERTIA_LARGE) - return var4 + "A Lot"; + return var4 + Lang.get("vivecraft.options.inertia.large"); else if (this.inertiaFactor == INERTIA_MASSIVE) - return var4 + "Even More"; + return var4 + Lang.get("vivecraft.options.inertia.massive"); // VIVE START - new options case SIMULATE_FALLING: - return this.simulateFalling ? var4 + "ON" : var4 + "OFF"; + return this.simulateFalling ? var4 + Lang.getOn() : var4 + Lang.getOff(); case WEAPON_COLLISION: - return this.weaponCollision ? var4 + "ON" : var4 + "OFF"; + if(this.weaponCollision == 0) + return var4 + Lang.getOff(); + else if(this.weaponCollision == 1) + return var4 + Lang.getOn(); + else if(this.weaponCollision == 2) + return var4 + Lang.get("vivecraft.options.auto"); case ANIMAL_TOUCHING: - return this.animaltouching ? var4 + "ON" : var4 + "OFF"; + return this.animaltouching ? var4 + Lang.getOn() : var4 + Lang.getOff(); // VIVE END - new options //JRBUDDA case ALLOW_CRAWLING: - return this.vrAllowCrawling ? var4 + "ON" : var4 + "OFF"; + return this.vrAllowCrawling ? var4 + Lang.getOn() : var4 + Lang.getOff(); case LIMIT_TELEPORT: - return this.vrLimitedSurvivalTeleport ? var4 + "ON" : var4 + "OFF"; + return this.vrLimitedSurvivalTeleport ? var4 + Lang.getOn() : var4 + Lang.getOff(); case REVERSE_HANDS: - return this.vrReverseHands ? var4 + "ON" : var4 + "OFF"; + return this.vrReverseHands ? var4 + Lang.getOn() : var4 + Lang.getOff(); case STENCIL_ON: - return this.vrUseStencil ? var4 + "ON" : var4 + "OFF"; + return this.vrUseStencil ? var4 + Lang.getOn() : var4 + Lang.getOff(); case BCB_ON: - return this.vrShowBlueCircleBuddy ? var4 + "ON" : var4 + "OFF"; + return this.vrShowBlueCircleBuddy ? var4 + Lang.getOn() : var4 + Lang.getOff(); case WORLD_SCALE: return var4 + String.format("%.2f", this.vrWorldScale)+ "x" ; case WORLD_ROTATION: return var4 + String.format("%.0f", this.vrWorldRotation); case WORLD_ROTATION_INCREMENT: - return var4 + (this.vrWorldRotationIncrement == 0 ? "Smooth" : String.format("%.0f", this.vrWorldRotationIncrement)); + return var4 + (this.vrWorldRotationIncrement == 0 ? Lang.get("vivecraft.options.smooth") : String.format("%.0f", this.vrWorldRotationIncrement)); case TOUCH_HOTBAR: - return this.vrTouchHotbar ? var4 + "ON" : var4 + "OFF"; + return this.vrTouchHotbar ? var4 + Lang.getOn() : var4 + Lang.getOff(); case PLAY_MODE_SEATED: - return this.seated ? var4 + "Seated" : var4 + "Standing"; + return this.seated ? var4 + Lang.get("vivecraft.options.seated") : var4 + Lang.get("vivecraft.options.standing"); //END JRBUDDA case REALISTIC_JUMP: - return this.realisticJumpEnabled ? var4 + "ON" : var4 + "OFF"; + return this.realisticJumpEnabled ? var4 + Lang.getOn() : var4 + Lang.getOff(); case SEATED_HMD: - return this.seatedUseHMD ? var4 + "HMD" : var4 + "Crosshair"; + return this.seatedUseHMD ? var4 + Lang.get("vivecraft.options.hmd") : var4 + Lang.get("vivecraft.options.crosshair"); case SEATED_HUD_XHAIR: - return this.seatedHudAltMode ? var4 + "Crosshair" : var4 + "HMD"; + return this.seatedHudAltMode ? var4 + Lang.get("vivecraft.options.crosshair") : var4 + Lang.get("vivecraft.options.hmd"); case REALISTIC_SNEAK: - return this.realisticSneakEnabled ? var4 + "ON" : var4 + "OFF"; + return this.realisticSneakEnabled ? var4 + Lang.getOn() : var4 + Lang.getOff(); case REALISTIC_CLIMB: - return this.realisticClimbEnabled ? var4 + "ON" : var4 + "OFF"; + return this.realisticClimbEnabled ? var4 + Lang.getOn() : var4 + Lang.getOff(); case REALISTIC_SWIM: - return this.realisticSwimEnabled ? var4 + "ON" : var4 + "OFF"; + return this.realisticSwimEnabled ? var4 + Lang.getOn() : var4 + Lang.getOff(); case REALISTIC_ROW: - return this.realisticRowEnabled ? var4 + "ON" : var4 + "OFF"; + return this.realisticRowEnabled ? var4 + Lang.getOn() : var4 + Lang.getOff(); case VEHICLE_ROTATION: - return this.vehicleRotation ? var4 + "ON" : var4 + "OFF"; - case CALIBRATE_HEIGHT: - return var2; + return this.vehicleRotation ? var4 + Lang.getOn() : var4 + Lang.getOff(); case WALK_MULTIPLIER: return var4+ String.format("%.1f",walkMultiplier); case X_SENSITIVITY: @@ -1038,60 +1030,64 @@ else if (this.inertiaFactor == INERTIA_MASSIVE) switch (this.vrFreeMoveMode) { // VIVE - lock to hand instead of body case FREEMOVE_CONTROLLER: - return var4 + "Controller"; + return var4 + Lang.get("vivecraft.options.controller"); case FREEMOVE_HMD: - return var4 + "HMD"; + return var4 + Lang.get("vivecraft.options.hmd"); case FREEMOVE_RUNINPLACE: - return var4 + "RunInPlace"; + return var4 + Lang.get("vivecraft.options.runinplace"); + case FREEMOVE_ROOM: + return var4 + Lang.get("vivecraft.options.room"); } case FOV_REDUCTION: - return this.useFOVReduction ? var4 + "ON" : var4 + "OFF"; + return this.useFOVReduction ? var4 + Lang.getOn() : var4 + Lang.getOff(); case AUTO_OPEN_KEYBOARD: - return this.autoOpenKeyboard ? var4 + "ON" : var4 + "OFF"; + return this.autoOpenKeyboard ? var4 + Lang.getOn() : var4 + Lang.getOff(); case BACKPACK_SWITCH: - return this.backpackSwitching ? var4 + "ON" : var4 + "OFF"; + return this.backpackSwitching ? var4 + Lang.getOn() : var4 + Lang.getOff(); case ANALOG_MOVEMENT: - return this.analogMovement ? var4 + "ON" : var4 + "OFF"; + return this.analogMovement ? var4 + Lang.getOn() : var4 + Lang.getOff(); case AUTO_SPRINT: - return this.autoSprint ? var4 + "ON" : var4 + "OFF"; + return this.autoSprint ? var4 + Lang.getOn() : var4 + Lang.getOff(); case AUTO_SPRINT_THRESHOLD: return var4 + String.format("%.2f", autoSprintThreshold); case RADIAL_MODE_HOLD: - return this.radialModeHold ? var4 + "HOLD" : var4 + "PRESS"; + return this.radialModeHold ? var4 + Lang.get("vivecraft.options.hold") : var4 + Lang.get("vivecraft.options.press"); case PHYSICAL_KEYBOARD: - return this.physicalKeyboard ? var4 + "Physical" : var4 + "Pointer"; + return this.physicalKeyboard ? var4 + Lang.get("vivecraft.options.keyboard.physical") : var4 + Lang.get("vivecraft.options.keyboard.pointer"); + case PHYSICAL_KEYBOARD_SCALE: + return var4 + Math.round(this.physicalKeyboardScale * 100) + "%"; case BOW_MODE: if(this.bowMode == BOW_MODE_OFF) - return var4 + " OFF"; + return var4 + Lang.getOff(); else if(this.bowMode == BOW_MODE_ON) - return var4 + " ON"; + return var4 + Lang.getOn(); else if (this.bowMode == BOW_MODE_VANILLA) - return var4 + "VANILLA"; - else return var4 + " wtf?"; + return var4 + Lang.get("vivecraft.options.vanilla"); + else return var4 + "wtf?"; case TELEPORT_UP_LIMIT: - return var4 + (this.vrTeleportUpLimit > 0 ? this.vrTeleportUpLimit+ " Blocks" :" OFF"); + return var4 + (this.vrTeleportUpLimit > 0 ? LangHelper.get("vivecraft.options.teleportlimit", this.vrTeleportUpLimit) : Lang.getOff()); case TELEPORT_DOWN_LIMIT: - return var4 + (this.vrTeleportDownLimit > 0 ? this.vrTeleportDownLimit+ " Blocks" :" OFF"); + return var4 + (this.vrTeleportDownLimit > 0 ? LangHelper.get("vivecraft.options.teleportlimit", this.vrTeleportDownLimit) : Lang.getOff()); case TELEPORT_HORIZ_LIMIT: - return var4 + (this.vrTeleportHorizLimit > 0 ? this.vrTeleportHorizLimit+ " Blocks" :" OFF"); + return var4 + (this.vrTeleportHorizLimit > 0 ? LangHelper.get("vivecraft.options.teleportlimit", this.vrTeleportHorizLimit) : Lang.getOff()); case ALLOW_STANDING_ORIGIN_OFFSET: - return this.allowStandingOriginOffset ? var4 + "YES" : var4 + "NO"; + return this.allowStandingOriginOffset ? var4 + LangHelper.getYes() : var4 + LangHelper.getNo(); case SEATED_FREE_MOVE: - return this.seatedFreeMove ? var4 + "Free Move" : var4 + "Teleport"; + return this.seatedFreeMove ? var4 + Lang.get("vivecraft.options.freemove") : var4 + Lang.get("vivecraft.options.teleport"); case FORCE_STANDING_FREE_MOVE: - return this.forceStandingFreeMove ? var4 + "YES" : var4 + "NO"; + return this.forceStandingFreeMove ? var4 + LangHelper.getYes() : var4 + LangHelper.getNo(); case ALLOW_ADVANCED_BINDINGS: - return this.allowAdvancedBindings ? var4 + "YES" : var4 + "NO"; + return this.allowAdvancedBindings ? var4 + LangHelper.getYes() : var4 + LangHelper.getNo(); case MENU_WORLD_SELECTION: switch (this.menuWorldSelection) { case MENU_WORLD_BOTH: - return var4 + "Official & Custom"; + return var4 + Lang.get("vivecraft.options.menuworld.both"); case MENU_WORLD_CUSTOM: - return var4 + "Custom Only"; + return var4 + Lang.get("vivecraft.options.menuworld.custom"); case MENU_WORLD_OFFICIAL: - return var4 + "Official Only"; + return var4 + Lang.get("vivecraft.options.menuworld.official"); case MENU_WORLD_NONE: - return var4 + "None"; + return var4 + Lang.get("vivecraft.options.menuworld.none"); } default: return ""; @@ -1109,10 +1105,6 @@ public float getOptionFloatValue(VRSettings.VrOptions par1EnumOptions) return this.hudOpacity ; case HUD_DISTANCE : return this.hudDistance ; - case HUD_PITCH : - return this.hudPitchOffset ; - case HUD_YAW : - return this.hudYawOffset ; case CROSSHAIR_SCALE : return this.crosshairScale ; case MENU_CROSSHAIR_SCALE : @@ -1169,6 +1161,8 @@ public float getOptionFloatValue(VRSettings.VrOptions par1EnumOptions) return this.vrTeleportDownLimit; case TELEPORT_HORIZ_LIMIT: return this.vrTeleportHorizLimit; + case PHYSICAL_KEYBOARD_SCALE: + return this.physicalKeyboardScale; // VIVE END - new options default: @@ -1185,11 +1179,6 @@ public void setOptionValue(VRSettings.VrOptions par1EnumOptions, int par2) case RENDER_MENU_BACKGROUND: this.menuBackground = !this.menuBackground; break; - case RENDER_FULL_FIRST_PERSON_MODEL_MODE: - this.renderFullFirstPersonModelMode++; - if (this.renderFullFirstPersonModelMode > RENDER_FIRST_PERSON_NONE) - this.renderFullFirstPersonModelMode = RENDER_FIRST_PERSON_FULL; - break; case MIRROR_DISPLAY: switch (this.displayMirrorMode) { case MIRROR_OFF: @@ -1254,9 +1243,6 @@ public void setOptionValue(VRSettings.VrOptions par1EnumOptions, int par2) this.mixedRealityAlphaMask = !this.mixedRealityAlphaMask; mc.stereoProvider.reinitFrameBuffers("Settings Change"); break; - case INSIDE_BLOCK_SOLID_COLOR: - this.insideBlockSolidColor = !this.insideBlockSolidColor; - break; case WALK_UP_BLOCKS: this.walkUpBlocks = !this.walkUpBlocks; break; @@ -1273,6 +1259,7 @@ public void setOptionValue(VRSettings.VrOptions par1EnumOptions, int par2) this.vrHudLockMode = HUD_LOCK_HAND; break; case HUD_LOCK_BODY: + default: this.vrHudLockMode = HUD_LOCK_HAND; } break; @@ -1312,7 +1299,9 @@ public void setOptionValue(VRSettings.VrOptions par1EnumOptions, int par2) this.simulateFalling = !this.simulateFalling; break; case WEAPON_COLLISION: - this.weaponCollision = !this.weaponCollision; + this.weaponCollision++; + if(this.weaponCollision > 2) + this.weaponCollision = 0; break; case ANIMAL_TOUCHING: this.animaltouching = !this.animaltouching; @@ -1368,12 +1357,6 @@ public void setOptionValue(VRSettings.VrOptions par1EnumOptions, int par2) case VEHICLE_ROTATION: vehicleRotation = !vehicleRotation; break; - case CALIBRATE_HEIGHT: - if(seated) { - MCOpenVR.resetPosition(); - } - playerEyeHeight = (float) Minecraft.getMinecraft().vrPlayer.vrdata_room_pre.getHeadPivot().y; - break; case FREEMOVE_MODE: switch (this.vrFreeMoveMode) { case FREEMOVE_CONTROLLER: @@ -1383,6 +1366,10 @@ public void setOptionValue(VRSettings.VrOptions par1EnumOptions, int par2) this.vrFreeMoveMode = FREEMOVE_RUNINPLACE; break; case FREEMOVE_RUNINPLACE: + this.vrFreeMoveMode = FREEMOVE_ROOM; + break; + case FREEMOVE_ROOM: + default: this.vrFreeMoveMode = FREEMOVE_CONTROLLER; break; } @@ -1436,6 +1423,7 @@ public void setOptionValue(VRSettings.VrOptions par1EnumOptions, int par2) this.menuWorldSelection = MENU_WORLD_NONE; break; case MENU_WORLD_NONE: + default: this.menuWorldSelection = MENU_WORLD_BOTH; break; } @@ -1462,12 +1450,6 @@ public void setOptionFloatValue(VRSettings.VrOptions par1EnumOptions, float par2 case HUD_DISTANCE: this.hudDistance = par2; break; - case HUD_PITCH: - this.hudPitchOffset = par2; - break; - case HUD_YAW: - this.hudYawOffset = par2; - break; case CROSSHAIR_SCALE: this.crosshairScale = par2; break; @@ -1538,6 +1520,10 @@ public void setOptionFloatValue(VRSettings.VrOptions par1EnumOptions, float par2 break; case AUTO_SPRINT_THRESHOLD: this.autoSprintThreshold = par2; + case PHYSICAL_KEYBOARD_SCALE: + this.physicalKeyboardScale = par2; + KeyboardHandler.physicalKeyboard.setScale(par2); + break; // VIVE END - new options default: break; @@ -1608,7 +1594,7 @@ private void saveOptions(JSONObject theProfiles) var5.println("smoothTick:" + this.smoothTick); //VIVE var5.println("simulateFalling:" + this.simulateFalling); - var5.println("weaponCollision:" + this.weaponCollision); + var5.println("weaponCollisionNew:" + this.weaponCollision); var5.println("animalTouching:" + this.animaltouching); //END VIVE @@ -1667,6 +1653,7 @@ private void saveOptions(JSONObject theProfiles) var5.println("keyboardKeysShift:" + this.keyboardKeysShift); var5.println("radialModeHold:" + this.radialModeHold); var5.println("physicalKeyboard:" + this.physicalKeyboard); + var5.println("physicalKeyboardScale:" + this.physicalKeyboardScale); var5.println("originOffset:" + MCOpenVR.offset.getX() + "," + MCOpenVR.offset.getY() + "," + MCOpenVR.offset.getZ()); var5.println("allowStandingOriginOffset:" + this.allowStandingOriginOffset); var5.println("seatedFreeMove:" + this.seatedFreeMove); @@ -1754,129 +1741,98 @@ public static double getInertiaAddFactor(int inertiaFactor) public static enum VrOptions { - HUD_SCALE("HUD Size", true, false), - HUD_DISTANCE("HUD Distance", true, false), - HUD_PITCH("HUD Vertical Offset", true, false), - HUD_YAW("HUD Horiz. Offset", true, false), - HUD_LOCK_TO("HUD Orientation Lock", false, true), - HUD_OPACITY("HUD Opacity", true, false), - RENDER_MENU_BACKGROUND("HUD/GUI Background", false, true), - HUD_OCCLUSION("HUD Occlusion", false, true), - MENU_ALWAYS_FOLLOW_FACE("Main Menu Follow", false, true), - CROSSHAIR_OCCLUSION("Crosshair Occlusion", false, true), - CHAT_FADE_AWAY("Chat Persistence", false, true), - DUMMY("Dummy", false, true), - DUMMY_SMALL("Dummy", false, true), - VR_RENDERER("Stereo Renderer", false, true), - VR_HEAD_ORIENTATION("Head Orientation", false, true), - VR_HEAD_POSITION("Head Position", false, true), - VR_CONTROLLER("Controller", false, true), - CROSSHAIR_SCALE("Crosshair Size", true, false), - MENU_CROSSHAIR_SCALE("Menu Crosshair Size", true, false), - RENDER_CROSSHAIR_MODE("Show Crosshair", false, true), - CROSSHAIR_ROLL("Roll Crosshair", false, true), - CROSSHAIR_SCALES_WITH_DISTANCE("Crosshair Scaling", false, true), - RENDER_BLOCK_OUTLINE_MODE("Show Block Outline", false, true), - LOAD_MUMBLE_LIB("Load Mumble Lib", false, true), - RENDER_OWN_HEADWEAR("Render Own Headwear", false, true), - RENDER_FULL_FIRST_PERSON_MODEL_MODE("First Person Model", false, true), - RENDER_PLAYER_OFFSET("View Body Offset", true, false), - AUTO_OPEN_KEYBOARD("Always Open Keyboard", false, true), - RADIAL_MODE_HOLD("Radial Menu Mode", false, true), + HUD_SCALE(true, false), // HUD Size + HUD_DISTANCE(true, false), // HUD Distance + HUD_LOCK_TO(false, true), // HUD Orientation Lock + HUD_OPACITY(true, false), // HUD Opacity + RENDER_MENU_BACKGROUND(false, true), // HUD/GUI Background + HUD_OCCLUSION(false, true), // HUD Occlusion + MENU_ALWAYS_FOLLOW_FACE(false, true), // Main Menu Follow + CROSSHAIR_OCCLUSION(false, true), // Crosshair Occlusion + DUMMY(false, true), // Dummy + DUMMY_SMALL(false, true), // Dummy + CROSSHAIR_SCALE(true, false), // Crosshair Size + MENU_CROSSHAIR_SCALE(true, false), // Menu Crosshair Size + RENDER_CROSSHAIR_MODE(false, true), // Show Crosshair + CROSSHAIR_SCALES_WITH_DISTANCE(false, true), // Crosshair Scaling + RENDER_BLOCK_OUTLINE_MODE(false, true), // Show Block Outline + AUTO_OPEN_KEYBOARD(false, true), // Always Open Keyboard + RADIAL_MODE_HOLD(false, true), // Radial Menu Mode //HMD/render - FSAA("Lanczos Scaler", false, true), - MIRROR_DISPLAY("Mirror Display", false, true), - MIRROR_EYE("Mirror Eye", false, true), - MIXED_REALITY_KEY_COLOR("Key Color", false, false), - MIXED_REALITY_RENDER_HANDS("Show Hands", false, true), - MIXED_REALITY_UNITY_LIKE("Layout", false, true), - MIXED_REALITY_UNDISTORTED("Undistorted Pass", false, true), - MIXED_REALITY_ALPHA_MASK("Alpha Mask", false, true), - MIXED_REALITY_FOV("Camera FOV", true, false), - - INSIDE_BLOCK_SOLID_COLOR("Inside Block", false, true), - WALK_UP_BLOCKS("Walk up blocks", false, true), + FSAA(false, true), // Lanczos Scaler + MIRROR_DISPLAY(false, true), // Mirror Display + MIRROR_EYE(false, true), // Mirror Eye + MIXED_REALITY_KEY_COLOR(false, false), // Key Color + MIXED_REALITY_RENDER_HANDS(false, true), // Show Hands + MIXED_REALITY_UNITY_LIKE(false, true), // Layout + MIXED_REALITY_UNDISTORTED(false, true), // Undistorted Pass + MIXED_REALITY_ALPHA_MASK(false, true), // Alpha Mask + MIXED_REALITY_FOV(true, false), // Camera FOV + + WALK_UP_BLOCKS(false, true), // Walk up blocks //Movement/aiming controls - DECOUPLE_LOOK_MOVE("Decouple Look/Move", false, true), - MOVEMENT_MULTIPLIER("Move. Speed Multiplier", true, false), - STRAFE_MULTIPLIER("Strafe Speed Multiplier", true, false), - PITCH_AFFECTS_CAMERA("Pitch Affects Camera", false, true), - JOYSTICK_DEADZONE("Joystick Deadzone",true,false), - KEYHOLE_HEAD_RELATIVE("Keyhole Moves With Head",false,true), - MOUSE_AIM_TYPE("Aim Type",false,true), - CROSSHAIR_HEAD_RELATIVE("Cursor Relative To",false,true), - MOVEAIM_HYDRA_USE_CONTROLLER_ONE("Controller", false, true), - JOYSTICK_AIM_TYPE("Aim Type", false, false), - AIM_PITCH_OFFSET("Vertical Cursor Offset",true,false), - INERTIA_FACTOR("Player Inertia",false,true), + MOVEMENT_MULTIPLIER(true, false), // Move. Speed Multiplier + INERTIA_FACTOR(false, true), // Player Inertia // VIVE START - new options - SIMULATE_FALLING("Simulate falling", false, true), - WEAPON_COLLISION("Weapon collision", false, true), - ANIMAL_TOUCHING("Animal Interaction", false, true), + SIMULATE_FALLING(false, true), // Simulate falling + WEAPON_COLLISION(false, true), // Weapon collision + ANIMAL_TOUCHING(false, true), // Animal Interaction // VIVE END - new options //JRBUDDA VIVE - ALLOW_CRAWLING("Allow crawling",false, true), - ALLOW_MODE_SWITCH("Allow Mode Switch",false, true), - MOVE_MODE("Move Mode",false, true), - LIMIT_TELEPORT("Limit TP in Survival",false, true), - REVERSE_HANDS("Reverse Hands",false, true), - STENCIL_ON("Use Eye Stencil", false, true), - BCB_ON("Show Body Position", false, true), - WORLD_SCALE("World Scale", true, false), - WORLD_ROTATION("World Rotation", true, false), - WORLD_ROTATION_INCREMENT("Rotation Increment", true, false), - TOUCH_HOTBAR("Touch Hotbar Enabled", false, true), - PLAY_MODE_SEATED("Play Mode", false, true), - RENDER_SCALEFACTOR("Resolution", true, false), - MONO_FOV("Undistorted FOV", true, false), + ALLOW_CRAWLING(false, true), // Allow crawling + LIMIT_TELEPORT(false, true), // Limit TP in Survival + REVERSE_HANDS(false, true), // Reverse Hands + STENCIL_ON(false, true), // Use Eye Stencil + BCB_ON(false, true), // Show Body Position + WORLD_SCALE(true, false), // World Scale + WORLD_ROTATION(true, false), // World Rotation + WORLD_ROTATION_INCREMENT(true, false), // Rotation Increment + TOUCH_HOTBAR(false, true), // Touch Hotbar Enabled + PLAY_MODE_SEATED(false, true), // Play Mode + RENDER_SCALEFACTOR(true, false), // Resolution + MONO_FOV(true, false), // Undistorted FOV //END JRBUDDA - REALISTIC_JUMP("Roomscale Jumping",false,true), - REALISTIC_SNEAK("Roomscale Sneaking",false,true), - REALISTIC_CLIMB("Roomscale Climbing",false,true), - REALISTIC_SWIM("Roomscale Swimming",false,true), - REALISTIC_ROW("Roomscale Rowing",false,true), - CALIBRATE_HEIGHT("Calibrate Height",false,true), - WALK_MULTIPLIER("Walking Multipier",true,false), - FREEMOVE_MODE("Free Move Type", false, true), - FREEMOVE_WMR_STICK("Freemove Control", false, true), - ANALOG_DEADZONE("Analog Deadzone", true, false), - VEHICLE_ROTATION("Vehicle Rotation",false,true), + REALISTIC_JUMP(false, true), // Roomscale Jumping + REALISTIC_SNEAK(false, true), // Roomscale Sneaking + REALISTIC_CLIMB(false, true), // Roomscale Climbing + REALISTIC_SWIM(false, true), // Roomscale Swimming + REALISTIC_ROW(false, true), // Roomscale Rowing + WALK_MULTIPLIER(true, false), // Walking Multipier + FREEMOVE_MODE(false, true), // Free Move Type + VEHICLE_ROTATION(false, true), // Vehicle Rotation //SEATED - RESET_ORIGIN("Reset Origin",false,true), - X_SENSITIVITY("Rotation Speed",true,false), - Y_SENSITIVITY("Y Sensitivity",true,false), - KEYHOLE("Keyhole",true,false), - FOV_REDUCTION("FOV Comfort Reduction",false,true), + RESET_ORIGIN(false, true), // Reset Origin + X_SENSITIVITY(true, false), // Rotation Speed + Y_SENSITIVITY(true, false), // Y Sensitivity + KEYHOLE(true, false), // Keyhole + FOV_REDUCTION(false, true), // FOV Comfort Reduction // OTher buttons - OTHER_HUD_SETTINGS("Overlay/Crosshair/Chat...", false, true), - OTHER_RENDER_SETTINGS("IPD / FOV...", false, true), - LOCOMOTION_SETTINGS("Locomotion Settings...", false, true), - SEATED_HMD("Forward Direction",false,true), - SEATED_HUD_XHAIR("HUD Follows",false,true), - BACKPACK_SWITCH("Backpack Switching",false,true), - ANALOG_MOVEMENT("Analog Movement",false,true), - BOW_MODE("Roomscale Bow Mode", false, true), - TELEPORT_DOWN_LIMIT("Teleport Down Limit", true, false ), - TELEPORT_UP_LIMIT("Teleport Up Limit", true, false ), - TELEPORT_HORIZ_LIMIT("Teleport Distance Limit", true, false ), - ALLOW_STANDING_ORIGIN_OFFSET("Allow Origin Offset", false, true), - PHYSICAL_KEYBOARD("Keyboard Type", false, true), - HUD_HIDE("Hide Hud", false, true), - AUTO_SPRINT("Auto-sprint", false, true), - AUTO_SPRINT_THRESHOLD("Auto-sprint Threshold", true, false), - SEATED_FREE_MOVE("Movement Type", false, true), - FORCE_STANDING_FREE_MOVE("Force Free Move", false, true), - ALLOW_ADVANCED_BINDINGS("Show Advanced Bindings", false, true), - MENU_WORLD_SELECTION("Worlds", false, false) + SEATED_HMD(false, true), // Forward Direction + SEATED_HUD_XHAIR(false, true), // HUD Follows + BACKPACK_SWITCH(false, true), // Backpack Switching + ANALOG_MOVEMENT(false, true), // Analog Movement + BOW_MODE(false, true), // Roomscale Bow Mode + TELEPORT_DOWN_LIMIT(true, false), // Teleport Down Limit + TELEPORT_UP_LIMIT(true, false), // Teleport Up Limit + TELEPORT_HORIZ_LIMIT(true, false), // Teleport Distance Limit + ALLOW_STANDING_ORIGIN_OFFSET(false, true), // Allow Origin Offset + PHYSICAL_KEYBOARD(false, true), // Keyboard Type + PHYSICAL_KEYBOARD_SCALE(true, false), // Physical Keyboard Scale + HUD_HIDE(false, true), // Hide Hud + AUTO_SPRINT(false, true), // Auto-sprint + AUTO_SPRINT_THRESHOLD(true, false), // Auto-sprint Threshold + SEATED_FREE_MOVE(false, true), // Movement Type + FORCE_STANDING_FREE_MOVE(false, true), // Force Free Move + ALLOW_ADVANCED_BINDINGS(false, true), // Show Advanced Bindings + MENU_WORLD_SELECTION(false, false) // Worlds ; private final boolean enumFloat; private final boolean enumBoolean; - private final String enumString; private final float valueStep; private float valueMin; private float valueMax; @@ -1901,14 +1857,13 @@ public static VRSettings.VrOptions getEnumOptions(int par0) return null; } - private VrOptions(String par3Str, boolean isfloat, boolean isbool) + private VrOptions(boolean isfloat, boolean isbool) { - this(par3Str, isfloat, isbool, 0.0F, 1.0F, 0.0F); + this(isfloat, isbool, 0.0F, 1.0F, 0.0F); } - private VrOptions(String p_i45004_3_, boolean p_i45004_4_, boolean p_i45004_5_, float p_i45004_6_, float p_i45004_7_, float p_i45004_8_) + private VrOptions(boolean p_i45004_4_, boolean p_i45004_5_, float p_i45004_6_, float p_i45004_7_, float p_i45004_8_) { - this.enumString = p_i45004_3_; this.enumFloat = p_i45004_4_; this.enumBoolean = p_i45004_5_; this.valueMin = p_i45004_6_; @@ -1931,11 +1886,6 @@ public int returnEnumOrdinal() return this.ordinal(); } - public String getEnumString() - { - return this.enumString; - } - public float getValueMax() { return this.valueMax; @@ -1956,9 +1906,9 @@ protected float snapToStep(float p_148264_1_) return p_148264_1_; } - VrOptions(String p_i45005_3_, boolean p_i45005_4_, boolean p_i45005_5_, float p_i45005_6_, float p_i45005_7_, float p_i45005_8_, Object p_i45005_9_) + VrOptions(boolean p_i45005_4_, boolean p_i45005_5_, float p_i45005_6_, float p_i45005_7_, float p_i45005_8_, Object p_i45005_9_) { - this(p_i45005_3_, p_i45005_4_, p_i45005_5_, p_i45005_6_, p_i45005_7_, p_i45005_8_); + this(p_i45005_4_, p_i45005_5_, p_i45005_6_, p_i45005_7_, p_i45005_8_); } } diff --git a/src/org/vivecraft/utils/LangHelper.java b/src/org/vivecraft/utils/LangHelper.java index 3c280b9..a8a2b92 100644 --- a/src/org/vivecraft/utils/LangHelper.java +++ b/src/org/vivecraft/utils/LangHelper.java @@ -11,28 +11,50 @@ import net.minecraft.client.resources.IResourceManagerReloadListener; import net.minecraft.src.Config; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringEscapeUtils; public class LangHelper { public static void loadLocaleData() { - String path = "lang/" + Config.getGameSettings().language + ".lang"; + loadLangFile("en_us"); + loadLangFile(Config.getGameSettings().language); + } + + private static void loadLangFile(String lang) { + String path = "lang/" + lang + ".lang"; InputStream is = Utils.getAssetAsStream(path, false); - if (is == null) - path = "lang/en_us.lang"; - is = Utils.getAssetAsStream(path, false); if (is == null) return; try { Map map = I18n.getLocaleProperties(); + StringBuilder buf = new StringBuilder(); + String bufKey = null; for (String s : IOUtils.readLines(is, StandardCharsets.UTF_8)) { if (!s.isEmpty() && s.charAt(0) != '#') { - String[] split = s.split("=", 2); - map.put(split[0], split[1]); + if (s.charAt(s.length() - 1) == '\\') { + s = s.substring(0, s.length() - 1); + if (bufKey == null) { + String[] split = s.split("=", 2); + if (split.length == 2) + buf.append(StringEscapeUtils.unescapeJava(split[1])); + bufKey = split[0]; + } else { + buf.append(StringEscapeUtils.unescapeJava(s)); + } + } else if (bufKey != null) { + buf.append(StringEscapeUtils.unescapeJava(s)); + map.put(bufKey, buf.toString()); + buf.setLength(0); + bufKey = null; + } else { + String[] split = s.split("=", 2); + map.put(split[0], split.length == 2 ? StringEscapeUtils.unescapeJava(split[1]) : ""); + } } } is.close(); } catch (IOException e) { - System.out.println("Failed reading locale data"); + System.out.println("Failed reading locale data: " + path); e.printStackTrace(); } } @@ -49,4 +71,16 @@ public void onResourceManagerReload(IResourceManager resourceManager) { }); } } + + public static String get(String key, Object... params) { + return I18n.format(key, params); + } + + public static String getYes() { + return I18n.format("vivecraft.options.yes"); + } + + public static String getNo() { + return I18n.format("vivecraft.options.no"); + } } diff --git a/src/org/vivecraft/utils/Utils.java b/src/org/vivecraft/utils/Utils.java index afaa92d..602e665 100644 --- a/src/org/vivecraft/utils/Utils.java +++ b/src/org/vivecraft/utils/Utils.java @@ -29,10 +29,15 @@ import org.vivecraft.tweaker.MinecriftClassTransformer; import com.google.common.base.Charsets; +import com.google.common.collect.Lists; import com.google.common.io.Files; import jopenvr.HmdMatrix34_t; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiUtilRenderComponents; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.math.Vec3d; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextComponentString; import org.apache.commons.io.IOUtils; import org.lwjgl.util.vector.Matrix3f; import org.lwjgl.util.vector.Matrix4f; @@ -572,6 +577,95 @@ public static float applyDeadzone(float axis, float deadzone) { return newAxis; } + public static List wrapText(ITextComponent textComponent, int maxTextLength, FontRenderer fontRendererIn, boolean p_178908_3_, String linePrefix) + { + int i = 0; + ITextComponent itextcomponent = new TextComponentString(""); + List list = Lists.newArrayList(); + List list1 = Lists.newArrayList(textComponent); + + for (int j = 0; j < list1.size(); ++j) + { + ITextComponent itextcomponent1 = list1.get(j); + String s = itextcomponent1.getUnformattedComponentText(); + boolean flag = false; + + if (s.contains("\n")) + { + int k = s.indexOf(10); + String s1 = s.substring(k + 1); + s = s.substring(0, k + 1); + ITextComponent itextcomponent2 = new TextComponentString(s1); + itextcomponent2.setStyle(itextcomponent1.getStyle().createShallowCopy()); + list1.add(j + 1, itextcomponent2); + flag = true; + } + + String s4 = itextcomponent1.getStyle().getFormattingCode() + s; + String s5 = s4.endsWith("\n") ? s4.substring(0, s4.length() - 1) : s4; + int i1 = fontRendererIn.getStringWidth(s5); + TextComponentString textcomponentstring = new TextComponentString(s5); + textcomponentstring.setStyle(itextcomponent1.getStyle().createShallowCopy()); + + if (i + i1 > maxTextLength) + { + String s2 = fontRendererIn.trimStringToWidth(s4, maxTextLength - i, false); + String s3 = s2.length() < s4.length() ? s4.substring(s2.length()) : null; + + if (s3 != null && !s3.isEmpty()) + { + int l = s2.lastIndexOf(32); + + if (l >= 0 && fontRendererIn.getStringWidth(s4.substring(0, l)) > 0) + { + s2 = s4.substring(0, l); + + if (p_178908_3_) + { + ++l; + } + + s3 = s4.substring(l); + } + else if (i > 0 && !s4.contains(" ")) + { + s2 = ""; + s3 = s4; + } + + TextComponentString textcomponentstring1 = new TextComponentString(linePrefix + s3); + textcomponentstring1.setStyle(itextcomponent1.getStyle().createShallowCopy()); + list1.add(j + 1, textcomponentstring1); + } + + i1 = fontRendererIn.getStringWidth(s2); + textcomponentstring = new TextComponentString(s2); + textcomponentstring.setStyle(itextcomponent1.getStyle().createShallowCopy()); + flag = true; + } + + if (i + i1 <= maxTextLength) + { + i += i1; + itextcomponent.appendSibling(textcomponentstring); + } + else + { + flag = true; + } + + if (flag) + { + list.add(itextcomponent); + i = 0; + itextcomponent = new TextComponentString(""); + } + } + + list.add(itextcomponent); + return list; + } + public static long microTime() { return System.nanoTime() / 1000L; }