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..6cb683a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,24 @@ -/.settings/ -/bin/ -/release/ -/build/ -/.gradle/ -/run/ -.project -.classpath \ No newline at end of file +## gradle +/.gradle +/build + +## ForgeGradle +/run + +## eclipse +/.settings +/.metadata +/.classpath +/.project +/*.launch +/bin + +## intellij +/out +/.idea +/*.iml +/*.ipr +/*.iws + +## custom +/release diff --git a/build.gradle b/build.gradle index b334201..5423c67 100644 --- a/build.gradle +++ b/build.gradle @@ -1,59 +1,68 @@ 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.2-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 { + maven { + name = 'zebra' + url = 'https://nexus.3zebras.eu/repository/maven-public/' + } 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 group: 'bspkrs', name: 'bspkrsCore', version: project.bscore_version, ext: 'jar' } -group = config.group_name -version = config.mod_version -archivesBaseName = "[${config.minecraft_version}]${config.mod_id}" +group = project.group_name +version = project.mod_version +archivesBaseName = "${project.mod_id}_mc${project.minecraft_version}-${project.minecraft_maxversion}_v" minecraft { - version = config.minecraft_version + "-" + config.forge_version // grab latest forge - mappings = config.mappings_version - runDir = "run" - replace '@MOD_VERSION@', version - replace '@BSCORE_VERSION@', config.bscore_version + version = project.minecraft_version + '-' + project.forge_version // + '-' + project.minecraft_version // grab latest forge + mappings = project.mappings_version + runDir = 'run' + replace '@MOD_VERSION@', project.mod_version + replace '@BSCORE_VERSION@', project.bscore_version + replace '@MIN_MC_VERSION@', project.minecraft_version + replace '@MAX_MC_VERSION@', project.minecraft_maxversion } processResources { + // force replacements if input changes + inputs.property 'mod_version', version + inputs.property 'bscore_version', project.bscore_version + inputs.property 'forge_version', project.forge_version + inputs.property 'forge_versionlimit', project.forge_versionlimit + inputs.property 'minecraft_version', project.minecraft_version + inputs.property 'minecraft_maxversion', project.minecraft_maxversion + // replace stuff in the files we want. from(sourceSets.main.resources.srcDirs) { include '**/*.info' @@ -62,15 +71,15 @@ 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, + 'forge_versionlimit': project.forge_versionlimit, + 'minecraft_version': project.minecraft_version, + 'minecraft_maxversion': project.minecraft_maxversion ]) } - // copy everything else, thats we didnt do before + // copy everything else that we didn't do before from(sourceSets.main.resources.srcDirs) { exclude '**/*.info' exclude '**/*.properties' @@ -79,22 +88,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 -} \ No newline at end of file +} + +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 e8c456f..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=1.24 -bscore_version=7.01 -mod_id=DirectionHUD -group_name=directionhud -appendix=client \ No newline at end of file diff --git a/change.log b/change.log index 8285ead..771711c 100644 --- a/change.log +++ b/change.log @@ -1,3 +1,7 @@ +1.26.1 - 23-Jul-2016 +- Updated to Minecraft 1.9-1.10.2 +1.26 - 03-Apr-2016 +- Updated to Minecraft 1.9 1.24 - 06-Mar-2015 - 1.8 update 1.24 - 11-Nov-2014 diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..6cae2eb --- /dev/null +++ b/gradle.properties @@ -0,0 +1,10 @@ +minecraft_version=1.9 +minecraft_maxversion=1.10.2 +forge_version=12.16.1.1887 +forge_versionlimit=12.18.2 +mappings_version=stable_24 +mod_version=1.26.1 +bscore_version=7.1.1 +mod_id=DirectionHUD +group_name=directionhud +appendix=client diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b761216..5ccda13 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..58e971d 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 +#Sun Jul 24 11:46:35 CEST 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.14-bin.zip diff --git a/gradlew b/gradlew index 91a7e26..a129669 100644 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env bash ############################################################################## ## @@ -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/gradlew.bat b/gradlew.bat index 8a0b282..5f19212 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -46,7 +46,7 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args if "%@eval[2+2]" == "4" goto 4NT_args diff --git a/src/main/java/bspkrs/directionhud/CommandDirectionHUD.java b/src/main/java/bspkrs/directionhud/CommandDirectionHUD.java index f69139a..ba559f5 100644 --- a/src/main/java/bspkrs/directionhud/CommandDirectionHUD.java +++ b/src/main/java/bspkrs/directionhud/CommandDirectionHUD.java @@ -1,7 +1,9 @@ package bspkrs.directionhud; import net.minecraft.command.CommandBase; +import net.minecraft.command.CommandException; import net.minecraft.command.ICommandSender; +import net.minecraft.server.MinecraftServer; import bspkrs.directionhud.fml.gui.GuiDHConfig; import bspkrs.fml.util.DelayedGuiDisplayTicker; @@ -20,7 +22,7 @@ public String getCommandUsage(ICommandSender var1) } @Override - public boolean canCommandSenderUseCommand(ICommandSender par1ICommandSender) + public boolean checkPermission(MinecraftServer server, ICommandSender sender) { return true; } @@ -32,7 +34,7 @@ public int getRequiredPermissionLevel() } @Override - public void processCommand(ICommandSender var1, String[] var2) + public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException { try { @@ -44,12 +46,4 @@ public void processCommand(ICommandSender var1, String[] var2) } } - @Override - public int compareTo(Object object) - { - if (object instanceof CommandBase) - return this.getCommandName().compareTo(((CommandBase) object).getCommandName()); - - return 0; - } } diff --git a/src/main/java/bspkrs/directionhud/DirectionHUD.java b/src/main/java/bspkrs/directionhud/DirectionHUD.java index ceb93b4..ea4be10 100644 --- a/src/main/java/bspkrs/directionhud/DirectionHUD.java +++ b/src/main/java/bspkrs/directionhud/DirectionHUD.java @@ -7,7 +7,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiChat; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.util.MathHelper; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.config.Configuration; @@ -110,7 +110,7 @@ public static boolean onTickInGame(Minecraft mc) && !mc.gameSettings.showDebugInfo) { GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - scaledResolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); + scaledResolution = new ScaledResolution(mc); displayHUD(mc); GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); } diff --git a/src/main/java/bspkrs/directionhud/fml/ClientProxy.java b/src/main/java/bspkrs/directionhud/fml/ClientProxy.java index 6d0f6fa..dbb116f 100644 --- a/src/main/java/bspkrs/directionhud/fml/ClientProxy.java +++ b/src/main/java/bspkrs/directionhud/fml/ClientProxy.java @@ -1,12 +1,10 @@ package bspkrs.directionhud.fml; -import net.minecraftforge.client.ClientCommandHandler; -import bspkrs.bspkrscore.fml.bspkrsCoreMod; import bspkrs.directionhud.CommandDirectionHUD; import bspkrs.directionhud.DirectionHUD; -import bspkrs.util.ModVersionChecker; +import net.minecraftforge.client.ClientCommandHandler; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -22,24 +20,17 @@ public void preInit(FMLPreInitializationEvent event) @Override public void init(FMLInitializationEvent event) { - FMLCommonHandler.instance().bus().register(new DHGameTicker()); - FMLCommonHandler.instance().bus().register(new DHRenderTicker()); + MinecraftForge.EVENT_BUS.register(new DHRenderTicker()); ClientCommandHandler.instance.registerCommand(new CommandDirectionHUD()); - FMLCommonHandler.instance().bus().register(this); - - if (bspkrsCoreMod.instance.allowUpdateCheck) - { - DirectionHUDMod.instance.versionChecker = new ModVersionChecker(Reference.MODID, DirectionHUDMod.metadata.version, DirectionHUDMod.instance.versionURL, DirectionHUDMod.instance.mcfTopic); - DirectionHUDMod.instance.versionChecker.checkVersionWithLogging(); - } + MinecraftForge.EVENT_BUS.register(this); } @SubscribeEvent public void onConfigChanged(OnConfigChangedEvent event) { - if (event.modID.equals(Reference.MODID)) + if (event.getModID().equals(Reference.MODID)) { Reference.config.save(); DirectionHUD.syncConfig(); diff --git a/src/main/java/bspkrs/directionhud/fml/DHGameTicker.java b/src/main/java/bspkrs/directionhud/fml/DHGameTicker.java deleted file mode 100644 index a4d2e6d..0000000 --- a/src/main/java/bspkrs/directionhud/fml/DHGameTicker.java +++ /dev/null @@ -1,49 +0,0 @@ -package bspkrs.directionhud.fml; - -import net.minecraft.client.Minecraft; -import net.minecraft.util.ChatComponentText; -import bspkrs.bspkrscore.fml.bspkrsCoreMod; -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 DHGameTicker -{ - private Minecraft mc; - private static boolean isRegistered = false; - - public DHGameTicker() - { - isRegistered = true; - mc = Minecraft.getMinecraft(); - } - - @SubscribeEvent - public void onTick(ClientTickEvent event) - { - if (event.phase.equals(Phase.START)) - return; - - boolean keepTicking = !(mc != null && mc.thePlayer != null && mc.theWorld != null); - - if (!keepTicking && isRegistered) - { - if (bspkrsCoreMod.instance.allowUpdateCheck && DirectionHUDMod.instance.versionChecker != null) - if (!DirectionHUDMod.instance.versionChecker.isCurrentVersion()) - for (String msg : DirectionHUDMod.instance.versionChecker.getInGameMessage()) - 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/directionhud/fml/DHRenderTicker.java b/src/main/java/bspkrs/directionhud/fml/DHRenderTicker.java index 6512a27..9707bdd 100644 --- a/src/main/java/bspkrs/directionhud/fml/DHRenderTicker.java +++ b/src/main/java/bspkrs/directionhud/fml/DHRenderTicker.java @@ -1,8 +1,8 @@ package bspkrs.directionhud.fml; -import net.minecraft.client.Minecraft; import bspkrs.directionhud.DirectionHUD; -import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraft.client.Minecraft; +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.RenderTickEvent; @@ -29,7 +29,7 @@ public void onTick(RenderTickEvent event) if (!DirectionHUD.onTickInGame(mc)) { - FMLCommonHandler.instance().bus().unregister(this); + MinecraftForge.EVENT_BUS.unregister(this); isRegistered = false; } } diff --git a/src/main/java/bspkrs/directionhud/fml/DirectionHUDMod.java b/src/main/java/bspkrs/directionhud/fml/DirectionHUDMod.java index 77704cb..137afe2 100644 --- a/src/main/java/bspkrs/directionhud/fml/DirectionHUDMod.java +++ b/src/main/java/bspkrs/directionhud/fml/DirectionHUDMod.java @@ -1,7 +1,6 @@ package bspkrs.directionhud.fml; import bspkrs.util.Const; -import bspkrs.util.ModVersionChecker; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.Instance; @@ -11,14 +10,13 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -@Mod(modid = Reference.MODID, name = Reference.NAME, version = "@MOD_VERSION@", dependencies = "required-after:bspkrsCore@[@BSCORE_VERSION@,)", - useMetadata = true, guiFactory = Reference.GUI_FACTORY) +@Mod(modid = Reference.MODID, name = Reference.NAME, version = "@MOD_VERSION@", + dependencies = "required-after:bspkrsCore@[@BSCORE_VERSION@,)", + useMetadata = true, guiFactory = Reference.GUI_FACTORY, + updateJSON = Const.VERSION_URL_BASE + Reference.MODID + Const.VERSION_URL_EXT, + acceptedMinecraftVersions = "[@MIN_MC_VERSION@,@MAX_MC_VERSION@]") public class DirectionHUDMod { - protected ModVersionChecker versionChecker; - protected final String versionURL = Const.VERSION_URL + "/Minecraft/" + Const.MCVERSION + "/directionHUD.version"; - protected final String mcfTopic = "http://www.minecraftforum.net/topic/1114612-"; - @Metadata(value = Reference.MODID) public static ModMetadata metadata; @@ -31,7 +29,6 @@ public class DirectionHUDMod @EventHandler public void preInit(FMLPreInitializationEvent event) { - metadata = event.getModMetadata(); proxy.preInit(event); } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 36777ea..e0cad2f 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -5,7 +5,7 @@ "name": "DirectionHUD", "description": "Provides a HUD with your magnetic compass heading.", "version": "${mod_version}", - "mcversion": "${minecraft_version}", + "mcversion": "${minecraft_maxversion}", "url": "http://www.minecraftforum.net/topic/1114612-/", "updateUrl": "", "authorList": [ "bspkrs" ], @@ -13,8 +13,8 @@ "logoFile": "", "screenshots": [ ], "parent": "", - "requiredMods": [ "bspkrsCore@[${bscore_version},)" ], - "dependencies": [ "bspkrsCore@[${bscore_version},)" ], + "requiredMods": [ "Forge@[${forge_version},${forge_versionlimit})", "bspkrsCore@[${bscore_version},)" ], + "dependencies": [ "Forge@[${forge_version},${forge_versionlimit})", "bspkrsCore@[${bscore_version},)" ], "dependants": [ ], "useDependencyInformation": "true" }]