mirror of
https://github.com/GTNewHorizons/CraftTweaker.git
synced 2026-11-13 00:37:32 +00:00
Hopefully added a maven, updated forge version
This commit is contained in:
1 parent
c00f402e2e
commit
f89919bae7
5 files changed
+54
-16
No files matched your search
@@ -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);
|
||||
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -33,6 +33,7 @@ public class MCOreDictEntry implements IOreDictEntry {
|
||||
private static final List<ArrayList<ItemStack>> OREDICT_CONTENTS = MineTweakerHacks.getOreIdStacks();
|
||||
private static final List<ArrayList<ItemStack>> 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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
+44
-12
@@ -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' }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user