Tianpao/Arclight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GameData get injected multiple times (#170)

Browse Source
This commit is contained in:
IzzelAliz 2021-04-27 21:43:17 +08:00
parent d0108af1e6
commit 94894f63d4
2 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
arclight-common/src/main/java/io/izzel/arclight/common/mixin/forge/FMLWorldPersistenceHookMixin.java Normal file
View File

@ -0,0 +1,84 @@
package io.izzel.arclight.common.mixin.forge;
import com.google.common.collect.Multimap;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.ListNBT;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.storage.IServerConfiguration;
import net.minecraft.world.storage.SaveFormat;
import net.minecraftforge.fml.FMLWorldPersistenceHook;
import net.minecraftforge.fml.MavenVersionStringHelper;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.registries.ForgeRegistry;
import net.minecraftforge.registries.GameData;
import net.minecraftforge.registries.RegistryManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import java.nio.file.Path;
import java.util.HashMap;
import java.util.Map;
@Mixin(value = FMLWorldPersistenceHook.class, remap = false)
public class FMLWorldPersistenceHookMixin {
@Shadow @Final private static Logger LOGGER;
@Shadow @Final private static Marker WORLDPERSISTENCE;
private final Map<Path, CompoundNBT> map = new HashMap<>();
private boolean injected = false;
@Redirect(method = "readData", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/registries/GameData;injectSnapshot(Ljava/util/Map;ZZ)Lcom/google/common/collect/Multimap;"))
private Multimap<ResourceLocation, ResourceLocation> arclight$handleInject(Map<ResourceLocation, ForgeRegistry.Snapshot> snapshot, boolean injectFrozenData, boolean isLocalWorld,
SaveFormat.LevelSave levelSave, IServerConfiguration serverInfo, CompoundNBT tag) {
if (!injected) {
injected = true;
return GameData.injectSnapshot(snapshot, injectFrozenData, isLocalWorld);
} else {
// TODO Properly remap registry and id
map.put(levelSave.getWorldDir(), tag.getCompound("Registries").copy());
LOGGER.debug(WORLDPERSISTENCE, "Skipped registry injection for {}", serverInfo.getWorldName());
return null;
}
}
/**
* @author IzzelAliz
* @reason
*/
@Overwrite
public CompoundNBT getDataForWriting(SaveFormat.LevelSave levelSave, IServerConfiguration serverInfo) {
CompoundNBT fmlData = new CompoundNBT();
ListNBT modList = new ListNBT();
ModList.get().getMods().forEach(mi ->
{
final CompoundNBT mod = new CompoundNBT();
mod.putString("ModId", mi.getModId());
mod.putString("ModVersion", MavenVersionStringHelper.artifactVersionToString(mi.getVersion()));
modList.add(mod);
});
fmlData.put("LoadingModList", modList);
CompoundNBT nbt = map.get(levelSave.getWorldDir());
if (nbt != null) {
fmlData.put("Registries", nbt);
LOGGER.debug(WORLDPERSISTENCE, "Skipped ID Map collection for {}", serverInfo.getWorldName());
} else {
CompoundNBT registries = new CompoundNBT();
fmlData.put("Registries", registries);
LOGGER.debug(WORLDPERSISTENCE, "Gathering id map for writing to world save {}", serverInfo.getWorldName());
for (Map.Entry<ResourceLocation, ForgeRegistry.Snapshot> e : RegistryManager.ACTIVE.takeSnapshot(true).entrySet()) {
registries.put(e.getKey().toString(), e.getValue().write());
}
LOGGER.debug(WORLDPERSISTENCE, "ID Map collection complete {}", serverInfo.getWorldName());
}
return fmlData;
}
}

1
arclight-common/src/main/resources/mixins.arclight.forge.json
View File

@ -9,6 +9,7 @@
"defaultRequire": 1
},
"mixins": [
"FMLWorldPersistenceHookMixin",
"ForgeEventFactoryMixin",
"ForgeHooksMixin",
"NetworkHooksMixin",