diff --git a/patches/minecraft/net/minecraft/network/datasync/DataSerializers.java.patch b/patches/minecraft/net/minecraft/network/datasync/DataSerializers.java.patch new file mode 100644 index 0000000000..c9a0061a7b --- /dev/null +++ b/patches/minecraft/net/minecraft/network/datasync/DataSerializers.java.patch @@ -0,0 +1,27 @@ +--- ../src-base/minecraft/net/minecraft/network/datasync/DataSerializers.java ++++ ../src-work/minecraft/net/minecraft/network/datasync/DataSerializers.java +@@ -305,20 +305,21 @@ + } + }; + ++ @Deprecated // Forge: ONLY FOR VANILLA - mods should use the Forge registry + public static void func_187189_a(DataSerializer p_187189_0_) + { +- field_187204_n.func_186808_c(p_187189_0_); ++ if (field_187204_n.func_186808_c(p_187189_0_) >= 256) throw new RuntimeException("Vanilla DataSerializer ID limit exceeded"); + } + + @Nullable + public static DataSerializer func_187190_a(int p_187190_0_) + { +- return (DataSerializer)field_187204_n.func_186813_a(p_187190_0_); ++ return net.minecraftforge.common.ForgeHooks.getSerializer(p_187190_0_, field_187204_n); + } + + public static int func_187188_b(DataSerializer p_187188_0_) + { +- return field_187204_n.func_186815_a(p_187188_0_); ++ return net.minecraftforge.common.ForgeHooks.getSerializerId(p_187188_0_, field_187204_n); + } + + static diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index f192a84a00..fb8c9dbd62 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -81,6 +81,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.network.Packet; +import net.minecraft.network.datasync.DataSerializer; import net.minecraft.network.play.server.SPacketBlockChange; import net.minecraft.network.play.server.SPacketRecipeBook; import net.minecraft.network.play.server.SPacketRecipeBook.State; @@ -93,6 +94,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.IntIdentityHashBiMap; import net.minecraft.util.JsonUtils; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; @@ -151,6 +153,9 @@ import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.network.handshake.NetworkDispatcher; import net.minecraftforge.fml.common.network.handshake.NetworkDispatcher.ConnectionType; import net.minecraftforge.fml.common.registry.ForgeRegistries; +import net.minecraftforge.registries.DataSerializerEntry; +import net.minecraftforge.registries.ForgeRegistry; +import net.minecraftforge.registries.GameData; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.RegistryManager; @@ -1470,4 +1475,29 @@ public class ForgeHooks return false; } + private static final Map, DataSerializerEntry> serializerEntries = GameData.getSerializerMap(); + private static final ForgeRegistry serializerRegistry = (ForgeRegistry) ForgeRegistries.DATA_SERIALIZERS; + + @Nullable + public static DataSerializer getSerializer(int id, IntIdentityHashBiMap> vanilla) + { + DataSerializer serializer = vanilla.get(id); + if (serializer == null) + { + DataSerializerEntry entry = serializerRegistry.getValue(id); + if (entry != null) serializer = entry.getSerializer(); + } + return serializer; + } + + public static int getSerializerId(DataSerializer serializer, IntIdentityHashBiMap> vanilla) + { + int id = vanilla.getId(serializer); + if (id < 0) + { + DataSerializerEntry entry = serializerEntries.get(serializer); + if (entry != null) id = serializerRegistry.getID(entry); + } + return id; + } } diff --git a/src/main/java/net/minecraftforge/fml/common/registry/ForgeRegistries.java b/src/main/java/net/minecraftforge/fml/common/registry/ForgeRegistries.java index 67b9f7b033..066fc35e55 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/ForgeRegistries.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/ForgeRegistries.java @@ -29,6 +29,7 @@ import net.minecraft.potion.PotionType; import net.minecraft.util.SoundEvent; import net.minecraft.world.biome.Biome; import net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerProfession; +import net.minecraftforge.registries.DataSerializerEntry; import net.minecraftforge.registries.GameData; import net.minecraftforge.registries.IForgeRegistry; @@ -51,6 +52,7 @@ public class ForgeRegistries public static final IForgeRegistry VILLAGER_PROFESSIONS = GameRegistry.findRegistry(VillagerProfession.class); public static final IForgeRegistry ENTITIES = GameRegistry.findRegistry(EntityEntry.class); public static final IForgeRegistry RECIPES = GameRegistry.findRegistry(IRecipe.class); + public static final IForgeRegistry DATA_SERIALIZERS = GameRegistry.findRegistry(DataSerializerEntry.class); /** diff --git a/src/main/java/net/minecraftforge/registries/DataSerializerEntry.java b/src/main/java/net/minecraftforge/registries/DataSerializerEntry.java new file mode 100644 index 0000000000..bf4ae21ef0 --- /dev/null +++ b/src/main/java/net/minecraftforge/registries/DataSerializerEntry.java @@ -0,0 +1,37 @@ +/* + * Minecraft Forge + * Copyright (c) 2016-2018. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.minecraftforge.registries; + +import net.minecraft.network.datasync.DataSerializer; + +public final class DataSerializerEntry extends IForgeRegistryEntry.Impl +{ + private final DataSerializer serializer; + + public DataSerializerEntry(DataSerializer serializer) + { + this.serializer = serializer; + } + + public DataSerializer getSerializer() + { + return serializer; + } +} diff --git a/src/main/java/net/minecraftforge/registries/GameData.java b/src/main/java/net/minecraftforge/registries/GameData.java index 524ba33d95..3592ff96d0 100644 --- a/src/main/java/net/minecraftforge/registries/GameData.java +++ b/src/main/java/net/minecraftforge/registries/GameData.java @@ -37,6 +37,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.network.datasync.DataSerializer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionType; import net.minecraft.util.ObjectIntIdentityMap; @@ -100,6 +101,8 @@ public class GameData public static final ResourceLocation ENTITIES = new ResourceLocation("minecraft:entities"); public static final ResourceLocation RECIPES = new ResourceLocation("minecraft:recipes"); public static final ResourceLocation PROFESSIONS = new ResourceLocation("minecraft:villagerprofessions"); + public static final ResourceLocation SERIALIZERS = new ResourceLocation("minecraft:dataserializers"); + private static final int MAX_BLOCK_ID = 4095; private static final int MIN_ITEM_ID = MAX_BLOCK_ID + 1; private static final int MAX_ITEM_ID = 31999; @@ -111,10 +114,14 @@ public class GameData private static final int MAX_ENTITY_ID = Integer.MAX_VALUE >> 5; // Varint (SPacketSpawnMob) private static final int MAX_RECIPE_ID = Integer.MAX_VALUE >> 5; // Varint CPacketRecipeInfo/SPacketRecipeBook private static final int MAX_PROFESSION_ID = 1024; //TODO: Is this serialized anywhere anymore? + private static final int MIN_SERIALIZER_ID = 256; // Leave room for vanilla entries + private static final int MAX_SERIALIZER_ID = Integer.MAX_VALUE >> 5; // Varint (EntityDataManager) private static final ResourceLocation BLOCK_TO_ITEM = new ResourceLocation("minecraft:blocktoitemmap"); private static final ResourceLocation BLOCKSTATE_TO_ID = new ResourceLocation("minecraft:blockstatetoid"); private static final ResourceLocation ENTITY_CLASS_TO_ENTRY = new ResourceLocation("forge:entity_class_to_entry"); + private static final ResourceLocation SERIALIZER_TO_ENTRY = new ResourceLocation("forge:serializer_to_entry"); + private static boolean hasInit = false; private static final boolean DISABLE_VANILLA_REGISTRIES = Boolean.parseBoolean(System.getProperty("forge.disableVanillaGameData", "false")); // Use for unit tests/debugging private static final BiConsumer> LOCK_VANILLA = (name, reg) -> reg.slaves.values().stream().filter(o -> o instanceof ILockableRegistry).forEach(o -> ((ILockableRegistry)o).lock()); @@ -142,6 +149,7 @@ public class GameData makeRegistry(ENCHANTMENTS, Enchantment.class, MAX_ENCHANTMENT_ID).create(); makeRegistry(RECIPES, IRecipe.class, MAX_RECIPE_ID).disableSaving().allowModification().addCallback(RecipeCallbacks.INSTANCE).create(); makeRegistry(PROFESSIONS, VillagerProfession.class, MAX_PROFESSION_ID).create(); + makeRegistry(SERIALIZERS, DataSerializerEntry.class, MIN_SERIALIZER_ID, MAX_SERIALIZER_ID).disableSaving().disableOverrides().addCallback(SerializerCallbacks.INSTANCE).create(); entityRegistry = (ForgeRegistry)makeRegistry(ENTITIES, EntityEntry.class, MAX_ENTITY_ID).addCallback(EntityCallbacks.INSTANCE).create(); } @@ -196,6 +204,12 @@ public class GameData return GameRegistry.findRegistry(EntityEntry.class).getSlaveMap(ENTITY_CLASS_TO_ENTRY, Map.class); } + @SuppressWarnings("unchecked") + public static Map, DataSerializerEntry> getSerializerMap() + { + return GameRegistry.findRegistry(DataSerializerEntry.class).getSlaveMap(SERIALIZER_TO_ENTRY, Map.class); + } + public static > K register_impl(K value) { Validate.notNull(value, "Attempted to register a null object"); @@ -520,6 +534,32 @@ public class GameData } } + private static class SerializerCallbacks implements IForgeRegistry.AddCallback, IForgeRegistry.ClearCallback, IForgeRegistry.CreateCallback + { + static final SerializerCallbacks INSTANCE = new SerializerCallbacks(); + + @Override + public void onAdd(IForgeRegistryInternal owner, RegistryManager stage, int id, DataSerializerEntry entry, @Nullable DataSerializerEntry oldEntry) + { + @SuppressWarnings("unchecked") + Map, DataSerializerEntry> map = owner.getSlaveMap(SERIALIZER_TO_ENTRY, Map.class); + if (oldEntry != null) map.remove(oldEntry.getSerializer()); + map.put(entry.getSerializer(), entry); + } + + @Override + public void onClear(IForgeRegistryInternal owner, RegistryManager stage) + { + owner.getSlaveMap(SERIALIZER_TO_ENTRY, Map.class).clear(); + } + + @Override + public void onCreate(IForgeRegistryInternal owner, RegistryManager stage) + { + owner.setSlaveMap(SERIALIZER_TO_ENTRY, new IdentityHashMap<>()); + } + } + private static > void loadRegistry(final ResourceLocation registryName, final RegistryManager from, final RegistryManager to, final Class regType, boolean freeze) { ForgeRegistry fromRegistry = from.getRegistry(registryName);