Commit Graph

3577 Commits

Author SHA1 Message Date
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
9947c94414
Fix matter entangler not working 2025-02-19 14:40:44 +07:00
5166bf20ad
Fixed observed item stacks are not properly synched 2025-02-19 12:16:14 +07:00
cd40b66dab
Fix matter entangler not removing itself from matter graph when it is removed 2025-02-18 15:13:58 +07:00
d2fd075116
Add nickel plates to plate press 2025-02-18 10:27:05 +07:00
6b37ec8683
YuRaNnNzZZ: а ещё в табличках наверное надо текст приблизить
YuRaNnNzZZ: :wires:
2025-02-18 03:42:27 +03:00
39f72adb9e
holo sigh hitbox 2025-02-18 03:40:52 +03:00
2779c33d10 grill models (actual models now, i fucked up) 2025-02-18 02:30:39 +05:00
680cb3cab2 grill models 2025-02-18 02:30:06 +05:00
76c0540d57
Make explosive hammer less annoying in creative 2025-02-17 20:05:49 +07:00
7be3607da8
Star chair recipe 2025-02-17 19:52:58 +07:00
1f9719ceab
Don't decide whenever widen device controls panel before parent properly determines its dimensions 2025-02-17 19:47:54 +07:00
6105328e85
Add ignoreWhenSizingToContents 2025-02-17 19:38:12 +07:00
aa2e053c26
Don't add "chargeFlag" when player has no exopack 2025-02-17 19:31:54 +07:00
956531e08b
Don't touch filtered slots with non-stackable items in it 2025-02-17 19:26:00 +07:00
3129db667d
Reduce passive energy loss in flywheel battery 2025-02-17 19:09:57 +07:00
97e22459c5
Ah yes 2025-02-17 10:37:25 +07:00
995a57e631
Actually fix essence storage screen 2025-02-17 10:35:54 +07:00
2c0e0b3b8d
try onceClient for exopack scrollbar (for guis like integrated terminals) 2025-02-17 01:07:33 +03:00
4489951e4e
Fix previous commit 2025-02-17 01:01:44 +07:00
01c8fa1ec0
Fix essence storage screen bar visually displaying wrong xp required 2025-02-16 18:51:20 +07:00
0aa3e413b9
Mark otm armors as armor in general in tags 2025-02-16 18:37:01 +07:00
4d8a097b64
Merge remote-tracking branch 'origin/1.21' into 1.21 2025-02-16 12:31:18 +07:00
78ae793ade
Add missing "enchantments" upgrade ops to energy sword 2025-02-16 12:31:04 +07:00
18e7d9bbb3
ну а так? 2025-02-16 00:46:34 +03:00
b1915248a9
infinite water source missing tooltip 2025-02-16 00:34:39 +03:00
e747143512
simple check for durability in item reconstructor 2025-02-16 00:34:01 +03:00
533cb16dbf oops 2025-02-15 17:28:21 +05:00
2f13ef6984 p 2025-02-15 17:27:56 +05:00
0a22a54a9b Update the pattern drive gui texture 2025-02-15 16:02:06 +05:00
d8e52f11a9 ..Wait 2025-02-15 14:07:38 +05:00
a455e54087 Color 2025-02-15 14:04:53 +05:00
ceb8f866b9 Remove the weird gap at the base of essence storage 2025-02-15 14:00:53 +05:00
7c1893268d Merge remote-tracking branch 'origin/1.21' into 1.21 2025-02-15 13:37:36 +05:00
704eea379f Pale yellow 2025-02-15 13:37:05 +05:00
058580ae10
Inverting recipes for reinforced redstone lamp? 2025-02-15 15:36:40 +07:00
b8e57fb130
Flywheel config values 2025-02-14 21:36:25 +07:00
3eec0f4419
Fix chemical generator skipping one tick under certain conditions 2025-02-14 21:31:28 +07:00
3e56730191
Select random slots when distributing energy in battery bank 2025-02-14 21:27:47 +07:00
1363efecd8
Add "enchantable" tag to tritanium armor 2025-02-14 18:33:43 +07:00
3bdff50f4d
More robust "is hovered" logic 2025-02-13 20:56:53 +07:00
dd3a08f47d
Fix sizeToContents not working properly when childrens are not docked 2025-02-13 20:56:18 +07:00
89c7295abb
Change frequency of large veins again 2025-02-13 13:13:26 +07:00
b5269db492
Nerf tritanium large vein further 2025-02-12 21:56:30 +07:00
124af53131
If game suffers "Wayland" illness, don't crash, but instead just disable functionality 2025-02-12 19:07:18 +07:00
d1a2f24d5a
Add missing "mineable" tags for flywheel parts 2025-02-12 17:59:41 +07:00
f214682074
Bump matter registry limit to 64 MiB 2025-02-12 15:53:06 +07:00
6acee0de08
Swap redstone for dilithium gems in advanced upgrade recipes 2025-02-12 11:23:35 +07:00
4c04c6c114 Merge remote-tracking branch 'origin/1.21' into 1.21 2025-02-11 19:47:18 +05:00
1afe1859e5 teehee 2025-02-11 19:46:53 +05:00
3cb604bd98
Changed my mind about wind up inefficiency of netherite 2025-02-11 21:36:47 +07:00
46d5a87582
Display two digits in flywheel material tooltip 2025-02-11 21:35:24 +07:00
43eb2b7ac8
Bump default cable throughput once again 2025-02-11 21:23:15 +07:00
537620ba6c
Add netherite as flywheel material 2025-02-11 21:18:43 +07:00
bbf0283219 Merge remote-tracking branch 'origin/1.21' into 1.21 2025-02-11 16:47:20 +05:00
5813a3ad65
Make "powered" cable display handle more edge cases 2025-02-11 18:13:19 +07:00
c1bdc28bef Another attempt at eliminating the "furry test" from dilithium ore item 2025-02-11 15:41:38 +05:00
f9bd671e88
Misc fixes regarding cable network node removals 2025-02-11 15:55:30 +07:00
fcc8fe157e
Fix cables getting stuck on "powered" blockstate when segments get split 2025-02-11 14:37:51 +07:00
be9641fc03
Try to search for better path when cabling changes even if current path set is sufficient 2025-02-11 13:54:23 +07:00
486060c8a4
Don't subscribe block entity to chunk if syncher has no entries 2025-02-11 13:49:48 +07:00
483c27d919
Further refine cable path search performance 2025-02-11 12:58:12 +07:00
89ca0fbce8
Improve cable path search performance when there are a lot of paths existing already 2025-02-11 11:12:11 +07:00
590f420c07
egg 2025-02-11 11:08:24 +07:00
18949d65c4
a 2025-02-11 11:05:44 +07:00
fdc9944c17
Don't oversearch paths when target block won't accept all energy sent 2025-02-11 10:51:52 +07:00
8544368ab2
Update cable heuristics 2025-02-11 10:48:25 +07:00
3f87459f35 version deez 2025-02-11 07:14:21 +05:00
c5c5b04c3f Merge remote-tracking branch 'origin/1.21' into 1.21 2025-02-11 07:13:47 +05:00
2948d58e94 Mr. President, the condor has hit the second fuel base! 2025-02-11 07:13:32 +05:00
d0d9b6ae79
Merge remote-tracking branch 'origin/1.21' into 1.21 2025-02-11 01:25:34 +07:00
e708d3e6b2
There is no need for "greedy" strategy when searching for extra cable paths 2025-02-11 01:25:30 +07:00
e68f3a7996
Improve performance on cable addition and removal from cable network 2025-02-11 01:12:58 +07:00
614ba26da6
Improve extra path search performance 2025-02-11 00:17:04 +07:00
bb9d5d9ae0
Throttle cable path searches 2025-02-11 00:09:18 +07:00
a2c9234501
давайте исходить из того, что железных палок у нас в моде нет, так что и рецепты показывать НЕ НУЖНО 2025-02-10 18:38:28 +03:00
1b865d8c5f
светло-серым мангал-дипломат
Окрашено в светло-серый
2025-02-10 18:06:20 +03:00
702ac7cebb PH frigate loot table 2025-02-10 14:01:45 +05:00
1f669ba2b2
Reduce count of ore in tritanium cloud 2025-02-10 15:50:02 +07:00
b116ae7f91
Flywheel material tooltips 2025-02-10 15:46:03 +07:00
e55b1da9cb
Proper flywheel data values 2025-02-10 15:03:52 +07:00
c18fa330a6
Update "unlocked by" of pattern drive 2025-02-10 14:54:03 +07:00
1e4769873d
Improve ambiguous wording in energy counter description 2025-02-10 14:46:09 +07:00
c87ec56307
Proper pattern drive recipes 2025-02-10 14:44:45 +07:00
5e6b8bb725
Replace ender pearls with dilithium gems in matter transform matrix recipe 2025-02-10 14:44:27 +07:00
acc182eb26
Greatly improve performance of clusterization by hinting that min/max should be performed with implied zero value 2025-02-10 14:19:25 +07:00
b1783343bc
Greatly improve upgrade recipes 2025-02-10 13:53:36 +07:00
356ca59f9b h 2025-02-10 06:50:05 +05:00
61343b416f
Properly disable clientside "Cancel all tasks" button in pattern screen when player is in creative 2025-02-09 13:51:07 +07:00
691fe66797
Yurie — Сегодня, в 13:42
да
я знаю
i don't care
2025-02-09 13:44:31 +07:00
996d6e8ed1
Add antimatter transform matrix to the end cities 2025-02-09 13:36:40 +07:00
cdc9e7b40b
Matter entangler recipe 2025-02-09 13:34:55 +07:00
57d67b2945
Multiblock parts recipes, mechanical parts item 2025-02-09 13:30:58 +07:00
5687b15426
Add missing cargo crates item tag contents 2025-02-09 12:45:40 +07:00
22b0e44634 Issued a new fleet of frigates 2025-02-09 06:42:47 +05:00
cbfd8001c7
Fix black hole generator has wrong multiblock update direction 2025-02-08 14:04:16 +07:00
d03991137e
Greatly improve performance of combined energy/matter storage in multiblocks 2025-02-08 13:59:37 +07:00
480fa7cf7c
Hmm yes reinforced redstone lamp is made of reinforced redstone lamp 2025-02-08 12:59:20 +07:00
05544df25b
Default chart text gravity to top left 2025-02-08 10:10:02 +07:00
5d232a28ed
Fix west/east being swapped in multiblock configuration 2025-02-08 09:50:39 +07:00
70fdf98d0f flywheel battery blocks textures 2025-02-08 04:20:54 +05:00
d1e14ddde6
Fix column arguments being swapped 2025-02-08 00:24:33 +07:00
a0f605c396
Workaround rare race condition related to setLevel racing with other minecraft code 2025-02-08 00:16:30 +07:00
b9d85b7b17
Replace exception with "short circuit" flag on cables 2025-02-07 21:43:53 +07:00
b10b1c0da4
Failsafe when blackhole block entity gets removed 2025-02-07 21:11:07 +07:00
7d075ccfc3
Merge remote-tracking branch 'origin/1.21' into 1.21 2025-02-07 19:54:35 +07:00
da13d77af3
⚙ SHOCKY — Сегодня, в 19:53
не могу
мультиблок
влепить текстуры что есть
ибо мультиблок ещё на машине Дбота
2025-02-07 19:54:17 +07:00
fb3b547b5d dilithium texture 2025-02-07 02:58:55 +05:00
c3c43d7af6
Fix error message 2025-01-23 12:35:11 +07:00
a93fe595be
Merge remote-tracking branch 'origin/1.21' into 1.21 2025-01-22 22:11:52 +07:00
b01dba2a21
Add generics to ColoredDecorativeBlock so manual casts are no longer required 2025-01-22 22:11:42 +07:00
b4c8676daa
Update comments 2025-01-22 13:27:13 +07:00
99ebeddae4 m 2025-01-21 23:04:17 +05:00
7a1edd5e4a Merge remote-tracking branch 'origin/1.21' into 1.21
# Conflicts:
#	src/main/kotlin/ru/dbotthepony/mc/otm/registry/game/MItems.kt
2025-01-21 21:29:36 +05:00
d03439b076
missing tags for dilithium crystal block 2025-01-21 17:03:51 +03:00
90aa1ee523
resources not components 2025-01-21 16:46:22 +03:00
975b540fe4
Deepslate Dilithium Kot 2025-01-21 16:42:38 +03:00
15417e65aa p 2025-01-21 17:00:22 +05:00
1a50ecd6af
Mark star chair as having description 2025-01-21 15:43:20 +07:00
f922df53be
Remove savedcountingmap as it is not used 2025-01-21 15:33:19 +07:00
fc675811be
Rename "content" to "game", as it better resemble what that package contains 2025-01-21 15:31:31 +07:00
0d9be21cff
Move more registry objects to subpackages 2025-01-21 15:21:31 +07:00
122ca66e65
Move MBlockEntities to subpackage 2025-01-21 15:08:21 +07:00
ca264e9292
Move MItems, MBlocks, MFluids and MCreativeTabs to content subpackage 2025-01-21 15:03:58 +07:00
5a5ef2cd68
YuRaNnNzZZ — 15.01.2025 17:56
надо наверное эмиссив прописать на модели активных кабелей
2025-01-21 03:25:02 +03:00
216a923b53
missing models 2025-01-21 03:06:58 +03:00
92df9579f0
multi-level pattern storages with upgrade recipes (upgrade ops)
AMD User — Сегодня, в 2:55
Юра пошёл делать upgradeops

AMD User — Сегодня, в 2:56
MLC
TLC
YuRaNnNzZZ — Сегодня, в 2:56
верно
AMD User — Сегодня, в 2:56
А потом не меняя цены меняем на QLC
Втихую
2025-01-21 02:59:57 +03:00
bf87d48254
require mekanism loaded for mekanism painter recipes 2025-01-20 19:32:12 +03:00
76cb2c83f0
лишнее 2025-01-20 17:15:56 +03:00
495447648f
Split loot tables file 2025-01-20 20:46:14 +07:00
4888dad2dd
Split tags file into several files 2025-01-20 20:40:30 +07:00
6de80d792e
Bump bottom limit of how spread out ore is in large tritanium vein, as well make it appear less often 2025-01-20 20:26:09 +07:00
e63bbb79d2
Dilithium ore and crystals 2025-01-20 20:22:55 +07:00
e331790a71 Armor assembly 2025-01-20 15:07:25 +05:00
6661384dfd add a few pixels on upgrade textures 2025-01-20 15:06:40 +05:00
4898d18112 h 2025-01-20 13:25:57 +05:00
32f3803cb9 :wires: 2025-01-20 13:04:46 +05:00
75e9b782fa Merge remote-tracking branch 'origin/1.21' into 1.21 2025-01-20 12:40:14 +05:00
bbb8471d26 Texture tweaks 2025-01-20 12:39:57 +05:00
a47ec64cbb
Ronna and Quetta SI prefixes 2025-01-20 08:41:53 +07:00