marriagemaster compability

Author: SSStarku

core/pom.xml

@@ -149,6 +149,10 @@
             <id>viaversion-repo</id>
             <url>https://repo.viaversion.com</url>
         </repository>
+        <repository>
+            <id>pcgf-repo</id>
+            <url>https://repo.pcgamingfreaks.at/repository/maven-everything</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -227,5 +231,12 @@
             <version>2.7.0</version>
             <scope>provided</scope>
         </dependency>
+        <!-- Marriage Master API -->
+        <dependency>
+            <groupId>at.pcgamingfreaks</groupId>
+            <artifactId>MarriageMaster-API-Bukkit</artifactId>
+            <version>2.4</version><!-- Check api-version shield for newest version -->
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

core/src/main/java/me/matsubara/realisticvillagers/RealisticVillagers.java

@@ -45,6 +45,7 @@
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.metadata.Metadatable;
 import org.bukkit.persistence.PersistentDataType;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.potion.PotionType;
@@ -164,6 +165,7 @@ public void onLoad() {
         addCompatibility("EliteMobs", EMCompatibility::new);
         addCompatibility("ViaVersion", ViaCompatibility::new);
         addCompatibility("VillagerTradeLimiter", VTLCompatibility::new);
+        addCompatibility("MarriageMaster", MarriageCompatibility::new);
 
         logger.info("Compatibilities loaded!");
         logger.info("");
@@ -760,6 +762,7 @@ public String getNPCTextureURL(@Nullable IVillagerNPC npc) {
 
         TextureProperty textures = tracker.getTextures(npc.getSex(), "none", npc.getSkinTextureId());
         return textures.getName().equals("error") ? UNKNOWN_HEAD_TEXTURE : PluginUtils.getURLFromTexture(textures.getValue());
+
     }
 
     private @NotNull Set<Color> getColors(@NotNull FileConfiguration config, String path, String effect, String needed) {
@@ -793,11 +796,20 @@ public void saveResource(String name) {
         File file = new File(getDataFolder(), name);
         if (!file.exists()) saveResource(name, false);
     }
+    //MarriageMaster
+
+
+    private boolean marriedPlayer(@NotNull Player player) {
 
+        Plugin marriage = Bukkit.getServer().getPluginManager().getPlugin("MarriageMaster");
+        if (marriage == null) return false;
+        return getCompatibilityManager().marriedPlayer(player);
+    }
     public boolean isMarried(@NotNull Player player) {
         String partner = player.getPersistentDataContainer().get(marriedWith, PersistentDataType.STRING);
         if (partner == null) return false;
 
+        if (!marriedPlayer(player)) return false;
         IVillagerNPC partnerInfo = tracker.getOffline(UUID.fromString(partner));
         if (partnerInfo == null) {
             player.getPersistentDataContainer().remove(marriedWith);
@@ -855,6 +867,7 @@ public Gift getWantedItem(IVillagerNPC npc, ItemStack item, boolean isItemPickup
         return GiftCategory.appliesToVillager(wantedItems, npc, item, isItemPickup);
     }
 
+
     public @Nullable LivingEntity getUnloadedOffline(@NotNull IVillagerNPC offline) {
         LivingEntity bukkit = offline.bukkit();
         if (bukkit != null) return bukkit;

core/src/main/java/me/matsubara/realisticvillagers/command/MainCommand.java

@@ -2,6 +2,7 @@
 
 import com.github.retrooper.packetevents.protocol.player.TextureProperty;
 import me.matsubara.realisticvillagers.RealisticVillagers;
+import me.matsubara.realisticvillagers.compatibility.CompatibilityManager;
 import me.matsubara.realisticvillagers.entity.IVillagerNPC;
 import me.matsubara.realisticvillagers.files.Config;
 import me.matsubara.realisticvillagers.files.Messages;
@@ -29,6 +30,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.persistence.PersistentDataType;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.util.StringUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -41,6 +43,8 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import static org.bukkit.Bukkit.getServer;
+
 public class MainCommand implements CommandExecutor, TabCompleter {
 
     private final RealisticVillagers plugin;
@@ -309,7 +313,7 @@ private String getAgeStage(CommandSender sender, String string) {
         plugin.getMessages().send(sender, notFound);
         return null;
     }
-
+    private CompatibilityManager compatibilityManager;
     private void handleForceDivorce(CommandSender sender, @NotNull String[] args) {
         Messages messages = plugin.getMessages();
         VillagerTracker tracker = plugin.getTracker();
@@ -343,6 +347,7 @@ private void handleForceDivorce(CommandSender sender, @NotNull String[] args) {
             return;
         }
 
+
         for (IVillagerNPC offlineVillager : tracker.getOfflineVillagers()) {
             if (!offlineVillager.getUniqueId().equals(partnerUUID)) continue;
 

core/src/main/java/me/matsubara/realisticvillagers/compatibility/CompatibilityManager.java

@@ -29,4 +29,7 @@ public boolean handleVTL(Plugin plugin, Player player, Villager villager) {
     public boolean shouldCancelMetadata(Player player) {
         return compatibilities.get("ViaVersion") instanceof ViaCompatibility via && via.cancelMetadata(player);
     }
+    public boolean marriedPlayer(Player player) {
+        return compatibilities.get("MarriageMaster") instanceof MarriageCompatibility marriage && marriage.marriedPlayer(player);
+    }
 }

core/src/main/java/me/matsubara/realisticvillagers/compatibility/MarriageCompatibility.java

@@ -0,0 +1,32 @@
+package me.matsubara.realisticvillagers.compatibility;
+
+import at.pcgamingfreaks.MarriageMaster.API.MarriageMasterPlugin;
+
+import at.pcgamingfreaks.MarriageMaster.API.MarriageManager;
+import at.pcgamingfreaks.MarriageMaster.API.MarriagePlayer;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Villager;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+
+public class MarriageCompatibility implements Compatibility {
+
+    public MarriageMasterPlugin getMarriageMaster() {
+        Plugin bukkitPlugin = Bukkit.getPluginManager().getPlugin("MarriageMaster");
+        return (MarriageMasterPlugin) bukkitPlugin;
+
+    }
+    public boolean marriedPlayer(@NotNull Player player) {
+
+        UUID playerUUID = player.getUniqueId();
+        MarriagePlayer data = getMarriageMaster().getPlayerData(playerUUID);
+        return data.isMarried();
+    }
+    @Override
+    public boolean shouldTrack(Villager villager) {return true;}
+}
+

core/src/main/java/me/matsubara/realisticvillagers/listener/PlayerListeners.java

@@ -127,6 +127,7 @@ public void onPlayerMove(@NotNull PlayerMoveEvent event) {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onPlayerInteract(PlayerInteractEvent event) {
+
         handleWhistle(event);
         handleBabySpawn(event);
 

core/src/main/java/me/matsubara/realisticvillagers/manager/ExpectingManager.java

@@ -11,6 +11,8 @@
 import me.matsubara.realisticvillagers.manager.gift.GiftCategory;
 import me.matsubara.realisticvillagers.util.ItemStackUtils;
 import me.matsubara.realisticvillagers.util.PluginUtils;
+import at.pcgamingfreaks.MarriageMaster.Bukkit.API.Events.DivorcedEvent;
+import at.pcgamingfreaks.MarriageMaster.API.MarriagePlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.EntityEffect;
 import org.bukkit.NamespacedKey;
@@ -61,6 +63,7 @@ public void onEntityDeath(@NotNull EntityDeathEvent event) {
         villagerExpectingCache.entrySet().removeIf(next -> next.getValue().bukkit().equals(villager));
     }
 
+
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onVillagerFish(@NotNull VillagerFishEvent event) {
         if (event.getState() != VillagerFishEvent.State.CAUGHT_FISH) return;

core/src/main/resources/plugin.yml

@@ -14,6 +14,7 @@ softdepend:
   - ViaBackwards
   - ViaRewind
   - Geyser-Spigot
+  - MarriageMaster
 
 commands:
   realisticvillagers: