24w06a

common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java

@@ -1,17 +1,13 @@
 package org.embeddedt.modernfix;
 
-import com.mojang.datafixers.util.Pair;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.syncher.EntityDataAccessor;
-import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.MemoryReserve;
 import net.minecraft.world.entity.Entity;
 import org.embeddedt.modernfix.api.constants.IntegrationConstants;
 import org.embeddedt.modernfix.api.entrypoint.ModernFixClientIntegration;
 import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
-import org.embeddedt.modernfix.packet.EntityIDSyncPacket;
 import org.embeddedt.modernfix.platform.ModernFixPlatformHooks;
 import org.embeddedt.modernfix.searchtree.JEIBackedSearchTree;
 import org.embeddedt.modernfix.searchtree.REIBackedSearchTree;
@@ -20,8 +16,7 @@ import org.embeddedt.modernfix.util.ClassInfoManager;
 import org.embeddedt.modernfix.world.IntegratedWatchdog;
 
 import java.lang.management.ManagementFactory;
-import java.lang.reflect.Field;
+import java.util.List;
-import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 public class ModernFixClient {
@@ -123,85 +118,6 @@ public class ModernFixClient {
         }
     }
 
-    /**
-     * Horrendous hack to allow tracking every synced entity data manager.
-     *
-     * This is to ensure we can perform ID fixup on already constructed managers.
-     */
-    public static final Set<SynchedEntityData> allEntityDatas = Collections.newSetFromMap(new WeakHashMap<>());
-
-    private static final Field entriesArrayField;
-    static {
-        Field field;
-        try {
-            field = SynchedEntityData.class.getDeclaredField("entriesArray");
-            field.setAccessible(true);
-        } catch(ReflectiveOperationException e) {
-            field = null;
-        }
-        entriesArrayField = field;
-    }
-
-    /**
-     * Extremely hacky method to detect and correct mismatched entity data parameter IDs on the client and server.
-     *
-     * The technique is far from ideal, but it should detect reliably and also not break already constructed entities.
-     */
-    public static void handleEntityIDSync(EntityIDSyncPacket packet) {
-        Map<Class<? extends Entity>, List<Pair<String, Integer>>> info = packet.getFieldInfo();
-        boolean fixNeeded = false;
-        for(Map.Entry<Class<? extends Entity>, List<Pair<String, Integer>>> entry : info.entrySet()) {
-            Class<? extends Entity> eClass = entry.getKey();
-            for(Pair<String, Integer> field : entry.getValue()) {
-                String fieldName = field.getFirst();
-                int newId = field.getSecond();
-                try {
-                    Field f = eClass.getDeclaredField(fieldName);
-                    f.setAccessible(true);
-                    EntityDataAccessor<?> accessor = (EntityDataAccessor<?>)f.get(null);
-                    if(compareAndSwitchIds(eClass, fieldName, accessor, newId))
-                        fixNeeded = true;
-                } catch(NoSuchFieldException e) {
-                    ModernFix.LOGGER.warn("Couldn't find field on {}: {}", eClass, fieldName);
-                } catch(ReflectiveOperationException e) {
-                    throw new RuntimeException("Unexpected exception", e);
-                }
-            }
-        }
-        /* Now the ID mappings on synced entity data instances are probably all wrong. Fix that. */
-        List<SynchedEntityData> dataEntries;
-        synchronized (allEntityDatas) {
-            if(fixNeeded) {
-                dataEntries = new ArrayList<>(allEntityDatas);
-                for(SynchedEntityData manager : dataEntries) {
-                    Int2ObjectOpenHashMap<SynchedEntityData.DataItem<?>> fixedMap = new Int2ObjectOpenHashMap<>();
-                    List<SynchedEntityData.DataItem<?>> items = new ArrayList<>(manager.itemsById.values());
-                    for(SynchedEntityData.DataItem<?> item : items) {
-                        fixedMap.put(item.getAccessor().id, item);
-                    }
-                    manager.lock.writeLock().lock();
-                    try {
-                        manager.itemsById.replaceAll((id, parameter) -> fixedMap.get((int)id));
-                        if(entriesArrayField != null) {
-                            try {
-                                SynchedEntityData.DataItem<?>[] dataArray = new SynchedEntityData.DataItem[items.size()];
-                                for(int i = 0; i < dataArray.length; i++) {
-                                    dataArray[i] = fixedMap.get(i);
-                                }
-                                entriesArrayField.set(manager, dataArray);
-                            } catch(ReflectiveOperationException e) {
-                                ModernFix.LOGGER.error(e);
-                            }
-                        }
-                    } finally {
-                        manager.lock.writeLock().unlock();
-                    }
-                }
-            }
-            allEntityDatas.clear();
-        }
-    }
-
     public void onServerStarted(MinecraftServer server) {
         if(!ModernFixMixinPlugin.instance.isOptionEnabled("feature.integrated_server_watchdog.IntegratedWatchdog"))
             return;

common/src/main/java/org/embeddedt/modernfix/common/mixin/core/SynchedEntityDataMixin.java

@@ -1,26 +0,0 @@
-package org.embeddedt.modernfix.common.mixin.core;
-
-import net.minecraft.network.syncher.SynchedEntityData;
-import net.minecraft.world.entity.Entity;
-import org.embeddedt.modernfix.ModernFixClient;
-import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(SynchedEntityData.class)
-@ClientOnlyMixin
-public class SynchedEntityDataMixin {
-    /**
-     * Store this in our set of all entity data objects.
-     *
-     * Not an ideal solution, but it should guarantee compatibility with mods.
-     */
-    @Inject(method = "<init>", at = @At("RETURN"))
-    private void storeInSet(Entity arg, CallbackInfo ci) {
-        synchronized (ModernFixClient.allEntityDatas) {
-            ModernFixClient.allEntityDatas.add((SynchedEntityData)(Object)this);
-        }
-    }
-}

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/MappedRegistryMixin.java

@@ -1,8 +1,9 @@
 package org.embeddedt.modernfix.common.mixin.perf.compact_mojang_registries;
 
 import com.google.common.collect.ImmutableSet;
-import com.mojang.serialization.Lifecycle;
 import net.minecraft.core.MappedRegistry;
+import net.minecraft.core.RegistrationInfo;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import org.embeddedt.modernfix.annotation.IgnoreOutsideDev;
 import org.embeddedt.modernfix.registry.LifecycleMap;
@@ -22,13 +23,13 @@ public abstract class MappedRegistryMixin<T> {
     @Shadow
     @Final
     @Mutable
-    private Map<T, Lifecycle> lifecycles;
+    private Map<ResourceKey<T>, RegistrationInfo> registrationInfos;
 
     private static final ImmutableSet<ResourceLocation> MFIX$NEW_STORAGE_KEYS = ImmutableSet.of(new ResourceLocation("block"), new ResourceLocation("item"));
 
     @Inject(method = "<init>(Lnet/minecraft/resources/ResourceKey;Lcom/mojang/serialization/Lifecycle;Z)V", at = @At("RETURN"))
     private void replaceStorage(CallbackInfo ci) {
-        this.lifecycles = new LifecycleMap<>();
+        this.registrationInfos = new LifecycleMap<>();
         /*
         if(MFIX$NEW_STORAGE_KEYS.contains(this.key().location())) {
             ModernFixMixinPlugin.instance.logger.info("Using experimental registry storage for {}", this.key());

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/deduplicate_wall_shapes/WallBlockMixin.java

@@ -25,7 +25,7 @@ import java.util.Map;
  */
 @Mixin(WallBlock.class)
 public abstract class WallBlockMixin extends Block {
-    private static Map<ImmutableList<Float>, Pair<Map<ImmutableMap<Property<?>, Comparable<?>>, VoxelShape>, StateDefinition<Block, BlockState>>> CACHE_BY_SHAPE_VALS = new HashMap<>();
+    private static Map<ImmutableList<Float>, Pair<Map<Map<Property<?>, Comparable<?>>, VoxelShape>, StateDefinition<Block, BlockState>>> CACHE_BY_SHAPE_VALS = new HashMap<>();
 
     public WallBlockMixin(Properties properties) {
         super(properties);
@@ -34,7 +34,7 @@ public abstract class WallBlockMixin extends Block {
     @Inject(method = "makeShapes", at = @At("HEAD"), cancellable = true)
     private synchronized void useCachedShapeMap(float f1, float f2, float f3, float f4, float f5, float f6, CallbackInfoReturnable<Map<BlockState, VoxelShape>> cir) {
         ImmutableList<Float> key = ImmutableList.of(f1, f2, f3, f4, f5, f6);
-        Pair<Map<ImmutableMap<Property<?>, Comparable<?>>, VoxelShape>, StateDefinition<Block, BlockState>> cache = CACHE_BY_SHAPE_VALS.get(key);
+        Pair<Map<Map<Property<?>, Comparable<?>>, VoxelShape>, StateDefinition<Block, BlockState>> cache = CACHE_BY_SHAPE_VALS.get(key);
         // require the properties to be identical
         if(cache == null || !cache.getSecond().getProperties().equals(this.stateDefinition.getProperties()))
             return;
@@ -55,7 +55,7 @@ public abstract class WallBlockMixin extends Block {
             return;
         ImmutableList<Float> key = ImmutableList.of(f1, f2, f3, f4, f5, f6);
         if(!CACHE_BY_SHAPE_VALS.containsKey(key)) {
-            Map<ImmutableMap<Property<?>, Comparable<?>>, VoxelShape> cacheByProperties = new HashMap<>();
+            Map<Map<Property<?>, Comparable<?>>, VoxelShape> cacheByProperties = new HashMap<>();
             Map<BlockState, VoxelShape> shapeMap = cir.getReturnValue();
             for(Map.Entry<BlockState, VoxelShape> entry : shapeMap.entrySet()) {
                 cacheByProperties.put(entry.getKey().getValues(), entry.getValue());

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockStateBaseMixin.java

@@ -1,7 +1,7 @@
 package org.embeddedt.modernfix.common.mixin.perf.reduce_blockstate_cache_rebuilds;
 
-import com.google.common.collect.ImmutableMap;
 import com.mojang.serialization.MapCodec;
+import it.unimi.dsi.fastutil.objects.Reference2ObjectArrayMap;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
@@ -16,10 +16,12 @@ import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
+import java.util.Map;
+
 
 @Mixin(BlockBehaviour.BlockStateBase.class)
 public abstract class BlockStateBaseMixin extends StateHolder<Block, BlockState> implements IBlockState {
-    protected BlockStateBaseMixin(Block object, ImmutableMap<Property<?>, Comparable<?>> immutableMap, MapCodec<BlockState> mapCodec) {
+    protected BlockStateBaseMixin(Block object, Reference2ObjectArrayMap<Property<?>, Comparable<?>> immutableMap, MapCodec<BlockState> mapCodec) {
         super(object, immutableMap, mapCodec);
     }
 

common/src/main/java/org/embeddedt/modernfix/entity/EntityDataIDSyncHandler.java

@@ -1,57 +0,0 @@
-package org.embeddedt.modernfix.entity;
-
-import com.mojang.datafixers.util.Pair;
-import net.minecraft.network.syncher.EntityDataAccessor;
-import net.minecraft.network.syncher.SynchedEntityData;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.Entity;
-import org.embeddedt.modernfix.ModernFix;
-import org.embeddedt.modernfix.packet.EntityIDSyncPacket;
-import org.embeddedt.modernfix.platform.ModernFixPlatformHooks;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class EntityDataIDSyncHandler {
-    private static Map<Class<? extends Entity>, List<Pair<String, Integer>>> fieldsToSyncMap;
-
-    @SuppressWarnings("unchecked")
-    public static void onDatapackSyncEvent(ServerPlayer targetPlayer) {
-        if(targetPlayer != null) {
-            /* Compute the current set of serializer IDs in use and send them */
-            if(fieldsToSyncMap == null) {
-                fieldsToSyncMap = new HashMap<>();
-                Map<Class<? extends Entity>, Integer> entityPoolMap = SynchedEntityData.ENTITY_ID_POOL;
-                List<Field> fieldsToSync = new ArrayList<>();
-                for(Class<? extends Entity> eClass : entityPoolMap.keySet()) {
-                    fieldsToSync.clear();
-                    try {
-                        Field[] classFields = eClass.getDeclaredFields();
-                        for(Field field : classFields) {
-                            if(!Modifier.isStatic(field.getModifiers()))
-                                continue;
-                            field.setAccessible(true);
-                            Object o = field.get(null);
-                            if(o != null && EntityDataAccessor.class.isAssignableFrom(o.getClass())) {
-                                fieldsToSync.add(field);
-                            }
-                        }
-                        for(Field field : fieldsToSync) {
-                            int id = ((EntityDataAccessor<?>)field.get(null)).id;
-                            fieldsToSyncMap.computeIfAbsent(eClass, k -> new ArrayList<>()).add(Pair.of(field.getName(), id));
-                        }
-                    } catch(Throwable e) {
-                        ModernFix.LOGGER.error("Skipping entity ID sync for {}: {}", eClass.getName(), e);
-                    }
-                }
-            }
-            EntityIDSyncPacket packet = new EntityIDSyncPacket(fieldsToSyncMap);
-            ModernFix.LOGGER.debug("Sending ID correction packet to client with " + fieldsToSyncMap.size() + " classes");
-            ModernFixPlatformHooks.INSTANCE.sendPacket(targetPlayer, packet);
-        }
-    }
-}

common/src/main/java/org/embeddedt/modernfix/registry/LifecycleMap.java

@@ -1,15 +1,16 @@
 package org.embeddedt.modernfix.registry;
 
-import com.mojang.serialization.Lifecycle;
 import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
+import net.minecraft.core.RegistrationInfo;
+import net.minecraft.resources.ResourceKey;
 
-public class LifecycleMap<T> extends Reference2ReferenceOpenHashMap<T, Lifecycle> {
+public class LifecycleMap<T> extends Reference2ReferenceOpenHashMap<ResourceKey<T>, RegistrationInfo> {
     public LifecycleMap() {
-        this.defaultReturnValue(Lifecycle.stable());
+        this.defaultReturnValue(RegistrationInfo.BUILT_IN);
     }
 
     @Override
-    public Lifecycle put(T t, Lifecycle lifecycle) {
+    public RegistrationInfo put(ResourceKey<T> t, RegistrationInfo lifecycle) {
         if(lifecycle != defRetValue)
             return super.put(t, lifecycle);
         else {

common/src/main/resources/modernfix.accesswidener

@@ -21,9 +21,6 @@ accessible field net/minecraft/client/renderer/texture/Stitcher$Holder height I
 accessible field net/minecraft/network/syncher/EntityDataAccessor id I
 mutable field net/minecraft/network/syncher/EntityDataAccessor id I
 accessible class net/minecraft/client/resources/model/ModelBakery$BlockStateDefinitionException
-accessible field net/minecraft/network/syncher/SynchedEntityData itemsById Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
-accessible field net/minecraft/network/syncher/SynchedEntityData ENTITY_ID_POOL Lit/unimi/dsi/fastutil/objects/Object2IntMap;
-accessible field net/minecraft/network/syncher/SynchedEntityData lock Ljava/util/concurrent/locks/ReadWriteLock;
 accessible method net/minecraft/Util makeExecutor (Ljava/lang/String;)Ljava/util/concurrent/ExecutorService;
 accessible field net/minecraft/server/level/ChunkMap updatingChunkMap Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
 accessible field net/minecraft/server/level/ChunkMap visibleChunkMap Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;

gradle.properties

@@ -5,7 +5,7 @@ junit_version=5.10.0-M1
 mixinextras_version=0.3.2
 
 mod_id=modernfix
-minecraft_version=24w05a
+minecraft_version=24w06a
 enabled_platforms=fabric
 forge_version=20.4.132-beta
 # parchment_version=2023.07.09
@@ -15,7 +15,7 @@ rei_version=13.0.678
 ctm_version=1.20.1-1.1.8+4
 kubejs_version=1902.6.0-build.142
 rhino_version=1902.2.2-build.268
-supported_minecraft_versions=24w05a
+supported_minecraft_versions=24w06a
 
 fabric_loader_version=0.15.6
 fabric_api_version=0.91.1+1.20.4