Update branch

api/build.gradle

@@ -1,4 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import io.papermc.paperweight.userdev.ReobfArtifactConfiguration
 
 plugins {
     id 'net.minecrell.plugin-yml.bukkit'
@@ -7,28 +8,37 @@ plugins {
 
 group = 'org.parallelmc'
 
-version = '4.2.0'
+version = '4.4.0'
 description = 'A set of utilities and features for use on the Parallel Minecraft server'
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 
+paperweight.reobfArtifactConfiguration = ReobfArtifactConfiguration.getMOJANG_PRODUCTION()
+
 compileJava.options.encoding = "UTF-8"
 compileTestJava.options.encoding = "UTF-8"
 processResources.filteringCharset = "UTF-8"
 
+repositories {
+    mavenCentral()
+    maven { url = "https://repo.papermc.io/repository/maven-public/" }
+}
 
 dependencies {
+    //compileOnly 'io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT'
+    paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.21.1-R0.1-SNAPSHOT")
+
     implementation 'org.jetbrains:annotations:24.0.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
-    implementation 'net.dv8tion:JDA:5.0.0-beta.10'
-    compileOnly 'me.clip:placeholderapi:2.11.3'
+    implementation 'net.dv8tion:JDA:5.0.0-beta.24'
+    compileOnly 'me.clip:placeholderapi:2.11.6'
     compileOnly fileTree('libs') { include '*.jar' }
-    compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.8'
-    implementation 'mysql:mysql-connector-java:8.0.33'
-    compileOnly 'com.comphenix.protocol:ProtocolLib:5.0.0'
-    compileOnly 'dev.esophose:playerparticles:8.4'
+    compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.10'
+    implementation 'com.mysql:mysql-connector-j:8.3.0'
+    compileOnly 'com.comphenix.protocol:ProtocolLib:5.3.0'
+    compileOnly 'dev.esophose:playerparticles:8.6'
     implementation 'org.reflections:reflections:0.10.2'
 }
 
@@ -39,17 +49,17 @@ artifacts {
 
 tasks {
     assemble {
-        dependsOn(reobfJar)
+        //dependsOn(reobfJar)
     }
 
     build {
-        dependsOn(reobfJar)
+        //dependsOn(reobfJar)
     }
 
     compileJava {
         // Set the release flag. This configures what version bytecode the compiler will emit, as well as what JDK APIs are usable.
         // See https://openjdk.java.net/jeps/247 for more information.
-        options.release.set(17)
+        options.release.set(21)
     }
 
     shadowJar {
@@ -67,7 +77,7 @@ bukkit {
 
     main = 'parallelmc.parallelutils.ParallelUtils'
 
-    apiVersion = '1.20'
+    apiVersion = '1.20.5'
 
     depend = ['PlaceholderAPI', 'ProtocolLib']
     softDepend = ['Multiverse-Core', 'FractalForest', 'WorldGuard', 'VoteParty', 'PlayerParticles', 'ProNouns']
@@ -279,6 +289,20 @@ bukkit {
             description = 'Opens Maggies Shop'
             usage = '/openmaggieshop (player)'
         }
+        points {
+            description = 'View your advancement points'
+            usage = '/points'
+        }
+        recalculatepoints {
+            description = 'Recalculates advancement points for all players'
+            usage = '/recalculatepoints'
+            permissionMessage = 'You do not have permission.'
+            permission = 'parallelutils.recalculatepoints'
+        }
+        openpointsredemption {
+            description = 'Opens the point redemption shop for a player'
+            usage = '/openpointsredemption (player)'
+        }
     }
 
     permissions {
@@ -471,5 +495,12 @@ bukkit {
             description = 'Gives access to ChestShop debug commands'
             setDefault('FALSE')
         }
+        'parallelutils.resources.unenforced' {
+            description = 'Prevents being kicked from not accepting the resource pack'
+            setDefault('FALSE')
+        }
+        'parallelutils.recalculatepoints' {
+            description = 'Gives access to the /recalculatepoints dev command'
+        }
     }
 }

api/src/main/java/parallelmc/parallelutils/Constants.java

@@ -1,8 +1,12 @@
 package parallelmc.parallelutils;
 
+import java.util.ArrayList;
+
 public class Constants {
 
-	public static final Version VERSION = new Version(4, 2, 0);
+	public static final Version VERSION = new Version(4, 4, 0);
 	public static final String PLUGIN_NAME = "ParallelUtils";
 	public static final String DEFAULT_WORLD = "world2";
+
+	public static final String[] OVERWORLD_TYPE_WORLDS = {"world", "world2", "world_skyteaser"};
 }

api/src/main/java/parallelmc/parallelutils/ParallelUtils.java

@@ -77,8 +77,8 @@ public void onEnable() {
 		config = this.getConfig();
 
 		config.options().copyDefaults(true);
-		config.options().parseComments(true);
-		config.options().setHeader(List.of(HEADER));
+		//config.options().parseComments(true);
+		config.options().header(HEADER);
 
 		// Read config
 		this.saveDefaultConfig();

api/src/main/java/parallelmc/parallelutils/commands/Commands.java

@@ -5,7 +5,7 @@
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.command.*;
-import org.bukkit.craftbukkit.v1_20_R1.command.ServerCommandSender;
+import org.bukkit.craftbukkit.command.ServerCommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -220,9 +220,9 @@ public static Location convertLocation(CommandSender sender, String sx, String s
 	 */
 	public static List<String> getTargetedBlockTabHelper(@NotNull Player player, int depth) {
 		ArrayList<String> list = new ArrayList<>();
-		Block targetedBlock = player.getTargetBlockExact(5);
+		Block targetedBlock = player.getTargetBlock(null,5);
 
-		if (targetedBlock != null && targetedBlock.isSolid()) {
+		if (targetedBlock != null && !targetedBlock.isEmpty()) {
 			// Autofill targeted coords
 			if (depth >= 1) {
 				list.add(String.format("%d", targetedBlock.getZ()));

api/src/main/resources/config.yml

@@ -76,4 +76,6 @@ announcements:
 
 # Bits and Bobs
 disable-ender-chests: false
-prevent-spawner-mining: false
+prevent-spawner-mining: false
+enable-calling-bell: true
+enable-sweethearts: true

build.gradle

@@ -1,18 +1,21 @@
+import io.papermc.paperweight.userdev.ReobfArtifactConfiguration
+
 plugins {
     id 'java'
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
-    id("io.papermc.paperweight.userdev") version "1.5.5"
-    id "xyz.jpenilla.run-paper" version "2.1.0"
+    id 'io.github.goooler.shadow' version '8.1.7'
+    id "io.papermc.paperweight.userdev" version "1.7.1"
+    id "xyz.jpenilla.run-paper" version "2.3.0"
     id 'net.minecrell.plugin-yml.bukkit' version '0.6.0'
 }
 
-dependencies {
-    paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.20.1-R0.1-SNAPSHOT")
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 
+paperweight.reobfArtifactConfiguration = ReobfArtifactConfiguration.getMOJANG_PRODUCTION()
 
-java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+dependencies {
+    paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.21.1-R0.1-SNAPSHOT")
 }
 
 compileJava.options.encoding = "UTF-8"
@@ -21,12 +24,12 @@ processResources.filteringCharset = "UTF-8"
 
 allprojects {
     apply plugin: 'java'
-    apply plugin: 'com.github.johnrengelman.shadow'
+    apply plugin: 'io.github.goooler.shadow'
     apply plugin: "io.papermc.paperweight.userdev"
 
     repositories {
         mavenCentral()
-        maven { url = "https://papermc.io/repo/repository/maven-public/" }
+        maven { url = "https://repo.papermc.io/repository/maven-public/" }
         maven { url = 'https://oss.sonatype.org/content/repositories/snapshots/' }
         maven { url = "https://maven.enginehub.org/repo/" }
         maven { url = 'https://repo.md-5.net/content/groups/public/' }
@@ -36,15 +39,15 @@ allprojects {
         maven { url = 'https://repo.codemc.org/repository/maven-public/' }
         maven { url = 'https://repo.rosewooddev.io/repository/public/' }
         maven { url = 'https://jitpack.io' }
-
     }
 
     dependencies {
-        paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.20.1-R0.1-SNAPSHOT")
+        paperweightDevelopmentBundle("io.papermc.paper:dev-bundle:1.21.1-R0.1-SNAPSHOT")
+        //paperweight.paperDevBundle("1.20.6-R0.1-SNAPSHOT")
 
-        compileOnly "io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT"
+        //compileOnly "io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT"
         compileOnly 'net.luckperms:api:5.4'
-        compileOnly 'dev.esophose:playerparticles:8.4'
-        compileOnly "com.github.MilkBowl:VaultAPI:1.7"
+        compileOnly 'dev.esophose:playerparticles:8.6'
+        compileOnly "com.github.MilkBowl:VaultAPI:1.7.1"
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

modules/build.gradle

@@ -1,14 +1,17 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 import io.papermc.paperweight.tasks.RemapJar
+import io.papermc.paperweight.userdev.ReobfArtifactConfiguration
 
 group = 'org.parallelmc'
 
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 
+paperweight.reobfArtifactConfiguration = ReobfArtifactConfiguration.getMOJANG_PRODUCTION()
+
 compileJava.options.encoding = "UTF-8"
 compileTestJava.options.encoding = "UTF-8"
 processResources.filteringCharset = "UTF-8"
@@ -19,14 +22,14 @@ dependencies {
 
     compileOnly 'org.jetbrains:annotations:24.0.1'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
-    compileOnly 'net.dv8tion:JDA:5.0.0-beta.10'
-    compileOnly 'me.clip:placeholderapi:2.11.3'
+    compileOnly 'net.dv8tion:JDA:5.0.0-beta.24'
+    compileOnly 'me.clip:placeholderapi:2.11.6'
     compileOnly fileTree('libs') { include '*.jar' }
-    compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.8'
-    compileOnly 'mysql:mysql-connector-java:8.0.33'
-    compileOnly 'com.comphenix.protocol:ProtocolLib:5.0.0'
-    compileOnly 'dev.esophose:playerparticles:8.4'
-    compileOnly "io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT"
+    compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.10'
+    compileOnly 'com.mysql:mysql-connector-j:8.3.0'
+    compileOnly 'com.comphenix.protocol:ProtocolLib:5.3.0'
+    compileOnly 'dev.esophose:playerparticles:8.6'
+    compileOnly "io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT"
 }
 
 def names = []
@@ -63,7 +66,8 @@ names.each { mod ->
         def name = (String) "${mod}"
         exList.remove(name)
 
-        archiveClassifier.set("shadow-${mod}")
+        archiveBaseName.set("")
+        archiveClassifier.set("${mod}")
         from sourceSets.main.output
 
 
@@ -74,23 +78,23 @@ names.each { mod ->
         // Figure out how to exclude META-INF
     }
 }
-
-names.each { mod ->
-    task "reobf-${mod}" (type: RemapJar) {
-        dependsOn "shadow-${mod}"
-        group = "ReobfMod"
-        description = "Remap the compiled module jar to Spigot's obfuscated runtime names"
-
-        fromNamespace = reobfJar.fromNamespace
-        toNamespace = reobfJar.toNamespace
-        mappingsFile = reobfJar.mappingsFile
-        remapClasspath.from(reobfJar.remapClasspath.getFrom())
-        remapper.from(reobfJar.project.configurations.named("remapper"))
-        remapperArgs = reobfJar.remapperArgs
-
-
-        inputJar.set(new File("$buildDir/libs/modules-shadow-${mod}.jar"))
-        //outputJar.set(new File("$buildDir/libs/${mod}-${project.version}.jar"))
-        outputJar.set(new File("$buildDir/libs/${mod}.jar"))
-    }
-}
+//
+//names.each { mod ->
+//    task "reobf-${mod}" (type: RemapJar) {
+//        dependsOn "shadow-${mod}"
+//        group = "ReobfMod"
+//        description = "Remap the compiled module jar to Spigot's obfuscated runtime names"
+//
+//        fromNamespace = reobfJar.fromNamespace
+//        toNamespace = reobfJar.toNamespace
+//        mappingsFile = reobfJar.mappingsFile
+//        remapClasspath.from(reobfJar.remapClasspath.getFrom())
+//        remapper.from(reobfJar.project.configurations.named("remapper"))
+//        remapperArgs = reobfJar.remapperArgs
+//
+//
+//        inputJar.set(new File("$buildDir/libs/modules-shadow-${mod}.jar"))
+//        //outputJar.set(new File("$buildDir/libs/${mod}-${project.version}.jar"))
+//        outputJar.set(new File("$buildDir/libs/${mod}.jar"))
+//    }
+//}

modules/src/main/java/parallelmc/parallelutils/modules/bitsandbobs/BitsAndBobs.java

@@ -14,7 +14,6 @@
 import parallelmc.parallelutils.modules.bitsandbobs.minimodules.togglepvp.TogglePvpCommand;
 import parallelmc.parallelutils.modules.bitsandbobs.minimodules.togglepvp.TogglePvpManager;
 
-import java.net.URLClassLoader;
 import java.util.List;
 import java.util.logging.Level;
 
@@ -62,6 +61,7 @@ public void onEnable() {
         manager.registerEvents(new OnPvp(), plugin);
         manager.registerEvents(new ShardLotto(), plugin);
         manager.registerEvents(new ChickenFeatherDrops(), plugin);
+        manager.registerEvents(new EntityTweaks(), plugin);
 
         if (config.getBoolean("disable-ender-chests", false)) {
             manager.registerEvents(new DisableEnderChest(), plugin);
@@ -70,6 +70,18 @@ public void onEnable() {
         if (config.getBoolean("prevent-spawner-mining", false)) {
             manager.registerEvents(new PreventSpawnerMining(), plugin);
         }
+
+        if (config.getBoolean("enable-ziprails", true)) {
+            manager.registerEvents(new Ziprails(), plugin);
+        }
+
+        if (config.getBoolean("enable-calling-bell", true)) {
+            manager.registerEvents(new CallingBell(), plugin);
+        }
+
+        if (config.getBoolean("enable-sweethearts", true)) {
+            manager.registerEvents(new Sweethearts(), plugin);
+        }
     }
 
     @Override

modules/src/main/java/parallelmc/parallelutils/modules/bitsandbobs/README.md

@@ -0,0 +1,8 @@
+The following Bits & Bobs modules are plugin versions of datapack modules made by Gamemode 4:
+
+- Beehive Inspector
+- Calling Bell
+- SweetHearts 
+
+For licensing of these modules, please refer to the included license file.
+https://github.com/Gamemode4Dev/GM4_Datapacks