Updated to MC 1.18

.github/workflows/ci.yml

@@ -0,0 +1,37 @@
+name: Build Artifacts
+
+on:
+  push:
+  release:
+    types: [ created ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+
+      - name: Set Up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+
+      - name: Build With Maven
+        run: mvn -B clean test package "-Ddir=artifacts/" --file pom.xml
+
+      - name: Upload Artifacts
+        id: upload
+        uses: actions/upload-artifact@v2
+        with:
+          name: Artifacts
+          path: ./artifacts/*.jar
+
+      - name: Publish Artifacts
+        if: github.event_name == 'release'
+        uses: skx/github-action-publish-binaries@release-2.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: './artifacts/*.jar'

pom.xml

@@ -6,10 +6,10 @@
 
     <groupId>de.studiocode</groupId>
     <artifactId>MiniatureBlocks</artifactId>
-    <version>0.14.1</version>
+    <version>0.15</version>
 
     <properties>
-        <kotlin.version>1.5.20</kotlin.version>
+        <kotlin.version>1.6.10</kotlin.version>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <shadePath>de.studiocode.miniatureblocks.lib</shadePath>
@@ -31,8 +31,8 @@
             <url>https://repo.codemc.org/repository/maven-public</url>
         </repository>
         <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
+            <id>xenondevs</id>
+            <url>https://repo.xenondevs.xyz/releases/</url>
         </repository>
     </repositories>
 
@@ -58,18 +58,18 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.17-R0.1-SNAPSHOT</version>
+            <version>1.18.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.lingala.zip4j</groupId>
             <artifactId>zip4j</artifactId>
-            <version>2.7.0</version>
+            <version>2.9.1</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.7</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.mojang</groupId>
@@ -80,17 +80,17 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>1.7</version>
+            <version>2.2.1</version>
         </dependency>
         <dependency>
-            <groupId>com.github.NichtStudioCode.InvUI</groupId>
+            <groupId>de.studiocode.invui</groupId>
             <artifactId>InvUI</artifactId>
-            <version>e92abcf079</version>
+            <version>0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>xyz.xenondevs</groupId>
             <artifactId>particle</artifactId>
-            <version>1.6.1</version>
+            <version>1.7</version>
         </dependency>
         <dependency>
             <groupId>me.xdrop</groupId>
@@ -143,7 +143,7 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <version>3.3.0-SNAPSHOT</version>
                 <configuration>
-                    <outputFile>${dir}/${project.artifactId}-${project.version}-shaded.jar</outputFile>
+                    <outputFile>${dir}/${project.artifactId}-${project.version}.jar</outputFile>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                 </configuration>
                 <executions>

src/main/kotlin/de/studiocode/miniatureblocks/MiniatureBlocks.kt

@@ -9,7 +9,7 @@ import de.studiocode.miniatureblocks.region.RegionManager
 import de.studiocode.miniatureblocks.resourcepack.ResourcePack
 import de.studiocode.miniatureblocks.resourcepack.texture.BlockTexture
 import org.bstats.bukkit.Metrics
-import org.bstats.bukkit.Metrics.SingleLineChart
+import org.bstats.charts.SingleLineChart
 import org.bukkit.plugin.java.JavaPlugin
 import java.io.File
 

src/main/kotlin/de/studiocode/miniatureblocks/menu/AnimationMenu.kt

@@ -4,7 +4,7 @@ import de.studiocode.invui.gui.SlotElement
 import de.studiocode.invui.gui.SlotElement.ItemSlotElement
 import de.studiocode.invui.gui.impl.PagedGUI
 import de.studiocode.invui.gui.structure.Structure
-import de.studiocode.invui.item.ItemBuilder
+import de.studiocode.invui.item.builder.ItemBuilder
 import de.studiocode.invui.item.impl.BaseItem
 import de.studiocode.invui.item.impl.SimpleItem
 import de.studiocode.invui.resourcepack.Icon

src/main/kotlin/de/studiocode/miniatureblocks/menu/Menus.kt

@@ -3,7 +3,7 @@ package de.studiocode.miniatureblocks.menu
 import de.studiocode.invui.gui.impl.PagedGUI
 import de.studiocode.invui.gui.structure.Markers
 import de.studiocode.invui.gui.structure.Structure
-import de.studiocode.invui.item.ItemBuilder
+import de.studiocode.invui.item.builder.ItemBuilder
 import de.studiocode.invui.item.impl.controlitem.PageItem
 import de.studiocode.invui.resourcepack.Icon
 

src/main/kotlin/de/studiocode/miniatureblocks/menu/SearchMenu.kt

@@ -6,7 +6,7 @@ import de.studiocode.invui.gui.builder.guitype.GUIType
 import de.studiocode.invui.gui.impl.SimpleGUI
 import de.studiocode.invui.gui.impl.SimplePagedItemsGUI
 import de.studiocode.invui.item.Item
-import de.studiocode.invui.item.ItemBuilder
+import de.studiocode.invui.item.builder.ItemBuilder
 import de.studiocode.invui.item.impl.BaseItem
 import de.studiocode.invui.item.impl.SimpleItem
 import de.studiocode.invui.resourcepack.Icon

src/main/kotlin/de/studiocode/miniatureblocks/menu/TexturesMenu.kt

@@ -4,7 +4,7 @@ import de.studiocode.invui.gui.builder.GUIBuilder
 import de.studiocode.invui.gui.builder.guitype.GUIType
 import de.studiocode.invui.gui.impl.SimplePagedItemsGUI
 import de.studiocode.invui.item.Item
-import de.studiocode.invui.item.ItemBuilder
+import de.studiocode.invui.item.builder.ItemBuilder
 import de.studiocode.invui.item.impl.BaseItem
 import de.studiocode.invui.item.impl.SimpleItem
 import de.studiocode.invui.item.impl.SuppliedItem

src/main/kotlin/de/studiocode/miniatureblocks/miniature/armorstand/MiniatureArmorStand.kt

@@ -38,7 +38,7 @@ abstract class MiniatureArmorStand(val armorStand: ArmorStand) : Miniature(armor
             val nmsArmorStand = ReflectionUtils.createNMSEntity(world, location, EntityType.ARMOR_STAND)
 
             // set head item silently
-            ReflectionUtils.setArmorStandArmorItems(nmsArmorStand, 3, ReflectionUtils.createNMSItemStackCopy(itemStack))
+            ReflectionUtils.setArmorStandHeadStack(nmsArmorStand, ReflectionUtils.createNMSItemStackCopy(itemStack))
 
             // get CraftArmorStand
             val armorStand = ReflectionUtils.createBukkitEntityFromNMSEntity(nmsArmorStand) as ArmorStand

src/main/kotlin/de/studiocode/miniatureblocks/miniature/armorstand/impl/AnimatedMiniatureArmorStand.kt

@@ -62,7 +62,7 @@ class AnimatedMiniatureArmorStand(armorStand: ArmorStand) : MiniatureArmorStand(
         if (ticksPassed == tickDelay) {
             ticksPassed = 0
             if (nmsItemStacks.size == currentIndex) currentIndex = 0
-            ReflectionUtils.setArmorStandArmorItems(nmsArmorStand, 3, nmsItemStacks[currentIndex])
+            ReflectionUtils.setArmorStandHeadStack(nmsArmorStand, nmsItemStacks[currentIndex])
             currentIndex++
         }
     }

src/main/kotlin/de/studiocode/miniatureblocks/miniature/item/MiniatureItem.kt

@@ -1,6 +1,6 @@
 package de.studiocode.miniatureblocks.miniature.item
 
-import de.studiocode.invui.item.ItemBuilder
+import de.studiocode.invui.item.builder.ItemBuilder
 import de.studiocode.miniatureblocks.MiniatureBlocks
 import de.studiocode.miniatureblocks.miniature.Miniature
 import de.studiocode.miniatureblocks.miniature.armorstand.MiniatureManager.MiniatureType

src/main/kotlin/de/studiocode/miniatureblocks/region/RegionManager.kt

@@ -1,6 +1,6 @@
 package de.studiocode.miniatureblocks.region
 
-import de.studiocode.invui.item.ItemBuilder
+import de.studiocode.invui.item.builder.ItemBuilder
 import de.studiocode.miniatureblocks.util.runTaskTimer
 import de.studiocode.miniatureblocks.util.sendPrefixedMessage
 import org.bukkit.Bukkit

src/main/kotlin/de/studiocode/miniatureblocks/resourcepack/ResourcePack.kt

@@ -9,19 +9,17 @@ import de.studiocode.miniatureblocks.resourcepack.file.DirectoryFile
 import de.studiocode.miniatureblocks.resourcepack.file.MainModelDataFile
 import de.studiocode.miniatureblocks.resourcepack.file.MaterialModelDataFile
 import de.studiocode.miniatureblocks.resourcepack.file.TextureModelDataFile
-import de.studiocode.miniatureblocks.resourcepack.forced.ForcedResourcePack
 import de.studiocode.miniatureblocks.resourcepack.model.MiniatureModel
 import de.studiocode.miniatureblocks.resourcepack.texture.BlockTexture
 import de.studiocode.miniatureblocks.storage.PermanentStorage
 import de.studiocode.miniatureblocks.util.*
 import net.lingala.zip4j.ZipFile
+import net.md_5.bungee.api.chat.ComponentBuilder
 import org.apache.commons.io.FilenameUtils
 import org.bukkit.Bukkit
 import org.bukkit.Material
-import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
-import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.event.player.PlayerLoginEvent
 import java.io.File
 import java.net.URL
@@ -42,12 +40,11 @@ class ResourcePack(plugin: MiniatureBlocks) : Listener {
     private val config = plugin.config
 
     private val zipFile = File(main.parentFile, "ResourcePack.zip")
-    var hash = ByteArray(0)
 
     private val lastUploadUrl: String?
         @Synchronized get() = PermanentStorage.retrieveOrNull<String>("rp-download-url")
 
-    val downloadUrl: String?
+    private val downloadUrl: String?
         @Synchronized get() {
             return if (config.hasCustomUploader()) {
                 if (lastUploadUrl == null) uploadToCustom()
@@ -70,7 +67,7 @@ class ResourcePack(plugin: MiniatureBlocks) : Listener {
 
         runAsyncTask {
             createMaterialModelFiles()
-            packZip()
+            updateResourcePack(false)
 
             initialized = true
             println("[MiniatureBlocks] ResourcePack initialized")
@@ -232,7 +229,11 @@ class ResourcePack(plugin: MiniatureBlocks) : Listener {
     @Synchronized
     private fun updateResourcePack(force: Boolean = true) {
         packZip()
-        if (force) forceResourcePack(*Bukkit.getOnlinePlayers().toTypedArray())
+        ForceResourcePack.getInstance().setResourcePack(
+            downloadUrl,
+            ComponentBuilder("MiniatureBlocks ResourcePack").create(),
+            force
+        )
     }
 
     @Synchronized
@@ -256,17 +257,9 @@ class ResourcePack(plugin: MiniatureBlocks) : Listener {
         mbRP.delete()
         invUIRP.delete()
 
-        updateZipHash() // update hash
         if (config.hasCustomUploader()) uploadToCustom() // upload if custom uploader is set
     }
 
-    @Synchronized
-    private fun updateZipHash() {
-        hash = if (zipFile.exists()) {
-            HashUtils.createSha1Hash(zipFile)
-        } else ByteArray(0)
-    }
-
     @Synchronized
     private fun uploadToCustom() {
         val reqUrl = config.getCustomUploaderRequest()
@@ -289,16 +282,7 @@ class ResourcePack(plugin: MiniatureBlocks) : Listener {
 
     @EventHandler
     fun handlePlayerLogin(event: PlayerLoginEvent) {
-        if (!initialized) event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "")
-    }
-
-    @EventHandler
-    fun handlePlayerJoin(event: PlayerJoinEvent) {
-        runTaskLater(5) { forceResourcePack(event.player) }
-    }
-
-    private fun forceResourcePack(vararg players: Player) {
-        players.forEach { ForcedResourcePack(it, this).force() }
+        if (!initialized) event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "§cThe resource pack is not ready. Please try again later.")
     }
 
 }

src/main/kotlin/de/studiocode/miniatureblocks/resourcepack/file/ModelFile.kt

@@ -3,7 +3,7 @@ package de.studiocode.miniatureblocks.resourcepack.file
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
-import de.studiocode.invui.item.ItemBuilder
+import de.studiocode.invui.item.builder.ItemBuilder
 import de.studiocode.miniatureblocks.resourcepack.ResourcePack
 import org.bukkit.Material