diff options
| author | huajijam <strhuaji@gmail.com> | 2019-03-18 20:48:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-18 20:48:01 +0800 |
| commit | 847934e3f0ba597f6d43d5fafdd0e6192d007585 (patch) | |
| tree | c82b2784655f51b48c430d0cdd22e70b0523aa11 /src/Java/gtPlusPlus/core/util/Utils.java | |
| parent | 40d7e5da9f5b84213e2c3e4596fdc69b94bd523e (diff) | |
| parent | f93d9fb323a5aee2ed5c30320998f26bc177d707 (diff) | |
| download | GT5-Unofficial-847934e3f0ba597f6d43d5fafdd0e6192d007585.tar.gz GT5-Unofficial-847934e3f0ba597f6d43d5fafdd0e6192d007585.tar.bz2 GT5-Unofficial-847934e3f0ba597f6d43d5fafdd0e6192d007585.zip | |
just fix more bugs
just fix more bugs
Diffstat (limited to 'src/Java/gtPlusPlus/core/util/Utils.java')
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/Utils.java | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java index eef768e799..d032384638 100644 --- a/src/Java/gtPlusPlus/core/util/Utils.java +++ b/src/Java/gtPlusPlus/core/util/Utils.java @@ -46,6 +46,7 @@ import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -791,7 +792,13 @@ public class Utils { if (GT_Mod.VERSION == 509){ Class<GT_Mod> clazz; try { - clazz = (Class<GT_Mod>) Class.forName("gregtech.GT_Mod"); + + if (LoadedMods.BeyondRealityCore) { + //Safely assume it's Beyond Reality running .28-pre (If it's not, tough shit really?) + return new Pair<Integer, Integer>(9, 28); + } + + clazz = (Class<GT_Mod>) ReflectionUtils.getClass("gregtech.GT_Mod"); Field mSubversion = ReflectionUtils.getField(clazz, "SUBVERSION"); if (mSubversion != null){ int mSub = 0; @@ -802,7 +809,9 @@ public class Utils { } } } - catch (Throwable t){} + catch (Throwable t){ + + } } //5.08.33 else if (GT_Mod.VERSION == 508){ @@ -939,4 +948,16 @@ public class Utils { return aOther; } + public static long getMillisSince(long aStartTime, long aCurrentTime) { + return (aCurrentTime - aStartTime); + } + + public static long getSecondsFromMillis(long aMillis) { + return (aMillis/1000); + } + + public static long getTicksFromSeconds(long aSeconds) { + return (aSeconds*20); + } + } |