Skip to content

Commit ec31ea8

Browse files
koxx12-devkoxx12-dev
committed
tabs n' shit
1 parent bf42999 commit ec31ea8

File tree

4 files changed

+270
-109
lines changed

4 files changed

+270
-109
lines changed

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ plugins {
2424

2525
archivesBaseName = 'Skyclient-Universal-Installer'
2626
group = "io.github.koxx12-dev"
27-
version = '2.0.0'
27+
version = '2.0.1'
2828

2929
compileJava {
3030
sourceCompatibility = targetCompatibility = "1.8"
@@ -36,7 +36,7 @@ repositories {
3636

3737
dependencies {
3838

39-
implementation 'com.formdev:flatlaf:1.6.5'
39+
implementation 'com.formdev:flatlaf:2.0.1'
4040
implementation 'com.google.code.gson:gson:2.8.9'
4141
implementation 'com.google.guava:guava:31.0.1-jre'
4242

‎src/main/java/io/github/koxx12dev/universal/SkyclientUniversal.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class SkyclientUniversal {
4545
}
4646
}
4747

48-
public static String version = "2.0.0";
48+
public static String version = "2.0.1";
4949
public static Gson gson = new Gson().newBuilder().setPrettyPrinting().create();
5050
public static String baseRepo = "https://raw.githubusercontent.com/nacrt/SkyblockClient-REPO/main";
5151
public static String baseCdn = "https://cdn.jsdelivr.net/gh/nacrt/SkyblockClient-REPO@main";
@@ -77,19 +77,21 @@ public static void main(String[] args) throws IOException {
7777

7878
skyclient = new File(minecraft, "skyclient");
7979

80-
launcherProfiles = gson.fromJson(FileUtil.readFile(minecraft.getAbsolutePath()+"\\launcher_profiles.json"), LauncherProfiles.class);
81-
80+
launcherProfiles = gson.fromJson(FileUtil.readFile(minecraft.getAbsolutePath()+"/launcher_profiles.json"), LauncherProfiles.class);
8281

8382
cache.mkdirs();
8483

8584
Installer installer = new Installer();
85+
86+
installer.initCategories();
87+
8688
for (int i = 0; i < mods.length-1; i++) {
8789
installer.addModPanel(i, i-1);
8890
}
8991
for (int i = 0; i < packs.length-1; i++) {
9092
installer.addPackPanel(i, i-1);
9193
}
92-
94+
//
9395
installer.init();
9496

9597
}

‎src/main/java/io/github/koxx12dev/universal/guis/Installer.form‎

Lines changed: 64 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2,75 +2,91 @@
22
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="io.github.koxx12dev.universal.guis.Installer">
33
<grid id="27dc6" binding="pane" layout-manager="GridBagLayout">
44
<constraints>
5-
<xy x="20" y="20" width="702" height="486"/>
5+
<xy x="139" y="20" width="583" height="458"/>
66
</constraints>
77
<properties/>
88
<border type="none"/>
99
<children>
10-
<scrollpane id="5f928" binding="ModScrollPane">
10+
<component id="2bcbf" class="javax.swing.JButton" binding="InstallButton">
1111
<constraints>
12-
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
13-
<gridbag top="1" left="1" bottom="1" right="1" weightx="0.0" weighty="0.0"/>
12+
<grid row="1" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
13+
<gridbag weightx="0.0" weighty="0.0"/>
1414
</constraints>
1515
<properties>
16-
<doubleBuffered value="false"/>
17-
<minimumSize width="250" height="300"/>
18-
<preferredSize width="270" height="360"/>
16+
<maximumSize width="100" height="30"/>
17+
<minimumSize width="100" height="30"/>
18+
<preferredSize width="100" height="30"/>
19+
<text value="Install"/>
1920
</properties>
20-
<border type="none"/>
21-
<children>
22-
<grid id="6756a" binding="ModPane" layout-manager="GridBagLayout">
23-
<constraints/>
24-
<properties/>
25-
<border type="none"/>
26-
<children/>
27-
</grid>
28-
</children>
29-
</scrollpane>
30-
<scrollpane id="a82b7" binding="PackScrollPane">
21+
</component>
22+
<tabbedpane id="a7990" binding="ModTabPane">
3123
<constraints>
32-
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
33-
<gridbag top="1" left="1" bottom="1" right="1" weightx="0.0" weighty="0.0"/>
24+
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
25+
<preferred-size width="200" height="200"/>
26+
</grid>
27+
<gridbag weightx="0.0" weighty="0.0"/>
3428
</constraints>
3529
<properties>
36-
<doubleBuffered value="false"/>
37-
<minimumSize width="250" height="300"/>
38-
<preferredSize width="270" height="360"/>
30+
<minimumSize width="250" height="400"/>
31+
<preferredSize width="270" height="460"/>
3932
</properties>
4033
<border type="none"/>
4134
<children>
42-
<grid id="a62f1" binding="PackPane" layout-manager="GridBagLayout">
43-
<constraints/>
44-
<properties/>
35+
<scrollpane id="5f928" binding="ModScrollPane">
36+
<constraints>
37+
<tabbedpane title="All"/>
38+
</constraints>
39+
<properties>
40+
<doubleBuffered value="false"/>
41+
<minimumSize width="250" height="300"/>
42+
<preferredSize width="270" height="360"/>
43+
</properties>
4544
<border type="none"/>
46-
<children/>
47-
</grid>
45+
<children>
46+
<grid id="6756a" binding="ModPane" layout-manager="GridBagLayout">
47+
<constraints/>
48+
<properties/>
49+
<border type="none"/>
50+
<children/>
51+
</grid>
52+
</children>
53+
</scrollpane>
4854
</children>
49-
</scrollpane>
50-
<vspacer id="b4232">
51-
<constraints>
52-
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
53-
<gridbag weightx="0.0" weighty="0.0"/>
54-
</constraints>
55-
</vspacer>
56-
<component id="2bcbf" class="javax.swing.JButton" binding="InstallButton">
55+
</tabbedpane>
56+
<tabbedpane id="e278b" binding="PackTabPane">
5757
<constraints>
58-
<grid row="2" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
58+
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
59+
<preferred-size width="200" height="200"/>
60+
</grid>
5961
<gridbag weightx="0.0" weighty="0.0"/>
6062
</constraints>
6163
<properties>
62-
<maximumSize width="100" height="30"/>
63-
<minimumSize width="100" height="30"/>
64-
<preferredSize width="100" height="30"/>
65-
<text value="Install"/>
64+
<minimumSize width="250" height="400"/>
65+
<preferredSize width="270" height="460"/>
6666
</properties>
67-
</component>
68-
<hspacer id="5d5ce">
69-
<constraints>
70-
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
71-
<gridbag weightx="0.0" weighty="0.0"/>
72-
</constraints>
73-
</hspacer>
67+
<border type="none"/>
68+
<children>
69+
<scrollpane id="a82b7" binding="PackScrollPane">
70+
<constraints>
71+
<tabbedpane title="All"/>
72+
</constraints>
73+
<properties>
74+
<doubleBuffered value="false"/>
75+
<minimumSize width="250" height="300"/>
76+
<preferredSize width="270" height="360"/>
77+
</properties>
78+
<border type="none"/>
79+
<children>
80+
<grid id="a62f1" binding="PackPane" layout-manager="GridBagLayout">
81+
<constraints/>
82+
<properties/>
83+
<border type="none"/>
84+
<children/>
85+
</grid>
86+
</children>
87+
</scrollpane>
88+
</children>
89+
</tabbedpane>
7490
</children>
7591
</grid>
7692
<inspectionSuppressions>

0 commit comments

Comments
 (0)