diff --git a/FEATURES.md b/FEATURES.md index e1f2bc4c..84fa3cae 100644 --- a/FEATURES.md +++ b/FEATURES.md @@ -18,8 +18,8 @@ Fixes: Hooks: --------------- - Vault hook to buy cannons (was there even before fork) -- Movecraft-Cannons support is now integrated (Movecraft Combat hook + Movecraft hook) -- [PlaceholderAPI](./PLACEHOLDERS.md) hook +- [Movecraft](https://github.com/Intybyte/Cannons/wiki/Hooks-&-Integrations#movecraft): Movecraft-Cannons support is now integrated (Movecraft Combat hook + Movecraft hook) +- [PlaceholderAPI](https://github.com/Intybyte/Cannons/wiki/Hooks-&-Integrations#placeholder-api) hook Optimizations: --------------- diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/Cannons.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/Cannons.java index 8d0ebc69..10f80179 100644 --- a/cannons-bukkit/src/main/java/at/pavlov/cannons/Cannons.java +++ b/cannons-bukkit/src/main/java/at/pavlov/cannons/Cannons.java @@ -16,7 +16,7 @@ import at.pavlov.cannons.exchange.ExchangeLoader; import at.pavlov.cannons.hooks.VaultHook; import at.pavlov.cannons.hooks.movecraft.MovecraftHook; -import at.pavlov.cannons.hooks.movecraft.type.MaxCannonsProperty; +import at.pavlov.cannons.hooks.movecraft.type.properties.CannonProperties; import at.pavlov.cannons.hooks.movecraftcombat.MovecraftCombatHook; import at.pavlov.cannons.hooks.papi.PlaceholderAPIHook; import at.pavlov.cannons.listener.BlockListener; @@ -34,15 +34,12 @@ import at.pavlov.cannons.utils.CannonSelector; import at.pavlov.cannons.utils.TimeUtils; import at.pavlov.internal.CLogger; -import at.pavlov.internal.Hook; import at.pavlov.internal.HookManager; import at.pavlov.internal.Key; import at.pavlov.internal.ModrinthUpdateChecker; import at.pavlov.internal.key.registries.Registries; import at.pavlov.internal.projectile.definition.KeyedDefaultProjectile; import lombok.Getter; -import org.bstats.bukkit.Metrics; -import org.bstats.charts.AdvancedPie; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -59,8 +56,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.text.DecimalFormat; -import java.util.HashMap; -import java.util.Map; import java.util.UUID; import java.util.logging.Logger; @@ -127,7 +122,7 @@ public void onLoad() { if (config.isMovecraftEnabled()) { try { Class.forName("net.countercraft.movecraft.craft.type.property.Property"); - MaxCannonsProperty.register(); + CannonProperties.register(); } catch (Exception ignored) { } @@ -481,4 +476,8 @@ public boolean isDebugMode() { public void setDebugMode(boolean debugMode) { this.debugMode = debugMode; } + + public static NamespacedKey nsKey(String key) { + return new NamespacedKey(getPlugin(), key); + } } diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/MovecraftHook.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/MovecraftHook.java index 226f7644..03d0d061 100644 --- a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/MovecraftHook.java +++ b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/MovecraftHook.java @@ -3,13 +3,13 @@ import at.pavlov.cannons.Cannons; import at.pavlov.cannons.hooks.BukkitHook; import at.pavlov.cannons.hooks.movecraft.listener.CraftDetectListener; +import at.pavlov.cannons.hooks.movecraft.listener.ReleaseListener; import at.pavlov.cannons.hooks.movecraft.listener.RotationListener; import at.pavlov.cannons.hooks.movecraft.listener.SinkListener; import at.pavlov.cannons.hooks.movecraft.listener.TranslationListener; import at.pavlov.internal.Hook; import net.countercraft.movecraft.Movecraft; import org.bukkit.ChatColor; -import org.bukkit.event.HandlerList; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; @@ -42,6 +42,7 @@ public void onEnable() { pluginManager.registerEvents(new TranslationListener(), plugin); pluginManager.registerEvents(new RotationListener(), plugin); pluginManager.registerEvents(new SinkListener(), plugin); + pluginManager.registerEvents(new ReleaseListener(), plugin); plugin.logInfo(ChatColor.GREEN + enabledMessage()); } diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/MovecraftUtils.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/MovecraftUtils.java index b36753bc..990b4969 100644 --- a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/MovecraftUtils.java +++ b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/MovecraftUtils.java @@ -2,17 +2,24 @@ import at.pavlov.cannons.cannon.Cannon; import at.pavlov.cannons.cannon.CannonManager; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; import net.countercraft.movecraft.MovecraftLocation; import net.countercraft.movecraft.craft.Craft; import net.countercraft.movecraft.craft.PilotedCraft; import net.countercraft.movecraft.craft.SubCraft; +import net.countercraft.movecraft.util.Pair; import org.bukkit.Location; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.UUID; +import static net.countercraft.movecraft.craft.type.TypeData.NUMERIC_PREFIX; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) public class MovecraftUtils { public static Set getCannons(Craft craft) { @@ -49,4 +56,32 @@ public static UUID getPlayerFromCraft(Craft craft) { // Return null if all else fails return null; } + + public static @NotNull Pair parseLimit(@NotNull Object input) { + if (!(input instanceof String str)) { + return new Pair<>(false, (double) input); + } + + if (!str.contains(NUMERIC_PREFIX)) { + return new Pair<>(false, Double.valueOf(str)); + } + + String[] parts = str.split(NUMERIC_PREFIX); + int val = Integer.parseInt(parts[1]); + return new Pair<>(true, val); + } + + public static @NotNull List<@NotNull String> parseKey(Object key) { + if (key instanceof String string) { + return List.of(string); + } else if (key instanceof ArrayList array) { + if (array.get(0) instanceof String) { + return (ArrayList) array; + } + + throw new IllegalArgumentException("Invalid parsed key"); + } else { + throw new IllegalArgumentException("Invalid parsed key"); + } + } } diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/listener/CraftDetectListener.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/listener/CraftDetectListener.java index ed05c327..800d3643 100644 --- a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/listener/CraftDetectListener.java +++ b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/listener/CraftDetectListener.java @@ -1,97 +1,111 @@ package at.pavlov.cannons.hooks.movecraft.listener; import at.pavlov.cannons.Cannons; -import at.pavlov.cannons.Enum.BreakCause; import at.pavlov.cannons.cannon.Cannon; -import at.pavlov.cannons.cannon.CannonManager; +import at.pavlov.cannons.cannon.CannonDesign; import at.pavlov.cannons.hooks.movecraft.MovecraftUtils; -import at.pavlov.cannons.hooks.movecraft.type.MaxCannonsEntry; +import at.pavlov.cannons.hooks.movecraft.type.CannonCheck; +import at.pavlov.cannons.hooks.movecraft.type.properties.CannonProperties; import net.countercraft.movecraft.craft.Craft; import net.countercraft.movecraft.craft.PlayerCraft; import net.countercraft.movecraft.craft.type.CraftType; import net.countercraft.movecraft.events.CraftDetectEvent; -import net.countercraft.movecraft.events.CraftSinkEvent; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; +import java.util.Optional; import java.util.Set; -import static at.pavlov.cannons.hooks.movecraft.type.MaxCannonsProperty.MAX_CANNONS; - public class CraftDetectListener implements Listener { - private static final Set notifyError = new HashSet<>(); - private static final Cannons cannon = Cannons.getPlugin(); + private static final Cannons cannonPlugin = Cannons.getPlugin(); - @EventHandler + @EventHandler(ignoreCancelled = true) public void onCraftDetect(CraftDetectEvent e) { Craft craft = e.getCraft(); CraftType type = craft.getType(); - if (notifyError.contains(type)) - return; - - if (!(craft instanceof PlayerCraft)) - return; - Set maxCannons = getCannonProperty(type); - if (maxCannons.isEmpty()) - return; // Return if empty set to improve performance + if (!(craft instanceof PlayerCraft)) return; // Sum up counts of each cannon design Set cannons = MovecraftUtils.getCannons(craft); - Map cannonCount = new HashMap<>(); - for (var cannon : cannons) { - String design = cannon.getCannonDesign().getDesignName().toLowerCase(); - cannonCount.compute(design, (key, value) -> (value == null) ? 1 : value + 1); + + if (cannons.isEmpty()) return; + + if (checkMaxMin(e, type, cannons, craft)) return; + + if (checkMass(e, cannons, type)) return; + + boolean useShip = CannonProperties.USE_SHIP_ANGLES.get(type) == Boolean.TRUE; + if (useShip) { + cannons.forEach(it -> it.setOnShip(true)); + } + } + + private boolean checkMass(CraftDetectEvent e, Set cannons, CraftType type) { + int cannonsMassCount = 0; + Set exclude = CannonProperties.EXCLUDE_FROM_MASS.get(type); + for (Cannon cannon : cannons) { + CannonDesign design = cannon.getCannonDesign(); + + if (!exclude.contains(design.getDesignID())) { + cannonsMassCount += design.getMassOfCannon(); + } + } + + cannonPlugin.logDebug("MassCount " + cannonsMassCount); + Integer maxMass = CannonProperties.MAX_MASS.get(type); + if (maxMass != null && maxMass < cannonsMassCount) { + e.setCancelled(true); + e.setFailMessage( + String.format( + "Detection Failed! Too much cannon mass on board! %d > %d", cannonsMassCount, maxMass + ) + ); + return true; } - printCannonCount(cannonCount); - - // Check designs against maxCannons - int size = craft.getOrigBlockCount(); - for (var entry : maxCannons) { - if (!(entry instanceof MaxCannonsEntry max)) - throw new IllegalStateException("maxCannons must be a set of MaxCannonsEntry."); - - var cannonName = max.getName(); - var count = cannonCount.get(cannonName.toLowerCase()); - if (count == null) - continue; - - var result = max.detect(count, size); - - result.ifPresent( error -> { - e.setCancelled(true); - e.setFailMessage("Detection Failed! You have too many cannons of the following type on this craft: " - + cannonName + ": " + error); - }); + + Integer minMass = CannonProperties.MIN_MASS.get(type); + if (minMass != null && minMass > cannonsMassCount) { + e.setCancelled(true); + e.setFailMessage( + String.format( + "Detection Failed! Not enough cannon mass on board! %d < %d", cannonsMassCount, minMass + ) + ); + return true; } + + return false; } - private void printCannonCount(Map cannonCount) { + private boolean checkMaxMin(CraftDetectEvent e, CraftType type, Set cannons, Craft craft) { + Set cannonMaxMinChecks = CannonProperties.MAX_CANNONS.get(type); + cannonMaxMinChecks.addAll(CannonProperties.MIN_CANNONS.get(type)); + + if (cannonMaxMinChecks.isEmpty()) return false; + + Map cannonCount = new HashMap<>(); + for (Cannon cannon : cannons) { + String design = cannon.getCannonDesign().getDesignID(); + cannonCount.compute(design, (key, value) -> (value == null) ? 1 : value + 1); + } + for (var entry : cannonCount.entrySet()) { - cannon.logDebug("Cannon found: " + entry.getKey() + " | " + entry.getValue()); + cannonPlugin.logDebug("Cannon found: " + entry.getKey() + " | " + entry.getValue()); } - } - private Set getCannonProperty(CraftType type) { - try { - Object objectProperty = type.getObjectProperty(MAX_CANNONS); - if (objectProperty instanceof Set property) { - return (Set) property; - } else { - throw new IllegalStateException("maxCannons must be a set."); - } - } catch (Exception exception) { - notifyError.add(type); - cannon.logSevere( - "Failed to get maxCannons property from craft " + - type.getStringProperty(CraftType.NAME) + - " maxCannons won't be applied. - Cause: " + - exception.getMessage() - ); - return Set.of(); + for (CannonCheck check : cannonMaxMinChecks) { + Optional result = check.check(craft, cannonCount); + + if (result.isEmpty()) continue; + + String error = result.get(); + e.setCancelled(true); + e.setFailMessage("Detection Failed! " + error); + return true; } + return false; } } diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/listener/ReleaseListener.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/listener/ReleaseListener.java new file mode 100644 index 00000000..9b1bbfae --- /dev/null +++ b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/listener/ReleaseListener.java @@ -0,0 +1,15 @@ +package at.pavlov.cannons.hooks.movecraft.listener; + +import at.pavlov.cannons.hooks.movecraft.MovecraftUtils; +import net.countercraft.movecraft.events.CraftReleaseEvent; +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; + +public class ReleaseListener implements Listener { + + @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) + public void onRelease(CraftReleaseEvent event) { + MovecraftUtils.getCannons(event.getCraft()).forEach(it -> it.setOnShip(false)); + } +} diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/listener/SinkListener.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/listener/SinkListener.java index d57fd694..30a4d96b 100644 --- a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/listener/SinkListener.java +++ b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/listener/SinkListener.java @@ -6,13 +6,14 @@ import at.pavlov.cannons.hooks.movecraft.MovecraftUtils; import net.countercraft.movecraft.events.CraftSinkEvent; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import java.util.Set; public class SinkListener implements Listener { - @EventHandler + @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) public void onCraftSink(CraftSinkEvent event) { Set cannons = MovecraftUtils.getCannons(event.getCraft()); cannons.forEach(cannon -> CannonManager.getInstance().removeCannon(cannon.getUID(), false, true, BreakCause.Explosion)); diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/CannonCheck.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/CannonCheck.java new file mode 100644 index 00000000..ce6973b2 --- /dev/null +++ b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/CannonCheck.java @@ -0,0 +1,10 @@ +package at.pavlov.cannons.hooks.movecraft.type; + +import net.countercraft.movecraft.craft.Craft; + +import java.util.Map; +import java.util.Optional; + +public interface CannonCheck { + Optional check(Craft craft, Map cannonCountMap); +} diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/CraftKeys.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/CraftKeys.java new file mode 100644 index 00000000..692eb143 --- /dev/null +++ b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/CraftKeys.java @@ -0,0 +1,18 @@ +package at.pavlov.cannons.hooks.movecraft.type; + +import at.pavlov.cannons.Cannons; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import org.bukkit.NamespacedKey; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class CraftKeys { + public static final NamespacedKey MAX_CANNONS = Cannons.nsKey("max_cannons"); + public static final NamespacedKey MIN_CANNONS = Cannons.nsKey("min_cannons"); + + public static final NamespacedKey MAX_MASS = Cannons.nsKey("max_mass"); + public static final NamespacedKey MIN_MASS = Cannons.nsKey("min_mass"); + public static final NamespacedKey EXCLUDE_FROM_MASS = Cannons.nsKey("exclude_from_mass"); + + public static final NamespacedKey USE_SHIP_ANGLES = Cannons.nsKey("use_ship_angles"); +} diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/MaxCannonsEntry.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/MaxCannonsEntry.java index 71433468..9b380e2f 100644 --- a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/MaxCannonsEntry.java +++ b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/MaxCannonsEntry.java @@ -1,32 +1,26 @@ package at.pavlov.cannons.hooks.movecraft.type; import lombok.Getter; +import net.countercraft.movecraft.craft.Craft; import net.countercraft.movecraft.util.Pair; import org.jetbrains.annotations.NotNull; +import java.util.List; +import java.util.Map; import java.util.Optional; -public class MaxCannonsEntry { - @Getter - private final String name; +@Getter +public class MaxCannonsEntry implements CannonCheck { + private final List names; private final double max; private final boolean numericMax; - public MaxCannonsEntry(String name, @NotNull Pair max) { - this.name = name; + public MaxCannonsEntry(List names, @NotNull Pair max) { + this.names = names; this.max = max.getRight().doubleValue(); this.numericMax = max.getLeft(); } - public boolean check(int count, int size) { - if (numericMax) { - return !(count > max); - } - - double percent = 100D * count / size; - return !(percent > max); - } - /** * * @return Empty if no error, otherwise return the error @@ -34,13 +28,27 @@ public boolean check(int count, int size) { public Optional detect(int count, int size) { if (numericMax) { if (count > max) - return Optional.of(String.format("%d > %d", count, (int) max)); + return Optional.of(String.format("You have too many %s cannon types : %d > %d", allNames(), count, (int) max)); } else { double blockPercent = 100D * count / size; if (blockPercent > max) - return Optional.of(String.format("%.2f%% > %.2f%%", blockPercent, max)); + return Optional.of(String.format("You have too many %s cannon types : %.2f%% > %.2f%%", allNames(), blockPercent, max)); } return Optional.empty(); } + + public String allNames() { + return String.join(", ", names); + } + + @Override + public Optional check(Craft craft, Map cannonCountMap) { + int count = 0; + for (String name : names) { + count += cannonCountMap.getOrDefault(name, 0); + } + + return detect(count, craft.getOrigBlockCount()); + } } diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/MaxCannonsProperty.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/MaxCannonsProperty.java deleted file mode 100644 index 3a5523ce..00000000 --- a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/MaxCannonsProperty.java +++ /dev/null @@ -1,50 +0,0 @@ -package at.pavlov.cannons.hooks.movecraft.type; - -import net.countercraft.movecraft.craft.type.CraftType; -import net.countercraft.movecraft.craft.type.TypeData; -import net.countercraft.movecraft.craft.type.property.ObjectPropertyImpl; -import net.countercraft.movecraft.util.Pair; -import org.bukkit.NamespacedKey; -import org.jetbrains.annotations.NotNull; - -import java.util.HashSet; -import java.util.Set; - -import static net.countercraft.movecraft.craft.type.TypeData.NUMERIC_PREFIX; - -public class MaxCannonsProperty { - public static NamespacedKey MAX_CANNONS = new NamespacedKey("cannons-revamped", "max_cannons"); - - private static @NotNull Pair parseLimit(@NotNull Object input) { - if (!(input instanceof String str)) { - return new Pair<>(false, (double) input); - } - - if (!str.contains(NUMERIC_PREFIX)) { - return new Pair<>(false, Double.valueOf(str)); - } - - String[] parts = str.split(NUMERIC_PREFIX); - int val = Integer.parseInt(parts[1]); - return new Pair<>(true, val); - } - - public static void register() { - CraftType.registerProperty(new ObjectPropertyImpl("maxCannons", MAX_CANNONS, (data, type, fileKey, namespacedKey) -> { - var map = data.getData(fileKey).getBackingData(); - if (map.isEmpty()) - throw new TypeData.InvalidValueException("Value for " + fileKey + " must not be an empty map"); - - Set maxCannons = new HashSet<>(); - for (var entry : map.entrySet()) { - if (entry.getKey() == null) - throw new TypeData.InvalidValueException("Keys for " + fileKey + " must be a string cannon name."); - - String name = entry.getKey(); - var limit = parseLimit(entry.getValue()); - maxCannons.add(new MaxCannonsEntry(name, limit)); - } - return maxCannons; - }, (type -> new HashSet<>()))); - } -} diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/MinCannonsEntry.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/MinCannonsEntry.java new file mode 100644 index 00000000..f38d0b87 --- /dev/null +++ b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/MinCannonsEntry.java @@ -0,0 +1,54 @@ +package at.pavlov.cannons.hooks.movecraft.type; + +import lombok.Getter; +import net.countercraft.movecraft.craft.Craft; +import net.countercraft.movecraft.util.Pair; +import org.jetbrains.annotations.NotNull; + +import java.util.List; +import java.util.Map; +import java.util.Optional; + +@Getter +public class MinCannonsEntry implements CannonCheck { + private final List names; + private final double min; + private final boolean numericMax; + + public MinCannonsEntry(List names, @NotNull Pair min) { + this.names = names; + this.min = min.getRight().doubleValue(); + this.numericMax = min.getLeft(); + } + + /** + * + * @return Empty if no error, otherwise return the error + */ + public Optional detect(int count, int size) { + if (numericMax) { + if (count < min) + return Optional.of(String.format("You have too few %s cannon types : %d < %d", allNames(), count, (int) min)); + } else { + double blockPercent = 100D * count / size; + if (blockPercent < min) + return Optional.of(String.format("You have too few %s cannon types : %.2f%% < %.2f%%", allNames(), blockPercent, min)); + } + + return Optional.empty(); + } + + public String allNames() { + return String.join(", ", names); + } + + @Override + public Optional check(Craft craft, Map cannonCountMap) { + int count = 0; + for (String name : names) { + count += cannonCountMap.getOrDefault(name, 0); + } + + return detect(count, craft.getOrigBlockCount()); + } +} diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/properties/CannonProperties.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/properties/CannonProperties.java new file mode 100644 index 00000000..ea11522a --- /dev/null +++ b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/properties/CannonProperties.java @@ -0,0 +1,86 @@ +package at.pavlov.cannons.hooks.movecraft.type.properties; + +import at.pavlov.cannons.hooks.movecraft.MovecraftUtils; +import at.pavlov.cannons.hooks.movecraft.type.CraftKeys; +import at.pavlov.cannons.hooks.movecraft.type.MaxCannonsEntry; +import at.pavlov.cannons.hooks.movecraft.type.MinCannonsEntry; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +import net.countercraft.movecraft.craft.type.TypeData; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class CannonProperties { + public static final PropertyWrapper MAX_CANNONS = new PropertyWrapper<>( + CraftKeys.MAX_CANNONS, + Set.class, + Set::of + ); + + public static final PropertyWrapper MIN_CANNONS = new PropertyWrapper<>( + CraftKeys.MIN_CANNONS, + Set.class, + Set::of + ); + + public static final PropertyWrapperInt MAX_MASS = new PropertyWrapperInt(CraftKeys.MAX_MASS, (type) -> null); + public static final PropertyWrapperInt MIN_MASS = new PropertyWrapperInt(CraftKeys.MIN_MASS, (type) -> null); + public static final PropertyWrapper EXCLUDE_FROM_MASS = new PropertyWrapper<>( + CraftKeys.EXCLUDE_FROM_MASS, + Set.class, + Set::of + ); + + public static final PropertyWrapperBoolean USE_SHIP_ANGLES = new PropertyWrapperBoolean(CraftKeys.USE_SHIP_ANGLES, (type) -> false); + + public static void register() { + MAX_CANNONS.register((data, type, fileKey, namespacedKey) -> { + var map = data.getData(fileKey).getBackingData(); + if (map.isEmpty()) + throw new TypeData.InvalidValueException("Value for " + fileKey + " must not be an empty map"); + + Set maxCannons = new HashSet<>(); + for (var entry : map.entrySet()) { + if (entry.getKey() == null) + throw new TypeData.InvalidValueException("Keys for " + fileKey + " must be a string cannon name."); + + Object entryKey = entry.getKey(); + var limit = MovecraftUtils.parseLimit(entry.getValue()); + maxCannons.add(new MaxCannonsEntry(MovecraftUtils.parseKey(entryKey), limit)); + } + return maxCannons; + }, (type -> new HashSet<>())); + + MIN_CANNONS.register((data, type, fileKey, namespacedKey) -> { + var map = data.getData(fileKey).getBackingData(); + if (map.isEmpty()) + throw new TypeData.InvalidValueException("Value for " + fileKey + " must not be an empty map"); + + Set maxCannons = new HashSet<>(); + for (var entry : map.entrySet()) { + if (entry.getKey() == null) + throw new TypeData.InvalidValueException("Keys for " + fileKey + " must be a string cannon name."); + + Object entryKey = entry.getKey(); + var limit = MovecraftUtils.parseLimit(entry.getValue()); + maxCannons.add(new MinCannonsEntry(MovecraftUtils.parseKey(entryKey), limit)); + } + return maxCannons; + }, (type -> new HashSet<>())); + + MAX_MASS.register(); + MIN_MASS.register(); + EXCLUDE_FROM_MASS.register((data, type, fileKey, namespacedKey) -> { + List list = data.getStringList(fileKey); + if (list.isEmpty()) + throw new TypeData.InvalidValueException("Value for " + fileKey + " must not be an empty list"); + + return new HashSet<>(list); + }, (type -> new HashSet<>())); + + USE_SHIP_ANGLES.register(); + } +} diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/properties/PropertyUtils.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/properties/PropertyUtils.java new file mode 100644 index 00000000..9cebdb2e --- /dev/null +++ b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/properties/PropertyUtils.java @@ -0,0 +1,47 @@ +package at.pavlov.cannons.hooks.movecraft.type.properties; + +import net.countercraft.movecraft.craft.type.CraftType; +import net.countercraft.movecraft.craft.type.TypeData; +import net.countercraft.movecraft.util.functions.QuadFunction; +import org.bukkit.NamespacedKey; + +import java.util.function.Function; + +public class PropertyUtils { + public static String snakeToCamel(String input) { + if (input == null || input.isEmpty()) { + return input; + } + + StringBuilder result = new StringBuilder(); + boolean capitalizeNext = false; + + for (char c : input.toCharArray()) { + if (c == '_') { + capitalizeNext = true; + } else if (capitalizeNext) { + result.append(Character.toUpperCase(c)); + capitalizeNext = false; + } else { + result.append(c); + } + } + + return result.toString(); + } + + public record ShutUp( + QuadFunction otherType) implements QuadFunction { + @Override + public Object apply(TypeData typeData, CraftType craftType, String s, NamespacedKey namespacedKey) { + return otherType.apply(typeData, craftType, s, namespacedKey); + } + } + + public record ShutUp2(Function otherType) implements Function { + @Override + public Object apply(CraftType craftType) { + return otherType.apply(craftType); + } + } +} diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/properties/PropertyWrapper.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/properties/PropertyWrapper.java new file mode 100644 index 00000000..7444fd41 --- /dev/null +++ b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/properties/PropertyWrapper.java @@ -0,0 +1,65 @@ +package at.pavlov.cannons.hooks.movecraft.type.properties; + +import at.pavlov.cannons.Cannons; +import net.countercraft.movecraft.craft.type.CraftType; +import net.countercraft.movecraft.craft.type.TypeData; +import net.countercraft.movecraft.craft.type.property.ObjectPropertyImpl; +import net.countercraft.movecraft.util.functions.QuadFunction; +import org.bukkit.NamespacedKey; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.HashSet; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Supplier; + +public class PropertyWrapper { + public final Set notifyError = new HashSet<>(); + + public final NamespacedKey key; + public final Class clazz; + public final Supplier errorFallback; + public final String fileEntryName; + + public PropertyWrapper(NamespacedKey key, Class clazz, Supplier errorFallback) { + this.key = key; + this.clazz = clazz; + this.errorFallback = errorFallback; + this.fileEntryName = PropertyUtils.snakeToCamel(key.getKey()); + } + + public void register(@NotNull QuadFunction loadProvider) { + register(loadProvider, null); + } + + public void register(@NotNull QuadFunction loadProvider, @Nullable Function defaultProvider) { + if (defaultProvider == null) { + CraftType.registerProperty(new ObjectPropertyImpl(fileEntryName, key, new PropertyUtils.ShutUp<>(loadProvider))); + } else { + CraftType.registerProperty(new ObjectPropertyImpl(fileEntryName, key, new PropertyUtils.ShutUp<>(loadProvider), new PropertyUtils.ShutUp2<>(defaultProvider))); + } + } + + public T get(CraftType type) { + if (notifyError.contains(type)) return null; + + try { + Object objectProperty = type.getObjectProperty(key); + if (clazz.isInstance(objectProperty)) { + return clazz.cast(objectProperty); + } else { + throw new IllegalStateException("maxCannons must be a set."); + } + } catch (Exception exception) { + notifyError.add(type); + Cannons.getPlugin().logSevere( + "Failed to get " + fileEntryName +" property from craft " + + type.getStringProperty(CraftType.NAME) + + " so it won't be applied. - Cause: " + + exception.getMessage() + ); + return errorFallback.get(); + } + } +} diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/properties/PropertyWrapperBoolean.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/properties/PropertyWrapperBoolean.java new file mode 100644 index 00000000..9a7c5d5e --- /dev/null +++ b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/properties/PropertyWrapperBoolean.java @@ -0,0 +1,55 @@ +package at.pavlov.cannons.hooks.movecraft.type.properties; + +import at.pavlov.cannons.Cannons; +import net.countercraft.movecraft.craft.type.CraftType; +import net.countercraft.movecraft.craft.type.property.BooleanProperty; +import org.bukkit.NamespacedKey; +import org.jetbrains.annotations.Nullable; + +import java.util.HashSet; +import java.util.Set; +import java.util.function.Function; + +public class PropertyWrapperBoolean { + public final Set notifyError = new HashSet<>(); + + public final NamespacedKey key; + public final Function defaultProvider; + public final String fileEntryName; + + public PropertyWrapperBoolean(NamespacedKey key, Function defaultProvider) { + this.key = key; + this.defaultProvider = defaultProvider; + this.fileEntryName = PropertyUtils.snakeToCamel(key.getKey()); + } + + public void register() { + String configName = PropertyUtils.snakeToCamel(key.getKey()); + if (defaultProvider == null) { + CraftType.registerProperty(new BooleanProperty(configName, key)); + } else { + CraftType.registerProperty(new BooleanProperty(configName, key, defaultProvider)); + } + } + + public @Nullable Boolean get(CraftType type) { + if (notifyError.contains(type)) return null; + + try { + return type.getBoolProperty(key); + } catch (Exception exception) { + if (defaultProvider != null) return defaultProvider.apply(type); + + notifyError.add(type); + Cannons.getPlugin().logSevere( + "Failed to get " + fileEntryName + " property from craft " + + type.getStringProperty(CraftType.NAME) + + " so it won't be applied. - Cause: " + + exception.getMessage() + ); + + return null; + } + } +} + diff --git a/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/properties/PropertyWrapperInt.java b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/properties/PropertyWrapperInt.java new file mode 100644 index 00000000..a21575d7 --- /dev/null +++ b/cannons-bukkit/src/main/java/at/pavlov/cannons/hooks/movecraft/type/properties/PropertyWrapperInt.java @@ -0,0 +1,54 @@ +package at.pavlov.cannons.hooks.movecraft.type.properties; + +import at.pavlov.cannons.Cannons; +import net.countercraft.movecraft.craft.type.CraftType; +import net.countercraft.movecraft.craft.type.property.IntegerProperty; +import org.bukkit.NamespacedKey; + +import java.util.HashSet; +import java.util.Set; +import java.util.function.Function; + +public class PropertyWrapperInt { + public final Set notifyError = new HashSet<>(); + + public final NamespacedKey key; + public final Function defaultProvider; + public final String fileEntryName; + + public PropertyWrapperInt(NamespacedKey key, Function defaultProvider) { + this.key = key; + this.defaultProvider = defaultProvider; + this.fileEntryName = PropertyUtils.snakeToCamel(key.getKey()); + } + + public void register() { + String configName = PropertyUtils.snakeToCamel(key.getKey()); + if (defaultProvider == null) { + CraftType.registerProperty(new IntegerProperty(configName, key)); + } else { + CraftType.registerProperty(new IntegerProperty(configName, key, defaultProvider)); + } + } + + public Integer get(CraftType type) { + if (notifyError.contains(type)) return null; + + try { + // movecraft treats it as Integer but returns a not null int primitive... whatever + return type.getIntProperty(key); + } catch (Exception exception) { + if (defaultProvider != null) return defaultProvider.apply(type); + + notifyError.add(type); + Cannons.getPlugin().logSevere( + "Failed to get " + fileEntryName + " property from craft " + + type.getStringProperty(CraftType.NAME) + + " so it won't be applied. - Cause: " + + exception.getMessage() + ); + + return null; + } + } +}