Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
516 commits
Select commit Hold shift + click to select a range
e501ed4
Cleaned up code for the PathBuilder
FavouriteDragon Sep 18, 2024
41320a3
Adjusted builders. Have to finalise InputConverter next.
FavouriteDragon Sep 18, 2024
9bd01d9
Trying to figure out how to fix input converting
FavouriteDragon Sep 18, 2024
8009ede
add init method for ease
jakeee51 Sep 19, 2024
4b4171f
Finished input converter dear god
FavouriteDragon Sep 19, 2024
5423cc2
Merge branch 'FD/activatorSetup' of https://github.com/amuzil/skillap…
FavouriteDragon Sep 19, 2024
435de3a
MouseMotionModule integrated
jakeee51 Sep 20, 2024
7c9de13
Pulling before doing more work on the form registry
FavouriteDragon Sep 20, 2024
8110e04
Merge branch 'FD/activatorSetup' of https://github.com/amuzil/skillap…
FavouriteDragon Sep 20, 2024
3ece2ef
Fixed compilation errors
FavouriteDragon Sep 20, 2024
fb9e4d4
Trying to fix our formdataregistry
FavouriteDragon Sep 20, 2024
5d0060c
delete un-used method
jakeee51 Sep 20, 2024
303d5d7
Form Data Registry functional!
FavouriteDragon Sep 20, 2024
f6e589f
made sure stuff compiles
FavouriteDragon Sep 20, 2024
48235e6
Trying to fix the modifier listeners
FavouriteDragon Sep 22, 2024
c8624bd
adjusted KeyHeldModifier for mouse vs keyboard modules
FavouriteDragon Sep 25, 2024
a977a68
Override method signature fix for KeyHeldModifier
FavouriteDragon Sep 25, 2024
cb38d92
trying to sort out forms for cali
FavouriteDragon Sep 25, 2024
fbb62d6
Commented more forms
FavouriteDragon Sep 25, 2024
53d4e44
Implemented MouseMotionModifier/GestureModifier
jakeee51 Sep 26, 2024
75ec78a
inserting forms into RadixTree
jakeee51 Sep 26, 2024
d7bd11c
builds and runs...
jakeee51 Sep 27, 2024
838a8ed
ensure formData and formsTree are reset
jakeee51 Sep 27, 2024
ac87fbe
reset listeners
jakeee51 Sep 27, 2024
98e1819
Update Form.java
jakeee51 Sep 27, 2024
78c0476
Update PathBuilder.java
jakeee51 Sep 27, 2024
6024587
init
jakeee51 Sep 28, 2024
9d78d90
massively improved code
FavouriteDragon Sep 29, 2024
36f12b2
woops
FavouriteDragon Sep 29, 2024
9c1d555
forgot to make the original runnable run
FavouriteDragon Sep 29, 2024
790e3d7
KeyHoldCondition working
jakeee51 Oct 1, 2024
b529269
Improved code quality and fixed 2 crashes
FavouriteDragon Oct 1, 2024
9940efe
Struggling there
FavouriteDragon Oct 1, 2024
1f0f116
Getting closer fr
FavouriteDragon Oct 1, 2024
c7d8547
trying to fix step
FavouriteDragon Oct 1, 2024
1131c51
a few comments
jakeee51 Oct 1, 2024
037adce
immense suffering
FavouriteDragon Oct 1, 2024
2a16e60
Merge branch 'DJ/singleKeyActivation' of https://github.com/amuzil/sk…
FavouriteDragon Oct 1, 2024
8477cab
fix by activating all conditions in tree
jakeee51 Oct 1, 2024
259a5d2
the ol' switcher roo!
jakeee51 Oct 1, 2024
07aee55
comment out
jakeee51 Oct 1, 2024
6d92d9c
remove debug log
jakeee51 Oct 1, 2024
adff04a
Update ServerEvents.java
jakeee51 Oct 1, 2024
f597c18
fix some bugs
jakeee51 Oct 1, 2024
dcf389c
Update RadixTree.java
jakeee51 Oct 1, 2024
05d0e24
woop
jakeee51 Oct 1, 2024
194be88
working but a bit inconsistent
jakeee51 Oct 1, 2024
095cdab
Figured out the issue
FavouriteDragon Oct 1, 2024
6c8a669
Merge branch 'DJ/singleKeyActivation' of https://github.com/amuzil/sk…
FavouriteDragon Oct 1, 2024
db10e36
Figured out the issue; I'll work on it with Cali
FavouriteDragon Oct 1, 2024
9d36c6f
runnable adjusting
FavouriteDragon Oct 2, 2024
2f00bbe
implement moveDown logic
jakeee51 Oct 2, 2024
8d7e84e
Update KeyHoldCondition.java
jakeee51 Oct 2, 2024
4e3de5c
implemented debugging command
jakeee51 Oct 2, 2024
bf4e731
add more debug help
jakeee51 Oct 3, 2024
ca26973
made breathe a prefix for the down step
jakeee51 Oct 3, 2024
e5f1b1f
probs shouldn't do moveDown here like this
jakeee51 Oct 3, 2024
bcad00c
implemented traversing registration for tree
jakeee51 Oct 3, 2024
2204e42
register next condition in path for Step Form
jakeee51 Oct 4, 2024
0226aa9
unlimited suffering
FavouriteDragon Oct 4, 2024
7a542ba
bump
jakeee51 Oct 5, 2024
821fde8
added a space for formatting
FavouriteDragon Oct 5, 2024
48a991e
Merge branch 'DJ/singleKeyActivation' of https://github.com/amuzil/sk…
FavouriteDragon Oct 5, 2024
f873e9f
reverted keyhold changes...
FavouriteDragon Oct 5, 2024
36ab7fb
Now they're only working the first time...
FavouriteDragon Oct 5, 2024
541ae05
IT WORKS LET'S GOO
FavouriteDragon Oct 5, 2024
d262687
IT WORKSSSS
FavouriteDragon Oct 5, 2024
c9390a5
Going to start trying to fix multi soon
FavouriteDragon Oct 5, 2024
a8c5f34
Fixed a crash, my bad
FavouriteDragon Oct 5, 2024
2252c7d
Slight logic adjustments for lastActivatedForm
FavouriteDragon Oct 5, 2024
de050bd
stable
jakeee51 Oct 5, 2024
114cc72
just some refactoring, no logic changes
jakeee51 Oct 5, 2024
295920a
fixed sub conditions being null
FavouriteDragon Oct 5, 2024
7b4d488
Merge branch 'DJ/singleKeyActivation' of https://github.com/amuzil/sk…
FavouriteDragon Oct 5, 2024
6aeff27
Update RadixTree.java
jakeee51 Oct 6, 2024
3e32218
Updated hashing and debugging
FavouriteDragon Oct 6, 2024
b157802
Merge branch 'DJ/singleKeyActivation' of https://github.com/amuzil/sk…
FavouriteDragon Oct 6, 2024
0d2d833
Adjusting for client-side shenanigans
FavouriteDragon Oct 6, 2024
dba327c
it's successfully being fulfilled...
FavouriteDragon Oct 6, 2024
94ef980
remove debug prints & implemented toString
jakeee51 Oct 6, 2024
442a478
Update KeyHoldCondition.java
jakeee51 Oct 6, 2024
d553bc9
renaming
FavouriteDragon Oct 6, 2024
8e22ec9
Merge branch 'DJ/singleKeyActivation' of https://github.com/amuzil/sk…
FavouriteDragon Oct 6, 2024
b445ff5
prioritize MultiKeyCondition
jakeee51 Oct 6, 2024
b3405a9
fixed multi conditions being weird
FavouriteDragon Oct 6, 2024
51b7750
Update InputConverter.java
jakeee51 Oct 6, 2024
6fe9b8f
(stable) merged Keyboard & Mouse InputModules
jakeee51 Oct 6, 2024
875d5c3
maybe not printing it solved ConcurrentModificationException
jakeee51 Oct 6, 2024
451d48c
(stable) refactored a bit
jakeee51 Oct 6, 2024
6968caa
remove unecessary stuff
jakeee51 Oct 7, 2024
91fb021
Update InputConverter.java
jakeee51 Oct 7, 2024
a943f99
condition registry update
FavouriteDragon Oct 9, 2024
afb4b64
Removed chained condition; updated Multi condition
FavouriteDragon Oct 9, 2024
0c1f2b0
Form activated packet
FavouriteDragon Oct 9, 2024
b86875e
debugging for motion input
FavouriteDragon Oct 9, 2024
8e831e7
(stable) using HashTable instead of obsolete Dictionary
jakeee51 Oct 9, 2024
2adff7c
setting up mouse scrolling
FavouriteDragon Oct 10, 2024
788b39d
Merge branch 'FD/activatorSetup' of https://github.com/amuzil/skillap…
FavouriteDragon Oct 10, 2024
b88748a
mouse scroll condition done
FavouriteDragon Oct 10, 2024
78d2df7
Added a hash function for mouse scrolling
FavouriteDragon Oct 10, 2024
54d8b46
compress and expand forms done
FavouriteDragon Oct 11, 2024
05bd891
Fixed multi inputs for key held modifier
FavouriteDragon Oct 11, 2024
1ffb88e
mouse scroll modifier data
FavouriteDragon Oct 13, 2024
dfe2cb7
Debugging; figured out why it wasn't working
FavouriteDragon Oct 13, 2024
ae7b99d
adjust spacing
jakeee51 Oct 14, 2024
06ef136
upgrade forge version to recommended latest
jakeee51 Oct 14, 2024
c069263
Update gradle.properties
jakeee51 Oct 14, 2024
479e347
add photon dependencies
jakeee51 Oct 14, 2024
550a3aa
Fixed crashing with race conditions!!
FavouriteDragon Oct 15, 2024
96a48cd
Merge branch 'FD/activatorSetup' of https://github.com/amuzil/skillap…
FavouriteDragon Oct 15, 2024
65d1b64
Merge pull request #17 from amuzil/JM/upgradeForgeGradle
FavouriteDragon Oct 15, 2024
063cae8
code cleanup
FavouriteDragon Oct 15, 2024
e8065ff
added junit
jakeee51 Oct 15, 2024
1e9ff3c
Create MagusTest.java
jakeee51 Oct 15, 2024
bd8ef6e
added fx assets resources
jakeee51 Oct 15, 2024
a1a3ddf
comment out unit tests
jakeee51 Oct 16, 2024
28aeea2
Update fire_bloom.fx
jakeee51 Oct 16, 2024
69f5506
rename classes to MouseGesture...
jakeee51 Oct 18, 2024
bc20309
Slowly getting modifiers working
FavouriteDragon Oct 18, 2024
3afeb42
Merge branch 'FD/activatorSetup' of https://github.com/amuzil/skillap…
FavouriteDragon Oct 18, 2024
1c389fe
woops lmao
FavouriteDragon Oct 18, 2024
f425596
now it's cali's lmao
FavouriteDragon Oct 18, 2024
9fda546
cali please fix
FavouriteDragon Oct 18, 2024
b51c2ce
adjust MouseMotion tick stuff
jakeee51 Oct 18, 2024
79e4cb1
added test projectile
jakeee51 Oct 18, 2024
d9f6bc5
use both photon test fx
jakeee51 Oct 18, 2024
7ad0294
fx firing because of multiple server ticks at once
jakeee51 Oct 18, 2024
127606d
gonna start cleaning up modifiers
FavouriteDragon Oct 18, 2024
9d3a6e4
Merge branch 'FD/activatorSetup' of https://github.com/amuzil/skillap…
FavouriteDragon Oct 18, 2024
d48f098
added deflection test
jakeee51 Oct 20, 2024
7d5dda0
Update TestProjectileEntity.java
jakeee51 Oct 20, 2024
5ec2412
Update KeyboardMouseInputModule.java
jakeee51 Oct 20, 2024
f029049
Update Magus.java
jakeee51 Oct 20, 2024
d0d96f1
Update TestProjectileEntity.java
jakeee51 Oct 20, 2024
b425e40
init
jakeee51 Oct 23, 2024
880f029
Update TestProjectileEntity.java
jakeee51 Oct 23, 2024
2c3e9e9
collision working lowkey
jakeee51 Oct 23, 2024
93f8ae9
Update TestProjectileEntity.java
jakeee51 Oct 23, 2024
4e346f1
fix runServer error
jakeee51 Oct 23, 2024
3997101
comment out unnecessary code
jakeee51 Oct 23, 2024
b06d17a
Update TestProjectileEntity.java
jakeee51 Oct 23, 2024
97c205e
refactor sendDebugMsg method
jakeee51 Oct 23, 2024
5769e30
Update ServerEvents.java
jakeee51 Oct 23, 2024
bc075e0
working on modifiers, capability refactoring
FavouriteDragon Oct 25, 2024
cc4760e
Merge branch 'FD/activatorSetup' of https://github.com/amuzil/skillap…
FavouriteDragon Oct 25, 2024
71b61af
run multiple clients with dif users
jakeee51 Oct 25, 2024
7ef6106
multiplayer fx working!
jakeee51 Oct 25, 2024
caf1577
clean up some prints
jakeee51 Oct 25, 2024
e287b69
fix custom username arg
jakeee51 Oct 25, 2024
bea2005
exclude player that fires
jakeee51 Oct 25, 2024
431fbea
no need to check entityId
jakeee51 Oct 25, 2024
b76f9dd
slowly setting up generic Magi class for usage
FavouriteDragon Oct 25, 2024
bd9723c
use PacketDistributor to send to nearby clients
jakeee51 Oct 25, 2024
c13b688
Slowly adding in special logic so that avatar is get up and go
FavouriteDragon Oct 26, 2024
e3b0ad9
finished generic energy trait wrapper
FavouriteDragon Oct 26, 2024
5d06917
testing out new abstraction layer
FavouriteDragon Oct 26, 2024
ac3d6a9
create a command to trigger forms on specified player
jakeee51 Oct 27, 2024
09f642f
improved entity collision
jakeee51 Oct 28, 2024
8521d9a
fixed bugs with singleplayer/multiplayer vs client/server
jakeee51 Oct 28, 2024
0e784cd
move gravity setting
jakeee51 Oct 28, 2024
7cd1c33
refactor
jakeee51 Oct 28, 2024
8674a31
started implementing generic element entity handling system
jakeee51 Oct 29, 2024
1fa53dd
Update AvatarCommand.java
jakeee51 Oct 29, 2024
f544186
Update ElementCollision.java
jakeee51 Oct 29, 2024
400dad6
Update ElementCollision.java
jakeee51 Oct 29, 2024
73325d1
clean up
jakeee51 Oct 29, 2024
4e4c93d
entity spawning system stable
jakeee51 Oct 29, 2024
735a092
fix commands
jakeee51 Oct 30, 2024
4f1c3d1
Update InputModule.java
jakeee51 Oct 30, 2024
31c9a6c
fix toString
jakeee51 Oct 30, 2024
31e70cb
implemented arc form & collisions
jakeee51 Nov 1, 2024
aab7b4a
update fx
jakeee51 Nov 3, 2024
911e97d
improve form activation consistency
jakeee51 Nov 3, 2024
4f36872
Merge branch 'FD/activatorSetup' into JM/entityCollision
jakeee51 Nov 3, 2024
1c5148b
started to implement FormActivatedEvent
jakeee51 Nov 3, 2024
520adda
Merge pull request #18 from amuzil/JM/entityCollision
FavouriteDragon Nov 3, 2024
d52a5b0
update blue fire fx
jakeee51 Nov 4, 2024
bc9c0b3
improved arc catching & shooting
jakeee51 Nov 4, 2024
0ec509f
code cleanup, hopefully held modifier works
FavouriteDragon Nov 5, 2024
8970cdd
Merge branch 'FD/activatorSetup' of https://github.com/amuzil/skillap…
FavouriteDragon Nov 5, 2024
06f5a0d
capability error handling - just have to figure out why modifier data…
FavouriteDragon Nov 5, 2024
f90c81b
improved entity projectile testing system
jakeee51 Nov 5, 2024
c936cb1
uncomment John's code
jakeee51 Nov 5, 2024
c063b39
Update FormDataRegistry.java
jakeee51 Nov 5, 2024
ae0fe9e
fixed dif null error here
jakeee51 Nov 5, 2024
bf93546
Update FireProjectile.java
jakeee51 Nov 5, 2024
b19945d
key held modifier is weird af
FavouriteDragon Nov 5, 2024
276df07
fixed KeyHeldModifierListener
jakeee51 Nov 5, 2024
de58bd4
Update BaseModifierData.java
jakeee51 Nov 5, 2024
18ff0a0
cleanup
jakeee51 Nov 5, 2024
3dffb5c
fixed steam collision
jakeee51 Nov 5, 2024
ec61c25
Update DataTrait.java
jakeee51 Nov 5, 2024
5ca1ce3
Update DataTrait.java
jakeee51 Nov 5, 2024
bde95a1
account for mp/singleplayer connection null error
jakeee51 Nov 5, 2024
1239a1d
Update BendingMaterialUtil.java
jakeee51 Nov 5, 2024
e0144d8
attempt to fix avatar art/form commands
jakeee51 Nov 5, 2024
9701fc3
Merge branch 'FD/activatorSetup' of https://github.com/amuzil/skillap…
FavouriteDragon Nov 6, 2024
203cd40
key held modifier working better
FavouriteDragon Nov 6, 2024
bcee02c
debugging...
FavouriteDragon Nov 6, 2024
2a45a47
improved element change command
jakeee51 Nov 6, 2024
f61552b
form event
FavouriteDragon Nov 6, 2024
26f6f22
Merge branch 'FD/activatorSetup' of https://github.com/amuzil/skillap…
FavouriteDragon Nov 6, 2024
f954822
change to ClientTickEvent
jakeee51 Nov 6, 2024
5f0aac4
Merge branch 'FD/activatorSetup' of https://github.com/amuzil/skillap…
FavouriteDragon Nov 6, 2024
2bfd06f
getting closer....
FavouriteDragon Nov 6, 2024
6cc60d1
kind of working for things other than breathe and step
FavouriteDragon Nov 6, 2024
a780380
odd things going on
FavouriteDragon Nov 6, 2024
299a08e
fixed DirectionModifier
jakeee51 Nov 6, 2024
9f6c0ee
remove prints
jakeee51 Nov 6, 2024
7774d42
fix print
jakeee51 Nov 6, 2024
c774511
everything works but step
FavouriteDragon Nov 6, 2024
51815f6
Update DirectionModifierListener.java
jakeee51 Nov 6, 2024
2d93069
we found the issue....
FavouriteDragon Nov 6, 2024
d8988e4
Merge branch 'FD/activatorSetup' of https://github.com/amuzil/skillap…
FavouriteDragon Nov 6, 2024
2f58428
IT WORKS RAHHH
FavouriteDragon Nov 6, 2024
3457d58
cleanup
FavouriteDragon Nov 6, 2024
55fa248
figured out issue
FavouriteDragon Nov 6, 2024
0cb5718
multi working
FavouriteDragon Nov 6, 2024
aa4795f
modifiers are now sided
FavouriteDragon Nov 6, 2024
20685a6
listeners properly annotated
FavouriteDragon Nov 6, 2024
731123c
starting to work on skill implementation and integration
FavouriteDragon Nov 7, 2024
a71cf70
path builder adjustments
FavouriteDragon Nov 7, 2024
fa64a97
upgrade junit 5 and remove junit 4
jakeee51 Nov 7, 2024
9076607
Upgraded to 1.20.1
jakeee51 Nov 7, 2024
f7c8ac7
add resources to tests
jakeee51 Nov 7, 2024
11f5d5c
activation type & skill priority
FavouriteDragon Nov 8, 2024
bb52d01
working on condition path detection
FavouriteDragon Nov 8, 2024
5f4ba1a
added hashing for the condition path
FavouriteDragon Nov 8, 2024
77a7d1a
serialisation and deserialisation done
FavouriteDragon Nov 8, 2024
460594e
skills are now executed per tick, theoretically
FavouriteDragon Nov 8, 2024
c80e333
stable photon version
jakeee51 Nov 8, 2024
172b04e
just showing examples
FavouriteDragon Nov 8, 2024
b82b257
Merge branch 'FD/activatorSetup' of https://github.com/amuzil/skillap…
FavouriteDragon Nov 8, 2024
6a0eb94
major logic improvements
FavouriteDragon Nov 8, 2024
d18b243
woops
FavouriteDragon Nov 9, 2024
e14fb58
more stable photon version...
jakeee51 Nov 12, 2024
7611e7c
implement reloadFX method
jakeee51 Nov 12, 2024
aa342cd
logic updates; moved state to SkillData
FavouriteDragon Nov 14, 2024
76ca26f
Merge branch 'FD/activatorSetup' of https://github.com/amuzil/skillap…
FavouriteDragon Nov 14, 2024
6a3341c
some datasaving and skill testing
FavouriteDragon Nov 16, 2024
1a3adef
skills are registered and ticked
FavouriteDragon Nov 16, 2024
b30fe53
skills are just waiting on their requisite tree
FavouriteDragon Nov 16, 2024
a2068fe
bug fixing
FavouriteDragon Nov 16, 2024
67574ac
IT WORKS NOW
FavouriteDragon Nov 16, 2024
1a639a6
debugging
FavouriteDragon Nov 16, 2024
79e68de
path builder seems wonky
FavouriteDragon Nov 16, 2024
2baa90e
tree does not need to be serialised; made it compile
FavouriteDragon Jan 24, 2025
37dc7e3
have code for controlling when a skill should execute
FavouriteDragon Jan 24, 2025
c67b385
done with serialisation except for skill activation
FavouriteDragon Feb 5, 2025
a00ced2
cleanup
FavouriteDragon Feb 5, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ run

# Files from Forge MDK
forge*changelog.txt
*.log
65 changes: 0 additions & 65 deletions CREDITS.txt

This file was deleted.

696 changes: 22 additions & 674 deletions LICENSE

Large diffs are not rendered by default.

520 changes: 0 additions & 520 deletions LICENSE.txt

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# skillsapi
Temporary code storage for the skills part of magus. Hardest thing in the entire API, followed by rendering.
# Magus's Skills API
Temporary code storage for the skills API part of Magus.
46 changes: 0 additions & 46 deletions README.txt

This file was deleted.

Loading