Commit Graph
55 Commits
Author SHA1 Message Date
64f7e82c1e Merge main into backend-virgl (#316)
* Fix Duy's deploy and install stuffs

* Fix Makefile error and move external_include to external/zink

* Bug fix: version ordering when types are disabled

This commit fixes #293

* Update README.md

* Add option to disable symlink to /var/mobile/Documents/.pojavlauncher (off by default)

* Reset preferences option, switch to POJAV_HOME

* Update bug_report.yml

Update pojavlauncher directory location

* Mitigation for the Apache Log4j RCE in 1.8.x-1.18

* Experimental things

* Multitouch handling, allows one of these actions below to work with
moving camera at the same time.
- Switching hotbar slot; might not work properly
- Destroying block (left mouse button) with another finger
long-pressed (without pressing the PRI button)
- Right mouse trigger with another finger tapped onto the screen
(without pressing the SEC button); not working properly yet
* Sub-pixel cursor support; not yet checked

* Completely fix Log4J RCE (1.7-1.16.5) (not yet tested)

TODO: checker with SHA1

* Log4J RCE patch config: disable XML format output

This applies for Minecraft 1.12+
Disable XML formatting for now until we have a log viewer.

* Create newsfeed.html

* Update newsfeed.html

* Delete newsfeed.html

* WIP Demo mode stuff

Sign in with a Microsoft account that doesn't own the game, demo_user will be made. This is very much WIP as my iPhone 7 doesn't feel like launching PojavLauncher.

* New toggle option: Restart before launching game

This option allows the launcher to restart itself before launching the
game, therefore all changes are applied such as JVM Arguments and Java
version. The restart mechanism doesn't always work, so a toggle is
here for now.

* A few UI changes

Disable the Play button until version list finished loading
Disable ability to go back while a version is downloading
Display loading alert while logging in

* Possible fix for broken Mojang login

* Fix a NullPointerException when launching ≤ 1.6.4

* Bug fix: NPE when setting inherited fields

Unable to insert id=null
java.lang.NoSuchFieldException: id
	at java.lang.Class.getDeclaredField(Class.java:2070)
	at net.kdt.pojavlaunch.Tools.insertSafety(Tools.java:544)
	at net.kdt.pojavlaunch.Tools.getVersionInfo(Tools.java:466)
	at net.kdt.pojavlaunch.PLaunchApp.launchMinecraft(PLaunchApp.java:61)
	at
net.kdt.pojavlaunch.uikit.UIKit.callback_SurfaceViewController_launchMi
necraft(UIKit.java:104)
	at net.kdt.pojavlaunch.uikit.UIKit.launchUI(Native Method)
	at net.kdt.pojavlaunch.PLaunchApp.main(PLaunchApp.java:40)

* Keyboard + Mouse input handling; some cleanups
* Keyboard input: KeyboardInput.m
- Requires iOS 13.4. Used pressesBegan and pressesEnded.
- Not all keys are handled, these will be handled later.

* Mouse input
- Requires iOS 13.0 for hovering. Used UIHoverGestureRecognizer.
- Requires iOS 14.0 for L/R mouse buttons and scroll handling. Used GCMouse for now. We will use iOS 13.4(?)'s API later.
- Pointer lock is not yet handled.

These above apply to iPadOS aswell, not sure about tvOS. iPhone users need to disable "Perform Touch Gestures" in the AssistiveTouch Accessibility settings in order to get the pointer hovering to work.

* Cleanups
- Use asprintf instead of sprintf when possible
- CallbackBridge functions: removed unnecessary JNI fields.
- Condition cleanup (managing virtual mouse position).

* Use the old jvm arguments parser back for now

There’s no handling for backslash yet, or ignoring spaces inside delimiters.

* Remove duplicated code

* Support for input cursor movement from keyboard
New class: TrackedTextField. This class keeps track of the pointer in the text field. The hidden text field now has 40 placeholder spaces and the pointer is placed at the middle. When typing, placeholder spaces won't get removed as before. Autocorrect seem to be broken a bit for now.

Additional changes:
- Added missing GLFW functions (array version of other functions)
- Hotbar handling: doubled barWidth and barHeight

Bug fix:
- Touching onto the hotbar breaks the handling of on-screen tap/long-press gestures

* Bug fix: inputStringLength is not set back to 40

This caused a bug that clears the text when pressing backspace after
the keyboard is displayed again.

* Consolidate some code

* Fix undeclared identifier

* Consolidate some more code, fix my dumb mistake

* Added VGPU renderer

Commit:
https://github.com/PojavLauncherTeam/VGPU/commit/9f4ded5934b24c62368d70
1647855c9c9077d903

* Update LauncherPreferencesViewController.m

This line was mistakenly removed

* 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.

* Better click handling

* Finish make ipa

Still requires proper codesigning afterwards, and until I figure out the depends folder you'll need to download a copy of the Azul JDK artifact on our android-openjdk-build-multiarch repository and extract it to depends/jre. Tested and working on my MacBook Pro, although I need to find out why libjsig.dylib is defined twice (this issue doesn't hinder the build though, install_name_tool just doesn't apply changes).

* Added readable MSA errors

* Merge unjailbroken changes with main (#313)

* fix that lol

* IPABuilder moment

* typo moment

* Hooking changes
Now hook only dladdr and realpath, JRE works now. However, need to obtain libffi.

* Sole more changes

Add RPATH to libraries
Hook dlopen since loading libawt_headless somehow point to Frameworks
directory.

* Update development.yml

* Update development.yml

Co-authored-by: Duy Tran Khanh <[email protected]>
Co-authored-by: Duy Tran Khanh <[email protected]>

* Fix issue with text alignment

* Makefile: multi-jobs building native code

* Bump to Xcode 13.2.1

* Bump to Xcode 13.2.1 pt 2

* use gnproc and nproc (for procursus on macos)

on the road development is bumpy

* oops

* [Custom controls] Added color picker for iOS < 14

Might aswell add an option to optionally use this instead of the system
color picker on iOS 14+. Used library: Alderis

Other changes
- [Custom controls] The editor is now fullscreen due to the
presentation of the color picker.
- Fixes scroll wheel input is always int

* I’m too tired of getting dpkg exits, so it’s here

* Fix broken share log

* Bug fix: Fabric 1.17+ crash at startup(fixes #304)

Microsoft account now set accountType to msa.
Minor change in custom control view controller.

* Add Arc capes

* Minor bug fix for Arc capes switch

* Change how the login progress is displayed

Login progress now displays on the title bar instead of a dialog. This
will prevent infinite loading in case a connection error occurs.
Closes #315

* Bug fix: Arc DNS injector breaks on Java 16+

This is caused by a missing function in our class loader.

Error:
System class loader does not define the
appendToClassPathForInstrumentation method
Unable to add
/Applications/PojavLauncher.app/libs/arc_dns_injector.jar to system
class path - the system class loader does not define the
appendToClassPathForInstrumentation method or the method failed
FATAL ERROR in native method: processing of -javaagent failed,
appending to system class path failed

* Why did I add set -e

* Add changelog for 2.1 release

* FAQ changes

* Workflow changes and typo fix

* Workflow changes part 2

* Fixes swipeable button state handling

* Update informational.yml

* Add A7 warning

* Remove codesign from Alderis + thin lib

* Only load Alderis.framework when needed

* CC editor: view controller now follow bounds(#326)

* Update README.md (#324)

* Update LauncherPreferencesViewController.m

Co-authored-by: Duy Tran Khanh <[email protected]>
Co-authored-by: Duy Tran Khanh <[email protected]>
Co-authored-by: Silly Sock <[email protected]>
2022-02-14 09:13:58 -05:00
Adam Tunnic 131cb61be6 smh my head x2 2021-11-26 00:13:53 -05:00
Adam Tunnic f1707045b0 smh my head 2021-11-26 00:10:16 -05:00
Adam Tunnic cfd2dde8fa Fix postinst properly 2021-11-26 00:07:22 -05:00
Adam Tunnic 59b152c427 Makefile for 2.0 (#291)
* my brain hurts. let's keep going:

- iOS 15 packaging support
- rewrote the makefile to not copy and paste over and over
- dSYM generation in the makefile itself
- started working on ipabuilder in the makefile

* delete unneeded files

* delete unneeded files 2

* ahaha

* PojavCore.dSYM is a directory

* why am i such an idiot smh

* Update release.yml (#279)

* Add /usr/share changes, pt 1

* Fix old dir removal and migration

* Add check for already migrated + remove unneeded stuffs

* Remove free() from removed vars

* Fix workflow

* Fix Makefile

* Fix Makefile... again

* Add unjailbroken branch's IPABuilder

* Push what I have

* Push more changes

* control file stuff
2021-11-25 23:29:20 -05:00
Duy Tran Khanh 4f59e0ffff PojavCore is now inside the main executable
This took so long since there was a failed attempt in unloading and
reloading JVM to support Forge 1.17.x. Next attempt would be rewrite
everything to Objective-C and move the JVM entry point to the start of
the game.
2021-10-01 11:14:05 +07:00
Duy Tran Khanh 64f4042103 Changes
- Downgraded to Mesa 21.0 since 21.2.? goes brrr
- Zink renderer is now visible in the renderer picker.
- Makefile: test multi-line ssh script moment
2021-09-18 19:52:09 +07:00
Duy Tran Khanh b2ffd5edc3 Changes
- libpojavexec.dylib is now PojavCore.framework.
- More changes for Zink renderer. Note that Mesa 21.0 is included instead of 21.2.1 due to the new version seems to be broken, only display glClearColor.
2021-09-17 07:00:14 +07:00
doregon 0c1122c0ea Debug logging switch, currently not used 2021-09-05 15:01:35 -04:00
Adam Tunnic 58030b7caf Disable shaderconv switch completely on 1.1.4 2021-09-02 23:03:03 -04:00
doregon 11974a497f Changes
- exit app button in pojavlauncher prefs
- jailbreak warning on non-pro strapped jailbreaks
- better deciphering of what jailbreak is in use
2021-09-01 23:54:19 -04:00
doregon 15a6cf0acf MultiMC-like instances:
- now stores the minecraft directory in .pojavlauncher/instances/default
- configurable straight from the preferences
- migrates your existing minecraft folder to instances/default
- moves L/AS/m from Documents/ to .pojavlauncher/
- changes home directory to .pojavlauncher/
- automatically switches the L/AS/m symlink based on the current instance
- accounts stay the same between instances
2021-08-24 02:56:00 -04:00
Adam Tunnic e60209eaf6 Merge branch 'main' of [email protected]:PojavLauncherTeam/PojavLauncher_iOS 2021-08-23 11:14:51 -04:00
Adam Tunnic 74091950a2 Require JDK 8 2021-08-23 11:14:36 -04:00
doregon 51d342bdac Allow the Makefile to run when stdin is not available. 2021-08-22 22:17:27 -04:00
Duy Tran Khanh de6479f1e6 Changes
- test regal stuff (lib not added)
- auto init symlinks for jailed JRE
2021-08-18 05:52:40 +07:00
Duy Tran Khanh b7086e7316 Symlink "Library/Application Support/minecraft" 2021-08-14 18:28:45 +07:00
doregon a0582d0f26 Make the About view into a UIMenu
- Only affects iOS 14
- About, Send your logs, Update all in one spot **EASY TO FIND**
- Also fixed a makefile error
- Also fixed a text field thing
2021-08-09 02:05:41 -04:00
Duy Tran Khanh 98ecda573c Fixes #253: symlink for libawt_headless.dylib 2021-08-08 06:56:17 +07:00
Duy Tran Khanh b297f9b57d Update Makefile 2021-08-05 05:57:41 +07:00
Duy Tran Khanh a3976102a9 Removed MinecraftSurface storyboard dependence 2021-08-04 05:48:43 +07:00
Duy Tran Khanh fa62e8d268 Correct how Makefile set debug mode 2021-08-04 05:30:29 +07:00
Duy Tran Khanh f2566e3da5 Basic mod installer implementation 2021-08-03 16:06:32 +07:00
Duy Tran Khanh 0668d016bf Changes
- Added Caciocavallo (libawt_xawt stubs) support library.
- Added support lauching Minecraft 1.5.2 and older (requires latest
JRE8 build)
- [Custom controls] Implemented opacity property.
- Version info is now updated through macro instead of `sed` command.
2021-08-01 10:41:02 +07:00
doregon 1c0a8a34dc Actually build the launcher with the new option on GH 2021-07-20 00:14:57 -04:00
doregon 6a43d3d823 Try to prevent any merge conflicts from building the launcher 2021-07-20 00:11:37 -04:00
doregon b749da72b1 Update the Makefile to support dev vs stable
The whole point is to be able to distinguish commits, tbh
2021-07-19 23:49:07 -04:00
Duy Tran Khanh cade3c1f01 Added Caciocavallo (not yet finished) 2021-07-04 19:43:33 +07:00
doregon e74790a165 Revert that last commit 2021-07-03 18:39:09 -04:00
doregon febb1a40c6 Make the makefile detect a little better
This shouldn't affect operation on Apple Silicon Macs.
2021-07-03 17:32:48 -04:00
Duy Tran Khanh 7d3913ecb5 Revert c2cc703c2d
See 31fc7647b6
Duplicate resign, but c2cc703c2d is problematic.
2021-07-02 05:06:48 +07:00
Adam Tunnic 31fc7647b6 Fix make deploy ldid issues on iOS 2021-07-01 18:01:36 -04:00
Duy Tran Khanh c2cc703c2d Resign binaries on deploy task 2021-07-02 04:59:02 +07:00
doregon 290227a62f Revert "Use fakeroot instead of sudo where possible" 2021-07-01 12:31:27 -04:00
doregon 335a0f5ecc Use fakeroot instead of sudo where possible 2021-07-01 12:13:16 -04:00
doregon ec71e4b278 Aesthetic changes to the makefile 2021-07-01 11:58:02 -04:00
doregon b5bc203867 Fix @echo in Makefile 2021-07-01 11:54:24 -04:00
Adam Tunnic a518503e84 Fix Makefile to stop on error, THIS SHOULD FAIL 2021-07-01 11:37:17 -04:00
doregon 144e211107 Remove install from the all target, in case deploy is preferred 2021-06-29 22:22:15 -04:00
doregon b5fed60b05 Minor updates all around 2021-06-29 21:25:02 -04:00
doregon 70d099af67 Fix make deploy 2021-06-28 23:05:01 -04:00
doregon b55316a158 Make things a bit quieter 2021-06-28 20:56:40 -04:00
Adam Tunnic f7f84643f0 God damn iOS double-space-to-period 2021-06-28 02:36:08 -04:00
Hayden e427851c57 (#230) Overhauled Makefile by our man Hayden
Authored by Hayden Seay (Diatrus)
Co-authored-by: Adam Tunnic (Doregon)
2021-06-28 01:17:30 -04:00
Adam Tunnic 6ea575c2c5 Move update history… again. 2021-06-19 02:52:36 -04:00
Adam Tunnic a8b0f16142 More changes to the about page 2021-06-19 02:00:32 -04:00
Duy Tran Khanh 55499b52e6 Prepare for version list filtering 2021-06-16 15:18:06 +07:00
Adam Tunnic bbb61c04ce Redesigned login interface, fixed Discord link bug 2021-06-15 12:01:37 -04:00
Adam Tunnic 95436b8e2e Make the makefile less stupid 2021-06-15 00:28:17 -04:00
Adam Tunnic 539ffbd683 Added make deploy 2021-06-14 22:41:25 -04:00