Work on Effect jar;

Fixing TC3 integration on 1.5
This commit is contained in:
MysteriousAges committed 2013-04-21 15:38:52 -07:00
1 parent fc2f40d100
commit 9729d75252
34 files changed
+457 -184

No files matched your search

Binary file not shown.
+1 -1
View File
@@ -17,7 +17,7 @@
<property name="mc.version" value="1.5.1"/>
<property name="forge.version" value="7.7.1.651"/>
<property name="thaumicbees.version" value="1.4.5"/>
<property name="thaumicbees.version" value="1.4.5a"/>
<!-- for local deployment only, not used by main -->
<property name="deploy.type" value="previews" />
+5
View File
@@ -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.
+2 -2
View File
@@ -62,7 +62,7 @@
<entry key="tb.resource.fertilizer">Concentrated Compound</entry>
<entry key="tb.resource.startNode">Bees and Magic</entry>
<entry key="tb.resource.beeEnchant">Stark Infusion</entry>
<entry key="tb.resource.crystalFlux">Crystalized %s Aspect</entry>
<entry key="tb.resource.crystalAspect">Crystalized %s Aspect</entry>
<!-- Frames -->
<entry key="item.frameMagic.name">Magic Frame</entry>
@@ -82,7 +82,7 @@
<entry key="tb.liquid.water">Water</entry>
<entry key="tb.liquid.lava">Lava</entry>
<entry key="tb.liquid.biomass">Biomass</entry>
<entry key="tb.liquid.biofuel">Empty</entry>
<entry key="tb.liquid.biofuel">Biofuel</entry>
<entry key="tb.liquid.Oil">Oil</entry>
<entry key="tb.liquid.Fuel">Fuel</entry>
<entry key="tb.liquid.seedoil">Seed Oil</entry>
Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

+4 -3
View File
@@ -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
{
@@ -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;
@@ -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;
@@ -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())
{
@@ -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");
}
}
@@ -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
@@ -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");
}
}
@@ -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;
}
}
@@ -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<EnumPlantType> types = pollinatable.getPlantType();
return types.size() > 0 && !types.contains(EnumPlantType.Nether) && !types.contains(EnumPlantType.Water) ;
}
public String getDescription()
@@ -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;
}
}
@@ -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
@@ -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);
@@ -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);
@@ -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;
}
}
@@ -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;
}
}
@@ -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);
}
}
@@ -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;
}
}
@@ -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<ItemStack> 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<ItemStack>();
for (ItemStack i : items)
{
this.items.add(i);
}
}
public List<ItemStack> 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;
}
}
@@ -0,0 +1,7 @@
package thaumicbees.gui;
public enum UIScreens
{
EFFECT_JAR,
;
}
@@ -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
@@ -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;
@@ -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];
}
}
@@ -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
{
@@ -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() { }
+17 -8
View File
@@ -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);
}
}
@@ -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();
@@ -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"
@@ -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;
@@ -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() { }
}