diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..a8e787c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,26 @@ +# default +* text eol=auto + +# git +.gitattributes text eol=lf +.gitignore text eol=lf + +# sources +*.java text eol=lf + +# resources +*.lang text eol=lf +*.cfg text eol=lf +*.info text eol=lf +*.mcmeta text eol=lf +*.md text eol=lf +*.xml text eol=lf + +# scripts +*.bat text eol=crlf +*.gradle text eol=lf +*.properties text eol=lf + +# binaries +*.png binary +*.jar binary diff --git a/.gitignore b/.gitignore index 2b0c776..418781a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,23 @@ -/.settings/ -/bin/ -/release/ -/build/ -/.gradle/ -/run/ -.project -.classpath \ No newline at end of file +## gradle +/.gradle +/build + +## ForgeGradle +/run + +## eclipse +/.settings +/.metadata +/.classpath +/.project +/bin + +## intellij +/out +/.idea +/*.iml +/*.ipr +/*.iws + +## custom +/release diff --git a/build.gradle b/build.gradle index a2e1689..f3790d4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,56 +1,51 @@ buildscript { repositories { mavenCentral() + jcenter() maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" + name = 'forge' + url = 'http://files.minecraftforge.net/maven' } maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" + name = 'sonatype' + url = 'https://oss.sonatype.org/content/repositories/snapshots/' } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' + classpath 'com.matthewprenger:CurseGradle:1.0-SNAPSHOT' } } -apply plugin: "forge" +apply plugin: 'net.minecraftforge.gradle.forge' +apply plugin: 'com.matthewprenger.cursegradle' -// define the properties file -ext.configFile = file "build.properties" - -configFile.withReader { - // read config. it shall from now on be referenced as simply config or as project.config - def prop = new Properties() - prop.load(it) - project.ext.config = new ConfigSlurper().parse prop -} +compileJava.options.encoding = 'UTF-8' repositories { ivy { - url "http://bspk.rs/MC" - layout "pattern", { - artifact "[module]/deobf/%5B${config.minecraft_version}%5D[module]-deobf-[revision].[ext]" - artifact "[module]/deobf/[${config.minecraft_version}][module]-deobf-[revision].[ext]" + url 'http://bspk.rs/MC' + layout 'pattern', { + artifact "[module]/%5B${project.minecraft_version}%5D[module]-universal-[revision].[ext]" + artifact "[module]/[${project.minecraft_version}][module]-universal-[revision].[ext]" } } } dependencies { - compile name: 'bspkrsCore', version: "${config.bscore_version}", ext: 'jar' + deobfCompile name: 'bspkrsCore', version: project.bscore_version, ext: 'jar' } -group = config.group_name -version = "${config.minecraft_version}.${config.mod_version}" -archivesBaseName = "[${config.minecraft_version}]${config.mod_id}" +group = project.group_name +version = project.mod_version +archivesBaseName = "[${project.minecraft_version}]${project.mod_id}" minecraft { - version = config.minecraft_version + "-" + config.forge_version // grab latest forge - mappings = config.mappings_version - runDir = "run" - replace '@MOD_VERSION@', "${config.minecraft_version}.${config.mod_version}" - replace '@BSCORE_VERSION@', config.bscore_version + version = project.minecraft_version + '-' + project.forge_version // grab latest forge + mappings = project.mappings_version + runDir = 'run' + replace '@MOD_VERSION@', project.mod_version + replace '@BSCORE_VERSION@', project.bscore_version } processResources { @@ -62,15 +57,13 @@ processResources { // replaces expand ([ 'mod_version': version, - 'bscore_version': config.bscore_version, - 'bscore_jar': "[${config.minecraft_version}]bspkrsCore-universal-${config.bscore_version}.jar", - 'pattern': "\\\\[.+?\\\\](\\\\w+).*?([\\\\d\\\\.]+)[-\\\\w]*\\\\.[^\\\\d]+", - 'forge_version': config.forge_version, - 'minecraft_version': config.minecraft_version + 'bscore_version': project.bscore_version, + 'forge_version': project.forge_version, + 'minecraft_version': project.minecraft_version ]) } - // copy everything else, thats we didnt do before + // copy everything else that we didnt do before from(sourceSets.main.resources.srcDirs) { exclude '**/*.info' exclude '**/*.properties' @@ -79,22 +72,33 @@ processResources { // change the name of my obfuscated jar jar { - appendix = config.appendix + appendix = project.appendix } -// add a source jar -task sourceJar(type: Jar) { - from sourceSets.main.allSource +sourceJar { appendix = 'src' -} - -// because the normal output has been made to be obfuscated -task deobfJar(type: Jar) { - from sourceSets.main.output - appendix = 'deobf' + classifier = '' } artifacts { archives sourceJar - archives deobfJar +} + +if (project.hasProperty('api_key_curse') && project.hasProperty('extra_curse_id')) { + tasks.curseforge.dependsOn signJars + curseforge { + apiKey = project.api_key_curse + + project { + id = project.extra_curse_id + changelog = '' + releaseType = project.hasProperty('extra_curse_releasetype') ? project.extra_curse_releasetype : 'release' + + addArtifact sourceJar + + relations { + requiredLibrary 'bspkrscore' + } + } + } } diff --git a/build.properties b/build.properties deleted file mode 100644 index 434dee7..0000000 --- a/build.properties +++ /dev/null @@ -1,8 +0,0 @@ -minecraft_version=1.8 -forge_version=11.14.1.1334 -mappings_version=stable_16 -mod_version=r01 -bscore_version=7.01 -mod_id=WorldStateCheckpoints -group_name=worldstatecheckpoints -appendix=client \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..aee41f4 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,11 @@ +minecraft_version=1.8.9 +forge_version=11.15.0.1719 +mappings_version=snapshot_20160125 +mod_version=1.8.9.1 +bscore_version=1.8.9.1 +mod_id=WorldStateCheckpoints +group_name=worldstatecheckpoints +appendix=client + +# extra_curse_id=-1 +# extra_curse_releasetype=release diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b761216..9411448 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 678d9d8..3d44099 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 02 15:54:47 CDT 2014 +#Tue Feb 02 20:51:18 CET 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip diff --git a/gradlew b/gradlew index 91a7e26..9d82f78 100644 --- a/gradlew +++ b/gradlew @@ -42,11 +42,6 @@ case "`uname`" in ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do fi done SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -114,6 +109,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` diff --git a/src/main/java/bspkrs/worldstatecheckpoints/CheckpointManager.java b/src/main/java/bspkrs/worldstatecheckpoints/CheckpointManager.java index 20afb20..36f15c9 100644 --- a/src/main/java/bspkrs/worldstatecheckpoints/CheckpointManager.java +++ b/src/main/java/bspkrs/worldstatecheckpoints/CheckpointManager.java @@ -184,7 +184,7 @@ public void unloadWorldSilent() { world = null; mc.theWorld.sendQuittingDisconnectingPacket(); - mc.loadWorld((WorldClient) null); + mc.loadWorld(null); waitForIntegratedServerShutdown(); } @@ -195,7 +195,7 @@ public void unloadWorld(String msg) { world = null; mc.theWorld.sendQuittingDisconnectingPacket(); - mc.loadWorld((WorldClient) null, msg); + mc.loadWorld(null, msg); waitForIntegratedServerShutdown(); } diff --git a/src/main/java/bspkrs/worldstatecheckpoints/CommandWSC.java b/src/main/java/bspkrs/worldstatecheckpoints/CommandWSC.java index 5a54ea6..530a0b5 100644 --- a/src/main/java/bspkrs/worldstatecheckpoints/CommandWSC.java +++ b/src/main/java/bspkrs/worldstatecheckpoints/CommandWSC.java @@ -78,28 +78,21 @@ else if (args[0].equalsIgnoreCase("load")) } } - throw new WrongUsageException("commands.wsc.usage", new Object[0]); + throw new WrongUsageException("commands.wsc.usage"); } - @SuppressWarnings("rawtypes") @Override - public List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) + public List addTabCompletionOptions(ICommandSender sender, String[] args, BlockPos pos) { if (args.length == 1) - return getListOfStringsMatchingLastWord(args, new String[] { "load", "save" }); + return getListOfStringsMatchingLastWord(args, "load", "save"); else if ((args.length == 2) && args[0].equalsIgnoreCase("load")) { List list = new ArrayList(); list.addAll(WSCSettings.cpm.getCheckpointNames(true)); list.addAll(WSCSettings.cpm.getCheckpointNames(false)); - return getListOfStringsMatchingLastWord(args, list.toArray(new String[] {})); + return getListOfStringsMatchingLastWord(args, list.toArray(new String[list.size()])); } return new ArrayList(); } - - @Override - public int compareTo(Object o) - { - return 0; - } } diff --git a/src/main/java/bspkrs/worldstatecheckpoints/GuiReplaceCheckpointChangeName.java b/src/main/java/bspkrs/worldstatecheckpoints/GuiReplaceCheckpointChangeName.java index 3210806..cfb16ac 100644 --- a/src/main/java/bspkrs/worldstatecheckpoints/GuiReplaceCheckpointChangeName.java +++ b/src/main/java/bspkrs/worldstatecheckpoints/GuiReplaceCheckpointChangeName.java @@ -93,7 +93,7 @@ protected void keyTyped(char c, int i) save.enabled = (edit.getText().trim().length() > 0) && !edit.getText().trim().endsWith("."); if (c == '\r') - actionPerformed((GuiButton) buttonList.get(1)); + actionPerformed(buttonList.get(1)); } @Override diff --git a/src/main/java/bspkrs/worldstatecheckpoints/GuiSaveCheckpoint.java b/src/main/java/bspkrs/worldstatecheckpoints/GuiSaveCheckpoint.java index 190a1a9..3f1317b 100644 --- a/src/main/java/bspkrs/worldstatecheckpoints/GuiSaveCheckpoint.java +++ b/src/main/java/bspkrs/worldstatecheckpoints/GuiSaveCheckpoint.java @@ -84,7 +84,7 @@ protected void keyTyped(char c, int i) save.enabled = (edit.getText().trim().length() > 0) && !edit.getText().trim().endsWith("."); if (c == '\r') - actionPerformed((GuiButton) buttonList.get(1)); + actionPerformed(buttonList.get(1)); } @Override diff --git a/src/main/java/bspkrs/worldstatecheckpoints/fml/ClientProxy.java b/src/main/java/bspkrs/worldstatecheckpoints/fml/ClientProxy.java index 550b45f..7f53c90 100644 --- a/src/main/java/bspkrs/worldstatecheckpoints/fml/ClientProxy.java +++ b/src/main/java/bspkrs/worldstatecheckpoints/fml/ClientProxy.java @@ -1,17 +1,14 @@ package bspkrs.worldstatecheckpoints.fml; import bspkrs.worldstatecheckpoints.WSCSettings; -import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.common.MinecraftForge; public class ClientProxy extends CommonProxy { @Override public void registerClientTicker() { - if (!WSCClientTicker.isRegistered()) - FMLCommonHandler.instance().bus().register(new WSCClientTicker()); - if (!WSCKeyHandler.isRegistered(WSCSettings.bindKey)) - FMLCommonHandler.instance().bus().register(new WSCKeyHandler(WSCSettings.bindKey, false)); + MinecraftForge.EVENT_BUS.register(new WSCKeyHandler(WSCSettings.bindKey, false)); } } diff --git a/src/main/java/bspkrs/worldstatecheckpoints/fml/WSCClientTicker.java b/src/main/java/bspkrs/worldstatecheckpoints/fml/WSCClientTicker.java deleted file mode 100644 index b1db6d1..0000000 --- a/src/main/java/bspkrs/worldstatecheckpoints/fml/WSCClientTicker.java +++ /dev/null @@ -1,47 +0,0 @@ -package bspkrs.worldstatecheckpoints.fml; - -import net.minecraft.util.ChatComponentText; -import bspkrs.bspkrscore.fml.bspkrsCoreMod; -import bspkrs.worldstatecheckpoints.WSCSettings; -import net.minecraftforge.fml.common.FMLCommonHandler; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -@SideOnly(Side.CLIENT) -public class WSCClientTicker -{ - private static boolean isRegistered = false; - - public WSCClientTicker() - { - isRegistered = true; - } - - @SubscribeEvent - public void onTick(ClientTickEvent event) - { - if (event.phase.equals(Phase.START)) - return; - - boolean keepTicking = !(WSCSettings.mc != null && WSCSettings.mc.thePlayer != null && WSCSettings.mc.theWorld != null); - - if (!keepTicking && isRegistered) - { - if (bspkrsCoreMod.instance.allowUpdateCheck && WorldStateCheckpointsMod.instance.versionChecker != null) - if (!WorldStateCheckpointsMod.instance.versionChecker.isCurrentVersion()) - for (String msg : WorldStateCheckpointsMod.instance.versionChecker.getInGameMessage()) - WSCSettings.mc.thePlayer.addChatMessage(new ChatComponentText(msg)); - - FMLCommonHandler.instance().bus().unregister(this); - isRegistered = false; - } - } - - public static boolean isRegistered() - { - return isRegistered; - } -} diff --git a/src/main/java/bspkrs/worldstatecheckpoints/fml/WSCServerTicker.java b/src/main/java/bspkrs/worldstatecheckpoints/fml/WSCServerTicker.java index 8be83a5..c63fc20 100644 --- a/src/main/java/bspkrs/worldstatecheckpoints/fml/WSCServerTicker.java +++ b/src/main/java/bspkrs/worldstatecheckpoints/fml/WSCServerTicker.java @@ -1,7 +1,7 @@ package bspkrs.worldstatecheckpoints.fml; import bspkrs.worldstatecheckpoints.WSCSettings; -import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent.Phase; import net.minecraftforge.fml.common.gameevent.TickEvent.ServerTickEvent; @@ -12,7 +12,7 @@ public class WSCServerTicker public WSCServerTicker() { - FMLCommonHandler.instance().bus().register(this); + MinecraftForge.EVENT_BUS.register(this); isRegistered = true; } @@ -28,7 +28,7 @@ public void onTick(ServerTickEvent event) public void unregister() { - FMLCommonHandler.instance().bus().unregister(this); + MinecraftForge.EVENT_BUS.unregister(this); isRegistered = false; } diff --git a/src/main/java/bspkrs/worldstatecheckpoints/fml/WorldStateCheckpointsMod.java b/src/main/java/bspkrs/worldstatecheckpoints/fml/WorldStateCheckpointsMod.java index 2983414..dddf174 100644 --- a/src/main/java/bspkrs/worldstatecheckpoints/fml/WorldStateCheckpointsMod.java +++ b/src/main/java/bspkrs/worldstatecheckpoints/fml/WorldStateCheckpointsMod.java @@ -1,8 +1,6 @@ package bspkrs.worldstatecheckpoints.fml; -import bspkrs.bspkrscore.fml.bspkrsCoreMod; import bspkrs.util.Const; -import bspkrs.util.ModVersionChecker; import bspkrs.worldstatecheckpoints.CommandWSC; import bspkrs.worldstatecheckpoints.WSCSettings; import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; @@ -20,13 +18,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @Mod(modid = Reference.MODID, name = Reference.NAME, version = "@MOD_VERSION@", dependencies = "required-after:bspkrsCore@[@BSCORE_VERSION@,)", - useMetadata = true, guiFactory = Reference.GUI_FACTORY) + useMetadata = true, guiFactory = Reference.GUI_FACTORY, updateJSON = Const.VERSION_URL_BASE + Reference.MODID + Const.VERSION_URL_EXT) public class WorldStateCheckpointsMod { - public ModVersionChecker versionChecker; - private String versionURL = Const.VERSION_URL + "/Minecraft/" + Const.MCVERSION + "/worldStateCheckpointsForge.version"; - private String mcfTopic = "http://www.minecraftforum.net/topic/1548243-"; - @SidedProxy(clientSide = Reference.PROXY_CLIENT, serverSide = Reference.PROXY_COMMON) public static CommonProxy proxy; @@ -41,7 +35,6 @@ public class WorldStateCheckpointsMod @EventHandler public void preInit(FMLPreInitializationEvent event) { - metadata = event.getModMetadata(); WSCSettings.initConfig(event.getSuggestedConfigurationFile()); } @@ -49,12 +42,6 @@ public void preInit(FMLPreInitializationEvent event) public void init(FMLInitializationEvent event) { proxy.registerClientTicker(); - - if (bspkrsCoreMod.instance.allowUpdateCheck) - { - versionChecker = new ModVersionChecker(metadata.name, metadata.version, versionURL, mcfTopic); - versionChecker.checkVersionWithLogging(); - } } @EventHandler