[no ci] release 1.2.0

Reviewed-on: #33

README.md

@@ -16,6 +16,7 @@
 <p align="center">
   <img src=".github/media/preview.gif" />
 </p>
+
 ---
 
 ## Key Features
@@ -27,6 +28,7 @@
 * Watch roll results (also available as Browser Source in OBS)
 
 ---
+
 ## Start Container
 
 You can start dice-tower with docker compose

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.arindy</groupId>
     <artifactId>dice-tower</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
 
     <properties>
         <compiler-plugin.version>3.13.0</compiler-plugin.version>

src/main/kotlin/de/arindy/dicetower/ChatOverlayResource.kt

@@ -23,11 +23,12 @@ class ChatOverlayResource {
         @QueryParam("subsAllowed") subsAllowed: Boolean = false,
         @QueryParam("cmd") cmd: String? = "roll",
         @QueryParam("theme") theme: String? = "default",
-        @QueryParam("themeColor") themeColor: String? = "default",
+        @QueryParam("faceColor") faceColor: String? = "#ff0202",
+        @QueryParam("numberColor") numberColor: String? = "#ffffff",
         @QueryParam("clearAfter") clearAfter: Long? = -1,
         @QueryParam("timeout") timeout: Long? = -1
     ): TemplateInstance {
-        return Templates.chatoverlay(channel, scale ?: 7, maxDice ?: 20, modsAllowed, vipAllowed, subsAllowed, cmd ?: "roll", theme ?: "default", themeColor ?: "ff0202", clearAfter ?: 10, timeout ?: 60)
+        return Templates.chatoverlay(channel, scale ?: 7, maxDice ?: 20, modsAllowed, vipAllowed, subsAllowed, cmd ?: "roll", theme ?: "default", faceColor ?: "#ff0202", numberColor ?: "#ffffff", clearAfter ?: 10, timeout ?: 60)
     }
 
     @GET

src/main/kotlin/de/arindy/dicetower/DiceResource.kt

@@ -53,10 +53,10 @@ final class DiceResource(@Context val sse: Sse) {
                 .mediaType(MediaType.APPLICATION_JSON_TYPE).data(data).build()
         )
         if (data.roll.all { it.trim().isNotEmpty() }) {
-            results(data.room!!, Result(data.name, data.user!!, data.themeColor, null))
+            results(data.room!!, Result(data.name, data.user!!, data.faceColor, null))
         }
         Thread.sleep(1000)
-        results(data.room!!, Result(data.name, data.user!!, data.themeColor, results.toTypedArray()))
+        results(data.room!!, Result(data.name, data.user!!, data.faceColor, results.toTypedArray()))
     }
 
     @POST
@@ -110,7 +110,7 @@ final class DiceResource(@Context val sse: Sse) {
     }
 
     @RegisterForReflection
-    data class Result(val name: String, val user: String, val themeColor: String, val results: Array<Results>?) {
+    data class Result(val name: String, val user: String, val faceColor: String, val results: Array<Results>?) {
         override fun equals(other: Any?): Boolean {
             if (this === other) return true
             if (javaClass != other?.javaClass) return false
@@ -119,7 +119,7 @@ final class DiceResource(@Context val sse: Sse) {
 
             if (name != other.name) return false
             if (user != other.user) return false
-            if (themeColor != other.themeColor) return false
+            if (faceColor != other.faceColor) return false
             if (results != null) {
                 if (other.results == null) return false
                 if (!results.contentEquals(other.results)) return false
@@ -131,7 +131,7 @@ final class DiceResource(@Context val sse: Sse) {
         override fun hashCode(): Int {
             var result = name.hashCode()
             result = 31 * result + user.hashCode()
-            result = 31 * result + themeColor.hashCode()
+            result = 31 * result + faceColor.hashCode()
             result = 31 * result + (results?.contentHashCode() ?: 0)
             return result
         }

src/main/kotlin/de/arindy/dicetower/RollPayload.kt

@@ -1,11 +1,14 @@
 package de.arindy.dicetower
 
+import io.quarkus.runtime.annotations.RegisterForReflection
+
+@RegisterForReflection
 data class RollPayload(
     val name: String,
     var command: String,
     var predetermined: Boolean? = false,
-    val themeColor: String = "white",
-    val themeForegroundColor: String = "white",
+    val faceColor: String = "white",
+    val numberColor: String = "white",
     val theme: String = "default",
     var room: String?,
     var user: String?,

src/main/kotlin/de/arindy/dicetower/Templates.kt

@@ -27,7 +27,8 @@ object Templates {
         subsAllowed: Boolean,
         cmd: String?,
         theme: String?,
-        themeColor: String?,
+        faceColor: String?,
+        numberColor: String?,
         clearAfter: Long?,
         timeout: Long?
     ): TemplateInstance

src/main/resources/META-INF/resources/app.js

@@ -48,11 +48,11 @@ function start(event = undefined) {
         if (localStorage.getItem(document.getElementById('name').value + "-theme")) {
             document.getElementById('theme').value = localStorage.getItem(document.getElementById('name').value + "-theme")
         }
-        if (localStorage.getItem(document.getElementById('name').value + "-themeColor")) {
-            document.getElementById('themeColor').setColor(localStorage.getItem(document.getElementById('name').value + "-themeColor"));
+        if (localStorage.getItem(document.getElementById('name').value + "-faceColor")) {
+            document.getElementById('faceColor').setColor(localStorage.getItem(document.getElementById('name').value + "-faceColor"));
         }
-        if (localStorage.getItem(document.getElementById('name').value + "-themeForegroundColor")) {
-            document.getElementById('themeForegroundColor').setColor(localStorage.getItem(document.getElementById('name').value + "-themeForegroundColor"));
+        if (localStorage.getItem(document.getElementById('name').value + "-numberColor")) {
+            document.getElementById('numberColor').setColor(localStorage.getItem(document.getElementById('name').value + "-numberColor"));
         }
 
         if (!localStorage.getItem(document.getElementById('name').value + '-started')) {
@@ -131,8 +131,8 @@ function roll(event) {
         httpRequest.send(JSON.stringify({
             name: document.getElementById('name').value,
             command: document.getElementById('command').value,
-            themeColor: document.getElementById('themeColor').value,
-            themeForegroundColor: document.getElementById('themeForegroundColor').value,
+            faceColor: document.getElementById('faceColor').value,
+            numberColor: document.getElementById('numberColor').value,
             theme: document.getElementById('theme').value
         }))
     }
@@ -140,8 +140,8 @@ function roll(event) {
 
 function saveDice() {
     localStorage.setItem(document.getElementById('name').value + "-theme", document.getElementById('theme').value)
-    localStorage.setItem(document.getElementById('name').value + "-themeColor", document.getElementById('themeColor').value)
-    localStorage.setItem(document.getElementById('name').value + "-themeForegroundColor", document.getElementById('themeForegroundColor').value)
+    localStorage.setItem(document.getElementById('name').value + "-faceColor", document.getElementById('faceColor').value)
+    localStorage.setItem(document.getElementById('name').value + "-numberColor", document.getElementById('numberColor').value)
 }
 
 function configurePopover() {
@@ -190,6 +190,7 @@ document.addEventListener("DOMContentLoaded", async () => {
     document.querySelector('meta[property="twitter:url"]').setAttribute("content", url());
     document.querySelector('meta[property="og:image"]').setAttribute("content", url() + '/rich.png');
     document.querySelector('meta[name="twitter:image"]').setAttribute("content", url() + '/rich.png');
+    document.querySelector('meta[property="twitter:domain"]').setAttribute("content", window.location.hostname);
 
     if (localStorage.getItem('last-name') && localStorage.getItem('last-room')) {
         document.getElementById('name').value = localStorage.getItem('last-name');
@@ -218,6 +219,3 @@ document.addEventListener("DOMContentLoaded", async () => {
     configurePopover();
 })
 
-if (!localStorage.getItem("userId")) {
-    localStorage.setItem("userId", self.crypto.randomUUID());
-}

src/main/resources/META-INF/resources/dice-preview.js

@@ -115,8 +115,8 @@ document.addEventListener("DOMContentLoaded", async () => {
         diceBox.clearDice();
         await diceBox.updateConfig({
             theme_customColorset: {
-                background: document.getElementById('themeColor').value,
-                foreground: document.getElementById('themeForegroundColor').value,
+                background: document.getElementById('faceColor').value,
+                foreground: document.getElementById('numberColor').value,
                 texture: document.getElementById('theme').value
             }
         });

src/main/resources/META-INF/resources/rich-preview.js

@@ -1,40 +0,0 @@
-const title = `${document.querySelector('title').textContent}`
-const dexcription = ` Easy to use online dice rolling with customizable overlays.`
-function url() {
-    return window.location.protocol + '//' + window.location.hostname + (window.location.port?.length > 0 ? ':' + window.location.port : '');
-}
-
-const image = url() + '/rich.png'
-
-function createMetaTag(name, property, content) {
-    let tag = document.createElement('meta');
-    if (name) {
-        tag.setAttribute('name', name)
-    }
-    if (property) {
-        tag.setAttribute('property', property)
-    }
-    tag.setAttribute('content', content)
-    return tag;
-}
-
-function createTags() {
-    return [
-        createMetaTag('description', undefined, dexcription),
-        createMetaTag(undefined, 'og:url', url()),
-        createMetaTag(undefined, 'og:image', image),
-        createMetaTag(undefined, 'og:description', dexcription),
-        createMetaTag(undefined, 'og:title', title),
-        createMetaTag(undefined, 'og:site_name', title),
-        createMetaTag(undefined, 'og:type', 'website'),
-        createMetaTag(undefined, 'twitter:url', url()),
-        createMetaTag(undefined, 'twitter:domain', document.location.hostname),
-        createMetaTag('twitter:title', undefined, title),
-        createMetaTag('twitter:image', undefined, image),
-        createMetaTag('twitter:card', undefined, 'summary_large_image'),
-        createMetaTag('twitter:description', undefined, dexcription),
-    ]
-}
-document.addEventListener("DOMContentLoaded", async () => {
-    createTags().forEach(tag => document.head.appendChild(tag))
-})

src/main/resources/templates/chatoverlay.html

@@ -12,15 +12,20 @@
 <div popover id="results" class="tooltip">
 </div>
 <script type="module">
-    import DiceBox from "/vendor/dice-box/dice-box.es.js";
-
+    import DiceBox from "/vendor/dice-box/dice-box-threejs.es.js";
     const diceBox = new DiceBox("#dice-box", {
-        assetPath: "/vendor/assets/",
-        theme: '{theme}',
-        themeColor: '{themeColor}',
-        scale: {scale}
+        assetPath: "/vendor/dice-box/",
+        light_intensity: 2,
+        gravity_multiplier: 600,
+        baseScale: {scale} * 10,
+        strength: Math.floor(Math.random() * 4),
+        theme_customColorset: {
+            texture: '{theme}',
+            background: '{faceColor}',
+            foreground: '{numberColor}'
+        }
     });
-    diceBox.init()
+    diceBox.initialize();
     ComfyJS.Init('{channel}');
 
     //maxDice
@@ -33,16 +38,16 @@
             toggleWait(true);
 
             diceBox.onRollComplete = (rollResult) => {
-                rollResult.forEach(result => {
+                rollResult.sets.forEach(result => {
                     let values = []
                     result.rolls.forEach(roll => {
                         values.push(roll.value);
                     })
-                    document.getElementById('results').innerHTML = '<strong>' + user + '</strong> rolls <strong>' + message + '</strong>:<br/> [' + values.map(value => value === 1 ? '<strong style="text-shadow: 2px 2px 10px red">' + value + '</strong>' : value === result.sides ? '<strong style="text-shadow: 2px 2px 10px green">' + value + '</strong>' : value).join(' + ') + (result.modifier > 0 ? ' <a style="text-decoration: underline">+' + result.modifier + '</a>' : result.modifier < 0 ? ' <a style="text-decoration: underline">' + result.modifier + '</a>' : '') + '] = <strong>' + result.value + '</strong> '
+                    document.getElementById('results').innerHTML = '<strong>' + user + '</strong> rolls <strong>' + message + '</strong>:<br/> [' + values.map(value => value === 1 ? '<strong style="text-shadow: 2px 2px 10px red">' + value + '</strong>' : value === result.sides ? '<strong style="text-shadow: 2px 2px 10px green">' + value + '</strong>' : value).join(' + ') + '] = <strong>' + result.total + '</strong> '
                 })
                 document.getElementById('results').showPopover()
                 setTimeout(() => {
-                    diceBox.clear();
+                    diceBox.clearDice();
                     document.getElementById('results').hidePopover()
                 }, {clearAfter} * 1000)
             }

src/main/resources/templates/chatoverlayconfig.html

@@ -23,18 +23,16 @@
     <div class="w3-panel w3-theme-l4 w3-card w3-display-container"
          style="padding: 25px; text-align: center; margin-bottom: auto;">
         <label for="theme">Theme </label>
-        <select name="theme" id="theme" style="margin: 25px">
-            <option value="default">Default</option>
-            <option value="blueGreenMetal">Blue-Green Metal</option>
-            <option value="diceOfRolling">Dice of Rolling</option>
-            <option value="gemstone">Gemstone</option>
-            <option value="gemstoneMarble">Marble Gemstone</option>
-            <option value="rock">Rock</option>
-            <option value="rust">Rust</option>
-            <option value="smooth">Smooth</option>
-            <option value="wooden">Wooden</option>
-        </select>
-        <color-picker id="themeColor"></color-picker>
+        <select name="theme" id="theme" style="margin: 0 25px"></select>
+
+        <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline">
+            <div style="flex-grow: 1; padding: 0 10px">
+                <color-picker id="faceColor" name="Face" value="black"></color-picker>
+            </div>
+            <div style="flex-grow: 1; padding: 10px 0">
+                <color-picker id="numberColor" name="Numbers" value="white"></color-picker>
+            </div>
+        </div>
         <div>
             <label for="channel">Channel </label>
             <input type="text" id="channel" style="width: 400px; margin-top: 20px" value="arindy"/>
@@ -57,7 +55,7 @@
         </div>
         <div>
             <label for="scale">Dice-Scale </label>
-            <input type="number" id="scale" style="width: 50px; margin-top: 20px" value="9"/>
+            <input type="number" id="scale" style="width: 50px; margin-top: 20px" value="15"/>
             <label for="maxDice">Max number of dice </label>
             <input type="number" id="maxDice" style="width: 50px; margin-top: 20px" value="20"/>
         </div>
@@ -67,7 +65,10 @@
             <label for="timeout">Command-timeout (in seconds)</label>
             <input type="number" id="timeout" style="width: 50px; margin-top: 20px" value="60"/>
         </div>
-        <div id="dice-box" style="height: 400px"></div>
+
+        <div id="dice-box" style="width: 850px; height: 400px">
+            <div id="app"></div>
+        </div>
         <button style="margin: 10px" id="preview">Preview <i class="fa-solid fa-magnifying-glass"></i></button>
         <button style="margin: 10px" id="generate">Generate overlay-link <i class="fa-solid fa-link"></i></button>
         <div>
@@ -104,30 +105,139 @@
     }
 </script>
 <script type="module">
-    import DiceBox from "/vendor/dice-box/dice-box.es.js";
+    import DiceBox from "/vendor/dice-box/dice-box-threejs.es.js";
+    let diceBox
+
+    const Themes = {
+        cloudy: {
+            name: "Clouds (Transparent)"
+        },
+        cloudy_2: {
+            name: "Clouds"
+        },
+        fire: {
+            name: "Fire"
+        },
+        marble: {
+            name: "Marble"
+        },
+        water: {
+            name: "Water"
+        },
+        ice: {
+            name: "Ice"
+        },
+        paper: {
+            name: "Paper"
+        },
+        speckles: {
+            name: "Speckles"
+        },
+        glitter: {
+            name: "Glitter"
+        },
+        glitter_2: {
+            name: "Glitter (Transparent)"
+        },
+        stars: {
+            name: "Stars"
+        },
+        stainedglass: {
+            name: "Stained Glass"
+        },
+        wood: {
+            name: "Wood"
+        },
+        metal: {
+            name: "Stainless Steel"
+        },
+        skulls: {
+            name: "Skulls"
+        },
+        leopard: {
+            name: "Leopard"
+        },
+        tiger: {
+            name: "Tiger"
+        },
+        cheetah: {
+            name: "Cheetah"
+        },
+        dragon: {
+            name: "Dragon"
+        },
+        lizard: {
+            name: "Lizard"
+        },
+        bird: {
+            name: "Bird"
+        },
+        astral: {
+            name: "Astral Sea"
+        },
+        bronze01: {
+            name: "Bronze 1"
+        },
+        bronze02: {
+            name: "Bronze 2"
+        },
+        bronze03: {
+            name: "Bronze 3"
+        },
+        bronze03a: {
+            name: "Bronze 3a"
+        },
+        bronze03b: {
+            name: "Bronze 3b"
+        },
+        bronze04: {
+            name: "Bronze 4"
+        },
+        none: {
+            name: "none"
+        }
+    }
 
     function url() {
         return window.location.protocol + '//' + window.location.hostname + (window.location.port?.length > 0 ? ':' + window.location.port : '');
     }
 
     document.addEventListener("DOMContentLoaded", async () => {
+        const themeSelector = document.getElementById('theme');
+        for (const theme in Themes) {
+            let option = document.createElement('option');
+            option.value = theme;
+            option.innerText = Themes[theme].name;
+            themeSelector.appendChild(option);
+        }
+        themeSelector.value = 'cloudy';
         document.getElementById('preview').onclick = async () => {
-            document.getElementById('dice-box').replaceChildren(...[])
-            const diceBox = new DiceBox("#dice-box", {
-                assetPath: "/vendor/assets/",
-                theme: document.getElementById('theme').value,
-                themeColor: document.getElementById('themeColor').value,
-                scale: +document.getElementById('scale').value
+            document.getElementById('app').replaceChildren(...[])
+            diceBox = new DiceBox("#app", {
+                assetPath: "/vendor/dice-box/",
+                light_intensity: 2,
+                gravity_multiplier: 600,
+                baseScale: 120,
+                strength: Math.floor(Math.random() * 4),
             });
-            await diceBox.init()
-            diceBox.roll(['1d2', '1d4', '1d6', '1d8', '1d10', '1d12', '1d20', '1d100']);
+            await diceBox.initialize();
+            diceBox.clearDice();
+            await diceBox.updateConfig({
+                theme_customColorset: {
+                    background: document.getElementById('faceColor').value,
+                    foreground: document.getElementById('numberColor').value,
+                    texture: document.getElementById('theme').value
+                }
+            });
+            await diceBox.roll('1d2 & 1d4 & 1d6 & 1d8 & 1d10 & 1d12 & 1d20 & 1d100');
         }
         document.getElementById('generate').onclick = async () => {
             document.getElementById('link').value = url() +
                     "/chatoverlay/" + document.getElementById('channel').value +
                     "?cmd=" + document.getElementById('cmd').value +
                     "&theme=" + document.getElementById('theme').value +
-                    "&themeColor=" + encodeURIComponent(document.getElementById('themeColor').value) +
+                    "&faceColor=" + encodeURIComponent(document.getElementById('faceColor').value) +
+                    "&numberColor=" + encodeURIComponent(document.getElementById('numberColor').value) +
                     "&scale=" + document.getElementById('scale').value +
                     "&maxDice=" + document.getElementById('maxDice').value +
                     "&clearAfter=" + document.getElementById('clearAfter').value +

src/main/resources/templates/index.html

@@ -12,10 +12,28 @@
     <link rel="icon" type="image/png" href="/favicon.png">
     <script src="/vendor/color-picker.js"></script>
     <script type="module" src="/dice-preview.js"></script>
-    <script type="text/javascript" src="/rich-preview.js"></script>
     <script type="text/javascript" src="/app.js"></script>
+
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:title" content="Dice-Tower">
+    <meta name="twitter:image" content="{http:request.scheme}://{http:request.authority}/rich.png">
+    <meta name="description" content="Easy to use online dice rolling with customizable overlays.">
+    <meta name="twitter:description" content="Easy to use online dice rolling with customizable overlays.">
+    <meta property="og:url" content="{http:request.absoluteURI}">
+    <meta property="og:image" content="{http:request.scheme}://{http:request.authority}/rich.png">
+    <meta property="og:description" content="Easy to use online dice rolling with customizable overlays.">
+    <meta property="og:title" content="Dice-Tower">
+    <meta property="og:site_name" content="Dice-Tower">
+    <meta property="og:type" content="website">
+    <meta property="twitter:url" content="{http:request.absoluteURI}">
+    <meta property="twitter:domain" content="{http:request.authority}">
 </head>
 <body class="w3-theme-l1">
+<script>
+    if (!localStorage.getItem("userId")) {
+        localStorage.setItem("userId", self.crypto.randomUUID());
+    }
+</script>
 <div class="w3-container w3-content"
      style="height: 95vh; display: flex; flex-direction: column; justify-content: space-between;  padding: 25px">
     <h1 style="text-align: center"><i class="fa-solid fa-dice-d20"></i> Dice-Tower <i class="fa-solid fa-dice-d20"></i>
@@ -120,10 +138,10 @@
         </div>
         <div style="display: flex; flex-direction: row; justify-content: space-between; align-items: baseline">
             <div style="flex-grow: 1; padding: 0 10px">
-                <color-picker id="themeColor" name="Face"></color-picker>
+                <color-picker id="faceColor" name="Face" value="#8d8981"></color-picker>
             </div>
             <div style="flex-grow: 1; padding: 10px 0">
-                <color-picker id="themeForegroundColor" name="Numbers"></color-picker>
+                <color-picker id="numberColor" name="Numbers" value="black"></color-picker>
             </div>
         </div>
         <div id="dice-box">

src/main/resources/templates/overlay.html

@@ -36,8 +36,8 @@
         diceBox.updateConfig({
             theme_customColorset: {
                 texture: data.theme,
-                background: data.themeColor,
-                foreground: data.themeForegroundColor
+                background: data.faceColor,
+                foreground: data.numberColor
             }
         }).then(() => {
             diceBox.roll(data.roll.join('&'));

src/main/resources/templates/results.html

@@ -34,7 +34,7 @@
                     resultText += '<br/><strong>&ensp; D' + result.sides + '</strong>: [' + values.map(value => value === 1 ? '<strong style="text-shadow: 2px 2px 10px red">' + value + '</strong>' : value === result.sides ? '<strong style="text-shadow: 2px 2px 10px green">' + value + '</strong>' : value).join(' + ') + (result.modifier > 0 ? ' <a style="text-decoration: underline">+' + result.modifier + '</a>' : result.modifier < 0 ? ' <a style="text-decoration: underline">' + result.modifier + '</a>' : '') + '] = <strong>' + result.value + '</strong> '
                 })
             }
-            node.innerHTML = '<strong style="text-shadow: 2px 2px 10px ' + data.themeColor + ';">' + data.name + ':</strong> ' + resultText
+            node.innerHTML = '<strong style="text-shadow: 2px 2px 10px ' + data.faceColor + ';">' + data.name + ':</strong> ' + resultText
             name.appendChild(node)
             document.getElementById('results').insertBefore(name, document.getElementById('results').firstChild);
         }