toRun) {
- validateSafeReferent(toRun);
- if (dist == FMLEnvironment.dist) {
- toRun.get().run();
- }
- }
- /**
- * Executes one of the two suppliers, based on which side is active.
- *
- *
- * Example (replacement for old SidedProxy):
- * {@code Proxy p = DistExecutor.runForDist(()->ClientProxy::new, ()->ServerProxy::new);}
- *
- * NOTE: the double supplier is required to avoid classloading the secondary target.
- *
- * @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
- * @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
- * @param The common type to return
- * @return The returned instance
- * @deprecated Use {@link #safeRunForDist(Supplier, Supplier)}
- */
- @Deprecated
- public static T runForDist(Supplier> clientTarget, Supplier> serverTarget) {
- return unsafeRunForDist(clientTarget, serverTarget);
- }
-
- /**
- * Unsafe version of {@link #safeRunForDist(Supplier, Supplier)}. Use only when you know what you're doing
- * and understand why the verifier can cause unexpected ClassNotFoundException crashes even when code is apparently
- * not sided. Ensure you test both sides fully to be confident in using this.
- *
- * @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
- * @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
- * @param The common type to return
- * @return The returned instance
- */
- public static T unsafeRunForDist(Supplier> clientTarget, Supplier> serverTarget) {
- switch (FMLEnvironment.dist)
- {
- case CLIENT:
- return clientTarget.get().get();
- case DEDICATED_SERVER:
- return serverTarget.get().get();
- default:
- throw new IllegalArgumentException("UNSIDED?");
- }
- }
- /**
- * Executes one of the two suppliers, based on which side is active.
- *
- *
- * Example (replacement for old SidedProxy):
- * {@code Proxy p = DistExecutor.safeRunForDist(()->ClientProxy::new, ()->ServerProxy::new);}
- *
- * NOTE: the double supplier is required to avoid classloading the secondary target.
- *
- * @param clientTarget The supplier supplier to run when on the {@link Dist#CLIENT}
- * @param serverTarget The supplier supplier to run when on the {@link Dist#DEDICATED_SERVER}
- * @param The common type to return
- * @return The returned instance
- */
- public static T safeRunForDist(Supplier> clientTarget, Supplier> serverTarget) {
- validateSafeReferent(clientTarget);
- validateSafeReferent(serverTarget);
- switch (FMLEnvironment.dist)
- {
- case CLIENT:
- return clientTarget.get().get();
- case DEDICATED_SERVER:
- return serverTarget.get().get();
- default:
- throw new IllegalArgumentException("UNSIDED?");
- }
- }
-
- /**
- * A safe referent. This will assert that it is being called via a separated class method reference. This will
- * avoid the common pitfalls of {@link #callWhenOn(Dist, Supplier)} above.
- *
- * SafeReferents assert that they are defined as a separate method outside the scope of the calling class.
- *
- * Implementations need to be defined in a separate class to the referring site, with appropriate
- * visibility to be accessible at the callsite (generally, avoid private methods).
- *
- *
- * Valid:
- *
- * {@code DistExecutor.safeCallWhenOn(Dist.CLIENT, ()->AnotherClass::clientOnlyMethod);}
- *
- *
- * Invalid:
- *
- * {@code DistExecutor.safeCallWhenOn(Dist.CLIENT, ()->()->Minecraft.getInstance().world);}
- */
- public interface SafeReferent {}
-
- /**
- * SafeCallable version of {@link SafeReferent}.
- * @see SafeReferent
- * @param The return type of the Callable
- */
- public interface SafeCallable extends SafeReferent, Callable, Serializable {}
-
- /**
- * SafeSupplier version of {@link SafeReferent}
- * @param The return type of the Supplier
- */
- public interface SafeSupplier extends SafeReferent, Supplier, Serializable {}
-
- /**
- * SafeRunnable version of {@link SafeReferent}
- */
- public interface SafeRunnable extends SafeReferent, Runnable, Serializable {}
-
- private static final void validateSafeReferent(Supplier safeReferentSupplier) {
- if (FMLEnvironment.production) return;
- final SafeReferent setter;
- try {
- setter = safeReferentSupplier.get();
- } catch (Exception e) {
- // Typically a class cast exception, just return out, expected.
- return;
- }
-
- for (Class cl = setter.getClass(); cl != null; cl = cl.getSuperclass()) {
- try {
- Method m = cl.getDeclaredMethod("writeReplace");
- m.setAccessible(true);
- Object replacement = m.invoke(setter);
- if (!(replacement instanceof SerializedLambda))
- break;// custom interface implementation
- SerializedLambda l = (SerializedLambda) replacement;
- if (Objects.equals(l.getCapturingClass(), l.getImplClass())) {
- LOGGER.fatal("Detected unsafe referent usage, please view the code at {}",Thread.currentThread().getStackTrace()[3]);
- throw new RuntimeException("Unsafe Referent usage found in safe referent method");
- }
- } catch (NoSuchMethodException e) {
- } catch (IllegalAccessException | InvocationTargetException e) {
- break;
- }
- }
- }
-}
diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/IModLoadingState.java b/fmlcore/src/main/java/net/minecraftforge/fml/IModLoadingState.java
index df2ea454e0..0d48ff0c5c 100644
--- a/fmlcore/src/main/java/net/minecraftforge/fml/IModLoadingState.java
+++ b/fmlcore/src/main/java/net/minecraftforge/fml/IModLoadingState.java
@@ -6,13 +6,14 @@
package net.minecraftforge.fml;
import net.minecraftforge.fml.loading.progress.ProgressMeter;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
-import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
-import java.util.function.Consumer;
import java.util.function.Function;
-import java.util.function.ToIntFunction;
+import java.util.function.IntSupplier;
+import java.util.function.Supplier;
/**
* A mod loading state. During mod loading, the mod loader transitions between states in a defined sorted list of states,
@@ -20,6 +21,7 @@ import java.util.function.ToIntFunction;
*
* @see IModStateProvider
*/
+@NullMarked
public interface IModLoadingState {
/**
* {@return the name of this state}
@@ -42,19 +44,21 @@ public interface IModLoadingState {
/**
* {@return a function returning a human-friendly message for this state}
*/
- Function message();
+ Supplier message();
/**
* @return a function that computes the size of this transition based on the size of the modlist.
* Used to compute progress.
*/
- ToIntFunction size();
+ default IntSupplier size() {
+ return ModList::size;
+ }
/**
* {@return an optional runnable, which runs before starting the transition from this state to the next}
* @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
*/
- Optional> inlineRunnable();
+ @Nullable Runnable inlineRunnable();
/**
* Builds the transition task for this state with a blank pre-sync and post-sync task.
@@ -65,14 +69,14 @@ public interface IModLoadingState {
* @return a transition task for this state
* @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
*/
- default Optional> buildTransition(
+ default @Nullable CompletableFuture buildTransition(
final Executor syncExecutor,
final Executor parallelExecutor,
final ProgressMeter progressBar
) {
return buildTransition(syncExecutor, parallelExecutor, progressBar,
- e -> CompletableFuture.completedFuture(null),
- e -> CompletableFuture.completedFuture(null)
+ _ -> CompletableFuture.completedFuture(null),
+ _ -> CompletableFuture.completedFuture(null)
);
}
@@ -87,7 +91,7 @@ public interface IModLoadingState {
* @param postSyncTask a function which returns a task to run after event post-dispatch hook
* @return a transition task for this state
*/
- Optional> buildTransition(final Executor syncExecutor,
+ @Nullable CompletableFuture buildTransition(final Executor syncExecutor,
final Executor parallelExecutor,
final ProgressMeter progressBar,
final Function> preSyncTask,
diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/IModStateTransition.java b/fmlcore/src/main/java/net/minecraftforge/fml/IModStateTransition.java
index c1c57db993..9eb9e25d48 100644
--- a/fmlcore/src/main/java/net/minecraftforge/fml/IModStateTransition.java
+++ b/fmlcore/src/main/java/net/minecraftforge/fml/IModStateTransition.java
@@ -6,21 +6,16 @@
package net.minecraftforge.fml;
import net.minecraftforge.fml.event.IModBusEvent;
-import net.minecraftforge.fml.loading.progress.ProgressMeter;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import java.util.function.BiFunction;
import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
+import net.minecraftforge.fml.loading.progress.ProgressMeter;
import org.jetbrains.annotations.Nullable;
public interface IModStateTransition {
- /** Magic value to allow me to optimize the futures list by ignoring the default value without making old methods nullable. */
- BiFunction, CompletableFuture> NULL_HOOK = (e, g) -> CompletableFuture.completedFuture(null);
-
static IModStateTransition buildNoopTransition() {
return ModStateTransitionHelper.NOOP;
}
@@ -40,15 +35,6 @@ public interface IModStateTransition {
return ModLoadingStage::nextState;
}
- /**
- * This used to allow you to fire multiple events during the transition. However, in doing so it would cause issues with the default
- * ModContainer's event handlers causing issues such as mod classes being constructed multiple times.
- */
- @Deprecated(since = "1.21.3", forRemoval = true)
- default Supplier>> eventFunctionStream() {
- return () -> Stream.ofNullable(eventFunction());
- }
-
@Nullable
default EventGenerator eventFunction() {
return null;
@@ -57,25 +43,9 @@ public interface IModStateTransition {
ThreadSelector threadSelector();
BiFunction, CompletableFuture> finalActivityGenerator();
- /**
- * I think this was meant as a way to do some things for each mod container beforge/after the transition had been sent to the container.
- * However, the Future returned by this was never linked to the main transition future in any way. Which means that it was run
- * in parallel and couldn't guarantee the state of the ModContainer.
- *
- * Plus all existing code that I could find returned a completedFuture, so I don't think anyone ever used this.
- *
- * If I were to add this back it would be a CompletableFuture wrap(ModContainer, CompletableFuture)
- *
- * Added magic value NULL_HOOK to allow me to optimize the futures list by ignoring the default value without making this method nullable.
- */
- @Deprecated(since = "1.21.3", forRemoval = true)
- default BiFunction, CompletableFuture> preDispatchHook() { return NULL_HOOK; }
- @Deprecated(since = "1.21.3", forRemoval = true)
- default BiFunction, CompletableFuture> postDispatchHook() { return NULL_HOOK; }
-
interface EventGenerator extends Function {
static EventGenerator fromFunction(Function fn) {
return fn::apply;
}
}
-}
\ No newline at end of file
+}
diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/ISystemReportExtender.java b/fmlcore/src/main/java/net/minecraftforge/fml/ISystemReportExtender.java
index e533be752b..e39d9d069e 100644
--- a/fmlcore/src/main/java/net/minecraftforge/fml/ISystemReportExtender.java
+++ b/fmlcore/src/main/java/net/minecraftforge/fml/ISystemReportExtender.java
@@ -7,12 +7,10 @@ package net.minecraftforge.fml;
import java.util.function.Supplier;
-public interface ISystemReportExtender extends Supplier
-{
+public interface ISystemReportExtender extends Supplier {
String getLabel();
- default boolean isActive()
- {
+ default boolean isActive() {
return true;
}
}
diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/InterModComms.java b/fmlcore/src/main/java/net/minecraftforge/fml/InterModComms.java
index 92b31df72f..28cf6eab29 100644
--- a/fmlcore/src/main/java/net/minecraftforge/fml/InterModComms.java
+++ b/fmlcore/src/main/java/net/minecraftforge/fml/InterModComms.java
@@ -5,63 +5,20 @@
package net.minecraftforge.fml;
-
import java.util.Iterator;
import java.util.Spliterator;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ConcurrentMap;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.function.Supplier;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
-public class InterModComms
-{
- public record IMCMessage(String senderModId, String modId, String method, Supplier messageSupplier) {
+public final class InterModComms {
+ public record IMCMessage(String senderModId, String modId, String method, Supplier messageSupplier) {}
- /**
- * Deprecated: use {@link #senderModId()}
- * @return The modid of the sender. This is supplied by the caller, or by the active mod container context.
- * Consider it unreliable.
- */
- @Deprecated
- public final String getSenderModId() {
- return this.senderModId;
- }
-
- /**
- * Deprecated: use {@link #modId()}
- * @return The modid being sent to.
- */
- @Deprecated
- public final String getModId() {
- return this.modId;
- }
-
- /**
- * Deprecated: use {@link #method()}
- * @return The method being sent to.
- */
- @Deprecated
- public final String getMethod() {
- return this.method;
- }
-
- /**
- * @param The type of the message.
- * @return A {@link Supplier} of the message.
- * Use {@link #messageSupplier()}
- */
- @SuppressWarnings("unchecked")
- @Deprecated
- public final Supplier getMessageSupplier() {
- return (Supplier) this.messageSupplier;
- }
- }
-
- private static final ConcurrentMap> containerQueues = new ConcurrentHashMap<>();
+ private static final ConcurrentHashMap> containerQueues = new ConcurrentHashMap<>();
/**
* Send IMC to remote. Sender will default to the active modcontainer, or minecraft if not.
@@ -72,8 +29,9 @@ public class InterModComms
* @return true if the message was enqueued for sending (the target modid is loaded)
*/
public static boolean sendTo(final String modId, final String method, final Supplier thing) {
- if (!ModList.get().isLoaded(modId)) return false;
- containerQueues.computeIfAbsent(modId, k->new ConcurrentLinkedQueue<>()).add(new IMCMessage(ModLoadingContext.get().getActiveContainer().getModId(), modId, method, thing));
+ if (!ModList.isLoaded(modId)) return false;
+ containerQueues.computeIfAbsent(modId, _ -> new ConcurrentLinkedQueue<>())
+ .add(new IMCMessage(ModLoadingContext.get().getContainer().getModId(), modId, method, thing));
return true;
}
@@ -87,8 +45,9 @@ public class InterModComms
* @return true if the message was enqueued for sending (the target modid is loaded)
*/
public static boolean sendTo(final String senderModId, final String modId, final String method, final Supplier thing) {
- if (!ModList.get().isLoaded(modId)) return false;
- containerQueues.computeIfAbsent(modId, k->new ConcurrentLinkedQueue<>()).add(new IMCMessage(senderModId, modId, method, thing));
+ if (!ModList.isLoaded(modId)) return false;
+ containerQueues.computeIfAbsent(modId, _ -> new ConcurrentLinkedQueue<>())
+ .add(new IMCMessage(senderModId, modId, method, thing));
return true;
}
@@ -112,7 +71,7 @@ public class InterModComms
* @return All messages
*/
public static Stream getMessages(final String modId) {
- return getMessages(modId, s->Boolean.TRUE);
+ return getMessages(modId, _ -> true);
}
private record QueueFilteringSpliterator(
@@ -136,13 +95,10 @@ public class InterModComms
}
@Override
- public boolean tryAdvance(final Consumer action)
- {
+ public boolean tryAdvance(final Consumer action) {
IMCMessage next;
- do
- {
- if (!iterator.hasNext())
- {
+ do {
+ if (!iterator.hasNext()) {
return false;
}
next = this.iterator.next();
@@ -157,6 +113,5 @@ public class InterModComms
public Spliterator trySplit() {
return null;
}
-
}
}
diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/ModContainer.java b/fmlcore/src/main/java/net/minecraftforge/fml/ModContainer.java
index cf6a35a3af..8c453fda1c 100644
--- a/fmlcore/src/main/java/net/minecraftforge/fml/ModContainer.java
+++ b/fmlcore/src/main/java/net/minecraftforge/fml/ModContainer.java
@@ -19,7 +19,6 @@ import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.function.BiPredicate;
-import java.util.function.Consumer;
import java.util.function.Supplier;
/**
@@ -41,11 +40,6 @@ public abstract class ModContainer {
protected final Map>, Supplier> extensionPoints = new IdentityHashMap<>();
protected final EnumMap configs = new EnumMap<>(ModConfig.Type.class);
final Set dependencies = new HashSet<>();
- /**
- * If you want to handle the event, override {@link #dispatchConfigEvent(IConfigEvent)}
- */
- @Deprecated(since = "1.21.3", forRemoval = true)
- protected Optional> configHandler = Optional.empty();
public ModContainer(IModInfo info) {
this.modId = info.getModId();
@@ -59,7 +53,7 @@ public abstract class ModContainer {
Supplier displayTestSupplier = switch (displayTestString) {
case "MATCH_VERSION" -> // default displaytest checks for version string match
() -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
- (incoming, isNetwork) -> Objects.equals(incoming, this.modInfo.getVersion().toString()));
+ (incoming, _) -> Objects.equals(incoming, this.modInfo.getVersion().toString()));
case "IGNORE_SERVER_VERSION" -> // Ignores any version information coming from the server - use for server only mods
IExtensionPoint.DisplayTest.IGNORE_SERVER_VERSION;
case "IGNORE_ALL_VERSION" -> // Ignores all information and provides no information
@@ -138,12 +132,7 @@ public abstract class ModContainer {
configs.put(modConfig.getType(), modConfig);
}
- public void dispatchConfigEvent(IConfigEvent event) {
- var handler = configHandler.orElse(null);
- if (handler != null) {
- handler.accept(event);
- }
- }
+ public void dispatchConfigEvent(IConfigEvent event) {}
/**
* Does this mod match the supplied mod?
diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/ModList.java b/fmlcore/src/main/java/net/minecraftforge/fml/ModList.java
index 7bbfcb0ede..438609e6b6 100644
--- a/fmlcore/src/main/java/net/minecraftforge/fml/ModList.java
+++ b/fmlcore/src/main/java/net/minecraftforge/fml/ModList.java
@@ -5,14 +5,14 @@
package net.minecraftforge.fml;
+import net.minecraftforge.fml.loading.LoadingModList;
import net.minecraftforge.forgespi.language.IModFileInfo;
import net.minecraftforge.forgespi.language.IModInfo;
import net.minecraftforge.forgespi.language.ModFileScanData;
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
-import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
import net.minecraftforge.forgespi.locating.IModFile;
-import java.util.Collections;
+
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
@@ -30,33 +30,36 @@ import java.util.stream.Stream;
* Master list of all mods - game-side version. This is classloaded in the game scope and
* can dispatch game level events as a result.
*/
-public class ModList {
- private static ModList INSTANCE;
- private final List modFiles;
- private final List sortedList;
- private final Map fileById;
- private List mods;
- private Map indexedMods;
- private List modFileScanData;
- private List sortedContainers;
+public final class ModList {
+ private ModList() {}
- private ModList(final List modFiles, final List sortedList) {
- var modFileInfos = this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).toList();
- this.sortedList = sortedList.stream().map(IModInfo.class::cast).toList();
+ private static final List MOD_FILES;
+ private static final List SORTED_LIST;
+ private static final Map FILE_BY_ID;
+ private static List mods;
+ private static Map indexedMods;
+ private static List sortedContainers;
+
+ static {
+ var loadingModFiles = LoadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList();
+ var loadingSortedList = LoadingModList.getMods();
+
+ var modFileInfos = MOD_FILES = loadingModFiles.stream().map(ModFile::getModFileInfo).toList();
+ SORTED_LIST = loadingSortedList.stream().map(IModInfo.class::cast).toList();
var byId = new HashMap();
for (var file : modFileInfos) {
for (var mod : file.getMods())
byId.put(mod.getModId(), mod.getOwningFile());
}
- this.fileById = Map.copyOf(byId);
- CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
+ FILE_BY_ID = Map.copyOf(byId);
+ CrashReportCallables.registerCrashCallable("Mod List", ModList::crashReport);
}
- private String getModContainerState(String modId) {
+ private static String getModContainerState(String modId) {
return getModContainerById(modId).map(ModContainer::getCurrentState).map(Object::toString).orElse("NONE");
}
- private String fileToLine(IModFile mf) {
+ private static String fileToLine(IModFile mf) {
var mainMod = mf.getModInfos().getFirst();
return String.format(Locale.ENGLISH, "%-50.50s|%-30.30s|%-30.30s|%-20.20s|%-10.10s|Manifest: %s", mf.getFileName(),
mainMod.getDisplayName(),
@@ -66,92 +69,92 @@ public class ModList {
((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
}
- private String crashReport() {
- return "\n" + applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
+ private static String crashReport() {
+ return "\n" + applyForEachModFile(ModList::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
}
- public static ModList of(List modFiles, List sortedList) {
- INSTANCE = new ModList(modFiles, sortedList);
- return INSTANCE;
+ public static void init() {}
+
+ public static List getModFiles() {
+ return MOD_FILES;
}
- public static ModList get() {
- return INSTANCE;
+ public static IModFileInfo getModFileById(String modid) {
+ return FILE_BY_ID.get(modid);
}
- public List getModFiles() {
- return modFiles;
+ static void setLoadedMods(final List modContainers) {
+ mods = modContainers;
+ sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c -> SORTED_LIST.indexOf(c.getModInfo()))).toList();
+ indexedMods = modContainers.stream().collect(Collectors.toUnmodifiableMap(ModContainer::getModId, Function.identity()));
}
- public IModFileInfo getModFileById(String modid) {
- return this.fileById.get(modid);
- }
-
- void setLoadedMods(final List modContainers) {
- this.mods = modContainers;
- this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c -> sortedList.indexOf(c.getModInfo()))).toList();
- this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
+ static void clearLoadedMods() {
+ mods = List.of();
+ indexedMods = Map.of();
+ sortedContainers = List.of();
}
@SuppressWarnings("unchecked")
- public Optional getModObjectById(String modId) {
+ public static Optional getModObjectById(String modId) {
return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o);
}
- public Optional getModContainerById(String modId) {
- return Optional.ofNullable(this.indexedMods.get(modId));
+ public static Optional getModContainerById(String modId) {
+ return Optional.ofNullable(indexedMods.get(modId));
}
- public Optional getModContainerByObject(Object obj) {
+ public static Optional getModContainerByObject(Object obj) {
return mods.stream().filter(mc -> mc.getMod() == obj).findFirst();
}
- public List getMods() {
- return this.sortedList;
+ public static List getMods() {
+ return SORTED_LIST;
}
- public boolean isLoaded(String modTarget) {
- return this.indexedMods.containsKey(modTarget);
+ public static boolean isLoaded(String modTarget) {
+ return indexedMods.containsKey(modTarget);
}
- public int size() {
+ public static int size() {
return mods.size();
}
- public List getAllScanData() {
- if (modFileScanData == null) {
- modFileScanData = this.sortedList.stream().
- map(IModInfo::getOwningFile).
- filter(Objects::nonNull).
- map(IModFileInfo::getFile).
- distinct().
- map(IModFile::getScanResult).
- toList();
+ public static List getAllScanData() {
+ final class LazyInit {
+ private LazyInit() {}
+ private static final List MOD_FILE_SCAN_DATA = SORTED_LIST.stream()
+ .map(IModInfo::getOwningFile)
+ .filter(Objects::nonNull)
+ .map(IModFileInfo::getFile)
+ .distinct()
+ .map(IModFile::getScanResult)
+ .toList();
}
- return modFileScanData;
+ return LazyInit.MOD_FILE_SCAN_DATA;
}
- public void forEachModFile(Consumer fileConsumer) {
- modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
+ public static void forEachModFile(Consumer fileConsumer) {
+ MOD_FILES.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
}
- public Stream applyForEachModFile(Function function) {
- return modFiles.stream().map(IModFileInfo::getFile).map(function);
+ public static Stream applyForEachModFile(Function function) {
+ return MOD_FILES.stream().map(IModFileInfo::getFile).map(function);
}
- public void forEachModContainer(BiConsumer modContainerConsumer) {
+ public static void forEachModContainer(BiConsumer modContainerConsumer) {
indexedMods.forEach(modContainerConsumer);
}
- public void forEachModInOrder(Consumer containerConsumer) {
- this.sortedContainers.forEach(containerConsumer);
+ public static void forEachModInOrder(Consumer containerConsumer) {
+ sortedContainers.forEach(containerConsumer);
}
- public List getLoadedMods() {
- return this.sortedContainers;
+ public static List getLoadedMods() {
+ return sortedContainers;
}
- public Stream applyForEachModContainer(Function function) {
+ public static Stream applyForEachModContainer(Function function) {
return indexedMods.values().stream().map(function);
}
}
diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/ModLoader.java b/fmlcore/src/main/java/net/minecraftforge/fml/ModLoader.java
index b43a761f47..f6be23d2d1 100644
--- a/fmlcore/src/main/java/net/minecraftforge/fml/ModLoader.java
+++ b/fmlcore/src/main/java/net/minecraftforge/fml/ModLoader.java
@@ -5,16 +5,11 @@
package net.minecraftforge.fml;
-import com.google.common.collect.ImmutableList;
import net.minecraftforge.eventbus.api.bus.BusGroup;
import net.minecraftforge.fml.event.IModBusEvent;
-import net.minecraftforge.fml.loading.FMLEnvironment;
-import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fml.loading.ImmediateWindowHandler;
-import net.minecraftforge.fml.loading.LoadingModList;
+import net.minecraftforge.fml.loading.*;
import net.minecraftforge.fml.loading.moddiscovery.InvalidModIdentifier;
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
-import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
import net.minecraftforge.fml.loading.progress.ProgressMeter;
import net.minecraftforge.fml.loading.progress.StartupNotificationManager;
import net.minecraftforge.forgespi.language.IModInfo;
@@ -71,48 +66,18 @@ import static net.minecraftforge.fml.Logging.LOADING;
* and completes the mod loading sequence.
*
*/
-public class ModLoader {
+public final class ModLoader {
+ private ModLoader() {}
+
private static final Logger LOGGER = LogManager.getLogger();
- private final LoadingModList loadingModList;
-
- private final List loadingExceptions;
- private final Set erroredModInfos;
- private final List loadingWarnings;
- private final ModStateManager stateManager;
+ private static final ArrayList LOADING_EXCEPTIONS = new ArrayList<>();
+ private static final ArrayList LOADING_WARNINGS = new ArrayList<>();
+ private static final Consumer STATUS_CONSUMER = StartupNotificationManager.modLoaderConsumer().orElse(_ -> {});
+ private static final HashSet COMPLETED_STATES = new HashSet<>();
private static boolean loadingStateValid;
- private final Consumer statusConsumer = StartupNotificationManager.modLoaderConsumer().orElse(msg -> {});
- private final Set completedStates = new HashSet<>();
- private ModList modList;
-
- private ModLoader() {
- var loadingModList = this.loadingModList = FMLLoader.getLoadingModList();
- var loadingExceptions = this.loadingExceptions = loadingModList.getErrors().stream()
- .flatMap(ModLoadingException::fromEarlyException)
- .collect(Collectors.toList());
- this.loadingWarnings = loadingModList.getBrokenFiles().stream()
- .map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
- .collect(Collectors.toList());
- if (loadingExceptions.isEmpty()) {
- this.erroredModInfos = Collections.emptySet();
- } else {
- this.erroredModInfos = Collections.newSetFromMap(new IdentityHashMap<>());
- this.erroredModInfos.addAll(loadingExceptions.stream().map(ModLoadingException::getModInfo).toList());
- }
- loadingModList.getModFiles().stream()
- .filter(ModFileInfo::missingLicense)
- .filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(this.erroredModInfos::contains)) //Ignore files where any other mod already encountered an error
- .map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
- .forEach(this.loadingExceptions::add);
- this.stateManager = new ModStateManager();
- CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
- CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
- CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
- CrashReportCallables.registerCrashCallable("ModLauncher services", ModLoader::computeModLauncherServiceList);
- CrashReportCallables.registerCrashCallable("FML Language Providers", ModLoader::computeLanguageList);
- }
private static String computeLanguageList() {
- return "\n" + FMLLoader.getLanguageLoadingProvider()
+ return "\n" + LanguageLoadingProvider
.applyForEach(lp -> lp.name() + '@' + lp.getClass().getPackage().getImplementationVersion())
.collect(Collectors.joining("\n\t\t", "\t\t", ""));
}
@@ -126,37 +91,51 @@ public class ModLoader {
collect(Collectors.joining("\n\t\t","\t\t",""));
}
- public static ModLoader get() {
- return LazyInit.INSTANCE;
- }
-
- private static final class LazyInit {
- private static final ModLoader INSTANCE = new ModLoader();
- private LazyInit() {}
- }
-
/**
* Run on the primary starting thread by ClientModLoader and ServerModLoader
* @param syncExecutor An executor to run tasks on the main thread
* @param parallelExecutor An executor to run tasks on a parallel loading thread pool
* @param periodicTask Optional periodic task to perform on the main thread while other activities run
*/
- public void gatherAndInitializeMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
+ public static void gatherAndInitializeMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
+ var loadingExceptions = LoadingModList.getErrors().stream()
+ .flatMap(ModLoadingException::fromEarlyException)
+ .toList();
+ ModLoader.LOADING_EXCEPTIONS.addAll(loadingExceptions);
+ LOADING_WARNINGS.addAll(LoadingModList.getBrokenFiles().stream()
+ .map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
+ .toList());
+ Set erroredModInfos;
+ if (loadingExceptions.isEmpty()) {
+ erroredModInfos = Collections.emptySet();
+ } else {
+ erroredModInfos = Collections.newSetFromMap(new IdentityHashMap<>());
+ erroredModInfos.addAll(loadingExceptions.stream().map(ModLoadingException::getModInfo).toList());
+ }
+ LoadingModList.getModFiles().stream()
+ .filter(ModFileInfo::missingLicense)
+ .filter(modFileInfo -> modFileInfo.getMods().stream().noneMatch(erroredModInfos::contains)) //Ignore files where any other mod already encountered an error
+ .map(modFileInfo -> new ModLoadingException(null, ModLoadingStage.VALIDATE, "fml.modloading.missinglicense", null, modFileInfo.getFile()))
+ .forEach(LOADING_EXCEPTIONS::add);
+ CrashReportCallables.registerCrashCallable("ModLauncher", FMLLoader::getLauncherInfo);
+ CrashReportCallables.registerCrashCallable("ModLauncher launch target", FMLLoader::launcherHandlerName);
+ CrashReportCallables.registerCrashCallable("ModLauncher naming", FMLLoader::getNaming);
+ CrashReportCallables.registerCrashCallable("ModLauncher services", ModLoader::computeModLauncherServiceList);
+ CrashReportCallables.registerCrashCallable("FML Language Providers", ModLoader::computeLanguageList);
+
ForgeFeature.registerFeature("javaVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.BOTH, System.getProperty("java.version")));
ForgeFeature.registerFeature("openGLVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.CLIENT, ImmediateWindowHandler.getGLVersion()));
loadingStateValid = true;
FMLLoader.backgroundScanHandler.waitForScanToComplete(periodicTask);
- final ModList modList = ModList.of(loadingModList.getModFiles().stream().map(ModFileInfo::getFile).toList(),
- loadingModList.getMods());
- if (!this.loadingExceptions.isEmpty()) {
- LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.getFirst());
- statusConsumer.accept("ERROR DURING MOD LOADING");
- modList.setLoadedMods(Collections.emptyList());
+ if (!LOADING_EXCEPTIONS.isEmpty()) {
+ LOGGER.fatal(CORE, "Error during pre-loading phase", LOADING_EXCEPTIONS.getFirst());
+ STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
+ ModList.clearLoadedMods();
loadingStateValid = false;
- throw new LoadingFailedException(loadingExceptions);
+ throw new LoadingFailedException(LOADING_EXCEPTIONS);
}
var failedBounds = new ArrayList();
- for (var mod : loadingModList.getMods()) {
+ for (var mod : LoadingModList.getMods()) {
for (var feature : mod.getForgeFeatures()) {
if (!ForgeFeature.testFeature(FMLEnvironment.dist, feature))
failedBounds.add(feature);
@@ -165,8 +144,8 @@ public class ModLoader {
if (!failedBounds.isEmpty()) {
LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
- statusConsumer.accept("ERROR DURING MOD LOADING");
- modList.setLoadedMods(Collections.emptyList());
+ STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
+ ModList.clearLoadedMods();
loadingStateValid = false;
throw new LoadingFailedException(failedBounds.stream()
.map(fb -> new ModLoadingException(fb.modInfo(), ModLoadingStage.CONSTRUCT, "fml.modloading.feature.missing", null, fb, ForgeFeature.featureValue(fb)))
@@ -174,18 +153,18 @@ public class ModLoader {
}
final var modContainers = new HashMap();
- for (var file : loadingModList.getModFiles()) {
- var containers = this.buildMods(file.getFile());
+ for (var file : LoadingModList.getModFiles()) {
+ var containers = buildMods(file.getFile());
for (var container : containers)
modContainers.put(container.getModId(), container);
}
- if (!loadingExceptions.isEmpty()) {
- LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.getFirst());
- statusConsumer.accept("ERROR DURING MOD LOADING");
- modList.setLoadedMods(Collections.emptyList());
+ if (!LOADING_EXCEPTIONS.isEmpty()) {
+ LOGGER.fatal(CORE, "Failed to initialize mod containers", LOADING_EXCEPTIONS.getFirst());
+ STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
+ ModList.clearLoadedMods();
loadingStateValid = false;
- throw new LoadingFailedException(loadingExceptions);
+ throw new LoadingFailedException(LOADING_EXCEPTIONS);
}
// Gather all dependencies, so we can make sure they have finished their transition events before we fire ours
@@ -208,34 +187,33 @@ public class ModLoader {
}
}
- modList.setLoadedMods(modContainers.values().stream().toList());
- this.modList = modList;
- var stateList = stateManager.getStates(ModLoadingPhase.GATHER);
- var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(this.modList)).sum());
+ ModList.setLoadedMods(modContainers.values().stream().toList());
+ var stateList = ModStateManager.getStates(ModLoadingPhase.GATHER);
+ var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
for (IModLoadingState mls : stateList) {
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
}
progress.complete();
}
- public void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
- var stateList = stateManager.getStates(ModLoadingPhase.LOAD);
- var progress = StartupMessageManager.addProgressBar("Mod Loading", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
+ public static void loadMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
+ var stateList = ModStateManager.getStates(ModLoadingPhase.LOAD);
+ var progress = StartupMessageManager.addProgressBar("Mod Loading", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
for (IModLoadingState mls : stateList) {
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
}
progress.complete();
}
- public void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
- var stateList = stateManager.getStates(ModLoadingPhase.COMPLETE);
- var progress = StartupMessageManager.addProgressBar("Mod Complete", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(modList)).sum());
+ public static void finishMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) {
+ var stateList = ModStateManager.getStates(ModLoadingPhase.COMPLETE);
+ var progress = StartupMessageManager.addProgressBar("Mod Complete", stateList.stream().mapToInt(mls -> mls.size().getAsInt()).sum());
for (IModLoadingState mls : stateList) {
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
}
var modBusGroups = Set.of(
- modList.getLoadedMods().stream()
+ ModList.getLoadedMods().stream()
.map(ModContainer::getModBusGroup)
.filter(Objects::nonNull)
.toArray(BusGroup[]::new)
@@ -245,11 +223,11 @@ public class ModLoader {
}
parallelExecutor.execute(BusGroup.DEFAULT::trim);
- statusConsumer.accept("Mod loading complete - %d mods loaded".formatted(this.modList.size()));
+ STATUS_CONSUMER.accept("Mod loading complete - %d mods loaded".formatted(ModList.size()));
progress.complete();
}
- private void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, final ProgressMeter progressBar) {
+ private static void dispatchAndHandleError(IModLoadingState state, ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor, final Runnable ticker, final ProgressMeter progressBar) {
if (!isLoadingStateValid()) {
LOGGER.error("Cowardly refusing to process mod state change request from {}", state);
return;
@@ -257,25 +235,25 @@ public class ModLoader {
progressBar.label(progressBar.name() + " working");
syncExecutor.drive(ticker);
- var inlineRunnable = state.inlineRunnable().orElse(null);
+ var inlineRunnable = state.inlineRunnable();
if (inlineRunnable != null) handleInlineTransition(inlineRunnable, state, syncExecutor, ticker);
- var transition = state.buildTransition(syncExecutor, parallelExecutor, progressBar).orElse(null);
+ var transition = state.buildTransition(syncExecutor, parallelExecutor, progressBar);
if (transition != null) waitForTransition(state, syncExecutor, ticker, transition);
- completedStates.add(state);
+ COMPLETED_STATES.add(state);
}
- private void handleInlineTransition(final Consumer transition, final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker) {
+ private static void handleInlineTransition(final Runnable transition, final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker) {
var pb = StartupMessageManager.addProgressBar("State transition " + state.name() + " running", 0);
syncExecutor.drive(ticker);
- transition.accept(this.modList);
+ transition.run();
syncExecutor.drive(ticker);
pb.complete();
syncExecutor.drive(ticker);
}
- private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture transition) {
+ private static void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture transition) {
while (!transition.isDone()) {
syncExecutor.drive(ticker);
}
@@ -289,7 +267,7 @@ public class ModLoader {
.anyMatch(obj -> !(obj instanceof ModLoadingException));
if (hasNotModLoadingEx) {
LOGGER.fatal("Encountered non-modloading exceptions!", e);
- statusConsumer.accept("ERROR DURING MOD LOADING");
+ STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
throw e;
}
@@ -298,12 +276,12 @@ public class ModLoader {
.map(ModLoadingException.class::cast)
.toList();
LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
- statusConsumer.accept("ERROR DURING MOD LOADING");
+ STATUS_CONSUMER.accept("ERROR DURING MOD LOADING");
throw new LoadingFailedException(modLoadingExceptions);
}
}
- private List buildMods(final IModFile modFile) {
+ private static List buildMods(final IModFile modFile) {
final Map modInfoMap = new HashMap<>();
for (var mod : modFile.getModFileInfo().getMods())
modInfoMap.put(mod.getModId(), mod);
@@ -333,14 +311,14 @@ public class ModLoader {
missingMods.removeAll(modIds);
LOGGER.fatal(LOADING, "The following mods are missing, but have classes in the jar: {}", missingMods);
- loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
+ LOADING_EXCEPTIONS.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
}
// remove errored mod containers
return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).toList();
}
- private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map modInfoMap,
+ private static ModContainer buildModContainerFromTOML(final IModFile modFile, final Map modInfoMap,
final String modId, final IModLanguageProvider.IModLanguageLoader languageLoader
) {
try {
@@ -352,7 +330,7 @@ public class ModLoader {
return languageLoader.loadMod(info, modFile.getScanResult(), FMLLoader.getGameLayer());
} catch (ModLoadingException mle) {
// exceptions are caught and added to the error list for later handling
- loadingExceptions.add(mle);
+ LOADING_EXCEPTIONS.add(mle);
// return an errored container instance here, because we tried and failed building a container.
return new ErroredModContainer();
}
@@ -366,15 +344,8 @@ public class ModLoader {
return loadingStateValid;
}
- /** @deprecated Use {@link #hasCompletedState(IModLoadingState)} instead */
- @Deprecated(forRemoval = true)
- public boolean hasCompletedState(final String stateName) {
- IModLoadingState state = stateManager.findState(stateName);
- return completedStates.contains(state);
- }
-
- public boolean hasCompletedState(IModLoadingState state) {
- return completedStates.contains(state);
+ public static boolean hasCompletedState(IModLoadingState state) {
+ return COMPLETED_STATES.contains(state);
}
public static void runEventGenerator(Function generator) {
@@ -382,7 +353,7 @@ public class ModLoader {
LOGGER.error("Cowardly refusing to send event generator to a broken mod state");
return;
}
- for (var mod : ModList.get().getLoadedMods())
+ for (var mod : ModList.getLoadedMods())
mod.acceptEvent(generator.apply(mod));
}
@@ -391,7 +362,7 @@ public class ModLoader {
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
return;
}
- for (var mod : ModList.get().getLoadedMods())
+ for (var mod : ModList.getLoadedMods())
mod.acceptEvent(e);
}
@@ -400,7 +371,7 @@ public class ModLoader {
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
return e;
}
- for (var mod : ModList.get().getLoadedMods())
+ for (var mod : ModList.getLoadedMods())
mod.acceptEvent(e);
return e;
}
@@ -408,8 +379,8 @@ public class ModLoader {
@SuppressWarnings("removal")
public static void postEventWrapContainerInModOrder(T event) {
postEventWithWrapInModOrder(event,
- (mc, e) -> ModLoadingContext.get().setActiveContainer(mc),
- (mc, e) -> ModLoadingContext.get().setActiveContainer(null)
+ (mc, _) -> ModLoadingContext.get().setActiveContainer(mc),
+ (_, _) -> ModLoadingContext.get().setActiveContainer(null)
);
}
@@ -418,19 +389,19 @@ public class ModLoader {
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
return;
}
- for (var mod : ModList.get().getLoadedMods()) {
+ for (var mod : ModList.getLoadedMods()) {
pre.accept(mod, e);
mod.acceptEvent(e);
post.accept(mod, e);
}
}
- public List getWarnings() {
- return ImmutableList.copyOf(this.loadingWarnings);
+ public static List getWarnings() {
+ return List.copyOf(LOADING_WARNINGS);
}
- public void addWarning(ModLoadingWarning warning) {
- this.loadingWarnings.add(warning);
+ public static void addWarning(ModLoadingWarning warning) {
+ LOADING_WARNINGS.add(warning);
}
private static boolean runningDataGen = false;
diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingContext.java b/fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingContext.java
index 32d2ed044a..48090d9bee 100644
--- a/fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingContext.java
+++ b/fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingContext.java
@@ -32,24 +32,11 @@ public class ModLoadingContext {
return context.get();
}
- /**
- * @deprecated Going to be moved to ForgeHooks for Internal use.
- */
- @Deprecated(forRemoval = true, since="1.21.1")
- public void setActiveContainer(final ModContainer container) {
+ void setActiveContainer(final ModContainer container) {
this.activeContainer = container;
this.languageExtension = container == null ? null : container.contextExtension.get();
}
- /**
- * Going to be moved to ForgeHooks for Internal use.
- * @deprecated Override/Use {@link ModLoadingContext#getContainer()}
- */
- @Deprecated(forRemoval = true, since="1.21.1")
- public ModContainer getActiveContainer() {
- return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
- }
-
/**
* @deprecated Going to be moved to ForgeHooks for Internal use.
*/
@@ -58,11 +45,10 @@ public class ModLoadingContext {
return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
}
- /**
- * @return {@link ModLoadingContext#getActiveContainer()} by default.
- */
public ModContainer getContainer() {
- return getActiveContainer();
+ return activeContainer == null
+ ? ModList.getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!"))
+ : activeContainer;
}
/**
@@ -114,8 +100,7 @@ public class ModLoadingContext {
}
public void registerConfig(ModConfig.Type type, IConfigSpec spec) {
- if (spec.isEmpty())
- {
+ if (spec.isEmpty()) {
// This handles the case where a mod tries to register a config, without any options configured inside it.
LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getContainer().getModId());
return;
@@ -125,8 +110,7 @@ public class ModLoadingContext {
}
public void registerConfig(ModConfig.Type type, IConfigSpec spec, String fileName) {
- if (spec.isEmpty())
- {
+ if (spec.isEmpty()) {
// This handles the case where a mod tries to register a config, without any options configured inside it.
LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getContainer().getModId(), fileName);
return;
@@ -135,7 +119,6 @@ public class ModLoadingContext {
getContainer().addConfig(new ModConfig(type, spec, getContainer(), fileName));
}
-
@SuppressWarnings("unchecked")
public T extension() {
return (T)languageExtension;
diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingState.java b/fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingState.java
index 7a2ab79a3d..bba28748b7 100644
--- a/fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingState.java
+++ b/fmlcore/src/main/java/net/minecraftforge/fml/ModLoadingState.java
@@ -6,14 +6,14 @@
package net.minecraftforge.fml;
import net.minecraftforge.fml.loading.progress.ProgressMeter;
+import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
-import java.util.Objects;
-import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
-import java.util.function.Consumer;
import java.util.function.Function;
-import java.util.function.ToIntFunction;
+import java.util.function.IntSupplier;
+import java.util.function.Supplier;
/**
* Implementation of the {@link IModLoadingState} interface.
@@ -25,27 +25,26 @@ import java.util.function.ToIntFunction;
* @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
* @param transition optional state transition information
*/
+@NullMarked
public record ModLoadingState(
String name,
String previous,
- Function