diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-12-01 20:55:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-01 20:55:03 +0100 |
| commit | 8f32d27b91d8bec76d23f092274527d88d9466c3 (patch) | |
| tree | 5a1123859f3ae1d55ff13370dac4a9faec4c7449 /src/main/java | |
| parent | 9ca59dd58d42e5cb6d6f47c3318e3f443d72e646 (diff) | |
| parent | 68b8ca682803b88cb3abb01ace2415bfd68f006e (diff) | |
| download | GT5-Unofficial-8f32d27b91d8bec76d23f092274527d88d9466c3.tar.gz GT5-Unofficial-8f32d27b91d8bec76d23f092274527d88d9466c3.tar.bz2 GT5-Unofficial-8f32d27b91d8bec76d23f092274527d88d9466c3.zip | |
Merge pull request #720 from GTNewHorizons/unify-build-script
Unify build script draft
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/gregtech/GT_Mod.java | 7 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/GT_UndergroundOil.java | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 872055bcb8..3d07b67c87 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -77,9 +77,9 @@ 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 = "MC1710", useMetadata = false, dependencies = " required-after:IC2;" + - " required-after:" + StructureLib.MOD_ID + ";" + + " required-after:structurelib;" + " after:dreamcraft;" + " after:Forestry;" + " after:PFAAGeologica;" + @@ -115,7 +115,10 @@ 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; + @Deprecated public static final int TOTAL_VERSION = calculateTotalGTVersion(VERSION, SUBVERSION); public static final int REQUIRED_IC2 = 624; @Mod.Instance("gregtech") 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); |