Merge pull request #1086 from eccentricdevotion/copper_golem

- copper golems and games
- changes to desktop theme artron costs
- bug fixes

Author: eccentricdevotion

.github/workflows/gradle.yml

@@ -9,7 +9,7 @@ on:
     branches: [ "master" ]
 
 env:
-  VERSION: '6.3.10'
+  VERSION: '6.3.11'
   RELEASE_TAG: '1.21.11'
 
 jobs:

README.md

@@ -1,7 +1,7 @@
 # TARDIS
 
 TARDIS is a PaperMC plugin that allows you to create a TARDIS that lets you time travel (teleport) to random
-locations. It adds a Whovian twist to the typical /sethome and /home commands.
+locations. It adds a Whovian twist to the typical `/sethome` and `/home` commands.
 
 **As a player, you can:**
 
@@ -33,6 +33,8 @@ GitHub continuously integrated builds (updated when changes are pushed to this r
 ![Spigot downloads](https://img.shields.io/spiget/downloads/45729?label=Spigot%20downloads&style=for-the-badge)
 ![bStats Servers](https://img.shields.io/bstats/servers/11698?style=for-the-badge)
 
+![1.21.11 downloads](https://img.shields.io/github/downloads/eccentricdevotion/TARDIS/1.21.11/total?style=for-the-badge)
+![1.21.10 downloads](https://img.shields.io/github/downloads/eccentricdevotion/TARDIS/1.21.10/total?style=for-the-badge)
 ![1.21.8 downloads](https://img.shields.io/github/downloads/eccentricdevotion/TARDIS/1.21.8/total?style=for-the-badge)
 ![1.21.5 downloads](https://img.shields.io/github/downloads/eccentricdevotion/TARDIS/1.21.5/total?style=for-the-badge)
 ![1.21.4 downloads](https://img.shields.io/github/downloads/eccentricdevotion/TARDIS/1.21.4/total?style=for-the-badge)

build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
 
 group = "me.eccentric_nz"
 val buildNumber = "-b${System.getenv("BUILD_NUMBER") ?: (System.getenv("SHORT_SHA") ?: ".local")}"
-version = "6.3.10${buildNumber}"
+version = "6.3.11${buildNumber}"
 
 repositories {
     mavenCentral()
@@ -88,10 +88,10 @@ repositories {
 
 dependencies {
     paperweight.paperDevBundle("1.21.11-R0.1-SNAPSHOT")
-    compileOnly("com.sk89q.worldedit:worldedit-core:7.4.0-SNAPSHOT") {
+    compileOnly("com.sk89q.worldedit:worldedit-core:8.0.0-SNAPSHOT") {
         isTransitive = false
     }
-    compileOnly("com.sk89q.worldedit:worldedit-bukkit:7.4.0-SNAPSHOT") {
+    compileOnly("com.sk89q.worldedit:worldedit-bukkit:8.0.0-SNAPSHOT") {
         isTransitive = false
     }
     compileOnly("com.sk89q.worldguard:worldguard-core:7.1.0-SNAPSHOT") {
@@ -103,7 +103,7 @@ dependencies {
     compileOnly("net.citizensnpcs:citizensapi:2.0.41-SNAPSHOT") {
         isTransitive = false
     }
-    compileOnly("com.palmergames.bukkit.towny:towny:0.102.0.3") {
+    compileOnly("com.palmergames.bukkit.towny:towny:0.102.0.6") {
         isTransitive = false
     }
     compileOnly("org.mvplugins.multiverse.core:multiverse-core:5.5.0") {
@@ -122,7 +122,7 @@ dependencies {
     compileOnly("com.griefcraft:lwc:2.4.1") {
         isTransitive = false
     }
-    compileOnly("com.github.retrooper:packetevents-api:2.11.1") {
+    compileOnly("com.github.retrooper:packetevents-api:2.11.2") {
         isTransitive = false
     }
     compileOnly("me.libraryaddict.disguises:libsdisguises:11.0.14") {
@@ -143,8 +143,8 @@ dependencies {
     compileOnly("net.coreprotect:coreprotect:23.1") {
         isTransitive = false
     }
-    compileOnly(files("libs/dynmap-api-3.7-beta-10.jar"))
-    compileOnly(files("libs/DynmapCoreAPI-3.7-beta-10.jar"))
+    compileOnly(files("libs/dynmap-api-3.8.jar"))
+    compileOnly(files("libs/DynmapCoreAPI-3.8.jar"))
     compileOnly("de.bluecolored:bluemap-api:2.7.7")
     compileOnly("xyz.jpenilla:squaremap-api:1.3.12") {
         isTransitive = false

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -43,8 +43,10 @@ public enum TARDISARS implements ARS {
     EYE("SHROOMLIGHT", "Eye of Harmony", 1, RoomVariant.EYE.getKey()),
     FARM("DIRT", "Mob Farm", 1, RoomVariant.FARM.getKey()),
     GALLERY("CHISELED_QUARTZ_BLOCK", "Art Gallery", 1, RoomVariant.GALLERY.getKey()),
+    GAMES("DARK_OAK_PLANKS", "Games Room", 1, RoomVariant.GAMES.getKey()),
     GARDEN("CHERRY_LEAVES", "Flower Garden", 1, RoomVariant.GARDEN.getKey()),
     GEODE("AMETHYST_BLOCK", "Geode", 1, RoomVariant.GEODE.getKey()),
+    GOLEM("TUFF", "Copper Golem Charging Station", 1, RoomVariant.GOLEM.getKey()),
     GRAVITY("MOSSY_COBBLESTONE", "Gravity Well", 1, RoomVariant.GRAVITY.getKey()),
     GREENHOUSE("MELON", "Greenhouse", 1, RoomVariant.GREENHOUSE.getKey()),
     HAPPY("STRIPPED_OAK_LOG", "Happy Ghast Dock", 1, RoomVariant.HAPPY.getKey()),
@@ -81,6 +83,7 @@ public enum TARDISARS implements ARS {
     WOOD("OAK_PLANKS", "Wood Secondary Console", 1, RoomVariant.WOOD.getKey()),
     WORKSHOP("RED_NETHER_BRICKS", "Workshop", 1, RoomVariant.WORKSHOP.getKey()),
     ZERO("GRASS_BLOCK", "Zero Room", 0, null, false),
+    ARCADE("STRUCTURE_BLOCK", "Arcade", 0, null, false),
     JETTISON("TNT", "Jettison", 0, RoomVariant.JETTISON.getKey(), false),
     SLOT("STONE", "Empty slot", 0, RoomVariant.SLOT.getKey(), false),
     CUSTOM("", "Custom room", 0, null, false),