Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 08:48:34 +01:00
Code Issues Projects Releases Wiki Activity

refactor has forgotten u apparently but u fix now

Browse source
This commit is contained in:
Shadows_of_Fire 2018-05-10 05:40:16 -04:00
parent 505cdc349f
commit 0a1d976ce0
3 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java
View file

@ -10,15 +10,14 @@
package de.ellpeck.actuallyadditions.mod.update; package de.ellpeck.actuallyadditions.mod.update;
import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import de.ellpeck.actuallyadditions.mod.util.Util;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.URL; import java.net.URL;
import java.util.Properties; import java.util.Properties;
import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
import de.ellpeck.actuallyadditions.mod.util.Util;
public class ThreadUpdateChecker extends Thread{ public class ThreadUpdateChecker extends Thread{
public ThreadUpdateChecker(){ public ThreadUpdateChecker(){
@ -75,7 +74,7 @@ public class ThreadUpdateChecker extends Thread{
if(!UpdateChecker.checkFailed){ if(!UpdateChecker.checkFailed){
if(UpdateChecker.needsUpdateNotify){ if(UpdateChecker.needsUpdateNotify){
ActuallyAdditions.LOGGER.info("There is an Update for "+ActuallyAdditions.NAME+" available!"); ActuallyAdditions.LOGGER.info("There is an Update for "+ActuallyAdditions.NAME+" available!");
ActuallyAdditions.LOGGER.info("Current Version: "+ModUtil.VERSION+", newest Version: "+UpdateChecker.updateVersionString+"!"); ActuallyAdditions.LOGGER.info("Current Version: "+ActuallyAdditions.VERSION+", newest Version: "+UpdateChecker.updateVersionString+"!");
ActuallyAdditions.LOGGER.info("View the Changelog at "+UpdateChecker.CHANGELOG_LINK); ActuallyAdditions.LOGGER.info("View the Changelog at "+UpdateChecker.CHANGELOG_LINK);
ActuallyAdditions.LOGGER.info("Download at "+UpdateChecker.DOWNLOAD_LINK); ActuallyAdditions.LOGGER.info("Download at "+UpdateChecker.DOWNLOAD_LINK);
} }

3
src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java
View file

@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.update;
import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import de.ellpeck.actuallyadditions.mod.util.StringUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil;
import de.ellpeck.actuallyadditions.mod.util.Util; import de.ellpeck.actuallyadditions.mod.util.Util;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
@ -59,7 +58,7 @@ public class UpdateChecker{
} }
else if(UpdateChecker.needsUpdateNotify){ else if(UpdateChecker.needsUpdateNotify){
player.sendMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localize("info."+ActuallyAdditions.MODID+".update.generic"))); player.sendMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localize("info."+ActuallyAdditions.MODID+".update.generic")));
player.sendMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localizeFormatted("info."+ActuallyAdditions.MODID+".update.versionCompare", ModUtil.VERSION, UpdateChecker.updateVersionString))); player.sendMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localizeFormatted("info."+ActuallyAdditions.MODID+".update.versionCompare", ActuallyAdditions.VERSION, UpdateChecker.updateVersionString)));
player.sendMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localizeFormatted("info."+ActuallyAdditions.MODID+".update.buttons", UpdateChecker.CHANGELOG_LINK, UpdateChecker.DOWNLOAD_LINK))); player.sendMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localizeFormatted("info."+ActuallyAdditions.MODID+".update.buttons", UpdateChecker.CHANGELOG_LINK, UpdateChecker.DOWNLOAD_LINK)));
notified = true; notified = true;
} }

11
src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java
View file

@ -10,6 +10,9 @@
package de.ellpeck.actuallyadditions.mod.util; package de.ellpeck.actuallyadditions.mod.util;
import java.util.Locale;
import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
import net.minecraft.item.EnumRarity; import net.minecraft.item.EnumRarity;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.common.util.EnumHelper;
@ -17,10 +20,6 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import java.util.Locale;
import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
public final class Util{ public final class Util{
public static final int WILDCARD = OreDictionary.WILDCARD_VALUE; public static final int WILDCARD = OreDictionary.WILDCARD_VALUE;
@ -40,7 +39,7 @@ public final class Util{
} }
public static boolean isDevVersion(){ public static boolean isDevVersion(){
return ModUtil.VERSION.equals("@VERSION@"); return ActuallyAdditions.VERSION.equals("@VERSION@");
} }
public static boolean isClient(){ public static boolean isClient(){
@ -48,7 +47,7 @@ public final class Util{
} }
private static String[] splitVersion(){ private static String[] splitVersion(){
return ModUtil.VERSION.split("-"); return ActuallyAdditions.VERSION.split("-");
} }
public static String getMcVersion(){ public static String getMcVersion(){