Commit Graph

656 Commits

Author SHA1 Message Date
21e847676f
Port to 1.18.2 2022-03-28 17:49:33 +07:00
3ed3f43c59
typo 2022-03-28 12:39:07 +07:00
474516506a
Split powered component in three objects 2022-03-28 12:36:48 +07:00
114cb21676
Merge remote-tracking branch 'origin/master' into master 2022-03-27 19:48:19 +07:00
917faffcf9
Revise storage system to rely solely on ImpreciseFraction 2022-03-27 13:16:07 +07:00
ecc7d6e26d
Mekanism QIO support 2022-03-25 22:05:01 +07:00
7152108cc8
Improve ticker, actually remove nodes from storage graph 2022-03-21 23:40:22 +07:00
d4aa8cd7ee
Storage bus test, storage api improvements 2022-03-21 19:57:09 +07:00
2c4bd9ccd8
Make defaultDisplayName be property 2022-03-20 21:25:09 +07:00
7cce062ae5
Rename mattery block 2022-03-20 20:16:01 +07:00
e5e08fcf07
some kind of more projectile changes 2022-03-20 20:08:28 +07:00
09d63c19a1 >Portable gravitational stabilizer now has a model.
>Plasma rifle and Energy sword now has a 2d texture as item model, but draws a 3d model in hand.
>Tweaked Plasma rifle position in first person.
2022-03-17 22:28:41 +06:00
5e067b7567
Pass name to datafixer except we dont use it anyway 2022-03-17 20:30:22 +07:00
cd745a5e7e
more tests 2022-03-14 10:26:02 +07:00
2aed09593c
More weapon tests 2022-03-13 21:46:11 +07:00
4f1e2217fe Gun model 2022-03-06 17:43:28 +06:00
498164bc06
It shouldn't be there 2022-03-06 17:42:42 +07:00
a6b9ca3a45
Merge remote-tracking branch 'origin/master' into master 2022-03-06 17:32:53 +07:00
d0e6e5b450
Даю gun 2022-03-06 17:32:33 +07:00
f7bfc5fb86 Singularity scanner model 2022-03-06 04:09:20 +06:00
b4cb36a42d Powered cake slicer model 2022-03-05 17:02:43 +06:00
9ce7cfedde
Un-internal killFocusForEverythingExceptInner 2022-03-05 16:22:41 +07:00
6e0e0a44f2
Fix mekanism joules extraction 2022-02-27 14:28:50 +07:00
203b50dcb0
Streamlined energy implementations with transparent mekanism wrappers 2022-02-27 14:24:37 +07:00
98c91b01b0
Initial direct Mekanism energy support 2022-02-27 11:50:52 +07:00
ddf2c178e6
Revisit android features structure 2022-02-26 20:03:29 +07:00
5ba79f20e5
Use enqueueWork because vanilla registries are not thread safe 2022-02-26 12:19:38 +07:00
905e8376ca
Mark storageNode as property 2022-02-26 12:13:11 +07:00
398105f067
Iterate storage system design once again 2022-02-26 12:08:17 +07:00
da7be875d5
Typo 2022-02-25 07:50:45 +07:00
d49c679253
Move registry to kotlin 2022-02-24 22:02:54 +07:00
db5775c90b
Pill in dungeons
Fixes #6
2022-02-23 21:22:52 +07:00
ea8adbf62d
Clarify energy capability of sword 2022-02-23 15:23:13 +07:00
f5d17f6bdb
Energy Sword
Fixes #17
2022-02-23 14:52:38 +07:00
cdb72a610b
Actually rename everything back to match minecraft style
because most of other stuff is named this way
anyway
2022-02-23 11:11:14 +07:00
dd6d30e011
Number client input, energy counter io limit 2022-02-22 18:39:03 +07:00
dc535dd01a
Update mods.toml 2022-01-31 23:39:03 +07:00
e56a9477ef
Panel and minecraft widget panels improvements 2022-01-31 23:31:28 +07:00
060edb8073
Rename .java to .kt 2022-01-31 23:31:27 +07:00
da583324b9
Better menu data networking 2022-01-31 21:58:33 +07:00
34f6d8e3aa
Energy counter direction switch right in gui 2022-01-31 17:50:48 +07:00
02882509e5
Cleaner MenuMatterBottler code 2022-01-31 16:59:40 +07:00
1e49ec57ef
BooleanPlayerInputWidget 2022-01-31 16:49:21 +07:00
8dad391b28
Bump forge build to 64 2022-01-31 12:25:25 +07:00
5d487fabd5
Add worker blockstate to matter recycler 2022-01-31 12:01:24 +07:00
345a24b1ed
Some initial complexity balancing 2022-01-31 12:00:38 +07:00
901d1944ce
We are not nullable INBTSerializable 2022-01-31 11:37:59 +07:00
86c170be8a
Some un-static'ing 2022-01-30 20:47:50 +07:00
bb606f3c8d
Split registry file into multiple files 2022-01-30 19:59:27 +07:00
c62836fa04
Make use of builtin LazyOptional of energy impl 2022-01-30 17:01:57 +07:00
6e02402f06
Add built in LazyOptional to EnergyStorageImpl 2022-01-30 17:00:13 +07:00
f12ccc84e2
Set logging level about recipe discovery to debug 2022-01-30 16:56:09 +07:00
05a3b4a1d2
Don't punish this much for half researched patterns 2022-01-30 16:52:56 +07:00
accb0b526c
Fix matter decomposer being left with debugging code 2022-01-30 16:45:02 +07:00
03c04178e7
Failure chance in matter replicator, fix tick precision in worker, various fixes 2022-01-30 16:43:30 +07:00
052a29d005
Rename .java to .kt 2022-01-30 16:43:29 +07:00
75c76af82c
Streamline matter and tile worker APIs 2022-01-30 15:12:22 +07:00
8bd6852d10
Matter Recycler, Matter Dust and some fixes 2022-01-30 13:02:03 +07:00
da5aa346fb
New Matter registry, with better balance and "complexity" support 2022-01-29 17:38:25 +07:00
154e3679df
Fix issues with energy counter history 2022-01-26 18:21:34 +07:00
a859084b6f
ImpreciseFraction. Dear... god. There's more. Noooo! 2022-01-26 18:15:38 +07:00
3313a3d011
Industrial glass and pane, models and textures 2022-01-26 16:00:06 +07:00
1415c34206
Better read/write of imprecise fraction 2022-01-26 14:17:09 +07:00
17af248426
Merge remote-tracking branch 'origin/master' into master 2022-01-26 13:11:49 +07:00
edccc75e01
Update matter bottler code 2022-01-26 13:11:42 +07:00
cd9f18ef94
Do not toDouble 2022-01-26 09:01:18 +07:00
a5e5b928bc
Move energy, matter and storage ImpreciseFraction
those imprecisions will haut me in my dreams
2022-01-26 09:00:55 +07:00
dab5cd6a2b
ImpreciseFraction 2022-01-25 21:35:48 +07:00
6cd04682d7
Added energy counter in-world render 2022-01-25 12:54:09 +07:00
5ff3771f81
Use DoubleArray in test 2022-01-25 10:16:20 +07:00
5346e1917d -Added industrial glass textures; -Added item model for gravitation stabilizer; -Changed tritanium armor visor to black; 2022-01-25 00:35:07 +06:00
c5f0a35619
Make black hole tick method sleep for 4 ticks on creation 2022-01-24 18:45:33 +07:00
67cd8dd03a
Make stabilizer ray a bit more fabulous 2022-01-24 18:05:50 +07:00
5d8e0e8c48
Industrial glass blocks, panes and recipes 2022-01-24 17:07:28 +07:00
b79dd85a25
Add not utilized mesh parts to portable grav stabilizer model 2022-01-24 13:05:24 +07:00
4a614ce5d9
Merge remote-tracking branch 'origin/master' into master 2022-01-24 13:03:05 +07:00
fc685f40bb
Add GravitationStabilizerModel 2022-01-24 13:02:51 +07:00
9918e18113 -Gravitational stabilizer idle texture updated 2022-01-24 11:23:47 +06:00
7826e5d842
Gravitation stabilizer lens 2022-01-24 12:21:34 +07:00
d5a4b43d73
Merge remote-tracking branch 'origin/master' into master 2022-01-23 22:28:39 +07:00
3f3438c124 -Added Tritanium armor item textures; -Added dithering on tritanium blocks; -Modified some component textures; -Creative pattern drive is now golden; -Added gravitational stabilizer main block and lens block models. 2022-01-23 20:55:44 +06:00
e2a2a8479b
Fix X rotation 2022-01-23 17:51:54 +07:00
a3c646c4b7
Don't render black hole hover text when gui is hidden 2022-01-23 16:54:53 +07:00
1c0d3607a6
Move more stuff 2022-01-23 16:45:20 +07:00
ede0de1658
Rename .java to .kt 2022-01-23 16:45:19 +07:00
04f54343a1
Fix matter scanner not properly accepting shift click 2022-01-23 16:09:23 +07:00
4fe2bf3c97
Fix cargo crate eating items on shift click 2022-01-23 16:05:43 +07:00
dd72e0eb1a
Rename cargo crate menu 2022-01-23 15:36:28 +07:00
18afbe9bb4
Rename screen classes 2022-01-23 15:34:17 +07:00
72aaea3120
Use constant as capacity 2022-01-23 15:33:12 +07:00
5dbd634215
Move cargo crate and android station to kotlin, implement comparator for cargo crate 2022-01-23 15:28:55 +07:00
ecde930bcd
Rename .java to .kt 2022-01-23 15:28:54 +07:00
8dae844423
TritaniumArmorRenderProperties should be private 2022-01-23 13:38:53 +07:00
88755f991a -Fixed Plate press UV error; -Tritanium armor model is practically complete 2022-01-23 03:38:05 +06:00
5c3c6d5f93
Add locale for tritanium armor 2022-01-22 16:27:25 +07:00
23cbf9abdf
Add test code for tritanium armor and portable grav stabilizer 2022-01-22 16:26:09 +07:00
27646a0bad
Rename MtE to MtJ (Mattery Joules) 2022-01-21 11:48:25 +07:00
cc5748a5d4
Format matter value 2022-01-21 11:47:44 +07:00
91fd990d5c
Singularity scanner and some item components 2022-01-21 11:44:34 +07:00
f843f182a9
Display black hole information to players in creative 2022-01-20 18:39:11 +07:00
1ce4578336
A lot of math stuff and text rendering in gmod api style 2022-01-20 18:37:30 +07:00
bb3da639b0
Fix gravitation overflow on very weak gravtiations 2022-01-20 11:56:21 +07:00
784c57d9eb
Fix blackhole and grav stabilizer render getting cutoff 2022-01-20 11:23:28 +07:00
1b4cf9498a
Graviational stabilizer renderer 2022-01-20 10:54:32 +07:00
35e8b554c5
Move UV stuff to render package 2022-01-19 12:53:43 +07:00
71aaf98bb1
Move gravitation stabilizer rotation on placement to block 2022-01-19 08:51:58 +07:00
c9d5397a4f
Fix typo 2022-01-18 22:06:50 +07:00
c38c48c6f1
Free rotation on gravitation stabilizer 2022-01-18 20:12:33 +07:00
4271db62c8
Plate press physical model 2022-01-18 18:25:42 +07:00
ed6a76764b
Cleaner frame rendering 2022-01-18 18:09:46 +07:00
20a705ad40
Fix frame and scrollbar rendering 2022-01-18 17:52:57 +07:00
f6da17c303
Move kotlin files 2022-01-18 17:19:07 +07:00
1e425cce54
Plate press worker blockstate and it's blockstate files 2022-01-18 17:18:29 +07:00
e649182eef
Merge remote-tracking branch 'origin/master' into master 2022-01-18 17:03:59 +07:00
20d84ece56
No need in companion object 2022-01-18 17:03:06 +07:00
891a8a6dd8
Render guiding beams when holding gravitation stabilizer 2022-01-18 17:01:04 +07:00
72911e0208
Rename .java to .kt 2022-01-18 17:01:03 +07:00
6ed2f874a8
Move some render stuff to kotlin 2022-01-18 12:16:41 +07:00
083c6c216e
Rename .java to .kt 2022-01-18 12:16:36 +07:00
a3094549de PLATE PRESS MODEL HAAAAA 2022-01-14 22:10:41 +06:00
a2a53b2ca6
Streamline nbt names 2022-01-14 21:01:34 +07:00
4001eea509
Update data and datagen for latest added blocks 2022-01-14 20:54:27 +07:00
f95d22ebff
Dont get gravitation stabilizer get blocked by stuff 2022-01-14 20:48:30 +07:00
23df86e2f6
Gravitation stabilizer and slightly better blackhole gravity 2022-01-14 20:29:54 +07:00
04a2889311
Rename classes to match namings in other places 2022-01-14 18:54:26 +07:00
68401b01c8
Rename recipes to recipe 2022-01-14 18:47:48 +07:00
c6772f8003
Added more recipes 2022-01-14 18:27:28 +07:00
24ec919450
Update recipes 2022-01-14 18:01:34 +07:00
59ff6c4a2e
Serialize plate press container 2022-01-14 17:43:20 +07:00
5c87d0f8ab
More recipes for plate press, ignore "unknown tag" errors 2022-01-14 17:42:07 +07:00
c016b8850d
Plate Press
initial datagen for recipes
fix addItem ranges in MatteryContainer
2022-01-14 17:19:09 +07:00
81e6a8e616
Move from lambdas to interface since it is more clean in mattery container 2022-01-14 13:27:17 +07:00
fc20c4429d
Dont refuse to work when level is null 2022-01-14 12:47:14 +07:00
9ee960c421
Make chemical generator not eat buckets and other stuff from other mods 2022-01-14 12:37:58 +07:00
757f395004
Move mattery worker to kotlin and revise its code 2022-01-14 12:12:10 +07:00
0307431b4b
Rename .java to .kt 2022-01-14 12:12:08 +07:00
abe0122fe1
JEI support test 2022-01-14 11:07:24 +07:00
e9385efd5c
Translation for tritanium tools 2022-01-13 17:59:44 +07:00
cdc090bc32
Merge remote-tracking branch 'origin/master' into master 2022-01-13 17:21:13 +07:00
0efffda64c Tritanium instruments ХЫХА ХА 2022-01-13 16:19:34 +06:00
f726a9b6d5
Handheld models 2022-01-13 17:18:52 +07:00
f92dd0ad9e
Rename item model provider 2022-01-13 17:06:48 +07:00
52ea1102e4
Add missing datagen entries 2022-01-13 16:23:07 +07:00
b4c02e240d
mark research dirty when un-researching, add onUnresearched 2022-01-13 15:12:17 +07:00
e20a81c02c
Android research refund pill and health pill 2022-01-13 15:10:05 +07:00
c6fbd6aa78
Tritanium tools 2022-01-13 13:45:13 +07:00
a670671e21
Make blackhole be made out of stone 2022-01-11 12:04:41 +07:00
c41fc2c61b
Black holes now break blocks in range 2022-01-11 11:45:54 +07:00
c28ff851c9
Attempt new blackhole explosion algos, but nothing works 2022-01-10 18:55:30 +07:00
0cac33aec4
Serverside blackhole "weaker" affection now work correctly 2022-01-09 17:19:52 +07:00
ec6c903b6f
Move black holes to kotlin 2022-01-09 17:17:31 +07:00
3039bff89b
Crude fix for weird energy counter interface direction on placement 2022-01-09 15:15:38 +07:00
90d6e85207
Fix wrong rotation along y axis of energy counter 2022-01-09 15:12:27 +07:00
4b4e219a51
Physical model of energy counter 2022-01-09 15:08:25 +07:00
f3600b1f8f
Bring back shapegen, this time as command line tool, update blackhole model 2022-01-09 14:15:22 +07:00
55af4149ff
new black hole model 2022-01-09 14:01:24 +07:00
ba68a032c2
Finally make energy counter model rotate correctly
thanks mojang for not having z axis rotation
very cool
2022-01-09 13:51:39 +07:00
0c20bce816
Combine blockstate providers 2022-01-08 20:11:21 +07:00
26df2ea5b2
Use lootTable property for datagen 2022-01-08 19:30:12 +07:00
eabca10e5e
Make chemical generator mineable 2022-01-08 19:05:54 +07:00
17f3e51a25
Make energy counter mineable 2022-01-08 19:01:53 +07:00
6714cbd479
æugh, datagen 2022-01-08 18:52:17 +07:00
24d673b5ac
Simple block model provider 2022-01-06 19:40:23 +07:00
de16544f48
Crate blockstate provider 2022-01-06 16:40:33 +07:00
a5b0091522
Matter capacitor bank datagen 2022-01-06 16:10:36 +07:00
8cb915aad8
Datagen test 2022-01-06 15:48:32 +07:00
f23be0c213
Move to kotlin and streamline more base stuff 2022-01-04 23:28:00 +07:00
58598f7e3f
Rename .java to .kt 2022-01-04 23:27:59 +07:00
c689098253
Make energy counter be more consistent with lastTick 2022-01-04 20:05:35 +07:00
6c6f22c2a1
Fix chemical generator not updating it's "needs check" state 2022-01-04 20:02:04 +07:00
bea7ecab5f
Fix matter bottler not destroying it's matter node 2022-01-04 19:38:20 +07:00
605ab992f5
Bring back progress bar red flash 2022-01-04 19:33:40 +07:00
51f7e506f6
Matter bottler blockstate addition, streamline capability names 2022-01-04 19:20:48 +07:00
6c029b98b7
Updated energy counter, move energy API to kotlin 2022-01-03 21:06:21 +07:00
bb17f93a91
Rename .java to .kt 2022-01-03 21:06:20 +07:00
d1ea084516
Update Battery Bank code 2022-01-03 16:34:42 +07:00
9001147627
Rename .java to .kt 2022-01-03 16:34:41 +07:00
97cb64b3c5
Remove addBatterySlot of PoweredMatteryMenu 2022-01-03 15:29:44 +07:00
9f093a74ed
Streamline PoweredMatteryMenu API 2022-01-03 15:19:14 +07:00
d9ba74bc0f
Update drive viewer screen, move to PoweredVirtualComponent 2022-01-03 15:03:08 +07:00
287238c2d1
Rename .java to .kt 2022-01-03 15:03:07 +07:00
64c60abf3f
Update item monitor screen 2022-01-02 16:08:00 +07:00
6ec20989e6
Rename .java to .kt 2022-01-02 16:07:59 +07:00
ead57e567d
Fix double hover 2022-01-02 13:08:23 +07:00
a0450a9e39
Fix machine label in item monitor 2022-01-02 12:59:55 +07:00
162760c19c
farewell AbstractGrid 2022-01-02 12:56:12 +07:00
0ed841ab21
VirtualComponent on kotlin, PoweredVirtualComponent, powered storage system 2022-01-02 12:55:35 +07:00
9261562de7
Move more to kotlin, add shapes and locale to item monitor and drive rack 2022-01-01 13:35:41 +07:00
59a30e4935
Rename .java to .kt 2022-01-01 13:35:40 +07:00
1b790d49c9
Move items to kotlin 2022-01-01 11:48:58 +07:00
96b1d1ea92
Rename .java to .kt 2022-01-01 11:48:57 +07:00
64557a77f5
Functioning again storage network 2022-01-01 00:46:27 +07:00
695b540e3a
Rename .java to .kt 2022-01-01 00:46:26 +07:00
c9b6ec7e36
Move kotlin files 2021-12-31 20:56:30 +07:00
4b5a77b92e
Initial port of storage system to graph 2021-12-31 20:55:46 +07:00
215ecd1f21
Rename .java to .kt 2021-12-31 20:55:45 +07:00
e859b93350
Update android capability stuff 2021-12-31 18:24:05 +07:00
9efb4d6176
Move Android capability to kotlin and fix issues along the way 2021-12-31 18:09:16 +07:00
0acbdc8c69
Rename .java to .kt 2021-12-31 18:09:16 +07:00
8576378113
Move kotlin file 2021-12-31 15:38:26 +07:00