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
