From 9729d7525217966ab2dcd1b609857611f0184958 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Sun, 21 Apr 2013 15:38:52 -0700 Subject: [PATCH] Work on Effect jar; Fixing TC3 integration on 1.5 --- PSDs/moon dial.psd | Bin 0 -> 60152 bytes thaumicbees_res/build.xml | 2 +- thaumicbees_res/changelog.txt | 5 + thaumicbees_res/lang/thaumicbees/en_US.xml | 4 +- .../thaumicbees/textures/gui/jarScreen.png | Bin 0 -> 8778 bytes thaumicbees_src/thaumicbees/bees/Allele.java | 7 +- .../bees/AlleleEffectAuraNodeAttract.java | 3 +- .../bees/AlleleEffectAuraNodePurify.java | 2 +- .../thaumicbees/bees/BeeMutation.java | 9 +- .../thaumicbees/bees/BeeSpecies.java | 6 +- .../bees/FlowerProviderAuraNode.java | 11 +- .../bees/FlowerProviderAuraNodeFlux.java | 44 ------- .../bees/FlowerProviderAuraNodePurify.java | 52 -------- .../bees/FlowerProviderBookshelf.java | 9 +- .../bees/FlowerProviderThaumcraftFlower.java | 7 +- .../thaumicbees/block/BlockEffectJar.java | 20 ++++ .../thaumicbees/block/BlockPlanks.java | 4 +- .../thaumicbees/block/BlockWoodSlab.java | 3 +- .../block/TileEntityEffectJar.java | 28 ----- .../thaumicbees/gui/ContainerEffectJar.java | 25 ++++ .../thaumicbees/gui/GUIEffectJar.java | 60 ++++++++++ .../thaumicbees/gui/GUIHandler.java | 37 ++++++ .../thaumicbees/gui/SlotCustomItems.java | 107 +++++++++++++++++ .../thaumicbees/gui/UIScreens.java | 7 ++ .../thaumicbees/item/ItemCrystalAspect.java | 2 +- .../thaumicbees/item/ItemMagicHiveFrame.java | 1 - .../thaumicbees/item/ItemMoonDial.java | 20 +++- .../thaumicbees/main/ClientProxy.java | 6 +- .../thaumicbees/main/CommonProxy.java | 6 +- thaumicbees_src/thaumicbees/main/Config.java | 25 ++-- .../thaumicbees/main/ThaumicBees.java | 11 +- .../main/utils/CraftingManager.java | 2 +- .../EffectJarHousing.java | 3 +- .../tileentity/TileEntityEffectJar.java | 113 ++++++++++++++++++ 34 files changed, 457 insertions(+), 184 deletions(-) create mode 100644 PSDs/moon dial.psd create mode 100644 thaumicbees_res/mods/thaumicbees/textures/gui/jarScreen.png delete mode 100644 thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNodeFlux.java delete mode 100644 thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNodePurify.java delete mode 100644 thaumicbees_src/thaumicbees/block/TileEntityEffectJar.java create mode 100644 thaumicbees_src/thaumicbees/gui/ContainerEffectJar.java create mode 100644 thaumicbees_src/thaumicbees/gui/GUIEffectJar.java create mode 100644 thaumicbees_src/thaumicbees/gui/GUIHandler.java create mode 100644 thaumicbees_src/thaumicbees/gui/SlotCustomItems.java create mode 100644 thaumicbees_src/thaumicbees/gui/UIScreens.java rename thaumicbees_src/thaumicbees/{main/utils => tileentity}/EffectJarHousing.java (97%) create mode 100644 thaumicbees_src/thaumicbees/tileentity/TileEntityEffectJar.java diff --git a/PSDs/moon dial.psd b/PSDs/moon dial.psd new file mode 100644 index 0000000000000000000000000000000000000000..72fda6d1db9acc4b691021f4a970e1a528f02148 GIT binary patch literal 60152 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 literal 0 HcmV?d00001 diff --git a/thaumicbees_res/build.xml b/thaumicbees_res/build.xml index b658fee..53090ac 100644 --- a/thaumicbees_res/build.xml +++ b/thaumicbees_res/build.xml @@ -17,7 +17,7 @@ - + diff --git a/thaumicbees_res/changelog.txt b/thaumicbees_res/changelog.txt index 286e72f..c1fae5b 100644 --- a/thaumicbees_res/changelog.txt +++ b/thaumicbees_res/changelog.txt @@ -1,3 +1,8 @@ +1.4.5a +Repaired Thaumcraft 3 integration for 3.0.4a. +Fixed Biofuel capsules being shown as "Empty x Capsule" +Fixed missing texture for oil & fuel capsules + 1.4.5 Added the Jade Moon Dial - tells you what moon phase it currently is for breeding purposes. Added a creative menu tab for certain Thaumic Bees items - misc resources, capsules, tools. diff --git a/thaumicbees_res/lang/thaumicbees/en_US.xml b/thaumicbees_res/lang/thaumicbees/en_US.xml index 6f33b40..88b2598 100644 --- a/thaumicbees_res/lang/thaumicbees/en_US.xml +++ b/thaumicbees_res/lang/thaumicbees/en_US.xml @@ -62,7 +62,7 @@ Concentrated Compound Bees and Magic Stark Infusion - Crystalized %s Aspect + Crystalized %s Aspect Magic Frame @@ -82,7 +82,7 @@ Water Lava Biomass - Empty + Biofuel Oil Fuel Seed Oil diff --git a/thaumicbees_res/mods/thaumicbees/textures/gui/jarScreen.png b/thaumicbees_res/mods/thaumicbees/textures/gui/jarScreen.png new file mode 100644 index 0000000000000000000000000000000000000000..7e019ac672959dee39935274040e29558e9975f2 GIT binary patch literal 8778 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 J|E6Wo{{SQ4-?9Jz literal 0 HcmV?d00001 diff --git a/thaumicbees_src/thaumicbees/bees/Allele.java b/thaumicbees_src/thaumicbees/bees/Allele.java index 60ef460..4902085 100644 --- a/thaumicbees_src/thaumicbees/bees/Allele.java +++ b/thaumicbees_src/thaumicbees/bees/Allele.java @@ -39,10 +39,11 @@ public class Allele implements IAllele Allele.flowerBookshelf = new AlleleFlower("flowerBookshelf", new FlowerProviderBookshelf(), true); if (ThaumcraftHelper.isActive()) { + FlowerProviderAuraNode provider = new FlowerProviderAuraNode(); Allele.flowerThaumcraft = new AlleleFlower("flowerThaumcraftPlant", new FlowerProviderThaumcraftFlower(), false); - Allele.flowerAuraNode = new AlleleFlower("flowerAuraNode", new FlowerProviderAuraNode(), true); - Allele.flowerNodePurify = new AlleleFlower("flowerAuraNodePurify", new FlowerProviderAuraNode(), false); - Allele.flowerNodeFluxify = new AlleleFlower("flowerAuraNodeFlux", new FlowerProviderAuraNode(), false); + Allele.flowerAuraNode = new AlleleFlower("flowerAuraNode", provider, true); + Allele.flowerNodePurify = new AlleleFlower("flowerAuraNodePurify", provider, false); + Allele.flowerNodeFluxify = new AlleleFlower("flowerAuraNodeFlux", provider, false); } else { diff --git a/thaumicbees_src/thaumicbees/bees/AlleleEffectAuraNodeAttract.java b/thaumicbees_src/thaumicbees/bees/AlleleEffectAuraNodeAttract.java index ff3ca94..77a3f0a 100644 --- a/thaumicbees_src/thaumicbees/bees/AlleleEffectAuraNodeAttract.java +++ b/thaumicbees_src/thaumicbees/bees/AlleleEffectAuraNodeAttract.java @@ -2,10 +2,9 @@ package thaumicbees.bees; import java.lang.reflect.Method; -import thaumcraft.api.AuraNode; -import thaumcraft.api.EnumNodeType; import thaumcraft.api.ObjectTags; import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aura.AuraNode; import net.minecraft.world.World; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; diff --git a/thaumicbees_src/thaumicbees/bees/AlleleEffectAuraNodePurify.java b/thaumicbees_src/thaumicbees/bees/AlleleEffectAuraNodePurify.java index 0af67ed..7514b5b 100644 --- a/thaumicbees_src/thaumicbees/bees/AlleleEffectAuraNodePurify.java +++ b/thaumicbees_src/thaumicbees/bees/AlleleEffectAuraNodePurify.java @@ -2,10 +2,10 @@ package thaumicbees.bees; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import thaumcraft.api.AuraNode; import thaumcraft.api.EnumTag; import thaumcraft.api.ObjectTags; import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aura.AuraNode; import thaumicbees.main.Config; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; diff --git a/thaumicbees_src/thaumicbees/bees/BeeMutation.java b/thaumicbees_src/thaumicbees/bees/BeeMutation.java index fc813e1..42b0e7c 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeMutation.java +++ b/thaumicbees_src/thaumicbees/bees/BeeMutation.java @@ -7,9 +7,9 @@ import java.util.ArrayList; import cpw.mods.fml.common.FMLLog; -import thaumcraft.api.AuraNode; -import thaumcraft.api.EnumNodeType; import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aura.AuraNode; +import thaumcraft.api.aura.EnumNodeType; import thaumicbees.main.ThaumicBees; import thaumicbees.main.utils.MoonPhase; import thaumicbees.main.utils.compat.EquivalentExchangeHelper; @@ -39,6 +39,7 @@ public class BeeMutation implements IBeeMutation private static BeeMutation Flux; private static BeeMutation Node; private static BeeMutation Node1; + private static BeeMutation Rejuvination; private static BeeMutation Skulking; private static BeeMutation Brainy; private static BeeMutation Gossamer; @@ -174,6 +175,10 @@ public class BeeMutation implements IBeeMutation .setAuraNodeRequired(4).setMoonPhaseRestricted(MoonPhase.WANING_HALF, MoonPhase.WANING_HALF); BeeMutation.Node1 = new BeeMutation(BeeSpecies.PURE, BeeSpecies.FLUX, BeeSpecies.NODE, 2) .setAuraNodeRequired(4).setMoonPhaseRestricted(MoonPhase.WAXING_HALF, MoonPhase.WAXING_HALF); + + BeeMutation.Rejuvination = new BeeMutation(BeeSpecies.VIS, BeeSpecies.AWARE, BeeSpecies.REJUVENATING, 1) + .setAuraNodeRequired(15).setMoonPhaseRestricted(MoonPhase.WAXING_HALF, MoonPhase.WANING_HALF) + .setMoonPhaseBonus(MoonPhase.FULL, MoonPhase.FULL, 6); if (ExtraBeesHelper.isActive()) { diff --git a/thaumicbees_src/thaumicbees/bees/BeeSpecies.java b/thaumicbees_src/thaumicbees/bees/BeeSpecies.java index d36aff8..e109b76 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeSpecies.java +++ b/thaumicbees_src/thaumicbees/bees/BeeSpecies.java @@ -567,8 +567,8 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider public void registerItemIcons(IconRegister itemMap) { this.icons = new Icon[EnumBeeType.values().length][3]; - Icon outline = itemMap.registerIcon(ForestryHelper.Name + ":bees/outline"); - Icon body1 = itemMap.registerIcon(ForestryHelper.Name + ":bees/outline"); + Icon outline = itemMap.registerIcon(ForestryHelper.Name.toLowerCase() + ":bees/outline"); + Icon body1 = itemMap.registerIcon(ForestryHelper.Name.toLowerCase() + ":bees/outline"); for (int i = 0; i < EnumBeeType.values().length; i++) { if(EnumBeeType.values()[i] == EnumBeeType.NONE) @@ -576,7 +576,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider icons[i][0] = outline; icons[i][1] = body1; - icons[i][2] = itemMap.registerIcon(ForestryHelper.Name + ":bees/" + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".body2"); + icons[i][2] = itemMap.registerIcon(ForestryHelper.Name.toLowerCase() + ":bees/" + EnumBeeType.values()[i].toString().toLowerCase(Locale.ENGLISH) + ".body2"); } } diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNode.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNode.java index f02715e..ee655e8 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNode.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNode.java @@ -1,13 +1,12 @@ package thaumicbees.bees; -import cpw.mods.fml.common.registry.LanguageRegistry; -import thaumcraft.api.AuraNode; -import thaumcraft.api.ThaumcraftApi; -import thaumicbees.main.Config; -import thaumicbees.main.utils.LocalizationManager; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aura.AuraNode; +import thaumicbees.main.Config; +import thaumicbees.main.utils.LocalizationManager; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IFlowerProvider; import forestry.api.genetics.IPollinatable; @@ -25,7 +24,7 @@ public class FlowerProviderAuraNode implements IFlowerProvider @Override public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable) { - return true; + return pollinatable.getPlantType().size() > 0; } @Override diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNodeFlux.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNodeFlux.java deleted file mode 100644 index cf7acfe..0000000 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNodeFlux.java +++ /dev/null @@ -1,44 +0,0 @@ -package thaumicbees.bees; - -import cpw.mods.fml.common.registry.LanguageRegistry; -import thaumcraft.api.EnumTag; -import thaumcraft.api.ObjectTags; -import thaumcraft.api.ThaumcraftApi; -import thaumicbees.main.utils.LocalizationManager; -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 FlowerProviderAuraNodeFlux extends FlowerProviderAuraNode -{ - @Override - public ItemStack[] affectProducts(World world, IBeeGenome genome, int x, int y, int z, ItemStack[] products) - { - if (world.rand.nextInt(20) < 1) - { - EnumTag tag; - do - { - tag = EnumTag.values()[world.rand.nextInt(EnumTag.values().length)]; - } - while (tag == EnumTag.UNKNOWN || tag == EnumTag.WEATHER); - - int nodeId = ThaumcraftApi.getClosestAuraWithinRange(world, x, y, z, this.nodeRange); - if (nodeId != -1) - { - int quantity = world.rand.nextInt(2) + 1; - ThaumcraftApi.queueNodeChanges(nodeId, 0, 0, false, new ObjectTags().add(tag, quantity), 0f, 0f, 0f); - } - } - - return products; - } - - @Override - public String getDescription() - { - return LocalizationManager.getLocalizedString("tb.bees.flower.nodeFlux"); - } -} diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNodePurify.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNodePurify.java deleted file mode 100644 index a27d901..0000000 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNodePurify.java +++ /dev/null @@ -1,52 +0,0 @@ -package thaumicbees.bees; - -import cpw.mods.fml.common.registry.LanguageRegistry; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import thaumcraft.api.AuraNode; -import thaumcraft.api.EnumTag; -import thaumcraft.api.ObjectTags; -import thaumcraft.api.ThaumcraftApi; -import thaumicbees.main.Config; -import thaumicbees.main.utils.LocalizationManager; -import forestry.api.apiculture.IBeeGenome; - -public class FlowerProviderAuraNodePurify extends FlowerProviderAuraNode -{ - @Override - public boolean growFlower(World world, IBeeGenome genome, int x, int y, int z) - { - return true; - } - - @Override - public String getDescription() - { - return LocalizationManager.getLocalizedString("tb.bees.flower.nodePure"); - } - - @Override - public ItemStack[] affectProducts(World world, IBeeGenome genome, int x, int y, int z, ItemStack[] products) - { - if (world.rand.nextInt(25) < 1) - { - AuraNode node = this.getNodeWithinRange(world, x, y, z); - if (node != null && (1.0 * node.level) / node.baseLevel > 0.75) - { - int aspectCount = node.flux.tags.size(); - if (aspectCount > 0) - { - EnumTag selectedTag = node.flux.getAspectsSorted()[world.rand.nextInt(node.flux.tags.size())]; - if (selectedTag != null) - { - node.flux.remove(selectedTag, 1); - ThaumcraftApi.queueNodeChanges(node.key, node.baseLevel / -16, 0, false, new ObjectTags().add(selectedTag, -1), 0, 0, 0); - products = addItemToProducts(products, new ItemStack(Config.solidFlux, 1, selectedTag.id)); - } - } - } - } - return products; - } -} diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java index 594c676..1e5272f 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java @@ -1,10 +1,13 @@ package thaumicbees.bees; +import java.util.EnumSet; + import thaumicbees.main.utils.LocalizationManager; import cpw.mods.fml.common.registry.LanguageRegistry; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IFlowerProvider; import forestry.api.genetics.IPollinatable; @@ -39,11 +42,11 @@ public class FlowerProviderBookshelf implements IFlowerProvider return new ItemStack[] { new ItemStack(Block.bookShelf) }; } - //@Override + @Override public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable) { - // No idea what this is supposed to do. - return false; + EnumSet types = pollinatable.getPlantType(); + return types.size() > 0 && !types.contains(EnumPlantType.Nether) && !types.contains(EnumPlantType.Water) ; } public String getDescription() diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java index 2209705..dde532d 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java @@ -1,5 +1,7 @@ package thaumicbees.bees; +import java.util.EnumSet; + import cpw.mods.fml.common.registry.LanguageRegistry; import thaumicbees.main.Config; import thaumicbees.main.utils.LocalizationManager; @@ -7,6 +9,7 @@ import thaumicbees.main.utils.compat.ThaumcraftHelper; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IFlowerProvider; import forestry.api.genetics.IPollinatable; @@ -69,10 +72,10 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider return this.flowers; } - //@Override + @Override public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable) { - return false; + return pollinatable.getPlantType().size() > 1; } } diff --git a/thaumicbees_src/thaumicbees/block/BlockEffectJar.java b/thaumicbees_src/thaumicbees/block/BlockEffectJar.java index aef2d2c..e6b1cb5 100644 --- a/thaumicbees_src/thaumicbees/block/BlockEffectJar.java +++ b/thaumicbees_src/thaumicbees/block/BlockEffectJar.java @@ -1,7 +1,12 @@ package thaumicbees.block; +import thaumicbees.gui.UIScreens; +import thaumicbees.main.ThaumicBees; +import thaumicbees.main.utils.TabThaumicBees; +import thaumicbees.tileentity.TileEntityEffectJar; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -16,6 +21,21 @@ public class BlockEffectJar extends BlockContainer public BlockEffectJar(int id) { super(id, Material.glass); + this.setCreativeTab(TabThaumicBees.tabThaumicBees); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) + { + boolean activate = false; + + if (!player.isSneaking()) + { + player.openGui(ThaumicBees.object, UIScreens.EFFECT_JAR.ordinal(), world, x, y, z); + activate = true; + } + + return activate; } @Override diff --git a/thaumicbees_src/thaumicbees/block/BlockPlanks.java b/thaumicbees_src/thaumicbees/block/BlockPlanks.java index 22c149b..0c158a0 100644 --- a/thaumicbees_src/thaumicbees/block/BlockPlanks.java +++ b/thaumicbees_src/thaumicbees/block/BlockPlanks.java @@ -17,14 +17,13 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockPlanks extends Block { @SideOnly(Side.CLIENT) - private Icon[] icons = new Icon[PlankType.values().length]; + private Icon[] icons; public BlockPlanks(int id) { super(id, Material.wood); this.setHardness(2.5f); this.setResistance(6.0f); - this.setUnlocalizedName("tb.planks"); this.setCreativeTab(CreativeTabs.tabBlock); if (ThaumicBees.getConfig().AreMagicPlanksFlammable) { @@ -58,6 +57,7 @@ public class BlockPlanks extends Block @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { + this.icons = new Icon[PlankType.values().length]; for (PlankType t : PlankType.values()) { this.icons[t.ordinal()] = par1IconRegister.registerIcon(VersionInfo.ModName + ":" + t.name); diff --git a/thaumicbees_src/thaumicbees/block/BlockWoodSlab.java b/thaumicbees_src/thaumicbees/block/BlockWoodSlab.java index 88da543..dd2fc0d 100644 --- a/thaumicbees_src/thaumicbees/block/BlockWoodSlab.java +++ b/thaumicbees_src/thaumicbees/block/BlockWoodSlab.java @@ -20,7 +20,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockWoodSlab extends BlockHalfSlab { @SideOnly(Side.CLIENT) - private Icon[] icons = new Icon[PlankType.values().length]; + private Icon[] icons; public BlockWoodSlab(int id, boolean doubleSlab) { @@ -72,6 +72,7 @@ public class BlockWoodSlab extends BlockHalfSlab @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { + this.icons = new Icon[PlankType.values().length]; for (PlankType t : PlankType.values()) { this.icons[t.ordinal()] = par1IconRegister.registerIcon(VersionInfo.ModName + ":" + t.name); diff --git a/thaumicbees_src/thaumicbees/block/TileEntityEffectJar.java b/thaumicbees_src/thaumicbees/block/TileEntityEffectJar.java deleted file mode 100644 index d9c6117..0000000 --- a/thaumicbees_src/thaumicbees/block/TileEntityEffectJar.java +++ /dev/null @@ -1,28 +0,0 @@ -package thaumicbees.block; - -import thaumicbees.main.utils.EffectJarHousing; -import forestry.api.apiculture.IBeeHousing; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -public class TileEntityEffectJar extends TileEntity -{ - private String ownerName; - private EffectJarHousing housingLogic; - - public TileEntityEffectJar() - { - super(); - } - - public void setOwner(EntityPlayer player) - { - this.ownerName = player.username; - } - - public String getOwner() - { - return this.ownerName; - } -} diff --git a/thaumicbees_src/thaumicbees/gui/ContainerEffectJar.java b/thaumicbees_src/thaumicbees/gui/ContainerEffectJar.java new file mode 100644 index 0000000..17f0aa6 --- /dev/null +++ b/thaumicbees_src/thaumicbees/gui/ContainerEffectJar.java @@ -0,0 +1,25 @@ +package thaumicbees.gui; + +import forestry.api.core.ItemInterface; +import thaumicbees.tileentity.TileEntityEffectJar; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; + +public class ContainerEffectJar extends Container +{ + private TileEntityEffectJar jar; + + public ContainerEffectJar(TileEntityEffectJar tileEntityEffectJar, EntityPlayer player) + { + this.jar = tileEntityEffectJar; + ItemStack drone = ItemInterface.getItem("beeDroneGE"); + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) + { + return true; + } + +} diff --git a/thaumicbees_src/thaumicbees/gui/GUIEffectJar.java b/thaumicbees_src/thaumicbees/gui/GUIEffectJar.java new file mode 100644 index 0000000..3bd05e7 --- /dev/null +++ b/thaumicbees_src/thaumicbees/gui/GUIEffectJar.java @@ -0,0 +1,60 @@ +package thaumicbees.gui; + +import org.lwjgl.opengl.GL11; + +import thaumicbees.main.CommonProxy; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.inventory.Container; + +public class GUIEffectJar extends GuiContainer +{ + public static final String BACKGROUND_FILE = "jarScreen.png"; + + private static final int WIDTH = 176; + private static final int HEIGHT = 156; + + private static final int SLOT_JAR_X = 80; + private static final int SLOT_JAR_Y = 22; + private static final int SLOT_INVENTORY_X = 8; + private static final int SLOT_INVENTORY_Y = 74; + private static final int BAR_DEST_X = 117; + private static final int BAR_DEST_Y = 10; + + private static final int BAR_SRC_X = 176; + private static final int BAR_SRC_Y = 0; + + private static final int BAR_WIDTH = 10; + private static final int BAR_HEIGHT = 40; + + public GUIEffectJar(ContainerEffectJar container) + { + super(container); + this.xSize = WIDTH; + this.ySize = HEIGHT; + } + + @Override + protected void drawGuiContainerForegroundLayer(int par1, int par2) + { + fontRenderer.drawString("Inve", 9, 63, 0); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float f, int i, int j) + { + int texture = this.mc.renderEngine.getTexture(CommonProxy.TCBEES_GUI_PATH + BACKGROUND_FILE); + + GL11.glColor4f(1f, 1f, 1f, 0.2f); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_SRC_ALPHA); + GL11.glBindTexture(GL11.GL_TEXTURE_2D, texture); + + this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, xSize, ySize); + + GL11.glColor4f(1f, 1f, 1f, 1f); + + float percent = 0.0f; + int value = BAR_HEIGHT - (int)(percent * BAR_HEIGHT); + this.drawTexturedModalRect(this.guiLeft + BAR_DEST_X, this.guiTop + value + BAR_DEST_Y, BAR_SRC_X, BAR_SRC_Y, BAR_WIDTH, BAR_HEIGHT - value); + } + +} diff --git a/thaumicbees_src/thaumicbees/gui/GUIHandler.java b/thaumicbees_src/thaumicbees/gui/GUIHandler.java new file mode 100644 index 0000000..817542a --- /dev/null +++ b/thaumicbees_src/thaumicbees/gui/GUIHandler.java @@ -0,0 +1,37 @@ +package thaumicbees.gui; + +import thaumicbees.tileentity.TileEntityEffectJar; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import cpw.mods.fml.common.network.IGuiHandler; + +public class GUIHandler implements IGuiHandler +{ + + @Override + public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) + { + Object value = null; + + if (ID == UIScreens.EFFECT_JAR.ordinal()) + { + value = new ContainerEffectJar((TileEntityEffectJar)(world.getBlockTileEntity(x, y, z)), player); + } + + return value; + } + + @Override + public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) + { + Object value = null; + + if (ID == UIScreens.EFFECT_JAR.ordinal()) + { + value = new GUIEffectJar(new ContainerEffectJar((TileEntityEffectJar)(world.getBlockTileEntity(x, y, z)), player)); + } + + return value; + } + +} diff --git a/thaumicbees_src/thaumicbees/gui/SlotCustomItems.java b/thaumicbees_src/thaumicbees/gui/SlotCustomItems.java new file mode 100644 index 0000000..d507467 --- /dev/null +++ b/thaumicbees_src/thaumicbees/gui/SlotCustomItems.java @@ -0,0 +1,107 @@ +package thaumicbees.gui; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class SlotCustomItems extends Slot +{ + private List items; + + public SlotCustomItems(IInventory inventory, int slotIndex, int xPos, int yPos) + { + this(inventory, slotIndex, xPos, yPos, new ItemStack[0]); + } + + public SlotCustomItems(IInventory inventory, int slotIndex, int xPos, int yPos, ItemStack... items) + { + super(inventory, slotIndex, xPos, yPos); + this.items = new ArrayList(); + + for (ItemStack i : items) + { + this.items.add(i); + } + } + + public List getValidItems() + { + return this.items; + } + + public void addValidItem(ItemStack newItem) + { + boolean contains = false; + for (int i = 0; i < this.items.size(); ++i) + { + ItemStack s = this.items.get(i); + if (s.itemID == newItem.itemID) + { + if (s.getItemDamage() == -1) + { + contains = true; + break; + } + else if (s.getItemDamage() == newItem.getItemDamage()) + { + contains = true; + break; + } + } + } + if (!contains) + { + this.items.add(newItem); + } + } + + /** + * + * @param removeItem ItemStack to remove. + */ + public void removeValidItem(ItemStack removeItem) + { + for (int i = 0; i < this.items.size(); ++i) + { + ItemStack s = this.items.get(i); + if (s.itemID == removeItem.itemID) + { + if (s.getItemDamage() == -1) + { + this.items.remove(i); + break; + } + else if (s.getItemDamage() == removeItem.getItemDamage()) + { + this.items.remove(i); + break; + } + } + } + } + + @Override + public boolean isItemValid(ItemStack itemStack) + { + boolean flag = false; + for (int i = 0; i < this.items.size(); ++i) + { + if (this.items.get(i).itemID == itemStack.itemID) + { + if (this.items.get(i).getItemDamage() == itemStack.getItemDamage()) + { + flag = true; + } + else + { + flag = this.items.get(i).getItemDamage() == -1; + } + } + } + return flag; + } + +} diff --git a/thaumicbees_src/thaumicbees/gui/UIScreens.java b/thaumicbees_src/thaumicbees/gui/UIScreens.java new file mode 100644 index 0000000..c7134d5 --- /dev/null +++ b/thaumicbees_src/thaumicbees/gui/UIScreens.java @@ -0,0 +1,7 @@ +package thaumicbees.gui; + +public enum UIScreens +{ + EFFECT_JAR, + ; +} diff --git a/thaumicbees_src/thaumicbees/item/ItemCrystalAspect.java b/thaumicbees_src/thaumicbees/item/ItemCrystalAspect.java index 4636a35..15ad481 100644 --- a/thaumicbees_src/thaumicbees/item/ItemCrystalAspect.java +++ b/thaumicbees_src/thaumicbees/item/ItemCrystalAspect.java @@ -45,7 +45,7 @@ public class ItemCrystalAspect extends Item @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { - this.itemIcon = par1IconRegister.registerIcon(VersionInfo.ModName + ":crystalAspect"); + this.itemIcon = par1IconRegister.registerIcon(VersionInfo.ModName.toLowerCase() + ":crystalAspect"); } @Override diff --git a/thaumicbees_src/thaumicbees/item/ItemMagicHiveFrame.java b/thaumicbees_src/thaumicbees/item/ItemMagicHiveFrame.java index 5dccf82..ec9615f 100644 --- a/thaumicbees_src/thaumicbees/item/ItemMagicHiveFrame.java +++ b/thaumicbees_src/thaumicbees/item/ItemMagicHiveFrame.java @@ -5,7 +5,6 @@ import java.util.List; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import thaumcraft.api.AuraNode; import thaumcraft.api.EnumTag; import thaumcraft.api.ObjectTags; import thaumcraft.api.ThaumcraftApi; diff --git a/thaumicbees_src/thaumicbees/item/ItemMoonDial.java b/thaumicbees_src/thaumicbees/item/ItemMoonDial.java index a232b7e..bd5d3d7 100644 --- a/thaumicbees_src/thaumicbees/item/ItemMoonDial.java +++ b/thaumicbees_src/thaumicbees/item/ItemMoonDial.java @@ -5,6 +5,7 @@ import java.util.List; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import thaumicbees.item.types.PollenType; +import thaumicbees.main.Config; import thaumicbees.main.ThaumicBees; import thaumicbees.main.utils.MoonPhase; import thaumicbees.main.utils.TabThaumicBees; @@ -40,16 +41,27 @@ public class ItemMoonDial extends Item this.itemIcon = this.icons[0]; } + @Override @SideOnly(Side.CLIENT) - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) + public Icon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { - par3List.add("\u00A77" - + MoonPhase.getMoonPhaseFromTime(MinecraftServer.getServer().worldServers[0].getWorldTime()).getLocalizedName()); + return this.icons[MoonPhase.getMoonPhaseFromTime(player.worldObj.getWorldTime()).ordinal()]; + } + + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack itemStack, EntityPlayer entityPlayer, List infoList, boolean par4) + { + if (ThaumicBees.getConfig().MoonDialShowsPhaseInText) + { + infoList.add("\u00A77" + MoonPhase.getMoonPhaseFromTime(entityPlayer.worldObj.getWorldTime()).getLocalizedName()); + } } @Override + @SideOnly(Side.CLIENT) public Icon getIconFromDamage(int damage) { - return this.icons[MoonPhase.getMoonPhaseFromTime(MinecraftServer.getServer().worldServers[0].getWorldTime()).ordinal()]; + return this.icons[5]; } } diff --git a/thaumicbees_src/thaumicbees/main/ClientProxy.java b/thaumicbees_src/thaumicbees/main/ClientProxy.java index 9ffeb70..d1247bb 100644 --- a/thaumicbees_src/thaumicbees/main/ClientProxy.java +++ b/thaumicbees_src/thaumicbees/main/ClientProxy.java @@ -16,11 +16,7 @@ public class ClientProxy extends CommonProxy @Override public void preloadTextures() - { - // Preload the TCBees items file - MinecraftForgeClient.preloadTexture(TCBEES_ITEMS_IMAGE); - MinecraftForgeClient.preloadTexture(TCBEES_LIQUIDS_IMAGE); - + { Field f; try { diff --git a/thaumicbees_src/thaumicbees/main/CommonProxy.java b/thaumicbees_src/thaumicbees/main/CommonProxy.java index f1df93f..2fda5c2 100644 --- a/thaumicbees_src/thaumicbees/main/CommonProxy.java +++ b/thaumicbees_src/thaumicbees/main/CommonProxy.java @@ -6,16 +6,14 @@ import net.minecraft.world.World; public class CommonProxy { - public static final String TCBEES_GFX = "/gfx/thaumicbees/"; + public static final String TCBEES_GFX = "/mods/thaumicbees/textures/"; public static final String TCBEES_RESEARCH = "/research/thaumicbees/"; public static final String TCBEES_LOCDIR = "/lang/thaumicbees/"; - public static final String TCBEES_ITEM_GFX = TCBEES_GFX + "items/"; public static String FORESTRY_GFX_ITEMS; public static String FORESTRY_GFX_BEEEFFECTS; - public static final String TCBEES_ITEMS_IMAGE = TCBEES_ITEM_GFX + "items.png"; - public static final String TCBEES_LIQUIDS_IMAGE = TCBEES_ITEM_GFX + "liquids.png"; + public static final String TCBEES_GUI_PATH = TCBEES_GFX + "gui/"; public CommonProxy() { } diff --git a/thaumicbees_src/thaumicbees/main/Config.java b/thaumicbees_src/thaumicbees/main/Config.java index ffbc00f..1b6fce5 100644 --- a/thaumicbees_src/thaumicbees/main/Config.java +++ b/thaumicbees_src/thaumicbees/main/Config.java @@ -36,7 +36,6 @@ import thaumicbees.item.types.NuggetType; import thaumicbees.item.types.PlankType; import thaumicbees.item.types.ResourceType; import thaumicbees.main.utils.LocalizationManager; -import thaumicbees.main.utils.TabThaumicBees; import thaumicbees.main.utils.compat.EquivalentExchangeHelper; import thaumicbees.main.utils.compat.ForestryHelper; import thaumicbees.main.utils.compat.ThaumcraftHelper; @@ -60,12 +59,14 @@ public class Config public boolean SkipUpdateCheck; public boolean AreMagicPlanksFlammable; public boolean UseImpregnatedStickInTools; + public boolean MoonDialShowsPhaseInText; public String ThaumaturgeExtraItems; public int CapsuleStackSizeMax; public static BlockPlanks planksWood; public static BlockWoodSlab slabWoodHalf; public static BlockWoodSlab slabWoodFull; + //public static BlockEffectJar effectJar; public static ItemComb combs; public static ItemWax wax; @@ -159,9 +160,9 @@ public class Config if (ThaumcraftHelper.isActive()) { planksWood = new BlockPlanks(plankId); + planksWood.setUnlocalizedName("tb.planks"); - Item item = new ItemMultiTextureTile(planksWood.blockID - 256, planksWood, PlankType.getAllNames()) - .setUnlocalizedName(planksWood.getUnlocalizedName2()); + Item item = new ItemMultiTextureTile(planksWood.blockID - 256, planksWood, PlankType.getAllNames()); Item.itemsList[planksWood.blockID] = item; OreDictionary.registerOre("plankWood", new ItemStack(planksWood, 1, -1)); @@ -171,22 +172,26 @@ public class Config slabWoodFull = new BlockWoodSlab(slabFullId, true); slabWoodHalf = new BlockWoodSlab(slabHalfId, false); - item = new ItemSlab(slabWoodHalf.blockID - 256, slabWoodHalf, slabWoodFull, false) - .setUnlocalizedName(slabWoodHalf.getUnlocalizedName2()); + slabWoodFull.setUnlocalizedName("tb.planks"); + slabWoodHalf.setUnlocalizedName("tb.planks"); + + item = new ItemSlab(slabWoodHalf.blockID - 256, slabWoodHalf, slabWoodFull, false); Item.itemsList[slabWoodHalf.blockID] = item; - item = new ItemSlab(slabWoodFull.blockID - 256, slabWoodHalf, slabWoodFull, true) - .setUnlocalizedName(slabWoodFull.getUnlocalizedName2()); + item = new ItemSlab(slabWoodFull.blockID - 256, slabWoodHalf, slabWoodFull, true); Item.itemsList[slabWoodFull.blockID] = item; OreDictionary.registerOre("slabWood", new ItemStack(slabWoodHalf, 1, -1)); } } +/* effectJar = new BlockEffectJar(tbConfig.getBlock("effectJar", blockIdBase++).getInt()); + + GameRegistry.registerBlock(effectJar, "tb.effectJar");*/ } public void registerTileEntities() { - + //GameRegistry.registerTileEntity(TileEntityEffectJar.class, "tb.entity.effectJar"); } public void setupItems() @@ -335,6 +340,10 @@ public class Config p = tbConfig.get("general", "useImpregnatedStickInTools", false); p.comment = "Set to true to make Thaumium Grafter & Scoop require impregnated sticks in the recipe."; this.UseImpregnatedStickInTools = p.getBoolean(false); + + p = tbConfig.get("general", "moonDialShowText", false); + p.comment = "set to true to show the current moon phase in mouse-over text."; + this.MoonDialShowsPhaseInText = p.getBoolean(false); } } diff --git a/thaumicbees_src/thaumicbees/main/ThaumicBees.java b/thaumicbees_src/thaumicbees/main/ThaumicBees.java index f6954cd..37b11c2 100644 --- a/thaumicbees_src/thaumicbees/main/ThaumicBees.java +++ b/thaumicbees_src/thaumicbees/main/ThaumicBees.java @@ -1,9 +1,5 @@ package thaumicbees.main; -import net.minecraftforge.common.Configuration; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.ForgeSubscribe; -import thaumicbees.item.types.PlankType; import thaumicbees.main.utils.CompatabilityManager; import thaumicbees.main.utils.CraftingManager; import thaumicbees.main.utils.LocalizationManager; @@ -15,10 +11,9 @@ import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import forestry.api.core.ItemInterface; +import cpw.mods.fml.common.network.NetworkRegistry; @Mod( modid=VersionInfo.ModName, @@ -37,6 +32,7 @@ public class ThaumicBees @SidedProxy(serverSide="thaumicbees.main.CommonProxy", clientSide="thaumicbees.main.ClientProxy") public static CommonProxy proxy; + //public GUIHandler guiHandler; private String configsPath; private Config modConfig; @@ -79,6 +75,9 @@ public class ThaumicBees @Mod.PostInit public void postInit(FMLPostInitializationEvent event) { + /*this.guiHandler = new GUIHandler(); + NetworkRegistry.instance().registerGuiHandler(this, this.guiHandler);*/ + thaumicbees.bees.Allele.setupAdditionalAlleles(); thaumicbees.bees.BeeSpecies.setupBeeSpecies(); thaumicbees.bees.BeeMutation.setupMutations(); diff --git a/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java b/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java index e0ef583..2aff30c 100644 --- a/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java +++ b/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java @@ -122,7 +122,7 @@ public class CraftingManager }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Config.moonDial), new Object[] { - "rqr", "qDq", "rqr", + "DqD", "qrq", "DqD", 'r', Item.redstone, 'q', Item.netherQuartz, 'D', "dyeGreen" diff --git a/thaumicbees_src/thaumicbees/main/utils/EffectJarHousing.java b/thaumicbees_src/thaumicbees/tileentity/EffectJarHousing.java similarity index 97% rename from thaumicbees_src/thaumicbees/main/utils/EffectJarHousing.java rename to thaumicbees_src/thaumicbees/tileentity/EffectJarHousing.java index 140e182..ebb0ccd 100644 --- a/thaumicbees_src/thaumicbees/main/utils/EffectJarHousing.java +++ b/thaumicbees_src/thaumicbees/tileentity/EffectJarHousing.java @@ -1,6 +1,5 @@ -package thaumicbees.main.utils; +package thaumicbees.tileentity; -import thaumicbees.block.TileEntityEffectJar; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import forestry.api.apiculture.IBee; diff --git a/thaumicbees_src/thaumicbees/tileentity/TileEntityEffectJar.java b/thaumicbees_src/thaumicbees/tileentity/TileEntityEffectJar.java new file mode 100644 index 0000000..3c2a80a --- /dev/null +++ b/thaumicbees_src/thaumicbees/tileentity/TileEntityEffectJar.java @@ -0,0 +1,113 @@ +package thaumicbees.tileentity; + +import forestry.api.apiculture.IBeeHousing; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class TileEntityEffectJar extends TileEntity implements IInventory +{ + private String ownerName; + private EffectJarHousing housingLogic; + + private ItemStack droneSlot; + private ItemStack queenSlot; + + private int lifeTicksRemaining; + private static final int lifeTicks = 135; + + public TileEntityEffectJar() + { + super(); + } + + public void setOwner(EntityPlayer player) + { + this.ownerName = player.username; + } + + public String getOwner() + { + return this.ownerName; + } + + @Override + public int getSizeInventory() + { + return 1; + } + + @Override + public ItemStack getStackInSlot(int i) + { + return null; + } + + @Override + public ItemStack decrStackSize(int i, int j) + { + // TODO Auto-generated method stub + return null; + } + + @Override + public ItemStack getStackInSlotOnClosing(int i) + { + return null; + } + + @Override + public void readFromNBT(NBTTagCompound par1nbtTagCompound) { + super.readFromNBT(par1nbtTagCompound); + } + + @Override + public void writeToNBT(NBTTagCompound par1nbtTagCompound) { + super.writeToNBT(par1nbtTagCompound); + } + + @Override + public void setInventorySlotContents(int i, ItemStack itemstack) + { + + } + + @Override + public String getInvName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean isInvNameLocalized() { + // TODO Auto-generated method stub + return false; + } + + @Override + public int getInventoryStackLimit() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer entityplayer) + { + return true; + } + + @Override + public boolean isStackValidForSlot(int i, ItemStack itemstack) + { + return false; + } + + @Override + public void openChest() {} + + @Override + public void closeChest() { } +}