diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core')
| -rw-r--r-- | src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java | 24 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/CORE.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 2 |
3 files changed, 17 insertions, 12 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java index 464b825177..eac8757b0e 100644 --- a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java +++ b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java @@ -39,16 +39,18 @@ public class LoginEventHandler { if (!this.localPlayerRef.worldObj.isRemote){ PlayerCache.appendParamChanges(this.localPlayersName, this.localPlayersUUID.toString()); - if (!Utils.isModUpToDate()){ - Utils.LOG_INFO("[GT++] You're not using the latest recommended version of GT++, consider updating."); - if (!CORE.MASTER_VERSION.toLowerCase().equals("offline")) { - Utils.LOG_INFO("Latest version is: "+CORE.MASTER_VERSION); + if (CORE.configSwitches.enableUpdateChecker){ + if (!Utils.isModUpToDate()){ + Utils.LOG_INFO("[GT++] You're not using the latest recommended version of GT++, consider updating."); + if (!CORE.MASTER_VERSION.toLowerCase().equals("offline")) { + Utils.LOG_INFO("Latest version is: "+CORE.MASTER_VERSION); + } + Utils.LOG_INFO("You currently have: "+CORE.VERSION); + ShortTimer(this.localPlayerRef, 20); + } + else { + Utils.LOG_INFO("You're using the latest recommended version of GT++."); } - Utils.LOG_INFO("You currently have: "+CORE.VERSION); - ShortTimer(this.localPlayerRef, 20); - } - else { - Utils.LOG_INFO("You're using the latest recommended version of GT++."); } } @@ -100,7 +102,7 @@ public class LoginEventHandler { } } - + //Handles notifying the player about a version update. public Timer ShortTimer(EntityPlayer localPlayer, final int seconds) { Timer timer; @@ -108,7 +110,7 @@ public class LoginEventHandler { timer.schedule(new NotifyPlayer(localPlayer), seconds * 1000); return timer; } - + //Timer Task for notifying the player. class NotifyPlayer extends TimerTask { final EntityPlayer toMessage; diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index a45db02fe6..37f9894e05 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -95,6 +95,9 @@ public class CORE { public static class configSwitches { + //Updates + public static boolean enableUpdateChecker = true; + //Debug public static boolean disableEnderIOIntegration = false; public static boolean MACHINE_INFO = true; diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java index bd6f2833cc..dc4791ca0f 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -779,7 +779,7 @@ public class RECIPES_Machines { GregtechItemList.SimpleDustWasher.get(1)); } - if (CORE.configSwitches.enableMachine_Pollution){ + if (CORE.configSwitches.enableMachine_Pollution && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ RecipeUtils.addShapedGregtechRecipe( "plateCarbon", "plateCarbon", "plateCarbon", "dustCarbon", "dustCarbon", "dustCarbon", |