Commit Graph

3502 Commits

Author SHA1 Message Date
1df4ed809f
Make research internally use identity hash map 2022-08-28 20:28:30 +07:00
2042b8a9ab
Move variables to top 2022-08-28 20:09:23 +07:00
cbd35c6a80
Rename AndroidCapability to MatteryPlayerCapability 2022-08-28 20:08:15 +07:00
6a91a5fd2b
Add nutrient paste to loot tables, add heal pill to shipwreck 2022-08-28 19:01:11 +07:00
c8f098effb
Moar recipes! 2022-08-28 18:56:48 +07:00
a34930a310
Add missing methods to StripedColoredDecorativeBlock 2022-08-28 16:36:46 +07:00
d3166894f3
Un codegen StripedColoredDecorativeBlock 2022-08-28 16:34:29 +07:00
6d407d4c59
Striped tritanium blocks recipes 2022-08-28 15:53:15 +07:00
56d5277988
Move registry helper classes to subpackage 2022-08-28 12:49:33 +07:00
c0d71a49fc
god damn it 2022-08-28 12:42:38 +07:00
9db36447a9
Fix datagen failure 2022-08-28 12:38:01 +07:00
d7a444327c
Tritanium blocks, crate, vents recipes 2022-08-28 12:36:00 +07:00
78f959258c
MatteryRecipe builder, tritanium block recipe 2022-08-27 00:44:06 +07:00
5deb14f62f
Fix Cargo Crate being in wrong creative tabs 2022-08-26 23:27:24 +07:00
7c14614555
Adjust pill spawn chances 2022-08-25 22:12:10 +07:00
abedc7eace
World ore generation 2022-08-25 22:03:25 +07:00
d53e2286b5
Stitch up quantum battery code 2022-08-25 12:03:14 +07:00
de7f89186d
Move net packet to kotlin, add more network channels 2022-08-25 11:27:57 +07:00
69b8115395
Quantum batteries 2022-08-24 15:36:20 +07:00
2da5219739
minor corrections 2022-08-24 11:57:04 +07:00
017e9dee7f
flatBlockedBy 2022-08-23 23:05:11 +07:00
65dd7cead9
Visualize blocked/blocking research 2022-08-23 22:53:42 +07:00
435b8790b2
fix improper import 2022-08-23 22:39:56 +07:00
9746bfa69a
Repaint cross to white
because it is much easier to paint to desired color on the fly
2022-08-23 22:34:41 +07:00
28f50af69c
ListSet class for performance in research type 2022-08-23 22:32:38 +07:00
4c7238e40a
Add red cross widget 2022-08-23 22:32:19 +07:00
c8e67aece2
Move widget stuff around 2022-08-23 22:32:10 +07:00
7b45fe3903
Move block entity renderers to their subpackage 2022-08-23 21:10:36 +07:00
011fb340c0
Clarify on prerequisites 2022-08-23 21:08:02 +07:00
bf1a7394e6
Highlight paths in research tree 2022-08-23 21:05:39 +07:00
14e57cd4d1
Android research *tree*
*epic music plays*
2022-08-23 20:20:00 +07:00
b4f1e7fd89
some warnings 2022-08-23 18:28:37 +07:00
03f62b2d0e
Move render helper to kotlin 2022-08-23 18:26:39 +07:00
c24176374c
Merge android capability into rigid single class
since it is relevant only for player anyway
2022-08-20 22:43:48 +07:00
589d3a5499
Normalized lists of research 2022-08-19 18:08:38 +07:00
4fc037327f
Remove usages of deprecated energy storage capability link 2022-08-19 13:24:21 +07:00
928e241323
enqueueWork in MultiByteDataContainerPacket 2022-08-19 13:07:21 +07:00
2d532adf57
Make primitive containers check whenever old data matches new data 2022-08-19 13:02:58 +07:00
aba3f63311
remove early access check
since accessing registry itself early throws error now
2022-08-19 12:51:04 +07:00
3f36fb2843
bring back vararg constructor 2022-08-19 12:45:50 +07:00
53e512e918
remove loot modifiers registry fields
since they are useless anyway
2022-08-19 12:43:23 +07:00
fc736528dd
Move loot modifiers to 'convenient' and 'powerful' codecs
UndefinedBHVR — 22.08.2021
"Unconventional" is an understatement, there's some things there that are just.. "This is the worst way possible to do this, why would you do this Mojang?"
2022-08-19 12:32:01 +07:00
3d520a1a15
draw without shaders (no op) 2022-08-19 02:19:19 +07:00
26f2f5648c
Make it launch 2022-08-19 02:09:13 +07:00
3c7bff7a01
update mods.toml 2022-08-19 01:17:22 +07:00
63fd92a704
Make it compile 2022-08-19 01:13:37 +07:00
e90e7b3793
Fix no suffix being concated to formatted text 2022-08-17 19:57:47 +07:00
b6e57632a6
Fix fractional prefixes not working 2022-08-17 19:34:13 +07:00
55eb5223b7
Always display in red blockers/blocks in research tree 2022-08-17 19:09:35 +07:00
07c9efabd6
Add missing translation key for improved limbs 2022-08-17 19:05:18 +07:00
73633bd147
Attack boost android feature 2022-08-17 19:03:36 +07:00
0bb154e02e
fix setting wrong field 2022-08-17 17:15:03 +07:00
a5ca7af63e
Use buffer functions to read parts of imprecise fraction 2022-08-17 17:04:38 +07:00
51fa3a012c
Fix invalid order in AndroidEnergyLevelPacket 2022-08-17 17:04:23 +07:00
fa76cbfb74
Move event handler to kotlin 2022-08-17 17:02:17 +07:00
2f6f40d5f4
Android networking reworked 2022-08-17 17:02:07 +07:00
20425015ea
misc changes 2022-08-16 18:35:56 +07:00
add14f1733
Don't construct zero length big integer 2022-08-16 18:35:48 +07:00
3952067366
Don't put fractional digits for pattern count 2022-08-16 17:43:11 +07:00
f7ca3a1e11
Instead of iterating slot indexes iterate slots themselves 2022-08-16 17:41:45 +07:00
23286be3a9
Step assist research 2022-08-16 12:35:41 +07:00
e4833dd924
Revise android research and move it to Kotlin 2022-08-15 01:40:43 +07:00
800132a282
typo 2022-07-30 14:05:09 +07:00
0d3dc3a5fd
move index to property 2022-07-03 23:34:33 +07:00
627e35b065
toIntSafe for BigInteger 2022-07-03 23:10:56 +07:00
843da5c007
Display stored amounts 2022-07-03 23:10:46 +07:00
283342dc82
Get rid of old formatting helper 2022-07-03 22:24:56 +07:00
73e0c9a57e
New SI formatting or something 2022-07-03 21:53:36 +07:00
5833448584
Network storage items as ItemStackWrappers
so they can have counts of more than 2bil
Add some formatting for biginteger
2022-06-30 14:06:38 +07:00
11f416c601
Move buttons to bottom 2022-06-30 00:08:57 +07:00
ede335dc3f
Clarify tooltip 2022-06-29 22:19:25 +07:00
7b94558b40
Remove margin of refill priority button 2022-06-29 22:17:40 +07:00
eed9ffaf96
Make craftingGridTuples be sane 2022-06-29 22:05:53 +07:00
b6d3f59da0
Revert "since we no longer need to track several stacks for fuzzy mode"
This reverts commit ca9b6cf5fb.
2022-06-29 22:02:16 +07:00
ff8e9b5207
Also state the downside 2022-06-29 22:01:54 +07:00
4d7ab09e27
Update storage API documentation to lay out some decisions 2022-06-29 22:00:09 +07:00
eb74baffb8
Revert multiple mapping of stacks to each item 2022-06-29 21:43:49 +07:00
ca9b6cf5fb
since we no longer need to track several stacks for fuzzy mode 2022-06-29 21:33:57 +07:00
b64613e3bb
remove fuzzy match mode
it is way hard to implement
(you have to copy entire shaped/shapeless match code) and i think it is unnecessary
2022-06-29 21:25:07 +07:00
4b7e9234d8
More than working crafting in item panel 2022-06-29 19:33:10 +07:00
0dcf8d68c1
Fix storage bus not passing side to neightbour 2022-06-29 18:00:31 +07:00
532949e335
Remove unused variables 2022-06-29 16:11:27 +07:00
c89ff117ac
Fix scrol values on item monitor 2022-06-29 15:42:56 +07:00
0facae6ce4
Vastly improve square buttons, add enum variant 2022-06-29 15:39:42 +07:00
aaf3b31cdd
A bit of functional crafting inside item viewer 2022-06-29 00:49:16 +07:00
c5a5e1e8de
SlotPanel on Kotlin 2022-06-28 20:39:45 +07:00
8b6b80524e
Rename .java to .kt 2022-06-28 20:39:44 +07:00
4bb8f999d1
New item viewer screen, that just does absolutely nothing 2022-06-28 19:41:40 +07:00
a401e7cf99
Scrolling crafting history is now possible 2022-06-22 16:39:04 +07:00
c7181afc43
New item monitor interface prototype 2022-06-22 16:36:43 +07:00
3fe0a43333
Rename .java to .kt 2022-06-22 16:36:42 +07:00
d7a19327eb
Fix being unable to insert new items into storage bus 2022-06-22 13:13:38 +07:00
c907ec15a4
Move skin elements to framepanel class 2022-06-21 23:14:56 +07:00
f3a9234440
Split widget file 2022-06-21 23:10:38 +07:00
7d5faad7df
Rename fields of skin element to appropriate name 2022-06-21 22:57:00 +07:00
63c8f3fcb9
Make texture be a required argument to SkinElement 2022-06-21 22:51:21 +07:00
dac7a62850
new widgets (not commited) 2022-06-21 22:48:27 +07:00
1599dd39c9
Add SkinGrid, make SkinElement not be a data class 2022-06-21 22:46:36 +07:00
5cc5829456
Rearrange condition in hasNext 2022-06-16 15:56:26 +07:00
cc7e7600ec
Fix prioritized slot iterator 2022-06-16 15:56:07 +07:00
1afdcbe058
Use faster int set 2022-06-16 15:29:24 +07:00
cbc1c634d2
When storage bus receive items, try to put them into existing slots first 2022-06-16 15:26:13 +07:00
2597a8b15b
Fix interactive scrolling 2022-06-16 15:02:39 +07:00
7251ff7af5
Fix visual scrolling 2022-06-16 14:59:33 +07:00
b93faaae42
move everything to uuids again
god damn it
2022-06-08 20:37:57 +07:00
9a4f7c0a22
👋 Ender Rift and Colossal Chests 2022-06-08 20:06:07 +07:00
7c0c43dbb4
Snapshot change events on each frame, to avoid event spam when attached inventory
reconstruct slot list (hi Ender Rift)
2022-06-08 19:27:29 +07:00
c24c8a9a80
Move block classes to subpackages 2022-06-08 15:43:45 +07:00
fe9fd1c017
Make key creation as reified generic 2022-06-08 15:26:23 +07:00
5a3d68ea80
Move listener automated add/remove to extension function 2022-06-08 15:25:12 +07:00
0e140ad4f4
Fix filter not updating after nbt deserialize 2022-06-08 13:12:11 +07:00
50cac6d1b5
Move IDs to Longs again, update storage class hierarchy
maybe use ints? IDK
2022-06-08 12:42:48 +07:00
cb5cb44848
Migrate storage system to use bigintegers
since there are zero known real cases of storage units
which use fractions
and are not singleton units (e.g. energy)

fluid is still millibuckets despite having cauldrons and etc
2022-06-07 18:45:26 +07:00
4682d8116d
Rename node list properties 2022-05-24 19:49:11 +07:00
083d4efa17
Use HashMap for userData storage 2022-05-24 10:52:08 +07:00
cb171a63be
Added missing white/stripe tritanium block variant, added locale for striped blocks 2022-05-21 16:07:50 +07:00
9185473df6
Clean up registry, Language datagen 2022-05-21 15:36:18 +07:00
d0c1a7ec5a
Colored vents 2022-05-21 11:11:44 +07:00
69b3f723e6 Vent and Vent alt presets 2022-05-20 22:52:15 +06:00
f91581dce0
Matter bottler blockstate 2022-05-20 21:15:00 +07:00
0927578e96
Striped Colored Tritanium Blocks 2022-05-20 20:51:20 +07:00
1ed1474d3d
Gravitation stabilizer description 2022-05-20 19:14:29 +07:00
dd145ac023 Matter bottler blockstate parts 2022-05-16 20:05:05 +06:00
a2d861a0af Overheat sound for plasma weapons and colorless striped block base textures; 2022-05-16 19:42:31 +06:00
e0891620b2
Data for new colored blocks 2022-05-16 19:24:10 +07:00
8d7b73080f
Colored floor tiles and tritanium block 2022-05-16 19:08:25 +07:00
a787d22fbd
Update physical model of bus/i/o 2022-05-16 16:12:19 +07:00
bfb6767d1c
Merge remote-tracking branch 'origin/master' into master 2022-05-16 16:10:06 +07:00
ccb8c24ee9
Physical models for bus/i/o 2022-05-16 16:09:59 +07:00
8cabf8d295
Storage bus/i/o blockstates 2022-05-16 15:42:23 +07:00
1cd065d432 Fixed z fighting 2022-05-16 14:31:51 +06:00
de1eb1af19
Storage bus/i/o blockstates 2022-05-16 14:46:33 +07:00
f35974e23a
Merge remote-tracking branch 'origin/master' into master 2022-05-16 13:57:57 +07:00
89581bbb52
Portable condensation drive now use new item filter
Item filter now supports tag and nbt matching
2022-05-16 13:54:04 +07:00
86c706a178
Fix inability to paint colorless tritanium crate 2022-05-16 13:30:46 +07:00
45185db2b1 Floor tiles, vents and colorless tritanium building blocks;
Storage bus, importer and exporter models (Dbot i made the models, now please make them work with cables)
2022-05-16 01:16:04 +06:00
40a3547595
Fix storage bus crash on inventory shrink 2022-05-15 21:50:29 +07:00
a911eed753
Portable gravitation stabilizer logic for client 2022-05-15 21:02:49 +07:00
9bde1932a9
Portable gravitation stabilizer logic 2022-05-15 21:01:12 +07:00
99340baf30
Becoming android sound 2022-05-15 19:47:01 +07:00
f016e10dd2
Matter Recycler block shape 2022-05-15 19:25:40 +07:00
2e58853c74
Match vanilla locale at glass naming 2022-05-15 19:22:15 +07:00
66ac1db9e7
Stained Glass -> Colored Industrial Glass recipes 2022-05-15 19:21:24 +07:00
2a4c3795b5
Cargo crate models 2022-05-15 19:12:32 +07:00
d6b6673b20
Merge remote-tracking branch 'origin/master' into master 2022-05-15 18:37:13 +07:00
0198419d7f
Reduce batteryChargeLoop runtime if no battery is present 2022-05-15 18:31:26 +07:00
27fa58c418 A cratte biþ a smale boxe wiþ no leggys, whiche liueþ boþe in water and on londe. Hit biþ ofte tyme broune or grene or yelowe; or be hit tropyckal, hit may hauen dyuers coloures lyk reed, blewe, and blak. Tropyckalle crattes liuyn in trewes. 2022-05-15 16:45:51 +06:00
aabcaeaf46
Merge remote-tracking branch 'origin/master' into master 2022-05-15 17:26:43 +07:00
5a494b35cb
Color-less cargo crate 2022-05-15 17:26:25 +07:00
4be8ecee2d Merge remote-tracking branch 'origin/master' 2022-05-15 16:13:16 +06:00
429860bb5d Matter dust texture;
Matter recycler model/texture;
Gravitation field limiter and sensor textures;
Fixed matter capacitor parts matter color;
Singularity scanner now has a face;
2022-05-15 16:12:55 +06:00
1510a68d5b
Quick move in item monitor 2022-05-15 16:50:50 +07:00
140042bbd4
Cargo crates recipe and data 2022-05-15 16:14:43 +07:00
bf2caccecd
Industrial glass finishing up 2022-05-15 15:42:49 +07:00
3ea16e09ab
Storage power supplier inventory model 2022-05-15 15:06:56 +07:00
c67d0a54ca
Storage cable now has proper collision box 2022-05-15 15:06:19 +07:00
d6e90e4679
Drive viewer block shape 2022-05-15 14:56:40 +07:00
43e02f8c70
Storage power supplier block shape 2022-05-15 14:18:56 +07:00
07efb6ed85
Update datagen for previous commit 2022-05-15 14:13:13 +07:00
0c8363f3c7
Merge remote-tracking branch 'origin/master' into master 2022-05-15 13:53:19 +07:00
d9ce8ca3b5
Plasma weapon heating, hud and energy usage 2022-05-15 13:53:11 +07:00
dec110c16e Added storage cable texture;
Changed the color of matter in all item and block textures;
Added gravitation field limiter and gravitational field sensor textures;
Updated Portable gravitation stabilizer texture;
Added plasma ball projectile texture (Dbot, this, placeholder at least);
Added Storage power supplier model and texture, however it is not loaded (Dbot pls fix i forgor);
2022-05-15 01:01:33 +06:00
2314dbfa85
Colorable cargo crates 2022-05-15 01:15:35 +07:00
81d29999d7
Fix typo 2022-05-14 23:36:49 +07:00
833c5d2780
Storage power supplier menu 2022-05-14 23:35:30 +07:00
4dee77edbe
Storage importer now can receive items directly, fix item filter saving 2022-05-14 23:24:22 +07:00
69fdba7ea2
Reset slot counter when filter is updated 2022-05-14 22:56:27 +07:00
cce41508b8
Importer and exporter menus and filters 2022-05-14 22:52:29 +07:00
25916f920d
Plasma rifle fire sound 2022-05-14 22:31:43 +07:00
813a6f0ceb
Checkboxes! 2022-05-14 21:39:46 +07:00
aa6f28977b
Item Filter and storage bus menu 2022-05-14 20:58:36 +07:00
5b245ec564
Naming 2022-05-14 19:26:58 +07:00
bdb6aa1c21
Storage exporter 2022-05-14 19:18:10 +07:00
c6b68ad270
Split storage interface class 2022-05-14 18:55:34 +07:00
fffb44c9a0
ITEM_STORAGE shortcut 2022-05-14 18:45:30 +07:00
89c3b22913
Nerf max power storage of buses 2022-05-14 18:41:50 +07:00
3e66862de8
Storage import bus 2022-05-14 18:38:30 +07:00
cd622b0708
Move helpers out from interface 2022-05-14 18:18:42 +07:00
14c60033c3
Document little quirk with storage graph 2022-05-14 17:26:18 +07:00
2951f0f4e3
Fix storage had no it's own entity type 2022-05-14 17:23:08 +07:00
9a72ceeeb4
Fail fast on attempt to load drives in illegal state 2022-05-14 16:51:10 +07:00
af172dafe8
More storage work and fixes 2022-05-14 16:45:00 +07:00
42c0c49782
Plasma weapons but better™️ 2022-05-14 15:18:50 +07:00
15c4cfb488
kvector cancelled 2022-05-14 13:39:20 +07:00
9dc98b332a
Fix powered component power consumption being invalid 2022-05-10 21:50:16 +07:00
ba17a812e3
Storage power supplier block 2022-05-10 21:43:53 +07:00
45f63d4702
Half the stack is now actual half in item view 2022-05-10 19:52:22 +07:00
eb42291ee2
Use hashmap for maps with uuids
since they have uniform distribution
2022-05-10 19:50:22 +07:00
40f56e110b
Plasma projectiles tests and fixes 2022-05-10 19:32:41 +07:00
195ce7638b
Fix mekanism build 2022-05-10 17:51:02 +07:00
d62c308637
Storage cable translation string 2022-05-10 17:27:48 +07:00
01e3b2fb38
API description correction 2022-05-10 17:10:40 +07:00
6819866c48 Update storage system to use hashmap for partitioning 2022-04-26 15:16:25 +07:00
a7d11dae3f
staging 2022-04-26 11:26:29 +07:00
183bdd1118
Add storage cables, update matter node api 2022-04-09 16:08:58 +07:00
fc601fd783
Misc changes to drive pool 2022-03-29 21:45:27 +07:00
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
39096c0f14
Recreate android station menu 2021-12-31 15:33:14 +07:00
c14e955564
Rename .java to .kt 2021-12-31 15:33:12 +07:00
d923cff3f1
Instantly become android in creative 2021-12-31 14:03:36 +07:00
0a72458e91
Rename .java to .kt 2021-12-31 14:03:36 +07:00
11def73d10
Update cleanness of code 2021-12-31 13:47:02 +07:00
513f8afbe0
Fix chemical generator not burning fuel if it going to be exactly filling internal buffer 2021-12-31 13:44:11 +07:00
90a2d4f9ca
Add physical models to chemical generator and matter bottler 2021-12-31 13:40:35 +07:00
a8349b70d5
Merge branch 'master' of gitlab.com:DBotThePony/overdrive-that-matters into master 2021-12-31 13:19:02 +07:00
994863b9bc
New graph system, Matter interaction system rewrite
Port more code to Kotlin
Update Fraction to crunch down numbers with GCDs
2021-12-31 13:11:58 +07:00
b86f71b910
Rename .java to .kt 2021-12-31 13:10:29 +07:00
3183e13103
Burn fuel if buffer is less than 1 MtE 2021-12-29 16:36:52 +07:00
65179ca9e9
Suppress unused warnings 2021-12-29 16:34:02 +07:00
87deafd512
fix IMatteryEnergyStorage overloads being wrong 2021-12-29 16:33:27 +07:00
33d8556a27
Add devenv dependencies 2021-12-29 16:15:23 +07:00
6c8a427783
Fix shift clicking not working in chemical generator 2021-12-29 14:27:04 +07:00
328bca5982
Update matter scanner interface 2021-12-29 14:25:29 +07:00
4d4caed30d
Rename .java to .kt 2021-12-29 14:25:28 +07:00
a8811ae072
More soft Fraction.fromByteArray 2021-12-29 08:52:53 +07:00
752a3aeaea Chemical generator model complete; Fixed pattern monitor displaying incorrectly when placed on the ceiling; Fixed z-fighting on some models with decorative frames by giving them 0.5 pixel width; Changed framed carbon fibre block texture to one without frame for the time being; Fixed that one UV mistake i made on drive viewer model; Fixed a typo i made in drive rack's model that caused it's particles to display incorrectly. 2021-12-29 02:23:00 +06:00
1ea2361777
Open fraction classes, put burn time into progress gauge 2021-12-29 00:10:47 +07:00
1f026fd2e1
Add zeroing argument to percentage 2021-12-28 23:46:46 +07:00
394f387993
Fraction is now NaN capable 2021-12-28 23:45:03 +07:00
65aa3392ba
Now gauges render properly 2021-12-28 23:12:10 +07:00
f6057a73a6
Fix localToScreen 2021-12-28 22:42:34 +07:00
8384cb1306
Add battery slot to generator for charging 2021-12-28 22:37:22 +07:00
2d51a5e2c5
Fix battery bank not marking chunks dirty 2021-12-28 22:34:50 +07:00
eadf061f15
New interface prototypes 2021-12-28 22:18:47 +07:00
4f1f6e590f
Rename .java to .kt 2021-12-28 22:18:45 +07:00
ba87a286ad
rename 2021-12-28 20:10:46 +07:00
f6c80dcbd9
Minimally (not) working widget redo 2021-12-28 19:50:37 +07:00
fcd460ee38
Rename .java to .kt 2021-12-28 19:50:36 +07:00
0eaf13b1de
Chemical power generator, some kotlin extensions 2021-12-26 23:00:59 +07:00
f8f0ac27b4
When compacting, if value is 0 then make divisor 1 2021-12-23 23:43:15 +07:00
45132af065
god damn it 2021-12-23 23:41:26 +07:00
e58b5b725e
Fix compact minus of fractions were actually adding 2021-12-23 23:38:09 +07:00
26808f0ce8
Fix blockentity saving 2021-12-23 23:08:17 +07:00
6d78029af2
Kotlin, Unit tests, Fraction instead of BigDecimal 2021-12-23 22:46:25 +07:00
69defb2e62
Remove unused constructor 2021-12-23 11:49:51 +07:00
915ae6d6d6
Update version dependency to 1.18.1 2021-12-20 11:12:47 +07:00
70709aad5a
update locale 2021-12-03 12:48:55 +07:00
9e1650c70d
Better sleep conversion process 2021-12-03 12:34:56 +07:00
c9d3212a82
Don't take pills if player is in creative 2021-12-03 11:41:20 +07:00
5eb9599a26
Becoming android through sleeping 2021-12-03 11:40:42 +07:00
f16ea4159d
Suppress unusued warning 2021-12-02 07:55:20 +07:00
0fa73fb409
Make things compile on 1.18 2021-12-01 18:44:23 +07:00
eb1187bc7a
Apply migration map 2021-12-01 07:54:18 +07:00
4997714e43
Spinning singularities
Fixes #3
2021-11-21 14:04:38 +07:00
e47c370a96
Record history of energy passed in energy counter 2021-11-21 13:01:49 +07:00
5f73a18d9f
:lex: 2021-11-20 13:04:46 +07:00
68a084182f
Merge branch 'master' of gitlab.com:DBotThePony/overdrive-that-matters into master 2021-11-20 12:32:02 +07:00
08ce52906a -New drive rack model.
-New energy counter model.
-New item monitor model.
2021-10-18 15:44:37 +06:00
8cf0df6f59
Even more recipes 2021-10-12 21:23:36 +07:00
6f7ab85692 fix 2021-10-06 13:01:17 +06:00
9563a54a8d -Added black hole item TEXTURE because Gearshock thinks it would be cooler this way.
-Optimized block textures where it is possible
2021-10-06 12:33:32 +06:00
91b83dadd1
Avoid division 2021-10-03 15:07:52 +07:00
9212c83074
Add more recipes 2021-09-19 18:48:00 +07:00
2e7d7c2ef6
Fix redstone signal breaking on save-load 2021-09-19 18:45:43 +07:00
34ced36ba0
Ignore unused 2021-09-18 17:33:43 +07:00
ee2c3241d4
Fix MatteryContainer not adding items properly 2021-09-18 17:14:57 +07:00
d9baced685
Improve some grid logic 2021-09-18 13:51:04 +07:00
f8e0443b84
Genericify grid 2021-09-15 18:38:26 +07:00
44bb2c6c93
Fix old capabilities pointers being valid after invalidating them 2021-09-12 17:45:04 +07:00
e6b7308c3b
Energy counter test 2021-09-11 23:36:46 +07:00
a84aba2b39
Add todo comment 2021-09-10 17:43:06 +07:00
249cd46957
Fix issues related to ticking events 2021-09-10 12:19:31 +07:00
65ee43fd11
Machine redstone controls 2021-09-10 11:31:45 +07:00
e74ce49694
Annotate? 2021-09-10 10:23:32 +07:00
27b721b22e
Implement extended reach icon 2021-09-10 09:58:56 +07:00
f5b35349ff
Merge remote-tracking branch 'origin/master' into master 2021-09-10 09:56:56 +07:00
754ed25516
Make android feature match constructor of Menus (simpler) 2021-09-10 09:55:49 +07:00
3a61be004b Merge branch 'master' of https://gitlab.com/DBotThePony/overdrive-that-matters 2021-09-10 08:54:39 +06:00
89d019b8ad extended reach icon 2021-09-10 08:54:15 +06:00
ab28713db9
Android research better names 2021-09-10 09:51:30 +07:00
54facf02c6
Android extended reach 2021-09-10 09:49:02 +07:00
3358b5247e
Fix drive viewer blockstate improperly updating 2021-09-09 14:02:49 +07:00
61b87e02f0
Rename object into stack 2021-09-09 13:33:45 +07:00
fc7bc8ec4a
Merge remote-tracking branch 'origin/master' into master 2021-09-08 22:50:31 +07:00
3fd6de14d1
Move capabilities to sub packages 2021-09-08 21:32:36 +07:00
48f4d8c917
Rename IMatteryDrive impl to AbstractMatteryDrive 2021-09-08 20:44:51 +07:00
b1ad7a8ac6
Generify mattery drive 2021-09-08 20:44:16 +07:00
b3e2b30e72
Rename ItemStackStack to ItemStackWrapper 2021-09-08 18:38:47 +07:00
f4929ea25d
Remove debugprint 2021-09-08 18:33:51 +07:00
7e9d7ca8f8
Rename IStorageObject to IStorageStack 2021-09-08 18:23:11 +07:00
0806794722
More generics on storage system 2021-09-08 18:22:45 +07:00
56a45b9ad3
Storage system initial commit 2021-09-08 15:05:55 +07:00
9a52043443 Added a gravitational disruptor item model 2021-09-04 03:53:32 +06:00
f6e48e550e Added Matter capacitor parts.
Added titanium ore stuff
2021-09-03 18:55:53 +06:00
7ff41bbda2
Better wording in description 2021-09-03 15:48:12 +07:00
92f1219b6a
Improve blackhole explosion, rendering server responsive when one is collapsing 2021-09-03 15:29:46 +07:00
0d3e7c4112
Update description of disruptor 2021-09-03 14:17:36 +07:00
0a6dbb3b50
Gravitational Disruptor and black hole explosions 2021-09-03 14:02:50 +07:00
5b9760c2ed
Change blackhole gravity formula to square, change model to singularity 2021-09-03 12:20:11 +07:00
a39dd28199
Merge remote-tracking branch 'origin/master' into master 2021-09-03 11:47:20 +07:00
cc51a44070
Tritanium ore 2021-09-03 11:47:03 +07:00
d41fb35fb1 Added a model for cargo crate.
added textures for matter capacitor parts.
changed cargo container block textures.
2021-09-02 17:35:13 +06:00
13ae6d597b
Merge remote-tracking branch 'origin/master' into master 2021-09-02 16:01:49 +07:00
b81c76e2e5
Add cargo crate 2021-09-02 16:01:38 +07:00
8b3e303b21 Updated matter cable texture.
Updated drive viewer model.
Added new models/textures for crafting components.
2021-09-02 14:04:21 +06:00
ac0c72abb1
Make registries be statically initialized 2021-09-02 14:21:47 +07:00
bd02a3186d
Update locale to match minecraft style 2021-09-02 14:06:03 +07:00
e4a7ca35f7
Localization for items 2021-09-02 14:03:26 +07:00
107c1e2ed2
More matter capacitors 2021-09-02 13:57:33 +07:00
16259a5d7e
Damage for twice of player's max health instead when becoming android 2021-09-02 00:14:54 +07:00
b3330a2f1f
Some crafting ingredients and first recipes 2021-09-01 20:31:50 +07:00
167490382c
Actually hurt the player 2021-09-01 16:30:06 +07:00
288336ae18
Merge remote-tracking branch 'origin/master' into master 2021-09-01 16:26:22 +07:00
9d13db4298
Drive viewer "drive" blockstate property 2021-09-01 16:25:32 +07:00
ccadc1647f drive viewer blockstate models 2021-09-01 00:05:05 +06:00
4f8aaaa019
Merge branch 'master' of gitlab.com:DBotThePony/overdrive-that-matters into master 2021-08-31 19:45:20 +07:00
f0fa1a2d35
Remove auto generated file 2021-08-31 19:44:02 +07:00
387111ee64
Drive viewer working state and power consumption 2021-08-31 19:42:05 +07:00
c101edaee4
Black hole improvements 2021-08-30 21:28:55 +07:00
f9fb9124b7
Black hole renderer 2021-08-30 20:00:07 +07:00
a30e6dcb9b Added an "error" model for Matter decomposer, it's basically a copy of idle model because decomposer's blockstate keeps resetting after every build and changing both idle and error to idle model won't work. 2021-08-30 15:26:31 +06:00
2573a82559 Brain fart 2021-08-30 13:50:20 +06:00
03afe7baad
Move render helpers to render package 2021-08-30 11:50:14 +07:00
af828c1296
Move screen package to client package 2021-08-30 10:50:09 +07:00
b304a5f12a
Some tweaks to black hole 2021-08-30 10:42:41 +07:00
fde2ab46ee
Remove auto generated files 2021-08-30 10:26:24 +07:00
7af10649ef
Merge remote-tracking branch 'remotes/origin/master' into master 2021-08-30 10:25:05 +07:00
8fe2d8daa8
Black holes 2021-08-30 10:22:58 +07:00
bf49fc030d Added a model for matter bottler.
Added models for condensation drives.
Added a model for drive viewer.
Added container block textures.
Added Tritanium block textures.
Added item names to container blocks.
Changed Creative matter capacitor to look more like creative battery.
2021-08-30 04:41:19 +06:00
ac7bcc0f75
Add gitkeeps 2021-08-29 20:02:01 +07:00
9ecbad9f48
Make crates mineable 2021-08-29 19:35:36 +07:00
baa789b77a
More building blocks 2021-08-29 19:22:59 +07:00
a246cf5e25
Add crates? 2021-08-29 18:54:41 +07:00
300c27d366
Split worker class 2021-08-29 18:27:20 +07:00
26a1388c3d
Add working state to bottler 2021-08-29 18:14:08 +07:00
a5fe020564
Merge remote-tracking branch 'origin/master' into master 2021-08-29 17:02:34 +07:00
3506e661b1
Add second variant of condensation drive 2021-08-29 16:49:02 +07:00
1a4c1b468a
Fix quick move duping everything 2021-08-29 16:38:07 +07:00
b3b1a03136
Filter of autopickup for condensation drive 2021-08-29 16:30:34 +07:00
f1f1ce897c
Implement clone in drive menu 2021-08-28 15:23:44 +07:00
b0e9a96e50
Reasonable interaction with drive viewer 2021-08-28 14:47:01 +07:00
fa72e6ec03
Working interaction with drives 2021-08-28 10:12:13 +07:00
de22ab54c0
More test code regarding drives 2021-08-27 18:53:25 +07:00
998ce95f1c
Change back id to being UUIDs 2021-08-27 14:33:36 +07:00
05bed3a737
Drive viewer test code 2021-08-27 13:16:54 +07:00
2166119a75
Improve drive testcode 2021-08-26 10:41:48 +07:00
e7e12bed8c
Condensation drive test 2021-08-25 22:53:17 +07:00
76de8549aa fixed an error in matter decomposer's model, again. 2021-08-25 02:42:23 +06:00
1650e63e20 Merge branch 'master' of https://gitlab.com/DBotThePony/overdrive-that-matters 2021-08-24 21:42:25 +06:00
4613b5549e fixed an error in matter decomposer's model 2021-08-24 21:41:59 +06:00
d7a62f6d3c
Merge remote-tracking branch 'origin/master' into master 2021-08-24 22:41:06 +07:00
495af87688
Fix polluting global item renderer Z offset 2021-08-24 22:40:43 +07:00
e5f81569f9
Better research screen 2021-08-24 22:28:44 +07:00
f388639fc6
Primitive research "tree" 2021-08-24 22:09:38 +07:00
a5af0a4a00
Black background for android research "tree" 2021-08-24 21:25:06 +07:00
27945b62dc
Don't offset inner render 2021-08-24 21:24:47 +07:00
e79bdb4326
Scissor and draggable canvas panel for android research window 2021-08-24 21:08:26 +07:00
e7b810f1a8
Fix MtE burn not awarded for outer battery 2021-08-24 19:16:44 +07:00
dc76513dc8
Proper stat casing 2021-08-24 19:02:44 +07:00
9f7cc25ef5
Stats! 2021-08-24 19:01:34 +07:00
7c5bfb1b36
Nanobots, Regeneration and Armor features and research 2021-08-24 18:14:53 +07:00
39795e2659 Added Nutrient paste in language file, because it was not here for some reason 2021-08-24 14:15:53 +06:00
c45c7045d9
Disallow quick regeneration 2021-08-24 14:50:48 +07:00
64d41e450a
Make builder also build research entry, add blocking research 2021-08-24 14:19:18 +07:00
43790bbedc
Make button bigger 2021-08-24 12:04:19 +07:00
5d4842701e
Dock children in one pass, to match gmod api (and fix docking issues) 2021-08-24 12:01:19 +07:00
002b335f47
Matter bottler, UV winding order for widgets, EditablePanel#asGrid 2021-08-24 11:58:26 +07:00
eab7e1de10
Matter bottler 2021-08-24 00:59:22 +07:00
a26ed5ec41
Ignore depth buffer when drawing screens (panels are properly Z sorted), partially fixes issues with TOP 2021-08-23 22:42:38 +07:00
2753997898
Revert "Increase Z value of GUIs"
This reverts commit fd3f22da29.
2021-08-23 20:54:41 +07:00
fd3f22da29
Increase Z value of GUIs 2021-08-23 20:06:03 +07:00
c45435a6b0
Fix android station missing widgets 2021-08-23 19:44:34 +07:00
95a96c35ca
Pattern fillage gauge 2021-08-23 19:39:27 +07:00
eaa8c11b58
debugprints 2021-08-23 18:42:02 +07:00
5af92b5e24
Fix is_hovered on edges 2021-08-23 18:41:34 +07:00
14f7115639
Display stored matter in network 2021-08-23 18:36:55 +07:00
4f2fede296
Automate things with FlexGridPanel 2021-08-23 18:30:49 +07:00
ae7629548a
FlexGridPanel test 2021-08-23 17:47:17 +07:00
68c4f83fc6
Fix slot overlap in battery bank menu 2021-08-23 15:55:04 +07:00
0a41c09569
Remove debug code 2021-08-23 14:56:05 +07:00
3098a08d6e
Attack speed overclocking, improve research builder 2021-08-23 14:52:12 +07:00
899723eeb5
MODIFIER_NAME should be static 2021-08-23 14:24:13 +07:00
b1373c4360
typo 2021-08-23 14:24:00 +07:00
9ff3fefd50
Remove debugprint 2021-08-23 11:52:47 +07:00
1bb85a6d73
Merge remote-tracking branch 'origin/master' into master 2021-08-23 11:46:34 +07:00
0365c09398
Feature modifiers and levels, limb overclocking, research improvements 2021-08-23 11:46:13 +07:00
04f09a0544 Added new block textures/models: carbon fiber, container block. Added a cargo container texture. Added a texture for nutrient paste 2021-08-23 10:16:34 +06:00
38d34de609
Update code to work on dedicated servers 2021-08-22 23:31:43 +07:00
c66c64f87a
Research icons? 2021-08-22 23:21:29 +07:00
bba2a1d9e0
More abstract and straightforward android research system 2021-08-22 22:45:36 +07:00
6769af52f5
More research work 2021-08-22 20:04:47 +07:00
9e726e1779
Research render test 2021-08-22 19:22:30 +07:00
20a0a96c84
Fix nutrient paste missing from creative tab 2021-08-22 17:13:45 +07:00
5c72218cf8
Merge remote-tracking branch 'origin/master' into master 2021-08-22 17:12:10 +07:00
b7026c50b0
Make scrolling work 2021-08-22 17:11:53 +07:00
05a0b196c4
Polishing 2021-08-22 16:51:25 +07:00
7bd1de8171
Reimplement pattern panel menu 2021-08-22 16:43:19 +07:00
b65bbab767
Allow androids to be withered 2021-08-21 21:18:52 +07:00
6f68a2b1d6
Add battery and mater capacitor models 2021-08-20 22:02:04 +07:00
22fac17186
Fixed bad row gap in matter capacitor bank 2021-08-20 22:01:06 +07:00
a0af840ab9
Fix MatteryContainer of capacitor bank getting recreated 2021-08-20 22:00:43 +07:00
92bde060f6
Delete generated assets 2021-08-20 21:31:54 +07:00
23e4733a22
Move itemstack rendering to submethod 2021-08-20 19:56:06 +07:00
1b4226f0d5
Everything Doesn't Works (move stuff to panels) 2021-08-20 19:48:28 +07:00
c35c99b73c
Mattery widgets panels test 2021-08-20 18:29:27 +07:00
483b26449b
Moderately working panels 2021-08-20 18:09:20 +07:00
38495e59c1
Mattery screen rework for panels test 2021-08-20 16:49:12 +07:00
923d19bcc2
Panels test 2021-08-20 11:35:42 +07:00
500640807e the machines are now DESATURATED
I STOLE YOUR COLORS MUHAHAHAHAHAHAHAHA-
2021-08-19 23:44:53 +06:00
1b73eea70a
Render helper 2021-08-19 22:16:50 +07:00
68930672a4
Android feature research test 2021-08-19 20:44:43 +07:00
74658e3a69
Blockstate values for presence of batteries/capacitors 2021-08-19 17:48:24 +07:00
e4cfa88437
Nutrient paste 2021-08-19 17:07:02 +07:00
45932e5e4b
Android features registry and impl, better android networking 2021-08-19 17:02:18 +07:00
4f00113836
remove debugprint 2021-08-19 16:42:59 +07:00
1cff933373
Move android caps to subpackage 2021-08-19 13:59:28 +07:00
54eaf68a19
Rebalance android values 2021-08-19 11:43:29 +07:00
e9401115d6
Better power bar rendering of android 2021-08-19 11:31:54 +07:00
6cc17216a3
Better android charge handling 2021-08-19 11:23:49 +07:00
01f3268e68
Tick on client 2021-08-19 10:52:44 +07:00
be47a36cc3
Merge remote-tracking branch 'origin/master' into master 2021-08-19 10:40:34 +07:00
9c3ef93695
Cleaner code 2021-08-19 10:38:03 +07:00
017478b312
Display custom You died message as android 2021-08-19 10:33:52 +07:00
33a2000705
Make setChanged be more robust 2021-08-19 00:42:35 +07:00
0d27b058aa Fixed some items appearing in the inventory incorrectly. 2021-08-18 23:29:52 +06:00
86f2e98df3
10 ticks of swimming 2021-08-19 00:27:25 +07:00
73b4c161ac
Androids can not have some of status effects 2021-08-19 00:26:45 +07:00
4b94c64b4e
Also no swimming 2021-08-18 23:55:42 +07:00
a6e00d22e8
Water handling in android capability 2021-08-18 23:49:38 +07:00
316c30abb8
Registry polishing, make matter registry working and being synced in multiplayer 2021-08-18 20:44:14 +07:00
4668bcc71c
Update assets from last commit 2021-08-18 19:18:08 +07:00
901a4fa61a
Merge remote-tracking branch 'origin/master' into master 2021-08-18 19:10:00 +07:00
1b7cb1d298
Fix MatterySlot#onTake didn't call MatteryContainer#setChanged(...) 2021-08-18 19:09:43 +07:00
928fdc889f Added active/inactive/halted variants of the blocks.
Added previously missed matter panel.
2021-08-18 18:09:35 +06:00
02bbef97bd
Remove generated resource 2021-08-18 19:05:53 +07:00
5844eee9f5
Add missing loot tables 2021-08-18 18:56:35 +07:00
a00e7cdc35
Fix task updates not triggering chunk save 2021-08-18 18:55:59 +07:00
a976947a2a
Fix not saving matter cap of matter replicator 2021-08-18 18:41:11 +07:00
189dcbe60f
remove auto generated assets 2021-08-18 18:40:45 +07:00
090d2ac385
Update state of pattern storage 2021-08-18 18:10:23 +07:00
51faf655b9
Set state to error even if throttle is minimal 2021-08-18 17:55:51 +07:00
3f5d1bb129
delete generated assets 2021-08-18 17:40:19 +07:00
b929dcdb3a
Add auto generated pattern storage models and blockstate 2021-08-18 17:21:26 +07:00
1b8f3a5030
Android station shape 2021-08-18 16:43:07 +07:00
d3286c30de
Worker blockstate property 2021-08-18 16:40:05 +07:00
c719917035
Skip tick if throttle is still above zero 2021-08-18 16:15:14 +07:00
78c101f6a3
dum 2021-08-18 16:07:42 +07:00
8a6e51d804
test code for blockstates of pattern storage 2021-08-18 15:25:35 +07:00
778d1310b9
Move xcf to LFS 2021-08-18 15:08:57 +07:00
1fd093d07d
Auto generated shapes for blocks 2021-08-18 15:02:45 +07:00
f04a353ab6
Added "halted" and "inactive" versions of machines.
Added new models/textures for following machines:
Matter replicator, Matter scanner, Matter panel, Matter decomposer.
2021-08-18 10:10:55 +07:00
4c6e10ac53
Fix matter registry gets invalidated on second join in singleplayer 2021-08-18 00:20:16 +07:00
49a6d3a3e2
Add button sound when clicking on stacks in pattern panel 2021-08-18 00:08:15 +07:00
600463208f
Matter task viewing and managing 2021-08-18 00:01:37 +07:00
0c93939766
Try to get around palette issue 2021-08-17 20:48:26 +07:00
ed1d9b150c
Creative pattern drive 2021-08-17 19:40:53 +07:00
ac3204b2f3
Custom creative tab 2021-08-17 19:16:56 +07:00
69a67012c4
Add setChanged slot based, add proper grid notifications and network notifications 2021-08-17 19:02:03 +07:00
7ba1cca72d
Resolve most of issues with pattern network 2021-08-17 16:25:49 +07:00
b8bfddfe97
Fix crash when something tries to access itemhandler of pattern storage 2021-08-17 14:54:39 +07:00
8dd27d4368
Merge branch 'develop' of gitlab.com:DBotThePony/overdrive-that-matters into master 2021-08-17 13:36:15 +07:00
3b313ec162
Pattern monitor and Matter replicator! 2021-08-17 13:35:11 +07:00
da88d111dd ADDED MORE GRAPHIX 2021-08-17 12:15:16 +06:00
25bc104421
Make IMatterGridCell be a capability 2021-08-16 14:55:37 +07:00
117d1ea461
Attach extra data to jobs 2021-08-16 14:26:43 +07:00
cd1e8adfa1
Move matter stuff to matter package 2021-08-16 14:21:59 +07:00
0cc978d1c2
Simplify and add item handler to everything 2021-08-16 12:29:57 +07:00
aedb169eca
Patterns, Pattern Storages and Matter Scanner! 2021-08-16 11:45:55 +07:00
9e2d2db711
Move subclass to entities 2021-08-15 20:27:58 +07:00
8498bfdbcf
Shapes 2021-08-15 20:24:55 +07:00
61add16d1e
Matter cables 2021-08-15 20:00:08 +07:00
71e83874c0
simplify code 2021-08-15 11:08:54 +07:00
2328cd75b6
Assets for battery and matter capacitor banks 2021-08-15 00:12:40 +07:00
0471c27c44
Assets for battery and matter capacitor banks 2021-08-15 00:12:34 +07:00
52ae451a23
Get rid of up and down facings 2021-08-15 00:03:07 +07:00
1534eae1ab
Fix stackability of matter capacitor 2021-08-14 23:18:07 +07:00
beca7b88c2
Update color of energy 2021-08-14 23:16:53 +07:00
4e971b3e0b
Matter grid, matter capacitors and banks! 2021-08-14 23:11:46 +07:00
84929d4c91
Update widget gauges styling 2021-08-14 12:39:40 +07:00
4a6c50e5a9
update widgets 2021-08-14 12:38:03 +07:00
010fd38e92
update widgets 2021-08-14 12:37:34 +07:00
d5a0c8acd2
Progress widget 2021-08-14 12:27:31 +07:00
1067aa0bd5
Matter level widget 2021-08-14 00:36:29 +07:00
3f3e043c1d
Widgets menu composing method test 2021-08-13 23:50:00 +07:00
bafe6c23d9
Matter decomposer! 2021-08-13 19:57:15 +07:00
a33879f81e
Matter registry and basic scanning 2021-08-13 00:57:27 +07:00
51e424d9af
Battery bank! 2021-08-12 01:12:58 +07:00
7283c9a1ae
Batteries 2021-08-11 22:25:33 +07:00
cc05975c2f
Translations! and formatters 2021-08-11 20:52:56 +07:00
dac3a1cabd
Pill item test, fix capability going haywire when changing dimension 2021-08-11 18:59:50 +07:00
56e058998c
Move registry to a subclass 2021-08-11 17:24:07 +07:00
30cba0ca18
Implement quick move in android station menu 2021-08-11 16:24:15 +07:00
c980bdc272
Move stuff to appropriate places 2021-08-11 15:41:55 +07:00
610e01f0ea
react to invalidate caps 2021-08-11 15:00:18 +07:00
5c8657f5b3
Persistent android capability 2021-08-11 14:53:59 +07:00
7087705f22
Networking test, player capability is now networked to them 2021-08-11 12:55:18 +07:00
8cec0e3724
Separate screen, add power gauge draw 2021-08-10 16:37:47 +07:00
fb727a55bb
Android station graphics 2021-08-10 15:39:35 +07:00
f440a593f3
Abstraction, separation, battery containers 2021-08-10 15:30:47 +07:00
e8665ddde2
Tags and LootTable test, added drops 2021-08-09 22:08:35 +07:00
839313bde4
a 2021-08-09 19:42:17 +07:00
e5f0e563a4
Data container test, add graphics to android station 2021-08-09 19:31:36 +07:00
42044ff74a
Android station interaction test 2021-08-09 15:07:15 +07:00
8c9abc42ce
a 2021-08-09 12:22:47 +07:00
9e537f464a
Move capability registry 2021-08-09 12:13:43 +07:00
7e57fefcaa
Split, implement own energy capability 2021-08-09 12:09:18 +07:00
8b435f1d91
menu test 2021-08-08 20:59:00 +07:00
5f066b007a
more capability tests 2021-08-08 15:44:18 +07:00
27ee58f193
Block, BlockEntity test 2021-08-08 14:29:29 +07:00
8e5e451d4c
add android station block? 2021-08-07 20:01:19 +07:00
91834d9f5e
первые шаги 2021-08-07 19:24:47 +07:00
4b1daa783a
tab 2021-08-07 16:54:28 +07:00
63294a4cfe
начальный коммит 2021-08-07 14:42:03 +07:00