Commit Graph

1069 Commits

Author SHA1 Message Date
53550f31f4
Rename w, h to width, height in SkinElement 2022-09-09 15:43:30 +07:00
56ec34097f
Reduce lightbeam length of laboratory lamps 2022-09-09 15:37:55 +07:00
7e04cf42ca
YuRaNnNzZZ — Вчера, в 23:10
я андроид или кто
где цифры
2022-09-09 15:35:56 +07:00
71f0bf3a62
Buttons now have proper isDisabled, regular button is now native panel
Fixes #8
2022-09-09 15:22:11 +07:00
66576fee94
Round aligned text coordinates
because it's draw code is stupid and can't properly sample at half pixels
2022-09-09 15:17:42 +07:00
fc096c28aa
Round absolute values to not render at half a pixel 2022-09-09 14:29:54 +07:00
f80b913d61
streamline tickers 2022-09-09 13:23:47 +07:00
01e861032e
clarify function names 2022-09-09 12:59:29 +07:00
41c8172375
Fix opening and closing recipe book not moving exosuit button 2022-09-09 12:58:38 +07:00
ab2862c123
very spammable 2022-09-09 11:59:18 +07:00
9cc572be62
Update client event handler 2022-09-09 11:57:53 +07:00
0fdc3ef97e
Particles texture of lab lamp 2022-09-09 11:52:46 +07:00
8c7c3de01c
Inverted redstone signal laboratory lamp 2022-09-09 11:50:00 +07:00
b68ef58d0c
Split datagen code to multiple files 2022-09-09 11:34:26 +07:00
6cfae8f420
Unlit lamp blockstate 2022-09-09 10:39:38 +07:00
b2b128f93a Haha, metal beam, danger stripe and lab lamp textures 2022-09-09 00:27:16 +06:00
1ab14452a1
GearShocky — Сегодня, в 0:30
что то не так
2022-09-09 00:33:32 +07:00
70255794a8
Laboratory Lamp, Danger Stripe Block, Metal Beam
#70
2022-09-09 00:26:13 +07:00
d91232b537
Fix offhand quick moving is not working 2022-09-08 19:44:42 +07:00
b53d19308e
Datagen glass blocks with correct render type
Fixes #75
2022-09-08 19:41:58 +07:00
5946413b7a
Container crates, but with all colors 2022-09-08 19:14:33 +07:00
b617bf0c25
Refactor decorative blocks class 2022-09-08 18:22:03 +07:00
a23ce200f5
Readability of class names 2022-09-08 17:12:58 +07:00
d8f2f44b5f
Do not allow energy go through if we have more than 1 item in stack 2022-09-08 17:11:53 +07:00
5603970654
Give batteries some love 2022-09-08 17:11:16 +07:00
f62c796d19
Merge remote-tracking branch 'origin/master' into master 2022-09-08 16:45:05 +07:00
437439ae1e
don't make button's skin element yeet itself 2022-09-08 16:44:31 +07:00
1c0530e8dd
Unify NBT keys and update block loottables
Fixes #71
2022-09-08 16:38:09 +07:00
9e649a7c61
Fix being unable to break cargo crates 2022-09-08 16:10:34 +07:00
0245af79f8
Fixes for imprecise fraction
#72
2022-09-08 08:00:03 +07:00
121b411632
fix research exp desync in multiplayer + fix refund 2022-09-08 02:25:18 +03:00
780f3b3814
get rid of useless skinElement in SquareButtonPanel 2022-09-07 17:25:04 +07:00
a4a8eb57ee
Remember player's choice whenever to open vanilla or exosuit 2022-09-07 17:16:44 +07:00
fdc540483f
Add back-to-exosuit inventory button
Fixes #63
2022-09-07 17:10:24 +07:00
a6a06fd4cd
Make EditablePanel be generic and upper-bound to Screen 2022-09-07 16:28:08 +07:00
7b478d485a
also move ticker interfaces 2022-09-07 14:24:24 +07:00
b0c845e0f9
Move TickList to core 2022-09-07 14:23:15 +07:00
fcbe68297c
Button to go back to vanilla inventory screen 2022-09-07 14:22:14 +07:00
3797265107
Add @MouseTweaksDisableWheelTweak to screens with scrollbars 2022-09-07 13:36:27 +07:00
aea180b68c
Fix wrong ticker order 2022-09-07 12:47:12 +07:00
c6e570744a
да кто такая эта ваша руда 2022-09-07 04:57:10 +03:00
7616483a66
Merge remote-tracking branch 'origin/master' into master 2022-09-07 07:55:01 +07:00
c0c0b01688
findSlot now actually searches for slot panel 2022-09-07 07:53:55 +07:00
ec08a60340
Achieved with FORGE™️ (#23 final) 2022-09-07 03:28:49 +03:00
64485e8b29
fixed funni transforms/perspectives names (#23) 2022-09-07 00:09:00 +03:00
0ae30aa2c8 ZPM model 2022-09-07 01:48:31 +06:00
b51c4780b8
TickList with LinkedList in it
Fixes #50
2022-09-06 23:41:47 +07:00
6c9f71aed8
More minecraft'y tritanium block coloring
fixes #69
2022-09-06 23:08:22 +07:00
5fa901202e
Remove colored blocks recipe variants to reduce clutter 2022-09-06 22:39:07 +07:00
3f23eea95a
Remove debug blocks from creative tab 2022-09-06 22:28:28 +07:00
964a0e5a73
Fix plates being missing from tags 2022-09-06 22:24:42 +07:00
44bb3c2fae
Move crafting result slot to top 2022-09-06 22:18:53 +07:00
5f649d0d7e
More exosuit quickmove fixes 2022-09-06 22:12:15 +07:00
d47fc7af41
Fix quickmove in exosuit inventory 2022-09-06 22:02:16 +07:00
c75c056790
Merge remote-tracking branch 'origin/master' into master
# Conflicts:
#	src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt
2022-09-06 21:51:11 +07:00
14eece598a
Datagen tags 2022-09-06 21:45:53 +07:00
0489652057
#65 2022-09-06 09:03:56 +03:00
c07d5c668c
DBotThePony — Сегодня, в 8:34
Ойблядь
2022-09-06 08:38:59 +03:00
71e9c0b57e
ура балансим шлемак (#68) 2022-09-06 06:04:58 +03:00
2b3d2e3d75
Update block loottables 2022-09-06 08:39:56 +07:00
aca40e887d
Android station crafting recipe 2022-09-06 08:26:46 +07:00
d00338303e
Fix being able to open android research tree more than once 2022-09-06 08:15:25 +07:00
4a6fd46114
Add GearShocky to authors 2022-09-06 07:32:30 +07:00
fe48d55c14
каво 2022-09-06 07:25:48 +07:00
a0a21eb575
кот 2022-09-06 00:22:18 +07:00
77e35917ba
Even better bed button handling 2022-09-06 00:17:23 +07:00
5f3a17da9f
Try to fix selecting wrong button in InBedChatScreen 2022-09-05 23:58:38 +07:00
86eaec61f4
Merge remote-tracking branch 'origin/master' into master 2022-09-05 23:36:31 +07:00
f2b0f966ec
fix tests failing 2022-09-05 23:35:07 +07:00
027f6446f1
Exosuit Crafting upgrade as item 2022-09-05 23:30:29 +07:00
e7653d559f
Synchronized maps, update save keys, exosuit inventory upgrades as items 2022-09-05 23:13:48 +07:00
c608ade2da A 2022-09-05 18:50:50 +06:00
cee4ebc754 A 2022-09-05 18:31:06 +06:00
884f841bbd Placeholder models/textures 2022-09-05 18:26:02 +06:00
2915ef675b
Merge remote-tracking branch 'origin/master' into master 2022-09-05 18:54:37 +07:00
4cca4d2edc
Make singularity be wither immune 2022-09-05 18:53:38 +07:00
f94e3f11e4
Extract energy interface from mattery player into own class 2022-09-05 18:47:13 +07:00
dbe72c2311 FLOOR TILES YEEEE- (x2) 2022-09-05 17:44:09 +06:00
80a576f6a7 FLOOR TILES YEEEE- 2022-09-05 15:13:17 +06:00
ea19ab856f FLOOR TILES (white) UPDATE WOOOOOOOOOOO- 2022-09-05 15:10:03 +06:00
f0790eec1e "Гиршок, Там баг, АААААААА, Удоли ?.also" 2022-09-05 13:50:28 +06:00
ab2d4926ba
Merge remote-tracking branch 'origin/master' into master 2022-09-05 10:30:34 +07:00
d726db119b
Unrefined floor tiles and general floor tiles recipes 2022-09-05 10:30:21 +07:00
08e7b83ce4 Merge remote-tracking branch 'origin/master' 2022-09-05 00:53:41 +06:00
5f559078e6 android station idle texture; plasma rifle separate transforms??? 2022-09-05 00:40:31 +06:00
b7a6571aa4
Make singularity be immune to ender dragon 2022-09-05 01:22:38 +07:00
528afbc7ff Pattern storage minor model update 2022-09-05 00:22:02 +06:00
6b7778ac35
Update battery bank and matter capacitor bank models 2022-09-05 00:59:07 +07:00
0c0182a65c
Fix isHovered being true on out-of-bounds children 2022-09-05 00:42:03 +07:00
18334da499
Fix Item Monitor panel being too tall 2022-09-05 00:36:16 +07:00
f2b0ad4fec
Energy sword no longer breaks blocks in creative 2022-09-05 00:35:32 +07:00
4babe703c7
BackgroundPanel and better power bar position in item monitor 2022-09-05 00:31:46 +07:00
72a4d14159
fix wrong slot index check 2022-09-05 00:25:05 +07:00
ceda2846c5
fix StretchingRectangleElement rendering right bar wrong 2022-09-05 00:24:03 +07:00
2e7e676739
Make exosuit inventory contents appear in LivingDropsEvent when possible 2022-09-04 21:04:40 +07:00
705eaaf993
Obey keepInventory in exosuit inventory 2022-09-04 20:29:28 +07:00
b54dafe40b
Do not consume plasma rifle power if in creative 2022-09-04 20:22:59 +07:00
91512b0eb8
Do not consume exosuit probe if in creative 2022-09-04 20:21:17 +07:00
4ef4c9753f
Do not consume anything to research android stuff in creative 2022-09-04 20:19:38 +07:00
e5da98cba1
Do not perform not meaningful operations on ImpreciseFraction 2022-09-04 20:12:59 +07:00
8c09f72726
fix mekanism wrapper getting above imatteryenergy, update battery bank 2022-09-04 20:05:05 +07:00
a1405272f5
Fixes for battery bank block 2022-09-04 19:42:17 +07:00
8053ea69f9
Display fill levels on items 2022-09-04 19:24:14 +07:00
0e10b47bb8
Fix android station not draining energy when putting android parts 2022-09-04 18:43:22 +07:00
094f476fea
Quantum batteries now track statistics 2022-09-04 18:36:42 +07:00
e3643d7f61
little dirty fix for hovered commit 2022-09-04 18:12:25 +07:00
8eee289020
Fix throughput on batteries being wrong if no si prefix is present 2022-09-04 18:07:12 +07:00
bc6bb15874
Fix isHovered being false when outside of parent's bounds 2022-09-04 17:02:53 +07:00
9f6b884c8c
Add pattern menu tabs tooltips 2022-09-04 16:47:14 +07:00
47816d6cb3
Arbitrary tooltips on panels support 2022-09-04 16:47:04 +07:00
abd52a64b1
Fix quantum batteries eating overflown power
if someone edited save files
2022-09-04 16:30:25 +07:00
0eb24460e4
Swap places of input and output slots in matter decomposer 2022-09-04 16:28:09 +07:00
de90c2e3da
More readable text shadow 2022-09-04 16:21:20 +07:00
ae8a9296f7
Power consumption by android station when doing stuff in it 2022-09-04 16:19:46 +07:00
b010bcdd5d
what 2022-09-04 16:17:06 +07:00
c25d8729c2
Shadow should be drawn before actual text 2022-09-04 16:07:39 +07:00
7d46ec4b13
Update docs on IMatteryEnergyStorage to be more clear 2022-09-04 16:06:50 +07:00
ca3e5d948c
More appropriate field names of LevelGaugeWidget 2022-09-04 16:06:35 +07:00
0d5629ef07
runOnClient 2022-09-04 16:06:06 +07:00
6910ee7d33
More colors! 2022-09-04 16:05:56 +07:00
322e070060
Add shadow to label, implement sizeToContents 2022-09-04 16:05:50 +07:00
9cfbfd5d7b
Make android station have idle/working state 2022-09-04 00:03:28 +07:00
8e8e2534ca
JEI plate press recipe view 2022-09-03 23:38:29 +07:00
3ab641efb4
frame tabs icons, pattern panel tab icons 2022-09-03 21:11:15 +07:00
a142e4da98
Get rid of tab positions, since they should be at top anyway 2022-09-03 20:27:28 +07:00
a50fcaceaa
Fix inventory slots being off without exosuit 2022-09-03 19:27:29 +07:00
00b8e546b0 Merge branch 'master' of https://git.dbotthepony.ru/DBot/overdrive_that_matters 2022-09-03 17:43:26 +06:00
3771b20563
Register event listeners directly 2022-09-03 18:01:14 +07:00
8f2f599f38
remove continuous scroll bar panel 2022-09-03 16:21:35 +07:00
b4c07d331d
widen imprecise fraction cache 2022-09-03 16:20:13 +07:00
5a5288c0a2
Add playGuiClickSound 2022-09-03 16:15:21 +07:00
15d4dec2b1
Fix matter replicator allocating jobs while not powered 2022-09-03 16:03:38 +07:00
49fd0dc105
Fix ReplicatorJob not serializing it's values 2022-09-03 15:58:42 +07:00
86660e639e
Fix specifying throttle ticks sending machine to idle state 2022-09-03 15:29:35 +07:00
fab6edc91b
a 2022-09-03 15:23:16 +07:00
7da750f9c6
Fix task window not accounting in progress count 2022-09-03 15:18:43 +07:00
6e824db2f5
Revise and streamline pattern and replication tasks API 2022-09-03 14:59:35 +07:00
cc3e5f5550
Move pattern monitor screen to Kotlin 2022-09-03 01:32:12 +07:00
519be9389e
Add conditional exception throw at setItem
Since it is called after craft if we have no valid crafting recipe after
2022-09-02 19:20:45 +07:00
77f79f3f48
Disallow double click pickup from crafting result slot 2022-09-02 18:48:51 +07:00
0aa8bc0b31
Get rid of Continuous scrollbar panel in Kotlin code 2022-09-02 18:41:01 +07:00
48df8f4ef2
1% better item monitor menu 2022-09-02 18:13:27 +07:00
bc68b9b9ef
Improve power supplier menu 2022-09-02 18:04:24 +07:00
8df7cf76a8
Split gauge panels file 2022-09-02 17:35:03 +07:00
276cfeda00
Zero Point Module battery 2022-09-02 17:23:29 +07:00
93ffd8bbd3
Matter, but flowing 2022-09-02 16:35:52 +07:00
37234e6503
Refactor widgets atlas 2022-09-02 15:59:01 +07:00
17e1f58a13
actually 2022-09-02 14:15:16 +07:00
732039b321
Generalize slot iterator 2022-09-02 14:04:20 +07:00
96eb3c3491
a 2022-09-02 14:00:13 +07:00
a355767ea6
Move iterators to more appropriate places 2022-09-02 13:55:56 +07:00
a9d78fc31a
Quantum battery now display power level on client 2022-09-02 13:49:37 +07:00
cbea8873e9
Extract observed map from saved counting map 2022-09-02 12:54:02 +07:00
4e2928dbc7
fix popup code being invalid 2022-09-02 11:25:34 +07:00
915f3821db
ah yes, enslaved bonus slots in all menus 2022-09-02 11:21:02 +07:00
da3ae55d38
extendedItemIterator for player 2022-09-02 11:17:05 +07:00
1ff1587951
can you not 2022-09-02 11:16:16 +07:00
ee3dbda0fb
mmm 2022-09-02 11:12:48 +07:00
70dac3ba93
More streamlined iterators 2022-09-02 00:15:04 +07:00
e6b8b9b409
Clean up container iterators and move container extensions 2022-09-02 00:00:21 +07:00
ea701e70c9
Fix plate press recipe 2022-09-01 21:20:15 +07:00
a62ce62c9b
Merge remote-tracking branch 'origin/master' into master 2022-09-01 20:58:23 +07:00
4972ae5de7
A little removal 2022-09-01 20:58:13 +07:00
f902d466b3
Move extension functions around 2022-09-01 20:56:33 +07:00
b35cb71a80
Redo mattery worker machine 2022-09-01 20:41:29 +07:00
427fd43ea0
CompoundTag.map and CompoundTag.ifCompound 2022-09-01 19:32:24 +07:00
d80c1915f6
Remove item handler cacher since it is useless 2022-09-01 19:31:56 +07:00
cac5f399e4 Idiot moment 2022-09-01 18:02:39 +06:00
37c8dd039c Matter capacitor bank frame model update 2022-09-01 17:59:36 +06:00
4596219800 sword 2d/3d views restored (attempt 3) 2022-09-01 15:22:04 +06:00
30627a750a sword 2d/3d views restored (attempt 2) 2022-09-01 14:54:50 +06:00
7c5c37add3 sword 2d/3d views restored 2022-09-01 14:34:16 +06:00
ca90fd6f6e Battery inventory slot bg tweaks 2022-09-01 14:30:32 +06:00
cbb38c4122
Fix equipment slots being scrambled 2022-09-01 15:28:14 +07:00
3a257f0976
those are server -> client packets 2022-09-01 15:20:08 +07:00
2c568e46fc
Better scrollbar textures 2022-09-01 15:11:26 +07:00
db6c637ef7
Merge remote-tracking branch 'origin/master' into master 2022-09-01 14:53:01 +07:00
c9ca5f64f6
Pattern, equipment battery and matter capacitor slot backgrounds 2022-09-01 14:52:53 +07:00
f63a87298d
Battery slot background icon 2022-09-01 14:38:57 +07:00
b5f5b800cd
Research tree preview multiple scrollers 2022-09-01 13:41:10 +07:00
f80f9f82f2 Exosuit probe texture haha 2022-09-01 00:51:21 +06:00
7c9e5902c3 Fixed a big dumb 2022-08-31 23:52:46 +06:00
5d722152b0 Updated Tritanium helmet texture to fit the updated model; Added a unique detail for capacitor battery; Added emissive textures for OptiFine; 2022-08-31 23:41:46 +06:00
75fe096059
Improved, but not finished, android station GUI 2022-09-01 00:20:39 +07:00
4ecd5420e0 Android station minor model update 2022-08-31 22:22:53 +06:00
f136760ace
Add player slot listener to exosuit menu 2022-08-31 15:14:27 +07:00
177771b17c
Account for vanishing curse 2022-08-31 14:44:26 +07:00
121b1bbd24
Tick items also clientside 2022-08-31 14:37:23 +07:00
92c1c303db
Items in Exosuit now tick 2022-08-31 14:36:15 +07:00
6beab09cb6
Change condition order
since players most of time quick move crafting result
2022-08-31 14:27:16 +07:00
c8c4e2931f
Quick moving in exosuit inventory 2022-08-31 14:25:43 +07:00
b00182fc6e
Improve android research tree visual feedback 2022-08-31 14:00:12 +07:00
3593dd8bbc
Wide power gauge 2022-08-31 13:26:08 +07:00
65c36e44fa
StretchingRectangleElement 2022-08-31 12:46:33 +07:00
c28c66b56b
Update tests 2022-08-31 12:06:26 +07:00
ec886bf6ba
Display forward slash when research is already blocked by another research 2022-08-31 12:02:06 +07:00
4ed4ded681
Remove networking tests class 2022-08-31 11:27:25 +07:00
23eb879105
Drop exosuit inventory on death 2022-08-31 11:21:55 +07:00
7585da2a51
Add missing codecs 2022-08-31 11:06:48 +07:00
4037791a46
Use FieldSynchronizer to network everything in menus 2022-08-31 11:05:13 +07:00