Commit Graph

3626 Commits

Author SHA1 Message Date
6e5e64baeb
Merge branch '1.21' into new-container-api 2025-03-01 19:17:29 +07:00
f655405d4b
[19:15:16] [Worker-Main-10/ERROR] [minecraft/ModelManager]: Failed to load model overdrive_that_matters:models/block/matter_entangler_error.json
com.google.gson.JsonSyntaxException: com.google.gson.stream.MalformedJsonException: Unterminated object at line 3 column 4 path $.parent
2025-03-01 19:17:12 +07:00
3ed935001b
Move Painter to SlottedContainer 2025-03-01 19:16:40 +07:00
49ee0a6a5f eh? 2025-03-01 16:47:42 +05:00
4292713874
Oopsie 2025-03-01 13:26:34 +07:00
1b5476de40
Mark chunk dirty when grill fuel ticks 2025-03-01 12:22:24 +07:00
bf7c9277ee
Update getMaxStackSize in MatteryMenuSlot to use IEnhancedContainer 2025-03-01 12:19:06 +07:00
a6891362d9
Remove no longer needed operator 2025-03-01 12:15:33 +07:00
2b2f78e528
Fix Grill not properly saving cook progress when being deserialized from disk 2025-03-01 12:15:19 +07:00
454783a99a
KOptional codec 2025-03-01 12:11:53 +07:00
d2ff43946e
Update grill to use SlottedContainer 2025-03-01 12:00:33 +07:00
abf74e4a2b
Merge branch '1.21' into new-container-api 2025-03-01 11:28:16 +07:00
8ffb2ce3b1
Merge remote-tracking branch 'origin/1.21' into 1.21 2025-03-01 11:13:52 +07:00
0f2c6f0e1e
Fix allowSpectators not being used by filter 2025-03-01 11:13:33 +07:00
d76ddfcd2b Merge remote-tracking branch 'origin/1.21' into 1.21 2025-03-01 03:08:42 +05:00
272cf0f776 I'm schizo 2025-03-01 03:08:10 +05:00
ffdb7f6f8f
Also set furnaceMenuOpenState to false 2025-03-01 00:37:47 +07:00
162a3757e4
Add DeviceControls#dockOnLeft 2025-03-01 00:25:24 +07:00
66a4adecf9
Move Fluid tank to SlottedContainer, and make it accept slot filters 2025-03-01 00:06:07 +07:00
1702f95370
Rename "MatteryMenu" to "MatteryMenuSlot", along with all other slot classes to include "menu" in their name 2025-02-28 22:11:11 +07:00
1d11b9b626
Also unset "ender chest open" state on client 2025-02-28 22:05:47 +07:00
f9b2cef513
⚙ SHOCKY — Сегодня, в 22:00
а можно
эндер сундук
в инвентаре
⚙ SHOCKY — Сегодня, в 22:00
вырубить запоминание вкладки
что-бы предметы не испарялись
в бездну (эндер сундук)
⚙ SHOCKY — Сегодня, в 22:01
это что десинк клиента выходит
или как
что сервер думает что открыт сундук
и шифт клик перекидывает предмет в эндер сундук
а не в хотбар
2025-02-28 22:03:44 +07:00
f79b49d422
Move CargoCrate to SlottedContainer
implement necessary changes to MatteryMenu, MatterySlot and panels
to reflect networking slot filters as part of container state, and not as part of menu slot
2025-02-28 21:57:28 +07:00
b1930bc93d add iron sandwiches to creative menu 2025-02-28 19:20:42 +05:00
30263bf30e
Make CombinedContainer temporarily implement old IMatteryContainer so it no longer crashes 2025-02-28 20:29:20 +07:00
ffdd44357d
Make it compile again so migration can be done incrementally 2025-02-28 20:16:23 +07:00
18252cf800 bread 2025-02-28 17:03:05 +05:00
5e8ab76f49
Update MatteryContainer to fix compilation error 2025-02-28 15:38:37 +07:00
9f6b9ad85b
Some helper functions, split "Filtered" into own subclass with own "Simple" factory 2025-02-28 15:23:08 +07:00
ab1446b682
Move SlottedContainer to subpackage 2025-02-28 09:10:03 +07:00
6764af0dcc
Misc improvements for CombinedContainer 2025-02-28 08:38:09 +07:00
eddb7a1445
КУДА 2025-02-27 22:04:07 +03:00
7ba2e020b7
bread monster entity wip 2025-02-27 22:01:35 +03:00
6747d5f471
Further split ISlottedContainer into IAutomatedContainer 2025-02-27 23:40:29 +07:00
124a1b3db6
Get rid of "slot" and "container" in IContainerSlot since they were bad design choices 2025-02-27 21:55:03 +07:00
a0b04fc1f4
Extracting 'lost' items from SlottedContainer 2025-02-27 21:17:28 +07:00
8a4abb90bd
Forgot to switch IntSortedSet to IntSet 2025-02-27 21:08:00 +07:00
fc1d9d6448
Make SlottedContainerBuilder be embedded inside SlottedContainer 2025-02-27 20:41:56 +07:00
b39c82e79a
Merge branch '1.21' into new-container-api 2025-02-27 19:41:42 +07:00
d362c135d7
Implement clearSlotFilters in wrappedInventory 2025-02-27 19:34:39 +07:00
b1b6843400
Merge branch '1.21' into new-container-api 2025-02-27 19:24:54 +07:00
858e95e7bf
Merge branch '1.21' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.21 2025-02-27 19:19:51 +07:00
ca6ff30414
Initial code for new containers 2025-02-27 19:19:33 +07:00
8f2f4f1062 What about this 2025-02-27 16:52:27 +05:00
6b68e74b76 m 2025-02-27 16:49:59 +05:00
5e24fe2c85 Iron 2025-02-27 16:44:03 +05:00
6689bdfd19 texture consistency 2025-02-27 16:06:09 +05:00
b5e2b24dd5 Good morning 2025-02-27 15:53:59 +05:00
0b635aab7e attempt 2025-02-27 06:32:15 +05:00
cba52d8a66 смодулируй мне это 2025-02-27 04:38:29 +05:00