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 a09560e..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 -} \ 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 c04938a..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=FloatingRuins -group_name=floatingruins -appendix=universal \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..dc531a8 --- /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=FloatingRuins +group_name=floatingruins +appendix=universal + +# 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..14b4901 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 19:45:47 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/floatingruins/CommandFRGen.java b/src/main/java/bspkrs/floatingruins/CommandFRGen.java index 8ce4276..8358130 100644 --- a/src/main/java/bspkrs/floatingruins/CommandFRGen.java +++ b/src/main/java/bspkrs/floatingruins/CommandFRGen.java @@ -67,11 +67,4 @@ else if (args.length == 6) // TODO: island gen with x, y, z, radius, depth, and shape } } - - @Override - public int compareTo(Object o) - { - // TODO Auto-generated method stub - return 0; - } } diff --git a/src/main/java/bspkrs/floatingruins/FloatingRuins.java b/src/main/java/bspkrs/floatingruins/FloatingRuins.java index 0a12dd6..202704e 100644 --- a/src/main/java/bspkrs/floatingruins/FloatingRuins.java +++ b/src/main/java/bspkrs/floatingruins/FloatingRuins.java @@ -366,7 +366,7 @@ public static boolean isVillageNearby(World world, BlockPos pos, int radius) { FRLog.debug("Checking Villages..."); if (world.villageCollectionObj != null) - for (Village village : (List) world.villageCollectionObj.getVillageList()) + for (Village village : world.villageCollectionObj.getVillageList()) { if (Math.sqrt(village.getCenter().distanceSq(pos)) < (village.getVillageRadius() + radius)) return true; diff --git a/src/main/java/bspkrs/floatingruins/WorldGenFloatingIslandRuin.java b/src/main/java/bspkrs/floatingruins/WorldGenFloatingIslandRuin.java index 98e4b93..3863c15 100644 --- a/src/main/java/bspkrs/floatingruins/WorldGenFloatingIslandRuin.java +++ b/src/main/java/bspkrs/floatingruins/WorldGenFloatingIslandRuin.java @@ -16,6 +16,7 @@ import net.minecraft.tileentity.TileEntityChest; import net.minecraft.tileentity.TileEntityMobSpawner; import net.minecraft.util.BlockPos; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenerator; @@ -418,7 +419,7 @@ private ItemStack getItems(Random random) if (itemStack.length > 2) meta = CommonUtils.parseInt(itemStack[2].trim()); - Item item = GameData.getItemRegistry().getObject(id); + Item item = GameData.getItemRegistry().getObject(new ResourceLocation(id)); if (item == null) item = Items.egg; diff --git a/src/main/java/bspkrs/floatingruins/fml/ClientProxy.java b/src/main/java/bspkrs/floatingruins/fml/ClientProxy.java index d68a2d9..7e3666b 100644 --- a/src/main/java/bspkrs/floatingruins/fml/ClientProxy.java +++ b/src/main/java/bspkrs/floatingruins/fml/ClientProxy.java @@ -8,7 +8,5 @@ public class ClientProxy extends CommonProxy { @Override public void registerTickHandler() - { - new FloatingRuinsTicker(); - } + {} } diff --git a/src/main/java/bspkrs/floatingruins/fml/DelayedWorldGenTicker.java b/src/main/java/bspkrs/floatingruins/fml/DelayedWorldGenTicker.java index e6e1491..f18e75c 100644 --- a/src/main/java/bspkrs/floatingruins/fml/DelayedWorldGenTicker.java +++ b/src/main/java/bspkrs/floatingruins/fml/DelayedWorldGenTicker.java @@ -4,7 +4,7 @@ import net.minecraft.world.World; import bspkrs.floatingruins.FloatingRuins; -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.WorldTickEvent; @@ -24,7 +24,7 @@ public DelayedWorldGenTicker(int delayTicks, World world, Random random, int x, this.random = random; this.x = x; this.z = z; - FMLCommonHandler.instance().bus().register(this); + MinecraftForge.EVENT_BUS.register(this); } @SubscribeEvent @@ -36,7 +36,7 @@ public void onTick(WorldTickEvent event) if (--delayTicks == 0) { FloatingRuins.generateSurface(world, random, x, z, true); - FMLCommonHandler.instance().bus().unregister(this); + MinecraftForge.EVENT_BUS.unregister(this); } } } diff --git a/src/main/java/bspkrs/floatingruins/fml/FloatingRuinsMod.java b/src/main/java/bspkrs/floatingruins/fml/FloatingRuinsMod.java index f0137a6..76d2139 100644 --- a/src/main/java/bspkrs/floatingruins/fml/FloatingRuinsMod.java +++ b/src/main/java/bspkrs/floatingruins/fml/FloatingRuinsMod.java @@ -2,8 +2,8 @@ import java.io.File; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; -import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; import net.minecraftforge.fml.common.Mod.Instance; @@ -15,19 +15,14 @@ import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -import bspkrs.bspkrscore.fml.bspkrsCoreMod; import bspkrs.floatingruins.FloatingRuins; import bspkrs.util.CommonUtils; import bspkrs.util.Const; -import bspkrs.util.ModVersionChecker; @Mod(modid = Reference.MODID, name = Reference.NAME, version = "@MOD_VERSION@", dependencies = "required-after:bspkrsCore@[@BSCORE_VERSION@,)", useMetadata = true, - guiFactory = "bspkrs.floatingruins.fml.gui.ModGuiFactoryHandler") + guiFactory = "bspkrs.floatingruins.fml.gui.ModGuiFactoryHandler", updateJSON = Const.VERSION_URL_BASE + Reference.MODID + Const.VERSION_URL_EXT) public class FloatingRuinsMod { - public ModVersionChecker versionChecker; - private final String versionURL = Const.VERSION_URL + "/Minecraft/" + Const.MCVERSION + "/floatingRuinsForge.version"; - private final String mcfTopic = "http://www.minecraftforum.net/topic/1009577-"; @Metadata(value = Reference.MODID) public static ModMetadata metadata; @@ -41,8 +36,6 @@ public class FloatingRuinsMod @EventHandler public void preInit(FMLPreInitializationEvent event) { - metadata = event.getModMetadata(); - File file = event.getSuggestedConfigurationFile(); if (!CommonUtils.isObfuscatedEnv()) @@ -68,15 +61,9 @@ public void init(FMLInitializationEvent event) // hopefully a million is high enough to be last? GameRegistry.registerWorldGenerator(new FloatingRuinsWorldGenerator(), 1000000); - FMLCommonHandler.instance().bus().register(instance); + MinecraftForge.EVENT_BUS.register(instance); proxy.registerTickHandler(); - - if (bspkrsCoreMod.instance.allowUpdateCheck) - { - versionChecker = new ModVersionChecker(metadata.name, metadata.version, versionURL, mcfTopic); - versionChecker.checkVersionWithLogging(); - } } @EventHandler diff --git a/src/main/java/bspkrs/floatingruins/fml/FloatingRuinsTicker.java b/src/main/java/bspkrs/floatingruins/fml/FloatingRuinsTicker.java deleted file mode 100644 index 922a622..0000000 --- a/src/main/java/bspkrs/floatingruins/fml/FloatingRuinsTicker.java +++ /dev/null @@ -1,51 +0,0 @@ -package bspkrs.floatingruins.fml; - -import net.minecraft.client.Minecraft; -import net.minecraft.util.ChatComponentText; -import bspkrs.bspkrscore.fml.bspkrsCoreMod; -import net.minecraftforge.fml.client.FMLClientHandler; -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 FloatingRuinsTicker -{ - private static boolean isRegistered = false; - private Minecraft mcClient; - - public FloatingRuinsTicker() - { - mcClient = FMLClientHandler.instance().getClient(); - isRegistered = true; - FMLCommonHandler.instance().bus().register(this); - } - - @SubscribeEvent - public void onTick(ClientTickEvent event) - { - if (event.phase.equals(Phase.START)) - return; - - boolean keepTicking = !(mcClient != null && mcClient.thePlayer != null && mcClient.theWorld != null); - - if (!keepTicking && isRegistered) - { - if (bspkrsCoreMod.instance.allowUpdateCheck && FloatingRuinsMod.instance.versionChecker != null) - if (!FloatingRuinsMod.instance.versionChecker.isCurrentVersion()) - for (String msg : FloatingRuinsMod.instance.versionChecker.getInGameMessage()) - mcClient.thePlayer.addChatMessage(new ChatComponentText(msg)); - - FMLCommonHandler.instance().bus().unregister(this); - isRegistered = false; - } - } - - public static boolean isRegistered() - { - return isRegistered; - } -}