Expose a couple of mods.toml properties properly. Half-implemented

override namespace - still needs to be reviewed and determined how this
might work in detail.

Signed-off-by: cpw <[email protected]>
This commit is contained in:
cpw committed 2019-01-20 21:26:31 -05:00
1 parent eefc4d3e84
commit 040cc4bf16
7 files changed
+45 -13

No files matched your search

@@ -29,7 +29,6 @@ import java.util.Map;
import java.util.Optional;
import java.util.function.Consumer;
import java.util.function.Supplier;
import java.util.regex.Pattern;
/**
* The container that wraps around mods in the system.
@@ -46,8 +45,8 @@ import java.util.regex.Pattern;
public abstract class ModContainer
{
private static final Pattern VALID_MODIDS = Pattern.compile("^[a-z0-9_-]{3,64}$");
protected final String modId;
protected final String namespace;
protected final IModInfo modInfo;
protected ModLoadingStage modLoadingStage;
protected final Map<ModLoadingStage, Consumer<LifecycleEventProvider.LifecycleEvent>> triggerMap;
@@ -55,9 +54,9 @@ public abstract class ModContainer
public ModContainer(IModInfo info)
{
if (!VALID_MODIDS.matcher(info.getModId()).matches())
throw new IllegalArgumentException("Invalid modid " + info.getModId() + "! Mod ids need to be lowercase alphanumeric characters or '-'/'_' and need to be between 3 and 64 chars long.");
this.modId = info.getModId();
// TODO: Currently not reading namespace from configuration..
this.namespace = this.modId;
this.modInfo = info;
this.triggerMap = new HashMap<>();
this.modLoadingStage = ModLoadingStage.CONSTRUCT;
@@ -74,9 +73,9 @@ public abstract class ModContainer
/**
* @return the resource prefix for the mod
*/
public final String getPrefix()
public final String getNamespace()
{
return modId;
return namespace;
}
/**
@@ -276,7 +276,7 @@ public class ForgeRegistry<V extends IForgeRegistryEntry<V>> implements IForgeRe
int add(int id, V value)
{
final String owner = ModThreadContext.get().getActiveContainer().getPrefix();
final String owner = ModThreadContext.get().getActiveContainer().getNamespace();
return add(id, value, owner);
}
@@ -56,7 +56,6 @@ import org.apache.logging.log4j.MarkerManager;
import javax.annotation.Nullable;
import java.lang.reflect.Field;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
@@ -821,7 +820,7 @@ public class GameData
int index = name.lastIndexOf(':');
String oldPrefix = index == -1 ? "" : name.substring(0, index).toLowerCase(Locale.ROOT);
name = index == -1 ? name : name.substring(index + 1);
String prefix = ModThreadContext.get().getActiveContainer().getPrefix();
String prefix = ModThreadContext.get().getActiveContainer().getNamespace();
if (!oldPrefix.equals(prefix) && oldPrefix.length() > 0)
{
LogManager.getLogger().info("Potentially Dangerous alternative prefix `{}` for name `{}`, expected `{}`. This could be a intended override, but in most cases indicates a broken mod.", oldPrefix, name, prefix);