Commit Graph

755 Commits

Author SHA1 Message Date
ae3fef941b
руда. 2024-08-31 07:55:52 +03:00
0cd5867063
ещё пару блокстейтов в датаген 2024-08-31 07:09:18 +03:00
3d80a1e069
Merge remote-tracking branch 'origin/1.21' into 1.21 2024-08-31 10:50:53 +07:00
3dd7583d4e
Update DynamicBufferSource hooks 2024-08-31 10:31:42 +07:00
09320efa73
Merge branch '1.21' of https://git.dbotthepony.ru/DBot/overdrive_that_matters into 1.21 2024-08-31 06:28:29 +03:00
eeef87dcd1
давайте просто не будем хранить нбт блока который якобы декор 2024-08-31 06:28:05 +03:00
b3ca648be5
Merge remote-tracking branch 'origin/1.21' into 1.21 2024-08-31 10:10:45 +07:00
cb99fbe749
moved and upgraded structures 2024-08-31 05:51:11 +03:00
c5945723fa
Update energy servo multipart model 2024-08-31 09:47:01 +07:00
85279c4de8
датаген - кабель материи + тонкий кабель (база) 2024-08-30 16:47:25 +03:00
b5d7d99c63
датаген - добив рецептов 2024-08-30 16:40:52 +03:00
0446e5adb3
Update js coremods signatures 2024-08-28 18:10:43 +07:00
15618622ab
Update a bunch of models to use neoforge constructs 2024-08-27 23:41:50 +07:00
3b06e71fc0
Comment out level renderer patch 2024-08-27 23:41:34 +07:00
b939f7b020
Update js coremods import 2024-08-27 21:32:17 +07:00
5085fccf14
Update various files to make mod run 2024-08-27 21:30:42 +07:00
e3990d7fb5
Update mixins 2024-08-26 20:15:39 +07:00
381ca7dc2d
Update slotChangedCraftingGrid signature 2024-08-23 20:23:38 +07:00
eaefda867d
Update energy container upgrade recipe 2024-08-15 19:26:37 +07:00
64780fbda5
Resolve most of simple enough compilation errors 2024-08-10 01:24:15 +07:00
9b7e424fc5
Switch to neoforge and neogradle 2024-07-04 19:52:30 +07:00
769c1650e5 Fuck interpolation 2024-01-29 11:44:47 +06:00
a885ea4d87 Models and more texture updates 2024-01-29 04:15:13 +06:00
58ed338c7a Various texture updates 2024-01-29 03:03:39 +06:00
eb60c371ed Painting table and water source models 2024-01-29 02:54:49 +06:00
a51a4a3ad0
datagen biome modifiers for ores 2024-01-22 20:25:47 +03:00
c6059b0393
Merge remote-tracking branch 'origin/1.20.2' into 1.20.2
# Conflicts:
#	src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt
2024-01-22 11:40:48 +07:00
8a3ef344e3
essence storage empty/filled blockstate 2024-01-21 13:14:42 +03:00
7c794126b6
slurp 2024-01-21 11:55:58 +03:00
8ebc611c7c
Custom splashes 2024-01-20 18:31:39 +07:00
d669fcb28d
шиза с моделями и блокстейтами кабелей 2024-01-19 15:55:48 +03:00
c356cd703e
:mind_blown: More multiblock code 2024-01-17 17:30:50 +07:00
884336ffa1
Redo old recipes 2024-01-12 19:05:26 +07:00
d3b0eb5f92
Add tintindex to holo sign to color its lights 2024-01-08 21:32:53 +07:00
05db4a0c05
Use cutout for microwave oven 2024-01-06 11:28:48 +07:00
6aabc72145
Chemical generator, energy servo and energy counter coloring 2024-01-06 11:21:40 +07:00
796f7fdc98
Fix drive viewer model 2024-01-05 00:45:21 +07:00
a56dbd60f6
Switch render mode to cutout for holo sign and matter replicator 2024-01-05 00:38:53 +07:00
5d44a26493
Fix pattern monitor rotation 2024-01-05 00:32:30 +07:00
a95a5f27ff
Wireless charger, pattern monitor, driver viewer and storage power supplier coloring 2024-01-05 00:24:53 +07:00
f4bbf54095
Android station coloring 2024-01-04 19:37:36 +07:00
8aa34b3645
Induction furnace and powered furnace painting 2024-01-04 15:57:12 +07:00
3f2e90e55c
Merge remote-tracking branch 'origin/1.20.2' into 1.20.2 2024-01-04 14:06:48 +07:00
5b51c5e655
Microwave oven painting 2024-01-04 14:06:23 +07:00
071bb7b3ad Chug xp 2024-01-04 12:46:19 +06:00
9ecf53342e
More machine coloring 2024-01-04 13:40:40 +07:00
895ed6fbef Fix Computer 1000 yard stare + 4chair 2024-01-04 12:38:38 +06:00
9d876c573c
Merge remote-tracking branch 'origin/1.20.2' into 1.20.2 2024-01-04 12:07:45 +07:00
8f92b8d3f1
Add computer terminal as actual block 2024-01-03 20:46:51 +07:00
0dcf6664a3
Add painter recipes to matter recipe finder 2024-01-03 20:03:23 +07:00
b2c2bfa536
Plate press coloring 2024-01-03 19:56:50 +07:00
d6dc8689f8
Essence storage coloring 2024-01-03 18:51:59 +07:00
cb50ee2c68
Colored machines test, update creative menu order
update SupplierList/Map impl to use Java's suppliers
general code layout improvements
2024-01-03 18:36:06 +07:00
73773d4c70 tele jigsaw grunt pathic telepathic st'ructure processor jigsaw worldgenjson 2024-01-03 16:53:27 +06:00
565819c3e3
Add placeholder textures for liquid xp 2024-01-03 15:06:36 +07:00
6e16364491 Laboratory rebuild WIP + decorative computer model 2024-01-03 09:57:03 +06:00
0a5dbf468f
Update author list 2024-01-02 12:24:09 +07:00
76de15f01b Update the texture for metal beams and lamps 2024-01-02 00:15:39 +06:00
ea448c5262 More texture adjustments 2024-01-01 23:51:32 +06:00
ffa94d190d Microwave 2024-01-01 23:16:59 +06:00
6bee0784d3 Texture adjustments 2024-01-01 16:42:47 +06:00
1c0cdb8b5b
Energy cable tiers, fix some Client -> Server logic leaks in singleplayer 2023-12-30 20:26:31 +07:00
19bb6600dd
Bump KFF and Forge 2023-12-22 14:27:41 +07:00
993b1ac0fc
extremely fast archaeology 2023-11-15 02:13:30 +03:00
8a6e8afa61
machine upgrades 2023-11-13 21:54:10 +03:00
6c9058e72d
darken base tritanium armor color 2023-10-30 12:54:53 +03:00
6aaad2fe88
покраска тритановой брони
#178 :WiseTree:
2023-10-30 12:41:25 +03:00
0e83e08ec6
manual hammer priming 2023-10-26 17:01:36 +03:00
171e16a7c4
Remove Mekanism compat since it will not be updated to newer versions 2023-10-26 18:44:03 +07:00
db4f24e85e
DBot — Сегодня, в 8:11
Ящикатор?
2023-10-26 08:22:49 +03:00
294a402447
mod/toml version != jar version 2023-10-23 00:13:26 +03:00
54cfd84103
сейчас мы будем показывать жидкость
closes #258
2023-10-22 06:28:04 +03:00
91c8100729
DBot — Сегодня, в 14:51
Считается что работает правильно
Пока не доказано обратное
2023-10-21 15:32:25 +03:00
c32a5bf71b
Mod now compiles on 1.20.2 2023-10-07 22:27:02 +07:00
313f9cb39d
Swim Boosters android feature, electromotor crafting component 2023-08-23 14:24:43 +07:00
af2d621cee
Hopper and dispenser/dropper menus? 2023-08-21 11:13:48 +07:00
9244de0ac2
Vanilla chests with OTM gui 2023-08-20 23:36:13 +07:00
1ab252e57a
Move sorting order button sprite 1 pixel down 2023-08-20 15:42:49 +07:00
d4c029f27d
Slice container APIs and decouple interface from implementation, container sorting test 2023-08-20 15:39:20 +07:00
e88c29be57
Revert "Fix ingredients being "empty" when playing multiplayer"
This reverts commit f56884705a.
2023-08-19 01:13:32 +07:00
a0b0580bfa
Add circuit plating recipe to datagen 2023-08-19 00:18:48 +07:00
f56884705a
Fix ingredients being "empty" when playing multiplayer
These changes reflects Forge's PR https://github.com/MinecraftForge/MinecraftForge/pull/9688
2023-08-18 23:43:54 +07:00
0428b60561
Update pattern monitor 2023-08-18 21:05:35 +07:00
0c23e53bbc
Swap color palette for side controls 2023-08-12 15:01:41 +07:00
f8c2be4d4c
Storage bus insert/extract priorities configuration, operation mode, small refactorings 2023-08-12 01:08:42 +07:00
f27f21e3de
Make Exopack slot changes trigger advancements, and optimize them 2023-08-04 22:50:59 +07:00
ed84905627
Exopack ender chest access upgrade 2023-07-30 01:50:30 +07:00
912e361693
why 2023-07-30 00:56:35 +07:00
ff308ee67a
Actual tabs sprites, and all 4 sprite states for them 2023-07-29 16:30:56 +07:00
e518f2c732
рендер шизы
(или жидкостях в танках-предметах)
#258
2023-07-25 05:58:32 +03:00
1ff20b090f *Collapses* 2023-07-22 05:47:43 +06:00
19e205b527 Furnaces 2023-07-21 17:53:25 +06:00
90ae56dbdc Matter upgrades texture (not implemented) 2023-07-21 02:54:39 +06:00
8d4e0d83ee Electric furnace model (Looks broken atm, TODO: fix it) 2023-07-21 02:52:59 +06:00
dc50a79b20
Merge remote-tracking branch 'origin/master' into master
# Conflicts:
#	src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt
#	src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt
2023-07-18 12:04:13 +07:00
a707e49b8c
Exopack coloring and toggle exopack glowing 2023-07-18 01:55:17 +07:00
67c54357e8
bump forge to recommended build 2023-07-15 22:48:14 +03:00
4daa0be19a
Color picker panel 2023-07-15 19:41:31 +07:00
57b2b64ff9
Add custom position/tex/color shader without fragment discarding 2023-07-15 19:35:38 +07:00
027d6ef65f
exopack curios inventory button 2023-07-14 22:25:48 +03:00
4b6909fc0b Smelting upgrade texture and machine upgrade textures 2023-07-10 03:38:09 +06:00
2095120abd
Make help and close buttons bigger 2023-07-09 15:22:29 +07:00
f598cc7bbd
Proper charge slot background 2023-07-09 15:06:42 +07:00
2e894abd67
Make help and close buttons lesss ugly 2023-07-09 14:50:55 +07:00
344364520d
Frame panel help button, panel post render, more straightforward tooltips 2023-07-09 11:38:25 +07:00
18f0f833f3
блокстейты + шейпы + модель предмета для зарядника 2023-07-06 03:14:08 +03:00
507f0cbe41 Android charger segmented model 2023-07-06 03:18:12 +06:00
9dcf24cae7
Upgrade system, conditional quickmove slots, frame panel close button 2023-07-05 17:06:31 +07:00
b27ef2ea79
better combat presets for energy sword and explosive hammer (both not autodetected by mod) 2023-06-29 11:31:21 +03:00
2f59edd606
чудеса ASM и многократной потери рассудка #193 2023-06-28 15:40:33 +03:00
48d58c42dc
Further update hunger handling and patch FoodData 2023-06-27 22:01:36 +07:00
0ec8f3709a Add a few pixels to matter cable texture 2023-06-27 00:22:40 +06:00
3c90489dea Reduce the humongous amount of empty (But not really) space on texture atlas 2023-06-27 00:07:10 +06:00
26236a5b07 Fix twin plate press texture funny 2023-06-26 23:50:50 +06:00
23dc91fb55
use vanilla water/lava textures for cobblegen 2023-06-26 09:58:51 +03:00
8dd332a2e1 Plate press 2 2023-06-26 01:55:29 +06:00
65008b2a56 Update cobblestone generator model and make matter decomposer matter canisters glow 2023-06-25 04:03:22 +06:00
4f7c9ea176
Input balancing 2023-06-23 23:30:40 +07:00
ab61101ab6
Pull and push modes now can be independently configured 2023-06-20 20:36:33 +07:00
85c426e2b6
Update striped tritanium block texture 2023-06-20 18:08:54 +07:00
9efad96aff Sligthly update machine frame 2023-06-16 22:20:32 +06:00
fed99d4104 Remove some unnecessary faces 2023-06-16 22:13:54 +06:00
8c06b0e497 Matter replicator texture update 2023-06-16 17:26:22 +06:00
a2dc3c7d97 Updated redstone signal configuration widgets (?) 2023-06-16 01:23:27 +06:00
a040e4cc63
Bump dependencies in mods.toml 2023-06-13 22:20:13 +07:00
16b28a1d2d
most *compile* errors resolved for 1.20
only damage triggers remain and whatever font funcs in Ext.kt
2023-06-08 15:41:18 +03:00
817630cb79
Update mods.toml to reflect new mc version 2023-06-08 11:07:00 +07:00
068e6ba3f9
Configurable Fluid Handler 2023-05-31 14:09:12 +07:00
61d4bf57a6 Added a tiny piece of metal to primed hammer 2023-05-09 05:07:46 +06:00
be43c59a2d
bytecode moment (fix #249) 2023-05-07 17:09:58 +03:00
a4888c1982
DBotThePony — Вчера, в 16:20
:umer:
Вопрос только в том, а почему не переместить типичные патчи в mixin

----------
ну и починил /clear для экзокостюма
2023-05-07 02:08:53 +03:00
c9fa920a82
Move energy sword sweep patch to mixin 2023-05-06 20:20:24 +07:00
acf5ce9fbc
УВЫ 2023-05-05 17:11:55 +03:00
7e9d5ddbf8
Make it compile against 1.19.4 2023-04-26 08:21:31 +07:00
17abc2e29b Item textures for simple trarmor 2023-04-17 02:37:05 +06:00
8f8f7db0a8 Simple tritanium armor textures
I am too afraid to touch things in it to add a SIMPLE 2D LAYER ARMOR so i'll leave actually adding it
2023-04-17 01:47:37 +06:00
cdd6ef9eb3
Sort item classes to subpackages, correct some code 2023-04-16 19:10:27 +07:00
5df3a06fcb Perish 2023-04-14 19:20:25 +06:00
60ac4d60d2 did i deadass rollback this 2023-04-14 19:19:26 +06:00
2a910d2f96 OM NOM NOM 2023-04-13 22:28:35 +06:00
951df4a7d1 explosive hammer model 2023-04-13 21:06:39 +06:00
607512cf1b Texture updates 2023-04-11 23:01:57 +06:00
50b19c3a31 Make shield use reinforced stuff too, also more edits 2023-04-11 04:27:11 +06:00
89847ac34a texture stuff 2023-04-11 04:19:29 +06:00
6a9df1d79b Liquid running gif 2023-04-11 04:06:53 +06:00
cf5d0455cf a 2023-04-10 01:22:23 +06:00
5e444300a1 Fluid tank is now transparent 2023-04-08 20:43:05 +06:00
56f3395c47 Oops 2023-04-07 18:50:14 +06:00
cc1b944eba Fluid tank and capsule 2023-04-07 18:48:14 +06:00
0eb9d99e3b Mesh and Reinforced Tritanium textures 2023-04-07 18:12:02 +06:00
90f345a2d9
Fluid tanks
general improvements to SI prefix formatter
networking regarding fluid stacks
Own fluid handler implementations
2023-04-06 15:07:11 +07:00
6c4c40073e
Merge remote-tracking branch 'origin/master' into master 2023-03-28 09:06:19 +07:00
7d5a585897 perish 3 2023-03-27 18:55:21 +06:00
828b8d1039 Add a slight animation to Android station's holograms + LET IT GLOW 2023-03-27 18:53:55 +06:00
8928e8e31b Perish 2 2023-03-27 18:27:57 +06:00
ae622739b9 Revert "Perish"
This reverts commit 5b0988f08e.
2023-03-27 18:18:05 +06:00
51c23b425c Cargo crates texture update 2023-03-27 18:17:14 +06:00
5b0988f08e Perish 2023-03-27 18:13:46 +06:00
2752a82225 Active engine model (WIP) 2023-03-26 19:18:12 +06:00
77cb483774 Oops 2023-03-26 17:05:22 +06:00
cbde740747 ACKSHUALLY 2023-03-26 16:53:01 +06:00
faf43657fc
Androids no longer get hunger from "eating" raw food 2023-03-26 15:35:48 +07:00
44d4c6bbbe Tritanium bars (pls fix) 2023-03-25 23:39:12 +06:00
a7dbae85ab Essence storage funni 2023-03-25 23:38:20 +06:00
20f7ef45ed Matter Reconstructor 2023-03-25 23:37:41 +06:00
198c9b4aa3
essence storage block shape
оно компилится и похуй
2023-03-19 19:05:20 +03:00
8c3eabb3bd ship wreckage structure 2023-03-19 07:36:18 +06:00
b57b954e5c essence storage glows oooo 2023-03-19 00:13:40 +06:00
3f2deae863 essence storage and essence servo 2023-03-18 22:40:52 +06:00
89c2a99dfe METAL JUNK TEXTURE 4!!! ! !!!! 2023-03-18 21:57:40 +06:00
ce224d6fe7
Remove the most useless mob in the game from ever spawning when not asked to 2023-03-18 16:20:23 +07:00
30f07e2fed
Inventory filters preview 2023-03-16 07:56:48 +07:00
0d1f5d866a Merge remote-tracking branch 'origin/master' 2023-03-15 00:20:36 +06:00
5ecfc99533
DBotThePony — Сегодня, в 17:11
ах да
ты просил визуалку брони наноботов
так тыж сделал полоску хп, можно туда и наноботов влепить
:Pogomega:
2023-03-14 18:09:46 +03:00
d65717e213 Pillar textures 2023-03-14 18:32:54 +06:00
2c745a302f
fix ad astra temperature system 2023-03-14 17:42:34 +07:00
efc1642254
Revert "Manually write android_immune_effects.json"
This reverts commit 1b8e1d147f.

because minecraft engine is stupid
2023-03-14 17:42:34 +07:00
594e6c9fbf
Androids don't need to breathe oxygen 2023-03-14 17:42:33 +07:00
312795df93 Change translucent to cutout 2023-03-14 13:15:38 +06:00
aa14577445 essence drive and capsule 2023-03-13 20:21:36 +06:00
be56aaae0c Paint tritanium block and vents 2023-03-13 19:48:13 +06:00
40993cd504 Texture updates 2023-03-13 19:31:59 +06:00
95989fb101 Fatter mirror corners and darker vent overlay 2023-03-13 19:12:04 +06:00
40da26033d
Essence storage, servo, capsules 2023-03-13 18:10:02 +07:00
0b64ffafaa
Add MtU and complexity sorting buttons 2023-03-13 10:28:31 +07:00
4437634234
revert wrong file removal 2023-03-13 09:24:55 +07:00
93440f44cc Some changes to metal beam textures 2023-03-13 04:15:41 +06:00
8249c9a9cd Junk metal and Metal mesh blocks 2023-03-13 04:15:25 +06:00
bec79a1ea5
android health bar + 1px wider energy bar 2023-03-12 20:16:18 +03:00
1b8e1d147f
Manually write android_immune_effects.json
to add effects from other mods easily
2023-03-11 14:38:54 +07:00
288b2522c7
fix sword and android station emissive 2023-03-10 22:24:28 +03:00
ede087f4a0
lol 2023-03-10 23:25:26 +07:00
8ce67a7fae
Make special recipe finder for crafting table recipes, make use of residue logic 2023-03-10 22:48:34 +07:00
7e914f010e Make shields normal 2023-03-10 00:32:47 +06:00
cd95825460
почему-то не работает 2023-03-09 08:44:18 +03:00
441f358e12
Matter panel sorting (with buttons), cleanup nbt extensions 2023-03-06 00:21:06 +07:00
193489021b Tritanium anvil model 2023-03-02 17:51:54 +06:00
7364f7d2d8 Tritanium shield, exosuit upgrade modules texture update 2023-03-02 05:41:13 +06:00
de68575848
Every KILL has it's ULTRA
- Jhon Ultrakill
2023-02-27 20:06:03 +03:00
a85124224f Tritanium shears, no idea where do i put a shield model since it makes a duplicate 2023-02-27 04:55:52 +06:00