mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-21 04:32:34 +00:00
*tableflip*
This commit is contained in:
1 parent
9729d75252
commit
88ec668999
15 files changed
+233
-106
No files matched your search
@@ -178,21 +178,21 @@
|
||||
<entry key="thaumicbees.speciesSpirit.description">It is said these bees are able to contact the dead.|Apinomicon</entry>
|
||||
<entry key="thaumicbees.speciesSoul">Soul</entry>
|
||||
<entry key="thaumicbees.speciesSoul.description">"The Dread Pirate Roberts has come for your SOOOOOOULS!"|Dread Pirate Roberts</entry>
|
||||
<entry key="thaumicbees.speciesIron">Iron</entry>
|
||||
<entry key="thaumicbees.speciesIron">Ferrous</entry>
|
||||
<entry key="thaumicbees.speciesIron.description">Having absorbed some of the base metal, these bees can concentrate the essence of iron from the region.|Apinomicon</entry>
|
||||
<entry key="thaumicbees.speciesGold">Gold</entry>
|
||||
<entry key="thaumicbees.speciesGold">Auric</entry>
|
||||
<entry key="thaumicbees.speciesGold.description">Not all that glitters is gold.|Ancient Aphorism</entry>
|
||||
<entry key="thaumicbees.speciesCopper">Copper</entry>
|
||||
<entry key="thaumicbees.speciesCopper">Cuprum</entry>
|
||||
<entry key="thaumicbees.speciesCopper.description">A base metal common in many applications; these bees are helpful for resource-starved magicians.|Apinomicon</entry>
|
||||
<entry key="thaumicbees.speciesTin">Tin</entry>
|
||||
<entry key="thaumicbees.speciesTin">Stannum</entry>
|
||||
<entry key="thaumicbees.speciesTin.description">While metalic, these bees are suprisingly fragile.|Apinomicon</entry>
|
||||
<entry key="thaumicbees.speciesSilver">Silver</entry>
|
||||
<entry key="thaumicbees.speciesSilver">Argentum</entry>
|
||||
<entry key="thaumicbees.speciesSilver.description">While they do not recieve as much attention as Golden bees, they are nonetheless valuable.|Apinomicon</entry>
|
||||
<entry key="thaumicbees.speciesLead">Lead</entry>
|
||||
<entry key="thaumicbees.speciesLead">Plumbum</entry>
|
||||
<entry key="thaumicbees.speciesLead.description">A favourite of amateur alchemists, they believe they can transform these bees into gold.|Apinomicon</entry>
|
||||
<entry key="thaumicbees.speciesDiamond">Diamond</entry>
|
||||
<entry key="thaumicbees.speciesDiamond">Diamandi</entry>
|
||||
<entry key="thaumicbees.speciesDiamond.description">Crystalline, glittering, and harder than dragon's teeth. These bees are none of those.|Apinomicon</entry>
|
||||
<entry key="thaumicbees.speciesEmerald">Emerald</entry>
|
||||
<entry key="thaumicbees.speciesEmerald">Esmeraldi</entry>
|
||||
<entry key="thaumicbees.speciesEmerald.description">It is said they have been to a land ruled by a Great Wizard, and have taken the aspect of his city.|Apinomicon</entry>
|
||||
<entry key="thaumicbees.speciesChicken">Poultry</entry>
|
||||
<entry key="thaumicbees.speciesChicken.description">"Cluck. Cluck cluck! ... You heard me."|Confused bee</entry>
|
||||
@@ -209,6 +209,7 @@
|
||||
<entry key="thaumicbees.effectNodeGeneration">Aura Attract</entry>
|
||||
<entry key="thaumicbees.effectNodePurify">Purify Aura</entry>
|
||||
<entry key="thaumicbees.effectNodeFlux">Aura Flux</entry>
|
||||
<entry key="thuamicbees.effectNodeCharge">Aura Charge</entry>
|
||||
<entry key="thaumicbees.effectBrainy">Brainy</entry>
|
||||
<entry key="thaumicbees.effectBatty">Batty</entry>
|
||||
<entry key="thaumicbees.effectWispy">Wispy</entry>
|
||||
|
||||
@@ -60,7 +60,7 @@ public class BlockPlanks extends Block
|
||||
this.icons = new Icon[PlankType.values().length];
|
||||
for (PlankType t : PlankType.values())
|
||||
{
|
||||
this.icons[t.ordinal()] = par1IconRegister.registerIcon(VersionInfo.ModName + ":" + t.name);
|
||||
this.icons[t.ordinal()] = par1IconRegister.registerIcon(VersionInfo.ModName.toLowerCase() + ":" + t.name);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -75,7 +75,7 @@ public class BlockWoodSlab extends BlockHalfSlab
|
||||
this.icons = new Icon[PlankType.values().length];
|
||||
for (PlankType t : PlankType.values())
|
||||
{
|
||||
this.icons[t.ordinal()] = par1IconRegister.registerIcon(VersionInfo.ModName + ":" + t.name);
|
||||
this.icons[t.ordinal()] = par1IconRegister.registerIcon(VersionInfo.ModName.toLowerCase() + ":" + t.name);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,12 @@
|
||||
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.inventory.ICrafting;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import thaumicbees.tileentity.TileEntityEffectJar;
|
||||
import forestry.api.core.ItemInterface;
|
||||
|
||||
public class ContainerEffectJar extends Container
|
||||
{
|
||||
@@ -13,13 +15,81 @@ public class ContainerEffectJar extends Container
|
||||
public ContainerEffectJar(TileEntityEffectJar tileEntityEffectJar, EntityPlayer player)
|
||||
{
|
||||
this.jar = tileEntityEffectJar;
|
||||
ItemStack drone = ItemInterface.getItem("beeDroneGE");
|
||||
SlotCustomItems slot = new SlotCustomItems(this.jar, 0, 80, 22);
|
||||
slot.addValidItem(ItemInterface.getItem("beeDroneGE"));
|
||||
this.addSlotToContainer(slot);
|
||||
|
||||
for (int i = 0; i < 3; ++i)
|
||||
{
|
||||
for (int j = 0; j < 9; ++j)
|
||||
{
|
||||
this.addSlotToContainer(new Slot(player.inventory, j + i * 9+9, 8 + j * 18, 74 + i * 18));
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < 9; ++i)
|
||||
{
|
||||
this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 132));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInteractWith(EntityPlayer entityplayer)
|
||||
{
|
||||
return true;
|
||||
return this.jar.isUseableByPlayer(entityplayer);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack transferStackInSlot(EntityPlayer player, int slot)
|
||||
{
|
||||
ItemStack value = null;
|
||||
Slot s = (Slot)this.inventorySlots.get(slot);
|
||||
|
||||
if (s != null && s.getHasStack())
|
||||
{
|
||||
ItemStack source = s.getStack();
|
||||
value = source.copy();
|
||||
|
||||
if (slot == 0)
|
||||
{
|
||||
if (!this.mergeItemStack(source, 1, 36, true))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
s.onSlotChange(source, value);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (((SlotCustomItems)(this.inventorySlots.get(0))).isItemValid(source))
|
||||
{
|
||||
if (this.mergeItemStack(source, 0, 1, false))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
s.onSlotChange(source, value);
|
||||
}
|
||||
}
|
||||
|
||||
if (source.stackSize == 0)
|
||||
{
|
||||
s.putStack(null);
|
||||
}
|
||||
else
|
||||
{
|
||||
s.onSlotChanged();
|
||||
}
|
||||
|
||||
if (source.stackSize == value.stackSize)
|
||||
{
|
||||
value = null;
|
||||
}
|
||||
|
||||
s.onPickupFromSlot(player, source);
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -36,7 +36,7 @@ public class GUIEffectJar extends GuiContainer
|
||||
@Override
|
||||
protected void drawGuiContainerForegroundLayer(int par1, int par2)
|
||||
{
|
||||
fontRenderer.drawString("Inve", 9, 63, 0);
|
||||
fontRenderer.drawString("Inventory", 9, 63, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -94,10 +94,12 @@ public class SlotCustomItems extends Slot
|
||||
if (this.items.get(i).getItemDamage() == itemStack.getItemDamage())
|
||||
{
|
||||
flag = true;
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
flag = this.items.get(i).getItemDamage() == -1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ public class ItemThaumiumGrafter extends Item implements IVisRepairable, IToolGr
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getSaplingModifier(ItemStack stack, World world, int x, int y, int z)
|
||||
public float getSaplingModifier(ItemStack stack, World world, EntityPlayer player, int x, int y, int z)
|
||||
{
|
||||
return 100f;
|
||||
}
|
||||
|
||||
@@ -14,24 +14,6 @@ public class ClientProxy extends CommonProxy
|
||||
|
||||
public ClientProxy() { }
|
||||
|
||||
@Override
|
||||
public void preloadTextures()
|
||||
{
|
||||
Field f;
|
||||
try
|
||||
{
|
||||
f = Class.forName("forestry.core.config.Config").getField("enableParticleFX");
|
||||
ThaumicBees.getConfig().DrawParticleEffects = f.getBoolean(null);
|
||||
|
||||
f = Class.forName("forestry.core.config.Defaults").getField("TEXTURE_PARTICLES_BEE");
|
||||
thaumicbees.main.CommonProxy.FORESTRY_GFX_BEEEFFECTS = (String)f.get(null);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawBeeEffects(World world, double xPos, double yPos, double zPos, int colour, int rangeX, int rangeY, int rangeZ)
|
||||
{
|
||||
|
||||
@@ -17,11 +17,6 @@ public class CommonProxy
|
||||
|
||||
public CommonProxy() { }
|
||||
|
||||
public void preloadTextures()
|
||||
{
|
||||
// Does nothing here.
|
||||
}
|
||||
|
||||
public void drawBeeEffects(World world, double xPos, double yPos, double zPos, int colour, int rangeX, int rangeY, int rangeZ)
|
||||
{
|
||||
// Does nothing in common.
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package thaumicbees.main;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -15,6 +16,7 @@ import net.minecraftforge.common.Configuration;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.Property;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import thaumicbees.block.BlockEffectJar;
|
||||
import thaumicbees.block.BlockPlanks;
|
||||
import thaumicbees.block.BlockWoodSlab;
|
||||
import thaumicbees.item.ItemCapsule;
|
||||
@@ -40,8 +42,10 @@ import thaumicbees.main.utils.compat.EquivalentExchangeHelper;
|
||||
import thaumicbees.main.utils.compat.ForestryHelper;
|
||||
import thaumicbees.main.utils.compat.ThaumcraftHelper;
|
||||
import thaumicbees.storage.BackpackDefinition;
|
||||
import thaumicbees.tileentity.TileEntityEffectJar;
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.storage.BackpackManager;
|
||||
import forestry.api.storage.EnumBackpackType;
|
||||
@@ -66,7 +70,7 @@ public class Config
|
||||
public static BlockPlanks planksWood;
|
||||
public static BlockWoodSlab slabWoodHalf;
|
||||
public static BlockWoodSlab slabWoodFull;
|
||||
//public static BlockEffectJar effectJar;
|
||||
public static BlockEffectJar effectJar;
|
||||
|
||||
public static ItemComb combs;
|
||||
public static ItemWax wax;
|
||||
@@ -184,14 +188,14 @@ public class Config
|
||||
}
|
||||
}
|
||||
|
||||
/* effectJar = new BlockEffectJar(tbConfig.getBlock("effectJar", blockIdBase++).getInt());
|
||||
effectJar = new BlockEffectJar(tbConfig.getBlock("effectJar", blockIdBase++).getInt());
|
||||
|
||||
GameRegistry.registerBlock(effectJar, "tb.effectJar");*/
|
||||
GameRegistry.registerBlock(effectJar, "tb.effectJar");
|
||||
}
|
||||
|
||||
public void registerTileEntities()
|
||||
{
|
||||
//GameRegistry.registerTileEntity(TileEntityEffectJar.class, "tb.entity.effectJar");
|
||||
GameRegistry.registerTileEntity(TileEntityEffectJar.class, "tb.entity.effectJar");
|
||||
}
|
||||
|
||||
public void setupItems()
|
||||
@@ -314,6 +318,18 @@ public class Config
|
||||
{
|
||||
Property p;
|
||||
|
||||
// Pull config from Forestry via reflection
|
||||
Field f;
|
||||
try
|
||||
{
|
||||
f = Class.forName("forestry.core.config.Config").getField("enableParticleFX");
|
||||
this.DrawParticleEffects = f.getBoolean(null);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
p = tbConfig.get("general", "backpack.thaumaturge.additionalItems", "");
|
||||
p.comment = "Add additional items to the Thaumaturge's Backpack." +
|
||||
"\n Format is the same as Forestry's: id:meta;id;id:meta (etc)";
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package thaumicbees.main;
|
||||
|
||||
import thaumicbees.gui.GUIHandler;
|
||||
import thaumicbees.main.utils.CompatabilityManager;
|
||||
import thaumicbees.main.utils.CraftingManager;
|
||||
import thaumicbees.main.utils.LocalizationManager;
|
||||
@@ -32,7 +33,7 @@ public class ThaumicBees
|
||||
@SidedProxy(serverSide="thaumicbees.main.CommonProxy", clientSide="thaumicbees.main.ClientProxy")
|
||||
public static CommonProxy proxy;
|
||||
|
||||
//public GUIHandler guiHandler;
|
||||
public GUIHandler guiHandler;
|
||||
private String configsPath;
|
||||
private Config modConfig;
|
||||
|
||||
@@ -52,19 +53,7 @@ public class ThaumicBees
|
||||
|
||||
@Mod.Init
|
||||
public void init(FMLInitializationEvent event)
|
||||
{
|
||||
|
||||
this.proxy.preloadTextures();
|
||||
try
|
||||
{
|
||||
FMLLog.info("[ThaumicBees] Attempting to get Forestry's item graphics file...");
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
FMLLog.severe("ThaumicBees encountered a problem while loading!");
|
||||
throw new RuntimeException("Could not get the Forestry item texture file! Did Forestry load correctly?", e);
|
||||
}
|
||||
|
||||
{
|
||||
this.modConfig.setupBlocks();
|
||||
this.modConfig.registerTileEntities();
|
||||
this.modConfig.setupItems();
|
||||
@@ -75,8 +64,8 @@ public class ThaumicBees
|
||||
@Mod.PostInit
|
||||
public void postInit(FMLPostInitializationEvent event)
|
||||
{
|
||||
/*this.guiHandler = new GUIHandler();
|
||||
NetworkRegistry.instance().registerGuiHandler(this, this.guiHandler);*/
|
||||
this.guiHandler = new GUIHandler();
|
||||
NetworkRegistry.instance().registerGuiHandler(this, this.guiHandler);
|
||||
|
||||
thaumicbees.bees.Allele.setupAdditionalAlleles();
|
||||
thaumicbees.bees.BeeSpecies.setupBeeSpecies();
|
||||
|
||||
@@ -18,7 +18,7 @@ import net.minecraftforge.client.ForgeHooksClient;
|
||||
public class BeeRenderEffect extends EntityFX
|
||||
{
|
||||
public int blendmode = 1;
|
||||
private String texture = CommonProxy.FORESTRY_GFX_BEEEFFECTS;
|
||||
private static final String texture = "forestry:particles/swarm_bee";
|
||||
|
||||
public BeeRenderEffect(World world, double x, double y, double z, float motionScaleX, float motionScaleY, float motionScaleZ, int color)
|
||||
{
|
||||
|
||||
@@ -328,7 +328,7 @@ public class ThaumcraftHelper
|
||||
tags = new ObjectTags().add(EnumTag.COLD, 1);
|
||||
ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CraftingMaterial.ICE_SHARD.ordinal(), tags);
|
||||
tags = new ObjectTags().add(EnumTag.VALUABLE, 1).add(EnumTag.PLANT, 1).add(EnumTag.INSECT, 2)
|
||||
.add(EnumTag.CONTROL, 2).add(EnumTag.WOOD, 5);
|
||||
.add(EnumTag.CONTROL, 2).add(EnumTag.WOOD, 2);
|
||||
ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.CraftingMaterial.SCENTED_PANELING.ordinal(), tags);
|
||||
|
||||
itemStack = ItemInterface.getItem("beealyzer");
|
||||
@@ -346,11 +346,11 @@ public class ThaumcraftHelper
|
||||
ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
|
||||
|
||||
itemStack = ItemInterface.getItem("impregnatedCasing");
|
||||
tags = new ObjectTags().add(EnumTag.WOOD, 56).add(EnumTag.EXCHANGE, 8);
|
||||
tags = new ObjectTags().add(EnumTag.WOOD, 28).add(EnumTag.EXCHANGE, 8);
|
||||
ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
|
||||
|
||||
itemStack = ItemInterface.getItem("stickImpregnated");
|
||||
tags = new ObjectTags().add(EnumTag.WOOD, 6).add(EnumTag.EXCHANGE, 2);
|
||||
tags = new ObjectTags().add(EnumTag.WOOD, 3).add(EnumTag.EXCHANGE, 2);
|
||||
ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
|
||||
|
||||
itemStack = ItemInterface.getItem("peat");
|
||||
@@ -433,7 +433,7 @@ public class ThaumcraftHelper
|
||||
|
||||
// Forestry's wood
|
||||
itemStack = BlockInterface.getBlock("log1");
|
||||
tags = new ObjectTags().add(EnumTag.WOOD, 8);
|
||||
tags = new ObjectTags().add(EnumTag.WOOD, 4);
|
||||
ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags);
|
||||
itemStack = BlockInterface.getBlock("log2"); // Same tags
|
||||
ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags);
|
||||
@@ -443,7 +443,7 @@ public class ThaumcraftHelper
|
||||
ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags);
|
||||
|
||||
itemStack = ItemInterface.getItem("sapling");
|
||||
tags = new ObjectTags().add(EnumTag.PLANT, 4).add(EnumTag.WOOD, 2);
|
||||
tags = new ObjectTags().add(EnumTag.PLANT, 4).add(EnumTag.WOOD, 1);
|
||||
ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags);
|
||||
|
||||
// BEES!
|
||||
@@ -474,11 +474,11 @@ public class ThaumcraftHelper
|
||||
|
||||
itemStack = ItemInterface.getItem("tubes");
|
||||
tags = new ObjectTags(ItemInterface.getItem("ingotCopper").itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1);
|
||||
//ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.COPPER.ordinal(), tags);
|
||||
ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.COPPER.ordinal(), tags);
|
||||
tags = new ObjectTags(ItemInterface.getItem("ingotTin").itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1);
|
||||
//ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.TIN.ordinal(), tags);
|
||||
ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.TIN.ordinal(), tags);
|
||||
tags = new ObjectTags(ItemInterface.getItem("ingotBronze").itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1);
|
||||
//ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.BRONZE.ordinal(), tags);
|
||||
ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.BRONZE.ordinal(), tags);
|
||||
tags = new ObjectTags(Item.ingotIron.itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1);
|
||||
ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.IRON.ordinal(), tags);
|
||||
tags = new ObjectTags(Item.ingotGold.itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1);
|
||||
|
||||
@@ -2,6 +2,7 @@ package thaumicbees.tileentity;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.IBee;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeHousing;
|
||||
@@ -90,13 +91,19 @@ public class EffectJarHousing implements IBeeHousing
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onQueenChange(ItemStack queen) { }
|
||||
public void onQueenChange(ItemStack queen)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void wearOutEquipment(int amount) { }
|
||||
|
||||
@Override
|
||||
public void onQueenDeath(IBee queen) { }
|
||||
public void onQueenDeath(IBee queen)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPostQueenDeath(IBee queen) { }
|
||||
@@ -104,7 +111,7 @@ public class EffectJarHousing implements IBeeHousing
|
||||
@Override
|
||||
public ItemStack getQueen()
|
||||
{
|
||||
return null;
|
||||
return this.jarEntity.queenSlot;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -114,7 +121,10 @@ public class EffectJarHousing implements IBeeHousing
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setQueen(ItemStack itemstack) { }
|
||||
public void setQueen(ItemStack itemStack)
|
||||
{
|
||||
this.jarEntity.queenSlot = itemStack;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setDrone(ItemStack itemstack) { }
|
||||
@@ -128,13 +138,27 @@ public class EffectJarHousing implements IBeeHousing
|
||||
@Override
|
||||
public EnumTemperature getTemperature()
|
||||
{
|
||||
return EnumTemperature.NORMAL;
|
||||
EnumTemperature temp = EnumTemperature.NORMAL;
|
||||
ItemStack stack = this.jarEntity.queenSlot;
|
||||
if (stack != null)
|
||||
{
|
||||
IBee queen = BeeManager.beeInterface.getBee(stack);
|
||||
temp = queen.getGenome().getPrimary().getTemperature();
|
||||
}
|
||||
return temp;
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumHumidity getHumidity()
|
||||
{
|
||||
return EnumHumidity.NORMAL;
|
||||
EnumHumidity humid = EnumHumidity.NORMAL;
|
||||
ItemStack stack = this.jarEntity.queenSlot;
|
||||
if (stack != null)
|
||||
{
|
||||
IBee queen = BeeManager.beeInterface.getBee(stack);
|
||||
humid = queen.getGenome().getPrimary().getHumidity();
|
||||
}
|
||||
return humid;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package thaumicbees.tileentity;
|
||||
|
||||
import forestry.api.apiculture.IBeeHousing;
|
||||
import forestry.api.core.ItemInterface;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -13,8 +14,8 @@ public class TileEntityEffectJar extends TileEntity implements IInventory
|
||||
private String ownerName;
|
||||
private EffectJarHousing housingLogic;
|
||||
|
||||
private ItemStack droneSlot;
|
||||
private ItemStack queenSlot;
|
||||
private ItemStack[] droneSlots;
|
||||
protected ItemStack queenSlot;
|
||||
|
||||
private int lifeTicksRemaining;
|
||||
private static final int lifeTicks = 135;
|
||||
@@ -22,6 +23,7 @@ public class TileEntityEffectJar extends TileEntity implements IInventory
|
||||
public TileEntityEffectJar()
|
||||
{
|
||||
super();
|
||||
this.droneSlots = new ItemStack[1];
|
||||
}
|
||||
|
||||
public void setOwner(EntityPlayer player)
|
||||
@@ -37,60 +39,106 @@ public class TileEntityEffectJar extends TileEntity implements IInventory
|
||||
@Override
|
||||
public int getSizeInventory()
|
||||
{
|
||||
return 1;
|
||||
return this.droneSlots.length;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlot(int i)
|
||||
public ItemStack getStackInSlot(int slot)
|
||||
{
|
||||
return null;
|
||||
return droneSlots[slot];
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack decrStackSize(int i, int j)
|
||||
public ItemStack decrStackSize(int slot, int count)
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
ItemStack value = null;
|
||||
if (this.droneSlots[slot] != null)
|
||||
{
|
||||
value = this.droneSlots[slot].copy();
|
||||
value.stackSize = Math.min(count, this.droneSlots[slot].stackSize);
|
||||
this.droneSlots[slot].stackSize -= value.stackSize;
|
||||
if (this.droneSlots[slot].stackSize == 0)
|
||||
{
|
||||
this.droneSlots[slot] = null;
|
||||
}
|
||||
}
|
||||
onInventoryChanged();
|
||||
return value;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStackInSlotOnClosing(int i)
|
||||
public ItemStack getStackInSlotOnClosing(int slot)
|
||||
{
|
||||
return null;
|
||||
ItemStack value = null;
|
||||
if (this.droneSlots[slot] != null)
|
||||
{
|
||||
value = this.droneSlots[slot];
|
||||
this.droneSlots[slot] = null;
|
||||
}
|
||||
onInventoryChanged();
|
||||
return value;
|
||||
}
|
||||
|
||||
@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)
|
||||
public void readFromNBT(NBTTagCompound tagRoot)
|
||||
{
|
||||
super.readFromNBT(tagRoot);
|
||||
|
||||
if (tagRoot.hasKey("drones"))
|
||||
{
|
||||
this.droneSlots[0] = ItemStack.loadItemStackFromNBT((NBTTagCompound)tagRoot.getTag("drones"));
|
||||
}
|
||||
if (tagRoot.hasKey("queen"))
|
||||
{
|
||||
this.queenSlot = ItemStack.loadItemStackFromNBT((NBTTagCompound)tagRoot.getTag("queen"));
|
||||
}
|
||||
this.lifeTicksRemaining = tagRoot.getInteger("lifeTicksRemaining");
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInvName() {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
public void writeToNBT(NBTTagCompound tagRoot)
|
||||
{
|
||||
super.writeToNBT(tagRoot);
|
||||
|
||||
if (this.droneSlots[0] != null)
|
||||
{
|
||||
tagRoot.setTag("drones", this.droneSlots[0].writeToNBT(new NBTTagCompound()));
|
||||
}
|
||||
if (this.queenSlot != null)
|
||||
{
|
||||
tagRoot.setTag("queen", this.queenSlot.writeToNBT(new NBTTagCompound()));
|
||||
}
|
||||
tagRoot.setInteger("lifeTicksRemaining", this.lifeTicksRemaining);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isInvNameLocalized() {
|
||||
// TODO Auto-generated method stub
|
||||
public void setInventorySlotContents(int slot, ItemStack itemStack)
|
||||
{
|
||||
this.droneSlots[slot] = itemStack;
|
||||
if (this.droneSlots[slot] != null)
|
||||
{
|
||||
this.droneSlots[slot].stackSize = Math.min(this.droneSlots[slot].stackSize, this.droneSlots[slot].getItem().getItemStackLimit());
|
||||
}
|
||||
onInventoryChanged();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getInvName()
|
||||
{
|
||||
return "container.effectJar";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isInvNameLocalized()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getInventoryStackLimit() {
|
||||
// TODO Auto-generated method stub
|
||||
return 0;
|
||||
public int getInventoryStackLimit()
|
||||
{
|
||||
return 64;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -100,13 +148,13 @@ public class TileEntityEffectJar extends TileEntity implements IInventory
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isStackValidForSlot(int i, ItemStack itemstack)
|
||||
public boolean isStackValidForSlot(int i, ItemStack itemStack)
|
||||
{
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void openChest() {}
|
||||
public void openChest() { }
|
||||
|
||||
@Override
|
||||
public void closeChest() { }
|
||||
|
||||
Reference in new issue
Block a user