Skip to content

Commit 32336d3

Browse files
RedNestoRedNesto
committed
Merge branch '2022.2' into 2022.3
2 parents 38e46fb + cf8320d commit 32336d3

File tree

8 files changed

+316
-69
lines changed

8 files changed

+316
-69
lines changed

‎src/main/kotlin/facet/MinecraftFacetConfiguration.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class MinecraftFacetConfiguration : FacetConfiguration, PersistentStateComponent
2424
private var state = MinecraftFacetConfigurationData()
2525

2626
override fun createEditorTabs(editorContext: FacetEditorContext?, validatorsManager: FacetValidatorsManager?) =
27-
arrayOf(MinecraftFacetEditorTab(this))
27+
arrayOf(MinecraftFacetEditorTabV2(this))
2828

2929
override fun getState() = state
3030
override fun loadState(state: MinecraftFacetConfigurationData) {

‎src/main/kotlin/facet/MinecraftFacetEditorTab.form‎

Lines changed: 26 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.demonwav.mcdev.facet.MinecraftFacetEditorTab">
3-
<grid id="27dc6" binding="panel" layout-manager="GridLayoutManager" row-count="17" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="10" vgap="10">
3+
<grid id="27dc6" binding="panel" layout-manager="GridLayoutManager" row-count="16" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="10" vgap="10">
44
<margin top="10" left="10" bottom="10" right="10"/>
55
<constraints>
66
<xy x="20" y="20" width="500" height="682"/>
@@ -66,18 +66,9 @@
6666
<text value=""/>
6767
</properties>
6868
</component>
69-
<component id="c006" class="javax.swing.JLabel">
70-
<constraints>
71-
<grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
72-
</constraints>
73-
<properties>
74-
<icon value="assets/icons/platform/[email protected]"/>
75-
<text value=""/>
76-
</properties>
77-
</component>
7869
<component id="d80ff" class="javax.swing.JLabel" binding="mcpIcon">
7970
<constraints>
80-
<grid row="10" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
71+
<grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
8172
</constraints>
8273
<properties>
8374
<icon value="assets/icons/platform/[email protected]"/>
@@ -86,7 +77,7 @@
8677
</component>
8778
<component id="26afe" class="javax.swing.JLabel" binding="mixinIcon">
8879
<constraints>
89-
<grid row="11" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
80+
<grid row="10" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
9081
</constraints>
9182
<properties>
9283
<icon value="assets/icons/platform/[email protected]"/>
@@ -95,7 +86,7 @@
9586
</component>
9687
<component id="39d5b" class="javax.swing.JLabel">
9788
<constraints>
98-
<grid row="13" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
89+
<grid row="12" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
9990
</constraints>
10091
<properties>
10192
<icon value="assets/icons/platform/[email protected]"/>
@@ -142,33 +133,25 @@
142133
<text value="Forge"/>
143134
</properties>
144135
</component>
145-
<component id="32017" class="javax.swing.JLabel">
146-
<constraints>
147-
<grid row="9" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
148-
</constraints>
149-
<properties>
150-
<text value="LiteLoader"/>
151-
</properties>
152-
</component>
153136
<component id="66cc" class="javax.swing.JLabel">
154137
<constraints>
155-
<grid row="10" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
138+
<grid row="9" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
156139
</constraints>
157140
<properties>
158141
<text value="MCP"/>
159142
</properties>
160143
</component>
161144
<component id="dec47" class="javax.swing.JLabel">
162145
<constraints>
163-
<grid row="11" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
146+
<grid row="10" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
164147
</constraints>
165148
<properties>
166149
<text value="Mixin"/>
167150
</properties>
168151
</component>
169152
<component id="59796" class="javax.swing.JLabel">
170153
<constraints>
171-
<grid row="13" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
154+
<grid row="12" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
172155
</constraints>
173156
<properties>
174157
<text value="BungeeCord"/>
@@ -238,18 +221,9 @@
238221
<text value=""/>
239222
</properties>
240223
</component>
241-
<component id="1d6ee" class="javax.swing.JCheckBox" binding="liteloaderEnabledCheckBox">
242-
<constraints>
243-
<grid row="9" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
244-
</constraints>
245-
<properties>
246-
<enabled value="true"/>
247-
<text value=""/>
248-
</properties>
249-
</component>
250224
<component id="4c112" class="javax.swing.JCheckBox" binding="mcpEnabledCheckBox">
251225
<constraints>
252-
<grid row="10" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
226+
<grid row="9" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
253227
</constraints>
254228
<properties>
255229
<enabled value="true"/>
@@ -259,7 +233,7 @@
259233
</component>
260234
<component id="89c12" class="javax.swing.JCheckBox" binding="mixinEnabledCheckBox">
261235
<constraints>
262-
<grid row="11" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
236+
<grid row="10" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
263237
</constraints>
264238
<properties>
265239
<enabled value="true"/>
@@ -269,7 +243,7 @@
269243
</component>
270244
<component id="cb2d9" class="javax.swing.JCheckBox" binding="bungeecordEnabledCheckBox">
271245
<constraints>
272-
<grid row="13" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
246+
<grid row="12" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
273247
</constraints>
274248
<properties>
275249
<enabled value="true"/>
@@ -322,18 +296,9 @@
322296
<text value=""/>
323297
</properties>
324298
</component>
325-
<component id="3a46f" class="javax.swing.JCheckBox" binding="liteloaderAutoCheckBox">
326-
<constraints>
327-
<grid row="9" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
328-
</constraints>
329-
<properties>
330-
<selected value="false"/>
331-
<text value=""/>
332-
</properties>
333-
</component>
334299
<component id="ab12" class="javax.swing.JCheckBox" binding="mcpAutoCheckBox">
335300
<constraints>
336-
<grid row="10" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
301+
<grid row="9" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
337302
</constraints>
338303
<properties>
339304
<selected value="false"/>
@@ -342,7 +307,7 @@
342307
</component>
343308
<component id="e3307" class="javax.swing.JCheckBox" binding="mixinAutoCheckBox">
344309
<constraints>
345-
<grid row="11" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
310+
<grid row="10" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
346311
</constraints>
347312
<properties>
348313
<selected value="false"/>
@@ -351,7 +316,7 @@
351316
</component>
352317
<component id="b7266" class="javax.swing.JCheckBox" binding="bungeecordAutoCheckBox">
353318
<constraints>
354-
<grid row="13" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
319+
<grid row="12" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
355320
</constraints>
356321
<properties>
357322
<selected value="false"/>
@@ -360,23 +325,23 @@
360325
</component>
361326
<component id="82f90" class="javax.swing.JLabel">
362327
<constraints>
363-
<grid row="14" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
328+
<grid row="13" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
364329
</constraints>
365330
<properties>
366331
<text value="Waterfall"/>
367332
</properties>
368333
</component>
369334
<component id="b8445" class="javax.swing.JLabel">
370335
<constraints>
371-
<grid row="12" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
336+
<grid row="11" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
372337
</constraints>
373338
<properties>
374339
<text value="Velocity"/>
375340
</properties>
376341
</component>
377342
<component id="65657" class="javax.swing.JLabel">
378343
<constraints>
379-
<grid row="14" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
344+
<grid row="13" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
380345
</constraints>
381346
<properties>
382347
<icon value="assets/icons/platform/[email protected]"/>
@@ -385,7 +350,7 @@
385350
</component>
386351
<component id="1bd23" class="javax.swing.JLabel">
387352
<constraints>
388-
<grid row="12" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
353+
<grid row="11" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
389354
</constraints>
390355
<properties>
391356
<icon value="assets/icons/platform/[email protected]"/>
@@ -394,7 +359,7 @@
394359
</component>
395360
<component id="73379" class="javax.swing.JCheckBox" binding="waterfallEnabledCheckBox">
396361
<constraints>
397-
<grid row="14" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
362+
<grid row="13" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
398363
</constraints>
399364
<properties>
400365
<enabled value="true"/>
@@ -403,7 +368,7 @@
403368
</component>
404369
<component id="c10f3" class="javax.swing.JCheckBox" binding="velocityEnabledCheckBox">
405370
<constraints>
406-
<grid row="12" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
371+
<grid row="11" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
407372
</constraints>
408373
<properties>
409374
<enabled value="true"/>
@@ -412,7 +377,7 @@
412377
</component>
413378
<component id="35938" class="javax.swing.JCheckBox" binding="waterfallAutoCheckBox">
414379
<constraints>
415-
<grid row="14" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
380+
<grid row="13" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
416381
</constraints>
417382
<properties>
418383
<selected value="false"/>
@@ -421,7 +386,7 @@
421386
</component>
422387
<component id="a5eb2" class="javax.swing.JCheckBox" binding="velocityAutoCheckBox">
423388
<constraints>
424-
<grid row="12" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
389+
<grid row="11" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
425390
</constraints>
426391
<properties>
427392
<selected value="false"/>
@@ -463,7 +428,7 @@
463428
</component>
464429
<component id="80bac" class="javax.swing.JCheckBox" binding="adventureEnabledCheckBox">
465430
<constraints>
466-
<grid row="15" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
431+
<grid row="14" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
467432
</constraints>
468433
<properties>
469434
<enabled value="true"/>
@@ -472,20 +437,20 @@
472437
</component>
473438
<vspacer id="a91b3">
474439
<constraints>
475-
<grid row="16" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
440+
<grid row="15" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
476441
</constraints>
477442
</vspacer>
478443
<component id="df790" class="javax.swing.JLabel">
479444
<constraints>
480-
<grid row="15" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
445+
<grid row="14" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
481446
</constraints>
482447
<properties>
483448
<text value="Adventure"/>
484449
</properties>
485450
</component>
486451
<component id="fc586" class="javax.swing.JCheckBox" binding="adventureAutoCheckBox">
487452
<constraints>
488-
<grid row="15" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
453+
<grid row="14" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
489454
</constraints>
490455
<properties>
491456
<selected value="false"/>
@@ -494,7 +459,7 @@
494459
</component>
495460
<component id="154ee" class="javax.swing.JLabel">
496461
<constraints>
497-
<grid row="15" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
462+
<grid row="14" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
498463
</constraints>
499464
<properties>
500465
<icon value="assets/icons/platform/[email protected]"/>

‎src/main/kotlin/facet/MinecraftFacetEditorTab.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ class MinecraftFacetEditorTab(private val configuration: MinecraftFacetConfigura
3737
private lateinit var fabricAutoCheckBox: JCheckBox
3838
private lateinit var architecturyEnabledCheckBox: JCheckBox
3939
private lateinit var architecturyAutoCheckBox: JCheckBox
40-
private lateinit var liteloaderEnabledCheckBox: JCheckBox
41-
private lateinit var liteloaderAutoCheckBox: JCheckBox
4240
private lateinit var mcpEnabledCheckBox: JCheckBox
4341
private lateinit var mcpAutoCheckBox: JCheckBox
4442
private lateinit var mixinEnabledCheckBox: JCheckBox
@@ -65,7 +63,6 @@ class MinecraftFacetEditorTab(private val configuration: MinecraftFacetConfigura
6563
forgeEnabledCheckBox,
6664
fabricEnabledCheckBox,
6765
architecturyEnabledCheckBox,
68-
liteloaderEnabledCheckBox,
6966
mcpEnabledCheckBox,
7067
mixinEnabledCheckBox,
7168
bungeecordEnabledCheckBox,
@@ -84,7 +81,6 @@ class MinecraftFacetEditorTab(private val configuration: MinecraftFacetConfigura
8481
forgeAutoCheckBox,
8582
fabricAutoCheckBox,
8683
architecturyAutoCheckBox,
87-
liteloaderAutoCheckBox,
8884
mcpAutoCheckBox,
8985
mixinAutoCheckBox,
9086
bungeecordAutoCheckBox,
@@ -183,7 +179,6 @@ class MinecraftFacetEditorTab(private val configuration: MinecraftFacetConfigura
183179
)
184180
}
185181

186-
liteloaderEnabledCheckBox.addActionListener { also(liteloaderEnabledCheckBox, mcpEnabledCheckBox) }
187182
mixinEnabledCheckBox.addActionListener { also(mixinEnabledCheckBox, mcpEnabledCheckBox) }
188183

189184
bungeecordEnabledCheckBox.addActionListener { unique(bungeecordEnabledCheckBox, waterfallEnabledCheckBox) }

0 commit comments

Comments
 (0)