diff --git a/thaumicbees_src/thaumicbees/bees/AlleleFlower.java b/thaumicbees_src/thaumicbees/bees/AlleleFlower.java new file mode 100644 index 0000000..7a7c1f9 --- /dev/null +++ b/thaumicbees_src/thaumicbees/bees/AlleleFlower.java @@ -0,0 +1,44 @@ +package thaumicbees.bees; + +import forestry.api.apiculture.IAlleleFlowers; +import forestry.api.apiculture.IFlowerProvider; +import forestry.api.genetics.AlleleManager; + +public class AlleleFlower implements IAlleleFlowers +{ + + public static AlleleFlower alleleFlowerBookshelf; + public static AlleleFlower alleleFlowerThaumcraft; + + private String uid; + private IFlowerProvider provider; + private boolean dominant; + + public AlleleFlower(String uid, IFlowerProvider flowerProvider, boolean isDominant) + { + this.uid = "thaumicbees." + uid; + this.provider = flowerProvider; + this.dominant = isDominant; + + AlleleManager.alleleRegistry.registerAllele(this); + } + + @Override + public String getUID() + { + return this.uid; + } + + @Override + public boolean isDominant() + { + return this.dominant; + } + + @Override + public IFlowerProvider getProvider() + { + return this.provider; + } + +} diff --git a/thaumicbees_src/thaumicbees/bees/BeeMutation.java b/thaumicbees_src/thaumicbees/bees/BeeMutation.java index 2a0aead..c310ab6 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeMutation.java +++ b/thaumicbees_src/thaumicbees/bees/BeeMutation.java @@ -35,7 +35,6 @@ public class BeeMutation implements IBeeMutation mutationTemplate = producesGenome; baseChance = percentChance; isSecret = hide; - BeeManager.beeMutations.add(this); } public int getChance(IBeeHousing housing, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java index 0a4e412..73ba588 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java @@ -1,35 +1,51 @@ package thaumicbees.bees; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IFlowerProvider; +import forestry.api.genetics.IPollinatable; public class FlowerProviderBookshelf implements IFlowerProvider { public boolean isAcceptedFlower(World world, IBeeGenome genome, int x, int i, int j) { - return false; + boolean flag = false; + if (world.getBlockId(x, i, j) == Block.bookShelf.blockID) + { + flag = true; + } + return flag; } public boolean growFlower(World world, IBeeGenome genome, int x, int i, int j) { + // Always return true so the system thinks we grew a flower. + // Bees can't grow bookshelves! Are you crazy?! + return true; + } + + public ItemStack[] affectProducts(World world, IBeeGenome genome, int x, int i, int j, ItemStack products[]) + { + return products; + } + + public ItemStack[] getItemStacks() + { + return new ItemStack[] { new ItemStack(Block.bookShelf) }; + } + + @Override + public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable) + { + // No idea what this is supposed to do. return false; } public String getDescription() { - return null; - } - - public ItemStack[] affectProducts(World world, IBeeGenome genome, int x, int i, int j, ItemStack aum[]) - { - return null; - } - - public ItemStack[] getItemStacks() - { - return null; + return "Books"; } } diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java new file mode 100644 index 0000000..666e491 --- /dev/null +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java @@ -0,0 +1,65 @@ +package thaumicbees.bees; + +import thaumicbees.block.BlockManager; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IFlowerProvider; +import forestry.api.genetics.IPollinatable; + +public class FlowerProviderThaumcraftFlower implements IFlowerProvider +{ + private ItemStack[] flowers = {new ItemStack(BlockManager.ThaumcraftPlant, 1, 2), new ItemStack(BlockManager.ThaumcraftPlant, 1, 3) }; + + @Override + public boolean isAcceptedFlower(World world, IBeeGenome genome, int x, int y, int z) + { + boolean flag = false; + if (world.getBlockId(x, y, z) == BlockManager.ThaumcraftPlant.blockID) + { + int meta = world.getBlockMetadata(x, y, z); + if (meta == 2 || meta == 3) + { + flag = true; + } + } + return flag; + } + + @Override + public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable) + { + return false; + } + + @Override + public boolean growFlower(World world, IBeeGenome genome, int x, int y, int z) + { + boolean flag = false; + if (world.isAirBlock(x, y, z)) + { + int rand = world.rand.nextInt(10); + world.setBlockAndMetadata(x, y, z, BlockManager.ThaumcraftPlant.blockID, (rand >= 5) ? 2 : 3); + } + return flag; + } + + @Override + public String getDescription() + { + return "Magic Flowers"; + } + + @Override + public ItemStack[] affectProducts(World world, IBeeGenome genome, int x, int y, int z, ItemStack[] products) + { + return products; + } + + @Override + public ItemStack[] getItemStacks() + { + return this.flowers; + } + +} diff --git a/thaumicbees_src/thaumicbees/bees/ThaumicBeesPlugin.java b/thaumicbees_src/thaumicbees/bees/ThaumicBeesPlugin.java index 5c25c4e..8502ed6 100644 --- a/thaumicbees_src/thaumicbees/bees/ThaumicBeesPlugin.java +++ b/thaumicbees_src/thaumicbees/bees/ThaumicBeesPlugin.java @@ -10,6 +10,8 @@ import thaumcraft.api.EnumTag; import thaumcraft.api.ObjectTags; import thaumcraft.api.ThaumcraftApi; import thaumicbees.item.ItemManager; +import thaumicbees.item.ItemComb.CombType; +import thaumicbees.item.ItemMiscResources.ResourceType; import net.minecraft.command.ICommand; import net.minecraft.item.Item; @@ -50,16 +52,20 @@ public class ThaumicBeesPlugin implements IPlugin BeeBranch.Elemental = new BeeBranch("Elemental", "praecantatio"); BeeBranch.Scholarly = new BeeBranch("Scholarly", "scholasticus"); + AlleleFlower.alleleFlowerBookshelf = new AlleleFlower("flowerBookshelf", new FlowerProviderBookshelf(), true); + AlleleFlower.alleleFlowerThaumcraft = new AlleleFlower("flowerThaumcraftPlant", new FlowerProviderThaumcraftFlower(), false); + BeeSpecies.Esoteric = new BeeSpecies("Esoteric", "", "secretiore", BeeBranch.Arcane, 0, 0x001099, 0xcc763c, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, hideSpecies, true, true); - BeeSpecies.Esoteric.addProduct(new ItemStack(ItemManager.magicalComb), 5); + BeeSpecies.Esoteric.addProduct(ItemManager.combs.getStackForType(CombType.OCCULT), 45); BeeSpecies.Esoteric.setGene(EnumBeeChromosome.TEMPERATURE_TOLERANCE, AlleleManager.getAllele("toleranceBoth2")); breedingMgr.registerBeeTemplate(BeeSpecies.Esoteric.getGenome()); BeeSpecies.Mysterious = new BeeSpecies("Mysterious", "", "mysticus", BeeBranch.Arcane, 0, 0x762bc2, defaultBodyColour, EnumTemperature.NORMAL, EnumHumidity.NORMAL, - false, hideSpecies, true, true); + false, hideSpecies, true, true); + BeeSpecies.Mysterious.addProduct(ItemManager.combs.getStackForType(CombType.OCCULT), 60); BeeSpecies.Mysterious.setGene(EnumBeeChromosome.TEMPERATURE_TOLERANCE, AlleleManager.getAllele("toleranceBoth2")); BeeSpecies.Mysterious.setGene(EnumBeeChromosome.FERTILITY, AlleleManager.getAllele("fertilityNormal")); BeeSpecies.Mysterious.setGene(EnumBeeChromosome.FLOWERING, AlleleManager.getAllele("floweringMaximum")); @@ -68,14 +74,16 @@ public class ThaumicBeesPlugin implements IPlugin BeeSpecies.Arcane = new BeeSpecies("Arcane", "", "arcanus", BeeBranch.Arcane, 0, 0xd242df, defaultBodyColour, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, hideSpecies, true, true); - BeeSpecies.Mysterious.setGene(EnumBeeChromosome.TEMPERATURE_TOLERANCE, AlleleManager.getAllele("toleranceBoth2")); - BeeSpecies.Mysterious.setGene(EnumBeeChromosome.FLOWERING, AlleleManager.getAllele("floweringMaximum")); + BeeSpecies.Arcane.addProduct(ItemManager.combs.getStackForType(CombType.OCCULT), 80); + BeeSpecies.Arcane.setGene(EnumBeeChromosome.TEMPERATURE_TOLERANCE, AlleleManager.getAllele("toleranceBoth2")); + BeeSpecies.Arcane.setGene(EnumBeeChromosome.FLOWERING, AlleleManager.getAllele("floweringMaximum")); BeeSpecies.Arcane.setGene(EnumBeeChromosome.FERTILITY, AlleleManager.getAllele("fertilityLow")); breedingMgr.registerBeeTemplate(BeeSpecies.Arcane.getGenome()); BeeSpecies.Charmed = new BeeSpecies("Charmed", "", "larvatus", BeeBranch.Supernatural, 0, 0x48EEEC, defaultBodyColour, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, hideSpecies, true, true); + BeeSpecies.Charmed.addProduct(ItemManager.combs.getStackForType(CombType.OTHERWORLDLY), 40); BeeSpecies.Charmed.setGene(EnumBeeChromosome.NOCTURNAL, AlleleManager.getAllele("boolTrue")); BeeSpecies.Charmed.setGene(EnumBeeChromosome.SPEED, AlleleManager.getAllele("speedNorm")); BeeSpecies.Charmed.setGene(EnumBeeChromosome.FLOWERING, AlleleManager.getAllele("floweringSlowest")); @@ -84,24 +92,60 @@ public class ThaumicBeesPlugin implements IPlugin BeeSpecies.Enchanted = new BeeSpecies("Enchanted", "", "cantatus", BeeBranch.Supernatural, 0, 0x18e726, defaultBodyColour, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, hideSpecies, true, true); - BeeSpecies.Charmed.setGene(EnumBeeChromosome.NOCTURNAL, AlleleManager.getAllele("boolTrue")); - BeeSpecies.Charmed.setGene(EnumBeeChromosome.SPEED, AlleleManager.getAllele("speedNorm")); - BeeSpecies.Charmed.setGene(EnumBeeChromosome.FLOWERING, AlleleManager.getAllele("floweringSlowest")); - BeeSpecies.Charmed.setGene(EnumBeeChromosome.TEMPERATURE_TOLERANCE, AlleleManager.getAllele("toleranceBoth1")); + BeeSpecies.Enchanted.addProduct(ItemManager.combs.getStackForType(CombType.OTHERWORLDLY), 60); + BeeSpecies.Enchanted.setGene(EnumBeeChromosome.NOCTURNAL, AlleleManager.getAllele("boolTrue")); + BeeSpecies.Enchanted.setGene(EnumBeeChromosome.SPEED, AlleleManager.getAllele("speedNorm")); + BeeSpecies.Enchanted.setGene(EnumBeeChromosome.FLOWERING, AlleleManager.getAllele("floweringSlowest")); + BeeSpecies.Enchanted.setGene(EnumBeeChromosome.TEMPERATURE_TOLERANCE, AlleleManager.getAllele("toleranceBoth1")); breedingMgr.registerBeeTemplate(BeeSpecies.Enchanted.getGenome()); BeeSpecies.Supernatural = new BeeSpecies("Supernatural", "", "coeleste", BeeBranch.Supernatural, 0, 0x005614, defaultBodyColour, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, hideSpecies, true, true); - BeeSpecies.Charmed.setGene(EnumBeeChromosome.NOCTURNAL, AlleleManager.getAllele("boolTrue")); - BeeSpecies.Charmed.setGene(EnumBeeChromosome.SPEED, AlleleManager.getAllele("speedNorm")); - BeeSpecies.Charmed.setGene(EnumBeeChromosome.FLOWERING, AlleleManager.getAllele("floweringSlowest")); - BeeSpecies.Charmed.setGene(EnumBeeChromosome.TEMPERATURE_TOLERANCE, AlleleManager.getAllele("toleranceBoth2")); + BeeSpecies.Supernatural.addProduct(ItemManager.combs.getStackForType(CombType.OTHERWORLDLY), 80); + BeeSpecies.Supernatural.setGene(EnumBeeChromosome.NOCTURNAL, AlleleManager.getAllele("boolTrue")); + BeeSpecies.Supernatural.setGene(EnumBeeChromosome.SPEED, AlleleManager.getAllele("speedNorm")); + BeeSpecies.Supernatural.setGene(EnumBeeChromosome.FLOWERING, AlleleManager.getAllele("floweringSlowest")); + BeeSpecies.Supernatural.setGene(EnumBeeChromosome.TEMPERATURE_TOLERANCE, AlleleManager.getAllele("toleranceBoth2")); breedingMgr.registerBeeTemplate(BeeSpecies.Supernatural.getGenome()); + + BeeSpecies.Pupil = new BeeSpecies("Pupil", "", "disciplina", BeeBranch.Scholarly, 0, + 0xFFFF00, defaultBodyColour, EnumTemperature.NORMAL, EnumHumidity.ARID, + false, hideSpecies, true, true); + BeeSpecies.Pupil.addProduct(ItemManager.combs.getStackForType(CombType.PAPERY), 50); + BeeSpecies.Pupil.setGene(EnumBeeChromosome.SPEED, AlleleManager.getAllele("speedSlowest")); + BeeSpecies.Pupil.setGene(EnumBeeChromosome.LIFESPAN, AlleleManager.getAllele("lifespanElongated")); + BeeSpecies.Pupil.setGene(EnumBeeChromosome.CAVE_DWELLING, AlleleManager.getAllele("boolTrue")); + BeeSpecies.Pupil.setGene(EnumBeeChromosome.FLOWER_PROVIDER, AlleleFlower.alleleFlowerBookshelf); + breedingMgr.registerBeeTemplate(BeeSpecies.Pupil.getGenome()); + + BeeSpecies.Scholarly = new BeeSpecies("Scholarly", "", "studiosis", BeeBranch.Scholarly, 0, + 0x6E0000, defaultBodyColour, EnumTemperature.NORMAL, EnumHumidity.ARID, + false, hideSpecies, true, false); + BeeSpecies.Scholarly.addProduct(ItemManager.combs.getStackForType(CombType.PAPERY), 60); + BeeSpecies.Scholarly.addSpecialty(ItemManager.miscResources.getStackForType(ResourceType.KNOWLEDGE_FRAGMENT), 2); + BeeSpecies.Scholarly.setGene(EnumBeeChromosome.SPEED, AlleleManager.getAllele("speedSlower")); + BeeSpecies.Scholarly.setGene(EnumBeeChromosome.LIFESPAN, AlleleManager.getAllele("lifespanElongated")); + BeeSpecies.Scholarly.setGene(EnumBeeChromosome.CAVE_DWELLING, AlleleManager.getAllele("boolTrue")); + BeeSpecies.Scholarly.setGene(EnumBeeChromosome.FLOWER_PROVIDER, AlleleFlower.alleleFlowerBookshelf); + breedingMgr.registerBeeTemplate(BeeSpecies.Scholarly.getGenome()); + + BeeSpecies.Savant = new BeeSpecies("Savant", "", "philologus", BeeBranch.Scholarly, 0, + 0x6E1C6D, defaultBodyColour, EnumTemperature.NORMAL, EnumHumidity.ARID, + true, hideSpecies, true, false); + BeeSpecies.Savant.addProduct(ItemManager.combs.getStackForType(CombType.PAPERY), 70); + BeeSpecies.Savant.addSpecialty(ItemManager.miscResources.getStackForType(ResourceType.KNOWLEDGE_FRAGMENT), 5); + BeeSpecies.Savant.setGene(EnumBeeChromosome.SPEED, AlleleManager.getAllele("speedNorm")); + BeeSpecies.Savant.setGene(EnumBeeChromosome.LIFESPAN, AlleleManager.getAllele("lifespanElongated")); + BeeSpecies.Savant.setGene(EnumBeeChromosome.CAVE_DWELLING, AlleleManager.getAllele("boolTrue")); + BeeSpecies.Savant.setGene(EnumBeeChromosome.FLOWER_PROVIDER, AlleleFlower.alleleFlowerBookshelf); + breedingMgr.registerBeeTemplate(BeeSpecies.Savant.getGenome()); BeeSpecies.Stark = new BeeSpecies("Stark", "", "torridus", BeeBranch.Stark, 0, 0xCCCCCC, 0x999999, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, hideSpecies, true, false); + BeeSpecies.Stark.addProduct(ItemManager.combs.getStackForType(CombType.STARK), 75); + BeeSpecies.Stark.setGene(EnumBeeChromosome.FLOWER_PROVIDER, AlleleFlower.alleleFlowerThaumcraft); breedingMgr.registerBeeTemplate(BeeSpecies.Stark.getGenome()); BeeSpecies.Air = new BeeSpecies("Aura", "", "ventosa", BeeBranch.Elemental, 0, @@ -111,65 +155,45 @@ public class ThaumicBeesPlugin implements IPlugin BeeSpecies.Air.setGene(EnumBeeChromosome.LIFESPAN, AlleleManager.getAllele("lifespanShortened")); BeeSpecies.Air.setGene(EnumBeeChromosome.TERRITORY, AlleleManager.getAllele("territoryLargest")); BeeSpecies.Air.setGene(EnumBeeChromosome.TOLERANT_FLYER, AlleleManager.getAllele("boolTrue")); + BeeSpecies.Air.setGene(EnumBeeChromosome.FLOWER_PROVIDER, AlleleFlower.alleleFlowerThaumcraft); breedingMgr.registerBeeTemplate(BeeSpecies.Air.getGenome()); - BeeSpecies.Water = new BeeSpecies("Aqua", "", "umidus", BeeBranch.Elemental, 0, - 0x36CFD9, 0x1054A1, EnumTemperature.NORMAL, EnumHumidity.DAMP, - true, hideSpecies, true, true); - BeeSpecies.Water.setGene(EnumBeeChromosome.SPEED, AlleleManager.getAllele("speedFast")); - BeeSpecies.Water.setGene(EnumBeeChromosome.LIFESPAN, AlleleManager.getAllele("lifespanElongated")); - BeeSpecies.Water.setGene(EnumBeeChromosome.HUMIDITY_TOLERANCE, AlleleManager.getAllele("toleranceUp2")); - BeeSpecies.Water.setGene(EnumBeeChromosome.TOLERANT_FLYER, AlleleManager.getAllele("boolTrue")); - breedingMgr.registerBeeTemplate(BeeSpecies.Water.getGenome()); - - BeeSpecies.Earth = new BeeSpecies("Solum", "", "sordida", BeeBranch.Elemental, 0, - 0xD9A136, 0x79450C, EnumTemperature.NORMAL, EnumHumidity.NORMAL, - true, hideSpecies, true, true); - BeeSpecies.Earth.setGene(EnumBeeChromosome.SPEED, AlleleManager.getAllele("speedFast")); - BeeSpecies.Earth.setGene(EnumBeeChromosome.LIFESPAN, AlleleManager.getAllele("lifespanElongated")); - BeeSpecies.Earth.setGene(EnumBeeChromosome.HUMIDITY_TOLERANCE, AlleleManager.getAllele("toleranceUp2")); - BeeSpecies.Earth.setGene(EnumBeeChromosome.TOLERANT_FLYER, AlleleManager.getAllele("boolTrue")); - breedingMgr.registerBeeTemplate(BeeSpecies.Earth.getGenome()); - BeeSpecies.Fire = new BeeSpecies("Ignis", "", "praefervidus", BeeBranch.Elemental, 0, 0xE50B0B, 0x95132F, EnumTemperature.HELLISH, EnumHumidity.ARID, true, hideSpecies, true, true); BeeSpecies.Fire.setGene(EnumBeeChromosome.SPEED, AlleleManager.getAllele("speedFaster")); BeeSpecies.Fire.setGene(EnumBeeChromosome.LIFESPAN, AlleleManager.getAllele("lifespanNormal")); BeeSpecies.Fire.setGene(EnumBeeChromosome.TEMPERATURE_TOLERANCE, AlleleManager.getAllele("toleranceDown5")); - BeeSpecies.Fire.setGene(EnumBeeChromosome.HUMIDITY_TOLERANCE, AlleleManager.getAllele("toleranceDown2")); + BeeSpecies.Fire.setGene(EnumBeeChromosome.HUMIDITY_TOLERANCE, AlleleManager.getAllele("toleranceUp2")); BeeSpecies.Fire.setGene(EnumBeeChromosome.TOLERANT_FLYER, AlleleManager.getAllele("boolTrue")); + BeeSpecies.Fire.setGene(EnumBeeChromosome.FLOWER_PROVIDER, AlleleFlower.alleleFlowerThaumcraft); breedingMgr.registerBeeTemplate(BeeSpecies.Fire.getGenome()); - BeeSpecies.Pupil = new BeeSpecies("Pupil", "", "disciplina", BeeBranch.Scholarly, 0, - 0xFFFF00, defaultBodyColour, EnumTemperature.NORMAL, EnumHumidity.ARID, - false, hideSpecies, true, true); - BeeSpecies.Pupil.setGene(EnumBeeChromosome.SPEED, AlleleManager.getAllele("speedSlowest")); - BeeSpecies.Pupil.setGene(EnumBeeChromosome.LIFESPAN, AlleleManager.getAllele("lifespanElongated")); - BeeSpecies.Pupil.setGene(EnumBeeChromosome.CAVE_DWELLING, AlleleManager.getAllele("boolTrue")); - breedingMgr.registerBeeTemplate(BeeSpecies.Pupil.getGenome()); + BeeSpecies.Water = new BeeSpecies("Aqua", "", "umidus", BeeBranch.Elemental, 0, + 0x36CFD9, 0x1054A1, EnumTemperature.NORMAL, EnumHumidity.DAMP, + true, hideSpecies, true, true); + BeeSpecies.Water.setGene(EnumBeeChromosome.SPEED, AlleleManager.getAllele("speedFast")); + BeeSpecies.Water.setGene(EnumBeeChromosome.LIFESPAN, AlleleManager.getAllele("lifespanElongated")); + BeeSpecies.Water.setGene(EnumBeeChromosome.HUMIDITY_TOLERANCE, AlleleManager.getAllele("toleranceDown2")); + BeeSpecies.Water.setGene(EnumBeeChromosome.TOLERANT_FLYER, AlleleManager.getAllele("boolTrue")); + BeeSpecies.Water.setGene(EnumBeeChromosome.FLOWER_PROVIDER, AlleleFlower.alleleFlowerThaumcraft); + breedingMgr.registerBeeTemplate(BeeSpecies.Water.getGenome()); - BeeSpecies.Scholarly = new BeeSpecies("Scholarly", "", "studiosis", BeeBranch.Scholarly, 0, - 0x6E0000, defaultBodyColour, EnumTemperature.NORMAL, EnumHumidity.ARID, - false, hideSpecies, true, false); - BeeSpecies.Scholarly.setGene(EnumBeeChromosome.SPEED, AlleleManager.getAllele("speedSlower")); - BeeSpecies.Pupil.setGene(EnumBeeChromosome.LIFESPAN, AlleleManager.getAllele("lifespanElongated")); - BeeSpecies.Pupil.setGene(EnumBeeChromosome.CAVE_DWELLING, AlleleManager.getAllele("boolTrue")); - breedingMgr.registerBeeTemplate(BeeSpecies.Scholarly.getGenome()); - - BeeSpecies.Savant = new BeeSpecies("Savant", "", "philologus", BeeBranch.Scholarly, 0, - 0x6E1C6D, defaultBodyColour, EnumTemperature.NORMAL, EnumHumidity.ARID, - true, hideSpecies, true, false); - BeeSpecies.Pupil.setGene(EnumBeeChromosome.SPEED, AlleleManager.getAllele("speedNorm")); - BeeSpecies.Pupil.setGene(EnumBeeChromosome.LIFESPAN, AlleleManager.getAllele("lifespanElongated")); - BeeSpecies.Pupil.setGene(EnumBeeChromosome.CAVE_DWELLING, AlleleManager.getAllele("boolTrue")); - breedingMgr.registerBeeTemplate(BeeSpecies.Savant.getGenome()); + BeeSpecies.Earth = new BeeSpecies("Solum", "", "sordida", BeeBranch.Elemental, 0, + 0x005100, 0x00a000, EnumTemperature.NORMAL, EnumHumidity.NORMAL, + true, hideSpecies, true, true); + BeeSpecies.Earth.setGene(EnumBeeChromosome.SPEED, AlleleManager.getAllele("speedFast")); + BeeSpecies.Earth.setGene(EnumBeeChromosome.LIFESPAN, AlleleManager.getAllele("lifespanElongated")); + BeeSpecies.Earth.setGene(EnumBeeChromosome.HUMIDITY_TOLERANCE, AlleleManager.getAllele("toleranceDown2")); + BeeSpecies.Earth.setGene(EnumBeeChromosome.TOLERANT_FLYER, AlleleManager.getAllele("boolTrue")); + BeeSpecies.Earth.setGene(EnumBeeChromosome.FLOWER_PROVIDER, AlleleFlower.alleleFlowerThaumcraft); + breedingMgr.registerBeeTemplate(BeeSpecies.Earth.getGenome()); } private void setupBeeMutations() { BeeMutation.Esoteric = new BeeMutation(BeeSpecies.getBaseSpecies("Imperial"), BeeSpecies.getBaseSpecies("Demonic"), BeeSpecies.Esoteric.getGenome(), 10, false); - BeeMutation.Esoteric1 = new BeeMutation(BeeSpecies.getBaseSpecies("Heroic"), BeeSpecies.getBaseSpecies("Demonic"), BeeSpecies.Esoteric.getGenome(), 20, false); + BeeMutation.Esoteric1 = new BeeMutation(BeeSpecies.getBaseSpecies("Heroic"), BeeSpecies.getBaseSpecies("Demonic"), BeeSpecies.Esoteric.getGenome(), 25, false); BeeMutation.Mysterious = new BeeMutation(BeeSpecies.Esoteric, BeeSpecies.getBaseSpecies("Ended"), BeeSpecies.Mysterious.getGenome(), 10, false); BeeMutation.Arcane = new BeeMutation(BeeSpecies.Esoteric, BeeSpecies.Mysterious, BeeSpecies.Arcane.getGenome(), 8, false); BeeMutation.Charmed = new BeeMutation(BeeSpecies.getBaseSpecies("Cultivated"), BeeSpecies.getBaseSpecies("Valiant"), BeeSpecies.Charmed.getGenome(), 20, false); diff --git a/thaumicbees_src/thaumicbees/block/BlockManager.java b/thaumicbees_src/thaumicbees/block/BlockManager.java index ae7f0f6..dc6fc5b 100644 --- a/thaumicbees_src/thaumicbees/block/BlockManager.java +++ b/thaumicbees_src/thaumicbees/block/BlockManager.java @@ -1,16 +1,17 @@ package thaumicbees.block; +import net.minecraft.block.Block; +import net.minecraft.item.ItemBlock; +import net.minecraftforge.common.Configuration; + public class BlockManager { + public static Block ThaumcraftPlant; + public BlockManager() { } - - public static void registerBlocks() - { - - } - - public static void setupCrafting() + + public static void setupBlocks(Configuration config) { } diff --git a/thaumicbees_src/thaumicbees/item/ItemComb.java b/thaumicbees_src/thaumicbees/item/ItemComb.java index 9d17556..d3eaf11 100644 --- a/thaumicbees_src/thaumicbees/item/ItemComb.java +++ b/thaumicbees_src/thaumicbees/item/ItemComb.java @@ -1,5 +1,8 @@ package thaumicbees.item; +import java.util.List; + +import thaumicbees.item.ItemPollen.PollenType; import thaumicbees.main.CommonProxy; import thaumicbees.main.ThaumicBees; import cpw.mods.fml.relauncher.Side; @@ -12,9 +15,14 @@ public class ItemComb extends Item { public enum CombType { - MAGICAL("Magical Comb", 0x6e1c6d, 0xff8fff), - PAPERY("Papery Comb", 0xfff, 0xfff), - STARK("Stark Comb", 0x505759, 0xaaaebd), + OCCULT("Occult Comb", 0x6e1c6d, 0xff8fff), + OTHERWORLDLY("Otherworldy Comb", 0x000056, 0x765cc1), + PAPERY("Papery Comb", 0x503900, 0xbd9a30), + STARK("Stark Comb", 0xB0B0BC, 0x6e6e79), + AIRY("Airy Comb", 0xffff7e, 0x717600), + FIREY("Firey Comb", 0xff3C01, 0x740002), + WATERY("Watery Comb", 0x0090ff, 0x00308c), + EARTHY("Earthy Comb", 0x00a000, 0x005100), ; private CombType(String pName, int colourA, int colourB) @@ -33,6 +41,7 @@ public class ItemComb extends Item super(itemID); this.setTextureFile(CommonProxy.FORESTRY_GFX_ITEMS); this.setCreativeTab(CreativeTabs.tabMaterials); + this.setHasSubtypes(true); } public ItemStack getStackForType(CombType type) @@ -44,7 +53,18 @@ public class ItemComb extends Item { return new ItemStack(this, count, type.ordinal()); } - + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(int id, CreativeTabs tabs, List list) + { + super.getSubItems(id, tabs, list); + for (CombType type : CombType.values()) + { + list.add(this.getStackForType(type)); + } + } + @Override @SideOnly(Side.CLIENT) public boolean requiresMultipleRenderPasses() diff --git a/thaumicbees_src/thaumicbees/item/ItemDrop.java b/thaumicbees_src/thaumicbees/item/ItemDrop.java new file mode 100644 index 0000000..da99e7c --- /dev/null +++ b/thaumicbees_src/thaumicbees/item/ItemDrop.java @@ -0,0 +1,106 @@ +package thaumicbees.item; + +import java.util.List; + +import thaumicbees.item.ItemPollen.PollenType; +import thaumicbees.main.CommonProxy; +import thaumicbees.main.ThaumicBees; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class ItemDrop extends Item +{ + public enum DropType + { + ENCHANTED("Enchanting Drop", 0x6e1c6d, 0xff8fff), + ; + + private DropType(String pName, int colourA, int colourB) + { + this.name = pName; + this.combColour[0] = colourA; + this.combColour[1] = colourB; + } + + public final String name; + public int[] combColour = new int[2]; + } + + public ItemDrop(int itemID) + { + super(itemID); + this.setTextureFile(CommonProxy.FORESTRY_GFX_ITEMS); + this.setCreativeTab(CreativeTabs.tabMaterials); + this.setHasSubtypes(true); + } + + public ItemStack getStackForType(DropType type) + { + return new ItemStack(this, 1, type.ordinal()); + } + + public ItemStack getStackForType(DropType type, int count) + { + return new ItemStack(this, count, type.ordinal()); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(int id, CreativeTabs tabs, List list) + { + super.getSubItems(id, tabs, list); + for (DropType type : DropType.values()) + { + list.add(this.getStackForType(type)); + } + } + + @Override + @SideOnly(Side.CLIENT) + public boolean requiresMultipleRenderPasses() + { + return true; + } + + @Override + public int getRenderPasses(int metadata) + { + return 2; + } + + @Override + public int getIconIndex(ItemStack stack, int pass) + { + // 109, 110 are the base forestry drop textures. + return 109 + pass; + } + + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack stack, int pass) + { + int colour = 0xffffff; + int meta = stack.getItemDamage(); + if (meta >= 0 && meta < DropType.values().length) + { + colour = DropType.values()[meta].combColour[pass % 2]; + } + return colour; + } + + @Override + public String getItemDisplayName(ItemStack stack) + { + String result = ""; + int meta = stack.getItemDamage(); + if (meta >= 0 && meta < DropType.values().length) + { + result = DropType.values()[meta].name; + } + return result; + } + +} diff --git a/thaumicbees_src/thaumicbees/item/ItemKnowledgeFragment.java b/thaumicbees_src/thaumicbees/item/ItemKnowledgeFragment.java deleted file mode 100644 index b89afe2..0000000 --- a/thaumicbees_src/thaumicbees/item/ItemKnowledgeFragment.java +++ /dev/null @@ -1,18 +0,0 @@ -package thaumicbees.item; - -import extrabiomes.utility.CreativeTab; -import thaumicbees.main.CommonProxy; -import net.minecraft.item.Item; - -public class ItemKnowledgeFragment extends Item -{ - - public ItemKnowledgeFragment(int ID) - { - super(ID); - this.iconIndex = 3; - this.setTextureFile(CommonProxy.TCBEES_ITEMS); - this.setCreativeTab(CreativeTab.tabMaterials); - } - -} diff --git a/thaumicbees_src/thaumicbees/item/ItemMagicalWax.java b/thaumicbees_src/thaumicbees/item/ItemMagicalWax.java deleted file mode 100644 index 60350c6..0000000 --- a/thaumicbees_src/thaumicbees/item/ItemMagicalWax.java +++ /dev/null @@ -1,39 +0,0 @@ -package thaumicbees.item; - -import thaumicbees.main.CommonProxy; -import thaumicbees.main.ThaumicBees; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class ItemMagicalWax extends Item -{ - - private boolean sparkly; - private int colour; - - public ItemMagicalWax(int itemID, int overlayColour, boolean hasSparklyIcon) - { - super(itemID); - this.sparkly = hasSparklyIcon; - this.colour = overlayColour; - this.setTextureFile(CommonProxy.TCBEES_ITEMS); - this.setCreativeTab(CreativeTabs.tabMisc); - } - - @Override - public int getIconIndex(ItemStack stack, int pass) - { - return this.sparkly ? 0 : 1; - } - - @Override - @SideOnly(Side.CLIENT) - public int getColorFromItemStack(ItemStack par1ItemStack, int pass) - { - - return this.colour; - } -} diff --git a/thaumicbees_src/thaumicbees/item/ItemManager.java b/thaumicbees_src/thaumicbees/item/ItemManager.java index d098540..0d68f25 100644 --- a/thaumicbees_src/thaumicbees/item/ItemManager.java +++ b/thaumicbees_src/thaumicbees/item/ItemManager.java @@ -1,14 +1,38 @@ package thaumicbees.item; +import cpw.mods.fml.common.registry.GameRegistry; +import thaumicbees.item.ItemComb.CombType; +import thaumicbees.item.ItemMiscResources.ResourceType; +import thaumicbees.item.ItemPropolis.PropolisType; +import thaumicbees.item.ItemWax.WaxType; +import net.minecraft.block.Block; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.Property; +import net.minecraftforge.liquids.LiquidStack; +import forestry.api.core.ItemInterface; import forestry.api.recipes.*; public class ItemManager { - public static ItemComb magicalComb; - public static ItemMagicalWax magicalWax; + public static ItemComb combs; + public static ItemWax wax; + public static ItemPropolis propolis; + public static ItemDrop drops; + public static ItemMiscResources miscResources; + + //----- Thaumcraft Items ------------------- + public static ItemStack quicksilver; + public static ItemStack amber; + public static ItemStack fragment; + public static ItemStack airShard; + public static ItemStack fireShard; + public static ItemStack waterShard; + public static ItemStack earthShard; + public static ItemStack magicShard; + public static ItemStack dullShard; + public static ItemStack essentiaBottle; public ItemManager() { } @@ -17,14 +41,85 @@ public class ItemManager int itemIDBase = 26090; Property p = configFile.getItem("combs", itemIDBase++); - ItemManager.magicalComb= new ItemComb(p.getInt()); - ItemManager.magicalWax = new ItemMagicalWax(configFile.getItem("wax", itemIDBase++).getInt(), 0xffff00, false); + ItemManager.combs= new ItemComb(p.getInt()); + ItemManager.wax = new ItemWax(configFile.getItem("wax", itemIDBase++).getInt()); + ItemManager.propolis = new ItemPropolis(configFile.getItem("propolis", itemIDBase++).getInt()); + ItemManager.drops = new ItemDrop(configFile.getItem("drop", itemIDBase++).getInt()); + ItemManager.miscResources = new ItemMiscResources(configFile.getItem("miscResources", itemIDBase++).getInt()); } public static void setupCrafting() { + ItemStack output = ItemManager.essentiaBottle.copy(); + output.stackSize = 8; + GameRegistry.addRecipe(output, new Object[] + { + " C ", "G G", " G ", + Character.valueOf('G'), ItemManager.wax, + Character.valueOf('C'), Item.clay + }); + output.stackSize = 4; + GameRegistry.addRecipe(output, new Object[] + { + " W ", "W W", " W ", + 'W', ItemManager.wax + }); + + output = ItemManager.fragment.copy(); + GameRegistry.addShapelessRecipe(output, new Object[] + { + ItemManager.miscResources.getStackForType(ResourceType.KNOWLEDGE_FRAGMENT), + ItemManager.miscResources.getStackForType(ResourceType.KNOWLEDGE_FRAGMENT), + ItemManager.miscResources.getStackForType(ResourceType.KNOWLEDGE_FRAGMENT), + ItemManager.miscResources.getStackForType(ResourceType.KNOWLEDGE_FRAGMENT) + }); + // 20 is the 'average' time to centrifuge a comb. - RecipeManagers.centrifugeManager.addRecipe(25, new ItemStack(ItemManager.magicalComb), new ItemStack(ItemManager.magicalWax)); + RecipeManagers.centrifugeManager.addRecipe(20, ItemManager.combs.getStackForType(CombType.OCCULT), + new ItemStack[] {ItemManager.wax.getStackForType(WaxType.MAGIC), ItemInterface.getItem("honeyDrop") }, + new int[] { 100, 60 }); + RecipeManagers.centrifugeManager.addRecipe(20, ItemManager.combs.getStackForType(CombType.OTHERWORLDLY), + new ItemStack[] {ItemManager.wax.getStackForType(WaxType.MAGIC), ItemInterface.getItem("honeyDrop") }, + new int[] { 60, 100 }); + RecipeManagers.centrifugeManager.addRecipe(20, ItemManager.combs.getStackForType(CombType.PAPERY), + new ItemStack[] {ItemInterface.getItem("beeswax"), ItemManager.wax.getStackForType(WaxType.MAGIC), new ItemStack(Item.paper) }, + new int[] { 80, 20, 5 }); + RecipeManagers.centrifugeManager.addRecipe(25, ItemManager.combs.getStackForType(CombType.STARK), + new ItemStack[] {ItemInterface.getItem("beeswax"), ItemManager.wax.getStackForType(WaxType.MAGIC), ItemManager.propolis.getStackForType(PropolisType.STARK) }, + new int[] { 10, 95, 5 }); + RecipeManagers.centrifugeManager.addRecipe(25, ItemManager.combs.getStackForType(CombType.AIRY), + new ItemStack[] {ItemManager.wax.getStackForType(WaxType.MAGIC), ItemManager.propolis.getStackForType(PropolisType.AIR) }, + new int[] { 100, 65 }); + RecipeManagers.centrifugeManager.addRecipe(25, ItemManager.combs.getStackForType(CombType.FIREY), + new ItemStack[] {ItemManager.wax.getStackForType(WaxType.MAGIC), ItemManager.propolis.getStackForType(PropolisType.FIRE) }, + new int[] { 100, 65 }); + RecipeManagers.centrifugeManager.addRecipe(25, ItemManager.combs.getStackForType(CombType.WATERY), + new ItemStack[] {ItemManager.wax.getStackForType(WaxType.MAGIC), ItemManager.propolis.getStackForType(PropolisType.WATER)}, + new int[] { 100, 65 }); + RecipeManagers.centrifugeManager.addRecipe(25, ItemManager.combs.getStackForType(CombType.EARTHY), + new ItemStack[] {ItemManager.wax.getStackForType(WaxType.MAGIC), ItemManager.propolis.getStackForType(PropolisType.EARTH) }, + new int[] { 100, 65 }); + RecipeManagers.centrifugeManager.addRecipe(25, ItemManager.propolis.getStackForType(PropolisType.STARK), + new ItemStack[] {ItemManager.dullShard}, + new int[] { 25 }); + RecipeManagers.centrifugeManager.addRecipe(25, ItemManager.propolis.getStackForType(PropolisType.AIR), + new ItemStack[] {ItemManager.airShard}, + new int[] { 25 }); + RecipeManagers.centrifugeManager.addRecipe(25, ItemManager.propolis.getStackForType(PropolisType.FIRE), + new ItemStack[] {ItemManager.fireShard}, + new int[] { 25 }); + RecipeManagers.centrifugeManager.addRecipe(25, ItemManager.propolis.getStackForType(PropolisType.WATER), + new ItemStack[] {ItemManager.waterShard}, + new int[] { 25 }); + RecipeManagers.centrifugeManager.addRecipe(25, ItemManager.propolis.getStackForType(PropolisType.EARTH), + new ItemStack[] {ItemManager.earthShard}, + new int[] { 25 }); + + // Squeezer recipes + RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[] {ItemManager.propolis.getStackForType(PropolisType.FIRE) }, + new LiquidStack(Block.lavaStill, 250), ItemManager.fireShard, 15); + RecipeManagers.squeezerManager.addRecipe(20, new ItemStack[] {ItemManager.propolis.getStackForType(PropolisType.WATER) }, + new LiquidStack(Block.waterStill, 1000), ItemManager.waterShard, 25); } } diff --git a/thaumicbees_src/thaumicbees/item/ItemMiscResources.java b/thaumicbees_src/thaumicbees/item/ItemMiscResources.java new file mode 100644 index 0000000..b2b280a --- /dev/null +++ b/thaumicbees_src/thaumicbees/item/ItemMiscResources.java @@ -0,0 +1,84 @@ +package thaumicbees.item; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import extrabiomes.utility.CreativeTab; +import thaumicbees.item.ItemPropolis.PropolisType; +import thaumicbees.item.ItemWax.WaxType; +import thaumicbees.main.CommonProxy; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class ItemMiscResources extends Item +{ + public enum ResourceType + { + KNOWLEDGE_FRAGMENT("Lore Fragment", 2), + ; + + private ResourceType(String n, int i) + { + this.name = n; + this.iconIdx = i; + } + public String name; + public int iconIdx; + } + + public ItemMiscResources(int ID) + { + super(ID); + this.setTextureFile(CommonProxy.TCBEES_ITEMSPNG); + this.setCreativeTab(CreativeTab.tabMaterials); + this.setHasSubtypes(true); + } + + public ItemStack getStackForType(ResourceType type) + { + return new ItemStack(this, 1, type.ordinal()); + } + + public ItemStack getStackForType(ResourceType type, int count) + { + return new ItemStack(this, count, type.ordinal()); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(int id, CreativeTabs tabs, List list) + { + super.getSubItems(id, tabs, list); + for (ResourceType type : ResourceType.values()) + { + list.add(this.getStackForType(type)); + } + } + + @Override + @SideOnly(Side.CLIENT) + public int getIconFromDamage(int meta) + { + int iconIdx = 0; + if (meta >= 0 && meta < ResourceType.values().length) + { + iconIdx = ResourceType.values()[meta].iconIdx; + } + return iconIdx; + } + + @Override + public String getItemDisplayName(ItemStack stack) + { + String result = ""; + int meta = stack.getItemDamage(); + if (meta >= 0 && meta < ResourceType.values().length) + { + result = ResourceType.values()[meta].name; + } + return result; + } + +} diff --git a/thaumicbees_src/thaumicbees/item/ItemPollen.java b/thaumicbees_src/thaumicbees/item/ItemPollen.java new file mode 100644 index 0000000..87c2f85 --- /dev/null +++ b/thaumicbees_src/thaumicbees/item/ItemPollen.java @@ -0,0 +1,105 @@ +package thaumicbees.item; + +import java.util.List; + +import thaumicbees.main.CommonProxy; +import thaumicbees.main.ThaumicBees; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class ItemPollen extends Item +{ + public enum PollenType + { + UNUSUAL("Unusual Pollen", 0x742700, 0xdbad40), + FIBEROUS("Fiberous Pollen", 0x503900, 0xbd9a30), + ; + + private PollenType(String pName, int colourA, int colourB) + { + this.name = pName; + this.combColour[0] = colourA; + this.combColour[1] = colourB; + } + + public final String name; + public int[] combColour = new int[2]; + } + + public ItemPollen(int itemID) + { + super(itemID); + this.setTextureFile(CommonProxy.FORESTRY_GFX_ITEMS); + this.setCreativeTab(CreativeTabs.tabMaterials); + this.setHasSubtypes(true); + } + public ItemStack getStackForType(PollenType type) + { + return new ItemStack(this, 1, type.ordinal()); + } + + public ItemStack getStackForType(PollenType type, int count) + { + return new ItemStack(this, count, type.ordinal()); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(int id, CreativeTabs tabs, List list) + { + super.getSubItems(id, tabs, list); + for (PollenType type : PollenType.values()) + { + list.add(this.getStackForType(type)); + } + } + + @Override + @SideOnly(Side.CLIENT) + public boolean requiresMultipleRenderPasses() + { + return true; + } + + @Override + public int getRenderPasses(int metadata) + { + return 2; + } + + @Override + public int getIconIndex(ItemStack stack, int pass) + { + // 107, 108 are the base forestry honeycomb textures. + return 107 + pass; + } + + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack stack, int pass) + { + int colour = 0xffffff; + int meta = stack.getItemDamage(); + if (meta >= 0 && meta < PollenType.values().length) + { + colour = PollenType.values()[meta].combColour[pass % 2]; + } + return colour; + } + + @Override + public String getItemDisplayName(ItemStack stack) + { + String result = ""; + int meta = stack.getItemDamage(); + if (meta >= 0 && meta < PollenType.values().length) + { + result = PollenType.values()[meta].name; + } + return result; + } + +} diff --git a/thaumicbees_src/thaumicbees/item/ItemPropolis.java b/thaumicbees_src/thaumicbees/item/ItemPropolis.java index 8c48938..c37d77d 100644 --- a/thaumicbees_src/thaumicbees/item/ItemPropolis.java +++ b/thaumicbees_src/thaumicbees/item/ItemPropolis.java @@ -1,5 +1,13 @@ package thaumicbees.item; +import java.util.List; + +import thaumicbees.item.ItemPollen.PollenType; +import thaumicbees.item.ItemWax.WaxType; +import thaumicbees.main.CommonProxy; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -7,6 +15,11 @@ public class ItemPropolis extends Item { public enum PropolisType { + STARK("Dull Propolis", 0xBBBBBB), + AIR("Air Propolis", 0xA19E10), + FIRE("Firey Propolis", 0x95132F), + WATER("Watery Propolis", 0x1054A1), + EARTH("Earthen Propolis", 0x00a000), ; private PropolisType(String pName, int overlayColour) @@ -22,6 +35,30 @@ public class ItemPropolis extends Item public ItemPropolis(int id) { super(id); + this.setTextureFile(CommonProxy.FORESTRY_GFX_ITEMS); + this.setIconIndex(98); + this.setHasSubtypes(true); + } + + public ItemStack getStackForType(PropolisType type) + { + return new ItemStack(this, 1, type.ordinal()); + } + + public ItemStack getStackForType(PropolisType type, int count) + { + return new ItemStack(this, count, type.ordinal()); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(int id, CreativeTabs tabs, List list) + { + super.getSubItems(id, tabs, list); + for (PropolisType type : PropolisType.values()) + { + list.add(this.getStackForType(type)); + } } @Override @@ -36,4 +73,16 @@ public class ItemPropolis extends Item return colour; } + @Override + public String getItemDisplayName(ItemStack stack) + { + String result = ""; + int meta = stack.getItemDamage(); + if (meta >= 0 && meta < PropolisType.values().length) + { + result = PropolisType.values()[meta].name; + } + return result; + } + } diff --git a/thaumicbees_src/thaumicbees/item/ItemWax.java b/thaumicbees_src/thaumicbees/item/ItemWax.java new file mode 100644 index 0000000..4bc30b1 --- /dev/null +++ b/thaumicbees_src/thaumicbees/item/ItemWax.java @@ -0,0 +1,100 @@ +package thaumicbees.item; + +import java.util.List; + +import thaumicbees.item.ItemComb.CombType; +import thaumicbees.item.ItemDrop.DropType; +import thaumicbees.item.ItemPollen.PollenType; +import thaumicbees.main.CommonProxy; +import thaumicbees.main.ThaumicBees; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class ItemWax extends Item +{ + public enum WaxType + { + MAGIC("Magic Wax", false, 0xd242df), + ; + + private WaxType(String n, boolean sp, int c) + { + this.name = n; + this.sparkly = sp; + this.colour = c; + } + + public String name; + public boolean sparkly; + public int colour; + } + + public ItemWax(int itemID) + { + super(itemID); + this.setTextureFile(CommonProxy.TCBEES_ITEMSPNG); + this.setCreativeTab(CreativeTabs.tabMisc); + this.setHasSubtypes(true); + } + + public ItemStack getStackForType(WaxType type) + { + return new ItemStack(this, 1, type.ordinal()); + } + + public ItemStack getStackForType(WaxType type, int count) + { + return new ItemStack(this, count, type.ordinal()); + } + + @Override + public int getIconIndex(ItemStack stack, int pass) + { + int idx = 1; + int meta = stack.getItemDamage(); + if (meta >= 0 && meta < WaxType.values().length) + { + idx = (WaxType.values()[meta].sparkly) ? 0 : 1; + } + return idx; + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubItems(int id, CreativeTabs tabs, List list) + { + super.getSubItems(id, tabs, list); + for (WaxType type : WaxType.values()) + { + list.add(this.getStackForType(type)); + } + } + + @Override + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack stack, int pass) + { + int colour = 0xffffff; + int meta = stack.getItemDamage(); + if (meta >= 0 && meta < WaxType.values().length) + { + colour = WaxType.values()[meta].colour; + } + return colour; + } + + @Override + public String getItemDisplayName(ItemStack stack) + { + String result = ""; + int meta = stack.getItemDamage(); + if (meta >= 0 && meta < WaxType.values().length) + { + result = WaxType.values()[meta].name; + } + return result; + } +} diff --git a/thaumicbees_src/thaumicbees/main/CommonProxy.java b/thaumicbees_src/thaumicbees/main/CommonProxy.java index 6a52a88..b2c5b4f 100644 --- a/thaumicbees_src/thaumicbees/main/CommonProxy.java +++ b/thaumicbees_src/thaumicbees/main/CommonProxy.java @@ -2,12 +2,13 @@ package thaumicbees.main; public class CommonProxy { - public static String TCBEES_GFX = "./gfx/thaumicbees"; - public static String TCBEES_RESEARCH = "./research/thaumicbees"; + public static String TCBEES_GFX = "/gfx/thaumicbees"; + public static String TCBEES_RESEARCH = "/research/thaumicbees"; + public static String TCBEES_ITEMS = TCBEES_GFX + "/items/"; public static String FORESTRY_GFX_ITEMS; - public static String TCBEES_ITEMS = TCBEES_GFX + "/items.png"; + public static String TCBEES_ITEMSPNG = TCBEES_ITEMS + "items.png"; public CommonProxy() { } diff --git a/thaumicbees_src/thaumicbees/main/ThaumcraftCompat.java b/thaumicbees_src/thaumicbees/main/ThaumcraftCompat.java index 6cb0bfc..23b6916 100644 --- a/thaumicbees_src/thaumicbees/main/ThaumcraftCompat.java +++ b/thaumicbees_src/thaumicbees/main/ThaumcraftCompat.java @@ -2,34 +2,41 @@ package thaumicbees.main; import java.io.File; +import thaumcraft.api.EnumTag; +import thaumcraft.api.ObjectTags; import thaumcraft.api.ThaumcraftApi; +import thaumicbees.block.BlockManager; import thaumicbees.item.ItemManager; +import thaumicbees.item.ItemWax.WaxType; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.common.Property; import net.minecraftforge.common.Configuration; public class ThaumcraftCompat { + private static final int blockMetaSilverleaf = 2; + private static final int blockMetaCinderpearl = 3; - public static int itemResourceID; - public static final int itemResourceQuicksilverMeta = 3; - public static final int itemResourceAmberMeta = 6; - public static final int itemResourceFragmentMeta = 9; + private static int itemResourceID; + private static final int itemResourceQuicksilverMeta = 3; + private static final int itemResourceAmberMeta = 6; + private static final int itemResourceFragmentMeta = 9; - public static int itemShardID; - public static final int itemShardAirMeta = 0; - public static final int itemShardFireMeta = 1; - public static final int itemShardWaterMeta = 2; - public static final int itemShardEarthMeta = 3; - public static final int itemShardMagicMeta = 4; - public static final int itemShardDullMeta = 5; + private static int itemShardID; + private static final int itemShardAirMeta = 0; + private static final int itemShardFireMeta = 1; + private static final int itemShardWaterMeta = 2; + private static final int itemShardEarthMeta = 3; + private static final int itemShardMagicMeta = 4; + private static final int itemShardDullMeta = 5; - public static int itemEssentiaBottle; + private static int itemEssentiaBottle; public static void init() { @@ -38,27 +45,39 @@ public class ThaumcraftCompat tcConfig.load(); + // Load blocks out of the Thaumcraft config to get their IDs; + p = tcConfig.getBlock("BlockCustomPlant", 2403); + BlockManager.ThaumcraftPlant = Block.blocksList[p.getInt()]; + // Load items out of the Thaumcraft config to get their IDs. p = tcConfig.getItem("ItemEssence", 25005); itemEssentiaBottle = p.getInt() + 256; + ItemManager.essentiaBottle = new ItemStack(itemEssentiaBottle, 1, 0); p = tcConfig.getItem("ItemResource", 25007); itemResourceID = p.getInt() + 256; + ItemManager.quicksilver = new ItemStack(itemResourceID, 1, itemResourceQuicksilverMeta); + ItemManager.amber = new ItemStack(itemResourceID, 1, itemResourceAmberMeta); + ItemManager.fragment = new ItemStack(itemResourceID, 1, itemResourceFragmentMeta); p = tcConfig.getItem("ItemShard", 25008); itemShardID = p.getInt() + 256; + ItemManager.airShard = new ItemStack(itemShardID, 1, itemShardAirMeta); + ItemManager.fireShard = new ItemStack(itemShardID, 1, itemShardFireMeta); + ItemManager.waterShard = new ItemStack(itemShardID, 1, itemShardWaterMeta); + ItemManager.earthShard = new ItemStack(itemShardID, 1, itemShardEarthMeta); + ItemManager.magicShard = new ItemStack(itemShardID, 1, itemShardMagicMeta); + ItemManager.dullShard = new ItemStack(itemShardID, 1, itemShardDullMeta); } public static void setupResearch() { //ThaumcraftApi.registerResearchXML(CommonProxy.TCBEES_RESEARCH + "/research.xml"); } - - public static void setupCrafting() + + public static void setupAspects() { - GameRegistry.addRecipe(new ItemStack(itemEssentiaBottle, 8, 0), new Object[] - { - " C ", "G G", " G ", - Character.valueOf('G'), ItemManager.magicalWax, - Character.valueOf('C'), Item.clay - }); + ObjectTags tags; + + tags = new ObjectTags().add(EnumTag.MAGIC, 2); + ThaumcraftApi.registerObjectTag(ItemManager.wax.shiftedIndex, WaxType.MAGIC.ordinal(), tags); } } diff --git a/thaumicbees_src/thaumicbees/main/ThaumicBees.java b/thaumicbees_src/thaumicbees/main/ThaumicBees.java index 6e83348..22a6d79 100644 --- a/thaumicbees_src/thaumicbees/main/ThaumicBees.java +++ b/thaumicbees_src/thaumicbees/main/ThaumicBees.java @@ -20,8 +20,9 @@ import net.minecraftforge.event.world.WorldEvent; import thaumcraft.api.*; import thaumicbees.bees.BeeSpecies; import thaumicbees.bees.ThaumicBeesPlugin; +import thaumicbees.block.BlockManager; import thaumicbees.item.ItemComb; -import thaumicbees.item.ItemMagicalWax; +import thaumicbees.item.ItemWax; import thaumicbees.item.ItemManager; @Mod(modid="ThaumicBees", name="Thaumic Bees", version="0.0", dependencies="required-after:Forestry;required-after:Thaumcraft") @@ -60,14 +61,14 @@ public class ThaumicBees proxy.FORESTRY_GFX_ITEMS = ItemInterface.getItem("beeComb").getItem().getTextureFile(); this.config.load(); + BlockManager.setupBlocks(this.config); ItemManager.setupItems(this.config); this.config.save(); ItemManager.setupCrafting(); - ThaumcraftCompat.setupCrafting(); ThaumcraftCompat.setupResearch(); - + ThaumcraftCompat.setupAspects(); } @Mod.PostInit