From cfbbcc87770da532f9bed9e3e4b824200970c34c Mon Sep 17 00:00:00 2001 From: Johann Bernhardt Date: Sun, 7 Nov 2021 16:36:54 +0100 Subject: Unify build script draft --- src/main/java/gregtech/GT_Mod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 8980483f47..302696138e 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -78,7 +78,7 @@ import static gregtech.api.enums.GT_Values.MOD_ID_FR; @SuppressWarnings("ALL") @Mod(modid = "gregtech", name = "GregTech", version = "MC1710", useMetadata = false, dependencies = " required-after:IC2;" + - " required-after:" + StructureLib.MOD_ID + ";" + + " required-after:structurelib;" + " after:dreamcraft;" + " after:Forestry;" + " after:PFAAGeologica;" + -- cgit From e81f26a67380b87858e8e024cc6e85a36c9fdab5 Mon Sep 17 00:00:00 2001 From: Johann Bernhardt Date: Wed, 1 Dec 2021 15:49:02 +0100 Subject: Remove special characters --- src/main/java/gregtech/common/GT_UndergroundOil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/gregtech/common/GT_UndergroundOil.java b/src/main/java/gregtech/common/GT_UndergroundOil.java index b725b4bbb6..95151537ae 100644 --- a/src/main/java/gregtech/common/GT_UndergroundOil.java +++ b/src/main/java/gregtech/common/GT_UndergroundOil.java @@ -110,7 +110,7 @@ public class GT_UndergroundOil { int dimensionId = world.provider.dimensionId; GT_UO_Dimension dimension = GT_Mod.gregtechproxy.mUndergroundOil.GetDimension(dimensionId); if (dimension == null) return null; - // prepare RNG 🙏 🙏 🙏 + // prepare RNG final XSTR tVeinRNG = new XSTR(world.getSeed() + dimensionId * 2L + (chunkX >> 3) + 8267L * (chunkZ >> 3)); final XSTR tChunkRNG = new XSTR(world.getSeed() + dimensionId * 2L + chunkX + 8267L * chunkZ); GT_UO_Fluid uoFluid = dimension.getRandomFluid(tVeinRNG); -- cgit From fa30559d4b8cf1985e2e4a59bb4b6e9921400e75 Mon Sep 17 00:00:00 2001 From: Johann Bernhardt Date: Wed, 1 Dec 2021 17:18:45 +0100 Subject: Add version replacement --- gradle.properties | 4 ++-- src/main/java/gregtech/GT_Mod.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src/main/java') diff --git a/gradle.properties b/gradle.properties index 7de46d9a1d..afdcba0467 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,10 +26,10 @@ developmentEnvironmentUserName = "Developer" # The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's # version in @Mod([...], version = VERSION, [...]) # Leave these properties empty to skip individual token replacements -replaceGradleTokenInFile = +replaceGradleTokenInFile = GT_Mod.java gradleTokenModId = gradleTokenModName = -gradleTokenVersion = +gradleTokenVersion = GRADLETOKEN_VERSION gradleTokenGroupName = # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise you can diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 9ad5b3634f..963ff77ee5 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -77,7 +77,7 @@ import static gregtech.api.enums.GT_Values.MOD_ID_AE; import static gregtech.api.enums.GT_Values.MOD_ID_FR; @SuppressWarnings("ALL") -@Mod(modid = "gregtech", name = "GregTech", version = "MC1710", useMetadata = false, +@Mod(modid = "gregtech", name = "GregTech5-Unofficial", version = "GRADLETOKEN_VERSION", useMetadata = false, dependencies = " required-after:IC2;" + " required-after:structurelib;" + " after:dreamcraft;" + @@ -115,6 +115,8 @@ import static gregtech.api.enums.GT_Values.MOD_ID_FR; " after:TConstruct;" + " after:Translocator;") public class GT_Mod implements IGT_Mod { + + @Deprecated // Keep for use in BaseMetaTileEntity public static final int VERSION = 509, SUBVERSION = 40; public static final int TOTAL_VERSION = calculateTotalGTVersion(VERSION, SUBVERSION); public static final int REQUIRED_IC2 = 624; -- cgit From ab797fa78ef209f918f557a2bbfaab5a7767e1bf Mon Sep 17 00:00:00 2001 From: Johann Bernhardt Date: Wed, 1 Dec 2021 18:17:17 +0100 Subject: Revert version tag automation --- src/main/java/gregtech/GT_Mod.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java') diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 963ff77ee5..3d07b67c87 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -77,7 +77,7 @@ import static gregtech.api.enums.GT_Values.MOD_ID_AE; import static gregtech.api.enums.GT_Values.MOD_ID_FR; @SuppressWarnings("ALL") -@Mod(modid = "gregtech", name = "GregTech5-Unofficial", version = "GRADLETOKEN_VERSION", useMetadata = false, +@Mod(modid = "gregtech", name = "GregTech5-Unofficial", version = "MC1710", useMetadata = false, dependencies = " required-after:IC2;" + " required-after:structurelib;" + " after:dreamcraft;" + @@ -118,6 +118,7 @@ public class GT_Mod implements IGT_Mod { @Deprecated // Keep for use in BaseMetaTileEntity public static final int VERSION = 509, SUBVERSION = 40; + @Deprecated public static final int TOTAL_VERSION = calculateTotalGTVersion(VERSION, SUBVERSION); public static final int REQUIRED_IC2 = 624; @Mod.Instance("gregtech") -- cgit