Commit Graph

2195 Commits

Author SHA1 Message Date
70f38c7e54 Remove unnecessary "thrusters" on tritanium armor 2023-04-17 02:40:21 +06:00
7eaf180827 make 2023-04-17 02:37:48 +06:00
17abc2e29b Item textures for simple trarmor 2023-04-17 02:37:05 +06:00
8f8f7db0a8 Simple tritanium armor textures
I am too afraid to touch things in it to add a SIMPLE 2D LAYER ARMOR so i'll leave actually adding it
2023-04-17 01:47:37 +06:00
d3f97bfaa3
Move procedural exopack slot upgrade to proper subpackage 2023-04-16 21:18:37 +07:00
85aa5e7ce9
hmm 2023-04-16 19:30:52 +07:00
2ba1edf88d
Fix imports 2023-04-16 19:15:04 +07:00
cdd6ef9eb3
Sort item classes to subpackages, correct some code 2023-04-16 19:10:27 +07:00
c5d9ba34dd
Simple Tritanium Armor, some balancing to regular tritanium armor 2023-04-16 12:43:20 +07:00
3976c6da56
Make tritanium armor absorb 3/4 of cosmir radiation 2023-04-16 10:11:32 +07:00
e2a300259c
Swap execution order in moveEnergy 2023-04-16 10:05:46 +07:00
b7434d632c
Try to move as much as possible energy between energy storages 2023-04-16 00:09:16 +07:00
a65fb6d829
Merge remote-tracking branch 'origin/master' into master 2023-04-15 23:47:48 +07:00
8d63488d72
oh my god are you serious? 2023-04-15 23:46:47 +07:00
1828704859
Remove storage blocks from machines list 2023-04-15 15:41:05 +07:00
ba326b9fb8
Add profiled energy storage to most of machines 2023-04-15 14:09:24 +07:00
8afa21ae16
Profiled energy storage! 2023-04-14 23:58:38 +07:00
8c32a2cd7a
Put constants in decimal cache 2023-04-14 23:58:17 +07:00
20bbaec62a
Kotlin? Hello? 2023-04-14 22:45:39 +07:00
5df3a06fcb Perish 2023-04-14 19:20:25 +06:00
60ac4d60d2 did i deadass rollback this 2023-04-14 19:19:26 +06:00
addd088cc4
Sort matter json namespaces according to mod order 2023-04-14 14:59:02 +07:00
a51398e220
Fix mattery gui tracking last mattery player state wrong 2023-04-14 13:06:13 +07:00
130240e02a
Tritanium bars, but with proper model 2023-04-14 12:59:33 +07:00
de972f1688 Merge remote-tracking branch 'origin/master' 2023-04-13 23:34:28 +06:00
90fa7593f8
Carbon mesh recipe 2023-04-13 23:41:57 +07:00
2a910d2f96 OM NOM NOM 2023-04-13 22:28:35 +06:00
56a8831364 Merge remote-tracking branch 'origin/master' 2023-04-13 21:54:36 +06:00
bd357dad5f
Add is_primed property to hammer 2023-04-13 22:53:54 +07:00
951df4a7d1 explosive hammer model 2023-04-13 21:06:39 +06:00
08ca69fb0f
Merge remote-tracking branch 'origin/master' into master 2023-04-13 21:08:04 +07:00
8760fc3ec0
Explosive Hammer 2023-04-13 21:07:29 +07:00
f0076aca99
Fix EMP damage missing itemstack 2023-04-13 19:23:25 +07:00
ff4c24d5f6
Fix EMP damage not being actually dealt 2023-04-13 19:23:06 +07:00
607512cf1b Texture updates 2023-04-11 23:01:57 +06:00
50b19c3a31 Make shield use reinforced stuff too, also more edits 2023-04-11 04:27:11 +06:00
89847ac34a texture stuff 2023-04-11 04:19:29 +06:00
6a9df1d79b Liquid running gif 2023-04-11 04:06:53 +06:00
fc27199ce2
а где 2023-04-10 17:08:29 +03:00
3870428f5d
окно в европу 2023-04-10 16:58:51 +03:00
0bbe07f921
Fix non stackable items not getting moved to filtered slots first 2023-04-10 19:26:45 +07:00
9a1323ba46 AEUUGHH 2023-04-10 02:30:46 +06:00
8093d314d7 b 2023-04-10 02:28:56 +06:00
cf5d0455cf a 2023-04-10 01:22:23 +06:00
5e444300a1 Fluid tank is now transparent 2023-04-08 20:43:05 +06:00
d92dde8966
Use FluidUtil.interactWithFluidHandler 2023-04-08 01:40:14 +07:00
85ed4802f4
lol 2023-04-07 20:13:28 +07:00
13bfa7f2b2
Add datagen for fluid capsule and fluid tank 2023-04-07 20:11:34 +07:00
c3568a7fc1
Фиксим гигаприколы с IFluidHandler 2023-04-07 19:53:30 +07:00
56f3395c47 Oops 2023-04-07 18:50:14 +06:00
cc1b944eba Fluid tank and capsule 2023-04-07 18:48:14 +06:00
0eb9d99e3b Mesh and Reinforced Tritanium textures 2023-04-07 18:12:02 +06:00
509630ca35
More lenient "fill" checks 2023-04-06 15:16:39 +07:00
7ce73bdb52
Make fluid tanks drop item contents when broken 2023-04-06 15:13:32 +07:00
90f345a2d9
Fluid tanks
general improvements to SI prefix formatter
networking regarding fluid stacks
Own fluid handler implementations
2023-04-06 15:07:11 +07:00
82e410ad33
Use onItemUseFirst 2023-04-02 15:10:13 +07:00
516de507e4
Fluid capsules test 2023-04-02 14:48:28 +07:00
6c4c40073e
Merge remote-tracking branch 'origin/master' into master 2023-03-28 09:06:19 +07:00
7d5a585897 perish 3 2023-03-27 18:55:21 +06:00
828b8d1039 Add a slight animation to Android station's holograms + LET IT GLOW 2023-03-27 18:53:55 +06:00
8928e8e31b Perish 2 2023-03-27 18:27:57 +06:00
ae622739b9 Revert "Perish"
This reverts commit 5b0988f08e.
2023-03-27 18:18:05 +06:00
51c23b425c Cargo crates texture update 2023-03-27 18:17:14 +06:00
5b0988f08e Perish 2023-03-27 18:13:46 +06:00
42dcd22043
hmm 2023-03-27 18:34:20 +07:00
2752a82225 Active engine model (WIP) 2023-03-26 19:18:12 +06:00
77cb483774 Oops 2023-03-26 17:05:22 +06:00
cbde740747 ACKSHUALLY 2023-03-26 16:53:01 +06:00
d373393a5c
use array 2023-03-26 15:42:44 +07:00
faf43657fc
Androids no longer get hunger from "eating" raw food 2023-03-26 15:35:48 +07:00
7869d686f7
Fix crash caused by panel removing itself during tick 2023-03-26 15:16:16 +07:00
dd7ec5d839
CAGO 2 2023-03-25 23:05:43 +03:00
c81f181c46 Merge remote-tracking branch 'origin/master' 2023-03-25 23:39:27 +06:00
44d4c6bbbe Tritanium bars (pls fix) 2023-03-25 23:39:12 +06:00
a7dbae85ab Essence storage funni 2023-03-25 23:38:20 +06:00
20f7ef45ed Matter Reconstructor 2023-03-25 23:37:41 +06:00
a1fd948266
Add missing auto align to curios panel in matter reconstructor 2023-03-25 21:20:56 +07:00
581f337198
Don't use Streams.concat because they don't improve performance here 2023-03-25 20:51:29 +07:00
b4aee84249
Specify battery bank item handler as inputOutput 2023-03-25 20:38:55 +07:00
2bdefcf3c4
Specify all sides as input/output if inputOutput is present 2023-03-25 20:37:43 +07:00
f683f5acf8
Allow to extract matter containers from matter capacitor bank 2023-03-25 20:37:20 +07:00
065dd8bbe6
Add item configuration to matter capacitor bank 2023-03-25 20:27:48 +07:00
37400a2d5d
Rename item handler/energy config classes 2023-03-25 20:16:39 +07:00
ed04506507
Add item, energy and redstone configs to rest of machines 2023-03-25 20:15:21 +07:00
2da70e777f
Use type specific methods 2023-03-25 12:22:42 +07:00
6cc5659c43
Make menu widgets be just containers for synchronized fields 2023-03-25 11:33:27 +07:00
0902c445f6
Avoid excessive re-checks at the same tick 2023-03-25 09:16:11 +07:00
d21a4653e1
Matter reconstructor proper GUI 2023-03-25 09:09:46 +07:00
9adf18cd76
Use hash map for sideless caps 2023-03-25 00:56:11 +07:00
65c9a83b81
optimize imports 2023-03-25 00:34:32 +07:00
5b36988ac1
Rename itemrepairer to matter reconstructor internally everywhere but resource location 2023-03-25 00:31:55 +07:00
df130211c3
Add matter reconstructor controls 2023-03-25 00:30:17 +07:00
917a498e1e
Make matter reconstructor work only with anvil repair items by default 2023-03-25 00:20:28 +07:00
2f770e6e70
Account research percent of patterns in system in matter reconstructor 2023-03-25 00:11:35 +07:00
013fc649b2
Structurize decorative recipes 2023-03-24 23:53:51 +07:00
d2da3535c1
Clarify variable 2023-03-24 23:32:14 +07:00
11e3ff5161
Nerf matter capacity of matter reconstructor 2023-03-24 23:31:16 +07:00
72d4cdf29b
Move JsonArraySpliterator to proper package 2023-03-24 23:30:29 +07:00
66140d33a2
Item repairer recipe 2023-03-24 23:28:06 +07:00
d1978d7e04
Pattern panel now properly react to removed replication tasks 2023-03-24 20:59:05 +07:00
c6ded6b134
Fix displaying the same gauge twice 2023-03-24 20:37:30 +07:00
5f16804feb
New graph implementation 2023-03-24 20:25:35 +07:00
ebc41b808a
Merge remote-tracking branch 'origin/master' into master 2023-03-23 19:12:59 +07:00
f0caf66b68
Fix containerhandler stack size logic 2023-03-23 15:15:04 +07:00
2b4a8ec2c4
:sip: 2023-03-23 08:13:54 +07:00
5b1d52489e
CombinedItemHandler no longer checks underlying handlers if they are mattery container handlers 2023-03-23 08:05:04 +07:00
d47e5b3d7a
ConfigurableItemHandler now has inputOutput variant 2023-03-23 08:04:41 +07:00
e3993f439e
Item repairer block 2023-03-22 23:48:23 +07:00
aa31ff4cce
Fix wrong bounds operations when extracting matter from grid 2023-03-22 17:49:46 +07:00
9f6927cb8a
Multiplication of matter values 2023-03-20 18:06:08 +07:00
0481507217
Battery bank a bit smarter distribution 2023-03-20 18:05:57 +07:00
ec99243b15
Increase ZPM matter values again 2023-03-20 14:14:25 +07:00
198c9b4aa3
essence storage block shape
оно компилится и похуй
2023-03-19 19:05:20 +03:00
8c3eabb3bd ship wreckage structure 2023-03-19 07:36:18 +06:00
b57b954e5c essence storage glows oooo 2023-03-19 00:13:40 +06:00
f2dbe915d4 Merge remote-tracking branch 'origin/master' 2023-03-18 22:44:04 +06:00
3f2deae863 essence storage and essence servo 2023-03-18 22:40:52 +06:00
0de73d9eb2
Remove leftover phantom denied spawn trigger 2023-03-18 23:24:45 +07:00
75186cc272 METAL JUNK RU!! ! 2023-03-18 22:04:20 +06:00
89c2a99dfe METAL JUNK TEXTURE 4!!! ! !!!! 2023-03-18 21:57:40 +06:00
38e4c078fe
Fix health bar rendering when it shouldn't 2023-03-18 20:57:23 +07:00
04c295a359
Semantic fix for remove of MutablePredicateIterator 2023-03-18 16:29:42 +07:00
9f78291b79
Remove "phantom not spawned" achievement 2023-03-18 16:24:22 +07:00
ce224d6fe7
Remove the most useless mob in the game from ever spawning when not asked to 2023-03-18 16:20:23 +07:00
4068444e63
Buff attack boost even more 2023-03-18 15:28:03 +07:00
fcd1de644a
Fix nanobots armor almost instantly regenerating all armor layers 2023-03-18 15:27:15 +07:00
24aa9bfcbc
Add missing ∞ to quantum creative battery 2023-03-18 15:22:46 +07:00
e01d319517
Typo 2023-03-18 15:21:13 +07:00
90e6fe5f5d
Greatly buff android attack boost 2023-03-18 15:13:53 +07:00
2314b7d91c
a 2023-03-18 14:47:29 +07:00
f68d3e749d
Rename computed field factories to be prefixed with computed
to avoid shooting in foot
2023-03-18 14:25:21 +07:00
982554d2f0
Fix computed boolean field being ambiguous 2023-03-18 14:11:39 +07:00
9a841bf43b
Specify type specific properties of some field synchronizer users 2023-03-18 11:41:19 +07:00
d32cffe86b
Fix binding android wheel to mouse button breaking everything 2023-03-18 11:14:37 +07:00
743f9b64f1
Surprised FloatSupplier does not exist in either fastutil nor java base
loal
2023-03-18 08:42:11 +07:00
fdae27844a
Reimagine IConditionalTickable 2023-03-18 08:34:56 +07:00
6b3e80b629
Make tick list even faster 2023-03-18 08:21:12 +07:00
3672b9c3ac
Split field synchronizer into its own package 2023-03-18 08:11:34 +07:00
48a156cd9a
Reimplement variable length int field synchronizers, mark Supplier interface as deprecated 2023-03-18 07:49:58 +07:00
b4225af353
Type specific primitive fields in field synchronizer 2023-03-18 01:17:32 +07:00
34ed1322ba
Avoid unnecessary comparison 2023-03-17 23:34:35 +07:00
1e68baea9d
Revert using open hash set in dirtyFields 2023-03-17 23:08:33 +07:00
5b5c4de9f7
Fix energy counter setting ioLimit to not null when it is missing from nbt tag 2023-03-17 22:48:48 +07:00
4c97c99ee6
Format as readable research tooltips 2023-03-17 19:00:16 +07:00
f5b55f3ab1
oh my god 2023-03-17 18:18:55 +07:00
dfb0f5d3f3
Fix default text align being wrong, fix shadow not being aligned 2023-03-17 17:25:43 +07:00
f3b824b484
Use tick list for adding "tick once" stuff 2023-03-17 15:20:15 +07:00
bc99bc0c41
Add TickList to mattery player capability 2023-03-17 14:35:58 +07:00
8511c2c01b
Merge TimerQueue into TickList 2023-03-17 14:32:22 +07:00
a289d9d1c1
Add actuallyRemoved method to exopack menu 2023-03-17 14:08:27 +07:00