Commit Graph

3716 Commits

Author SHA1 Message Date
5422f0fec8
Merge branch '1.21' into new-container-api 2025-03-06 16:14:41 +07:00
c40f9a2c57
Make lootTable decoding not throw an exception when meeting unexpected data 2025-03-06 16:13:24 +07:00
c376a99da0
Make Upgrade container inherit EnhancedContainer instead 2025-03-06 16:11:37 +07:00
9806e1ec52
Revert "Update Upgrade Container to use SlottedContainer"
This reverts commit 861b94a30a.
2025-03-06 16:06:21 +07:00
de79019f56
Implement EnhancedContainer 2025-03-06 16:06:04 +07:00
bc109e8020 frogs 2025-03-05 17:46:30 +05:00
efbc93e16a
Make IAutomatedContainer implement IItemHandlerModifiable 2025-03-05 19:01:24 +07:00
7efb792353
frigate cargo crate loot fix 2025-03-05 13:10:41 +03:00
861b94a30a
Update Upgrade Container to use SlottedContainer 2025-03-05 16:22:39 +07:00
83d11d531d
Cache recipes in Matter Entangler 2025-03-05 15:23:27 +07:00
45a32dce3c
Merge branch '1.21' into new-container-api 2025-03-05 13:20:27 +07:00
e45e35f0c3
Couldn't handle mushrom that day 2025-03-05 13:20:16 +07:00
3910e38add
Move Matter Entangler to Slotted container 2025-03-05 13:17:57 +07:00
5942ab2126
Implement IEnhancedCraftingContainer 2025-03-05 13:07:39 +07:00
8696d268ad
Make IEnhancedContainer implement StackedContentsCompatible 2025-03-05 13:03:42 +07:00
8aae573110
Merge branch '1.21' into new-container-api 2025-03-05 10:51:52 +07:00
f78336657d Merge remote-tracking branch 'origin/1.21' into 1.21 2025-03-05 07:55:04 +05:00
d9680181b1 a 2025-03-05 07:52:57 +05:00
892beddfc6
Merge branch '1.21' into new-container-api 2025-03-05 09:49:31 +07:00
828c80dfd4
Merge branch 'prng' into 1.21 2025-03-05 09:46:13 +07:00
e6365f3bb7
Merge remote-tracking branch 'origin/1.21' into 1.21 2025-03-05 09:46:07 +07:00
991314c07b
Use Xoshiro256SSRandom instead of CMWC for OTM provided level random 2025-03-05 09:44:02 +07:00
95f1a304c9
Provide docs for random number generators 2025-03-05 09:43:24 +07:00
b8291c7e1c
Proper Xoshiro256 initialization with 256 bit seed 2025-03-05 09:34:29 +07:00
1a52864c4e
Throw an exception when xoshiro seed is completely zero 2025-03-05 09:31:28 +07:00
f19804dd4a
Provide better random seeds for random number generators 2025-03-05 09:10:23 +07:00
6b7f1fb949 andr oid 2025-03-05 07:08:49 +05:00
49f76c7bdd
Provide Xoshiro256StarStar random 2025-03-05 09:07:01 +07:00
6c087a278d
Don't store seed since it is of no use 2025-03-05 08:38:07 +07:00
e03d9b1a74
Provide LCG64 implementation as separate class 2025-03-05 08:37:43 +07:00
d326e45b32
Initialize carry using lcg instead of modulo divide seed 2025-03-05 08:20:39 +07:00
ffee09ec0f Merge remote-tracking branch 'origin/1.21' into 1.21 2025-03-05 05:59:20 +05:00
5956b5d76f a 2025-03-05 05:59:10 +05:00
f5036e6220
unempty 2025-03-05 00:36:54 +03:00
d31922e331
вы мне не доверяете, А Я ВАМ 2025-03-05 00:33:51 +03:00
4187e7818e
тогда уж и типы правильные давайте 2025-03-04 23:57:19 +03:00
43d2abe7e3
а давайте лут таблицы будут работать в ящиках. согласны? 2025-03-04 23:52:57 +03:00
825cbb6731 Merge remote-tracking branch 'origin/1.21' into 1.21 2025-03-05 01:36:11 +05:00
94289b9d2c Adjustments 2025-03-05 01:35:59 +05:00
e8222216e0
и масштаб тоже нормально считать надо 2025-03-04 22:41:58 +03:00
18b89b4031
НЕТ НУ ЕСЛИ ТЕПЕРЬ У НАС ЕСТЬ ТАКОЙ ШРИФТ ТО Я БУДУ ЕГО АБУЗИТЬ
и вы мне ничего не сделаете
понятно?
2025-03-04 22:31:24 +03:00
a00225e859
очередная корректировка 2025-03-04 22:19:47 +03:00
ee0a113702
бесконечность не пердел 2025-03-04 21:57:17 +03:00
3a010048ee
да 2025-03-04 21:37:17 +03:00
9417d6ffdc
Use more robust 64-bit LCG for seeding CMWC internal state 2025-03-05 01:03:00 +07:00
1ddeff7a29
Merge remote-tracking branch 'origin/1.21' into 1.21 2025-03-05 00:48:39 +07:00
44a1ae3263
Николай Bsky — Сегодня, в 20:10
а можно другой цвет фонта энергии 💀
ибо на полоске энергия чуть более оранжево-желтая
а на фонте зеленовато желтый
2025-03-04 20:14:30 +03:00
fbef1f6f84
маленький шрифт для худа 2025-03-04 20:09:41 +03:00
4eb7971717
Further reduce internal state of CMWC (from 1024 octets / 8192 bits to just 128 octets / 1024 bits) because we don't need these insane periods 2025-03-04 21:06:22 +07:00
257c5edacb
рецепт конфигуратора 2025-03-04 15:20:01 +03:00
93fea6394f
компонент экран + корректировка рецептов
GearShocky — Сегодня, в 14:35
сканер сингулярностей
его кстати переделать нужно
2025-03-04 15:00:12 +03:00
5ea0b64982
конфигуратор для копирования настроек #341 2025-03-04 14:15:04 +03:00
440b7fff2b Falling sun 2025-03-04 06:18:01 +05:00
14e6ee4916
Merge branch '1.21' into new-container-api 2025-03-03 22:29:17 +07:00
5df477feab
Fix grill not marking chunk as dirty when it ticks progress/fuel 2025-03-03 22:29:00 +07:00
b83c9edf13
Delegate List.shuffle extension impl to Minecraft util 2025-03-03 22:22:04 +07:00
fcec612718
Lock CMWC state size to 256 WORDs, improving performance of nextInt() 2025-03-03 22:19:57 +07:00
38923d7978
Fix flywheel battery not marking chunk dirty when energy level changes 2025-03-03 22:17:20 +07:00
d2f119a112
теги структур и карты для картографа 2025-03-03 17:34:39 +03:00
d558252db9
Update Matter Decomposer to use SlottedContainer 2025-03-03 20:14:20 +07:00
7f9af78734
Update MatteryPoweredBlockEntity battery container to use SlottedContainer 2025-03-03 19:55:52 +07:00
d76f2fe015
lol 2025-03-03 19:54:22 +07:00
70bfa114c8
Use IEnhancedContainer in setChanged 2025-03-03 19:47:45 +07:00
a5b96fa4c4
Update bottler to use slotted container 2025-03-03 18:33:24 +07:00
cff5988767
Merge branch '1.21' into new-container-api 2025-03-03 18:03:28 +07:00
362c3bd931
Shuffle entities in vicinity of android charger, so all players around it will get charged more or less equally 2025-03-03 18:01:03 +07:00
866776dc74
YuRaNnNzZZ — Сегодня, в 17:57
но он продолжает меня заряжать
2025-03-03 17:59:50 +07:00
6e7b90a8e8
Move Matter capacitor bank to slotted container 2025-03-03 15:00:30 +07:00
edb3aa657d
Merge branch '1.21' into new-container-api 2025-03-03 14:44:54 +07:00
56cce749f7
Make HFB be correct tool for plants and cobwebs 2025-03-03 13:40:33 +07:00
c96614c7c0
Replace usages of Level#random with OTM provided random (CMWC) 2025-03-03 13:23:06 +07:00
bc2c531e1f
Attach CMWC random to Level class, as alternative random to be used in OTM 2025-03-03 12:20:29 +07:00
32ef2911fa
Implement Complementary Multiply-With-Curry Random 2025-03-03 12:02:42 +07:00
4e653b6544 lang 2025-03-03 05:59:06 +05:00
b585187ae0 Merge remote-tracking branch 'origin/1.21' into 1.21 2025-03-03 03:21:08 +05:00
2ee6c7e923 Loader 2025-03-03 03:20:55 +05:00
42b86778cb
Веасол 2025-03-02 05:44:11 +03:00
36a16ac9d2
Trollium 2025-03-01 21:59:10 +03:00
e6bab75bc7
YuRaNnNzZZ — Сегодня, в 20:44
Изображение
а обратно?
2025-03-01 20:58:00 +03:00
80128a01e5 forgot 2025-03-01 19:22:48 +05:00
e1decb67ec Imperfect bread 2025-03-01 19:16:18 +05:00
9d12044db4 Merge remote-tracking branch 'origin/1.21' into 1.21 2025-03-01 17:54:34 +05:00
271f594389 yes 2025-03-01 17:54:26 +05:00
9ce2fbf497 withered steel block 2025-03-01 17:53:53 +05:00
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
1c7f116502 g 2025-02-27 00:03:55 +05:00
5e3520de55 shapegen 2025-02-26 23:58:22 +05:00
aa0a1ed53f Matter entangler model 2025-02-26 23:27:44 +05:00
ba2048849b reduce empty space on bread monster texture 2025-02-26 15:45:14 +05:00
3fd06889da regen essence storage colored textures 2025-02-26 15:41:57 +05:00
e3efc88d83 Hull 2025-02-26 05:08:14 +05:00
74546e46d3 I don't know if this is relevant, the modded entity does not contain animation data and this one might be specific to blockbench 2025-02-26 01:33:39 +05:00
f57b171bc9 forsenbread (2) 2025-02-26 01:29:12 +05:00
dfc35f393f
Add clearSlotFilters to IMatteryContainer 2025-02-25 22:13:36 +07:00
cdaae2f9fa
Remove unused class 2025-02-25 21:54:18 +07:00
736da72ca7
Invalidate remotes on chart being deserialized 2025-02-25 19:56:58 +07:00
4ab69d6d82
Move IContainerSlot to regular container subpackage 2025-02-25 16:31:27 +07:00
25e25b0f86
Remove structural synchronization inside SynchableGroup
Also fixed memory leak when removing remotes
2025-02-25 16:09:32 +07:00
05913674b1
Improve performance of MatteryMenu#addSlot 2025-02-25 13:49:08 +07:00
2bcc1965ce
Add alt power view with shift pressed in flywheel battery screen 2025-02-25 12:06:32 +07:00
ab68f8d36d
Make DynamicLabel update text before resizing 2025-02-25 12:04:39 +07:00
06e2a97cfc
Make FramePanel take into account title width 2025-02-25 12:02:00 +07:00
59200b2baa
Improve performance of multiblock scanning by postponing blockentity lookup until it is actually needed 2025-02-25 11:56:36 +07:00
304b6a65c8
Multiblock formed/invalid/unloaded states; greatly improve multiblock scanning performance 2025-02-25 11:20:44 +07:00
6ce84804d7
Add 4 pixel margin to "multiblock formed" label 2025-02-25 11:06:04 +07:00
3ad085c1ae
Forgot to increase width and height in "BackgroundPanel#block" 2025-02-24 22:41:41 +07:00
4a711783f5
Flywheel battery status GUI 2025-02-24 22:40:03 +07:00
2c741b45c3 Merge remote-tracking branch 'origin/1.21' into 1.21 2025-02-24 17:33:57 +05:00
f257686742 forsenbread 2025-02-24 17:33:49 +05:00
4ff0b14b6d replicate this 2025-02-24 16:56:04 +05:00
d4636038cc
:skull_rotate: 2025-02-24 18:08:02 +07:00
d0ee1fb0e3
Properly delegate setChanged in combined container slot 2025-02-24 16:37:39 +07:00
96d902bc98
Type specific setChanged override in MatterySlot 2025-02-24 16:29:11 +07:00
13c9e93d31
Move black hole spawn chance to placedfeature 2025-02-24 15:15:25 +07:00
b12b25c68f
Changed my mind, 0.4% 2025-02-23 19:18:14 +07:00
469f7d072d
ZPM was supposed to have 0.1% chance to appear, not 1% 2025-02-23 18:10:14 +07:00
921778b9e6
Merge remote-tracking branch 'origin/1.21' into 1.21 2025-02-22 23:54:26 +07:00
dd003264f2
Allow spectators to see blackhole stats too 2025-02-22 23:54:11 +07:00
0f30cd6756 поскучал 2025-02-22 21:44:46 +05:00
00870576fd не скучайте 2025-02-22 20:58:12 +05:00
35d222d15a
Profiled matter capacitor storage 2025-02-22 18:56:45 +07:00
69c93d4b16
Painted tritanium anvil 2025-02-22 17:13:02 +07:00
28c7459b82
Use MatteryContainer instead of Mojang's SimpleContainer in matter entangler quantum linking 2025-02-22 13:27:04 +07:00
a93d754a68
Update tritanium door colored textures 2025-02-22 13:27:04 +07:00
ad729221f3
Update computer terminal colored textures 2025-02-22 13:27:04 +07:00
ec68b7ee9c
Shortcut to "isEmpty" in UpgradeContainer to account for most common case 2025-02-22 13:27:04 +07:00
b4fc02b14e
Revert "генерируем перекрашенные текстуры в рантайме"
This reverts commit 13d76df9fa.
2025-02-22 13:27:03 +07:00
4712cf4b35
Revert "генерация colomposed текстур и автотрек текстур для датагена"
This reverts commit cc8a149c25.
2025-02-22 13:27:03 +07:00
f9159f61ec
Revert "двери с люками тоже. и некрашенные блоки с полоской"
This reverts commit 12d63e962f.
2025-02-22 13:27:03 +07:00
bde57e69cf
Revert "да и остальное тритановое тоже"
This reverts commit e7ae4977d3.
2025-02-22 13:27:03 +07:00
47364de172
Revert "если вы ещё не поняли что я ненормальный"
This reverts commit 5dd4c027a9.
2025-02-22 13:27:02 +07:00
1be974006f
output = output 2025-02-22 09:03:07 +03:00
ba012cf9d0
black hole generator multiblock parts loottable/tags 2025-02-22 08:44:33 +03:00
9fcbd19385 Move singularity ring to block 2025-02-22 01:50:59 +05:00
767a3b45bd b 2025-02-22 01:50:26 +05:00
84505f1fbb I mixed it up 2025-02-22 01:50:13 +05:00
1965720053
Fix energy counter for android being rendered incorrectly 2025-02-21 21:15:29 +07:00
fb8a28d423
Animate gauges slower in matter entangler recipe category 2025-02-21 21:11:29 +07:00
63383c22eb
Fix power gauge in matter entangler recipe category rendering wrong 2025-02-21 21:10:15 +07:00
ba5d3a4043
Someplace i don't fucking know 2025-02-21 19:38:26 +07:00
60f5876280
если это не работает я сдаюсь. оно генерирует нормальный байткод который должен корректно вырезаться
YuRaNnNzZZ — Сегодня, в 14:50
Изображение
Изображение
и как это обходить блять
котлин говна
2025-02-21 15:01:50 +03:00
7432cac581
ЗВУК КЛИЕНТСКИЙ. ОН НЕ ДОЛЖЕН ПРОИГРЫВАТЬСЯ НА СЕРВЕРЕ. 2025-02-21 14:41:55 +03:00
e57dbe5814
How? 2025-02-21 18:24:58 +07:00
0b5ff224f8
Allow interacting with essence storage as fluid tank 2025-02-21 18:21:56 +07:00
e53676a91f Merge branch '1.21' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.21 2025-02-21 16:04:30 +05:00
bf63bc0e1e less shitty 2025-02-21 16:04:21 +05:00
624588318d
квантовый аккумулятор
10к/т
квантовый аккумулятор накопитель (capacitor)
200к/т
может он это того
не накопитель?
2025-02-21 13:24:31 +03:00
652e7d5238
попытка в амбиент звук для чёрной дыры.
не факт что правильная и не факт что будет работать нормально.
2025-02-20 23:46:15 +03:00
d5d4637fff hatch textures 2025-02-20 15:58:41 +05:00
8f81d8fd6f :trolley: 2025-02-20 04:15:42 +05:00
b108b2c495
Fix rare cable crash related to two neighbour cables being mined at same tick 2025-02-19 21:35:55 +07:00