mirror/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2026-04-20 09:37:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Android Studio compatibility

Browse Source
This commit is contained in:
khanhduytran0
2020-04-11 15:05:51 +07:00
parent 4ed0897ed7
commit 80c8aa6945
63 changed files with 803 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/android/internal/awt/AndroidGraphics2D.java
View File

@@ -1073,7 +1073,7 @@ public class AndroidGraphics2D extends Graphics2D {
mP = new Paint();
}
Paint.Style tmp = mP.getStyle();
mC.save(Canvas.CLIP_SAVE_FLAG);
mC.save(); // (CLIP_SAVE_FLAG);
mP.setStyle(Paint.Style.FILL);

2
app/src/main/java/com/kdt/mojangauth/RefreshTokenTask.java
View File

@@ -16,7 +16,7 @@ public class RefreshTokenTask extends AsyncTask<String, Void, Throwable> {
private Context ctx;
private ProgressDialog build;
@Override
public RefreshTokenTask(Context ctx, RefreshListener listener) {
this.ctx = ctx;
this.listener = listener;

4
app/src/main/java/net/kdt/pojavlaunch/CancelException.java
View File

@@ -2,13 +2,11 @@ package net.kdt.pojavlaunch;
public class CancelException extends RuntimeException
{
@Override
public CancelException() {
super();
// org.lwjgl.c
}
@Override
public CancelException(String msg) {
super(msg);
}

30
app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
View File

@@ -421,8 +421,8 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
}
} else {
switch (e.getActionMasked()) {
case e.ACTION_DOWN: // 0
case e.ACTION_POINTER_DOWN: // 5
case MotionEvent.ACTION_DOWN: // 0
case MotionEvent.ACTION_POINTER_DOWN: // 5
isTouchInHotbar = hudKeyHandled != -1;
if (isTouchInHotbar) {
sendKeyPress(hudKeyHandled, true);
@@ -444,9 +444,9 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
}
}
break;
case e.ACTION_UP: // 1
case e.ACTION_CANCEL: // 3
case e.ACTION_POINTER_UP: // 6
case MotionEvent.ACTION_UP: // 1
case MotionEvent.ACTION_CANCEL: // 3
case MotionEvent.ACTION_POINTER_UP: // 6
if (!isTouchInHotbar) {
AndroidDisplay.mouseX = x;
AndroidDisplay.mouseY = y;
@@ -543,17 +543,17 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
}
switch (e.getActionMasked()) {
case e.ACTION_DOWN: // 0
case e.ACTION_POINTER_DOWN: // 5
case MotionEvent.ACTION_DOWN: // 0
case MotionEvent.ACTION_POINTER_DOWN: // 5
AndroidDisplay.putMouseEventWithCoords(rightOverride ? (byte) 1 : (byte) 0, (byte) 1, x, y, 0, System.nanoTime());
initialX = x;
initialY = y;
theHandler.sendEmptyMessageDelayed(MainActivity.MSG_LEFT_MOUSE_BUTTON_CHECK, 500);
break;
case e.ACTION_UP: // 1
case e.ACTION_CANCEL: // 3
case e.ACTION_POINTER_UP: // 6
case MotionEvent.ACTION_UP: // 1
case MotionEvent.ACTION_CANCEL: // 3
case MotionEvent.ACTION_POINTER_UP: // 6
AndroidDisplay.putMouseEventWithCoords(rightOverride ? (byte) 1 : (byte) 0, (byte) 0, x, y, 0, System.nanoTime());
/*
if (!triggeredLeftMouseButton && Math.abs(initialX - x) < fingerStillThreshold && Math.abs(initialY - y) < fingerStillThreshold) {
@@ -740,13 +740,13 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
public boolean onTouch(View v, MotionEvent e) {
boolean isDown;
switch (e.getActionMasked()) {
case TessState.T_DORMANT /*0*/:
case AppletLoader.STATE_CHECKING_FOR_UPDATES /*5*/:
case MotionEvent.ACTION_DOWN: // 0
case MotionEvent.ACTION_POINTER_DOWN: // 5
isDown = true;
break;
case TessState.T_IN_POLYGON /*1*/:
case AppletLoader.STATE_DETERMINING_PACKAGES /*3*/:
case AppletLoader.STATE_DOWNLOADING /*6*/:
case MotionEvent.ACTION_UP: // 1
case MotionEvent.ACTION_CANCEL: // 3
case MotionEvent.ACTION_POINTER_UP: // 6
isDown = false;
break;
default:

4
app/src/main/java/net/minecraft/launchwrapper/injector/VanillaTweakInjector.java
View File

@@ -33,7 +33,7 @@ public class VanillaTweakInjector implements IClassTransformer {
ClassNode classNode = new ClassNode();
new ClassReader(bytes).accept(classNode, 8);
MethodNode mainMethod = null;
for (MethodNode methodNode : classNode.methods) {
for (MethodNode methodNode : (List<MethodNode>) classNode.methods) {
if ("main".equals(methodNode.name)) {
mainMethod = methodNode;
break;
@@ -43,7 +43,7 @@ public class VanillaTweakInjector implements IClassTransformer {
return bytes;
}
FieldNode workDirNode = null;
for (FieldNode fieldNode : classNode.fields) {
for (FieldNode fieldNode : (List<FieldNode>) classNode.fields) {
if (Type.getDescriptor(File.class).equals(fieldNode.desc) && (fieldNode.access & 8) == 8) {
workDirNode = fieldNode;
break;

16
app/src/main/java/sun/misc/SharedSecrets.java
View File

@@ -44,7 +44,7 @@ import java.security.AccessController;
for this purpose, namely the loss of compile-time checking. */
public class SharedSecrets {
private static final FakeUnsafe FakeUnsafe = FakeUnsafe.getUnsafe();
private static final FakeUnsafe fakeUnsafe = sun.misc.FakeUnsafe.getUnsafe();
private static JavaUtilJarAccess javaUtilJarAccess;
//private static JavaLangAccess javaLangAccess;
private static JavaIOAccess javaIOAccess;
@@ -61,7 +61,7 @@ public class SharedSecrets {
if (javaUtilJarAccess == null) {
// Ensure JarFile is initialized; we know that that class
// provides the shared secret
FakeUnsafe.ensureClassInitialized(JarFile.class);
fakeUnsafe.ensureClassInitialized(JarFile.class);
}
return javaUtilJarAccess;
}
@@ -92,7 +92,7 @@ public class SharedSecrets {
public static JavaNetHttpCookieAccess getJavaNetHttpCookieAccess() {
if (javaNetHttpCookieAccess == null)
FakeUnsafe.ensureClassInitialized(java.net.HttpCookie.class);
fakeUnsafe.ensureClassInitialized(java.net.HttpCookie.class);
return javaNetHttpCookieAccess;
}
@@ -105,7 +105,7 @@ public class SharedSecrets {
// Ensure java.nio.ByteOrder is initialized; we know that
// this class initializes java.nio.Bits that provides the
// shared secret.
FakeUnsafe.ensureClassInitialized(java.nio.ByteOrder.class);
fakeUnsafe.ensureClassInitialized(java.nio.ByteOrder.class);
}
return javaNioAccess;
}
@@ -116,7 +116,7 @@ public class SharedSecrets {
public static JavaIOAccess getJavaIOAccess() {
if (javaIOAccess == null) {
FakeUnsafe.ensureClassInitialized(Console.class);
fakeUnsafe.ensureClassInitialized(Console.class);
}
return javaIOAccess;
}
@@ -127,7 +127,7 @@ public class SharedSecrets {
public static JavaIOFileDescriptorAccess getJavaIOFileDescriptorAccess() {
if (javaIOFileDescriptorAccess == null)
FakeUnsafe.ensureClassInitialized(FileDescriptor.class);
fakeUnsafe.ensureClassInitialized(FileDescriptor.class);
return javaIOFileDescriptorAccess;
}
@@ -140,7 +140,7 @@ public class SharedSecrets {
public static JavaSecurityProtectionDomainAccess
getJavaSecurityProtectionDomainAccess() {
if (javaSecurityProtectionDomainAccess == null)
FakeUnsafe.ensureClassInitialized(ProtectionDomain.class);
fakeUnsafe.ensureClassInitialized(ProtectionDomain.class);
return javaSecurityProtectionDomainAccess;
}
/*
@@ -173,7 +173,7 @@ public class SharedSecrets {
public static JavaUtilZipAccess getJavaUtilZipAccess() {
if (javaUtilZipAccess == null) {
FakeUnsafe.ensureClassInitialized(Adler32.class);
fakeUnsafe.ensureClassInitialized(Adler32.class);
}
return javaUtilZipAccess;
}