apple cow orchard

royal shrines
new advancements
portals deleting on relog if portal gun is gone

neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java

@@ -6,6 +6,7 @@ import com.craisinlord.antarchy.compat.infinity.InfinityCompatVersion;
 import com.craisinlord.antarchy.content.AntarchyGameRules;
 import com.craisinlord.antarchy.content.AntarchyObjects;
 import com.craisinlord.antarchy.content.AntarchySoundEvents;
+import com.craisinlord.antarchy.content.advancement.AntarchyAdvancementTriggers;
 import com.craisinlord.antarchy.content.item.BloodCrystalKatanaItem;
 import com.craisinlord.antarchy.content.item.ScorpionWhipTetherSync;
 import com.craisinlord.antarchy.content.network.BloodCrystalKatanaTrailPayload;
@@ -17,7 +18,9 @@ import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.ModList;
 import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.registries.RegisterEvent;
 import net.neoforged.neoforge.network.PacketDistributor;
+import net.minecraft.core.registries.Registries;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -29,6 +32,7 @@ public class AntarchyNeoforge {
 
     public AntarchyNeoforge(IEventBus modEventBus, ModContainer modContainer) {
         modEventBusTempHolder = modEventBus;
+        modEventBus.addListener(AntarchyNeoforge::registerAdvancementTriggers);
         bootstrapGameRules();
         AntarchyConfigModuleNeoforge.init(modContainer);
         AntarchySoundEvents.bind(
@@ -296,6 +300,13 @@ public class AntarchyNeoforge {
         Antarchy.init();
     }
 
+    private static void registerAdvancementTriggers(RegisterEvent event) {
+        if (event.getRegistryKey().equals(Registries.TRIGGER_TYPE)) {
+            AntarchyAdvancementTriggers.register((id, trigger) ->
+                    event.register(Registries.TRIGGER_TYPE, id, () -> trigger));
+        }
+    }
+
     @SuppressWarnings("unchecked")
     private static void bootstrapGameRules() {
         AntarchyGameRules.bootstrap((name, category, defaultValue) -> {

neoforge-1.21.1/src/main/java/com/craisinlord/antarchy/neoforge/registry/PortalGunServerEvents.java

@@ -4,6 +4,7 @@ import com.craisinlord.antarchy.Antarchy;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.event.server.ServerStoppingEvent;
+import net.neoforged.neoforge.event.entity.player.PlayerEvent;
 
 @EventBusSubscriber(modid = Antarchy.MODID)
 public final class PortalGunServerEvents {
@@ -15,4 +16,11 @@ public final class PortalGunServerEvents {
         com.craisinlord.antarchy.content.portalgun.PortalGunResetManager.clear(event.getServer());
         com.craisinlord.antarchy.content.entity.ant.AntArrivalScheduler.clear();
     }
+
+    @SubscribeEvent
+    public static void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) {
+        if (event.getEntity() instanceof net.minecraft.server.level.ServerPlayer player) {
+            com.craisinlord.antarchy.content.portalgun.PortalGunSavedData.clearMissingGuns(player);
+        }
+    }
 }