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

Merge 1.20 into 1.20.2

Browse Source
This commit is contained in:
embeddedt 2023-10-06 17:07:49 -04:00
commit 1267a25db1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,11 +76,13 @@ public class CachingStructureManager {
ModernFix.LOGGER.debug("Using cached upgraded version of {}", location); ModernFix.LOGGER.debug("Using cached upgraded version of {}", location);
currentTag = cachedUpgraded; currentTag = cachedUpgraded;
} else { } else {
/*
synchronized (laggyStructureMods) { synchronized (laggyStructureMods) {
if(laggyStructureMods.add(location.getNamespace())) { if(laggyStructureMods.add(location.getNamespace())) {
ModernFix.LOGGER.warn("The namespace {} contains an outdated structure file, which can cause worldgen lag. Please view debug.log for the full filename, determine which mod provides the structure, and report to the mod/datapack author, including the debug log.", location.getNamespace()); ModernFix.LOGGER.warn("The namespace {} contains an outdated structure file, which can cause worldgen lag. Please view debug.log for the full filename, determine which mod provides the structure, and report to the mod/datapack author, including the debug log.", location.getNamespace());
} }
} }
*/
ModernFix.LOGGER.debug("Structure {} is being run through DFU (hash {}), this will cause launch time delays", location, hash); ModernFix.LOGGER.debug("Structure {} is being run through DFU (hash {}), this will cause launch time delays", location, hash);
currentTag = DataFixTypes.STRUCTURE.update(datafixer, currentTag, currentDataVersion, currentTag = DataFixTypes.STRUCTURE.update(datafixer, currentTag, currentDataVersion,
SharedConstants.getCurrentVersion().getDataVersion().getVersion()); SharedConstants.getCurrentVersion().getDataVersion().getVersion());

5
forge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java
View File

@ -2,12 +2,9 @@ package org.embeddedt.modernfix.forge.config;
import com.electronwill.nightconfig.core.file.FileWatcher; import com.electronwill.nightconfig.core.file.FileWatcher;
import cpw.mods.modlauncher.api.LamdbaExceptionUtils; import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.Component;
import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.loading.FMLLoader;
import net.minecraftforge.fml.util.ObfuscationReflectionHelper; import net.minecraftforge.fml.util.ObfuscationReflectionHelper;
import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.ModernFix;
import org.embeddedt.modernfix.ModernFixClient;
import org.embeddedt.modernfix.core.ModernFixMixinPlugin; import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
import org.embeddedt.modernfix.util.CommonModUtil; import org.embeddedt.modernfix.util.CommonModUtil;
@ -79,6 +76,7 @@ public class NightConfigFixer {
private static boolean couldShowMessage = true; private static boolean couldShowMessage = true;
private static void triggerConfigMessage() { private static void triggerConfigMessage() {
/*
if(false && couldShowMessage && Minecraft.getInstance().level != null && ModernFixClient.recipesUpdated && ModernFixClient.tagsUpdated) { if(false && couldShowMessage && Minecraft.getInstance().level != null && ModernFixClient.recipesUpdated && ModernFixClient.tagsUpdated) {
Minecraft.getInstance().execute(() -> { Minecraft.getInstance().execute(() -> {
if(Minecraft.getInstance().level != null) { if(Minecraft.getInstance().level != null) {
@ -87,6 +85,7 @@ public class NightConfigFixer {
} }
}); });
} }
*/
} }
static class MonitoringConfigTracker implements Runnable { static class MonitoringConfigTracker implements Runnable {