Modern platform support

Signed-off-by: Christopher White <[email protected]>

Author: cswhite2000

buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts

@@ -19,7 +19,6 @@ repositories {
 }
 
 dependencies {
-    implementation("tc.oc.pgm:util:0.16-SNAPSHOT") { isTransitive = false }
     implementation("com.zaxxer:HikariCP:2.4.1") { isTransitive = false }
     implementation("fr.minuskube.inv:smart-invs:1.2.7") { isTransitive = false }
 
@@ -32,6 +31,7 @@ dependencies {
     implementation("org.reflections:reflections:0.10.2")
 
     compileOnly("tc.oc.pgm:core:0.16-SNAPSHOT")
+    compileOnly("tc.oc.pgm:util:0.16-SNAPSHOT")
     compileOnly("tc.oc.occ:AFK:1.0.0-SNAPSHOT")
     compileOnly("tc.oc.occ:Environment:1.0.0-SNAPSHOT")
     compileOnly("org.incendo:cloud-annotations:2.0.0")

core/build.gradle.kts

@@ -12,6 +12,7 @@ dependencies {
     implementation(project(":util"))
 
     runtimeOnly(project(":platform-sportpaper")) { exclude("*") }
+    runtimeOnly(project(":platform-modern")) { exclude("*") }
 }
 
 tasks.named<ShadowJar>("shadowJar") {
@@ -22,6 +23,7 @@ tasks.named<ShadowJar>("shadowJar") {
     minimize {
         // Exclude from minimization as they're required at runtime
         exclude(project(":platform-sportpaper"))
+        exclude(project(":platform-modern"))
     }
 
     dependencies {

platform/platform-modern/build.gradle.kts

@@ -0,0 +1,11 @@
+plugins {
+    id("buildlogic.java-conventions")
+    id("io.papermc.paperweight.userdev") version "1.7.4"
+}
+
+dependencies {
+    implementation(project(":util"))
+    paperweight.paperDevBundle("1.21.1-R0.1-SNAPSHOT")
+}
+
+paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION

platform/platform-modern/src/main/java/dev/pgm/community/platform/modern/ModernEffects.java

@@ -0,0 +1,27 @@
+package dev.pgm.community.platform.modern;
+
+import static dev.pgm.community.util.Supports.Variant.PAPER;
+
+import dev.pgm.community.util.Effects;
+import dev.pgm.community.util.Supports;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.TNTPrimed;
+
+@Supports(value = PAPER, minVersion = "1.20.6")
+public class ModernEffects implements Effects {
+  @Override
+  public void dummy() {}
+
+  @Override
+  public void tntRainExplode(TNTPrimed tnt) {}
+
+  @Override
+  public void mobSpawnEffect(Location loc) {}
+
+  @Override
+  public void explosionEffect(Location loc) {}
+
+  @Override
+  public void batTakeoffSound(Player player) {}
+}

platform/platform-modern/src/main/java/dev/pgm/community/platform/modern/ModernEntityUtils.java

@@ -0,0 +1,24 @@
+package dev.pgm.community.platform.modern;
+
+import static dev.pgm.community.util.Supports.Variant.PAPER;
+
+import dev.pgm.community.util.EntityUtils;
+import dev.pgm.community.util.Supports;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.PathfinderMob;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.entity.CraftEntity;
+import org.bukkit.entity.LivingEntity;
+
+@Supports(value = PAPER, minVersion = "1.20.6")
+public class ModernEntityUtils implements EntityUtils {
+  @Override
+  public void follow(LivingEntity mob, Location location, float speed) {
+    Entity handle = ((CraftEntity) mob).getHandle();
+    if (handle instanceof PathfinderMob pathfinderMob) {
+      pathfinderMob
+          .getNavigation()
+          .moveTo(location.getX(), location.getY(), location.getZ(), speed);
+    }
+  }
+}

platform/platform-modern/src/main/java/dev/pgm/community/platform/modern/ModernEventUtils.java

@@ -0,0 +1,16 @@
+package dev.pgm.community.platform.modern;
+
+import static dev.pgm.community.util.Supports.Variant.PAPER;
+
+import dev.pgm.community.util.EventUtils;
+import dev.pgm.community.util.Supports;
+import org.bukkit.entity.FishHook;
+import org.bukkit.event.player.PlayerFishEvent;
+
+@Supports(value = PAPER, minVersion = "1.20.6")
+public class ModernEventUtils implements EventUtils {
+  @Override
+  public FishHook getFishHook(PlayerFishEvent fishEvent) {
+    return fishEvent.getHook();
+  }
+}

platform/platform-modern/src/main/java/dev/pgm/community/platform/modern/ModernInventoryUtils.java

@@ -0,0 +1,25 @@
+package dev.pgm.community.platform.modern;
+
+import static dev.pgm.community.util.Supports.Variant.PAPER;
+
+import dev.pgm.community.util.InventoryUtils;
+import dev.pgm.community.util.Supports;
+import java.util.Random;
+import org.bukkit.Material;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeModifier;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+@Supports(value = PAPER, minVersion = "1.20.6")
+public class ModernInventoryUtils implements InventoryUtils {
+  @Override
+  public void addAttributeModifier(ItemMeta meta, Attribute attribute, AttributeModifier modifier) {
+    meta.addAttributeModifier(attribute, modifier);
+  }
+
+  @Override
+  public ItemStack getRandomPotion(boolean splash, Random random) {
+    return new ItemStack(Material.POTION);
+  }
+}

platform/platform-modern/src/main/java/dev/pgm/community/platform/modern/ModernPlatform.java

@@ -0,0 +1,14 @@
+package dev.pgm.community.platform.modern;
+
+import static dev.pgm.community.util.Supports.Priority.HIGHEST;
+import static dev.pgm.community.util.Supports.Variant.PAPER;
+
+import dev.pgm.community.util.Platform;
+import dev.pgm.community.util.Supports;
+import org.bukkit.plugin.Plugin;
+
+@Supports(value = PAPER, minVersion = "1.20.6", priority = HIGHEST)
+public class ModernPlatform implements Platform.Manifest {
+  @Override
+  public void onEnable(Plugin plugin) {}
+}

platform/platform-modern/src/main/java/dev/pgm/community/platform/modern/ModernPlayerUtils.java

@@ -0,0 +1,24 @@
+package dev.pgm.community.platform.modern;
+
+import static dev.pgm.community.util.Supports.Variant.PAPER;
+
+import dev.pgm.community.util.PlayerUtils;
+import dev.pgm.community.util.Supports;
+import org.bukkit.craftbukkit.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+import tc.oc.pgm.platform.modern.util.Skins;
+import tc.oc.pgm.util.skin.Skin;
+
+@Supports(value = PAPER, minVersion = "1.20.6")
+public class ModernPlayerUtils implements PlayerUtils {
+  @Override
+  public Skin getPlayerSkin(Player player) {
+    CraftPlayer craftPlayer = (CraftPlayer) player;
+    return Skins.fromProfile(craftPlayer.getProfile());
+  }
+
+  @Override
+  public void setFakeNameAndSkin(Player player, Player viewer, String displayName, String nick) {
+    // TODO
+  }
+}

settings.gradle.kts

@@ -2,6 +2,8 @@ rootProject.name = "community"
 
 include(":util")
 include(":platform-sportpaper")
+include(":platform-modern")
 include(":core")
 
-project(":platform-sportpaper").projectDir = file("platform/platform-sportpaper")
+project(":platform-sportpaper").projectDir = file("platform/platform-sportpaper")
+project(":platform-modern").projectDir = file("platform/platform-modern")