mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-08 19:04:46 +00:00
Merge pull request #245 from Thorfusion/remove-updatenotifier
remove update notifier
This commit is contained in:
7 files changed
+4
-182
No files matched your search
+2
-2
@@ -4,5 +4,5 @@ FMP_version=1.2.0.345
|
||||
CCLIB_version=1.1.3.141
|
||||
NEI_version=1.0.5.120
|
||||
CCC_version=1.0.7.48
|
||||
mod_version=9.10.47
|
||||
alt_version=9, 10, 47
|
||||
mod_version=9.10.48
|
||||
alt_version=9, 10, 48
|
||||
@@ -60,12 +60,6 @@ public class ClientTickHandler
|
||||
{
|
||||
MekanismClient.ticksPassed++;
|
||||
|
||||
if(!hasNotified && mc.theWorld != null && Mekanism.latestVersionNumber != null && Mekanism.recentNews != null)
|
||||
{
|
||||
MekanismUtils.checkForUpdates(mc.thePlayer);
|
||||
hasNotified = true;
|
||||
}
|
||||
|
||||
if(!Mekanism.proxy.isPaused())
|
||||
{
|
||||
for(Iterator<IClientTicker> iter = tickingSet.iterator(); iter.hasNext();)
|
||||
|
||||
@@ -28,32 +28,17 @@ public class GuiCredits extends GuiScreen
|
||||
drawDefaultBackground();
|
||||
drawCenteredString(fontRendererObj, EnumColor.DARK_BLUE + "Mekanism" + EnumColor.GREY + " by aidancbrady", width / 2, (height / 4 - 60) + 20, 0xffffff);
|
||||
|
||||
if(Mekanism.latestVersionNumber != null && !Mekanism.latestVersionNumber.equals("null"))
|
||||
{
|
||||
writeText(EnumColor.INDIGO + "Mekanism " + (Mekanism.versionNumber.comparedState(Version.get(Mekanism.latestVersionNumber)) == -1 ? EnumColor.DARK_RED : EnumColor.GREY) + Mekanism.versionNumber, 36);
|
||||
}
|
||||
else {
|
||||
writeText(EnumColor.INDIGO + "Mekanism " + EnumColor.GREY + Mekanism.versionNumber, 36);
|
||||
}
|
||||
writeText(EnumColor.INDIGO + "Mekanism " + EnumColor.GREY + Mekanism.versionNumber, 36);
|
||||
|
||||
int size = 36;
|
||||
|
||||
for(IModule module : Mekanism.modulesLoaded)
|
||||
{
|
||||
size += 9;
|
||||
writeText(EnumColor.INDIGO + "Mekanism" + module.getName() + EnumColor.GREY + " " + module.getVersion(), size);
|
||||
|
||||
if(Mekanism.latestVersionNumber != null && !Mekanism.latestVersionNumber.equals("null"))
|
||||
{
|
||||
writeText(EnumColor.INDIGO + "Mekanism" + module.getName() + (module.getVersion().comparedState(Version.get(Mekanism.latestVersionNumber)) == -1 ? EnumColor.DARK_RED : EnumColor.GREY) + " " + module.getVersion(), size);
|
||||
}
|
||||
else {
|
||||
writeText(EnumColor.INDIGO + "Mekanism" + module.getName() + EnumColor.GREY + " " + module.getVersion(), size);
|
||||
}
|
||||
}
|
||||
|
||||
writeText(EnumColor.GREY + "Newest version: " + Mekanism.latestVersionNumber, size+9);
|
||||
writeText(EnumColor.GREY + "Recent news: " + EnumColor.DARK_BLUE + (!Mekanism.recentNews.contains("null") ? Mekanism.recentNews : "couldn't access."), size+18);
|
||||
|
||||
super.drawScreen(mouseX, mouseY, partialTick);
|
||||
}
|
||||
}
|
||||
@@ -49,9 +49,7 @@ public class CommandMekanism extends CommandBase
|
||||
{
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------"));
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Version: " + EnumColor.DARK_GREY + Mekanism.versionNumber));
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Latest Version: " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber));
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Code, textures, and ideas by aidancbrady"));
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.GREY + " *Recent News: " + EnumColor.INDIGO + Mekanism.recentNews));
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------"));
|
||||
}
|
||||
else if(params.length >= 1)
|
||||
@@ -64,8 +62,6 @@ public class CommandMekanism extends CommandBase
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " /mk" + EnumColor.GREY + " -- displays the main page."));
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " /mk help" + EnumColor.GREY + " -- displays this guide."));
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " /mk version" + EnumColor.GREY + " -- displays the version number."));
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " /mk latest" + EnumColor.GREY + " -- displays the latest version number."));
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " /mk news" + EnumColor.GREY + " -- displays most recent recent news."));
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " /mk debug" + EnumColor.GREY + " -- toggles Mekanism's debug mode."));
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " /mk teleporter" + EnumColor.GREY + " -- provides information on teleporters."));
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------"));
|
||||
@@ -81,27 +77,6 @@ public class CommandMekanism extends CommandBase
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------"));
|
||||
}
|
||||
}
|
||||
else if(params[0].equalsIgnoreCase("version"))
|
||||
{
|
||||
if(!MekanismUtils.checkForUpdates((EntityPlayer)sender))
|
||||
{
|
||||
if(general.updateNotifications || Mekanism.latestVersionNumber == null || Mekanism.recentNews == null || Mekanism.latestVersionNumber.equals("null"))
|
||||
{
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Minecraft is in offline mode, could not check for updates."));
|
||||
}
|
||||
else {
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Your client is up to date."));
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(params[0].equalsIgnoreCase("news"))
|
||||
{
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Most recent news: " + EnumColor.INDIGO + Mekanism.recentNews));
|
||||
}
|
||||
else if(params[0].equalsIgnoreCase("latest"))
|
||||
{
|
||||
sender.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " The latest version for mekanism is " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber + EnumColor.GREY + "."));
|
||||
}
|
||||
else if(params[0].equalsIgnoreCase("teleporter"))
|
||||
{
|
||||
if(params.length == 2)
|
||||
|
||||
@@ -1489,10 +1489,6 @@ public class Mekanism
|
||||
//Initialization notification
|
||||
logger.info("Version " + versionNumber + " initializing...");
|
||||
|
||||
//Get data from server
|
||||
if (general.updateNotifications)
|
||||
new ThreadGetData();
|
||||
|
||||
//Register with ForgeChunkManager
|
||||
ForgeChunkManager.setForcedChunkLoadingCallback(this, new ChunkManager());
|
||||
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
package mekanism.common;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import cpw.mods.fml.relauncher.FMLInjectionData;
|
||||
|
||||
/**
|
||||
* Thread used to retrieve data from the Mekanism server.
|
||||
* @author AidanBrady
|
||||
*
|
||||
*/
|
||||
public class ThreadGetData extends Thread
|
||||
{
|
||||
public ThreadGetData()
|
||||
{
|
||||
setDaemon(true);
|
||||
start();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run()
|
||||
{
|
||||
List<String> ret = MekanismUtils.getHTML("https://raw.githubusercontent.com/Thorfusion/Mekanism-1.7.10-Community-Edition/1.7.10/Mekanism.txt");
|
||||
|
||||
Mekanism.latestVersionNumber = "null";
|
||||
Mekanism.recentNews = "null";
|
||||
|
||||
for(String s : ret)
|
||||
{
|
||||
String[] text = s.split(":");
|
||||
|
||||
if(text.length == 3 && !text[0].contains("UTF-8") && !text[0].contains("HTML") && !text[0].contains("http"))
|
||||
{
|
||||
if(Version.get(text[0]) != null && Version.get(text[0]).equals(Version.get((String)FMLInjectionData.data()[4])))
|
||||
{
|
||||
Mekanism.latestVersionNumber = text[1];
|
||||
Mekanism.recentNews = text[2];
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -103,62 +103,6 @@ public final class MekanismUtils
|
||||
|
||||
public static final Map<String, Class<?>> classesFound = new HashMap<String, Class<?>>();
|
||||
|
||||
/**
|
||||
* Checks for a new version of Mekanism.
|
||||
*/
|
||||
public static boolean checkForUpdates(EntityPlayer entityplayer)
|
||||
{
|
||||
try {
|
||||
if(general.updateNotifications && Mekanism.latestVersionNumber != null && Mekanism.recentNews != null)
|
||||
{
|
||||
if(!Mekanism.latestVersionNumber.equals("null"))
|
||||
{
|
||||
ArrayList<IModule> list = new ArrayList<IModule>();
|
||||
|
||||
for(IModule module : Mekanism.modulesLoaded)
|
||||
{
|
||||
if(Version.get(Mekanism.latestVersionNumber).comparedState(module.getVersion()) == 1)
|
||||
{
|
||||
list.add(module);
|
||||
}
|
||||
}
|
||||
|
||||
if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == 1 || !list.isEmpty())
|
||||
{
|
||||
entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " -------------"));
|
||||
entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " " + LangUtils.localize("update.outdated") + "."));
|
||||
|
||||
if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == 1)
|
||||
{
|
||||
entityplayer.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " Mekanism: " + EnumColor.DARK_RED + Mekanism.versionNumber));
|
||||
}
|
||||
|
||||
for(IModule module : list)
|
||||
{
|
||||
entityplayer.addChatMessage(new ChatComponentText(EnumColor.INDIGO + " Mekanism" + module.getName() + ": " + EnumColor.DARK_RED + module.getVersion()));
|
||||
}
|
||||
|
||||
entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " " + LangUtils.localize("update.consider") + " " + EnumColor.DARK_GREY + Mekanism.latestVersionNumber));
|
||||
entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " " + LangUtils.localize("update.newFeatures") + ": " + EnumColor.INDIGO + Mekanism.recentNews));
|
||||
entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + " " + LangUtils.localize("update.visit") + " " + EnumColor.DARK_GREY + "https://thorfusion.com" + EnumColor.GREY + " " + LangUtils.localize("update.toDownload") + "."));
|
||||
entityplayer.addChatMessage(new ChatComponentText(EnumColor.GREY + "------------- " + EnumColor.DARK_BLUE + "[=======]" + EnumColor.GREY + " -------------"));
|
||||
return true;
|
||||
}
|
||||
else if(Version.get(Mekanism.latestVersionNumber).comparedState(Mekanism.versionNumber) == -1)
|
||||
{
|
||||
entityplayer.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism] " + EnumColor.GREY + LangUtils.localize("update.devBuild") + " " + EnumColor.DARK_GREY + Mekanism.versionNumber));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
else {
|
||||
Mekanism.logger.info("Minecraft is in offline mode, could not check for updates.");
|
||||
}
|
||||
}
|
||||
} catch(Exception e) {}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns one line of HTML from the url.
|
||||
@@ -205,33 +149,6 @@ public final class MekanismUtils
|
||||
return builder.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if the mod doesn't need an update.
|
||||
* @return if mod doesn't need an update
|
||||
*/
|
||||
public static boolean noUpdates()
|
||||
{
|
||||
if(Mekanism.latestVersionNumber.contains("null"))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
if(Mekanism.versionNumber.comparedState(Version.get(Mekanism.latestVersionNumber)) == -1)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
for(IModule module : Mekanism.modulesLoaded)
|
||||
{
|
||||
if(module.getVersion().comparedState(Version.get(Mekanism.latestVersionNumber)) == -1)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a fake explosion at the declared player, with only sounds and effects. No damage is caused to either blocks or the player.
|
||||
* @param entityplayer - player to explode
|
||||
|
||||
Reference in new issue
Block a user