Pending changes exported from your codespace

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

@@ -164,6 +164,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("");
@@ -797,7 +798,7 @@ public void saveResource(String name) {
     public boolean isMarried(@NotNull Player player) {
         String partner = player.getPersistentDataContainer().get(marriedWith, PersistentDataType.STRING);
         if (partner == null) return false;
-
+        if (!compatibilityManager.isMarried(player)) return false;
         IVillagerNPC partnerInfo = tracker.getOffline(UUID.fromString(partner));
         if (partnerInfo == null) {
             player.getPersistentDataContainer().remove(marriedWith);

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

@@ -1,5 +1,10 @@
 package me.matsubara.realisticvillagers.compatibility;
 
+import at.pcgamingfreaks.MarriageMaster.Bukkit.API.MarriageMaster;
+import at.pcgamingfreaks.MarriageMaster.Bukkit.API.MarriageManager;
+import at.pcgamingfreaks.MarriageMaster.API.MarriagePlayer;
+
+import at.pcgamingfreaks.MarriageMaster.API.MarriagePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Villager;
 import org.bukkit.plugin.Plugin;
@@ -29,4 +34,21 @@ 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 isMarried(Player player) {
+        if (compatibilities.get("MarriageMaster") instanceof MarriageMaster marriageMaster) {
+            MarriageManager manager = marriageMaster.getMarriageManager();
+            MarriagePlayer<?, ?> marriagePlayer = manager.getMarriagePlayer(player.getUniqueId());
+
+            return marriagePlayer != null && marriagePlayer.isMarried();
+        }
+        return false;
+    }
+
+    public boolean isDivorced(Player player) {
+        return !isMarried(player);
+    }
+
 }

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

@@ -0,0 +1,42 @@
+import at.pcgamingfreaks.MarriageMaster.Bukkit.API.MarriageMasterPlugin;
+import at.pcgamingfreaks.MarriageMaster.Bukkit.API.MarriageManager;
+import at.pcgamingfreaks.MarriageMaster.API.MarriagePlayer;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Villager;
+import org.bukkit.plugin.Plugin;
+
+public class MarriageCompatibility implements Compatibility {
+
+    private final MarriageMasterPlugin marriageMaster;
+
+    public MarriageCompatibility() {
+        Plugin plugin = Bukkit.getPluginManager().getPlugin("MarriageMaster");
+        if (plugin instanceof MarriageMasterPlugin) {
+            this.marriageMaster = (MarriageMasterPlugin) plugin;
+            Bukkit.getLogger().info("[RealisticVillagers] MarriageMaster detected and hooked.");
+        } else {
+            this.marriageMaster = null;
+        }
+    }
+
+    public boolean isMarried(Player player) {
+        if (marriageMaster == null) return false;
+        MarriageManager manager = marriageMaster.getMarriageManager();
+
+        // Get the MarriagePlayer object from the manager
+        MarriagePlayer marriagePlayer = manager.getMarriagePlayer(player.getUniqueId());
+
+        // If marriagePlayer is null, the player is not registered in the system
+        return marriagePlayer != null && marriagePlayer.isMarried();
+    }
+
+    public boolean isDivorced(Player player) {
+        return !isMarried(player); 
+    }
+
+    @Override
+    public boolean shouldTrack(Villager villager) {
+        return true;
+    }
+}

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

@@ -22,6 +22,7 @@
 import me.matsubara.realisticvillagers.tracker.VillagerTracker;
 import me.matsubara.realisticvillagers.util.ItemBuilder;
 import me.matsubara.realisticvillagers.util.PluginUtils;
+import me.matsubara.realisticvillagers.compatibility.*;
 import net.wesjd.anvilgui.AnvilGUI;
 import org.apache.commons.lang3.tuple.Pair;
 import org.bukkit.*;
@@ -460,12 +461,14 @@ && cancelEquipment(player, interact)) {
 
             npc.setProcreatingWith(playerUUID);
             new BabyTask(plugin, villager, player).runTaskTimer(plugin, 0L, 20L);
-        } else if (isCustomItem(current, "divorce")) {
+        } else if (isCustomItem(current, "divorce") || plugin.getCompatibilityManager().isMarried(player)) {
             // Return if it's a kid.
             if (conditionNotMet(player, villager.isAdult(), Messages.Message.INTERACT_FAIL_NOT_AN_ADULT)) return;
 
             // Return if not married.
-            if (conditionNotMet(player, isPartner, Messages.Message.INTERACT_FAIL_NOT_MARRIED)) return;
+            if (conditionNotMet(player, isPartner, Messages.Message.INTERACT_FAIL_NOT_MARRIED) || conditionNotMet(player, plugin.getCompatibilityManager().isMarried(player), Messages.Message.INTERACT_FAIL_NOT_MARRIED)) return;
+
+            
 
             // Only remove divorce papers if the villager isn't a cleric partner.
             boolean hasDivorcePapers = (isPartner && villager.getProfession() == Villager.Profession.CLERIC)
@@ -486,6 +489,10 @@ && cancelEquipment(player, interact)) {
                 messages.send(player, npc, Messages.Message.DIVORCE_NORMAL);
             }
 
+
+            
+
+
             // Divorce, remove and drop previous wedding ring.
             npc.divorceAndDropRing(player);
         } else if (isCustomItem(current, "combat")) {

core/src/main/java/me/matsubara/realisticvillagers/tracker/VillagerTracker.java

@@ -334,8 +334,7 @@ public Optional<NPC> getNPC(int entityId) {
     }
 
     public boolean isInvalid(@NotNull LivingEntity living, boolean ignoreSkinState) {
-        return (!ignoreSkinState && Config.DISABLE_SKINS.asBool())
-                || (!(living instanceof WanderingTrader) && (!(living instanceof Villager villager) || !plugin.getCompatibilityManager().shouldTrack(villager)))
+        return (!(living instanceof WanderingTrader) && (!(living instanceof Villager villager) || !plugin.getCompatibilityManager().shouldTrack(villager)))
                 || plugin.isDisabledIn(living.getWorld())
                 || plugin.getConverter().getNPC(living).isEmpty();
     }