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
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
3f91e554cb
Throttle "powered" cable updates even further when it doesn't oscillate
2025-01-19 23:12:18 +07:00
a9b191eb72
Greatly improve cable network segment slicing and splicing
2025-01-19 22:51:37 +07:00
aa41647c04
Speed up cable Segment splitting
2025-01-19 21:12:59 +07:00
9579bc6a0c
LinkedHashSet instead of ObjectLinkedOpenHashSet for update performance
...
because LinkedHashSet uses linked list, while ObjectLinkedOpenHashSet use sequential array of keys
2025-01-19 20:56:32 +07:00
20b3fe78ba
Further reduce amount of small tritanium patches
2025-01-19 15:12:42 +07:00
2e2af1bc69
Reduce amount of regular tritanium ore in deepslate layer
2025-01-19 15:12:01 +07:00
d528f8465c
Tritanium cloud/ellipsoid ore distribution
2025-01-19 15:10:46 +07:00
35e871890c
Move DecimalProvider to data.world subpackage
2025-01-19 13:30:58 +07:00
6fc26c869a
Move codecs to subpackage
2025-01-19 13:28:54 +07:00
77821768bc
Better tritanium ore placement
2025-01-19 13:22:56 +07:00
c8c8e75b62
Update cables throughput values and recipes
2025-01-19 10:45:53 +07:00
b0bf4adb0f
Not/Normal Pill along Suspicious food
2025-01-19 01:58:18 +07:00
78896089ec
Update deprecated method usage
2025-01-19 01:50:37 +07:00
e53a7f65d8
Add JEI search aliases
2025-01-19 01:44:34 +07:00
8c4e2b1ea6
Add portable grill to smoking catalysts
2025-01-19 01:34:24 +07:00
4ef66dff7c
Don't sort cable paths when simulating transfer
2025-01-18 16:11:17 +07:00
7846b3f5a4
amongus
2025-01-18 16:01:06 +07:00
c36690fe94
Bump max lines limit
2025-01-18 15:36:27 +07:00
38227bc937
Add back proper on-block level gauge textures
2025-01-18 15:28:33 +07:00
bc9a78c514
Visual and audio feedback when trying to type stuff out of bounds
...
Add creative holo sign bounds
2025-01-18 13:45:00 +07:00
082f1478f5
Switching battery mode by right clicking while holding shift
2025-01-16 20:02:23 +07:00
805e760c52
💀
2025-01-15 22:26:59 +07:00
eeea537715
Fix splitted segments getting attached to unrelated paths
2025-01-15 21:53:33 +07:00
bd4fe17e33
Increase cable visuals update frequency the more it oscillate during last 17 ticks
2025-01-15 21:52:30 +07:00
b4e37fbd1f
Cable segment merging
2025-01-15 21:27:13 +07:00
90dc125b1b
Fix cable wrong "transferred" calculation
2025-01-15 20:32:06 +07:00
6fb9f4474e
Use linked hash set for cable internals, which improves iteration performance
2025-01-15 13:08:49 +07:00
655a9c541e
If multiple paths exist to target, and they differ in throughput, now cables will combine their throughput
2025-01-15 11:44:52 +07:00
61eab5fb37
Multi path in cable system
2025-01-15 09:59:13 +07:00
436456dcc5
Fix cable path heuristics
2025-01-14 18:27:20 +07:00
07121d8b41
Fix crash in addLivelyNode
2025-01-14 18:19:44 +07:00
43afa73df7
Minimally functional segmented power network, with functional per-tick limited throughput
2025-01-14 16:55:36 +07:00
0673fbf352
Merge remote-tracking branch 'origin/1.21' into 1.21
2025-01-11 10:24:06 +07:00
c0b8488afd
Railing
2025-01-10 19:42:10 +05:00
2067c9cceb
h2
2025-01-10 18:59:55 +05:00
9c834e21e7
Merge remote-tracking branch 'origin/1.21' into 1.21
2025-01-10 18:33:43 +05:00
140eecf57d
h
2025-01-10 18:33:29 +05:00
3f75e40e9c
Merge remote-tracking branch 'origin/1.21' into 1.21
2025-01-10 20:02:31 +07:00
5f6da754f9
I just need multiblock rendering
...
Have to add a little multiblock rendering
Are you okay? - Yeah, i just need to `add a little more multiblock rendering`
Rend-er-ing
Rend
and R in ING is RENDER-MAN
Hard Rendy the Bender Render Fender
2025-01-10 20:02:25 +07:00
d8744841d9
powered energy cables blockstate, БАГНУТАЯ ХУЙНЯ!!!!!!!!!!!!
2025-01-10 15:05:28 +03:00
057977f4a4
swap cable states since there aren't any atm
2025-01-10 16:08:47 +05:00
b2ee766194
генерация моделей мусора и полосок опасности вместе с блокстейтами
2025-01-09 20:47:59 +03:00
5dd4c027a9
если вы ещё не поняли что я ненормальный
2025-01-09 20:11:54 +03:00
e7ae4977d3
да и остальное тритановое тоже
2025-01-09 19:57:30 +03:00
12d63e962f
двери с люками тоже. и некрашенные блоки с полоской
2025-01-09 19:49:28 +03:00
cc8a149c25
генерация colomposed текстур и автотрек текстур для датагена
2025-01-09 19:34:32 +03:00
13d76df9fa
генерируем перекрашенные текстуры в рантайме
...
AMD User — Сегодня, в 15:29
no wae
imagemagick in my meinkraft coed!!1?/
2025-01-09 15:50:50 +03:00
b7f1f34b9c
Ok party pooper
2025-01-07 19:28:13 +05:00
05907276e1
Fix blackhole generator guide not drawing when main block if off-screen
2025-01-07 19:26:29 +07:00
7403edf157
Bump holo sign survival limits
2025-01-07 18:29:58 +07:00
9621356682
Captain Redstone Keyes
2025-01-07 18:17:03 +07:00
6f67912041
Fix spontaneous crashes in android station screen
2025-01-07 16:22:31 +07:00
ffa0e3d6d5
Add briefcase grill to condensed creative compat
2025-01-07 15:46:28 +07:00
cf021a5260
Merge remote-tracking branch 'origin/1.21' into 1.21
2025-01-07 02:26:32 +05:00
dc523973b0
forgot
2025-01-07 01:44:01 +05:00
d69eef7464
New power cables, the texture contains both unpowered and powered states, and I have no idea how to handle this, also the UVs on them are still wrong, the second half of the cable texture is not used at all.
2025-01-07 01:40:30 +05:00
db01f126f4
texture updates
2025-01-07 01:38:38 +05:00
78a1fecf92
Please replace danger stripe with these 50/50% 2 variant textures, I have no idea where the blockstates are to make it
2025-01-07 01:37:30 +05:00
b52b49a468
Allow computer terminal tick timer to be changed
2025-01-07 00:42:05 +07:00
0298968042
Mark alignButtons as private
2025-01-07 00:05:13 +07:00
65cbaf95b1
Button for manual stored experience drain from machine
2025-01-06 16:45:03 +07:00
c5edd9ff59
Briefcase grill config
2025-01-06 12:53:16 +07:00
dfeb638b7c
Experience storage for briefcase grill
2025-01-06 12:46:22 +07:00
7c35c284cd
Briefcase grill
2025-01-05 23:50:43 +07:00
a09795ad74
Improve sizeToContents()
2025-01-05 16:35:21 +07:00
2dd93da8bd
бары энергии и материи в тултипах предметов
...
AMD User — Сегодня, в 17:27
Ты успел быстрее меня это сделать
2024-12-12 17:55:09 +03:00
ab83fc9d45
развернул. но всё равно всрато
2024-12-12 17:45:16 +03:00
9689153910
вовращаем меканизм + бамп версии неофбабрика + рецепты покраски для красителя из меканизма #203
2024-12-12 07:58:55 +03:00
3cbc7b417f
hide layers in f1
2024-12-12 06:44:40 +03:00
7a5ce91995
switch hud elements to gui layers
2024-12-10 07:07:24 +03:00
72b1b5550d
AMD User — Сегодня, в 6:50
...
Просто вынеси в верх тика
Итерацию
2024-12-10 06:52:24 +03:00
4101f0e184
Merge remote-tracking branch 'origin/1.21' into 1.21
2024-12-06 13:06:27 +07:00
3b53369598
https://tenor.com/view/kobold-dota-2-dota-gif-11237083995805096987
2024-12-06 13:06:13 +07:00
8d0aa38b91
it's not static anymore ???
2024-11-19 04:37:18 +03:00
1712f92335
Kotlin for Kotlin (switch to KFF loader)
2024-11-19 03:40:18 +03:00
3b769fdfd1
Increase width of painter window by 44 gui pixels
2024-11-16 11:22:02 +07:00
08061a69c5
Fix tooltips of device controls panel
2024-11-16 11:18:35 +07:00
acd5c06b7a
Rollback text input panel dimensions change
2024-11-16 11:17:17 +07:00
87de48fffe
Fix "upgrades" button width
2024-11-16 11:16:49 +07:00
a92b893bc9
Fix fluid tank item crashing server during save
2024-11-16 11:13:09 +07:00
9daa3df589
Fix fluid tank not working properly with items
2024-11-16 10:51:27 +07:00
f870c2cefc
Use dist provided to constructor
2024-11-15 17:22:58 +07:00
9820505c0d
Update black hole placement code
2024-11-15 16:56:33 +07:00
89aa300b9b
Merge remote-tracking branch 'origin/1.21' into 1.21
2024-11-15 15:24:46 +07:00
4fa46505b6
Improve performance of clusterization used in chart rendering
2024-11-15 15:24:38 +07:00
ac2c387601
Switch energy counter chart guiding line to clustering too
2024-11-15 14:38:14 +07:00
7664b0b4de
Significantly improve chart clarity in tooltips
2024-11-15 13:41:16 +07:00
0d250dea2f
это не руда, это ворлдген.
...
потвикал значения (но шанс наверное всё равно уменьшить надо)
2024-11-14 21:46:19 +03:00
6713adcfe9
ГЕНЕРАЦИЯ ЧЁРНЫХ ДЫР ПОЯВИЛАСЬ РАНЬШЕ ЧЕМ МАНГАЛ ДИПЛОМАТ
...
// TODO: ЭТО НЕ РУДА
// TODO: твикнуть значения (очевидно)
2024-11-14 08:25:50 +03:00
46d04a4217
Merge remote-tracking branch 'origin/1.21' into 1.21
2024-11-13 18:52:04 +07:00
ab5a2275c2
Singularity generator operation modes, inject rate, (visual) radio button
2024-11-13 18:51:58 +07:00
13a9f58b74
сжимаем капсулы и баки
...
сам ты жидкостная бака
2024-11-12 07:31:21 +03:00
fef11d3bdc
заменил
2024-11-12 06:29:49 +03:00
13a7829016
не ну раз уж я начал закидывать итемблоки в .block тогда и этот туда же логично? логично.
2024-11-12 06:11:19 +03:00
0f77ed34c2
рецепты и тултип для энергетических кабелей
...
Konstantin Linev, [6:01]
Konstantin Linev, [6:02]
Но имеет смысл
2024-11-12 06:04:01 +03:00
fc76e0fbcb
рецепт ящикатора
2024-11-12 05:22:31 +03:00
71094aed76
Remove ad astra compat config
2024-11-11 09:22:15 +07:00
eb38466467
Allow to use scroll wheel to switch enum button mode
2024-11-10 14:16:00 +07:00
a50cad6832
Refactor buttons to have more streamlined hierarchy
2024-11-10 14:10:27 +07:00
583b9dc208
"Draw building guide" checkbox
2024-11-07 13:11:15 +07:00
6f75ca785d
Fix various block entity rendering issues
2024-11-05 23:15:51 +07:00
6c5b7fc72f
Fix energy hatches not ticking
2024-11-05 22:34:08 +07:00
7bf309173f
Allow only gravitation stabilizer between injectors and blackhole, require empty space between collector and blackhole
2024-11-05 22:25:31 +07:00
cdfa529d7b
Updated gauge design, horizontal matter gauge, added missing gauges to menus
2024-11-05 22:03:11 +07:00
868cd753d5
dockGravity
2024-11-05 17:43:10 +07:00
56e2e70a5c
"Low power" HUD element
2024-11-03 12:21:12 +07:00
604999ebe3
Don't wrap blockstate and blockentity in lazy
2024-10-30 20:59:58 +07:00
35ae7ed88a
Merge remote-tracking branch 'origin/1.21' into 1.21
2024-10-30 20:54:53 +07:00
58af515f9a
Black hole generator test (for real this time)
2024-10-30 20:54:41 +07:00
b832873203
Fix WriteOnce not properly handling nulls
2024-10-27 10:35:20 +07:00
bb7d3425f4
рендерим текст во всю ширину блока
...
font.width выдаёт ширину на 1 пиксель больше, так что чем больше текст тем больше смещение от этого самого пикселя
2024-10-24 06:26:30 +03:00
29ab315e43
УРА БОЛЬШЕ ВСРАТЫХ ИКОНОК (перенос чекбокса блокировки содержимого вправо + тултип для переключения ресайза)
2024-10-24 05:54:08 +03:00
84da57719d
переключение скейлинга текста в табличке
...
(и всратая палитра на иконку выбора цвета)
2024-10-23 20:50:31 +03:00
5913f56fb0
автоскейлинг текста на табличках (пока не переключаемый)
...
AMD User — Сегодня, в 11:36
Изображение
наверное ветер
2024-10-23 11:47:28 +03:00
74f75ebfc6
лёгкий нёрф молотка для крафта пластин, теперь максимум стак на 1 молоток
2024-10-17 03:53:45 +03:00
0e1dcbf1fe
попытка пофиксить отсутствующие блоки в структурах
2024-10-16 00:32:02 +03:00
434f06be7f
костыли от костылей (для костылей)
2024-10-15 18:32:23 +03:00
35b8652161
командная работа
...
- вычленение команд в отдельные файлы
- команда /android теперь может выдавать/забирать исследования
2024-10-11 22:21:13 +03:00
04b71b7cc8
защита от мгновенного сдува наноботов постоянным уроном (кактус, магмаблоки)
2024-10-11 21:00:46 +03:00
e2d4f810d4
Move chart levels text to left
2024-10-11 14:10:13 +07:00
fb573cb483
Optimize Air/NotAir
2024-10-10 21:50:35 +07:00
7d088d6433
Multiblock docs
2024-10-10 20:30:57 +07:00
36ec7855f0
Move black hole generator controller block to blackhole subpackage
2024-10-10 12:19:32 +07:00
876c6180cb
Remove widget2panel text input wrapper
2024-10-10 12:12:11 +07:00
b80da0e214
Energy counter limit input using panel instead of widget
2024-10-08 12:10:46 +07:00
064fbd0f36
/clear command should also remove exopack energy and battery
2024-10-08 09:53:58 +07:00
5299c20970
Ah yes, matter slots
2024-10-08 09:42:18 +07:00
e13ab9f087
Merge remote-tracking branch 'origin/1.21' into 1.21
2024-10-08 09:40:06 +07:00
0049cd4d06
real player [REAL]
2024-10-08 04:55:05 +03:00
358287df9c
real player
2024-10-08 03:45:42 +03:00
b3bc98b187
AMD User — Сегодня, в 3:32
...
Я специально это фиксил
Но спасибо что убрали fakeplayer базу
Теперь я хз как это фиксить
2024-10-08 03:36:40 +03:00
385a00c55b
do not recreate exopack menu if it's not ready
2024-10-07 15:24:23 +03:00
bdb34ba28f
Add little padding
2024-10-07 19:22:55 +07:00
1c3fc4e6e6
Chart smooth bends
2024-10-06 20:44:24 +07:00
d0e6ab2829
Yurie — Сегодня, в 22:02
...
Переслано
Единица энергии странная какая-то
2024-10-05 22:03:33 +07:00
0f2da66816
Merge remote-tracking branch 'origin/1.21' into 1.21
2024-10-05 20:56:53 +07:00
7d0b257928
Chart rendering right on energy counter
2024-10-05 20:43:00 +07:00
35769e5b57
a
2024-10-05 19:40:34 +07:00
37cd1600ab
Stateful dont have to inherit nullable tag types
2024-10-05 10:36:15 +07:00
c80954aea9
loot for vaults (and matter dust loot randomizer)
2024-10-04 19:44:55 +03:00
5bc104b04d
Fix "negative infinity only" case not being correctly handled in history chart rendering in tooltips
2024-10-04 17:14:31 +07:00
a43521c579
Fix negative numbers being displayed wrong
2024-10-04 17:07:27 +07:00
