From f89919bae7a46a8a4e403fd8209b1d24b22c8444 Mon Sep 17 00:00:00 2001 From: Jared Date: Wed, 11 May 2016 19:47:46 +0200 Subject: [PATCH] Hopefully added a maven, updated forge version --- .../api/recipes/IRecipeManager.java | 7 ++- .../minetweaker/mc18/server/MCServer.java | 4 +- .../mc19/oredict/MCOreDictEntry.java | 2 + .../mc19/recipes/MCRecipeManager.java | 1 + build.gradle | 56 +++++++++++++++---- 5 files changed, 54 insertions(+), 16 deletions(-) diff --git a/MineTweaker3-API/src/main/java/minetweaker/api/recipes/IRecipeManager.java b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/IRecipeManager.java index 7154bb1..b0a5cf3 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/api/recipes/IRecipeManager.java +++ b/MineTweaker3-API/src/main/java/minetweaker/api/recipes/IRecipeManager.java @@ -1,13 +1,14 @@ package minetweaker.api.recipes; -import java.util.List; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.Optional; +import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenGetter; import stanhebben.zenscript.annotations.ZenMethod; +import java.util.List; + /** * The RecipeManager adds and removes crafting recipes. The IRecipeManager * instance is available throug the recipes global variable. @@ -16,6 +17,7 @@ import stanhebben.zenscript.annotations.ZenMethod; */ @ZenClass("minetweaker.recipes.IRecipeManager") public interface IRecipeManager { + /** * Returns all crafting recipes. * @@ -117,4 +119,5 @@ public interface IRecipeManager { */ @ZenMethod public IItemStack craft(IItemStack[][] contents); + } diff --git a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/server/MCServer.java b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/server/MCServer.java index 295d521..11cd178 100644 --- a/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/server/MCServer.java +++ b/MineTweaker3-MC18-Main/src/main/java/minetweaker/mc18/server/MCServer.java @@ -182,12 +182,12 @@ public class MCServer extends AbstractServer { CommandHandler ch = (CommandHandler) MineTweakerMod.server.getCommandManager(); if (!ch.getCommands().containsValue(command)) return "Adding command " + command.getCommandName(); - return ""; + return "Tried to add command: " + command.getCommandName() + ", failed. THIS IS NOT AN ERROR!"; } @Override public String describeUndo() { - return "tried to remove command: " + command.getCommandName() + " failed. THIS IS NOT AN ERROR!"; + return "Tried to remove command: " + command.getCommandName() + ", failed. THIS IS NOT AN ERROR!"; } @Override diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/oredict/MCOreDictEntry.java b/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/oredict/MCOreDictEntry.java index 2e8b146..e78daf2 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/oredict/MCOreDictEntry.java +++ b/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/oredict/MCOreDictEntry.java @@ -33,6 +33,7 @@ public class MCOreDictEntry implements IOreDictEntry { private static final List> OREDICT_CONTENTS = MineTweakerHacks.getOreIdStacks(); private static final List> OREDICT_CONTENTS_UN = MineTweakerHacks.getOreIdStacksUn(); + private final String id; public MCOreDictEntry(String id) { @@ -286,6 +287,7 @@ public class MCOreDictEntry implements IOreDictEntry { public Object getOverrideKey() { return null; } + } private static class ActionMirror implements IUndoableAction { diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/recipes/MCRecipeManager.java b/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/recipes/MCRecipeManager.java index 7dbeed2..09a0b66 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/recipes/MCRecipeManager.java +++ b/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/recipes/MCRecipeManager.java @@ -1,5 +1,6 @@ package minetweaker.mc19.recipes; +import com.google.common.collect.ImmutableList; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; diff --git a/build.gradle b/build.gradle index dc75e86..cad8f42 100644 --- a/build.gradle +++ b/build.gradle @@ -145,16 +145,48 @@ task assembleAll(dependsOn: [ assembleDevFull19]) { } -task("uploadJars", dependsOn: "assembleAll") { - description = "uploads JARs" - if (project.hasProperty("local_maven")) { - apply plugin: 'maven' - uploadArchives { - repositories { - mavenDeployer { - repository(url: "file://${local_maven}") - } - } - } - } +configurations { + deployerJars } + +dependencies { + deployerJars 'org.apache.maven.wagon:wagon-ftp:2.2' +} + +apply plugin: 'maven' + +uploadArchives { + repositories { + mavenDeployer { + configuration = configurations.deployerJars + repository(url: "ftp://maven2.aktheknight.co.uk/public_html/maven2") { + authentication(userName: mavenUser, password: mavenPass) + } + pom { + groupId = "us.getfluxed.crafttweaker" + version = project.version + artifactId = project.archivesBaseName + project { + name project.archivesBaseName + packaging 'jar' + description 'CraftTweaker' + url 'https://github.com/jaredlll08/CraftTweaker' + scm { + url 'https://github.com/jaredlll08/CraftTweaker' + connection 'scm:git:git@github.com:jaredlll08/CraftTweaker.git' + developerConnection 'scm:git:git@github.com:jaredlll08/CraftTweaker.git' + } + developers { + developer { + id 'Jaredlll08' + name 'Jaredlll08' + roles { role 'developer' } + } + } + } + } + } + } +} + +