From ae504d76e9cc77465978cea71759f85d55c7e0da Mon Sep 17 00:00:00 2001 From: Lance5057 Date: Fri, 30 Jun 2017 16:50:39 -0500 Subject: Added all current materials, ingots, nuggets, and dusts. --- .../java/lance5057/tDefense/TinkersDefense.java | 4 +- .../tDefense/core/blocks/fluid/VibrantFluid.java | 36 ++- .../tDefense/core/blocks/fluid/VileFluid.java | 12 +- .../tDefense/core/items/TDOreDictItem.java | 23 ++ .../tDefense/core/materials/TDMaterials.java | 329 +++++++++++++++------ 5 files changed, 297 insertions(+), 107 deletions(-) create mode 100644 src/main/java/lance5057/tDefense/core/items/TDOreDictItem.java (limited to 'src/main/java') diff --git a/src/main/java/lance5057/tDefense/TinkersDefense.java b/src/main/java/lance5057/tDefense/TinkersDefense.java index c7fc37b..bcd385e 100644 --- a/src/main/java/lance5057/tDefense/TinkersDefense.java +++ b/src/main/java/lance5057/tDefense/TinkersDefense.java @@ -331,7 +331,7 @@ public class TinkersDefense { core.preInit(e); //armor.preInit(e); holiday.preInit(e); - mats.registerMaterials(); + mats.preInit(e); parts.preInit(e); tools.preInit(e); baubles.preInit(e); @@ -352,7 +352,7 @@ public class TinkersDefense { core.init(e); //armor.init(e); holiday.init(e); - mats.setupMaterials(e); + mats.init(e); parts.init(e); tools.init(e); baubles.init(e); diff --git a/src/main/java/lance5057/tDefense/core/blocks/fluid/VibrantFluid.java b/src/main/java/lance5057/tDefense/core/blocks/fluid/VibrantFluid.java index 051651a..daea94a 100644 --- a/src/main/java/lance5057/tDefense/core/blocks/fluid/VibrantFluid.java +++ b/src/main/java/lance5057/tDefense/core/blocks/fluid/VibrantFluid.java @@ -28,19 +28,27 @@ public class VibrantFluid extends BlockFluidClassic { super.neighborChanged(state, worldIn, pos, blockIn); dirtToGrass(state, worldIn, pos); } - - private void dirtToGrass(IBlockState state, World worldIn, BlockPos pos) - { - for (EnumFacing enumfacing : EnumFacing.values()) - { - if (worldIn.getBlockState(pos.offset(enumfacing)).getBlock() == Blocks.DIRT) - { - if (worldIn.getBlockState(pos.offset(enumfacing)).getBlock() != this.getBlockState().getBlock()) - { - worldIn.setBlockState(pos.offset(enumfacing), Blocks.GRASS.getDefaultState()); - break; - } - } -} + + private void dirtToGrass(IBlockState state, World worldIn, BlockPos pos) { + for (EnumFacing enumfacing : EnumFacing.values()) { + if (worldIn.getBlockState(pos.offset(enumfacing)).getBlock() == Blocks.DIRT) { + if (worldIn.getBlockState(pos.offset(enumfacing)).getBlock() != this.getBlockState().getBlock()) { + worldIn.setBlockState(pos.offset(enumfacing), Blocks.GRASS.getDefaultState()); + break; + } + } + if (worldIn.getBlockState(pos.offset(enumfacing)).getBlock() == Blocks.COBBLESTONE) { + if (worldIn.getBlockState(pos.offset(enumfacing)).getBlock() != this.getBlockState().getBlock()) { + worldIn.setBlockState(pos.offset(enumfacing), Blocks.MOSSY_COBBLESTONE.getDefaultState()); + break; + } + } + if (worldIn.getBlockState(pos.offset(enumfacing)).getBlock() == Blocks.STONEBRICK) { + if (worldIn.getBlockState(pos.offset(enumfacing)).getBlock() != this.getBlockState().getBlock()) { + worldIn.setBlockState(pos.offset(enumfacing), Blocks.STONEBRICK.getStateFromMeta(1)); + break; + } + } + } } } diff --git a/src/main/java/lance5057/tDefense/core/blocks/fluid/VileFluid.java b/src/main/java/lance5057/tDefense/core/blocks/fluid/VileFluid.java index 6de4129..9a6fe88 100644 --- a/src/main/java/lance5057/tDefense/core/blocks/fluid/VileFluid.java +++ b/src/main/java/lance5057/tDefense/core/blocks/fluid/VileFluid.java @@ -31,10 +31,14 @@ public class VileFluid extends BlockFluidClassic { ((EntityZombie) entity).setZombieType(ZombieType.HUSK); } if (entity instanceof EntityHorse) { - if (world.rand.nextInt(2) == 0 && !(((EntityHorse) entity).getType() != HorseType.SKELETON || ((EntityHorse) entity).getType() != HorseType.ZOMBIE)) - ((EntityHorse) entity).setType(HorseType.SKELETON); - else - ((EntityHorse) entity).setType(HorseType.ZOMBIE); + if (((EntityHorse) entity).getType() != HorseType.SKELETON + && ((EntityHorse) entity).getType() != HorseType.ZOMBIE) + { + if (world.rand.nextInt(2) == 0) + ((EntityHorse) entity).setType(HorseType.SKELETON); + else + ((EntityHorse) entity).setType(HorseType.ZOMBIE); + } } if (entity instanceof EntityPig) { EntityPigZombie pig = new EntityPigZombie(world); diff --git a/src/main/java/lance5057/tDefense/core/items/TDOreDictItem.java b/src/main/java/lance5057/tDefense/core/items/TDOreDictItem.java new file mode 100644 index 0000000..94febcb --- /dev/null +++ b/src/main/java/lance5057/tDefense/core/items/TDOreDictItem.java @@ -0,0 +1,23 @@ +package lance5057.tDefense.core.items; + +import lance5057.tDefense.core.CoreBase; +import net.minecraft.item.Item; + +public class TDOreDictItem extends Item { + String prefix; + + public TDOreDictItem(String pre, String name) { + setUnlocalizedName(pre + "_" + name); + setRegistryName(pre + "_" + name); + prefix = pre; + this.setCreativeTab(CoreBase.tab); + } + + public boolean isOreDict() { + return true; + } + + public String getOreDictPrefix() { + return prefix; + } +} diff --git a/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java b/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java index 9873631..ac23b79 100644 --- a/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java +++ b/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java @@ -1,10 +1,10 @@ package lance5057.tDefense.core.materials; -import static slimeknights.tconstruct.library.utils.HarvestLevels.COBALT; - import java.util.Collection; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import com.google.common.collect.Lists; import com.google.common.eventbus.Subscribe; @@ -14,17 +14,24 @@ import lance5057.tDefense.armor.materials.MaterialCloth; import lance5057.tDefense.core.blocks.fluid.TDFluid; import lance5057.tDefense.core.blocks.fluid.VibrantFluid; import lance5057.tDefense.core.blocks.fluid.VileFluid; +import lance5057.tDefense.core.items.TDOreDictItem; import lance5057.tDefense.core.materials.traits.TraitAxeLover; import lance5057.tDefense.core.materials.traits.TraitDulling; import lance5057.tDefense.core.materials.traits.TraitFirestarter; import net.minecraft.block.Block; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.oredict.OreDictionary; +import slimeknights.tconstruct.library.MaterialIntegration; import slimeknights.tconstruct.library.TinkerRegistry; +import slimeknights.tconstruct.library.materials.BowMaterialStats; import slimeknights.tconstruct.library.materials.ExtraMaterialStats; import slimeknights.tconstruct.library.materials.HandleMaterialStats; import slimeknights.tconstruct.library.materials.HeadMaterialStats; @@ -32,6 +39,7 @@ import slimeknights.tconstruct.library.materials.Material; //import slimeknights.tconstruct.library.materials.Material; import slimeknights.tconstruct.library.materials.MaterialTypes; import slimeknights.tconstruct.library.traits.AbstractTrait; +import slimeknights.tconstruct.library.utils.HarvestLevels; import slimeknights.tconstruct.smeltery.block.BlockMolten; import slimeknights.tconstruct.tools.TinkerMaterials; @@ -41,10 +49,10 @@ public class TDMaterials { String SHIELD = ShieldMaterialStats.TYPE; - public static final Material aeonsteel = mat("aeonsteel", 0xd200d1); - public static final Material queensgold = mat("queensgold", 0xdede00); - public static final Material dogbearium = mat("dogbearium", 0x604933); - +// public static final Material aeonsteel = mat("aeonsteel", 0xd200d1); +// public static final Material queensgold = mat("queensgold", 0xdede00); +// public static final Material dogbearium = mat("dogbearium", 0x604933); + public static Material black; public static Material red; public static Material green; @@ -62,7 +70,7 @@ public class TDMaterials { public static Material orange; public static Material white; - public static TDFluid fluidAeonsteel = new TDFluid("aeonsteel_fluid", 0xd200d1, 1300, 15, 3000, 6000); + public static TDFluid fluidAeonsteel = new TDFluid("aeonsteel_fluid", 0xa470e0, 1300, 15, 3000, 6000); public static TDFluid fluidQueensGold = new TDFluid("queensgold_fluid", 0xdcff00, 1300, 15, 3000, 6000); public static TDFluid fluidDogbearium = new TDFluid("dogbearium_fluid", 0x6d3300, 1300, 15, 3000, 6000); public static TDFluid fluidRedCandy = new TDFluid("redcandy_fluid", 0xff0000, 1300, 15, 3000, 6000); @@ -79,8 +87,69 @@ public class TDMaterials { public static TDFluid fluidPlatinum = new TDFluid("platinum_fluid", 0xe8e8e8, 1300, 15, 3000, 6000); public static TDFluid fluidBrass = new TDFluid("brass_fluid", 0xdbb332, 1300, 15, 3000, 6000); public static TDFluid fluidSilver = new TDFluid("silver_fluid", 0x9e9e9e, 1300, 15, 3000, 6000); - public static TDFluid fluidCheese = new TDFluid("cheese_fluid", 0xffe731, 750, 0, 6000, 6000); + public static TDFluid fluidCheese = new TDFluid("cheese_fluid", 0xffe731, 300, 0, 12000, 9000); + + public static TDOreDictItem ingotAeonsteel; + public static TDOreDictItem ingotQueensGold; + public static TDOreDictItem ingotDogbearium; + public static TDOreDictItem ingotRedCandy; + public static TDOreDictItem ingotGreenCandy; + public static TDOreDictItem ingotSinisterium; + public static TDOreDictItem ingotNihilite; + public static TDOreDictItem ingotOrichalcum; + public static TDOreDictItem ingotPandorium; + public static TDOreDictItem ingotRoseGold; + public static TDOreDictItem ingotPlatinum; + public static TDOreDictItem ingotBrass; + public static TDOreDictItem ingotSilver; + public static TDOreDictItem ingotCheese; + + public static TDOreDictItem nuggetAeonsteel; + public static TDOreDictItem nuggetQueensGold; + public static TDOreDictItem nuggetDogbearium; + public static TDOreDictItem nuggetRedCandy; + public static TDOreDictItem nuggetGreenCandy; + public static TDOreDictItem nuggetSinisterium; + public static TDOreDictItem nuggetNihilite; + public static TDOreDictItem nuggetOrichalcum; + public static TDOreDictItem nuggetPandorium; + public static TDOreDictItem nuggetRoseGold; + public static TDOreDictItem nuggetPlatinum; + public static TDOreDictItem nuggetBrass; + public static TDOreDictItem nuggetSilver; + public static TDOreDictItem nuggetCheese; + + public static TDOreDictItem dustAeonsteel; + public static TDOreDictItem dustQueensGold; + public static TDOreDictItem dustDogbearium; + public static TDOreDictItem dustRedCandy; + public static TDOreDictItem dustGreenCandy; + public static TDOreDictItem dustSinisterium; + public static TDOreDictItem dustNihilite; + public static TDOreDictItem dustOrichalcum; + public static TDOreDictItem dustPandorium; + public static TDOreDictItem dustRoseGold; + public static TDOreDictItem dustPlatinum; + public static TDOreDictItem dustBrass; + public static TDOreDictItem dustSilver; + public static TDOreDictItem dustCheese; + public static Material matAeonsteel = new Material("aeonsteel", 0xa470e0); + public static Material matQueensGold = new Material("queensgold", 0xdcff00); + public static Material matDogbearium = new Material("dogbearium", 0x6d3300); + public static Material matRedCandy = new Material("redcandy", 0xff0000); + public static Material matGreenCandy = new Material("greencandy", 0x00ff00); + public static Material matSinisterium = new Material("sinisterium", 0x210000); + public static Material matNihilite = new Material("nihilite", 0x000021); + public static Material matVibrant = new Material("vibrant", 0x76ff00); + public static Material matOrichalcum = new Material("orichalcum", 0xffc700); + public static Material matPandorium = new Material("pandorium", 0x7f6a00); + public static Material matRoseGold = new Material("rosegold", 0xff9b84); + public static Material matPlatinum = new Material("platinum", 0xe8e8e8); + public static Material matBrass = new Material("brass", 0xdbb332); + public static Material matSilver = new Material("silver", 0x9e9e9e); + public static Material matCheese = new Material("cheese", 0xffe731); + public static final AbstractTrait axelover = new TraitAxeLover(); public static final AbstractTrait dulling = new TraitDulling(); public static final AbstractTrait firestarter = new TraitFirestarter(); @@ -91,40 +160,43 @@ public class TDMaterials { return mat; } - public void registerMaterials() { - - addMat("aeonsteel", fluidAeonsteel); - addMat("queensgold", fluidQueensGold); - addMat("dogbearium", fluidDogbearium); - addMat("redcandy", fluidRedCandy); - addMat("greencandy", fluidGreenCandy); - - addMat("sinisterium", fluidSinisterium); - addMat("nihilite", fluidNihilite); - - addMat("orichalcum", fluidOrichalcum); - addMat("pandorium", fluidPandorium); + @Subscribe + public void preInit(FMLPreInitializationEvent event) { + + addMat("aeonsteel", fluidAeonsteel, nuggetAeonsteel, ingotAeonsteel, dustAeonsteel); + addMat("queensgold", fluidQueensGold, nuggetQueensGold, ingotQueensGold, dustQueensGold); + addMat("dogbearium", fluidDogbearium, nuggetDogbearium, ingotDogbearium, dustDogbearium); + addMat("redcandy", fluidRedCandy, nuggetRedCandy, ingotRedCandy, dustRedCandy); + addMat("greencandy", fluidGreenCandy, nuggetGreenCandy, ingotGreenCandy, dustGreenCandy); + + addMat("sinisterium", fluidSinisterium, nuggetSinisterium, ingotSinisterium, dustSinisterium); + addMat("nihilite", fluidNihilite, nuggetNihilite, ingotNihilite, dustNihilite); + + addMat("orichalcum", fluidOrichalcum, nuggetOrichalcum, ingotOrichalcum, dustOrichalcum); + addMat("pandorium", fluidPandorium, nuggetPandorium, ingotPandorium, dustPandorium); + + addMat("rosegold", fluidRoseGold, nuggetRoseGold, ingotRoseGold, dustRoseGold); + addMat("platinum", fluidPlatinum, nuggetPlatinum, ingotPlatinum, dustPlatinum); + addMat("brass", fluidBrass, nuggetBrass, ingotBrass, dustBrass); + addMat("silver", fluidSilver, nuggetSilver, ingotSilver, dustSilver); + addMat("cheese", fluidCheese, nuggetCheese, ingotCheese, dustCheese); + addMat("chorusjuice", fluidChorusJuice); addMat("dragonsbreath", fluidDragonsBreath); - addMat("rosegold", fluidRoseGold); - addMat("platinum", fluidPlatinum); - addMat("brass", fluidBrass); - addMat("silver", fluidSilver); - addMat("cheese", fluidCheese); - + FluidRegistry.registerFluid(fluidVibrant); FluidRegistry.addBucketForFluid(fluidVibrant); addMat("vibrantfluid", fluidVibrant, new VibrantFluid(fluidVibrant)); - + FluidRegistry.registerFluid(fluidVile); FluidRegistry.addBucketForFluid(fluidVile); addMat("vilefluid", fluidVile, new VileFluid(fluidVile)); + - registerClothMaterials(); } @Subscribe - public void setupMaterials(FMLInitializationEvent event) { + public void init(FMLInitializationEvent event) { Material.UNKNOWN.addStats(new ShieldMaterialStats(35, 33)); // TinkerRegistry.addMaterialStats(Material.UNKNOWN, @@ -181,8 +253,10 @@ public class TDMaterials { TinkerRegistry.addMaterialStats(TinkerMaterials.steel, new ShieldMaterialStats(540, 33)); - TinkerRegistry.addMaterialStats(aeonsteel, new HeadMaterialStats(1000, 4.0f, 3.00f, COBALT), - new HandleMaterialStats(1.10f, 200), new ExtraMaterialStats(500)); + registerClothMaterials(); + registerMaterials(); +// TinkerRegistry.addMaterialStats(aeonsteel, new HeadMaterialStats(1000, 4.0f, 3.00f, COBALT), +// new HandleMaterialStats(1.10f, 200), new ExtraMaterialStats(500)); // iron.addItemIngot("ingotIron"); // iron.setRepresentativeItem(Items.field_151042_j); // iron.addTrait(magnetic2, HEAD); @@ -207,29 +281,84 @@ public class TDMaterials { FluidRegistry.registerFluid(fluid); FluidRegistry.addBucketForFluid(fluid); - BlockMolten block = new BlockMolten(fluid); - // Sets names - block.setUnlocalizedName("molten_" + fluid.getName()); - block.setRegistryName(Reference.MOD_ID, "molten_" + fluid.getName()); - // Registers the fluid in its block form and its corresponding item (block/fluid as item in inventory) - GameRegistry.register(block); - GameRegistry.register(new ItemBlock(block).setRegistryName(block.getRegistryName())); - // Registers the fluid's model but only on the client side - TinkersDefense.proxy.registerFluidModels(fluid); + createFluid(name, fluid); } - + + void addMat(String name, TDFluid fluid, TDOreDictItem nugget, TDOreDictItem ingot, TDOreDictItem dust) { + FluidRegistry.registerFluid(fluid); + FluidRegistry.addBucketForFluid(fluid); + + createFluid(name, fluid); + createItems(name, nugget, ingot, dust); + } + void addMat(String name, TDFluid fluid, Block fluidBlock) { - - // Sets names + + createFluid(name, fluid, fluidBlock); + } + + void addMat(String name, TDFluid fluid, Block fluidBlock, TDOreDictItem nugget, TDOreDictItem ingot, + TDOreDictItem dust) { + + createFluid(name, fluid, fluidBlock); + createItems(name, nugget, ingot, dust); + } + + void createFluid(String name, TDFluid fluid) { + BlockMolten block = new BlockMolten(fluid); + // Sets names + block.setUnlocalizedName("molten_" + fluid.getName()); + block.setRegistryName(Reference.MOD_ID, "molten_" + fluid.getName()); + // Registers the fluid in its block form and its corresponding item + // (block/fluid as item in inventory) + GameRegistry.register(block); + GameRegistry.register(new ItemBlock(block).setRegistryName(block.getRegistryName())); + // Registers the fluid's model but only on the client side + TinkersDefense.proxy.registerFluidModels(fluid); + } + + void createFluid(String name, TDFluid fluid, Block fluidBlock) { fluidBlock.setUnlocalizedName("molten_" + fluid.getName()); - fluidBlock.setRegistryName(Reference.MOD_ID, "molten_" + fluid.getName()); - // Registers the fluid in its block form and its corresponding item (block/fluid as item in inventory) - GameRegistry.register(fluidBlock); - GameRegistry.register(new ItemBlock(fluidBlock).setRegistryName(fluidBlock.getRegistryName())); - // Registers the fluid's model but only on the client side - TinkersDefense.proxy.registerFluidModels(fluid); + fluidBlock.setRegistryName(Reference.MOD_ID, "molten_" + fluid.getName()); + // Registers the fluid in its block form and its corresponding item + // (block/fluid as item in inventory) + GameRegistry.register(fluidBlock); + GameRegistry.register(new ItemBlock(fluidBlock).setRegistryName(fluidBlock.getRegistryName())); + // Registers the fluid's model but only on the client side + TinkersDefense.proxy.registerFluidModels(fluid); } - + + void createItems(String name, TDOreDictItem nugget, TDOreDictItem ingot, TDOreDictItem dust) { + nugget = new TDOreDictItem("nugget", name); + ingot = new TDOreDictItem("ingot", name); + dust = new TDOreDictItem("dust", name); + + GameRegistry.register(nugget); + GameRegistry.register(ingot); + GameRegistry.register(dust); + + OreDictionary.registerOre(nugget.getOreDictPrefix() + StringUtils.capitalize(name), nugget); + OreDictionary.registerOre(ingot.getOreDictPrefix() + StringUtils.capitalize(name), ingot); + OreDictionary.registerOre(dust.getOreDictPrefix() + StringUtils.capitalize(name), dust); + } + + void createMaterial(String name, Material mat, Fluid fluid, Item item, HeadMaterialStats headstat, HandleMaterialStats handlestat, + ExtraMaterialStats extrastat, BowMaterialStats bowstat, boolean craftable, + boolean castable) { + TinkerRegistry.addMaterial(mat); + mat.setFluid(fluid).setCraftable(craftable).setCastable(castable); + mat.addItem(item, 1, Material.VALUE_Ingot); + mat.setRepresentativeItem(item); + + TinkerRegistry.addMaterialStats(mat, headstat); + TinkerRegistry.addMaterialStats(mat, handlestat); + TinkerRegistry.addMaterialStats(mat, extrastat); + TinkerRegistry.addMaterialStats(mat, bowstat); + + MaterialIntegration integration = new MaterialIntegration(mat, fluid, name); + integration.integrate(); + } + private void registerClothMaterials() { black = new Material("blackCloth", 0x191616); red = new Material("redCloth", 0x963430); @@ -247,42 +376,42 @@ public class TDMaterials { magenta = new Material("magentaCloth", 0xB350BC); orange = new Material("orangeCloth", 0xDB7D3E); white = new Material("whiteCloth", 0xDDDDDD); - + Material.UNKNOWN.addStats(new MaterialCloth(100)); - black.addItem(new ItemStack(Blocks.WOOL,15), 1, Material.VALUE_Ingot); - red.addItem(new ItemStack(Blocks.WOOL,14), 1, Material.VALUE_Ingot); - green.addItem(new ItemStack(Blocks.WOOL,13), 1, Material.VALUE_Ingot); - brown.addItem(new ItemStack(Blocks.WOOL,12), 1, Material.VALUE_Ingot); - blue.addItem(new ItemStack(Blocks.WOOL,11), 1, Material.VALUE_Ingot); - purple.addItem(new ItemStack(Blocks.WOOL,10), 1, Material.VALUE_Ingot); - cyan.addItem(new ItemStack(Blocks.WOOL,9), 1, Material.VALUE_Ingot); - lightgray.addItem(new ItemStack(Blocks.WOOL,8), 1, Material.VALUE_Ingot); - gray.addItem(new ItemStack(Blocks.WOOL,7), 1, Material.VALUE_Ingot); - pink.addItem(new ItemStack(Blocks.WOOL,6), 1, Material.VALUE_Ingot); - lime.addItem(new ItemStack(Blocks.WOOL,5), 1, Material.VALUE_Ingot); - yellow.addItem(new ItemStack(Blocks.WOOL,4), 1, Material.VALUE_Ingot); - lightblue.addItem(new ItemStack(Blocks.WOOL,3), 1, Material.VALUE_Ingot); - magenta.addItem(new ItemStack(Blocks.WOOL,2), 1, Material.VALUE_Ingot); - orange.addItem(new ItemStack(Blocks.WOOL,1), 1, Material.VALUE_Ingot); - white.addItem(new ItemStack(Blocks.WOOL,0), 1, Material.VALUE_Ingot); - - black.setRepresentativeItem(new ItemStack(Blocks.WOOL,15)); - red.setRepresentativeItem(new ItemStack(Blocks.WOOL,14)); - green.setRepresentativeItem(new ItemStack(Blocks.WOOL,13)); - brown.setRepresentativeItem(new ItemStack(Blocks.WOOL,12)); - blue.setRepresentativeItem(new ItemStack(Blocks.WOOL,11)); - purple.setRepresentativeItem(new ItemStack(Blocks.WOOL,10)); - cyan.setRepresentativeItem(new ItemStack(Blocks.WOOL,9)); - lightgray.setRepresentativeItem(new ItemStack(Blocks.WOOL,8)); - gray.setRepresentativeItem(new ItemStack(Blocks.WOOL,7)); - pink.setRepresentativeItem(new ItemStack(Blocks.WOOL,6)); - lime.setRepresentativeItem(new ItemStack(Blocks.WOOL,5)); - yellow.setRepresentativeItem(new ItemStack(Blocks.WOOL,4)); - lightblue.setRepresentativeItem(new ItemStack(Blocks.WOOL,3)); - magenta.setRepresentativeItem(new ItemStack(Blocks.WOOL,2)); - orange.setRepresentativeItem(new ItemStack(Blocks.WOOL,1)); - white.setRepresentativeItem(new ItemStack(Blocks.WOOL,0)); - + black.addItem(new ItemStack(Blocks.WOOL, 15), 1, Material.VALUE_Ingot); + red.addItem(new ItemStack(Blocks.WOOL, 14), 1, Material.VALUE_Ingot); + green.addItem(new ItemStack(Blocks.WOOL, 13), 1, Material.VALUE_Ingot); + brown.addItem(new ItemStack(Blocks.WOOL, 12), 1, Material.VALUE_Ingot); + blue.addItem(new ItemStack(Blocks.WOOL, 11), 1, Material.VALUE_Ingot); + purple.addItem(new ItemStack(Blocks.WOOL, 10), 1, Material.VALUE_Ingot); + cyan.addItem(new ItemStack(Blocks.WOOL, 9), 1, Material.VALUE_Ingot); + lightgray.addItem(new ItemStack(Blocks.WOOL, 8), 1, Material.VALUE_Ingot); + gray.addItem(new ItemStack(Blocks.WOOL, 7), 1, Material.VALUE_Ingot); + pink.addItem(new ItemStack(Blocks.WOOL, 6), 1, Material.VALUE_Ingot); + lime.addItem(new ItemStack(Blocks.WOOL, 5), 1, Material.VALUE_Ingot); + yellow.addItem(new ItemStack(Blocks.WOOL, 4), 1, Material.VALUE_Ingot); + lightblue.addItem(new ItemStack(Blocks.WOOL, 3), 1, Material.VALUE_Ingot); + magenta.addItem(new ItemStack(Blocks.WOOL, 2), 1, Material.VALUE_Ingot); + orange.addItem(new ItemStack(Blocks.WOOL, 1), 1, Material.VALUE_Ingot); + white.addItem(new ItemStack(Blocks.WOOL, 0), 1, Material.VALUE_Ingot); + + black.setRepresentativeItem(new ItemStack(Blocks.WOOL, 15)); + red.setRepresentativeItem(new ItemStack(Blocks.WOOL, 14)); + green.setRepresentativeItem(new ItemStack(Blocks.WOOL, 13)); + brown.setRepresentativeItem(new ItemStack(Blocks.WOOL, 12)); + blue.setRepresentativeItem(new ItemStack(Blocks.WOOL, 11)); + purple.setRepresentativeItem(new ItemStack(Blocks.WOOL, 10)); + cyan.setRepresentativeItem(new ItemStack(Blocks.WOOL, 9)); + lightgray.setRepresentativeItem(new ItemStack(Blocks.WOOL, 8)); + gray.setRepresentativeItem(new ItemStack(Blocks.WOOL, 7)); + pink.setRepresentativeItem(new ItemStack(Blocks.WOOL, 6)); + lime.setRepresentativeItem(new ItemStack(Blocks.WOOL, 5)); + yellow.setRepresentativeItem(new ItemStack(Blocks.WOOL, 4)); + lightblue.setRepresentativeItem(new ItemStack(Blocks.WOOL, 3)); + magenta.setRepresentativeItem(new ItemStack(Blocks.WOOL, 2)); + orange.setRepresentativeItem(new ItemStack(Blocks.WOOL, 1)); + white.setRepresentativeItem(new ItemStack(Blocks.WOOL, 0)); + TinkerRegistry.addMaterial(black); TinkerRegistry.addMaterial(red); TinkerRegistry.addMaterial(green); @@ -299,7 +428,7 @@ public class TDMaterials { TinkerRegistry.addMaterial(magenta); TinkerRegistry.addMaterial(orange); TinkerRegistry.addMaterial(white); - + TinkerRegistry.addMaterialStats(black, new MaterialCloth(100)); TinkerRegistry.addMaterialStats(red, new MaterialCloth(100)); TinkerRegistry.addMaterialStats(green, new MaterialCloth(100)); @@ -317,4 +446,30 @@ public class TDMaterials { TinkerRegistry.addMaterialStats(orange, new MaterialCloth(100)); TinkerRegistry.addMaterialStats(white, new MaterialCloth(100)); } + + private void registerMaterials() + { + createMaterial("aeonsteel", matAeonsteel, fluidAeonsteel, ingotAeonsteel, new HeadMaterialStats(0, 0, 0, HarvestLevels.COBALT), new HandleMaterialStats(0, 0), new ExtraMaterialStats(0), new BowMaterialStats(0, 0, 0), false, true); + createMaterial("queensgold", matQueensGold, fluidQueensGold, ingotQueensGold, new HeadMaterialStats(0, 0, 0, HarvestLevels.COBALT), new HandleMaterialStats(0, 0), new ExtraMaterialStats(0), new BowMaterialStats(0, 0, 0), false, true); + createMaterial("dogbearium", matDogbearium, fluidDogbearium, ingotDogbearium, new HeadMaterialStats(0, 0, 0, HarvestLevels.COBALT), new HandleMaterialStats(0, 0), new ExtraMaterialStats(0), new BowMaterialStats(0, 0, 0), false, true); + createMaterial("redcandy", matRedCandy, fluidRedCandy, ingotRedCandy, new HeadMaterialStats(0, 0, 0, HarvestLevels.COBALT), new HandleMaterialStats(0, 0), new ExtraMaterialStats(0), new BowMaterialStats(0, 0, 0), false, true); + createMaterial("greencandy", matGreenCandy, fluidGreenCandy, ingotGreenCandy, new HeadMaterialStats(0, 0, 0, HarvestLevels.COBALT), new HandleMaterialStats(0, 0), new ExtraMaterialStats(0), new BowMaterialStats(0, 0, 0), false, true); + + createMaterial("sinisterium", matSinisterium, fluidSinisterium, ingotSinisterium, new HeadMaterialStats(0, 0, 0, HarvestLevels.COBALT), new HandleMaterialStats(0, 0), new ExtraMaterialStats(0), new BowMaterialStats(0, 0, 0), false, true); + createMaterial("nihilite", matNihilite, fluidNihilite, ingotNihilite, new HeadMaterialStats(0, 0, 0, HarvestLevels.COBALT), new HandleMaterialStats(0, 0), new ExtraMaterialStats(0), new BowMaterialStats(0, 0, 0), false, true); + createMaterial("orichalcum", matOrichalcum, fluidOrichalcum, ingotOrichalcum, new HeadMaterialStats(0, 0, 0, HarvestLevels.COBALT), new HandleMaterialStats(0, 0), new ExtraMaterialStats(0), new BowMaterialStats(0, 0, 0), false, true); + createMaterial("pandorium", matPandorium, fluidPandorium, ingotPandorium, new HeadMaterialStats(0, 0, 0, HarvestLevels.COBALT), new HandleMaterialStats(0, 0), new ExtraMaterialStats(0), new BowMaterialStats(0, 0, 0), false, true); + + createMaterial("rosegold", matRoseGold, fluidRoseGold, ingotRoseGold, new HeadMaterialStats(0, 0, 0, HarvestLevels.COBALT), new HandleMaterialStats(0, 0), new ExtraMaterialStats(0), new BowMaterialStats(0, 0, 0), false, true); + createMaterial("platinum", matPlatinum, fluidPlatinum, ingotPlatinum, new HeadMaterialStats(0, 0, 0, HarvestLevels.COBALT), new HandleMaterialStats(0, 0), new ExtraMaterialStats(0), new BowMaterialStats(0, 0, 0), false, true); + createMaterial("brass", matBrass, fluidBrass, ingotBrass, new HeadMaterialStats(0, 0, 0, HarvestLevels.COBALT), new HandleMaterialStats(0, 0), new ExtraMaterialStats(0), new BowMaterialStats(0, 0, 0), false, true); + createMaterial("cheese", matCheese, fluidCheese, ingotCheese, new HeadMaterialStats(0, 0, 0, HarvestLevels.COBALT), new HandleMaterialStats(0, 0), new ExtraMaterialStats(0), new BowMaterialStats(0, 0, 0), false, true); + +// public static TDOreDictItem ingotRoseGold; +// public static TDOreDictItem ingotPlatinum; +// public static TDOreDictItem ingotBrass; +// public static TDOreDictItem ingotSilver; +// public static TDOreDictItem ingotCheese; + + } } -- cgit v1.2.3