Merge remote-tracking branch 'upstream/HEAD'

Author: 1zun4

bundle.cjs

@@ -10,10 +10,10 @@ if (fs.existsSync("resources")) {
     log("Deleted resources folder");
 }
 
-fs.mkdirSync("resources/resources/liquidbounce", { recursive: true });
+fs.mkdirSync("resources/resources/liquidbounce/themes", { recursive: true });
 
 // Create a zip archive
-const output = fs.createWriteStream("resources/resources/liquidbounce/default_theme.zip");
+const output = fs.createWriteStream("resources/resources/liquidbounce/themes/liquidbounce.zip");
 const archive = archiver("zip", {});
 
 output.on("close", () => {

index.html

@@ -5,9 +5,38 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>JelloBounce UI</title>
-    <link rel="preload" href="./assets/font/sf-pro/SFPRODISPLAYBOLD.ttf" as="font" crossorigin="anonymous">
-    <link rel="preload" href="./assets/font/sf-pro/SFPRODISPLAYMEDIUM.ttf" as="font" crossorigin="anonymous">
-    <link rel="preload" href="./assets/font/sf-pro/SFPRODISPLAYREGULAR.ttf" as="font" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Borel-Regular.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Inter-Black.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Inter-Bold.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Inter-ExtraBold.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Inter-ExtraLight.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Inter-Light.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Inter-Medium.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Inter-Regular.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Inter-SemiBold.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Inter-Thin.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/SFPRODISPLAYBOLD.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/SFPRODISPLAYMEDIUM.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/SFPRODISPLAYREGULAR.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-Black.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-BlackItalic.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-Bold.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-BoldItalic.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-ExtraBold.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-ExtraBoldItalic.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-ExtraLight.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-ExtraLightItalic.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-Italic.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-Light.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-LightItalic.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-Medium.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-MediumItalic.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-Regular.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-SemiBold.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-SemiBoldItalic.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-Thin.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-ThinItalic.ttf" as="font" type="font/ttf" crossorigin="anonymous">
+    <link rel="preload" href="/fonts/Urbanist-VariableFont_wght.ttf" as="font" type="font/ttf" crossorigin="anonymous">
 </head>
 
 <body>

public/background.frag

@@ -0,0 +1,11 @@
+{
+  "name": "ArmorItems",
+  "enabled": false,
+  "singleton": true,
+  "alignment": {
+    "horizontalAlignment": "CenterTranslated",
+    "horizontalOffset": 225,
+    "verticalAlignment": "Bottom",
+    "verticalOffset": 15
+  }
+}

public/background.png

@@ -0,0 +1,11 @@
+{
+  "name": "ArrayList",
+  "enabled": true,
+  "singleton": true,
+  "alignment": {
+    "horizontalAlignment": "Right",
+    "horizontalOffset": 15,
+    "verticalAlignment": "Top",
+    "verticalOffset": 15
+  }
+}

public/background1.png public/backgrounds/background1.pngpublic/background1.png renamed to public/backgrounds/background1.png

@@ -0,0 +1,11 @@
+{
+  "name": "BlockCounter",
+  "enabled": true,
+  "singleton": true,
+  "alignment": {
+    "horizontalAlignment": "CenterTranslated",
+    "horizontalOffset": 0,
+    "verticalAlignment": "Center",
+    "verticalOffset": 300
+  }
+}

public/background2.png public/backgrounds/background2.pngpublic/background2.png renamed to public/backgrounds/background2.png

@@ -0,0 +1,11 @@
+{
+  "name": "CraftingInventory",
+  "enabled": false,
+  "singleton": true,
+  "alignment": {
+    "horizontalAlignment": "Right",
+    "horizontalOffset": 15,
+    "verticalAlignment": "Bottom",
+    "verticalOffset": 150
+  }
+}