26.1-snap-6

src/main/java/carpet/mixins/Brain_scarpetMixin.java

@@ -0,0 +1,22 @@
+package carpet.mixins;
+
+import carpet.fakes.BrainInterface;
+import net.minecraft.world.entity.ai.Brain;
+import net.minecraft.world.entity.ai.memory.MemoryModuleType;
+import net.minecraft.world.entity.ai.memory.MemorySlot;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import java.util.Map;
+
+@Mixin(Brain.class)
+public class Brain_scarpetMixin implements BrainInterface {
+    @Shadow @Final
+    private Map<MemoryModuleType<?>, MemorySlot<?>> memories;
+
+    @Override
+    public Map<MemoryModuleType<?>, MemorySlot<?>> getMemoriesCM() {
+        return memories;
+    }
+}

src/main/java/carpet/mixins/ChunkMap_scarpetChunkCreationMixin.java

@@ -14,7 +14,6 @@ import java.util.function.IntFunction;
 import java.util.stream.Collectors;
 
 import carpet.fakes.SimpleEntityLookupInterface;
-import carpet.fakes.ServerWorldInterface;
 import net.minecraft.util.Util;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.server.MinecraftServer;

src/main/java/carpet/mixins/ServerLevel_scarpetMixin.java

@@ -1,6 +1,5 @@
 package carpet.mixins;
 
-import carpet.fakes.ServerWorldInterface;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.core.RegistryAccess;
@@ -37,14 +36,12 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
-import java.util.function.Supplier;
-
 import static carpet.script.CarpetEventServer.Event.EXPLOSION;
 import static carpet.script.CarpetEventServer.Event.LIGHTNING;
 import static carpet.script.CarpetEventServer.Event.CHUNK_UNLOADED;
 
 @Mixin(ServerLevel.class)
-public abstract class ServerLevel_scarpetMixin extends Level implements ServerWorldInterface
+public abstract class ServerLevel_scarpetMixin extends Level
 {
 
     @Shadow public abstract GameRules getGameRules();
@@ -97,21 +94,4 @@ public abstract class ServerLevel_scarpetMixin extends Level implements ServerWo
             CHUNK_UNLOADED.onChunkEvent(level, levelChunk.getPos(), false);
         }
     }
-
-    @Final
-    @Shadow
-    private ServerLevelData serverLevelData;
-    @Shadow @Final private PersistentEntitySectionManager<Entity> entityManager;
-
-    @Unique
-    @Override
-    public ServerLevelData getWorldPropertiesCM(){
-        return serverLevelData;
-    }
-
-    @Unique
-    @Override
-    public LevelEntityGetter<Entity> getEntityLookupCMPublic() {
-        return entityManager.getEntityGetter();
-    }
 }

src/main/java/carpet/mixins/Villager_aiMixin.java

@@ -65,14 +65,14 @@ public abstract class Villager_aiMixin extends AbstractVillager
         if (MobAI.isTracking(this, MobAI.TrackingType.IRON_GOLEM_SPAWNING))
         {
             long time;
-            Optional<? extends ExpirableValue<?>> last_seen = this.brain.getMemories().get(MemoryModuleType.GOLEM_DETECTED_RECENTLY);
+            Optional<Boolean> last_seen = this.brain.getMemory(MemoryModuleType.GOLEM_DETECTED_RECENTLY);
             if (!last_seen.isPresent())
             {
                 time = 0;
             }
             else
             {
-                time = last_seen.get().getTimeToLive();
+                time = this.brain.getTimeUntilExpiry(MemoryModuleType.GOLEM_DETECTED_RECENTLY);
             }
             boolean recentlySeen = time > 0;
             Optional<Long> optional_11 = this.brain.getMemory(MemoryModuleType.LAST_SLEPT);