Update to 2024.7

danieldieeins · Jul 3, 2024 · f17e230 · f17e230
1 parent 4dfedb1
commit f17e230
Show file tree

Hide file tree

Showing 81 changed files with 87 additions and 82 deletions.
diff --git a/application-main/pom.xml b/application-main/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.zyneonstudios</groupId>
         <artifactId>application-parent</artifactId>
-        <version>2024.6</version>
+        <version>2024.7</version>
     </parent>
 
     <artifactId>application-main</artifactId>
-    <version>2024.6.4</version>
+    <version>2024.7</version>
 
     <properties>
         <maven.compiler.source>21</maven.compiler.source>
@@ -31,27 +31,27 @@
         <dependency>
             <groupId>com.zyneonstudios</groupId>
             <artifactId>nexus-zyndex</artifactId>
-            <version>2024.4.3.2</version>
+            <version>2024.7</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.zyneonstudios</groupId>
             <artifactId>nexus-auth</artifactId>
-            <version>2024.4.2</version>
+            <version>2024.7</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.zyneonstudios</groupId>
             <artifactId>verget-all</artifactId>
-            <version>2024.4.2.2</version>
+            <version>2024.6</version>
             <scope>compile</scope>
         </dependency>
 
         <!--Dependencies by FlowArg-->
         <dependency>
             <groupId>fr.flowarg</groupId>
             <artifactId>flowupdater</artifactId>
-            <version>1.8.4</version>
+            <version>LATEST</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/application-main/src/main/java/com/zyneonstudios/Main.java b/application-main/src/main/java/com/zyneonstudios/Main.java
@@ -32,9 +32,9 @@ public static void main(String[] args) {
         splash = new ZyneonSplash();
         splash.setVisible(true);
         FileUtil.deleteFolder(new File(getDirectoryPath()+"temp/"));
-        version = "2024.6.4";
+        version = "2024.7";
         ArrayList<String> arguments = new ArrayList<>();
-        String name = "Tricky Protonium²";
+        String name = "Transitum";
         architecture = getArchitecture();
         logger = new ZLogger("ZYNEON");
         String fullVersion = version+" ▪ "+name;
@@ -45,7 +45,9 @@ public static void main(String[] args) {
             switch (arg) {
                 case "--test" -> {
                     test = true;
-                    fullVersion = version + " ▪ " + new SimpleDateFormat("yyyyMMdd-HHmmss").format(Calendar.getInstance().getTime());
+                    version = new SimpleDateFormat("yyyy.M.d-HHmmss").format(Calendar.getInstance().getTime());
+                    name = "Test";
+                    fullVersion = version+" ▪ "+name;
                 }
                 case "--debug" -> {
                     logger.setDebugEnabled(true);

diff --git a/application-main/src/main/java/com/zyneonstudios/application/installer/ForgeInstaller.java b/application-main/src/main/java/com/zyneonstudios/application/installer/ForgeInstaller.java
@@ -20,7 +20,6 @@ public boolean download(String minecraftVersion, String forgeVersion, ForgeVersi
         UpdaterOptions options = new UpdaterOptions.UpdaterOptionsBuilder()
                 .build();
 
-        System.out.println(forgeVersion);
         AbstractForgeVersion forge = new ForgeVersionBuilder(type)
                 .withForgeVersion(forgeVersion)
                 .build();

diff --git a/application-main/src/main/java/com/zyneonstudios/application/installer/LabyModInstaller.java b/application-main/src/main/java/com/zyneonstudios/application/installer/LabyModInstaller.java
@@ -20,7 +20,6 @@ public boolean download(String minecraftVersion, String forgeVersion, ForgeVersi
         UpdaterOptions options = new UpdaterOptions.UpdaterOptionsBuilder()
                 .build();
 
-        System.out.println(forgeVersion);
         AbstractForgeVersion forge = new ForgeVersionBuilder(type)
                 .withForgeVersion(forgeVersion)
                 .build();

diff --git a/...ication-main/src/main/java/com/zyneonstudios/application/installer/NeoForgeInstaller.java b/...ication-main/src/main/java/com/zyneonstudios/application/installer/NeoForgeInstaller.java
@@ -20,7 +20,6 @@ public boolean download(String minecraftVersion, String forgeVersion, Path insta
         UpdaterOptions options = new UpdaterOptions.UpdaterOptionsBuilder()
                 .build();
 
-        System.out.println(forgeVersion);
         AbstractForgeVersion forge = new ForgeVersionBuilder(ForgeVersionType.NEO_FORGE)
                 .withForgeVersion(forgeVersion)
                 .build();

diff --git a/...in/src/main/java/com/zyneonstudios/application/integrations/zyndex/ZyndexIntegration.java b/...in/src/main/java/com/zyneonstudios/application/integrations/zyndex/ZyndexIntegration.java
@@ -160,7 +160,6 @@ public static WritableInstance update(WritableInstance localInstance) {
                     }
                     Main.getLogger().debug("[ZYNDEX] Updated instance!");
                 }
-                System.out.println(onlineInstance.getMinecraftVersion());
                 localInstance.setMinecraftVersion(onlineInstance.getMinecraftVersion());
                 return localInstance;
             }

diff --git a/application-main/src/main/resources/content.zip b/application-main/src/main/resources/content.zip
diff --git a/application-ui/content/assets/zyneon/css/themes/custom/instances.css b/application-ui/content/assets/zyneon/css/themes/custom/instances.css
@@ -10,18 +10,18 @@
 .menu ul li a .instance-item.active,.instance-item#selected {
     color: #fff;
     background: var(--accent);
-    box-shadow: 0 0 0.8rem var(--accent);
+    box-shadow: 0 0 0.4rem var(--accent);
 }
 
 .menu ul li a .instance-item.active:hover,.instance-item#selected:hover {
     color: #fff;
     background: var(--accent);
-    box-shadow: 0 0 0.8rem var(--accent);
+    box-shadow: 0 0 0.4rem var(--accent);
 }
 
 .menu ul li a .instance-item:hover {
     background: var(--highlight);
-    box-shadow: 0 0 0.8rem var(--highlight);
+    box-shadow: 0 0 0.4rem var(--highlight);
     transition: 0.5s;
     cursor: pointer;
 }
@@ -125,7 +125,7 @@
 
 .content #instance-view .card#title-card .buttons i:hover {
     z-index: 2000;
-    box-shadow: 0 0 0.8rem var(--color);
+    box-shadow: 0 0 0.4rem var(--color);
     color: var(--background-accent);
     background: var(--color);
 }
@@ -166,7 +166,7 @@
 
 .content #instance-view .card#title-card .buttons .folder-dropdown .card h3:hover {
     color: var(--background-accent);
-    box-shadow: 0 0 0.8rem var(--color);
+    box-shadow: 0 0 0.4rem var(--color);
     background: var(--color);
     border-radius: 0.5rem;
     cursor: pointer;
@@ -184,7 +184,7 @@
 }
 
 .content #instance-view #instance-settings .card {
-    box-shadow: 0 0 0.4rem black;
+    box-shadow: 0 0 0.4rem var(--background-accent);
 }
 
 .content #instance-view #instance-settings h3 {
@@ -254,7 +254,7 @@
     cursor: pointer;
     color: #fff;
     background-color: var(--accent);
-    box-shadow: 0 0 0.8rem var(--accent);
+    box-shadow: 0 0 0.4rem var(--accent);
     transition: 0.25s;
 }
 
@@ -271,7 +271,7 @@
 .content #instance-view #instance-settings h3 a.button#delete-instance:hover {
     color: white;
     background: red;
-    box-shadow: 0 0 0.8rem red;
+    box-shadow: 0 0 0.4rem red;
     animation: wiggle 0.1s linear infinite;
 }
 
@@ -339,7 +339,7 @@
     bottom: 0;
     height: 8rem;
     width: 100%;
-    box-shadow: 0 0 0.8rem #000;
+    box-shadow: 0 0 0.4rem var(--background-accent);
     z-index: 99;
     background: var(--background4);
 }
@@ -361,7 +361,7 @@
 
 .content .dock a.button#launch:hover {
     background: var(--accent);
-    box-shadow: 0 0 0.8rem var(--accent);
+    box-shadow: 0 0 0.4rem var(--accent);
     animation: wiggle 2.5s linear infinite;
 }
 
@@ -385,7 +385,7 @@
     cursor: pointer;
     color: #fff;
     background-color: var(--accent);
-    box-shadow: 0 0 0.8rem var(--accent);
+    box-shadow: 0 0 0.4rem var(--accent);
     transition: 0.25s;
 }
 
@@ -434,7 +434,7 @@
     cursor: pointer;
     color: #fff;
     background-color: var(--accent);
-    box-shadow: 0 0 0.8rem var(--accent);
+    box-shadow: 0 0 0.4rem var(--accent);
     transition: 0.25s;
 }
 

diff --git a/application-ui/content/assets/zyneon/css/themes/custom/settings.css b/application-ui/content/assets/zyneon/css/themes/custom/settings.css
@@ -28,7 +28,7 @@
 
 .menu-item#exit:hover {
     background: red;
-    box-shadow: 0 0 0.8rem red;
+    box-shadow: 0 0 0.4rem red;
     animation: wiggle 0.1s linear infinite;
 }
 

diff --git a/application-ui/content/assets/zyneon/css/themes/custom/shared.css b/application-ui/content/assets/zyneon/css/themes/custom/shared.css
@@ -50,7 +50,7 @@ body {
     overflow: hidden;
     flex-shrink: 0;
     position: relative;
-    box-shadow: 0 0 0.8rem #000;
+    box-shadow: 0 0 0.4rem var(--background-accent);
     background: var(--background-accent);
     transition: 0.5s;
     padding: 1rem;
@@ -166,7 +166,7 @@ body {
 
 .menu ul li a .menu-item:hover {
     background: var(--highlight);
-    box-shadow: 0 0 0.8rem var(--highlight);
+    box-shadow: 0 0 0.4rem var(--highlight);
     transition: 0.5s;
     cursor: pointer;
 }
@@ -228,7 +228,7 @@ body {
 .menu ul li a .menu-item.active,.menu-item#selected {
     color: #fff;
     background: var(--accent);
-    box-shadow: 0 0 0.8rem var(--accent);
+    box-shadow: 0 0 0.4rem var(--accent);
 }
 
 .menu ul li a .menu-item.active:hover span,i,.menu ul li a .menu-item#selected:hover span,i {
@@ -354,7 +354,7 @@ body {
 
 ::-webkit-scrollbar-thumb {
     background: rgba(0, 0, 0, 0.5);
-    box-shadow: 0 0 5rem #000;
+    box-shadow: 0 0 5rem var(--background-accent);
     border-radius: 1rem;
 }
 
@@ -373,7 +373,7 @@ body {
     font-size: 1.05rem;
     padding: 0.5rem 0.5rem 0.325rem 0.5rem;
     border-radius: 0.5rem;
-    box-shadow: 0 0 0.8rem #000;
+    box-shadow: 0 0 0.4rem var(--background-accent);
     z-index: 5;
     color: var(--color);
     background-color: var(--background-accent);
@@ -384,7 +384,7 @@ body {
     font-size: large;
     color: #fff;
     background-color: var(--accent);
-    box-shadow: 0 0 0.8rem var(--accent);
+    box-shadow: 0 0 0.4rem var(--accent);
     transition: 0.25s;
     z-index: 999;
 }
@@ -407,7 +407,7 @@ body {
 .content .card {
     border-radius: 0.5rem;
     background: var(--background2);
-    box-shadow: 0 0 0.8rem #000;
+    box-shadow: 0 0 0.4rem var(--background-accent);
     margin-bottom: 1.5rem;
 }
 

diff --git a/application-ui/content/assets/zyneon/css/themes/default/instances.css b/application-ui/content/assets/zyneon/css/themes/default/instances.css
@@ -10,18 +10,18 @@
 .menu ul li a .instance-item.active,.instance-item#selected {
     color: #fff;
     background: var(--accent);
-    box-shadow: 0 0 0.8rem var(--accent);
+    box-shadow: 0 0 0.4rem var(--accent);
 }
 
 .menu ul li a .instance-item.active:hover,.instance-item#selected:hover {
     color: #fff;
     background: var(--accent);
-    box-shadow: 0 0 0.8rem var(--accent);
+    box-shadow: 0 0 0.4rem var(--accent);
 }
 
 .menu ul li a .instance-item:hover {
     background: var(--highlight);
-    box-shadow: 0 0 0.8rem var(--highlight);
+    box-shadow: 0 0 0.4rem var(--highlight);
     transition: 0.5s;
     cursor: pointer;
 }
@@ -125,7 +125,7 @@
 
 .content #instance-view .card#title-card .buttons i:hover {
     z-index: 2000;
-    box-shadow: 0 0 0.8rem var(--color);
+    box-shadow: 0 0 0.4rem var(--color);
     color: var(--background-accent);
     background: var(--color);
 }
@@ -166,7 +166,7 @@
 
 .content #instance-view .card#title-card .buttons .folder-dropdown .card h3:hover {
     color: var(--background-accent);
-    box-shadow: 0 0 0.8rem var(--color);
+    box-shadow: 0 0 0.4rem var(--color);
     background: var(--color);
     border-radius: 0.5rem;
     cursor: pointer;
@@ -184,7 +184,7 @@
 }
 
 .content #instance-view #instance-settings .card {
-    box-shadow: 0 0 0.4rem black;
+    box-shadow: 0 0 0.4rem var(--background-accent);
 }
 
 .content #instance-view #instance-settings h3 {
@@ -254,7 +254,7 @@
     cursor: pointer;
     color: #fff;
     background-color: var(--accent);
-    box-shadow: 0 0 0.8rem var(--accent);
+    box-shadow: 0 0 0.4rem var(--accent);
     transition: 0.25s;
 }
 
@@ -271,7 +271,7 @@
 .content #instance-view #instance-settings h3 a.button#delete-instance:hover {
     color: white;
     background: red;
-    box-shadow: 0 0 0.8rem red;
+    box-shadow: 0 0 0.4rem red;
     animation: wiggle 0.1s linear infinite;
 }
 
@@ -339,7 +339,7 @@
     bottom: 0;
     height: 8rem;
     width: 100%;
-    box-shadow: 0 0 0.8rem #000;
+    box-shadow: 0 0 0.4rem var(--background-accent);
     z-index: 99;
     background: var(--background4);
 }
@@ -361,7 +361,7 @@
 
 .content .dock a.button#launch:hover {
     background: var(--accent);
-    box-shadow: 0 0 0.8rem var(--accent);
+    box-shadow: 0 0 0.4rem var(--accent);
     animation: wiggle 2.5s linear infinite;
 }
 
@@ -385,7 +385,7 @@
     cursor: pointer;
     color: #fff;
     background-color: var(--accent);
-    box-shadow: 0 0 0.8rem var(--accent);
+    box-shadow: 0 0 0.4rem var(--accent);
     transition: 0.25s;
 }
 
@@ -434,7 +434,7 @@ select#creator-minecraft,select#creator-modloader,select#creator-type,select#cre
     cursor: pointer;
     color: #fff;
     background-color: var(--accent);
-    box-shadow: 0 0 0.8rem var(--accent);
+    box-shadow: 0 0 0.4rem var(--accent);
     transition: 0.25s;
 }
 

diff --git a/application-ui/content/assets/zyneon/css/themes/default/settings.css b/application-ui/content/assets/zyneon/css/themes/default/settings.css
@@ -28,7 +28,7 @@
 
 .menu-item#exit:hover {
     background: red;
-    box-shadow: 0 0 0.8rem red;
+    box-shadow: 0 0 0.4rem red;
     animation: wiggle 0.1s linear infinite;
 }