R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complain once per mod ID if an outdated structure is found

Browse Source
This commit is contained in:
embeddedt 2023-05-04 11:42:25 -04:00
parent 4796af2094
commit 270fec309e
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/src/main/java/org/embeddedt/modernfix/structure/CachingStructureManager.java
View File

@ -1,6 +1,7 @@
package org.embeddedt.modernfix.structure; package org.embeddedt.modernfix.structure;
import com.mojang.datafixers.DataFixer; import com.mojang.datafixers.DataFixer;
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
import net.minecraft.SharedConstants; import net.minecraft.SharedConstants;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtIo; import net.minecraft.nbt.NbtIo;
@ -15,6 +16,7 @@ import org.embeddedt.modernfix.util.FileUtil;
import java.io.*; import java.io.*;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Set;
public class CachingStructureManager { public class CachingStructureManager {
private static ThreadLocal<MessageDigest> digestThreadLocal = ThreadLocal.withInitial(() -> { private static ThreadLocal<MessageDigest> digestThreadLocal = ThreadLocal.withInitial(() -> {
@ -45,6 +47,8 @@ public class CachingStructureManager {
return sb.toString(); return sb.toString();
} }
private static final Set<String> laggyStructureMods = new ObjectOpenHashSet<>();
public static CompoundTag readStructureTag(ResourceLocation location, DataFixer datafixer, InputStream stream) throws IOException { public static CompoundTag readStructureTag(ResourceLocation location, DataFixer datafixer, InputStream stream) throws IOException {
byte[] structureBytes = toBytes(stream); byte[] structureBytes = toBytes(stream);
CompoundTag currentTag = NbtIo.readCompressed(new ByteArrayInputStream(structureBytes)); CompoundTag currentTag = NbtIo.readCompressed(new ByteArrayInputStream(structureBytes));
@ -53,6 +57,11 @@ public class CachingStructureManager {
} }
int currentDataVersion = currentTag.getInt("DataVersion"); int currentDataVersion = currentTag.getInt("DataVersion");
if(currentDataVersion < SharedConstants.getCurrentVersion().getWorldVersion()) { if(currentDataVersion < SharedConstants.getCurrentVersion().getWorldVersion()) {
synchronized (laggyStructureMods) {
if(laggyStructureMods.add(location.getNamespace())) {
ModernFix.LOGGER.warn("Mod {} is shipping outdated structure files; please report this to them.", location.getNamespace());
}
}
/* Needs upgrade, try looking up from cache */ /* Needs upgrade, try looking up from cache */
MessageDigest hasher = digestThreadLocal.get(); MessageDigest hasher = digestThreadLocal.get();
hasher.reset(); hasher.reset();