diff --git a/build.gradle b/build.gradle index 407744ef..5ce869fc 100755 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ archivesBaseName = "replaymod" minecraft { coreMod = 'com.replaymod.core.LoadingPlugin' - version = '1.12-14.21.0.2327' + version = '1.12-14.21.0.2375' runDir = "eclipse" mappings = "snapshot_20170615" replace '@MOD_VERSION@', project.version diff --git a/src/main/java/com/replaymod/core/gui/GuiFactory.java b/src/main/java/com/replaymod/core/gui/GuiFactory.java index 2940f62c..d29ebb84 100644 --- a/src/main/java/com/replaymod/core/gui/GuiFactory.java +++ b/src/main/java/com/replaymod/core/gui/GuiFactory.java @@ -24,18 +24,8 @@ public class GuiFactory implements IModGuiFactory { return new GuiReplaySettings(parentScreen, ReplayMod.instance.getSettingsRegistry()).toMinecraft(); } - @Override - public Class mainConfigGuiClass() { - return null; - } - @Override public Set runtimeGuiCategories() { return null; } - - @Override - public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) { - return null; - } } diff --git a/src/main/java/com/replaymod/core/utils/ModCompat.java b/src/main/java/com/replaymod/core/utils/ModCompat.java index 876c05fe..e87a26e2 100644 --- a/src/main/java/com/replaymod/core/utils/ModCompat.java +++ b/src/main/java/com/replaymod/core/utils/ModCompat.java @@ -4,22 +4,22 @@ import com.replaymod.replaystudio.data.ModInfo; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.ModContainer; -import net.minecraftforge.fml.common.registry.GameData; +import net.minecraftforge.registries.ForgeRegistry; +import net.minecraftforge.registries.RegistryManager; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; -import java.util.stream.Stream; public class ModCompat { @SuppressWarnings("unchecked") public static Collection getInstalledNetworkMods() { Map ignoreCaseMap = Loader.instance().getModList().stream() .collect(Collectors.toMap(m -> m.getModId().toLowerCase(), Function.identity())); - return Stream.concat( - ((Set) GameData.getBlockRegistry().getKeys()).stream(), - ((Set) GameData.getItemRegistry().getKeys()).stream() - ).map(ResourceLocation::getResourceDomain).filter(s -> !s.equals("minecraft")).distinct() + return RegistryManager.ACTIVE.takeSnapshot(false).keySet().stream() + .map(RegistryManager.ACTIVE::getRegistry) + .map(ForgeRegistry::getKeys).flatMap(Set::stream) + .map(ResourceLocation::getResourceDomain).filter(s -> !s.equals("minecraft")).distinct() .map(String::toLowerCase).map(ignoreCaseMap::get).filter(mod -> mod != null) .map(mod -> new ModInfo(mod.getModId(), mod.getName(), mod.getVersion())) .collect(Collectors.toList());