Fixes

Signed-off-by: BT (calcastor/mame) <[email protected]>

Author: calcastor

core/src/main/java/tc/oc/occ/matchshare/MatchShare.java

@@ -1,5 +1,6 @@
 package tc.oc.occ.matchshare;
 
+import java.util.logging.Level;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
 import tc.oc.occ.matchshare.listeners.AssistanceListener;
@@ -21,6 +22,7 @@
 import tc.oc.occ.matchshare.listeners.WoolDestructionListener;
 import tc.oc.occ.matchshare.tracker.MatchCapacityTracker;
 import tc.oc.occ.matchshare.tracker.MatchTimeTracker;
+import tc.oc.occ.matchshare.util.Platform;
 
 public class MatchShare extends JavaPlugin implements Listener {
 
@@ -32,6 +34,13 @@ public void onEnable() {
     this.timeTracker = new MatchTimeTracker();
     this.capacityTracker = new MatchCapacityTracker(this);
 
+    try {
+      Platform.init();
+    } catch (Throwable t) {
+      getLogger().log(Level.SEVERE, "Failed to initialize MatchShare platform", t);
+      getServer().getPluginManager().disablePlugin(this);
+    }
+
     registerEvents(new DebugListener(this));
     registerEvents(new PlayerMetaListener(this));
     registerEvents(new PlayerCombatListener(this));
@@ -56,6 +65,7 @@ public MatchTimeTracker getTimeTracker() {
   }
 
   private void registerEvents(Listener listener) {
+    Platform.MANIFEST.onEnable(this);
     getServer().getPluginManager().registerEvents(listener, this);
   }
 }

core/src/main/java/tc/oc/occ/matchshare/listeners/BlockListener.java

@@ -1,5 +1,6 @@
 package tc.oc.occ.matchshare.listeners;
 
+import static net.kyori.adventure.text.Component.text;
 import static tc.oc.occ.matchshare.util.MiscUtils.MISC_UTILS;
 
 import org.bukkit.Material;
@@ -10,6 +11,7 @@
 import org.bukkit.event.block.BlockBreakEvent;
 import tc.oc.occ.dispense.events.players.PGMPlayerBlockBreakEvent;
 import tc.oc.occ.matchshare.MatchShare;
+import tc.oc.pgm.util.Audience;
 
 public class BlockListener extends ShareListener {
 
@@ -24,6 +26,11 @@ public void onBlockBreak(BlockBreakEvent event) {
 
     if (block == null || block.getType() == Material.AIR) return;
     if (player == null || !player.isOnline() || !isParticipating(player)) return;
+
+    Audience.get(player)
+        .sendMessage(
+            text(block.getType().name() + " has strength " + MISC_UTILS.getBlockStrength(block)));
+
     if (MISC_UTILS.getBlockStrength(block) < 0.5) return;
 
     callNewEvent(new PGMPlayerBlockBreakEvent(player, block));

core/src/main/java/tc/oc/occ/matchshare/listeners/MapListener.java

@@ -50,7 +50,7 @@ public void onMapLoad(MatchLoadEvent event) {
     String name = map.getName();
     String desc = map.getDescription();
     int maxPlayers = map.getMaxPlayers().stream().reduce(0, Integer::sum);
-    String gamemode = "";
+    String gamemode;
 
     TextComponent.Builder gmc = text();
     Collection<Gamemode> gamemodes = map.getGamemodes();

platform/platform-modern/src/main/java/tc.oc.occ.matchshare.platform.modern/ModernMiscUtils.java

@@ -1,6 +1,6 @@
 package tc.oc.occ.matchshare.platform.modern;
 
-import static tc.oc.pgm.util.platform.Supports.Variant.PAPER;
+import static tc.oc.occ.matchshare.util.Supports.Variant.PAPER;
 
 import java.time.Duration;
 import java.util.UUID;
@@ -13,17 +13,20 @@
 import net.minecraft.world.entity.item.ItemEntity;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.block.CraftBlockType;
+import org.bukkit.craftbukkit.block.CraftBlock;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
 import org.bukkit.craftbukkit.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
 import tc.oc.occ.matchshare.util.MiscUtils;
-import tc.oc.pgm.util.platform.Supports;
+import tc.oc.occ.matchshare.util.Supports;
 
 @Supports(value = PAPER, minVersion = "1.21.6")
 public class ModernMiscUtils implements MiscUtils {
+  @Override
+  public void dummy() {}
+
   @Override
   public void sendPacket(Player bukkitPlayer, Object packet) {
     if (bukkitPlayer.isOnline()) {
@@ -94,6 +97,6 @@ public void showFakeItems(
 
   @Override
   public float getBlockStrength(Block block) {
-    return ((CraftBlockType<?>) block).getHardness();
+    return ((CraftBlock) block).getNMS().destroySpeed;
   }
 }

platform/platform-modern/src/main/java/tc.oc.occ.matchshare.platform.modern/ModernPlatform.java

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

platform/platform-sportpaper/src/main/java/tc/oc/occ/matchshare/platform/sportpaper/SpMiscUtils.java

@@ -1,6 +1,6 @@
 package tc.oc.occ.matchshare.platform.sportpaper;
 
-import static tc.oc.pgm.util.platform.Supports.Variant.SPORTPAPER;
+import static tc.oc.occ.matchshare.util.Supports.Variant.SPORTPAPER;
 
 import java.time.Duration;
 import java.util.UUID;
@@ -19,7 +19,7 @@
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
 import tc.oc.occ.matchshare.util.MiscUtils;
-import tc.oc.pgm.util.platform.Supports;
+import tc.oc.occ.matchshare.util.Supports;
 
 /**
  * Took some stuff from
@@ -28,6 +28,9 @@
  */
 @Supports(SPORTPAPER)
 public class SpMiscUtils implements MiscUtils {
+  @Override
+  public void dummy() {}
+
   @Override
   public void sendPacket(Player bukkitPlayer, Object packet) {
     if (bukkitPlayer.isOnline()) {

platform/platform-sportpaper/src/main/java/tc/oc/occ/matchshare/platform/sportpaper/SpPlatform.java

@@ -0,0 +1,14 @@
+package tc.oc.occ.matchshare.platform.sportpaper;
+
+import static tc.oc.occ.matchshare.util.Supports.Priority.HIGHEST;
+import static tc.oc.occ.matchshare.util.Supports.Variant.SPORTPAPER;
+
+import org.bukkit.plugin.Plugin;
+import tc.oc.occ.matchshare.util.Platform;
+import tc.oc.occ.matchshare.util.Supports;
+
+@Supports(value = SPORTPAPER, priority = HIGHEST)
+public class SpPlatform implements Platform.Manifest {
+  @Override
+  public void onEnable(Plugin plugin) {}
+}

util/src/main/java/tc/oc/occ/matchshare/util/MiscUtils.java

@@ -8,7 +8,6 @@
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
-import tc.oc.pgm.util.platform.Platform;
 
 public interface MiscUtils {
   MiscUtils MISC_UTILS = Platform.get(MiscUtils.class);
@@ -17,6 +16,8 @@ static double randomEntityVelocity() {
     return new Random().nextDouble() - 0.5D;
   }
 
+  void dummy();
+
   void sendPacket(Player bukkitPlayer, Object packet);
 
   void scheduleEntityDestroy(Plugin plugin, UUID viewerUuid, Duration delay, int[] entityIds);

util/src/main/java/tc/oc/occ/matchshare/util/Platform.java

@@ -0,0 +1,85 @@
+package tc.oc.occ.matchshare.util;
+
+import static org.reflections.scanners.Scanners.TypesAnnotated;
+
+import java.util.Arrays;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+import org.reflections.Reflections;
+import org.reflections.util.ClasspathHelper;
+import org.reflections.util.ConfigurationBuilder;
+import tc.oc.occ.matchshare.util.Supports.Variant;
+import tc.oc.pgm.util.Version;
+import tc.oc.pgm.util.reflect.ReflectionUtils;
+import tc.oc.pgm.util.text.TextParser;
+
+@SuppressWarnings("unchecked")
+public abstract class Platform {
+  private static final Reflections REFLECTIONS = new Reflections(new ConfigurationBuilder()
+      .addUrls(ClasspathHelper.forPackage("tc.oc.occ.matchshare", Platform.class.getClassLoader()))
+      .forPackage("tc.oc.occ.matchshare.platform")
+      .setScanners(TypesAnnotated));
+
+  public static final Version MINECRAFT_VERSION;
+  public static final Variant VARIANT;
+
+  static {
+    var sv = Bukkit.getServer();
+    MINECRAFT_VERSION = TextParser.parseVersion(sv.getBukkitVersion().split("-")[0]);
+    VARIANT = Arrays.stream(Variant.values())
+        .filter(v -> v.matcher.test(sv))
+        .findFirst()
+        .orElse(null);
+  }
+
+  public static final @NotNull Manifest MANIFEST = get(Manifest.class);
+
+  /**
+   * Do a minimum sanity-check of the platform's viability and early-load some codepaths
+   *
+   * @throws Throwable could throw even class not found issues if loading in the wrong version
+   */
+  public static void init() throws Throwable {
+    MiscUtils.MISC_UTILS.dummy();
+  }
+
+  public static <T> @NotNull T get(Class<T> clazz) {
+    return (T) Platform.getBestSupported(clazz);
+  }
+
+  private static <T> Iterable<Class<?>> getSupported(Class<T> parent) {
+    return REFLECTIONS.get(TypesAnnotated.with(Supports.class, Supports.List.class)
+        .asClass()
+        .filter(parent::isAssignableFrom));
+  }
+
+  private static Object getBestSupported(Class<?> parent) {
+    Class<?> result = null;
+    Supports.Priority priority = null;
+    for (Class<?> clazz : getSupported(parent)) {
+      Supports[] supportList = clazz.getDeclaredAnnotationsByType(Supports.class);
+      for (Supports sup : supportList) {
+        if (VARIANT != sup.value()) continue;
+        if (!sup.minVersion().isEmpty()
+            && MINECRAFT_VERSION.isOlderThan(TextParser.parseVersion(sup.minVersion()))) continue;
+        if (!sup.maxVersion().isEmpty()
+            && TextParser.parseVersion(sup.maxVersion()).isOlderThan(MINECRAFT_VERSION)) continue;
+
+        if (priority == null || priority.compareTo(sup.priority()) < 0) {
+          priority = sup.priority();
+          result = clazz;
+        }
+      }
+    }
+    if (result == null)
+      throw new UnsupportedOperationException(
+          "Current server software platform does not have an impl for: " + parent.getSimpleName());
+
+    return ReflectionUtils.callConstructor(ReflectionUtils.getConstructor(result));
+  }
+
+  public interface Manifest {
+    void onEnable(Plugin plugin);
+  }
+}

util/src/main/java/tc/oc/occ/matchshare/util/Supports.java

@@ -0,0 +1,43 @@
+package tc.oc.occ.matchshare.util;
+
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.function.Predicate;
+import org.bukkit.Server;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(Supports.List.class)
+public @interface Supports {
+  Variant value();
+
+  String minVersion() default "";
+
+  String maxVersion() default "";
+
+  Priority priority() default Priority.MEDIUM;
+
+  enum Variant {
+    SPORTPAPER(sv -> sv.getVersion().contains("SportPaper")),
+    PAPER(sv -> sv.getName().equalsIgnoreCase("Paper"));
+
+    public final Predicate<Server> matcher;
+
+    Variant(Predicate<Server> matches) {
+      this.matcher = matches;
+    }
+  }
+
+  enum Priority {
+    LOWEST,
+    LOW,
+    MEDIUM,
+    HIGH,
+    HIGHEST
+  }
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @interface List {
+    Supports[] value();
+  }
+}