diff --git a/build.gradle.kts b/build.gradle.kts index c931c0d..36097d3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,10 +28,6 @@ minecraft_fp { tokens { tokenClass = "internal.Tags" - modid = "MODID" - name = "MODNAME" - version = "VERSION" - rootPkg = "GROUPNAME" } publish { diff --git a/src/main/java/com/falsepattern/chunk/internal/ChunkAPI.java b/src/main/java/com/falsepattern/chunk/internal/ChunkAPI.java index fbdbd1e..59669dc 100644 --- a/src/main/java/com/falsepattern/chunk/internal/ChunkAPI.java +++ b/src/main/java/com/falsepattern/chunk/internal/ChunkAPI.java @@ -37,9 +37,9 @@ import com.falsepattern.chunk.internal.vanilla.SkylightManager; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; -@Mod(modid = Tags.MODID, - version = Tags.VERSION, - name = Tags.MODNAME, +@Mod(modid = Tags.MOD_ID, + version = Tags.MOD_VERSION, + name = Tags.MOD_NAME, acceptedMinecraftVersions = "[1.7.10]", dependencies = "required-after:falsepatternlib@[1.2.0,);") public class ChunkAPI { diff --git a/src/main/java/com/falsepattern/chunk/internal/Common.java b/src/main/java/com/falsepattern/chunk/internal/Common.java index 81617c7..2732d97 100644 --- a/src/main/java/com/falsepattern/chunk/internal/Common.java +++ b/src/main/java/com/falsepattern/chunk/internal/Common.java @@ -33,7 +33,7 @@ import org.apache.logging.log4j.Logger; * Non-minecraft stuff to avoid accidental classloading in spaghetti code */ public class Common { - public static final Logger LOG = LogManager.getLogger(Tags.MODID); + public static final Logger LOG = LogManager.getLogger(Tags.MOD_ID); public static final int SUBCHUNKS_PER_CHUNK = 16; public static final int BLOCKS_PER_SUBCHUNK = 16 * 16 * 16; diff --git a/src/main/java/com/falsepattern/chunk/internal/DataRegistryImpl.java b/src/main/java/com/falsepattern/chunk/internal/DataRegistryImpl.java index ba524e6..1481d72 100644 --- a/src/main/java/com/falsepattern/chunk/internal/DataRegistryImpl.java +++ b/src/main/java/com/falsepattern/chunk/internal/DataRegistryImpl.java @@ -383,7 +383,7 @@ public class DataRegistryImpl { public static void writeLevelDat(NBTTagCompound tag) { val managers = new NBTTagCompound(); tag.setTag("managers", managers); - tag.setString("version", Tags.VERSION); + tag.setString("version", Tags.MOD_VERSION); for (val manager: NBTManagers.entrySet()) { val name = manager.getKey(); if (name.startsWith("minecraft:")) diff --git a/src/main/java/com/falsepattern/chunk/internal/core/ChunkAPICoreModContainer.java b/src/main/java/com/falsepattern/chunk/internal/core/ChunkAPICoreModContainer.java index 4a12276..5deb59e 100644 --- a/src/main/java/com/falsepattern/chunk/internal/core/ChunkAPICoreModContainer.java +++ b/src/main/java/com/falsepattern/chunk/internal/core/ChunkAPICoreModContainer.java @@ -50,11 +50,11 @@ public class ChunkAPICoreModContainer extends DummyModContainer implements World private static ModMetadata createMetadata() { val meta = new ModMetadata(); - meta.modId = Tags.MODID + "core"; - meta.name = Tags.MODNAME + " Core"; - meta.version = Tags.VERSION; - meta.dependencies.add(new DefaultArtifactVersion(Tags.MODID, Tags.VERSION)); - meta.parent = Tags.MODID; + meta.modId = Tags.MOD_ID + "core"; + meta.name = Tags.MOD_NAME + " Core"; + meta.version = Tags.MOD_VERSION; + meta.dependencies.add(new DefaultArtifactVersion(Tags.MOD_ID, Tags.MOD_VERSION)); + meta.parent = Tags.MOD_ID; return meta; } diff --git a/src/main/java/com/falsepattern/chunk/internal/core/CoreLoadingPlugin.java b/src/main/java/com/falsepattern/chunk/internal/core/CoreLoadingPlugin.java index 24ce44f..fe82f81 100644 --- a/src/main/java/com/falsepattern/chunk/internal/core/CoreLoadingPlugin.java +++ b/src/main/java/com/falsepattern/chunk/internal/core/CoreLoadingPlugin.java @@ -32,7 +32,7 @@ import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import java.util.Map; -@IFMLLoadingPlugin.TransformerExclusions(Tags.GROUPNAME + ".internal.core") +@IFMLLoadingPlugin.TransformerExclusions(Tags.ROOT_PKG + ".internal.core") public class CoreLoadingPlugin implements IFMLLoadingPlugin { @Override public String[] getASMTransformerClass() { @@ -41,7 +41,7 @@ public class CoreLoadingPlugin implements IFMLLoadingPlugin { @Override public String getModContainerClass() { - return Tags.GROUPNAME + ".internal.core.ChunkAPICoreModContainer"; + return Tags.ROOT_PKG + ".internal.core.ChunkAPICoreModContainer"; } @Override diff --git a/src/main/java/com/falsepattern/chunk/internal/mixin/plugin/MixinPlugin.java b/src/main/java/com/falsepattern/chunk/internal/mixin/plugin/MixinPlugin.java index 920d9ae..b4ed779 100644 --- a/src/main/java/com/falsepattern/chunk/internal/mixin/plugin/MixinPlugin.java +++ b/src/main/java/com/falsepattern/chunk/internal/mixin/plugin/MixinPlugin.java @@ -35,7 +35,7 @@ import org.apache.logging.log4j.Logger; public class MixinPlugin implements IMixinPlugin { @Getter - private final Logger logger = IMixinPlugin.createLogger(Tags.MODNAME); + private final Logger logger = IMixinPlugin.createLogger(Tags.MOD_NAME); @Override public ITargetedMod[] getTargetedModEnumValues() {