Commit graph

431 commits

Author SHA1 Message Date
gamma-delta
3763a33955 fix #124 2022-06-15 21:17:52 -05:00
gamma-delta
c922b13c3f fix #127 (they are actually in the right namespace, I just registered them to the datafixer wrong) 2022-06-15 21:17:18 -05:00
gamma-delta
744c6e1fd8 keep renaming things. fix #115 2022-06-15 21:00:46 -05:00
gamma-delta
3638ec7b01 close #126 2022-06-15 16:26:03 -05:00
yrsegal@gmail.com
f8468b8862 show skins for real for real this time 2022-06-15 17:04:41 -04:00
yrsegal@gmail.com
13d97af5bf fix looking at an old cleric impetus with a lens crashing 2022-06-15 16:54:09 -04:00
gamma-delta
726fc8427e merge in the lore 2022-06-14 20:42:52 -05:00
gamma-delta
bdec14b202 IT RUNS ON FORGE AND FABRIC 2022-06-14 20:41:03 -05:00
yrsegal@gmail.com
71a0b11d25 drop reduced dust and crystals even if not using the proper tool 2022-06-14 21:16:07 -04:00
yrsegal@gmail.com
bf5c908273 thoth always either evaluates or errors 2022-06-14 20:51:51 -04:00
gamma-delta
434c480b0b kotlin now compiles! ... now onto java 2022-06-14 14:35:06 -05:00
yrsegal@gmail.com
72a1f28902 fix place block using the wrong context 2022-06-14 10:20:40 -04:00
gamma-delta
8b7369fe8b do spells and finish up the harness ... now onto blocks! 2022-06-14 02:11:38 -05:00
gamma-delta
2917a3b358 who am i, wire? converted all non-spell actions to the new iotas 2022-06-14 01:02:20 -05:00
yrsegal@gmail.com
f2555fa4d6 fix #122 2022-06-13 23:29:47 -04:00
gamma-delta
71c3cade9b and now for the part of the show where we refactor every single operator 2022-06-13 22:02:50 -05:00
gamma-delta
8261063208 more manual fixes 2022-06-13 20:29:30 -05:00
yrsegal@gmail.com
a6369674ba sort tags 2022-06-13 21:28:03 -04:00
yrsegal@gmail.com
7286ddc8ae fix jeweler's hammer not dropping full amethyst loot 2022-06-13 21:26:12 -04:00
gamma-delta
6f4497a18f whoopsy it modified things in caches. oh well. 2022-06-13 19:41:13 -05:00
gamma-delta
7403d87e6f kotlin went great, now for java 2022-06-13 19:26:39 -05:00
gamma-delta
e00757331e pushing to have a backup if i mess up sed 2022-06-13 19:02:46 -05:00
gamma-delta
ba9028010f make foci/spellbooks overlays based 2022-06-13 18:38:24 -05:00
gamma-delta
d0f43ff0d9 rename lots of things 2022-06-13 16:45:22 -05:00
gamma-delta
fb246ef883 finish making types 2022-06-13 13:58:53 -05:00
gamma-delta
029869b247 make blink not free when less than a block 2022-06-13 12:29:30 -05:00
gamma-delta
a9c8be1212 still doesn't compile, but now feat. registries 2022-06-13 01:39:12 -05:00
gamma-delta
61926ca299 Rebase this onto the 1.0 branch 2022-06-12 23:57:16 -05:00
yrsegal@gmail.com
10c9d074b8 prevent nbt editing from causing crashes on foci and such 2022-06-12 22:33:48 -04:00
gamma-delta
fef331d8e0 formatting 2022-06-12 20:30:05 -05:00
gamma-delta
06c7f97585 whoops 2022-06-12 20:29:47 -05:00
yrsegal@gmail.com
fc225b1afa fix impetus player head loading being weird 2022-06-12 19:53:14 -04:00
gamma-delta
411e85579f fix the jar not including everything on forge 2022-06-12 17:00:38 -05:00
gamma-delta
952b53eaed this actually seems more helpful 2022-06-12 15:10:45 -05:00
gamma-delta
c8e252497c *actually* close #102 2022-06-12 15:07:49 -05:00
gamma-delta
6ad14e6fc8 close #101 ... well, more like touch up 2022-06-12 15:06:10 -05:00
gamma-delta
bf4682260d close #114 2022-06-12 13:48:20 -05:00
gamma-delta
608fd0e4c2 close #116 and also whoops i forgor to run datagen in a while 2022-06-12 12:38:45 -05:00
gamma-delta
8ef43af35d Close #113 and document naming pages 2022-06-12 12:13:47 -05:00
gamma-delta
c4a5f97129 close #102 2022-06-12 11:55:18 -05:00
gamma-delta
1b1b43dcfe Close 112 2022-06-12 11:54:28 -05:00
yrsegal@gmail.com
3019e4c35a oops. 2022-06-11 18:43:48 -04:00
yrsegal@gmail.com
cea2d33cfa make weakmapped safer, and document 2022-06-11 18:38:45 -04:00
gamma-delta
c16002e832 ok jk i want 8x scale 2022-06-10 18:45:55 -05:00
gamma-delta
25afe5a74b yeah i probably shouldve seen that one coming 2022-06-10 18:41:22 -05:00
gamma-delta
6109fffc32 Merge branch 'main' of https://github.com/gamma-delta/HexMod 2022-06-09 20:32:39 -05:00
gamma-delta
b7a554dd75 make the spell circle spells no longer great 2022-06-09 20:32:25 -05:00
yrsegal@gmail.com
481a9aef5d don't use valueOf explicitly 2022-06-09 19:18:24 -04:00
yrsegal@gmail.com
233fb28eac make some progress towards fixing fabulous conjures 2022-06-09 17:02:19 -04:00
yrsegal@gmail.com
b0bdbb7d76 fix some villager and rendering jank 2022-06-09 17:01:51 -04:00
gamma-delta
b743c8e7a2 they're called staves, wire 2022-06-09 14:48:46 -05:00
gamma-delta
63ea5822dd hopefully prevent fork bombs, fix #106 2022-06-09 13:54:30 -05:00
yrsegal@gmail.com
8cbcea2833 fix the sentinel sometimes rendering weird 2022-06-08 20:50:25 -04:00
yrsegal@gmail.com
ae89127572 fix a stateleak 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
0895fc972c fix obfuscation 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
2ddd3c54e4 more categories 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
86c57198ce for height modifiers 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
c4dceeeede weak reference utils, migrate villager prep code into central location 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
b25cffd814 some minor tag changes 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
69b7177ee6 localize some tags 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
70067b97bc show "minecraft:villager" if no profession 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
f91b26057e advanced/regular tooltips 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
d188a20366 you ever just grayscale 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
28404a6593 emi! 2022-06-07 19:22:09 -04:00
yrsegal@gmail.com
e246d31926 fix CI not building 2022-06-07 19:21:57 -04:00
yrsegal@gmail.com
811adff148 huh, boolean flip here 2022-06-07 19:10:18 -04:00
yrsegal@gmail.com
54724ac95e fix custom item handlers being weeeird with impetuses
I also finally got that fabric fluid transfer thing implemented, woo
2022-06-07 17:41:20 -04:00
yrsegal@gmail.com
4e6d47de41 resolve fabric todos 2022-06-07 14:57:16 -04:00
yrsegal@gmail.com
59378e8031 i need to stop copypasting 2022-06-06 22:03:23 -04:00
yrsegal@gmail.com
01dba3419d fix potion effects being able to go into the weird negative range 2022-06-06 21:10:20 -04:00
yrsegal@gmail.com
51a4ae9dcd fix impetus only showing it's bound when bound to a player in world 2022-06-06 10:09:23 -04:00
yrsegal@gmail.com
df6e018d7c fix lang 2022-06-06 10:03:20 -04:00
gamma-delta
1c4a64cc1c do the rest of it; page layout cleanup todo 2022-06-05 01:39:24 -05:00
yrsegal@gmail.com
9b0487688c creative unlocker now can show you mana usages 2022-06-04 18:17:10 -04:00
yrsegal@gmail.com
31d40b7555 migrate old colorizers 2022-06-04 14:27:55 -04:00
gamma-delta
1b22e63a1f start work on lore 2022-06-04 13:01:09 -05:00
yrsegal@gmail.com
0edc687a60 open up scroll loot tables to config 2022-06-04 12:23:25 -04:00
yrsegal@gmail.com
e61b5c1255 fix comparator output not showing on fabric 2022-06-04 10:24:31 -04:00
yrsegal@gmail.com
f08959d90e fix akashic records not working on fabric 2022-06-04 10:18:00 -04:00
gamma-delta
2d049114ba for FILE in *.png.mcmeta; do jq '.animation.frames |= [to_entries | .[] | {index: .key} + .value]' $FILE > $FILE.out; done 2022-06-03 22:09:40 -05:00
gamma-delta
c121211369 messed up the json generation; pushing a commit to have somewhere to fall back on if jq fails 2022-06-03 21:59:19 -05:00
yrsegal@gmail.com
2e6dda478f name the local 2022-06-03 16:46:50 -04:00
yrsegal@gmail.com
b652625706 wow. how did I miss this one 2022-06-02 20:01:50 -04:00
yrsegal@gmail.com
236648bb47 better hint for WHAT DID I SEE 2022-06-02 16:25:24 -04:00
gamma-delta
bf35952778 lilliputian 2022-06-02 02:11:48 -05:00
gamma-delta
772d94cd9e add multiple scroll sizes 2022-06-02 00:51:29 -05:00
gamma-delta
db6bc09218 unbreak things when played with no cross-compat mods 2022-06-01 22:03:14 -05:00
gamma-delta
272f81e36b add gravichanger compat, add stubs for pehkui, and rebalance flight 2022-06-01 21:53:24 -05:00
yrsegal@gmail.com
7a297ed216 villagers now are offended by mind murder 2022-06-01 00:23:14 -04:00
yrsegal@gmail.com
4ab69d18f4 bring formatting of rank in line with others 2022-05-31 23:05:27 -04:00
yrsegal@gmail.com
3ee9d8cd94 Use rank names instead of numbers 2022-05-31 23:02:04 -04:00
yrsegal@gmail.com
eb52579062 Close #96 2022-05-31 20:02:56 -04:00
yrsegal@gmail.com
79b97a2998 Fix #98 2022-05-31 19:55:46 -04:00
yrsegal@gmail.com
ad357eb0d6 Close #97 2022-05-31 19:54:32 -04:00
yrsegal@gmail.com
7a5d40f5ba fix repetition 2022-05-31 00:35:13 -04:00
yrsegal@gmail.com
b6d049dc38 fix a typo but again 2022-05-31 00:31:18 -04:00
yrsegal@gmail.com
86a7820099 fix a typo 2022-05-31 00:07:21 -04:00
gamma-delta
00e9340851 close #95 (it would have happened on both sides) 2022-05-30 15:31:46 -05:00
gamma-delta
a0517426e0 Merge branch 'main' of https://github.com/gamma-delta/HexMod 2022-05-30 10:38:16 -05:00
gamma-delta
b9e1472436 fix #94 2022-05-30 10:37:29 -05:00
yrsegal@gmail.com
2195ffae97 also wait this was a nerf oops 2022-05-29 22:44:42 -04:00
yrsegal@gmail.com
303c307c5c jeweler's hammer is a little less sad 2022-05-29 22:42:19 -04:00
yrsegal@gmail.com
e1ba0a14dc budding amethyst emits hex particles 2022-05-29 19:24:53 -04:00
yrsegal@gmail.com
758d71bc18 e m p h a s i s 2022-05-29 17:06:09 -04:00
yrsegal@gmail.com
fcb5ab35f4 fix some compiler complaints 2022-05-29 16:41:57 -04:00
yrsegal@gmail.com
bcd3091d03 for emphasis, but again 2022-05-29 16:29:18 -04:00
yrsegal@gmail.com
718225b3cc for emphasis 2022-05-29 16:11:23 -04:00
yrsegal@gmail.com
61e208a1d8 lang tweaks 2022-05-29 16:02:44 -04:00
yrsegal@gmail.com
33f364039c some kt component utils, also fix a display bug on fabric 2022-05-29 15:59:52 -04:00
gamma-delta
9013ffe6f1 fix #91 2022-05-28 21:01:10 -05:00
gamma-delta
ac33eca6bf close 80, close 92, close 93 2022-05-28 19:08:09 -05:00
yrsegal@gmail.com
a011ce5a5d fix #74 2022-05-27 17:49:14 -04:00
yrsegal@gmail.com
7eea96ec60 fix reloadable server resources 2022-05-26 13:17:27 -04:00
gamma-delta
f0472125ea move to new paucal datagen 2022-05-26 09:15:56 -05:00
petrak@
c6c1a07a8e
Merge pull request #87 from Alwinfy/fancy-lightning
Change lightning to have a flow effect
2022-05-26 07:26:08 -05:00
yrsegal@gmail.com
2c471d3a8b fix #79 2022-05-25 18:50:19 -04:00
Alwinfy
0a85f08877
Merge branch 'main' into fancy-lightning 2022-05-25 18:46:00 -04:00
gamma-delta
18383927d7 add creative unlocker 2022-05-25 17:13:19 -05:00
gamma-delta
940444497b unbreak spell circles!! 2022-05-25 15:57:38 -05:00
yrsegal@gmail.com
0da0b40256 begone, helper objects. kotlin has no need of thou 2022-05-25 00:10:09 -04:00
yrsegal@gmail.com
5945d6ea70 dsls my belovededed 2022-05-24 23:59:00 -04:00
yrsegal@gmail.com
3e0d1f9fe0 dsls my beloveded 2022-05-24 23:57:02 -04:00
yrsegal@gmail.com
5f4c0c170d dsls my beloved 2022-05-24 23:51:39 -04:00
yrsegal@gmail.com
52b7036b91 nbt dsl, names are no longer wrongcased, ser for con frames 2022-05-24 23:35:36 -04:00
yrsegal@gmail.com
3efb992e92 😔 2022-05-24 21:01:00 -04:00
Alwinfy
a3fd353cc3
Merge remote-tracking branch 'origin/main' into fancy-lightning 2022-05-24 20:35:45 -04:00
yrsegal@gmail.com
4f0e390c14 greater patterns now aren't just spells
Akashic Read is deliberately not a greater pattern, so you can distribute trinkets based on it on a server or something
2022-05-24 17:44:28 -04:00
yrsegal@gmail.com
37df5d3c56 blink now can go down, teleport into void is now ban 2022-05-24 17:12:46 -04:00
gamma-delta
cfbc2bd5f0 clean up some todos 2022-05-24 12:12:20 -05:00
gamma-delta
d901b83732 get reducer working on forge; todo why the mixin doesn't fire on fabric 2022-05-24 12:11:04 -05:00
Alwinfy
f332604424
Make wiggles a little more obvious 2022-05-24 10:29:08 -04:00
gamma-delta
ee3f34878e it works on forge. todo mixin until after everything's loaded and shoehorn in the loot func 2022-05-23 23:24:21 -05:00
Alwinfy
82cafe098e
Parameterize the chaos of a pattern 2022-05-24 00:06:02 -04:00
Alwinfy
6b7be0a8cf
A little more chaos 2022-05-23 23:30:19 -04:00
Alwinfy
f2e9cb1f5e
Change lightning to have a flow effect 2022-05-23 23:30:18 -04:00
Yoni Segal
6505249cc3
Merge branch 'main' into side-effects 2022-05-23 19:43:21 -04:00
yrsegal@gmail.com
539c7d1005 change the names of resolution types
also fancier colors
2022-05-23 19:40:42 -04:00
Alwinfy
cd5657d7b8
Make continuations immutable and functional 2022-05-23 18:54:33 -04:00
gamma-delta
9ccfba83f9 datagen that i havent tested at all 2022-05-23 17:01:22 -05:00
Alwinfy
cf89dfe38b
Fix nested intros colourizing themselves 2022-05-23 16:48:48 -04:00
Alwinfy
82dad4d971
Remove eval/delay lang entry 2022-05-23 16:05:18 -04:00
Alwinfy
9ad0a5cbe1
Remove dead var, add executeIota helper 2022-05-23 15:59:28 -04:00
Alwinfy
fec005cb65
Update OpHalt lang entry 2022-05-23 15:41:10 -04:00
Alwinfy
ec49c0f9e0
Minor fixes 2022-05-23 15:31:29 -04:00
gamma-delta
082dbc15d7 half-implement xplat datagen 2022-05-23 14:21:13 -05:00
Alwinfy
bc71393b53
Document ContinuationFrame 2022-05-23 13:17:19 -04:00
Alwinfy
924be394ac
Oops, ^V-failed a lang entry 2022-05-23 11:38:57 -04:00
Alwinfy
c9f15ae67d
Register + doc halt 2022-05-23 11:31:00 -04:00
Alwinfy
f2687b9e88
Small opts + halt 2022-05-23 10:49:34 -04:00
Alwinfy
d701fafff1
Merge remote-tracking branch 'origin/main' into side-effects 2022-05-23 02:11:49 -04:00
Alwinfy
448cb0b8a7
It compiles and evaluates things properly now 2022-05-23 01:39:33 -04:00
Alwinfy
1d5935f930
Initial pass for evaluator 2022-05-23 00:08:40 -04:00
yrsegal@gmail.com
0955510929 now everything is colory
colors not final
2022-05-22 16:56:58 -04:00
yrsegal@gmail.com
dd089c2be7 add modulo, fix russian
closes #82, #85, #86
2022-05-22 16:56:39 -04:00
yrsegal@gmail.com
4ce31d7f1a more accurate thoth sig 2022-05-22 06:51:40 -04:00
gamma-delta
fef9e5f011 fix #83 2022-05-21 17:45:40 -05:00
gamma-delta
bc38d0e1b4 stop making common jars, hopefully 2022-05-21 16:11:38 -05:00
yrsegal@gmail.com
0a92bc0e01 woops 2022-05-21 19:30:14 +01:00
yrsegal@gmail.com
c7780b3b0d close #72 2022-05-20 21:03:25 +01:00
gamma-delta
918abb89de particles still dont work on farbc 2022-05-20 11:53:34 -05:00
yrsegal@gmail.com
153b2b9667 equality tolerance - but it's everywhere now
also fix mishaps for arguments
2022-05-20 16:56:33 +01:00
gamma-delta
a17dc3e90a Close #81 2022-05-19 23:18:55 -05:00
gamma-delta
804bcecf38 fix #74 2022-05-19 21:09:05 -05:00
gamma-delta
c77d2d96ea close #73 2022-05-19 20:41:17 -05:00
gamma-delta
c4d75c37cf Merge branch 'main' of https://github.com/gamma-delta/HexMod 2022-05-19 18:59:54 -05:00
gamma-delta
ac67b467cd forge tests still wont build 2022-05-19 18:59:47 -05:00
yrsegal@gmail.com
a3d915f90f alwinfyyyyyyyy 2022-05-20 00:08:03 +01:00
gamma-delta
cb8b4be953 ok i think it works this time 2022-05-19 10:27:02 -05:00
gamma-delta
d634824ae7 clean up some weird conflicts from the merge 2022-05-19 09:50:50 -05:00
gamma-delta
88d596cfd1 holy shit i think that's the rebase done and dusted 2022-05-19 09:44:00 -05:00
yrsegal@gmail.com
135810c343 fix akashic stairs being there for some reason 2022-05-18 23:41:56 +01:00
yrsegal@gmail.com
2cb6dfba68 fix edify cost 2022-05-18 23:09:17 +01:00
yrsegal@gmail.com
4317ac38fa try to fit this into the box 2022-05-18 23:09:17 +01:00
yrsegal@gmail.com
9ec3192d1c fix a bad message with integration distillation 2022-05-18 23:09:17 +01:00
yrsegal@gmail.com
c1443e20aa fix intro/retro 2022-05-18 23:09:17 +01:00
gamma-delta
1b9533bc88 properly implement read and write local 2022-05-18 23:09:15 +01:00
Alwinfy
99648ecc2c Fix packaged spell 2022-05-18 23:08:15 +01:00
Alwinfy
c77e38b5da Make empty lists falsy 2022-05-18 23:08:15 +01:00
Alwinfy
0b13dd55b1 moar bugfix 2022-05-18 23:08:05 +01:00
Alwinfy
156e3263f3 Fix type errors 2022-05-18 23:08:03 +01:00
Alwinfy
6d4434fed6 Add O(1) cons/uncons 2022-05-18 23:07:11 +01:00
Alwinfy
f893fe2a69 Add a dedicated SpellList perst. data type for efficiency of ops 2022-05-18 23:04:00 +01:00
yrsegal@gmail.com
8241c351ce players are now range-agnostic 2022-05-18 23:02:15 +01:00
yrsegal@gmail.com
67644a7608 oh no this texture is beyond saving waaaaa 2022-05-18 23:02:15 +01:00
yrsegal@gmail.com
d71ad0c7e3 *sigh* 2022-05-18 23:02:13 +01:00
yrsegal@gmail.com
50cec62cb0 add explanation of metaeval consideration with iotas 2022-05-18 23:01:46 +01:00
yrsegal@gmail.com
983ac97f26 whee, fix the dust block model 2022-05-18 23:01:44 +01:00
yrsegal@gmail.com
3b6c7e2fe4 prevent true naming with spell holder items 2022-05-18 23:00:56 +01:00
yrsegal@gmail.com
ddce4acd5a executing patterns as spells
:)
2022-05-18 22:59:51 +01:00
yrsegal@gmail.com
0e38543cc7 jeweler's hammer
this entry is very temporary, petra, replace as you see fit
2022-05-18 22:48:18 +01:00
gamma-delta
ebbe80b9d1 you can no longer cheese the spell gui wuth a really thin window 2022-05-18 22:37:48 +01:00
yrsegal@gmail.com
b4360b9b4a overcasting now runs on a percentage schema 2022-05-18 22:36:09 +01:00
yrsegal@gmail.com
d09cd5fcc0 fix flight not working unless you had a sentinel in that dimension 2022-05-18 22:34:34 +01:00
yrsegal@gmail.com
2428d18075 add Huginn's Gambit, Muninn's Reflection, and Surgeon's Exaltation
no patterns for huginn and muninn (yet)
2022-05-18 22:30:27 +01:00
yrsegal@gmail.com
74b6352594 make flight actually push you up 2022-05-18 22:26:40 +01:00
yrsegal@gmail.com
84a8d5deb7 change advancement to trigger on charged amethyst 2022-05-18 22:25:01 +01:00
gamma-delta
4f118c227a fisherman's no longer hangs when trying to get things below the bottom of the stack, and clean up the error message 2022-05-18 22:23:02 +01:00
yrsegal@gmail.com
634e00cbe5 ever heard of ItemNBTHelper? me neither
this would look way prettier if more of the mod was in kotlin. just trust me on that
2022-05-18 22:22:44 +01:00
yrsegal@gmail.com
7f4f51f127 bookkeeper's gambit keep-1 works 2022-05-18 22:08:02 +01:00
yrsegal@gmail.com
8bbf315a7e witches no longer drink potions or join raids if swept 2022-05-18 22:06:28 +01:00