Fix version replacement (#330)

Former-commit-id: bea94a8da777b597948d2598e922403967738193

4 files changed, 5 insertions, 28 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/API_REFERENCE.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/API_REFERENCE.java
deleted file mode 100644
index fea78559ad..0000000000
--- a/src/main/java/com/github/bartimaeusnek/bartworks/API/API_REFERENCE.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following
- * conditions: The above copyright notice and this permission notice shall be included in all copies or substantial
- * portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-package com.github.bartimaeusnek.bartworks.API;
-
-public final class API_REFERENCE {
-
-    public static final String VERSION = "GRADLETOKEN_VERSION";
-}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
index e5253d3dfb..d656e9840f 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
@@ -82,7 +82,7 @@ import gregtech.api.util.GT_Recipe;
 @Mod(
         modid = MainMod.MOD_ID,
         name = MainMod.NAME,
-        version = MainMod.VERSION,
+        version = API_REFERENCE.VERSION,
         dependencies = "required-after:IC2; " + "required-after:gregtech; "
                 + "after:berriespp; "
                 + "after:tectech; "
@@ -95,7 +95,6 @@ import gregtech.api.util.GT_Recipe;
 public final class MainMod {
 
     public static final String NAME = "BartWorks";
-    public static final String VERSION = "GRADLETOKEN_VERSION";
     public static final String MOD_ID = Mods.Names.BART_WORKS;
     public static final String APIVERSION = "11";
     public static final Logger LOGGER = LogManager.getLogger(MainMod.NAME);
@@ -115,11 +114,6 @@ public final class MainMod {
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent preinit) {
-
-        if (!(API_REFERENCE.VERSION.equals(MainMod.APIVERSION))) {
-            MainMod.LOGGER.error("Something has loaded an old API. Please contact the Mod authors to update!");
-        }
-
         if (GTPlusPlus.isModLoaded()) {
             MainMod.LOGGER.info("Found GT++, continuing");
         }
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java
index d29299f13c..7f3239a7eb 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java
@@ -25,7 +25,7 @@ import org.apache.commons.io.input.ReaderInputStream;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.github.bartimaeusnek.bartworks.MainMod;
+import com.github.bartimaeusnek.bartworks.API.API_REFERENCE;
 import com.github.bartimaeusnek.crossmod.GTpp.loader.RadioHatchCompat;
 import com.github.bartimaeusnek.crossmod.galacticraft.GalacticraftProxy;
 import com.github.bartimaeusnek.crossmod.tectech.TecTechResearchLoader;
@@ -51,7 +51,7 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent;
 public class BartWorksCrossmod {
 
     public static final String NAME = "BartWorks Mod Additions";
-    public static final String VERSION = MainMod.VERSION;
+    public static final String VERSION = API_REFERENCE.VERSION;
     public static final String MOD_ID = "bartworkscrossmod";
     public static final Logger LOGGER = LogManager.getLogger(BartWorksCrossmod.NAME);
 
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java b/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java
index 45ba78c82c..e770166668 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java
@@ -10,6 +10,7 @@ import java.util.HashMap;
 
 import net.minecraftforge.common.config.Property;
 
+import com.github.bartimaeusnek.bartworks.API.API_REFERENCE;
 import com.github.bartimaeusnek.bartworks.MainMod;
 import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
 
@@ -36,7 +37,7 @@ import vexatos.tgregworks.reference.Config;
 public class MaterialsInjector {
 
     public static final String NAME = "BartWorks Mod Additions - TGregworks Container";
-    public static final String VERSION = MainMod.VERSION;
+    public static final String VERSION = API_REFERENCE.VERSION;
     public static final String MOD_ID = "bartworkscrossmodtgregworkscontainer";
 
     private static HashMap<Materials, Property> configProps;