Commit b17e0b99 authored by Dennis Bonke's avatar Dennis Bonke Committed by Dennis Bonke

Added some textures, localised all items, disabled ingots, added mcmod.info, should be good now.

parent 31104a20
......@@ -30,6 +30,8 @@ repositories {
}
apply plugin: 'forge'
apply plugin: 'maven'
apply plugin: 'maven-publish'
project.ext.buildnumber = "CUSTOM_BUILD" // referenced as project.buildnumber
......@@ -44,10 +46,62 @@ else
println "!! No build number set !!"
}
version = "1.7.10-0.2.0-A1" + "-" + project.buildnumber
group= "com.advancedmods.advancedtools" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
project.buildnumber = "1"
version = "1.7.10-0.2.1-B1" + "-" + project.buildnumber
group= "com.advancedmods" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "AdvancedTools"
// External properties
ext.configFile = file "build.properties"
configFile.withReader {
// Load config. It shall from now be referenced as simply config or project.config
def prop = new Properties()
prop.load(it)
project.ext.config = new ConfigSlurper().parse prop
}
configurations {
deployerJars
}
task buildInfo {
def cmd = "git rev-parse --short HEAD"
def proc = cmd.execute()
proc.waitFor()
if (proc.exitValue() == 0) {
ext.revision = proc.text.trim()
} else {
ext.revision = "GITBORK"
}
if (System.getenv().BUILD_NUMBER != null) {
ext.buildNum = "build${System.getenv().BUILD_NUMBER}"
} else {
ext.buildNum = "DEV.${project.buildInfo.revision}"
}
}
/*if (System.getenv().ARTIFACT_VERSION == null) {
artifact_version = "${config.mod_version}.${project.buildInfo.buildNum}"
}
if (System.getenv().ARTIFACT_VERSION != null) {
artifact_version = "${system.getenv().ARTIFACT_VERSION}"
}
version = "${config.minecraft_version}-${artifact_version}"*/
dependencies {
deployerJars "org.apache.maven.wagon:wagon-ssh:2.2"
}
uploadArchives {
repositories.mavenDeployer {
configuration = configurations.deployerJars
repository(url: "sftp://web1.zsnode.com/srv/users/maven/apps/maven-repo-public/public") {
authentication(userName: "maven", password: project.maven_pass)
}
}
}
minecraft {
version = "1.7.10-10.13.4.1614-1.7.10"
runDir = "eclipse"
......@@ -89,3 +143,30 @@ processResources
exclude 'mcmod.info'
}
}
//Because the normal default jar task has been modified to be obfuscated
task deobfJar(type: Jar) {
from sourceSets.main.output
//Since this is now the main version, maven standards
classifier = 'dev'
manifest {
//attributes FMLCorePlugin: "net.cazzar.example.CoreMod", //Only for Core Mods, no comma if only using the FMLCorePlugin
//attributes FMLAT: "fmlat.cfg" //Only for FMLAT
}
}
artifacts {
archives deobfJar
}
//Create a task to create a javadoc for the developers
task javadocJar(type: Jar, dependsOn: javadoc) {
//Again, maven standards to use classifier of javadoc, any smart IDE will use this if asked.
classifier 'javadoc'
from 'build/docs/javadoc'
}
artifacts {
archives javadocJar
}
......@@ -13,7 +13,8 @@ public class BlockNetherStar extends ATBlock {
this.setCreativeTab(AdvancedTools.tabMaterials);
setHardness(5.0F);
setStepSound(Block.soundTypeMetal);
//this.setBlockTextureName("advancedtools:blockNetherStar");
this.setBlockTextureName("advancedtools:blockNetherStar");
this.setBlockName("netherstarblock");
}
@Override
......
......@@ -17,10 +17,10 @@ public class ATBlock extends Block {
super(material);
}
//public ATBlock()
//{
// this(Material.rock);
//}
public ATBlock()
{
this(Material.rock);
}
@Override
public String getUnlocalizedName()
......
......@@ -18,10 +18,4 @@ public class CreativeTabATCombat extends CreativeTabs {
//return ModItems.emeraldSword;
return Items.diamond_sword;
}
@Override
public String getTabLabel() {
return "advancedtools:combat";
}
}
......@@ -18,9 +18,4 @@ public class CreativeTabATMaterials extends CreativeTabs {
//return ModItems.enderionIngot;
return Items.iron_ingot;
}
@Override
public String getTabLabel() {
return "advancedtools:materials";
}
}
......@@ -9,9 +9,9 @@ public class ATProps {
// Versioning
public static final String MC_VERSION = "1.7.10";
public static final String VERSION_COMPLETE = "1.7.10R0.2.0A1";
public static final String FORGE_BASE = "10.13.2.";
public static final String FORGE_BUILD = "1240";
public static final String VERSION_COMPLETE = "1.7.10R0.2.1B1";
public static final String FORGE_BASE = "10.13.4.";
public static final String FORGE_BUILD = "1614";
public static final String FORGE_VERSION = "[" + FORGE_BASE + FORGE_BUILD + "]";
public static final String AMCORE_VERSION = "[" + AMCoreProps.version + "]";
......
......@@ -18,6 +18,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.common.util.EnumHelper;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
/**
* Created by Dennisbonke on 15-4-2015.
......@@ -54,7 +55,7 @@ public class ATRegistry {
// Bone
// TODO: Playtest material values.
// TODO: Finish Bone.
public static Item boneIngot = new BoneIngot();
//public static Item boneIngot = new BoneIngot();
//public static Item boneNugget = new BoneNugget(4010);
//public static Item bonePickaxe = new BonePickaxe(5005, bone);
//public static Item boneShovel = new BoneShovel(5006, bone);
......@@ -69,7 +70,7 @@ public class ATRegistry {
// Redstone
// TODO: Playtest material values.
// TODO: Finish Redstone.
public static Item redstoneIngot = new RedstoneIngot();
//public static Item redstoneIngot = new RedstoneIngot();
//public static Item redstoneNugget = new RedstoneNugget(4015);
//public static Item redstonePickaxe = new RedstonePickaxe(5010, redstone);
//public static Item redstoneShovel = new RedstoneShovel(5011, redstone);
......@@ -113,7 +114,7 @@ public class ATRegistry {
// Lapis
// TODO: Change Tool and Armor material values to fit Lapis.
// TODO: Finish Lapis.
public static Item lapisIngot = new LapisIngot();
//public static Item lapisIngot = new LapisIngot();
//public static Item lapisNugget = new LapisNugget(7006);
//public static Item lapisPickaxe = new LapisPickaxe(7001, lapis);
//public static Item lapisShovel = new LapisShovel(7002, lapis);
......@@ -128,7 +129,7 @@ public class ATRegistry {
// Flint
// TODO: Change Tool and Armor material values to fit Flint.
// TODO: Finish Flint.
public static Item flintIngot = new FlintIngot();
//public static Item flintIngot = new FlintIngot();
/*public static Item flintNugget = new FlintNugget(8006);
//public static Item flintPickaxe = new FlintPickaxe(8001, flint);
//public static Item flintShovel = new FlintShovel(8002, flint);
......@@ -143,7 +144,7 @@ public class ATRegistry {
// Netherion
// TODO: Change Tool and Armor material values to fit Netherion.
// TODO: Finish Netherion.
public static Item netherionIngot = new NetherionIngot();
//public static Item netherionIngot = new NetherionIngot();
//public static Item netherionNugget = new NetherionNugget(9001);
//public static Item netherionPickaxe = new NetherionPickaxe(9002, netherion);
//public static Item netherionShovel = new NetherionShovel(9002, netherion);
......@@ -171,7 +172,7 @@ public class ATRegistry {
// Copper
// TODO: Change Tool and Armor material values to fit Copper.
// TODO: Finish Copper.
public static Item copperIngot = new CopperIngot();
//public static Item copperIngot = new CopperIngot();
//public static Item copperNugget = new CopperNugget(9001);
//public static Item copperPickaxe = new CopperPickaxe(9002, copper);
//public static Item copperShovel = new CopperShovel(9002, copper);
......@@ -195,13 +196,13 @@ public class ATRegistry {
// Items
// Ingots
// TODO: Make Textures for remaining Ingots before being re-enabled.
GameRegistry.registerItem(boneIngot, "boneingot");
GameRegistry.registerItem(redstoneIngot, "redstoneingot");
GameRegistry.registerItem(enderionIngot, "enderioningot");
GameRegistry.registerItem(lapisIngot, "lapisingot");
GameRegistry.registerItem(flintIngot, "flintingot");
GameRegistry.registerItem(netherionIngot, "netherioningot");
GameRegistry.registerItem(copperIngot, "copperingot");
//GameRegistry.registerItem(boneIngot, "boneingot");
//GameRegistry.registerItem(redstoneIngot, "redstoneingot");
//GameRegistry.registerItem(enderionIngot, "enderioningot");
//GameRegistry.registerItem(lapisIngot, "lapisingot");
//GameRegistry.registerItem(flintIngot, "flintingot");
//GameRegistry.registerItem(netherionIngot, "netherioningot");
//GameRegistry.registerItem(copperIngot, "copperingot");
// Nuggets
// TODO: Make Textures for remaining Nuggets before being re-enabled.
......@@ -350,12 +351,14 @@ public class ATRegistry {
public static void registerOredict() {
// Ingots
OreDictionary.registerOre("ingotBone", new ItemStack(boneIngot));
OreDictionary.registerOre("ingotRedstone", new ItemStack(redstoneIngot));
OreDictionary.registerOre("ingotEnderion", new ItemStack(enderionIngot));
OreDictionary.registerOre("ingotFlint", new ItemStack(flintIngot));
OreDictionary.registerOre("ingotLapis", new ItemStack(lapisIngot));
OreDictionary.registerOre("ingotNetherion", new ItemStack(netherionIngot));
//OreDictionary.registerOre("ingotBone", new ItemStack(boneIngot));
//OreDictionary.registerOre("ingotRedstone", new ItemStack(redstoneIngot));
//OreDictionary.registerOre("ingotEnderion", new ItemStack(enderionIngot));
//OreDictionary.registerOre("ingotFlint", new ItemStack(flintIngot));
//OreDictionary.registerOre("ingotLapis", new ItemStack(lapisIngot));
//OreDictionary.registerOre("ingotNetherion", new ItemStack(netherionIngot));
// Blocks
OreDictionary.registerOre("blockNetherStar", new ItemStack(blockNetherStar));
// Nuggets
......@@ -378,6 +381,8 @@ public class ATRegistry {
// Blocks
// Nether star
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockNetherStar), "sss", "sss", "sss", 's', "materialNetherStar"));
//GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.nether_star), "s", 's', ATRegistry.blockNetherStar));
GameRegistry.addShapelessRecipe(new ItemStack(Items.nether_star, 9), new Object[] {ATRegistry.blockNetherStar});
// Armor
// Emerald
......@@ -439,7 +444,7 @@ public class ATRegistry {
// Ingots
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.redstoneIngot, 3), "rrr", "rir", "rrr", 'r', "dustRedstone", 'i', "ingotIron"));*/
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(boneIngot, 3), "bbb", "bib", "bbb", 'b', "dyeWhite", 'i', "ingotIron"));
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(boneIngot, 3), "bbb", "bib", "bbb", 'b', "dyeWhite", 'i', "ingotIron"));
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.enderionIngot, 3), "eee", "eie", "eee", 'e', "materialEnderPearl", 'i', "ingotIron"));
//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.lapisIngot, 3), "lll", "lil", "lll", 'l', "gemLapis", 'i', "ingotIron"));
}
......
// Creative Tabs
itemGroup.Combat=Advanced Tools:Combat
itemGroup.Materials=Advanced Tools:Materials
itemGroup.Tools=Advanced Tools:Tools
// Armor
// Emerald
item.advancedtools:EmeraldHelmet.name=Emerald Helmet
item.advancedtools:EmeraldChestplate.name=Emerald Chestplate
item.advancedtools:EmeraldLeggings.name=Emerald Leggings
item.advancedtools:EmeraldBoots.name=Emerald Boots
// Blocks
tile.advancedtools:netherstarblock.name=Nether Star Block
// Ingots
item.advancedtools:boneingot.name=Bone Ingot
item.advancedtools:redstoneingot.name=Redstone Ingot
item.advancedtools:enderioningot.name=Enderion Ingot
item.advancedtools:lapisingot.name=Lapis Ingot
item.advancedtools:flintingot.name=Flint Ingot
item.advancedtools:netherioningot.name=Netherion Ingot
item.advancedtools:quartzingot.name=Quartz Ingot
item.advancedtools:copperingot.name=Copper Ingot
\ No newline at end of file
[
{
"modid" : "AdvancedTools",
"name" : "Advanced Tools",
"version": "1.7.10R0.2.1B1",
"mcversion": "1.7.10",
"url" : "",
"credits" : "Vazkii, SpitefulFox",
"authorList": [ "Dennisbonke, Zandor300" ],
"description": "Advanced Tools aims to add more tools to the game (currently WIP).",
"logoFile" : "",
"updateUrl" : "",
"parent" : "",
"screenshots": [
]
}
]
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment