Skip to content

Commit dacc6de

Browse files
committed
Separate Instance and Minecraft Directory Selection
1 parent 66323cb commit dacc6de

File tree

2 files changed

+128
-22
lines changed

2 files changed

+128
-22
lines changed

src/main/java/net/hypercubemc/iris_installer/NewInstaller.form

Lines changed: 59 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,9 @@
1010
<Property name="iconImage" type="java.awt.Image" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
1111
<Connection code="new ImageIcon(Objects.requireNonNull(Utils.class.getClassLoader().getResource(&quot;iris_profile_icon.png&quot;))).getImage()" type="code"/>
1212
</Property>
13-
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
14-
<Dimension value="[480, 550]"/>
15-
</Property>
1613
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
1714
<Dimension value="[480, 550]"/>
1815
</Property>
19-
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
20-
<Dimension value="[480, 550]"/>
21-
</Property>
2216
<Property name="resizable" type="boolean" value="false"/>
2317
</Properties>
2418
<SyntheticProperties>
@@ -171,6 +165,7 @@
171165
</Property>
172166
<Property name="horizontalAlignment" type="int" value="0"/>
173167
<Property name="text" type="java.lang.String" value="Installation directory:"/>
168+
<Property name="toolTipText" type="java.lang.String" value="The directory to place your Iris and Sodium installation."/>
174169
<Property name="horizontalTextPosition" type="int" value="0"/>
175170
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
176171
<Dimension value="[300, 24]"/>
@@ -243,6 +238,33 @@
243238
</Component>
244239
</SubComponents>
245240
</Container>
241+
<Component class="javax.swing.JLabel" name="minecraftDirectoryLabel">
242+
<Properties>
243+
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
244+
<FontInfo relative="true">
245+
<Font bold="true" component="minecraftDirectoryLabel" property="font" relativeSize="false" size="16"/>
246+
</FontInfo>
247+
</Property>
248+
<Property name="horizontalAlignment" type="int" value="0"/>
249+
<Property name="text" type="java.lang.String" value="Minecraft directory:"/>
250+
<Property name="toolTipText" type="java.lang.String" value="The directory containing your Minecraft installations and launcher data."/>
251+
<Property name="horizontalTextPosition" type="int" value="0"/>
252+
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
253+
<Dimension value="[300, 24]"/>
254+
</Property>
255+
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
256+
<Dimension value="[165, 24]"/>
257+
</Property>
258+
</Properties>
259+
<AccessibilityProperties>
260+
<Property name="AccessibleContext.accessibleName" type="java.lang.String" value="Minecraft directory"/>
261+
</AccessibilityProperties>
262+
<Constraints>
263+
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
264+
<GridBagConstraints gridX="1" gridY="10" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
265+
</Constraint>
266+
</Constraints>
267+
</Component>
246268
<Component class="javax.swing.JComboBox" name="gameVersionList">
247269
<Properties>
248270
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
@@ -300,6 +322,7 @@
300322
<Font component="directoryName" property="font" relativeSize="false" size="16"/>
301323
</FontInfo>
302324
</Property>
325+
<Property name="toolTipText" type="java.lang.String" value="The directory to place your Iris and Sodium installation."/>
303326
<Property name="label" type="java.lang.String" value="Directory Name"/>
304327
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
305328
<Dimension value="[300, 36]"/>
@@ -341,7 +364,7 @@
341364
</Properties>
342365
<Constraints>
343366
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
344-
<GridBagConstraints gridX="1" gridY="10" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="40" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
367+
<GridBagConstraints gridX="1" gridY="12" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="40" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
345368
</Constraint>
346369
</Constraints>
347370
</Component>
@@ -372,7 +395,35 @@
372395
</AuxValues>
373396
<Constraints>
374397
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
375-
<GridBagConstraints gridX="1" gridY="11" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="0" insetsBottom="30" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
398+
<GridBagConstraints gridX="1" gridY="13" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="0" insetsBottom="30" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
399+
</Constraint>
400+
</Constraints>
401+
</Component>
402+
<Component class="javax.swing.JButton" name="minecraftDirectoryName">
403+
<Properties>
404+
<Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
405+
<FontInfo relative="true">
406+
<Font component="minecraftDirectoryName" property="font" relativeSize="false" size="16"/>
407+
</FontInfo>
408+
</Property>
409+
<Property name="toolTipText" type="java.lang.String" value="The directory containing your Minecraft installations and launcher data."/>
410+
<Property name="label" type="java.lang.String" value="Directory Name"/>
411+
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
412+
<Dimension value="[300, 36]"/>
413+
</Property>
414+
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
415+
<Dimension value="[300, 36]"/>
416+
</Property>
417+
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
418+
<Dimension value="[300, 36]"/>
419+
</Property>
420+
</Properties>
421+
<Events>
422+
<EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="minecraftDirectoryNameMouseClicked"/>
423+
</Events>
424+
<Constraints>
425+
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
426+
<GridBagConstraints gridX="1" gridY="11" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
376427
</Constraint>
377428
</Constraints>
378429
</Component>

0 commit comments

Comments
 (0)