Update the icons & fix the alpha versions not starting bug
34
app_pojavlauncher/src/main/assets/language_list.txt
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
values-af-rZA
|
||||||
|
values-ar-rSA
|
||||||
|
values-ba-rRU
|
||||||
|
values-ca-rES
|
||||||
|
values-cs-rCZ
|
||||||
|
values-da-rDK
|
||||||
|
values-de-rDE
|
||||||
|
values-el-rGR
|
||||||
|
values-en-rGB
|
||||||
|
values-en-rUS
|
||||||
|
values-es-rES
|
||||||
|
values-fi-rFI
|
||||||
|
values-fr-rFR
|
||||||
|
values-hu-rHU
|
||||||
|
values-in-rID
|
||||||
|
values-it-rIT
|
||||||
|
values-iw-rIL
|
||||||
|
values-ja-rJP
|
||||||
|
values-kk-rKZ
|
||||||
|
values-ko-rKR
|
||||||
|
values-nl-rNL
|
||||||
|
values-no-rNO
|
||||||
|
values-pl-rPL
|
||||||
|
values-pt-rBR
|
||||||
|
values-pt-rPT
|
||||||
|
values-ro-rRO
|
||||||
|
values-ru-rRU
|
||||||
|
values-sr-rSP
|
||||||
|
values-sv-rSE
|
||||||
|
values-tr-rTR
|
||||||
|
values-uk-rUA
|
||||||
|
values-vi-rVN
|
||||||
|
values-zh-rCN
|
||||||
|
values-zh-rTW
|
@ -365,7 +365,7 @@ public class BaseMainActivity extends LoggableActivity {
|
|||||||
// System.out.println("Pre touch, isTouchInHotbar=" + Boolean.toString(isTouchInHotbar) + ", action=" + MotionEvent.actionToString(e.getActionMasked()));
|
// System.out.println("Pre touch, isTouchInHotbar=" + Boolean.toString(isTouchInHotbar) + ", action=" + MotionEvent.actionToString(e.getActionMasked()));
|
||||||
/* int x = ((int) e.getX()) / scaleFactor;
|
/* int x = ((int) e.getX()) / scaleFactor;
|
||||||
int y = ((int) e.getY()) / scaleFactor;*/
|
int y = ((int) e.getY()) / scaleFactor;*/
|
||||||
if(e.getHistorySize() > 0) {
|
if(e.getHistorySize() > 0 && CallbackBridge.isGrabbing()) {
|
||||||
x += (int)(e.getX() - e.getHistoricalX(0));
|
x += (int)(e.getX() - e.getHistoricalX(0));
|
||||||
y += (int)(e.getY() - e.getHistoricalY(0));
|
y += (int)(e.getY() - e.getHistoricalY(0));
|
||||||
}
|
}
|
||||||
@ -373,6 +373,7 @@ public class BaseMainActivity extends LoggableActivity {
|
|||||||
x = (int) e.getX();
|
x = (int) e.getX();
|
||||||
y = (int) e.getY();
|
y = (int) e.getY();
|
||||||
}
|
}
|
||||||
|
|
||||||
int hudKeyHandled = handleGuiBar((int)e.getX(), (int)e.getY());
|
int hudKeyHandled = handleGuiBar((int)e.getX(), (int)e.getY());
|
||||||
if (!CallbackBridge.isGrabbing() && gestureDetector.onTouchEvent(e)) {
|
if (!CallbackBridge.isGrabbing() && gestureDetector.onTouchEvent(e)) {
|
||||||
if (hudKeyHandled != -1) {
|
if (hudKeyHandled != -1) {
|
||||||
|
@ -69,10 +69,10 @@ public final class Tools
|
|||||||
int mcReleaseDate = Integer.parseInt(versionInfo.releaseTime.substring(0, 10).replace("-", ""));
|
int mcReleaseDate = Integer.parseInt(versionInfo.releaseTime.substring(0, 10).replace("-", ""));
|
||||||
// 13w17a: 20130425
|
// 13w17a: 20130425
|
||||||
// 13w18a: 20130502
|
// 13w18a: 20130502
|
||||||
if (mcReleaseDate < 20130502 && versionInfo.minimumLauncherVersion <= 4){
|
if (mcReleaseDate < 20130502 && versionInfo.minimumLauncherVersion < 9){
|
||||||
|
ctx.appendlnToLog("AWT-enabled version detected! ("+mcReleaseDate+")");
|
||||||
javaArgList.add("-Djava.awt.headless=false");
|
javaArgList.add("-Djava.awt.headless=false");
|
||||||
|
// Caciocavallo config AWT-enabled version
|
||||||
// Caciocavallo config
|
|
||||||
javaArgList.add("-Dcacio.managed.screensize=" + CallbackBridge.windowWidth + "x" + CallbackBridge.windowHeight);
|
javaArgList.add("-Dcacio.managed.screensize=" + CallbackBridge.windowWidth + "x" + CallbackBridge.windowHeight);
|
||||||
javaArgList.add("-Dcacio.font.fontmanager=net.java.openjdk.cacio.ctc.CTCFontManager");
|
javaArgList.add("-Dcacio.font.fontmanager=net.java.openjdk.cacio.ctc.CTCFontManager");
|
||||||
// javaArgList.add("-Dcacio.font.fontscaler=sun.font.FreetypeFontScaler");
|
// javaArgList.add("-Dcacio.font.fontscaler=sun.font.FreetypeFontScaler");
|
||||||
@ -91,6 +91,8 @@ public final class Tools
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
javaArgList.add(cacioClasspath.toString());
|
javaArgList.add(cacioClasspath.toString());
|
||||||
|
}else{
|
||||||
|
ctx.appendlnToLog("Headless version detected! ("+mcReleaseDate+")");
|
||||||
}
|
}
|
||||||
|
|
||||||
javaArgList.add("-cp");
|
javaArgList.add("-cp");
|
||||||
@ -98,7 +100,7 @@ public final class Tools
|
|||||||
|
|
||||||
javaArgList.add(versionInfo.mainClass);
|
javaArgList.add(versionInfo.mainClass);
|
||||||
javaArgList.addAll(Arrays.asList(launchArgs));
|
javaArgList.addAll(Arrays.asList(launchArgs));
|
||||||
|
ctx.appendlnToLog("full args: "+javaArgList.toString());
|
||||||
JREUtils.launchJavaVM(ctx, javaArgList);
|
JREUtils.launchJavaVM(ctx, javaArgList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 6.5 KiB |
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 25 KiB |
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
@ -18,7 +18,7 @@
|
|||||||
<ImageView
|
<ImageView
|
||||||
android:layout_width="112dp"
|
android:layout_width="112dp"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:src="@drawable/mojang_logo"
|
android:src="@drawable/pojav_logo"
|
||||||
android:layout_alignParentRight="true"
|
android:layout_alignParentRight="true"
|
||||||
android:padding="5dp"
|
android:padding="5dp"
|
||||||
android:background="#000000"
|
android:background="#000000"
|
||||||
|
@ -156,7 +156,7 @@ public class GLFWInputImplementation implements InputImplementation {
|
|||||||
event_buffer.put(button).put(state);
|
event_buffer.put(button).put(state);
|
||||||
//always put deltas when grabbed
|
//always put deltas when grabbed
|
||||||
if (grab) {
|
if (grab) {
|
||||||
event_buffer.putInt(acoord1-mouseLastX).putInt(acoord2-mouseLastY);
|
event_buffer.putInt(acoord1-mouseX).putInt(acoord2-mouseY);
|
||||||
}else{
|
}else{
|
||||||
event_buffer.putInt(acoord1).putInt(acoord2);
|
event_buffer.putInt(acoord1).putInt(acoord2);
|
||||||
}
|
}
|
||||||
|