feat: start 0.6.0-SNAPSHOT

Author: Machine-Maker

build.gradle.kts

@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "me.machinemaker"
-version = "0.5.0"
+version = "0.6.0-SNAPSHOT"
 description = "A replacement for the VanillaTweaks datapack"
 
 repositories {
@@ -55,7 +55,7 @@ dependencies {
     implementation("io.github.classgraph:classgraph:4.8.157")
     implementation("io.leangen.geantyref:geantyref:1.3.14")
     implementation("com.h2database:h2:1.4.200")
-    implementation("org.xerial:sqlite-jdbc:3.40.0.0")
+    implementation("org.xerial:sqlite-jdbc:3.41.2.2")
 
     // tests
     testImplementation(paperApi)
@@ -65,10 +65,10 @@ dependencies {
     testImplementation(libs.jackson.yaml)
     testImplementation(libs.jackson.paramNames)
     testImplementation(libs.guice)
-    testImplementation(libs.junit.api)
+    testImplementation(libs.junit)
     testImplementation(libs.mockito)
 
-    testRuntimeOnly(libs.junit.engine)
+    testRuntimeOnly(libs.junit.platform)
 }
 
 java {
@@ -109,9 +109,10 @@ tasks {
     }
 
     processResources {
+        val projectProvider = project.provider { project.version.toString() }
         filteringCharset = Charsets.UTF_8.name()
         filesMatching(listOf("plugin.yml", "paper-plugin.yml")) {
-            expand("version" to project.version)
+            expand("version" to projectProvider.get())
         }
     }
 
@@ -182,11 +183,11 @@ tasks {
         }
     }
 
-    withType<RunServer> { // set for both runServer and runMojangMappedServer
+    withType<RunServer> {
         systemProperty("com.mojang.eula.agree", "true")
 
         downloadPlugins {
-            url("https://download.luckperms.net/1549/bukkit/loader/LuckPerms-Bukkit-5.4.134.jar")
+            url("https://download.luckperms.net/1610/bukkit/loader/LuckPerms-Bukkit-5.5.21.jar")
         }
     }
 

gradle.properties

@@ -1 +1,2 @@
 org.gradle.parallel=true
+org.gradle.configuration-cache=true

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-minecraft = "1.21.4"
+minecraft = "1.21.11"
 mm-mirror = "0.2.0"
 mm-lectern = "0.3.0" # deprecated
 cloud = "2.0.0-SNAPSHOT"
@@ -8,8 +8,8 @@ moonshine = "2.0.4"
 guice = "7.0.0"
 jdbi = "3.22.0"
 jackson = "2.15.2"
-commons-config = "2.8.0"
-commons-beans = "1.9.4"
+commons-config = "2.10.1"
+commons-beans = "1.11.0"
 
 # compile only
 slf4j-api = "2.0.7" # only until paper bumps api version
@@ -19,13 +19,13 @@ worldguard = "7.0.9"
 griefprevention = "16.18.1"
 
 # tests
-junit = "5.10.0"
+junit = "6.0.1"
 mockito = "5.5.0"
 
 # plugins
-shadow = "8.1.7"
-indra = "3.1.1"
-runPaper = "2.3.0"
+shadow = "9.3.0"
+indra = "4.0.0"
+runPaper = "3.0.2"
 
 [libraries]
 mm-mirror = { module = "me.machinemaker.mirror:mirror-paper", version.ref = "mm-mirror" }
@@ -57,12 +57,12 @@ worldguard = { module = "com.sk89q.worldguard:worldguard-bukkit", version.ref =
 griefprevention = { module = "com.github.TechFortress:GriefPrevention", version.ref = "griefprevention" }
 
 # tests
-junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
-junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
+junit = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
+junit-platform = { module = "org.junit.platform:junit-platform-launcher" }
 mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 
 [plugins]
-shadow = { id = "io.github.goooler.shadow", version.ref = "shadow" }
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
 indra-licenser-spotless = { id = "net.kyori.indra.licenser.spotless", version.ref = "indra" }
 runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" }
 

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -20,19 +20,21 @@
 package me.machinemaker.papertweaks.adventure;
 
 import com.google.common.collect.Maps;
+import java.text.MessageFormat;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
 import java.util.ResourceBundle;
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.translation.GlobalTranslator;
+import net.kyori.adventure.translation.TranslationStore;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class TranslationRegistry {
 
     private static final Key LANG_KEY = Key.key("papertweaks", "lang");
     private static final Map<String, Translation> TRANSLATIONS = Maps.newConcurrentMap();
-    private static final net.kyori.adventure.translation.TranslationRegistry ADVENTURE_REGISTRY = net.kyori.adventure.translation.TranslationRegistry.create(LANG_KEY);
+    private static final TranslationStore.StringBased<MessageFormat> ADVENTURE_REGISTRY = TranslationStore.messageFormat(LANG_KEY);
 
     static {
         GlobalTranslator.translator().addSource(ADVENTURE_REGISTRY);
@@ -48,7 +50,7 @@ public static void registerAll(final Locale locale, final ResourceBundle bundle)
         });
     }
 
-    public static Optional<String> translate(final String key, final Locale locale) {
+    public static Optional<@Nullable String> translate(final String key, final Locale locale) {
         final Translation translation = TRANSLATIONS.get(key);
         if (translation == null) {
             return Optional.empty();

gradlew

@@ -70,7 +70,7 @@ class ItemDropRunnable extends BukkitRunnable {
         this.item = item;
         this.lookingFor = lookingFor;
         this.itemPredicate = switch (lookingFor) {
-            case CHESTPLATE -> constructBiPredicate(Tags.CHESTPLATES::isTagged);
+            case CHESTPLATE -> constructBiPredicate(i -> Tag.ITEMS_CHEST_ARMOR.isTagged(i.getItemStack().getType()));
             case ARMORED_ELYTRA ->
                     constructBiPredicate(i -> i.getItemStack().getType() == Material.ELYTRA && ItemListener.IS_ARMORED_ELYTRA.has(i.getItemStack()));
         };

gradlew.bat

@@ -19,13 +19,16 @@
  */
 package me.machinemaker.papertweaks.modules.items.wrenches;
 
+import com.destroystokyo.paper.MaterialTags;
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;
 import java.util.List;
 import me.machinemaker.papertweaks.integrations.Interactions;
 import me.machinemaker.papertweaks.modules.ModuleListener;
 import me.machinemaker.papertweaks.tags.MaterialTag;
 import me.machinemaker.papertweaks.tags.Tags;
+import org.bukkit.Material;
+import org.bukkit.Tag;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.data.BlockData;
@@ -63,7 +66,7 @@ public void onPlayerInteract(final PlayerInteractEvent event) {
             final BlockData blockData = block.getBlockData();
             if (blockData instanceof final Directional directional
                 && (this.isValid(block, event.getPlayer(), this.config.redstoneWrench, Tags.REDSTONE_COMPONENTS, "vanillatweaks.wrench.redstone")
-                || this.isValid(block, event.getPlayer(), this.config.terracottaWrench, Tags.GLAZED_TERRACOTTA, "vanillatweaks.wrench.terracotta"))) {
+                || this.isValid(block, event.getPlayer(), this.config.terracottaWrench, MaterialTags.GLAZED_TERRACOTTA, "vanillatweaks.wrench.terracotta"))) {
                 if (!(directional instanceof final Piston piston && piston.isExtended()) && Interactions.isAllowedInteraction(event.getPlayer(), event.getClickedBlock())) { // Don't allow rotating extended pistons
                     final List<BlockFace> applicableFaces = Lists.newArrayList();
                     for (final BlockFace face : FACES) {
@@ -82,7 +85,7 @@ public void onPlayerInteract(final PlayerInteractEvent event) {
 
     }
 
-    private boolean isValid(final Block block, final Player player, final boolean config, final MaterialTag tag, final String permission) {
+    private boolean isValid(final Block block, final Player player, final boolean config, final Tag<Material> tag, final String permission) {
         return config && tag.isTagged(block.getType()) && player.hasPermission(permission);
     }
 }