Various bug fixes
- Input cursor movement seems too fast, attempt to reduce it by setting larger font size in the hidden text field. - latestlog.txt doesn't log in 1.12+ since Log4j patch. Fixed by adding some config lines. - Makefile: building is broken when run make from a path with space(s). Fixed by handling spaces with backslashes. - text2speech is not overridden properly. Fixed by excluding it from download list and adding launcher.jar itself to the classpath. - XML log output in < 1.12 since Log4j patch. Fixed by using our own configuration file. Some more changes: - Commented out a debug line in LWJGLX - Fix a typo. - JavaLauncher: use (ObjC)BOOL instead of (std)bool.
This commit is contained in:
1 parent
50bdb73ab8
commit
fbde4948d5
10 files changed
+48
-19
No files matched your search
@@ -2,16 +2,5 @@ package com.mojang.text2speech;
|
||||
|
||||
public class Text2Speech {
|
||||
public static void main(final String[] args) {
|
||||
System.setProperty("jna.library.path", "./src/natives/resources/");
|
||||
final Narrator narrator = Narrator.getNarrator();
|
||||
narrator.say("This is a test", false);
|
||||
|
||||
while (true) {
|
||||
try {
|
||||
Thread.sleep(100);
|
||||
} catch (final InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -65,6 +65,8 @@ public class PLaunchApp {
|
||||
if (mVersion.logging != null) {
|
||||
if (mVersion.logging.client.file.id.equals("client-1.12.xml")) {
|
||||
configPath = Tools.DIR_BUNDLE + "/log4j-rce-patch-1.12.xml";
|
||||
} else if (mVersion.logging.client.file.id.equals("client-1.7.xml")) {
|
||||
configPath = Tools.DIR_BUNDLE + "/log4j-rce-patch-1.7.xml";
|
||||
} else {
|
||||
configPath = Tools.DIR_GAME_NEW + "/" + mVersion.logging.client.file.id;
|
||||
}
|
||||
|
||||
@@ -150,7 +150,8 @@ public final class Tools
|
||||
// URLClassLoader loader = new URLClassLoader(urlList.toArray(new URL[0]), ClassLoader.getSystemClassLoader());
|
||||
|
||||
PojavClassLoader loader = (PojavClassLoader) ClassLoader.getSystemClassLoader();
|
||||
|
||||
// add launcher.jar itself
|
||||
loader.addURL(Tools.class.getProtectionDomain().getCodeSource().getLocation().toURI().toURL());
|
||||
for (String s : launchClassPath.split(":")) {
|
||||
if (!s.isEmpty()) {
|
||||
loader.addURL(new File(s).toURI().toURL());
|
||||
@@ -417,7 +418,7 @@ public final class Tools
|
||||
// Support for text2speech is not planned, so skip it for now.
|
||||
for (int i = 0; i < libraries.length; i++) {
|
||||
DependentLibrary libItem = libraries[i];
|
||||
if (libItem.name.startsWith("com.mojang.text2speech") ||
|
||||
if (libItem.name.startsWith("com.mojang:text2speech") ||
|
||||
libItem.name.startsWith("net.java.jinput") ||
|
||||
libItem.name.startsWith("net.java.dev.jna:platform:") ||
|
||||
libItem.name.startsWith("org.lwjgl") ||
|
||||
|
||||
@@ -178,7 +178,7 @@ public class GLFWInputImplementation implements InputImplementation {
|
||||
last_event_nanos = nanos;
|
||||
}
|
||||
public void putKeyboardEvent(int keycode, byte state, int ch, long nanos, boolean repeat) {
|
||||
System.out.println("LWJGL2: debug keyboard=" + keycode + ", state=" + state + ", repeat=" + repeat);
|
||||
//System.out.println("LWJGL2: debug keyboard=" + keycode + ", state=" + state + ", repeat=" + repeat);
|
||||
key_down_buffer[keycode] = state;
|
||||
keyboardEvent.clear();
|
||||
keyboardEvent.putInt(keycode).put(state).putInt(ch).putLong(nanos).put(repeat ? (byte)1 : (byte)0);
|
||||
|
||||
Reference in new issue
Block a user