aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2024-05-24 19:59:18 +0100
committerRaven Szewczyk <git@eigenraven.me>2024-05-24 19:59:18 +0100
commitaa393be7cebd20545249282312c04e67ca70e881 (patch)
tree046f147721e5dbbed5ab089bb1a3b3ec7828ad85 /src/main/java
parent6d1b2216464d4dad449ac6fcfec476832224a55e (diff)
downloadGT5-Unofficial-aa393be7cebd20545249282312c04e67ca70e881.tar.gz
GT5-Unofficial-aa393be7cebd20545249282312c04e67ca70e881.tar.bz2
GT5-Unofficial-aa393be7cebd20545249282312c04e67ca70e881.zip
Fix gradle token references in addons
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/bloodasp/galacticgreg/GalacticGreg.java9
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java3
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java4
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/package-info.java5
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java4
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java4
-rw-r--r--src/main/java/com/github/technus/tectech/Reference.java3
-rw-r--r--src/main/java/gtPlusPlus/core/lib/CORE.java5
8 files changed, 20 insertions, 17 deletions
diff --git a/src/main/java/bloodasp/galacticgreg/GalacticGreg.java b/src/main/java/bloodasp/galacticgreg/GalacticGreg.java
index 3becbcb92b..4ca2eb36f6 100644
--- a/src/main/java/bloodasp/galacticgreg/GalacticGreg.java
+++ b/src/main/java/bloodasp/galacticgreg/GalacticGreg.java
@@ -19,6 +19,7 @@ import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
+import gregtech.GT_Version;
import gregtech.api.GregTech_API;
import gregtech.api.world.GT_Worldgen;
@@ -37,7 +38,7 @@ public class GalacticGreg {
public static final String MODID = "galacticgreg";
public static final String MODNAME = "Galactic Greg";
- public static final String VERSION = "GRADLETOKEN_VERSION";
+ public static final String VERSION = GT_Version.VERSION;
public static final LogHelper Logger = new LogHelper(NICE_MODID);
public static ProfilingStorage Profiler = new ProfilingStorage();
@@ -49,7 +50,7 @@ public class GalacticGreg {
/**
* Preload phase. Read config values and set various features.. n stuff...
- *
+ *
* @param aEvent
*/
@EventHandler
@@ -77,7 +78,7 @@ public class GalacticGreg {
* Postload phase. Mods can add their custom definition to our api in their own PreLoad or Init-phase Once
* GalacticGregRegistry.InitRegistry() is called, no changes are accepted. (Well you can with reflection, but on a
* "normal" way it's not possible)
- *
+ *
* @param aEvent
*/
@EventHandler
@@ -126,7 +127,7 @@ public class GalacticGreg {
/**
* If oregen profiling is enabled, then register the command
- *
+ *
* @param pEvent
*/
@EventHandler
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java
index 4bef7a0cad..f23eb8144a 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/package-info.java
@@ -10,8 +10,9 @@
* 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.
*/
-@API(owner = Mods.Names.BART_WORKS, apiVersion = API_REFERENCE.VERSION, provides = "bartworks API")
+@API(owner = Mods.Names.BART_WORKS, apiVersion = GT_Version.VERSION, provides = "bartworks API")
package com.github.bartimaeusnek.bartworks.API;
import cpw.mods.fml.common.API;
+import gregtech.GT_Version;
import gregtech.api.enums.Mods;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
index 818b67d6fc..cf2643a850 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java
@@ -22,6 +22,7 @@ import static gregtech.api.enums.Mods.GTPlusPlus;
import java.io.IOException;
import java.util.Map;
+import gregtech.GT_Version;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge;
@@ -30,7 +31,6 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import com.github.bartimaeusnek.bartworks.API.API_ConfigValues;
-import com.github.bartimaeusnek.bartworks.API.API_REFERENCE;
import com.github.bartimaeusnek.bartworks.API.BioObjectAdder;
import com.github.bartimaeusnek.bartworks.API.BioVatLogicAdder;
import com.github.bartimaeusnek.bartworks.API.SideReference;
@@ -80,7 +80,7 @@ import gregtech.api.recipe.RecipeMap;
import gregtech.api.recipe.check.CheckRecipeResultRegistry;
import gregtech.api.util.GT_OreDictUnificator;
-@Mod(modid = MainMod.MOD_ID, name = MainMod.NAME, version = API_REFERENCE.VERSION, dependencies = """
+@Mod(modid = MainMod.MOD_ID, name = MainMod.NAME, version = GT_Version.VERSION, dependencies = """
required-after:IC2;\
required-after:gregtech;\
after:berriespp;\
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/util/package-info.java b/src/main/java/com/github/bartimaeusnek/bartworks/util/package-info.java
index 8d9d539524..fdb0d3a06a 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/util/package-info.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/util/package-info.java
@@ -10,10 +10,9 @@
* 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.
*/
-@API(owner = Mods.Names.BART_WORKS, apiVersion = API_REFERENCE.VERSION, provides = "bartworks util")
+@API(owner = Mods.Names.BART_WORKS, apiVersion = GT_Version.VERSION, provides = "bartworks util")
package com.github.bartimaeusnek.bartworks.util;
-import com.github.bartimaeusnek.bartworks.API.API_REFERENCE;
-
import cpw.mods.fml.common.API;
+import gregtech.GT_Version;
import gregtech.api.enums.Mods;
diff --git a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java
index b1264fb9af..aaabb629ab 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java
@@ -19,13 +19,13 @@ import static gregtech.api.enums.Mods.TecTech;
import java.io.StringReader;
+import gregtech.GT_Version;
import net.minecraft.util.StringTranslate;
import org.apache.commons.io.input.ReaderInputStream;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-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;
@@ -53,7 +53,7 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent;
public class BartWorksCrossmod {
public static final String NAME = "BartWorks Mod Additions";
- public static final String VERSION = API_REFERENCE.VERSION;
+ public static final String VERSION = GT_Version.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 2959bc2fb2..c222a6d787 100644
--- a/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java
+++ b/src/main/java/com/github/bartimaeusnek/crossmod/tgregworks/MaterialsInjector.java
@@ -2,9 +2,9 @@ package com.github.bartimaeusnek.crossmod.tgregworks;
import static gregtech.api.enums.Mods.TinkersGregworks;
+import gregtech.GT_Version;
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;
@@ -29,7 +29,7 @@ import vexatos.tgregworks.reference.Config;
public class MaterialsInjector {
public static final String NAME = "BartWorks Mod Additions - TGregworks Container";
- public static final String VERSION = API_REFERENCE.VERSION;
+ public static final String VERSION = GT_Version.VERSION;
public static final String MOD_ID = "bartworkscrossmodtgregworkscontainer";
@Mod.EventHandler
diff --git a/src/main/java/com/github/technus/tectech/Reference.java b/src/main/java/com/github/technus/tectech/Reference.java
index 928a4a4e0f..35b0a2f407 100644
--- a/src/main/java/com/github/technus/tectech/Reference.java
+++ b/src/main/java/com/github/technus/tectech/Reference.java
@@ -1,12 +1,13 @@
package com.github.technus.tectech;
+import gregtech.GT_Version;
import gregtech.api.enums.Mods;
public final class Reference {
public static final String MODID = Mods.Names.TECTECH;
public static final String NAME = "TecTech - Tec Technology!";
- public static final String VERSION = Tags.VERSION;
+ public static final String VERSION = GT_Version.VERSION;
public static final String COLLECTIONNAME = "TecTech";
public static final String CLIENTSIDE = "com.github.technus.tectech.proxy.ClientProxy";
public static final String SERVERSIDE = "com.github.technus.tectech.proxy.CommonProxy";
diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java
index 9f39f1f369..9108fafc22 100644
--- a/src/main/java/gtPlusPlus/core/lib/CORE.java
+++ b/src/main/java/gtPlusPlus/core/lib/CORE.java
@@ -10,6 +10,7 @@ import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Supplier;
+import gregtech.GT_Version;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
@@ -40,7 +41,7 @@ public class CORE {
// Mod Variables
public static final String name = "GT++";
- public static final String VERSION = "GRADLETOKEN_VERSION";
+ public static final String VERSION = GT_Version.VERSION;
// Tweakables
public static int EVERGLADES_ID = 227;
@@ -202,7 +203,7 @@ public class CORE {
public static class Everglades {
public static final String NAME = "GT++ Toxic Everglades";
- public static final String VERSION = "GRADLETOKEN_VERSION";
+ public static final String VERSION = GT_Version.VERSION;
}
public static final void crash() {