-
-
Notifications
You must be signed in to change notification settings - Fork 65
Add integration for Origins mod climbing power #212
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: Multiloader-1.20.4
Are you sure you want to change the base?
Conversation
6d7ca31 to
1f29025
Compare
|
that shouldn't matter I'm debugging it atm |
|
hm maybe it does matter, looks like they had some api changes from 1.20 to 1.20.2 apace100/apoli@e635031 |
|
implements #209 |
common/src/main/java/org/vivecraft/client_vr/gameplay/trackers/ClimbTracker.java
Outdated
Show resolved
Hide resolved
1f29025 to
9e9b225
Compare
|
I fixed the incorrect logic. Not sure about the API stuff. |
98b2811 to
1083ccd
Compare
|
Okay, I changed how hasClimbingPower functions, see if the check works now. |
1083ccd to
fe4057a
Compare
|
It works! I compiled the mod, tested with climbing ability, could climb✅, tested without ability, couldn't climb✅. Tried without origins mod installed, couldn't climb ✅. YAY!!! |
fe4057a to
4a88c98
Compare
|
Removed the origins mod itself as a compile-time dep since we only actually use classes from apoli. |
|
bug(?) i found: when climbing mode hand items are swapped, left hand items in right hand, vice versa. |
|
I'm not sure I understand what you mean. |
that must be from a different mod |
|
Only trouble we have now is that this effectively prevents you from using the other "stick hand in block" contextual interactions system we have, since climbing takes priority over that. |
4a88c98 to
751f844
Compare
|
We now check if the climbing power is toggled on, best we can do to solve that issue. The mod has the toggle bound to G by default. |
here's a video showing the glitch with only vivecraft, origins, sodium & others: https://www.youtube.com/watch?v=spmHLP1lFUE |
|
See if that addresses the issue. |
It did. Thank you! |
|
How goes this? |
if you compile the code it should work! it just hasn't been merged into the main branch yet. |
|
hm @Techjar could you resolve the confict please? I'm not 100% sure what goes where |
6369a83 to
0fccd81
Compare
|
Converting this to a draft as it needs some reworking to function correctly with changes on the master branch. |
363f7ad to
dbb415c
Compare
|
I think that's sufficient to make it compatible with the new model replacement logic. Please verify and I'll mark it ready again. Specifically, your main hand item renderers shouldn't be swapped or replaced in either first or third person when you have the climbing power without the claws. |
|
seems to work fine with origins on fabric, didn't notice any item swapping. |
So, I added a check to see if the player is using fabric. VivecraftMod-origins-integration\common\src\main\java\org\vivecraft\mod_compat_vr\origins\OriginsHelper.java It disables the extra functionality for Forge. This also stops the game from crashing due to the power holder not being ported when joining a world. Fabric still functions as expected. |
|
we have an Xplat call to check the modloader, and there are forge ports of the fabric api |
|
Oh, thanks for the information! I'm inexperienced with minecraft modding & java. Unfortunately, I don't think they're going to port it. |
Verified |
dbb415c to
31ca5bf
Compare
|
Rebased on 1.20.5, please verify it compiles and works still. I didn't feel like waiting for gradle lol. 1.21 support will come at a later date, as there are breaking API changes in Apoli. |
common/src/main/java/org/vivecraft/client_vr/gameplay/trackers/ClimbTracker.java
Outdated
Show resolved
Hide resolved
3b0bc9d to
69ca2ea
Compare
|
Rebased to 1.20.4 since Origins is not available for 1.20.5 |
69ca2ea to
da3db73
Compare
da3db73 to
bb383bf
Compare

Unable to test right now as my VR setup is broken, but it does compile at least.