From ad9135590dae061c0f24fb934569fa33d4c88982 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Sun, 15 Mar 2015 01:06:14 -0700 Subject: [PATCH 01/17] Starting to flesh out Thaumic Apiary. --- .../magicbees/tileentity/TileEntityThaumicApiary.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java b/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java index 3b71520..cebb2d5 100644 --- a/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java @@ -37,8 +37,8 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento private static final int SLOT_QUEEN = 0; private static final int SLOT_DRONE = 1; private static final int SLOT_FRAME_START = 2; - private static final int SLOT_INVENTORY_START = 5; private static final int SLOT_FRAME_COUNT = 3; + private static final int SLOT_INVENTORY_START = 5; private static final int SLOT_INVENTORY_COUNT = 7; @@ -383,8 +383,12 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento @Override public boolean canInsertItem(int slot, ItemStack itemStack, int side) { if(slot == SLOT_QUEEN && PluginApiculture.beeInterface.isMember(itemStack) - && !PluginApiculture.beeInterface.isDrone(itemStack)) + && !PluginApiculture.beeInterface.isDrone(itemStack)) { return true; + } + else if (slot == SLOT_DRONE && PluginApiculture.beeInterface.isDrone(itemStack)) { + return true; + } return slot == SLOT_DRONE && PluginApiculture.beeInterface.isDrone(itemStack); } From 5d4b84727d1a78e30ccf53013534151a4326857e Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Tue, 17 Mar 2015 23:03:48 -0700 Subject: [PATCH 02/17] Work on Thaumic Apiary. Creating Packet Handler for sending network events (ie queen item stack changes) Tweaking textures on thaumic apiary again Adding MORE crap to gitignore build.gradle missing a runDir argument, apparently. --- .gitignore | 5 +- build.gradle | 1 + .../magicbees/client/gui/ContainerMB.java | 4 +- .../client/gui/ContainerThaumicApiary.java | 16 +- .../client/gui/GuiThaumicApiary.java | 58 +++++++ .../magicbees/main/utils/PacketHandler.java | 19 +++ .../main/utils/net/PacketInventoryUpdate.java | 5 + .../tileentity/TileEntityThaumicApiary.java | 156 +++++++++++------- .../textures/blocks/thaumicapiary.2.png | Bin 1221 -> 1221 bytes .../textures/blocks/thaumicapiary.4.png | Bin 1221 -> 1221 bytes .../assets/magicbees/textures/gui/apiary.png | Bin 4717 -> 5195 bytes 11 files changed, 196 insertions(+), 68 deletions(-) create mode 100644 src/main/java/magicbees/main/utils/PacketHandler.java create mode 100644 src/main/java/magicbees/main/utils/net/PacketInventoryUpdate.java diff --git a/.gitignore b/.gitignore index adab173..de81a7a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,7 @@ libs/ config/ crash-reports/ logs/ -mods/ \ No newline at end of file +mods/ +saves/ +usernamecache.json +options.txt \ No newline at end of file diff --git a/build.gradle b/build.gradle index f1f9623..ee5a5ff 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,7 @@ archivesBaseName = "magicbees" minecraft { version = project.version_mc + "-" + project.version_forge assetDir = "eclipse/assets" + runDir = "." replace '@VERSION@', project.version_mod replace '@MCVERSION@', project.version_mc diff --git a/src/main/java/magicbees/client/gui/ContainerMB.java b/src/main/java/magicbees/client/gui/ContainerMB.java index e3f7e5e..e608cf7 100644 --- a/src/main/java/magicbees/client/gui/ContainerMB.java +++ b/src/main/java/magicbees/client/gui/ContainerMB.java @@ -13,12 +13,12 @@ public class ContainerMB extends Container public void addPlayerInventory(InventoryPlayer inventoryPlayer, int xStart, int yStart) { for (int x = 0; x < PLAYER_INVENTORY_COLUMNS; x++){ - addSlotToContainer(new Slot(inventoryPlayer, x, 8 + 18 * x, yStart + 4 + PLAYER_INVENTORY_ROWS * 18)); + addSlotToContainer(new Slot(inventoryPlayer, x, xStart + 8 + 18 * x, yStart + 4 + PLAYER_INVENTORY_ROWS * 18)); } for (int y = 0; y < PLAYER_INVENTORY_ROWS; y++){ for (int x = 0; x < PLAYER_INVENTORY_COLUMNS; x++){ - addSlotToContainer(new Slot(inventoryPlayer, x + y * 9 + 9, 8 + 18 * x, yStart + y * 18)); + addSlotToContainer(new Slot(inventoryPlayer, x + y * 9 + 9, xStart + 8 + 18 * x, yStart + y * 18)); } } } diff --git a/src/main/java/magicbees/client/gui/ContainerThaumicApiary.java b/src/main/java/magicbees/client/gui/ContainerThaumicApiary.java index 81783cd..9e33171 100644 --- a/src/main/java/magicbees/client/gui/ContainerThaumicApiary.java +++ b/src/main/java/magicbees/client/gui/ContainerThaumicApiary.java @@ -12,7 +12,7 @@ import net.minecraft.item.ItemStack; public class ContainerThaumicApiary extends ContainerMB { - private TileEntityThaumicApiary thaumicApiary; + public TileEntityThaumicApiary apiary; public int maxSlot = 0; // Constants @@ -24,12 +24,12 @@ public class ContainerThaumicApiary extends ContainerMB { private static final int SLOT_INVENTORY_COUNT = 7; public ContainerThaumicApiary(InventoryPlayer inventoryPlayer, TileEntityThaumicApiary thaumicApiary){ - this.thaumicApiary = thaumicApiary; + this.apiary = thaumicApiary; // Queen/Princess slot - addSlotToContainer(new SlotCustomItems(this.thaumicApiary, 0, 29, 39, ItemInterface.getItemStack("Forestry", "beeQueenGE", 1), ItemInterface.getItemStack("Forestry", "beePrincessGE", 1))); + addSlotToContainer(new SlotCustomItems(this.apiary, 0, 29, 39, ItemInterface.getItemStack("Forestry", "beeQueenGE", 1), ItemInterface.getItemStack("Forestry", "beePrincessGE", 1))); // Drone slot - addSlotToContainer(new SlotCustomItems(this.thaumicApiary, 1, 29, 65, ItemInterface.getItemStack("Forestry", "beeDroneGE", 64))); + addSlotToContainer(new SlotCustomItems(this.apiary, 1, 29, 65, ItemInterface.getItemStack("Forestry", "beeDroneGE", 64))); int currentSlot = 1; @@ -56,7 +56,7 @@ public class ContainerThaumicApiary extends ContainerMB { j++; } - addPlayerInventory(inventoryPlayer, 0, 108); + addPlayerInventory(inventoryPlayer, 6, 109); maxSlot = currentSlot; @@ -105,13 +105,13 @@ public class ContainerThaumicApiary extends ContainerMB { @Override public boolean canInteractWith(EntityPlayer entityPlayer) { - return thaumicApiary.isUseableByPlayer(entityPlayer); + return apiary.isUseableByPlayer(entityPlayer); } @Override public void updateProgressBar(int i, int j) { - thaumicApiary.getGUINetworkData(i, j); + apiary.getGUINetworkData(i, j); } @Override @@ -119,7 +119,7 @@ public class ContainerThaumicApiary extends ContainerMB { super.detectAndSendChanges(); for (Object crafter : crafters) { - thaumicApiary.sendGUINetworkData(this, (ICrafting) crafter); + apiary.sendGUINetworkData(this, (ICrafting) crafter); } } } diff --git a/src/main/java/magicbees/client/gui/GuiThaumicApiary.java b/src/main/java/magicbees/client/gui/GuiThaumicApiary.java index 01a647b..f62973d 100644 --- a/src/main/java/magicbees/client/gui/GuiThaumicApiary.java +++ b/src/main/java/magicbees/client/gui/GuiThaumicApiary.java @@ -8,6 +8,7 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) @@ -17,6 +18,40 @@ public class GuiThaumicApiary extends GuiContainer private static final int WIDTH = 176; private static final int HEIGHT = 190; + + private static final int LIFEBAR_WIDTH = 2; + private static final int LIFEBAR_HEIGHT = 46; + + private static final int LIFEBAR_DEST_X = 21; + private static final int LIFEBAR_DEST_Y = 37; + + private static final int LIFEBAR_SRC_Y = 0; + private static final int LIFEBAR_SRC_STAGE1_X = 193; + private static final int LIFEBAR_SRC_STAGE2_X = 189; + private static final int LIFEBAR_SRC_STAGE3_X = 185; + private static final int LIFEBAR_SRC_STAGE4_X = 181; + private static final int LIFEBAR_SRC_STAGE5_X = 177; + + private static final int WORKBOOST_WIDTH = 16; + private static final int WORKBOOST_HEIGHT = 12; + private static final int WORKBOOST_DEST_X = 37; + private static final int WORKBOOST_DEST_Y = 18; + private static final int WORKBOOST_SRC_X = 176; + private static final int WORKBOOST_SRC_Y = 46; + + private static final int DEATHBOOST_WIDTH = 11; + private static final int DEATHBOOST_HEIGHT = 13; + private static final int DEATHBOOST_DEST_X = 25; + private static final int DEATHBOOST_DEST_Y = 17; + private static final int DEATHBOOST_SRC_X = 176; + private static final int DEATHBOOST_SRC_Y = 58; + + private static final int MUTATIONBOOST_WIDTH = 9; + private static final int MUTATIONBOOST_HEIGHT = 13; + private static final int MUTATIONBOOST_DEST_X = 15; + private static final int MUTATIONBOOST_DEST_Y = 17; + private static final int MUTATIONBOOST_SRC_X = 176; + private static final int MUTATIONBOOST_SRC_Y = 71; public GuiThaumicApiary(InventoryPlayer inventoryPlayer, TileEntityThaumicApiary thaumicApiary) { super(new ContainerThaumicApiary(inventoryPlayer, thaumicApiary)); @@ -25,12 +60,35 @@ public class GuiThaumicApiary extends GuiContainer this.ySize = HEIGHT; } + @Override + protected void drawGuiContainerForegroundLayer(int par1, int par2) + { + fontRendererObj.drawString("Inventory", 9, 99, 0); + } + @Override protected void drawGuiContainerBackgroundLayer(float opacity, int x, int y) { GL11.glColor4f(1, 1, 1, 1); this.mc.getTextureManager().bindTexture(BACKGROUND_LOCATION); this.drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); + + TileEntityThaumicApiary apiary = ((ContainerThaumicApiary)this.inventorySlots).apiary; + int value = LIFEBAR_HEIGHT - (apiary.getHealthScaled(100) * LIFEBAR_HEIGHT) / 100; + this.drawTexturedModalRect(this.guiLeft + LIFEBAR_DEST_X, this.guiTop + LIFEBAR_DEST_Y, + LIFEBAR_SRC_STAGE1_X, LIFEBAR_SRC_Y, LIFEBAR_WIDTH, value); + if (apiary.isWorkBoosted()) { + this.drawTexturedModalRect(this.guiLeft + WORKBOOST_DEST_X, this.guiTop + WORKBOOST_DEST_Y, + WORKBOOST_SRC_X, WORKBOOST_SRC_Y, WORKBOOST_WIDTH, WORKBOOST_HEIGHT); + } + if (apiary.isDeathRateBoosted()) { + this.drawTexturedModalRect(this.guiLeft + DEATHBOOST_DEST_X, this.guiTop + DEATHBOOST_DEST_Y, + DEATHBOOST_SRC_X, DEATHBOOST_SRC_Y, DEATHBOOST_WIDTH, DEATHBOOST_HEIGHT); + } + if (apiary.isMutationBoosted()) { + this.drawTexturedModalRect(this.guiLeft + MUTATIONBOOST_DEST_X, this.guiTop + MUTATIONBOOST_DEST_Y, + MUTATIONBOOST_SRC_X, MUTATIONBOOST_SRC_Y, MUTATIONBOOST_WIDTH, MUTATIONBOOST_HEIGHT); + } } } diff --git a/src/main/java/magicbees/main/utils/PacketHandler.java b/src/main/java/magicbees/main/utils/PacketHandler.java new file mode 100644 index 0000000..5855da3 --- /dev/null +++ b/src/main/java/magicbees/main/utils/PacketHandler.java @@ -0,0 +1,19 @@ +package magicbees.main.utils; + +import cpw.mods.fml.common.network.FMLEventChannel; +import cpw.mods.fml.common.network.NetworkRegistry; + +public class PacketHandler { + + public enum PacketTypes { + INVENTORY_UPDATE, + } + + private FMLEventChannel channel; + + public PacketHandler() { + channel = NetworkRegistry.INSTANCE.newEventDrivenChannel(VersionInfo.ModName); + channel.register(this); + } + +} diff --git a/src/main/java/magicbees/main/utils/net/PacketInventoryUpdate.java b/src/main/java/magicbees/main/utils/net/PacketInventoryUpdate.java new file mode 100644 index 0000000..4670eff --- /dev/null +++ b/src/main/java/magicbees/main/utils/net/PacketInventoryUpdate.java @@ -0,0 +1,5 @@ +package magicbees.main.utils.net; + +public class PacketInventoryUpdate { + +} diff --git a/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java b/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java index cebb2d5..02808dc 100644 --- a/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java @@ -1,18 +1,5 @@ package magicbees.tileentity; -import com.mojang.authlib.GameProfile; -import forestry.api.apiculture.*; -import forestry.api.core.ErrorStateRegistry; -import forestry.api.core.IErrorState; -import forestry.api.core.EnumHumidity; -import forestry.api.core.EnumTemperature; -import forestry.api.genetics.IIndividual; -import forestry.core.config.ForestryItem; -import forestry.core.inventory.InvTools; -import forestry.core.proxy.Proxies; -import forestry.core.inventory.InventoryAdapter; -import forestry.core.utils.Utils; -import forestry.plugins.PluginApiculture; import magicbees.main.CommonProxy; import magicbees.main.utils.LogHelper; import magicbees.reference.Names; @@ -28,6 +15,26 @@ import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.util.Constants; +import com.mojang.authlib.GameProfile; + +import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.IBee; +import forestry.api.apiculture.IBeeGenome; +import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeekeepingLogic; +import forestry.api.apiculture.IHiveFrame; +import forestry.api.core.EnumHumidity; +import forestry.api.core.EnumTemperature; +import forestry.api.core.ErrorStateRegistry; +import forestry.api.core.IErrorState; +import forestry.api.genetics.IIndividual; +import forestry.core.config.ForestryItem; +import forestry.core.inventory.InvTools; +import forestry.core.inventory.InventoryAdapter; +import forestry.core.proxy.Proxies; +import forestry.core.utils.Utils; +import forestry.plugins.PluginApiculture; + public class TileEntityThaumicApiary extends TileEntity implements ISidedInventory, IBeeHousing { public static final String tileEntityName = CommonProxy.DOMAIN + ".thaumicApiary"; @@ -95,15 +102,15 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento public void wearOutEquipment(int amount) { int wear = Math.round(amount * PluginApiculture.beeInterface.getBeekeepingMode(worldObj).getWearModifier()); - for (int i = SLOT_FRAME_START; i < SLOT_FRAME_START + SLOT_FRAME_COUNT; i++){ - if (getStackInSlot(i) == null) + for (int i = SLOT_FRAME_START; i < SLOT_FRAME_START + SLOT_FRAME_COUNT; i++) { + if (getStackInSlot(i) == null) { continue; - if (!(getStackInSlot(i).getItem() instanceof IHiveFrame)) + } + if (!(getStackInSlot(i).getItem() instanceof IHiveFrame)) { continue; + } - setInventorySlotContents( - i, - ((IHiveFrame) getStackInSlot(i).getItem()).frameUsed(this, getStackInSlot(i), + setInventorySlotContents(i, ((IHiveFrame) getStackInSlot(i).getItem()).frameUsed(this, getStackInSlot(i), PluginApiculture.beeInterface.getMember(getStackInSlot(SLOT_QUEEN)), wear)); } } @@ -149,6 +156,9 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento if (getStackInSlot(i).getItem() instanceof IHiveFrame) mod *= ((IHiveFrame) getStackInSlot(i).getItem()).getMutationModifier(genome, mate, mod); } + if (this.isMutationBoosted()) { + mod = mod * 2f; + } return mod; } @@ -161,6 +171,9 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento if (getStackInSlot(i).getItem() instanceof IHiveFrame) mod *= ((IHiveFrame) getStackInSlot(i).getItem()).getLifespanModifier(genome, mate, mod); } + if (this.isDeathRateBoosted()) { + mod = mod / 2f; + } return mod; } @@ -173,6 +186,9 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento if (getStackInSlot(i).getItem() instanceof IHiveFrame) mod *= ((IHiveFrame) getStackInSlot(i).getItem()).getProductionModifier(genome, mod); } + if (this.isWorkBoosted()) { + mod = mod * 2f; + } return mod; } @@ -407,33 +423,41 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento } - /* Health display */ - private int getHealthDisplay(){ - if (getStackInSlot(SLOT_QUEEN) == null) + private int getHealthDisplay() { + if (getStackInSlot(SLOT_QUEEN) == null) { return 0; + } - if (ForestryItem.beeQueenGE.isItemEqual(inventory.getStackInSlot(SLOT_QUEEN))) + if (ForestryItem.beeQueenGE.isItemEqual(inventory.getStackInSlot(SLOT_QUEEN))) { return PluginApiculture.beeInterface.getMember(getStackInSlot(SLOT_QUEEN)).getHealth(); - else if (ForestryItem.beePrincessGE.isItemEqual(getStackInSlot(SLOT_QUEEN))) + } + else if (ForestryItem.beePrincessGE.isItemEqual(getStackInSlot(SLOT_QUEEN))) { return displayHealth; - else + } + else { return 0; + } } - private int getMaxHealthDisplay(){ - if (getStackInSlot(SLOT_QUEEN) == null) + private int getMaxHealthDisplay() { + if (getStackInSlot(SLOT_QUEEN) == null) { return 0; - if (ForestryItem.beeQueenGE.isItemEqual(getStackInSlot(SLOT_QUEEN))) + } + if (ForestryItem.beeQueenGE.isItemEqual(getStackInSlot(SLOT_QUEEN))) { return PluginApiculture.beeInterface.getMember(getStackInSlot(SLOT_QUEEN)).getMaxHealth(); - else if (ForestryItem.beePrincessGE.isItemEqual(getStackInSlot(SLOT_QUEEN))) + } + else if (ForestryItem.beePrincessGE.isItemEqual(getStackInSlot(SLOT_QUEEN))) { return displayHealthMax; - else + } + else { return 0; + } } - private int getHealthScaled(int i){ - if (getMaxHealthDisplay() == 0) + public int getHealthScaled(int i) { + if (getMaxHealthDisplay() == 0) { return 0; + } return (getHealthDisplay() * i) / getMaxHealthDisplay(); } @@ -448,15 +472,15 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento /* Saving and loading */ @Override - public void writeToNBT(NBTTagCompound compound){ + public void writeToNBT(NBTTagCompound compound) { super.writeToNBT(compound); NBTTagList items = new NBTTagList(); - for (int i = 0; i < getSizeInventory(); i++){ + for (int i = 0; i < getSizeInventory(); i++) { ItemStack itemStack = getStackInSlot(i); - if (itemStack != null){ + if (itemStack != null) { NBTTagCompound item = new NBTTagCompound(); item.setByte("Slot", (byte)i); itemStack.writeToNBT(item); @@ -465,23 +489,24 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento } compound.setInteger("BiomeId", biome.biomeID); - if (logic != null) + if (logic != null) { logic.writeToNBT(compound); + } compound.setTag("Items", items); } @Override - public void readFromNBT(NBTTagCompound compound){ + public void readFromNBT(NBTTagCompound compound) { super.readFromNBT(compound); NBTTagList items = compound.getTagList("Items", Constants.NBT.TAG_COMPOUND); - for (int i = 0; i < items.tagCount(); i++){ + for (int i = 0; i < items.tagCount(); i++) { NBTTagCompound item = (NBTTagCompound)items.getCompoundTagAt(i); int slot = item.getByte("Slot"); - if (slot >= 0 && slot < getSizeInventory()){ + if (slot >= 0 && slot < getSizeInventory()) { setInventorySlotContents(slot, ItemStack.loadItemStackFromNBT(item)); } } @@ -491,32 +516,34 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento logic.readFromNBT(compound); } - public float getExactTemperature(){ + public float getExactTemperature() { return biome.temperature; } - public float getExactHumidity(){ + public float getExactHumidity() { return biome.rainfall; } @Override - public void updateEntity(){ - if (init == false){ + public void updateEntity() { + if (init == false) { init = true; updateBiome(); } - if (!Proxies.common.isSimulating(worldObj)) + if (!Proxies.common.isSimulating(worldObj)) { updateClientSide(); - else + } + else { updateServerSide(); + } } - public void updateBiome(){ - if (worldObj != null){ - if (biome == null){ + public void updateBiome() { + if (worldObj != null) { + if (biome == null) { BiomeGenBase biome = Utils.getBiomeAt(worldObj, xCoord, yCoord); - if (biome != null){ + if (biome != null) { this.biome = biome; setErrorState(ErrorStateRegistry.getErrorState("OK")); } @@ -524,7 +551,7 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento } } - public void updateClientSide(){ + public void updateClientSide() { if (PluginApiculture.beeInterface.isMated(getStackInSlot(SLOT_QUEEN))) { if (getErrorState() == ErrorStateRegistry.getErrorState("OK") && worldObj.getTotalWorldTime() % 2 % 2 == 0) { IBee displayQueen = PluginApiculture.beeInterface.getMember(getStackInSlot(SLOT_QUEEN)); @@ -533,21 +560,23 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento } } - public void updateServerSide(){ + public void updateServerSide() { logic.update(); IBee queen = logic.getQueen(); - if (queen == null) + if (queen == null) { return; + } - // Swarm effects - if (worldObj.getTotalWorldTime() % 200 * 10 == 0) + if (worldObj.getTotalWorldTime() % 200 * 10 == 0) { onQueenChange(getStackInSlot(SLOT_QUEEN)); + } } - public void getGUINetworkData(int i, int j){ - if (logic == null) + public void getGUINetworkData(int i, int j) { + if (logic == null) { return; + } switch(i) { case 0: @@ -559,10 +588,23 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento } public void sendGUINetworkData(Container container, ICrafting iCrafting) { - if (logic == null) + if (logic == null) { return; + } iCrafting.sendProgressBarUpdate(container, 0, logic.getBreedingTime()); iCrafting.sendProgressBarUpdate(container, 1, logic.getTotalBreedingTime()); } + + public boolean isWorkBoosted() { + return false; + } + + public boolean isDeathRateBoosted() { + return false; + } + + public boolean isMutationBoosted() { + return false; + } } diff --git a/src/main/resources/assets/magicbees/textures/blocks/thaumicapiary.2.png b/src/main/resources/assets/magicbees/textures/blocks/thaumicapiary.2.png index 1d38df9c7381a6ab0a56d0ae18e5debafc857910..bc573f9e6acd874dbe912cecd53d0d9b92cbf0e6 100644 GIT binary patch delta 594 zcmWlVOIH$M06@P{sSt$`hHr-VsDt1D1tSQ9W+MzRgMd9y6Em^Uw1;ULnmV8;YS}}i zlY3^}d6q0qc2AyQkSviH3-&Ey~g>g5h-OAxE<%kdE zJZ+q(J;YEEZ%4GdQ}o+Ke`lPfsh?QNTAMuoQ!vJh2%i zN&?&x@vRiLE#T!i+#bNo3A~)b%L1_**X<;Ta!S9KfWOE(A5zWM5xO(}M?C;QJ}-^CvYZQ~J4yjr{v3lewAAo6)x*m(9wWpFW?Pn7Sit&ZH-SH-G{}(ZhIq6#$X3 zePC);g&<9p#p;d<0g9D8Ser!=1YLMlT#--!Wb0eNgUP>sZ^V4p(T1j`MwA7wi|^*Y z4)JzdxbKE}z|?R3DwdR%@N$AKjwp1C)C`{DhO z^n;<)tw+FkQlsANl}49$w_gmL)Y^gO_$bof?Y3RL))h=1ACXp2r&el}j~B)=Gt*Y9 Yk-YTtuSloP8ip>G0Wp%|Pea+#KbC8m$N&HU delta 632 zcmWmA*;W#90D$rTD5juH;HJA573P-&^cZ97Tt7C7uh+#?*+bd{yG0}oUg3Klro7@R+XQZHyISwMrDmjb)l|Z zEw!j?teRSjMrza6*>qB?roKZfv+45R@ghc*|EVbH(+d0b`9HGe)`|hW(65Jw+u$K1 zJYo{rTN^2Z++}QH%*`IF+GEx9bzIOEypX(jr5h=PAS@l}!J^$n*dY$vkuZgX?P$b~ zuhF7)7m{!yaR(Z+6EO;nQ&@t+V>A+_(KwAIXgtB78%{Lo#8Wh$auG=eO)^-j7mqv0 z4LccS#R;}D#v(};O|e+gji*^+(}iby@eEC77&60RSr*^Yx`|B>w#A{_ERplz+g@VV zhvj@kjw5m`x$BYa_{bbrwdce4`-!h*MJ7lxEm#Zy0Qk%7=qdo^mH&f&{7U^TEEOBm zMVBkcOC=)&1;F=VRt$@O^u$nuSDQM9lkKO z9X`G@F%`^t=>nJ=DrGl)8onxv9ylRT))XU0`i`(m#CFH#vHZyU`yE-U83AA0Fo) z?F>c^?yv0S_x3@LqK)cl)zmkuue4hXhHeE&rPFiCxzLb57`S&cx_rCyxA)ty;`7PH NGT?S`^cQM6`wt52spbFx diff --git a/src/main/resources/assets/magicbees/textures/blocks/thaumicapiary.4.png b/src/main/resources/assets/magicbees/textures/blocks/thaumicapiary.4.png index 02c43424a3360280268f62a7b2dc88d226ecb146..3fdcfa37a9485306230ad8fc1c5d15c0220263a1 100644 GIT binary patch delta 591 zcmWlVOIH$M06@P{sSt%xhi``WD1+bt1tSQ9rX$Y*0j)?AGqDiup^*5H*+jJ3vDI^nY>e75l+d!0q7dInJ{wubQn*Hz%KO%ARH z(fSFZoZSh+oiJ7mV5I;o2Vpscm%_?&1a6NKMUE)(SeaLrqOii_yCGPMz-o}FhKU*v z_oDb-65Ho-AqMxya3PKhNnGHG!pB8gbsJ4RPzpNF8@&ciBp%@t(ZtsV4&-O2dOF|_21dMn z<6k~^f_+N8JXhIx|7v%2Ar5wCTqpqx6ziiwpNq{N9A`fbJ_aR z#=3Z%pDlg>;_5+R_QCXvbn0UmpOFx{v`{dD7>hb;L z9V5`5H>fv<)#<{)-m9_mh7oj~orXpS9Oj$1`hAJBQ_=*QI^|0F)BH?&F=sMq$!ot_ UA|v4YAOF=d5Dg`R7yeA`AAk0jS^xk5 delta 616 zcmWmA*;W#90D$rT2&SVlg0tZYDhRS9A|OlRFwBetD3+q;l1qe^nV1W!FoJ8DC6X<+ zS>1Qj3v}ZPbWWGOLl@n2P8ZoZzwZUU3-|&)o`f}xxJFs4QPvd}Rc&TK8?lrCf88&Se(3qRDQ0|v>UsqjbH-dQzdl7vjiXcsbK zLB_07s9N@kMTdjr*U}OzR9pSK7ytmkEByEx0F^cWgTDXF{w*$xEJ8_jmHbMn97FN?MnywS z8IXQDSJsg%&vL##-{*4_RDF0~tMX7@&oyhS|KmF;c-%xRP3*)@?@i4_b^}Zi%uG&- zD;FOuP0S65D?`C4&|yUY1lx@r4j4dUn+wdPB@k5cdhN{<2?XF|3~bIL5QIciLNbQ{ zAl}*s23Z*lm&;5}L{w2xj@ZDn?dQwknYZ(?jkA;JSndTlTRV!64GrH91z+aE;rt0O z88yb17L~QlX3$!+Jw0H3b~-eAy?=WAM)1~PBytD5x_NwBc)B+nKYFx!P&haQz3MKy xw^QHTuDjZ8H=EsRkQIc5%tCY|6bV1PomjamxcyGptJ%9;27GLg`9ja;{{iGsqJ;ne diff --git a/src/main/resources/assets/magicbees/textures/gui/apiary.png b/src/main/resources/assets/magicbees/textures/gui/apiary.png index 02208738d84e2afeab79e9d0f909c4e85f157201..c787c47c95b86b4b86d18c70cdb34f09476ca01b 100644 GIT binary patch delta 4680 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 Date: Wed, 18 Mar 2015 23:52:55 -0700 Subject: [PATCH 03/17] Updating GUI texture. --- .../assets/magicbees/textures/gui/apiary.png | Bin 5195 -> 5269 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/magicbees/textures/gui/apiary.png b/src/main/resources/assets/magicbees/textures/gui/apiary.png index c787c47c95b86b4b86d18c70cdb34f09476ca01b..fc2c2908f79b8cb155a75384f729fd75221eaadc 100644 GIT binary patch delta 4152 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 delta 4077 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 From cbb0b15dee97bef9114f9acb13845eac7d234b8b Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Wed, 18 Mar 2015 23:53:22 -0700 Subject: [PATCH 04/17] Adding network packet stuff. --- .../client/gui/ContainerThaumicApiary.java | 2 +- .../client/gui/GuiThaumicApiary.java | 61 +++++++-- src/main/java/magicbees/main/MagicBees.java | 20 +-- .../magicbees/main/utils/ChunkCoords.java | 36 ++++-- .../magicbees/main/utils/PacketHandler.java | 19 --- .../error/InvalidEventTypeIndexException.java | 13 ++ .../magicbees/main/utils/net/EventBase.java | 119 ++++++++++++++++++ .../magicbees/main/utils/net/EventCoords.java | 60 +++++++++ .../main/utils/net/EventInventoryUpdate.java | 67 ++++++++++ .../main/utils/net/NetworkEventHandler.java | 93 ++++++++++++++ .../main/utils/net/PacketInventoryUpdate.java | 5 - .../tileentity/TileEntityThaumicApiary.java | 52 ++++---- 12 files changed, 466 insertions(+), 81 deletions(-) delete mode 100644 src/main/java/magicbees/main/utils/PacketHandler.java create mode 100644 src/main/java/magicbees/main/utils/error/InvalidEventTypeIndexException.java create mode 100644 src/main/java/magicbees/main/utils/net/EventBase.java create mode 100644 src/main/java/magicbees/main/utils/net/EventCoords.java create mode 100644 src/main/java/magicbees/main/utils/net/EventInventoryUpdate.java create mode 100644 src/main/java/magicbees/main/utils/net/NetworkEventHandler.java delete mode 100644 src/main/java/magicbees/main/utils/net/PacketInventoryUpdate.java diff --git a/src/main/java/magicbees/client/gui/ContainerThaumicApiary.java b/src/main/java/magicbees/client/gui/ContainerThaumicApiary.java index 9e33171..b184c82 100644 --- a/src/main/java/magicbees/client/gui/ContainerThaumicApiary.java +++ b/src/main/java/magicbees/client/gui/ContainerThaumicApiary.java @@ -56,7 +56,7 @@ public class ContainerThaumicApiary extends ContainerMB { j++; } - addPlayerInventory(inventoryPlayer, 6, 109); + addPlayerInventory(inventoryPlayer, 0, 109); maxSlot = currentSlot; diff --git a/src/main/java/magicbees/client/gui/GuiThaumicApiary.java b/src/main/java/magicbees/client/gui/GuiThaumicApiary.java index f62973d..a8107be 100644 --- a/src/main/java/magicbees/client/gui/GuiThaumicApiary.java +++ b/src/main/java/magicbees/client/gui/GuiThaumicApiary.java @@ -74,21 +74,58 @@ public class GuiThaumicApiary extends GuiContainer this.drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); TileEntityThaumicApiary apiary = ((ContainerThaumicApiary)this.inventorySlots).apiary; - int value = LIFEBAR_HEIGHT - (apiary.getHealthScaled(100) * LIFEBAR_HEIGHT) / 100; - this.drawTexturedModalRect(this.guiLeft + LIFEBAR_DEST_X, this.guiTop + LIFEBAR_DEST_Y, - LIFEBAR_SRC_STAGE1_X, LIFEBAR_SRC_Y, LIFEBAR_WIDTH, value); + + drawLifebar(apiary); - if (apiary.isWorkBoosted()) { - this.drawTexturedModalRect(this.guiLeft + WORKBOOST_DEST_X, this.guiTop + WORKBOOST_DEST_Y, - WORKBOOST_SRC_X, WORKBOOST_SRC_Y, WORKBOOST_WIDTH, WORKBOOST_HEIGHT); - } - if (apiary.isDeathRateBoosted()) { - this.drawTexturedModalRect(this.guiLeft + DEATHBOOST_DEST_X, this.guiTop + DEATHBOOST_DEST_Y, - DEATHBOOST_SRC_X, DEATHBOOST_SRC_Y, DEATHBOOST_WIDTH, DEATHBOOST_HEIGHT); - } - if (apiary.isMutationBoosted()) { + drawWorkBoostIcon(apiary); + drawDeathRateIcon(apiary); + drawMutationIcon(apiary); + } + + private void drawMutationIcon(TileEntityThaumicApiary apiary) { + if (apiary.isMutationBoosted()) { this.drawTexturedModalRect(this.guiLeft + MUTATIONBOOST_DEST_X, this.guiTop + MUTATIONBOOST_DEST_Y, MUTATIONBOOST_SRC_X, MUTATIONBOOST_SRC_Y, MUTATIONBOOST_WIDTH, MUTATIONBOOST_HEIGHT); } + } + + private void drawDeathRateIcon(TileEntityThaumicApiary apiary) { + if (apiary.isDeathRateBoosted()) { + this.drawTexturedModalRect(this.guiLeft + DEATHBOOST_DEST_X, this.guiTop + DEATHBOOST_DEST_Y, + DEATHBOOST_SRC_X, DEATHBOOST_SRC_Y, DEATHBOOST_WIDTH, DEATHBOOST_HEIGHT); + } + } + + private void drawWorkBoostIcon(TileEntityThaumicApiary apiary) { + if (apiary.isWorkBoosted()) { + this.drawTexturedModalRect(this.guiLeft + WORKBOOST_DEST_X, this.guiTop + WORKBOOST_DEST_Y, + WORKBOOST_SRC_X, WORKBOOST_SRC_Y, WORKBOOST_WIDTH, WORKBOOST_HEIGHT); + } + } + + private void drawLifebar(TileEntityThaumicApiary apiary) { + int value = LIFEBAR_HEIGHT - apiary.getHealthScaled(LIFEBAR_HEIGHT); + int lifebarSrc = getLifebarSrc(apiary); + this.drawTexturedModalRect(this.guiLeft + LIFEBAR_DEST_X, this.guiTop + value + LIFEBAR_DEST_Y, + lifebarSrc, LIFEBAR_SRC_Y, LIFEBAR_WIDTH, LIFEBAR_HEIGHT - value); + } + + private int getLifebarSrc(TileEntityThaumicApiary apiary) { + int value = apiary.getHealthScaled(5); + if (value >= 5) { + return LIFEBAR_SRC_STAGE1_X; + } + else if (value >= 4) { + return LIFEBAR_SRC_STAGE2_X; + } + else if (value >= 3) { + return LIFEBAR_SRC_STAGE3_X; + } + else if (value >= 2) { + return LIFEBAR_SRC_STAGE4_X; + } + else { + return LIFEBAR_SRC_STAGE5_X; + } } } diff --git a/src/main/java/magicbees/main/MagicBees.java b/src/main/java/magicbees/main/MagicBees.java index 69f0be6..ecbfd1b 100644 --- a/src/main/java/magicbees/main/MagicBees.java +++ b/src/main/java/magicbees/main/MagicBees.java @@ -1,14 +1,5 @@ package magicbees.main; -import cpw.mods.fml.common.FMLCommonHandler; -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.IMCEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.network.NetworkRegistry; - import magicbees.bees.BeeManager; import magicbees.bees.TransmutationEffectController; import magicbees.client.gui.GUIHandler; @@ -17,6 +8,15 @@ import magicbees.main.utils.IMCManager; import magicbees.main.utils.LogHelper; import magicbees.main.utils.VersionInfo; import magicbees.main.utils.compat.ModHelper; +import magicbees.main.utils.net.NetworkEventHandler; +import cpw.mods.fml.common.FMLCommonHandler; +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.IMCEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.network.NetworkRegistry; @Mod( modid = VersionInfo.ModName, @@ -34,10 +34,12 @@ public class MagicBees public GUIHandler guiHandler; private Config modConfig; + public final NetworkEventHandler netHandler = new NetworkEventHandler(); @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { + LogHelper.info("Preinit started"); this.modConfig = new Config(event.getSuggestedConfigurationFile()); FMLCommonHandler.instance().bus().register(modConfig); diff --git a/src/main/java/magicbees/main/utils/ChunkCoords.java b/src/main/java/magicbees/main/utils/ChunkCoords.java index 15277ba..2dfc6f0 100644 --- a/src/main/java/magicbees/main/utils/ChunkCoords.java +++ b/src/main/java/magicbees/main/utils/ChunkCoords.java @@ -1,17 +1,35 @@ package magicbees.main.utils; -import net.minecraft.world.chunk.Chunk; +import net.minecraft.entity.Entity; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; public class ChunkCoords { - public int dimension; - public int xCoord; - public int zCoord; + public final int dimension; + public final int x; + public final int y; + public final int z; - public ChunkCoords(Chunk chunk) - { - this.dimension = chunk.worldObj.provider.dimensionId; - this.xCoord = chunk.xPosition; - this.zCoord = chunk.zPosition; + public ChunkCoords(TileEntity entity) { + this(entity.getWorldObj(), entity.xCoord, entity.yCoord, entity.zCoord); } + + public ChunkCoords(Entity entity) { + this(entity.worldObj, entity.chunkCoordX, entity.chunkCoordY, entity.chunkCoordZ); + } + + public ChunkCoords(World world, int xCoord, int yCoord, int zCoord) + { + this(world.provider.dimensionId, xCoord, yCoord, zCoord); + } + + public ChunkCoords(int dimId, int xCoord, int yCoord, int zCoord) + { + this.dimension = dimId; + this.x = xCoord; + this.y = yCoord; + this.z = zCoord; + } + } diff --git a/src/main/java/magicbees/main/utils/PacketHandler.java b/src/main/java/magicbees/main/utils/PacketHandler.java deleted file mode 100644 index 5855da3..0000000 --- a/src/main/java/magicbees/main/utils/PacketHandler.java +++ /dev/null @@ -1,19 +0,0 @@ -package magicbees.main.utils; - -import cpw.mods.fml.common.network.FMLEventChannel; -import cpw.mods.fml.common.network.NetworkRegistry; - -public class PacketHandler { - - public enum PacketTypes { - INVENTORY_UPDATE, - } - - private FMLEventChannel channel; - - public PacketHandler() { - channel = NetworkRegistry.INSTANCE.newEventDrivenChannel(VersionInfo.ModName); - channel.register(this); - } - -} diff --git a/src/main/java/magicbees/main/utils/error/InvalidEventTypeIndexException.java b/src/main/java/magicbees/main/utils/error/InvalidEventTypeIndexException.java new file mode 100644 index 0000000..4ae735b --- /dev/null +++ b/src/main/java/magicbees/main/utils/error/InvalidEventTypeIndexException.java @@ -0,0 +1,13 @@ +package magicbees.main.utils.error; + +public class InvalidEventTypeIndexException extends RuntimeException { + private static final long serialVersionUID = 8920019214439088440L; + + public InvalidEventTypeIndexException(String message) { + this(message, null); + } + + public InvalidEventTypeIndexException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/src/main/java/magicbees/main/utils/net/EventBase.java b/src/main/java/magicbees/main/utils/net/EventBase.java new file mode 100644 index 0000000..eb50836 --- /dev/null +++ b/src/main/java/magicbees/main/utils/net/EventBase.java @@ -0,0 +1,119 @@ +package magicbees.main.utils.net; + +import forestry.core.proxy.Proxies; +import io.netty.buffer.Unpooled; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import magicbees.main.utils.LogHelper; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.common.network.internal.FMLProxyPacket; +import cpw.mods.fml.common.registry.GameData; + +public class EventBase { + + private NetworkEventHandler.EventType eventType; + + public EventBase() { + this.eventType = NetworkEventHandler.EventType.UNKNOWN; + } + + public EventBase(NetworkEventHandler.EventType type) { + this.eventType = type; + } + + public FMLProxyPacket getPacket() { + ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + DataOutputStream data = new DataOutputStream(bytes); + + try { + data.writeInt(eventType.ordinal()); + writeDataToOutputStream(data); + } + catch (IOException e) { + LogHelper.error("Could not write EventBase data."); + e.printStackTrace(); + } + + return new FMLProxyPacket(Unpooled.wrappedBuffer(bytes.toByteArray()), NetworkEventHandler.CHANNEL_NAME); + } + + public void process(EntityPlayerMP player) { + + } + + protected void writeDataToOutputStream(DataOutputStream data) { + return; + } + + protected void readDataFromInputStream(DataInputStream data) { + return; + } + + protected ItemStack readItemStackFromData(DataInputStream data) throws IOException { + ItemStack itemstack = null; + + String itemName = data.readUTF(); + + if (!itemName.isEmpty()) { + Item item = GameData.getItemRegistry().getRaw(itemName); + byte stackSize = data.readByte(); + short meta = data.readShort(); + itemstack = new ItemStack(item, stackSize, meta); + + if (item.isDamageable() || Proxies.common.needsTagCompoundSynched(item)) { + itemstack.stackTagCompound = this.readNBTTagCompound(data); + } + } + + return itemstack; + } + + protected void writeItemStackToData(ItemStack itemstack, DataOutputStream data) throws IOException { + if (itemstack == null) { + data.writeUTF(""); + } else { + data.writeUTF(GameData.getItemRegistry().getNameForObject(itemstack.getItem())); + data.writeByte(itemstack.stackSize); + data.writeShort(itemstack.getItemDamage()); + + if (itemstack.getItem().isDamageable() || Proxies.common.needsTagCompoundSynched(itemstack.getItem())) { + this.writeNBTTagCompound(itemstack.stackTagCompound, data); + } + } + } + + protected NBTTagCompound readNBTTagCompound(DataInputStream data) throws IOException { + + short length = data.readShort(); + + if (length < 0) { + return null; + } else { + byte[] compressed = new byte[length]; + data.readFully(compressed); + return CompressedStreamTools.readCompressed(new ByteArrayInputStream(compressed)); + } + + } + + protected void writeNBTTagCompound(NBTTagCompound nbttagcompound, DataOutputStream data) throws IOException { + + if (nbttagcompound == null) { + data.writeShort(-1); + } else { + byte[] compressed = CompressedStreamTools.compress(nbttagcompound); + data.writeShort((short) compressed.length); + data.write(compressed); + } + + } +} diff --git a/src/main/java/magicbees/main/utils/net/EventCoords.java b/src/main/java/magicbees/main/utils/net/EventCoords.java new file mode 100644 index 0000000..907e74b --- /dev/null +++ b/src/main/java/magicbees/main/utils/net/EventCoords.java @@ -0,0 +1,60 @@ +package magicbees.main.utils.net; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import magicbees.main.utils.ChunkCoords; +import magicbees.main.utils.LogHelper; + +public class EventCoords extends EventBase { + + private ChunkCoords coords; + + public EventCoords(NetworkEventHandler.EventType type, ChunkCoords position) { + super(type); + this.coords = position; + } + + public EventCoords(NetworkEventHandler.EventType type, DataInputStream byteStream) { + super(type); + } + + public ChunkCoords getCoords() { + return this.coords; + } + + @Override + protected void writeDataToOutputStream(DataOutputStream byteStream) { + super.writeDataToOutputStream(byteStream); + + try { + byteStream.writeInt(coords.dimension); + byteStream.writeInt(coords.x); + byteStream.writeInt(coords.y); + byteStream.writeInt(coords.z); + } + catch (IOException e) { + LogHelper.error("Could not write EventCoords data to stream."); + e.printStackTrace(); + } + } + + @Override + protected void readDataFromInputStream(DataInputStream byteStream) { + super.readDataFromInputStream(byteStream); + + try { + int dim = byteStream.readInt(); + int x = byteStream.readInt(); + int y = byteStream.readInt(); + int z = byteStream.readInt(); + + this.coords = new ChunkCoords(dim, x, y, z); + } + catch (IOException e) { + LogHelper.error("Could not read EventCoords data from stream."); + e.printStackTrace(); + } + } +} diff --git a/src/main/java/magicbees/main/utils/net/EventInventoryUpdate.java b/src/main/java/magicbees/main/utils/net/EventInventoryUpdate.java new file mode 100644 index 0000000..c813783 --- /dev/null +++ b/src/main/java/magicbees/main/utils/net/EventInventoryUpdate.java @@ -0,0 +1,67 @@ +package magicbees.main.utils.net; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import cpw.mods.fml.client.FMLClientHandler; +import magicbees.main.utils.ChunkCoords; +import magicbees.main.utils.LogHelper; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +public class EventInventoryUpdate extends EventCoords { + + private int slotIndex; + private ItemStack itemStack; + + public EventInventoryUpdate(ChunkCoords position, int slot, ItemStack item) { + super(NetworkEventHandler.EventType.INVENTORY_UPDATE, position); + + this.slotIndex = slot; + this.itemStack = item; + } + + public EventInventoryUpdate(DataInputStream byteStream) { + super(NetworkEventHandler.EventType.INVENTORY_UPDATE, byteStream); + + this.readDataFromInputStream(byteStream); + } + + @Override + protected void writeDataToOutputStream(DataOutputStream byteStream) { + super.writeDataToOutputStream(byteStream); + + try { + byteStream.writeInt(this.slotIndex); + this.writeItemStackToData(this.itemStack, byteStream); + } catch (IOException e) { + LogHelper.error("Could not write EventInventoryUpdate to byte stream."); + e.printStackTrace(); + } + } + + @Override + protected void readDataFromInputStream(DataInputStream byteStream) { + super.readDataFromInputStream(byteStream); + + try { + this.slotIndex = byteStream.readInt(); + this.itemStack = this.readItemStackFromData(byteStream); + } catch (IOException e) { + LogHelper.error("Could not read EventInventoryUpdate to byte stream."); + e.printStackTrace(); + } + } + + @Override + public void process(EntityPlayerMP player) { + TileEntity tile = FMLClientHandler.instance().getClient().theWorld.getTileEntity(getCoords().x, getCoords().y, getCoords().z); + + if (tile != null && tile instanceof IInventory) { + ((IInventory) tile).setInventorySlotContents(slotIndex, itemStack); + } + } +} diff --git a/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java b/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java new file mode 100644 index 0000000..f8d880a --- /dev/null +++ b/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java @@ -0,0 +1,93 @@ +package magicbees.main.utils.net; + +import io.netty.buffer.ByteBuf; +import io.netty.buffer.ByteBufInputStream; + +import java.io.DataInputStream; +import java.io.IOException; + +import magicbees.main.utils.ChunkCoords; +import magicbees.main.utils.LogHelper; +import magicbees.main.utils.VersionInfo; +import magicbees.main.utils.error.InvalidEventTypeIndexException; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.network.FMLEventChannel; +import cpw.mods.fml.common.network.FMLNetworkEvent.ClientCustomPacketEvent; +import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.internal.FMLProxyPacket; + +public class NetworkEventHandler { + + public static final String CHANNEL_NAME = VersionInfo.ModName; + + public enum EventType { + UNKNOWN, + INVENTORY_UPDATE, + ; + } + + private FMLEventChannel channel; + + public NetworkEventHandler() { + channel = NetworkRegistry.INSTANCE.newEventDrivenChannel(CHANNEL_NAME); + channel.register(this); + } + + @SubscribeEvent + public void onPacket(ServerCustomPacketEvent event) { + this.parseAndDispatchPacket(event.packet.payload(), ((NetHandlerPlayServer)event.handler).playerEntity); + } + + @SubscribeEvent + public void onPacket(ClientCustomPacketEvent event) { + this.parseAndDispatchPacket(event.packet.payload(), null); + } + + public void sendInventoryUpdate(TileEntity entity, int slotIndex, ItemStack itemStack) { + EventInventoryUpdate event = new EventInventoryUpdate(new ChunkCoords(entity), slotIndex, itemStack); + FMLProxyPacket packet = event.getPacket(); + + sendPacket(packet); + } + + private void sendPacket(FMLProxyPacket packet) { + if (FMLCommonHandler.instance().getEffectiveSide().isServer()) { + channel.sendToAll(packet); + } + else { + channel.sendToServer(packet); + } + } + + private void parseAndDispatchPacket(ByteBuf packetPayload, EntityPlayerMP player) { + try { + DataInputStream data = new DataInputStream(new ByteBufInputStream(packetPayload)); + + processEventData(data, player); + + data.close(); + } catch (IOException e) { + LogHelper.info("DataInputStream had a problem closing. Good for it."); + //e.printStackTrace(); + } + } + + private void processEventData(DataInputStream data, EntityPlayerMP player) throws IOException { + int eventId = data.readInt(); + + if (eventId == EventType.INVENTORY_UPDATE.ordinal()) { + EventInventoryUpdate eventData = new EventInventoryUpdate(data); + eventData.process(player); + } + else { + throw new InvalidEventTypeIndexException(""); + } + } + +} diff --git a/src/main/java/magicbees/main/utils/net/PacketInventoryUpdate.java b/src/main/java/magicbees/main/utils/net/PacketInventoryUpdate.java deleted file mode 100644 index 4670eff..0000000 --- a/src/main/java/magicbees/main/utils/net/PacketInventoryUpdate.java +++ /dev/null @@ -1,5 +0,0 @@ -package magicbees.main.utils.net; - -public class PacketInventoryUpdate { - -} diff --git a/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java b/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java index 02808dc..18144c3 100644 --- a/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java @@ -1,6 +1,8 @@ package magicbees.tileentity; +import magicbees.bees.BeeManager; import magicbees.main.CommonProxy; +import magicbees.main.MagicBees; import magicbees.main.utils.LogHelper; import magicbees.reference.Names; import net.minecraft.entity.player.EntityPlayer; @@ -17,7 +19,6 @@ import net.minecraftforge.common.util.Constants; import com.mojang.authlib.GameProfile; -import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; @@ -28,12 +29,9 @@ import forestry.api.core.EnumTemperature; import forestry.api.core.ErrorStateRegistry; import forestry.api.core.IErrorState; import forestry.api.genetics.IIndividual; -import forestry.core.config.ForestryItem; import forestry.core.inventory.InvTools; import forestry.core.inventory.InventoryAdapter; -import forestry.core.proxy.Proxies; import forestry.core.utils.Utils; -import forestry.plugins.PluginApiculture; public class TileEntityThaumicApiary extends TileEntity implements ISidedInventory, IBeeHousing { @@ -62,7 +60,7 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento public TileEntityThaumicApiary() { items = new ItemStack[12]; - logic = PluginApiculture.beeInterface.createBeekeepingLogic(this); + logic = BeeManager.beeRoot.createBeekeepingLogic(this); } public void setOwner(EntityPlayer player) { this.ownerName = player.getGameProfile(); } @@ -92,15 +90,17 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento return true; } - // TODO: Investigate this :D @Override public void onQueenChange(ItemStack queenStack) { - + if (!worldObj.isRemote) { + MagicBees.object.netHandler.sendInventoryUpdate(this, SLOT_QUEEN, queenStack); + this.markDirty(); + } } @Override public void wearOutEquipment(int amount) { - int wear = Math.round(amount * PluginApiculture.beeInterface.getBeekeepingMode(worldObj).getWearModifier()); + int wear = Math.round(amount * BeeManager.beeRoot.getBeekeepingMode(worldObj).getWearModifier()); for (int i = SLOT_FRAME_START; i < SLOT_FRAME_START + SLOT_FRAME_COUNT; i++) { if (getStackInSlot(i) == null) { @@ -111,7 +111,7 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento } setInventorySlotContents(i, ((IHiveFrame) getStackInSlot(i).getItem()).frameUsed(this, getStackInSlot(i), - PluginApiculture.beeInterface.getMember(getStackInSlot(SLOT_QUEEN)), wear)); + BeeManager.beeRoot.getMember(getStackInSlot(SLOT_QUEEN)), wear)); } } @@ -398,14 +398,14 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento @Override public boolean canInsertItem(int slot, ItemStack itemStack, int side) { - if(slot == SLOT_QUEEN && PluginApiculture.beeInterface.isMember(itemStack) - && !PluginApiculture.beeInterface.isDrone(itemStack)) { + if(slot == SLOT_QUEEN && BeeManager.beeRoot.isMember(itemStack) + && !BeeManager.beeRoot.isDrone(itemStack)) { return true; } - else if (slot == SLOT_DRONE && PluginApiculture.beeInterface.isDrone(itemStack)) { + else if (slot == SLOT_DRONE && BeeManager.beeRoot.isDrone(itemStack)) { return true; } - return slot == SLOT_DRONE && PluginApiculture.beeInterface.isDrone(itemStack); + return slot == SLOT_DRONE && BeeManager.beeRoot.isDrone(itemStack); } @Override @@ -428,10 +428,10 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento return 0; } - if (ForestryItem.beeQueenGE.isItemEqual(inventory.getStackInSlot(SLOT_QUEEN))) { - return PluginApiculture.beeInterface.getMember(getStackInSlot(SLOT_QUEEN)).getHealth(); + if (BeeManager.beeRoot.isMated(getStackInSlot(SLOT_QUEEN))) { + return BeeManager.beeRoot.getMember(getStackInSlot(SLOT_QUEEN)).getHealth(); } - else if (ForestryItem.beePrincessGE.isItemEqual(getStackInSlot(SLOT_QUEEN))) { + else if (!BeeManager.beeRoot.isDrone(getStackInSlot(SLOT_QUEEN))) { return displayHealth; } else { @@ -443,10 +443,10 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento if (getStackInSlot(SLOT_QUEEN) == null) { return 0; } - if (ForestryItem.beeQueenGE.isItemEqual(getStackInSlot(SLOT_QUEEN))) { - return PluginApiculture.beeInterface.getMember(getStackInSlot(SLOT_QUEEN)).getMaxHealth(); + if (BeeManager.beeRoot.isMated(getStackInSlot(SLOT_QUEEN))) { + return BeeManager.beeRoot.getMember(getStackInSlot(SLOT_QUEEN)).getMaxHealth(); } - else if (ForestryItem.beePrincessGE.isItemEqual(getStackInSlot(SLOT_QUEEN))) { + else if (!BeeManager.beeRoot.isDrone(getStackInSlot(SLOT_QUEEN))) { return displayHealthMax; } else { @@ -531,11 +531,11 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento updateBiome(); } - if (!Proxies.common.isSimulating(worldObj)) { - updateClientSide(); + if (worldObj.isRemote) { + updateServerSide(); } else { - updateServerSide(); + updateClientSide(); } } @@ -552,9 +552,9 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento } public void updateClientSide() { - if (PluginApiculture.beeInterface.isMated(getStackInSlot(SLOT_QUEEN))) { - if (getErrorState() == ErrorStateRegistry.getErrorState("OK") && worldObj.getTotalWorldTime() % 2 % 2 == 0) { - IBee displayQueen = PluginApiculture.beeInterface.getMember(getStackInSlot(SLOT_QUEEN)); + if (BeeManager.beeRoot.isMated(getStackInSlot(SLOT_QUEEN))) { + if (getErrorState() == ErrorStateRegistry.getErrorState("OK") && worldObj.getTotalWorldTime() % 10 == 0) { + IBee displayQueen = BeeManager.beeRoot.getMember(getStackInSlot(SLOT_QUEEN)); displayQueen.doFX(logic.getEffectData(), this); } } @@ -568,7 +568,7 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento return; } - if (worldObj.getTotalWorldTime() % 200 * 10 == 0) { + if (worldObj.getTotalWorldTime() % 5 == 0) { onQueenChange(getStackInSlot(SLOT_QUEEN)); } } From 4938c29e8c3d7ef806ba58e999eb833d0caf3ebf Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Thu, 19 Mar 2015 13:51:41 -0700 Subject: [PATCH 05/17] Deleting reference package. Not needed. Moving Apiary config location - not Thaumcraft specific. Adding ItemStackUtils - generic item stack/inventory functions. Thaumic Apiary has baseline functionality. Bees work in it. --- src/main/java/magicbees/main/Config.java | 15 ++- .../magicbees/main/utils/ItemStackUtils.java | 103 +++++++++++++++ src/main/java/magicbees/reference/Names.java | 13 -- .../tileentity/TileEntityThaumicApiary.java | 119 +++++++++--------- 4 files changed, 169 insertions(+), 81 deletions(-) create mode 100644 src/main/java/magicbees/main/utils/ItemStackUtils.java delete mode 100644 src/main/java/magicbees/reference/Names.java diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 105cf86..7b0feb2 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -240,6 +240,7 @@ public class Config { setupEffectJar(); setupHives(); + setupApiary(); } public void setupItems() @@ -388,6 +389,12 @@ public class Config GameRegistry.registerBlock(effectJar, "effectJar"); GameRegistry.registerTileEntity(TileEntityEffectJar.class, TileEntityEffectJar.tileEntityName); } + + private void setupApiary() { + thaumicApiary = new BlockThaumicApiary(); + GameRegistry.registerBlock(thaumicApiary, "thaumicApiary"); + GameRegistry.registerTileEntity(TileEntityThaumicApiary.class, TileEntityThaumicApiary.tileEntityName); + } private void setupFrames() { hiveFrameMagic = new ItemMagicHiveFrame(HiveFrameType.MAGIC); @@ -493,12 +500,8 @@ public class Config if (ThaumcraftHelper.isActive()) { // Items - solidFlux = new ItemCrystalAspect(); - - // Blocks - thaumicApiary = new BlockThaumicApiary(); - GameRegistry.registerBlock(thaumicApiary, "thaumicApiary"); - GameRegistry.registerTileEntity(TileEntityThaumicApiary.class, TileEntityThaumicApiary.tileEntityName); + //solidFlux replaced by Thaumcraft's crystalized essentia. + //solidFlux = new ItemCrystalAspect(); } } diff --git a/src/main/java/magicbees/main/utils/ItemStackUtils.java b/src/main/java/magicbees/main/utils/ItemStackUtils.java new file mode 100644 index 0000000..4cc9560 --- /dev/null +++ b/src/main/java/magicbees/main/utils/ItemStackUtils.java @@ -0,0 +1,103 @@ +package magicbees.main.utils; + +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + +public class ItemStackUtils { + + /** + * Attempts to add all items to the inventory, starting at startSlot and considering slotCount item slots. + * @return Number of items successfully added to the inventory. + */ + public static int tryAddItemStacksToInvenotry(IInventory inventory, ItemStack[] items, int startSlot, int slotCount) { + int itemsAdded = 0; + + for (ItemStack item : items) { + itemsAdded += addItemToInventory(inventory, item, startSlot, slotCount); + } + + return itemsAdded; + } + + /** + * Attempts to add all items to the inventory, starting at startSlot and considering slotCount item slots. + * @return true if and only if all items were successfully added to the inventory. + */ + public static boolean tryAddAllItemStacksToInventory(IInventory inventory, ItemStack[] items, int startSlot, int slotCount) { + int itemsToAdd = 0; + int itemsAdded = 0; + + for (ItemStack item : items) { + itemsToAdd += item.stackSize; + itemsAdded += addItemToInventory(inventory, item, startSlot, slotCount); + } + + return itemsToAdd == itemsAdded; + } + + /** + * Attempts to add an item to an inventory, starting at startSlot and considering slotCount item slots. + * @return number of items in the stack successfully added to the inventory. + */ + public static int addItemToInventory(IInventory inventory, ItemStack item, int startSlot, int slotCount) { + int itemsAdded = 0; + + itemsAdded = addToExistingSlot(inventory, item, startSlot, slotCount); + if (itemsAdded < item.stackSize) { + item.stackSize -= itemsAdded; + itemsAdded += addToEmptySlot(inventory, item, startSlot, slotCount); + } + + return itemsAdded; + } + + private static int addToExistingSlot(IInventory inventory, ItemStack item, int startSlot, int slotCount) { + int itemsAdded = 0; + + for (int slotIndex = startSlot; slotIndex < (startSlot + slotCount); ++slotIndex) { + ItemStack slotStack = inventory.getStackInSlot(slotIndex); + + // Skip empty slots. + if (slotStack != null && areItemsEqualNBT(item, slotStack)) { + int spaceAvailable = slotStack.getMaxStackSize() - slotStack.stackSize; + + if (spaceAvailable > item.stackSize) { + slotStack.stackSize += item.stackSize; + inventory.setInventorySlotContents(slotIndex, slotStack); + itemsAdded += item.stackSize; + item.stackSize = 0; + } + else if (spaceAvailable > 0) { + slotStack.stackSize = slotStack.getMaxStackSize(); + inventory.setInventorySlotContents(slotIndex, slotStack); + itemsAdded += spaceAvailable; + item.stackSize -= spaceAvailable; + } + } + + // Don't add beyond what we have. + if (item.stackSize == 0) { + break; + } + } + + return itemsAdded; + } + + private static int addToEmptySlot(IInventory inventory, ItemStack item, int startSlot, int slotCount) { + for (int slotIndex = startSlot; slotIndex < (startSlot + slotCount); ++slotIndex) { + ItemStack slotStack = inventory.getStackInSlot(slotIndex); + + if (slotStack == null) { + inventory.setInventorySlotContents(slotIndex, item); + return item.stackSize; + } + } + + return 0; + } + + public static boolean areItemsEqualNBT(ItemStack item, ItemStack otherItem) { + return item.isItemEqual(otherItem) && ItemStack.areItemStackTagsEqual(item, otherItem); + } +} diff --git a/src/main/java/magicbees/reference/Names.java b/src/main/java/magicbees/reference/Names.java deleted file mode 100644 index 19b1a74..0000000 --- a/src/main/java/magicbees/reference/Names.java +++ /dev/null @@ -1,13 +0,0 @@ -package magicbees.reference; - -public class Names { - public static final class Blocks - { - public static final String THAUMIC_APIARY = "thaumicApiary"; - } - - public static final class Containers - { - public static final String THAUMIC_APIARY = "container.mb." + Blocks.THAUMIC_APIARY; - } -} diff --git a/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java b/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java index 18144c3..74df2cc 100644 --- a/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java @@ -3,8 +3,7 @@ package magicbees.tileentity; import magicbees.bees.BeeManager; import magicbees.main.CommonProxy; import magicbees.main.MagicBees; -import magicbees.main.utils.LogHelper; -import magicbees.reference.Names; +import magicbees.main.utils.ItemStackUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -29,41 +28,39 @@ import forestry.api.core.EnumTemperature; import forestry.api.core.ErrorStateRegistry; import forestry.api.core.IErrorState; import forestry.api.genetics.IIndividual; -import forestry.core.inventory.InvTools; -import forestry.core.inventory.InventoryAdapter; import forestry.core.utils.Utils; public class TileEntityThaumicApiary extends TileEntity implements ISidedInventory, IBeeHousing { public static final String tileEntityName = CommonProxy.DOMAIN + ".thaumicApiary"; - private GameProfile ownerName; + private GameProfile ownerProfile; // Constants private static final int SLOT_QUEEN = 0; private static final int SLOT_DRONE = 1; private static final int SLOT_FRAME_START = 2; private static final int SLOT_FRAME_COUNT = 3; - private static final int SLOT_INVENTORY_START = 5; - private static final int SLOT_INVENTORY_COUNT = 7; - - + private static final int SLOT_PRODUCTS_START = 5; + private static final int SLOT_PRODUCTS_COUNT = 7; + private final IBeekeepingLogic logic; private BiomeGenBase biome; private int displayHealthMax = 0; private int displayHealth = 0; private boolean init = false; + + private IErrorState errorState = ErrorStateRegistry.getErrorState("ok"); private ItemStack[] items; - protected final InventoryAdapter inventory = new InventoryAdapter(12, "Items"); - - public TileEntityThaumicApiary() - { + public TileEntityThaumicApiary(){ items = new ItemStack[12]; logic = BeeManager.beeRoot.createBeekeepingLogic(this); } - public void setOwner(EntityPlayer player) { this.ownerName = player.getGameProfile(); } + public void setOwner(EntityPlayer player) { + this.ownerProfile = player.getGameProfile(); + } @Override public ItemStack getQueen() { @@ -94,7 +91,6 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento public void onQueenChange(ItemStack queenStack) { if (!worldObj.isRemote) { MagicBees.object.netHandler.sendInventoryUpdate(this, SLOT_QUEEN, queenStack); - this.markDirty(); } } @@ -135,14 +131,17 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento return false; } + private boolean isItemStackFrame(int i) { + return getStackInSlot(i) != null && getStackInSlot(i).getItem() instanceof IHiveFrame; + } + @Override public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { float mod = 1.0f; - for (int i = SLOT_FRAME_START; i < SLOT_FRAME_START + SLOT_FRAME_COUNT; i++){ - if (getStackInSlot(i) == null) - continue; - if (getStackInSlot(i).getItem() instanceof IHiveFrame) - mod *= ((IHiveFrame) getStackInSlot(i).getItem()).getTerritoryModifier(genome, mod); + for (int slotIndex = SLOT_FRAME_START; slotIndex < SLOT_FRAME_START + SLOT_FRAME_COUNT; slotIndex++) { + if (isItemStackFrame(slotIndex)) { + mod *= ((IHiveFrame) getStackInSlot(slotIndex).getItem()).getTerritoryModifier(genome, mod); + } } return mod; } @@ -150,11 +149,10 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento @Override public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { float mod = 1.0f; - for (int i = SLOT_FRAME_START; i < SLOT_FRAME_START + SLOT_FRAME_COUNT; i++){ - if (getStackInSlot(i) == null) - continue; - if (getStackInSlot(i).getItem() instanceof IHiveFrame) - mod *= ((IHiveFrame) getStackInSlot(i).getItem()).getMutationModifier(genome, mate, mod); + for (int slotIndex = SLOT_FRAME_START; slotIndex < SLOT_FRAME_START + SLOT_FRAME_COUNT; slotIndex++) { + if (isItemStackFrame(slotIndex)) { + mod *= ((IHiveFrame) getStackInSlot(slotIndex).getItem()).getMutationModifier(genome, mate, mod); + } } if (this.isMutationBoosted()) { mod = mod * 2f; @@ -165,11 +163,10 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento @Override public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { float mod = 1.0f; - for (int i = SLOT_FRAME_START; i < SLOT_FRAME_START + SLOT_FRAME_COUNT; i++){ - if (getStackInSlot(i) == null) - continue; - if (getStackInSlot(i).getItem() instanceof IHiveFrame) - mod *= ((IHiveFrame) getStackInSlot(i).getItem()).getLifespanModifier(genome, mate, mod); + for (int slotIndex = SLOT_FRAME_START; slotIndex < SLOT_FRAME_START + SLOT_FRAME_COUNT; slotIndex++) { + if (isItemStackFrame(slotIndex)) { + mod *= ((IHiveFrame) getStackInSlot(slotIndex).getItem()).getLifespanModifier(genome, mate, mod); + } } if (this.isDeathRateBoosted()) { mod = mod / 2f; @@ -179,12 +176,11 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { - float mod = 1.0f; - for (int i = SLOT_FRAME_START; i < SLOT_FRAME_START + SLOT_FRAME_COUNT; i++){ - if (getStackInSlot(i) == null) - continue; - if (getStackInSlot(i).getItem() instanceof IHiveFrame) - mod *= ((IHiveFrame) getStackInSlot(i).getItem()).getProductionModifier(genome, mod); + float mod = 0.9f; + for (int slotIndex = SLOT_FRAME_START; slotIndex < SLOT_FRAME_START + SLOT_FRAME_COUNT; slotIndex++){ + if (isItemStackFrame(slotIndex)) { + mod *= ((IHiveFrame) getStackInSlot(slotIndex).getItem()).getProductionModifier(genome, mod); + } } if (this.isWorkBoosted()) { mod = mod * 2f; @@ -195,23 +191,21 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento @Override public float getFloweringModifier(IBeeGenome genome, float currentModifier) { float mod = 1.0f; - for (int i = SLOT_FRAME_START; i < SLOT_FRAME_START + SLOT_FRAME_COUNT; i++){ - if (getStackInSlot(i) == null) - continue; - if (getStackInSlot(i).getItem() instanceof IHiveFrame) - mod *= ((IHiveFrame) getStackInSlot(i).getItem()).getFloweringModifier(genome, mod); + for (int slotIndex = SLOT_FRAME_START; slotIndex < SLOT_FRAME_START + SLOT_FRAME_COUNT; slotIndex++) { + if (isItemStackFrame(slotIndex)) { + mod *= ((IHiveFrame) getStackInSlot(slotIndex).getItem()).getFloweringModifier(genome, mod); + } } return mod; } @Override public float getGeneticDecay(IBeeGenome genome, float currentModifier) { - float mod = 1.0f; - for (int i = SLOT_FRAME_START; i < SLOT_FRAME_START + SLOT_FRAME_COUNT; i++){ - if (getStackInSlot(i) == null) - continue; - if (getStackInSlot(i).getItem() instanceof IHiveFrame) - mod *= ((IHiveFrame) getStackInSlot(i).getItem()).getGeneticDecay(genome, mod); + float mod = 0.8f; + for (int slotIndex = SLOT_FRAME_START; slotIndex < SLOT_FRAME_START + SLOT_FRAME_COUNT; slotIndex++) { + if (isItemStackFrame(slotIndex)) { + mod *= ((IHiveFrame) getStackInSlot(slotIndex).getItem()).getGeneticDecay(genome, mod); + } } return mod; } @@ -238,7 +232,7 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento @Override public GameProfile getOwnerName() { - return this.ownerName; + return this.ownerProfile; } @Override @@ -283,33 +277,34 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento @Override public void setErrorState(int state) { - + this.errorState = ErrorStateRegistry.getErrorState((short) state); } @Override public void setErrorState(IErrorState state) { - + this.errorState = state; } @Override public int getErrorOrdinal() { - return 0; + return this.errorState.getID(); } @Override public IErrorState getErrorState() { - return null; + return this.errorState; } - public InventoryAdapter getInternalInventory() { - return inventory; - } - - // TODO: Implement own version of this @Override public boolean addProduct(ItemStack product, boolean all) { - LogHelper.info("Trying to add " + product.getDisplayName() + " to thaumicApiary"); - return InvTools.tryAddStack(getInternalInventory(), product, SLOT_INVENTORY_START, SLOT_INVENTORY_COUNT, all, true); + int countAdded = ItemStackUtils.addItemToInventory(this, product, SLOT_PRODUCTS_START, SLOT_PRODUCTS_COUNT); + + if (all) { + return countAdded == product.stackSize; + } + else { + return countAdded > 0; + } } @Override @@ -358,7 +353,7 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento @Override public String getInventoryName() { - return Names.Containers.THAUMIC_APIARY; + return tileEntityName; } @Override @@ -532,10 +527,10 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento } if (worldObj.isRemote) { - updateServerSide(); + updateClientSide(); } else { - updateClientSide(); + updateServerSide(); } } From 4f39132e4e842e7a39e4bab71193f3336b9a2a36 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Thu, 19 Mar 2015 14:02:43 -0700 Subject: [PATCH 06/17] Adjusting lifebar locations in Apiary GUI. --- .../client/gui/GuiThaumicApiary.java | 10 +++++----- .../assets/magicbees/textures/gui/apiary.png | Bin 5269 -> 5194 bytes 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/magicbees/client/gui/GuiThaumicApiary.java b/src/main/java/magicbees/client/gui/GuiThaumicApiary.java index a8107be..6c841a0 100644 --- a/src/main/java/magicbees/client/gui/GuiThaumicApiary.java +++ b/src/main/java/magicbees/client/gui/GuiThaumicApiary.java @@ -26,11 +26,11 @@ public class GuiThaumicApiary extends GuiContainer private static final int LIFEBAR_DEST_Y = 37; private static final int LIFEBAR_SRC_Y = 0; - private static final int LIFEBAR_SRC_STAGE1_X = 193; - private static final int LIFEBAR_SRC_STAGE2_X = 189; - private static final int LIFEBAR_SRC_STAGE3_X = 185; - private static final int LIFEBAR_SRC_STAGE4_X = 181; - private static final int LIFEBAR_SRC_STAGE5_X = 177; + private static final int LIFEBAR_SRC_STAGE1_X = 184; + private static final int LIFEBAR_SRC_STAGE2_X = 182; + private static final int LIFEBAR_SRC_STAGE3_X = 180; + private static final int LIFEBAR_SRC_STAGE4_X = 178; + private static final int LIFEBAR_SRC_STAGE5_X = 176; private static final int WORKBOOST_WIDTH = 16; private static final int WORKBOOST_HEIGHT = 12; diff --git a/src/main/resources/assets/magicbees/textures/gui/apiary.png b/src/main/resources/assets/magicbees/textures/gui/apiary.png index fc2c2908f79b8cb155a75384f729fd75221eaadc..6dae19a06c2a4cd560e9723c82b3f247bb281ad2 100644 GIT binary patch delta 4111 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

Q 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 el$!(rO Date: Fri, 20 Mar 2015 16:52:42 -0700 Subject: [PATCH 07/17] Renaming Thaumic Apiary to Magic Apiary. --- ...aumicApiary.java => BlockMagicApiary.java} | 10 ++++----- ...cApiary.java => ContainerMagicApiary.java} | 8 +++---- .../java/magicbees/client/gui/GUIHandler.java | 10 ++++----- ...ThaumicApiary.java => GuiMagicApiary.java} | 20 +++++++++--------- src/main/java/magicbees/main/Config.java | 8 +++---- ...Apiary.java => TileEntityMagicApiary.java} | 6 +++--- .../assets/magicbees/lang/en_US.lang | 5 +---- .../textures/blocks/thaumicapiary.1.png | Bin 1188 -> 1179 bytes 8 files changed, 32 insertions(+), 35 deletions(-) rename src/main/java/magicbees/block/{BlockThaumicApiary.java => BlockMagicApiary.java} (93%) rename src/main/java/magicbees/client/gui/{ContainerThaumicApiary.java => ContainerMagicApiary.java} (94%) rename src/main/java/magicbees/client/gui/{GuiThaumicApiary.java => GuiMagicApiary.java} (85%) rename src/main/java/magicbees/tileentity/{TileEntityThaumicApiary.java => TileEntityMagicApiary.java} (99%) diff --git a/src/main/java/magicbees/block/BlockThaumicApiary.java b/src/main/java/magicbees/block/BlockMagicApiary.java similarity index 93% rename from src/main/java/magicbees/block/BlockThaumicApiary.java rename to src/main/java/magicbees/block/BlockMagicApiary.java index 437e364..fba29bf 100644 --- a/src/main/java/magicbees/block/BlockThaumicApiary.java +++ b/src/main/java/magicbees/block/BlockMagicApiary.java @@ -6,7 +6,7 @@ import magicbees.client.gui.UIScreens; import magicbees.main.CommonProxy; import magicbees.main.MagicBees; import magicbees.main.utils.TabMagicBees; -import magicbees.tileentity.TileEntityThaumicApiary; +import magicbees.tileentity.TileEntityMagicApiary; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -21,16 +21,16 @@ import net.minecraft.world.World; import javax.swing.*; -public class BlockThaumicApiary extends BlockContainer +public class BlockMagicApiary extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon[] icons; - public BlockThaumicApiary() + public BlockMagicApiary() { super(Material.wood); this.setCreativeTab(TabMagicBees.tabMagicBees); - this.setBlockName("thaumicApiary"); + this.setBlockName("magicApiary"); this.setHardness(1f); this.setResistance(1.5f); this.setHarvestLevel("axe", 0); @@ -79,7 +79,7 @@ public class BlockThaumicApiary extends BlockContainer @Override public TileEntity createNewTileEntity(World world, int metadata) { - return new TileEntityThaumicApiary(); + return new TileEntityMagicApiary(); } @Override diff --git a/src/main/java/magicbees/client/gui/ContainerThaumicApiary.java b/src/main/java/magicbees/client/gui/ContainerMagicApiary.java similarity index 94% rename from src/main/java/magicbees/client/gui/ContainerThaumicApiary.java rename to src/main/java/magicbees/client/gui/ContainerMagicApiary.java index b184c82..6e1a59b 100644 --- a/src/main/java/magicbees/client/gui/ContainerThaumicApiary.java +++ b/src/main/java/magicbees/client/gui/ContainerMagicApiary.java @@ -3,16 +3,16 @@ package magicbees.client.gui; import forestry.api.apiculture.IHiveFrame; import forestry.plugins.PluginApiculture; import magicbees.main.utils.ItemInterface; -import magicbees.tileentity.TileEntityThaumicApiary; +import magicbees.tileentity.TileEntityMagicApiary; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -public class ContainerThaumicApiary extends ContainerMB { +public class ContainerMagicApiary extends ContainerMB { - public TileEntityThaumicApiary apiary; + public TileEntityMagicApiary apiary; public int maxSlot = 0; // Constants @@ -23,7 +23,7 @@ public class ContainerThaumicApiary extends ContainerMB { private static final int SLOT_FRAME_COUNT = 3; private static final int SLOT_INVENTORY_COUNT = 7; - public ContainerThaumicApiary(InventoryPlayer inventoryPlayer, TileEntityThaumicApiary thaumicApiary){ + public ContainerMagicApiary(InventoryPlayer inventoryPlayer, TileEntityMagicApiary thaumicApiary){ this.apiary = thaumicApiary; // Queen/Princess slot diff --git a/src/main/java/magicbees/client/gui/GUIHandler.java b/src/main/java/magicbees/client/gui/GUIHandler.java index 47a3496..16e84fc 100644 --- a/src/main/java/magicbees/client/gui/GUIHandler.java +++ b/src/main/java/magicbees/client/gui/GUIHandler.java @@ -1,7 +1,7 @@ package magicbees.client.gui; import magicbees.tileentity.TileEntityEffectJar; -import magicbees.tileentity.TileEntityThaumicApiary; +import magicbees.tileentity.TileEntityMagicApiary; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -21,8 +21,8 @@ public class GUIHandler implements IGuiHandler } else if (ID == UIScreens.THAUMIC_APIARY.ordinal()) { - TileEntityThaumicApiary tileEntityThaumicApiary = (TileEntityThaumicApiary) world.getTileEntity(x, y, z); - value = new ContainerThaumicApiary(player.inventory, tileEntityThaumicApiary); + TileEntityMagicApiary tileEntityThaumicApiary = (TileEntityMagicApiary) world.getTileEntity(x, y, z); + value = new ContainerMagicApiary(player.inventory, tileEntityThaumicApiary); } return value; @@ -38,8 +38,8 @@ public class GUIHandler implements IGuiHandler value = new GUIEffectJar((TileEntityEffectJar)world.getTileEntity(x, y, z), player); }else if (ID == UIScreens.THAUMIC_APIARY.ordinal()) { - TileEntityThaumicApiary tileEntityThaumicApiary = (TileEntityThaumicApiary) world.getTileEntity(x, y, z); - value = new GuiThaumicApiary(player.inventory, tileEntityThaumicApiary); + TileEntityMagicApiary tileEntityThaumicApiary = (TileEntityMagicApiary) world.getTileEntity(x, y, z); + value = new GuiMagicApiary(player.inventory, tileEntityThaumicApiary); } return value; diff --git a/src/main/java/magicbees/client/gui/GuiThaumicApiary.java b/src/main/java/magicbees/client/gui/GuiMagicApiary.java similarity index 85% rename from src/main/java/magicbees/client/gui/GuiThaumicApiary.java rename to src/main/java/magicbees/client/gui/GuiMagicApiary.java index 6c841a0..324286f 100644 --- a/src/main/java/magicbees/client/gui/GuiThaumicApiary.java +++ b/src/main/java/magicbees/client/gui/GuiMagicApiary.java @@ -3,7 +3,7 @@ package magicbees.client.gui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import magicbees.main.CommonProxy; -import magicbees.tileentity.TileEntityThaumicApiary; +import magicbees.tileentity.TileEntityMagicApiary; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -12,7 +12,7 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class GuiThaumicApiary extends GuiContainer +public class GuiMagicApiary extends GuiContainer { public static final ResourceLocation BACKGROUND_LOCATION = new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.GUI_TEXTURE + "apiary.png"); @@ -53,8 +53,8 @@ public class GuiThaumicApiary extends GuiContainer private static final int MUTATIONBOOST_SRC_X = 176; private static final int MUTATIONBOOST_SRC_Y = 71; - public GuiThaumicApiary(InventoryPlayer inventoryPlayer, TileEntityThaumicApiary thaumicApiary) { - super(new ContainerThaumicApiary(inventoryPlayer, thaumicApiary)); + public GuiMagicApiary(InventoryPlayer inventoryPlayer, TileEntityMagicApiary thaumicApiary) { + super(new ContainerMagicApiary(inventoryPlayer, thaumicApiary)); this.xSize = WIDTH; this.ySize = HEIGHT; @@ -73,7 +73,7 @@ public class GuiThaumicApiary extends GuiContainer this.drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); - TileEntityThaumicApiary apiary = ((ContainerThaumicApiary)this.inventorySlots).apiary; + TileEntityMagicApiary apiary = ((ContainerMagicApiary)this.inventorySlots).apiary; drawLifebar(apiary); @@ -82,35 +82,35 @@ public class GuiThaumicApiary extends GuiContainer drawMutationIcon(apiary); } - private void drawMutationIcon(TileEntityThaumicApiary apiary) { + private void drawMutationIcon(TileEntityMagicApiary apiary) { if (apiary.isMutationBoosted()) { this.drawTexturedModalRect(this.guiLeft + MUTATIONBOOST_DEST_X, this.guiTop + MUTATIONBOOST_DEST_Y, MUTATIONBOOST_SRC_X, MUTATIONBOOST_SRC_Y, MUTATIONBOOST_WIDTH, MUTATIONBOOST_HEIGHT); } } - private void drawDeathRateIcon(TileEntityThaumicApiary apiary) { + private void drawDeathRateIcon(TileEntityMagicApiary apiary) { if (apiary.isDeathRateBoosted()) { this.drawTexturedModalRect(this.guiLeft + DEATHBOOST_DEST_X, this.guiTop + DEATHBOOST_DEST_Y, DEATHBOOST_SRC_X, DEATHBOOST_SRC_Y, DEATHBOOST_WIDTH, DEATHBOOST_HEIGHT); } } - private void drawWorkBoostIcon(TileEntityThaumicApiary apiary) { + private void drawWorkBoostIcon(TileEntityMagicApiary apiary) { if (apiary.isWorkBoosted()) { this.drawTexturedModalRect(this.guiLeft + WORKBOOST_DEST_X, this.guiTop + WORKBOOST_DEST_Y, WORKBOOST_SRC_X, WORKBOOST_SRC_Y, WORKBOOST_WIDTH, WORKBOOST_HEIGHT); } } - private void drawLifebar(TileEntityThaumicApiary apiary) { + private void drawLifebar(TileEntityMagicApiary apiary) { int value = LIFEBAR_HEIGHT - apiary.getHealthScaled(LIFEBAR_HEIGHT); int lifebarSrc = getLifebarSrc(apiary); this.drawTexturedModalRect(this.guiLeft + LIFEBAR_DEST_X, this.guiTop + value + LIFEBAR_DEST_Y, lifebarSrc, LIFEBAR_SRC_Y, LIFEBAR_WIDTH, LIFEBAR_HEIGHT - value); } - private int getLifebarSrc(TileEntityThaumicApiary apiary) { + private int getLifebarSrc(TileEntityMagicApiary apiary) { int value = apiary.getHealthScaled(5); if (value >= 5) { return LIFEBAR_SRC_STAGE1_X; diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 7b0feb2..8e1a136 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -35,7 +35,7 @@ import magicbees.main.utils.VersionInfo; import magicbees.main.utils.compat.ThaumcraftHelper; import magicbees.storage.BackpackDefinition; import magicbees.tileentity.TileEntityEffectJar; -import magicbees.tileentity.TileEntityThaumicApiary; +import magicbees.tileentity.TileEntityMagicApiary; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; @@ -92,7 +92,7 @@ public class Config public static BlockWoodSlab slabWoodFull; public static BlockEffectJar effectJar; public static BlockHive hive; - public static BlockThaumicApiary thaumicApiary; + public static BlockMagicApiary thaumicApiary; public static ItemComb combs; public static ItemWax wax; @@ -391,9 +391,9 @@ public class Config } private void setupApiary() { - thaumicApiary = new BlockThaumicApiary(); + thaumicApiary = new BlockMagicApiary(); GameRegistry.registerBlock(thaumicApiary, "thaumicApiary"); - GameRegistry.registerTileEntity(TileEntityThaumicApiary.class, TileEntityThaumicApiary.tileEntityName); + GameRegistry.registerTileEntity(TileEntityMagicApiary.class, TileEntityMagicApiary.tileEntityName); } private void setupFrames() { diff --git a/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java similarity index 99% rename from src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java rename to src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index 74df2cc..b50142f 100644 --- a/src/main/java/magicbees/tileentity/TileEntityThaumicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -30,9 +30,9 @@ import forestry.api.core.IErrorState; import forestry.api.genetics.IIndividual; import forestry.core.utils.Utils; -public class TileEntityThaumicApiary extends TileEntity implements ISidedInventory, IBeeHousing { +public class TileEntityMagicApiary extends TileEntity implements ISidedInventory, IBeeHousing { - public static final String tileEntityName = CommonProxy.DOMAIN + ".thaumicApiary"; + public static final String tileEntityName = CommonProxy.DOMAIN + ".magicApiary"; private GameProfile ownerProfile; // Constants @@ -53,7 +53,7 @@ public class TileEntityThaumicApiary extends TileEntity implements ISidedInvento private ItemStack[] items; - public TileEntityThaumicApiary(){ + public TileEntityMagicApiary(){ items = new ItemStack[12]; logic = BeeManager.beeRoot.createBeekeepingLogic(this); } diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang index d80903f..3de498c 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -10,11 +10,8 @@ item.magicbees:mysteriousMagnet.name=Mysterious Magnet item.moonDial.name=Jade Moon Dial #Tiles -tile.planks.greatwood.name=Greatwood Planks -tile.slab.wood.greatwood.name=Greatwood Slab -tile.planks.silverwood.name=Silverwood Planks -tile.slab.wood.silverwood.name=Silverwood Slab tile.effectJar.name=Bee Collector's Jar +tile.magicApiary.name=Magic Apiary tile.hive.curious.name=Curious Hive tile.hive.unusual.name=Unusual Hive tile.hive.deep.name=Deep Hive diff --git a/src/main/resources/assets/magicbees/textures/blocks/thaumicapiary.1.png b/src/main/resources/assets/magicbees/textures/blocks/thaumicapiary.1.png index 1ae178c9eef411c329d76bf9354e3f91177ef296..4feeccb53d29b6fe9dea2c81a3fee02a4eefdb82 100644 GIT binary patch delta 350 zcmV-k0iph+37ZL!nvtDg6GAd1LNX;pG9^SaCPp+RL^LKvlMn$c42ohfq;oT+bTqVn zH?v^@^Z}D_0UQ}B5nB!b000SaNLh0L01FWS01FWTe`H^glWqeifAL8~K~yMH4b9s^ zfIPSnX93n4nFg*=!R0#gY6erLV)#pTOCL!8xO3RD}lI`1A9w#U#P5eJZ0nFym;{ z)abg{)It^(2$c~;e~-I;60$;As*K}yvrD!+TvpW@7Amw5UEaf2Re9i~0YQsdoH68w z)B};ujsC*8*R`}v5Y}<1^_N~#)8hLByf`~PHO5qT2pRky1lXIve+;uCF2BlLN&&{Z wAG~}fd6r74@`A&WuH9?b#H4(MX!F58NTV$3&$t(T000002uVdwM6N<$g16e42mk;8 delta 383 zcmV-_0f7FS38V>-ngcW@9g&(~6G1T~LNX*mG9^SZB}OzQL^LKulMMkZBy>?Dhh8a- zVk(eiE0t(1n`|$fZ7-s6F{E-bsdhB2c{Q_rH?vUz^#K`9#6ryg000SaNLh0L01FZT z01FZU(%pXilWqeifBH#8K~yMH6~l{Gf-o2W;J>R`ltB@}@>)(72%~~zG!WRjfLd8( z@Bbv7zH>ge)^z|A8CfiOXZ(Y)TUoncXQ57)E9$J44qjv~kZi2^uIpm#IH*b~1Uyn0OBmxx zg39LyaCyGHt96lT>w4>TL14f_?=s3uUOiQX5CpV)FT8n7i#!uT7A1x)RXJCVbrWHq d(gAM$0l%{@5gDSHCDs4{002ovPDHLkV1jdRnd1Ne From 46cb2cb95ae35b7fdff5f1a73e656132608bce20 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Sat, 21 Mar 2015 18:20:45 -0700 Subject: [PATCH 08/17] Add VisAuraProvider. Placeholder texture, placeholder name, placeholder EVERYTHING. Add crude search mechanism for Aura Providers to Magic Apiary. --- .../api/bees/IMagicApiaryAuraProvider.java | 37 ++++++ .../magicbees/block/BlockVisAuraProvider.java | 42 +++++++ src/main/java/magicbees/main/Config.java | 35 ++++-- src/main/java/magicbees/main/MagicBees.java | 11 ++ .../magicbees/main/utils/ChunkCoords.java | 58 +++++++++ .../tileentity/TileEntityMagicApiary.java | 113 +++++++++++++++++- .../tileentity/TileEntityVisAuraProvider.java | 112 +++++++++++++++++ .../assets/magicbees/lang/en_US.lang | 1 + 8 files changed, 397 insertions(+), 12 deletions(-) create mode 100644 src/main/java/magicbees/api/bees/IMagicApiaryAuraProvider.java create mode 100644 src/main/java/magicbees/block/BlockVisAuraProvider.java create mode 100644 src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java diff --git a/src/main/java/magicbees/api/bees/IMagicApiaryAuraProvider.java b/src/main/java/magicbees/api/bees/IMagicApiaryAuraProvider.java new file mode 100644 index 0000000..d2d5096 --- /dev/null +++ b/src/main/java/magicbees/api/bees/IMagicApiaryAuraProvider.java @@ -0,0 +1,37 @@ +package magicbees.api.bees; + +/** + * Allows a tile entity to provide a Magic Apiary with 'aura' to boost bee production, mutation rate, + * or decrease bee lifespan. + * + * @author MysteriousAges + */ +public interface IMagicApiaryAuraProvider { + + /** + * Requests a mutation charge from the aura provider. If true is returned, the + * aura provider should decrement its internal charge by one. If there are no + * charges remaining, it should return false. + * + * @return True if a charge is given; false otherwise. + */ + public boolean getMutationCharge(); + + /** + * Requests a mutation charge from the aura provider. If true is returned, the + * aura provider should decrement its internal charge by one. If there are no + * charges remaining, it should return false. + * + * @return True if a charge is given; false otherwise. + */ + public boolean getDeathRateCharge(); + + /** + * Requests a mutation charge from the aura provider. If true is returned, the + * aura provider should decrement its internal charge by one. If there are no + * charges remaining, it should return false. + * + * @return True if a charge is given; false otherwise. + */ + public boolean getProductionCharge(); +} diff --git a/src/main/java/magicbees/block/BlockVisAuraProvider.java b/src/main/java/magicbees/block/BlockVisAuraProvider.java new file mode 100644 index 0000000..37edea4 --- /dev/null +++ b/src/main/java/magicbees/block/BlockVisAuraProvider.java @@ -0,0 +1,42 @@ +package magicbees.block; + +import magicbees.main.utils.TabMagicBees; +import magicbees.tileentity.TileEntityVisAuraProvider; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Blocks; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockVisAuraProvider extends BlockContainer { + + public BlockVisAuraProvider() { + super(Material.glass); + this.setCreativeTab(TabMagicBees.tabMagicBees); + this.setBlockName("visAuraProvider"); + this.setHardness(0.5f); + this.setResistance(1.5f); + this.setBlockBounds(0.25f, 0f, 0.25f, 0.75f, 0.5f, 0.75f); + } + + @Override + public boolean isOpaqueCube() + { + return false; + } + + @Override + public TileEntity createNewTileEntity(World world, int metadata) { + return new TileEntityVisAuraProvider(); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) { + this.blockIcon = Blocks.glass.getIcon(0, 0); + } + +} diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 8e1a136..cb7cefd 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -3,11 +3,12 @@ package magicbees.main; import java.io.File; import java.lang.reflect.Field; -import cpw.mods.fml.client.event.ConfigChangedEvent; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.registry.GameRegistry; -import magicbees.block.*; +import magicbees.block.BlockEffectJar; +import magicbees.block.BlockHive; +import magicbees.block.BlockMagicApiary; +import magicbees.block.BlockPlanks; +import magicbees.block.BlockVisAuraProvider; +import magicbees.block.BlockWoodSlab; import magicbees.block.types.HiveType; import magicbees.item.ItemCapsule; import magicbees.item.ItemComb; @@ -36,6 +37,7 @@ import magicbees.main.utils.compat.ThaumcraftHelper; import magicbees.storage.BackpackDefinition; import magicbees.tileentity.TileEntityEffectJar; import magicbees.tileentity.TileEntityMagicApiary; +import magicbees.tileentity.TileEntityVisAuraProvider; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; @@ -47,6 +49,10 @@ import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.client.event.ConfigChangedEvent; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.apiculture.BeeManager; import forestry.api.storage.BackpackManager; import forestry.api.storage.EnumBackpackType; @@ -92,7 +98,8 @@ public class Config public static BlockWoodSlab slabWoodFull; public static BlockEffectJar effectJar; public static BlockHive hive; - public static BlockMagicApiary thaumicApiary; + public static BlockMagicApiary magicApiary; + public static BlockVisAuraProvider visAuraProvider; public static ItemComb combs; public static ItemWax wax; @@ -241,6 +248,8 @@ public class Config setupEffectJar(); setupHives(); setupApiary(); + + setupThaumcraftBlocks(); } public void setupItems() @@ -391,8 +400,8 @@ public class Config } private void setupApiary() { - thaumicApiary = new BlockMagicApiary(); - GameRegistry.registerBlock(thaumicApiary, "thaumicApiary"); + magicApiary = new BlockMagicApiary(); + GameRegistry.registerBlock(magicApiary, "magicApiary"); GameRegistry.registerTileEntity(TileEntityMagicApiary.class, TileEntityMagicApiary.tileEntityName); } @@ -495,13 +504,19 @@ public class Config } } } + + private void setupThaumcraftBlocks() { + if (ThaumcraftHelper.isActive()) { + visAuraProvider = new BlockVisAuraProvider(); + GameRegistry.registerBlock(visAuraProvider, "visAuraProvider"); + GameRegistry.registerTileEntity(TileEntityVisAuraProvider.class, "visAuraProvider"); + } + } private void setupThaumcraftItems() { if (ThaumcraftHelper.isActive()) { // Items - //solidFlux replaced by Thaumcraft's crystalized essentia. - //solidFlux = new ItemCrystalAspect(); } } diff --git a/src/main/java/magicbees/main/MagicBees.java b/src/main/java/magicbees/main/MagicBees.java index ecbfd1b..1870e39 100644 --- a/src/main/java/magicbees/main/MagicBees.java +++ b/src/main/java/magicbees/main/MagicBees.java @@ -14,6 +14,8 @@ 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.IMCEvent; +import cpw.mods.fml.common.event.FMLMissingMappingsEvent; +import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; @@ -90,5 +92,14 @@ public class MagicBees { IMCManager.handle(event); } + + @Mod.EventHandler + public void handleMissingMapping(FMLMissingMappingsEvent event) { + for (MissingMapping mapping : event.get()) { + // TODO: ... maybe not this. + LogHelper.info(String.format("Missing mapping: %s - ignoring.", mapping.name)); + mapping.ignore(); + } + } } diff --git a/src/main/java/magicbees/main/utils/ChunkCoords.java b/src/main/java/magicbees/main/utils/ChunkCoords.java index 2dfc6f0..d88d2b5 100644 --- a/src/main/java/magicbees/main/utils/ChunkCoords.java +++ b/src/main/java/magicbees/main/utils/ChunkCoords.java @@ -1,6 +1,7 @@ package magicbees.main.utils; import net.minecraft.entity.Entity; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -32,4 +33,61 @@ public class ChunkCoords this.z = zCoord; } + /** + * Adds chunk coords together & returns the result within the same dimension. + */ + public ChunkCoords add(ChunkCoords coords) { + return new ChunkCoords(coords.dimension, this.x + coords.x, this.y + coords.y, this.z + coords.z); + } + + /** + * Subtracts chunk coords (a.subtract(b) == a - b) & returns the result within the same dimension. + */ + public ChunkCoords subtract(ChunkCoords coords) { + return new ChunkCoords(coords.dimension, this.x - coords.x, this.y - coords.y, this.z - coords.z); + } + + /** + * Returns a new ChunkCoords in the specified dimension. + */ + public ChunkCoords inDimension(int dimId) { + return new ChunkCoords(dimId, x, y, z); + } + + /** + * Returns a new ChunkCoords in the specified world. + */ + public ChunkCoords inDimension(World world) { + return new ChunkCoords(world.provider.dimensionId, x, y, z); + } + + /** + * Writes obj to the given tag compound as a subtag. Writes nothing if obj is null. + */ + public static void writeToNBT(ChunkCoords obj, NBTTagCompound tagRoot) { + if (obj != null) { + NBTTagCompound coordsTag = new NBTTagCompound(); + coordsTag.setInteger("dim", obj.dimension); + coordsTag.setInteger("xPos", obj.x); + coordsTag.setInteger("yPos", obj.y); + coordsTag.setInteger("zPos", obj.z); + tagRoot.setTag("chunkCoords", coordsTag); + } + } + + /** + * Reads a ChunkCoords from an NBT tag. If no ChunkCoords subtag exists, returns null. + */ + public static ChunkCoords readFromNBT(NBTTagCompound tagRoot) { + if (tagRoot.hasKey("chunkCoords")) { + NBTTagCompound coordsTag = (NBTTagCompound)tagRoot.getTag("chunkCoords"); + int dim = coordsTag.getInteger("dim"); + int x = coordsTag.getInteger("xPos"); + int y = coordsTag.getInteger("yPos"); + int z = coordsTag.getInteger("zPos"); + return new ChunkCoords(dim, x, y, z); + } + return null; + } + } diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index b50142f..5ff04a1 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -1,9 +1,12 @@ package magicbees.tileentity; +import magicbees.api.bees.IMagicApiaryAuraProvider; import magicbees.bees.BeeManager; import magicbees.main.CommonProxy; import magicbees.main.MagicBees; +import magicbees.main.utils.ChunkCoords; import magicbees.main.utils.ItemStackUtils; +import magicbees.main.utils.LogHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -43,17 +46,28 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory private static final int SLOT_PRODUCTS_START = 5; private static final int SLOT_PRODUCTS_COUNT = 7; - private final IBeekeepingLogic logic; + private static final int AURAPROVIDER_SEARCH_RADIUS = 6; + + private IBeekeepingLogic logic; + private boolean hasAuraProvider = false; + private IMagicApiaryAuraProvider auraProvider; + private ChunkCoords auraProviderPosition; private BiomeGenBase biome; private int displayHealthMax = 0; private int displayHealth = 0; private boolean init = false; + private static final int FLAG_MUTATIONCHARGE = 1 << 0; + private static final int FLAG_DEATHCHARGE = 1 << 1; + private static final int FLAG_PRODUCTION = 1 << 2; + private int flags; + private IErrorState errorState = ErrorStateRegistry.getErrorState("ok"); private ItemStack[] items; public TileEntityMagicApiary(){ + flags = 0; items = new ItemStack[12]; logic = BeeManager.beeRoot.createBeekeepingLogic(this); } @@ -482,13 +496,16 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory items.appendTag(item); } } + compound.setTag("Items", items); compound.setInteger("BiomeId", biome.biomeID); if (logic != null) { logic.writeToNBT(compound); } - compound.setTag("Items", items); + ChunkCoords.writeToNBT(this.auraProviderPosition, compound); + + compound.setInteger("flags", this.flags); } @Override @@ -509,6 +526,9 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory int biomeId = compound.getInteger("BiomeId"); biome = BiomeGenBase.getBiome(biomeId); logic.readFromNBT(compound); + + this.auraProviderPosition = ChunkCoords.readFromNBT(compound); + this.flags = compound.getInteger("flags"); } public float getExactTemperature() { @@ -556,6 +576,13 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory } public void updateServerSide() { + if (!this.hasAuraProvider) { + findAuraProvider(); + } + else { + updateAuraProvider(); + } + logic.update(); IBee queen = logic.getQueen(); @@ -602,4 +629,86 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory public boolean isMutationBoosted() { return false; } + + private void updateAuraProvider() { + + } + + private static final int MAX_BLOCKS_SEARCH_PER_CHECK = (AURAPROVIDER_SEARCH_RADIUS * 2 + 1) * 2; + private void findAuraProvider() { + if (worldObj.getTotalWorldTime() % 10 != 0) { + return; + } + + if (this.auraProviderPosition == null) { + this.auraProviderPosition = new ChunkCoords(0, + xCoord - AURAPROVIDER_SEARCH_RADIUS, + (yCoord - AURAPROVIDER_SEARCH_RADIUS >= 0) ? yCoord - AURAPROVIDER_SEARCH_RADIUS : 0, + zCoord - AURAPROVIDER_SEARCH_RADIUS); + LogHelper.info("Apiary starting search"); + } + else { + // Will end up here after loading from save with a valid auraProvider. + if (locationHasAuraProvider(auraProviderPosition.x, auraProviderPosition.y, auraProviderPosition.z)) { + this.auraProvider = (IMagicApiaryAuraProvider)(worldObj.getTileEntity(auraProviderPosition.x, + auraProviderPosition.y, + auraProviderPosition.x)); + this.hasAuraProvider = true; + return; + } + } + + int blocksCounted = 0; + int x = auraProviderPosition.x; + int y = auraProviderPosition.y; + int z = auraProviderPosition.z; + while ((y < yCoord + AURAPROVIDER_SEARCH_RADIUS) && blocksCounted < MAX_BLOCKS_SEARCH_PER_CHECK) { + while ((z < zCoord + AURAPROVIDER_SEARCH_RADIUS) && blocksCounted < MAX_BLOCKS_SEARCH_PER_CHECK) { + while ((x < xCoord + AURAPROVIDER_SEARCH_RADIUS) && blocksCounted < MAX_BLOCKS_SEARCH_PER_CHECK) { + if (locationHasAuraProvider(x, y, z)) { + LogHelper.info("Apiary found aura provider!"); + this.auraProvider = (IMagicApiaryAuraProvider)(worldObj.getTileEntity(x, y, z)); + this.hasAuraProvider = true; + saveAuraProviderPosition(x, y, z); + return; + } + + ++blocksCounted; + ++x; + } + if (blocksCounted < MAX_BLOCKS_SEARCH_PER_CHECK) { + ++z; + x = xCoord - AURAPROVIDER_SEARCH_RADIUS; + } + } + if (blocksCounted < MAX_BLOCKS_SEARCH_PER_CHECK) { + ++y; + z = zCoord - AURAPROVIDER_SEARCH_RADIUS; + } + } + + LogHelper.info("Apiary suspending search"); + + if (auraProvider == null) { + saveAuraProviderPosition(x, y, z); + + if (auraProviderPosition.y >= yCoord + AURAPROVIDER_SEARCH_RADIUS) { + LogHelper.info("Apiary finished scanning blocks; did not find aura provider."); + this.auraProviderPosition = null; + return; + } + } + } + + private void saveAuraProviderPosition(int x, int y, int z) { + auraProviderPosition = new ChunkCoords(auraProviderPosition.dimension, x, y, z); + } + + private boolean locationHasAuraProvider(int x, int y, int z) { + TileEntity entity = worldObj.getTileEntity(x, y, z); + if (entity != null && entity instanceof IMagicApiaryAuraProvider) { + return true; + } + return false; + } } diff --git a/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java b/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java new file mode 100644 index 0000000..7a63524 --- /dev/null +++ b/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java @@ -0,0 +1,112 @@ +package magicbees.tileentity; + +import magicbees.api.bees.IMagicApiaryAuraProvider; +import magicbees.main.CommonProxy; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.visnet.VisNetHandler; + +public class TileEntityVisAuraProvider extends TileEntity implements IMagicApiaryAuraProvider { + + public static final String tileEntityName = CommonProxy.DOMAIN + ".visAuraProvider"; + + private static final int MAX_CHARGES = 10; + int currentMutationCharges; + int currentDeathCharges; + int currentProductionCharges; + + private static final int VIS_PER_CHARGE = 10; + private static Aspect ASPECT_MUTATION = Aspect.WATER; + private static Aspect ASPECT_DEATH = Aspect.ENTROPY; + private static Aspect ASPECT_PRODUCTION = Aspect.AIR; + int currentMutationVis; + int currentDeathVis; + int currentProductionVis; + + public TileEntityVisAuraProvider() { + super(); + } + + @Override + public void updateEntity() { + + long modTickRate = worldObj.getTotalWorldTime(); + if (currentProductionCharges < MAX_CHARGES && modTickRate % 3 == 0) { + currentProductionVis += getVisFromNet(ASPECT_PRODUCTION); + if (currentProductionVis >= VIS_PER_CHARGE) { + currentProductionVis -= VIS_PER_CHARGE; + ++currentProductionCharges; + } + } + if (currentDeathCharges < MAX_CHARGES && modTickRate % 5 == 0) { + currentDeathVis += getVisFromNet(ASPECT_DEATH); + if (currentDeathVis >= VIS_PER_CHARGE) { + currentDeathVis -= VIS_PER_CHARGE; + ++currentDeathCharges; + } + } + if (currentMutationCharges < MAX_CHARGES && modTickRate % 11 == 0) { + currentMutationCharges += getVisFromNet(ASPECT_MUTATION); + if (currentMutationCharges >= VIS_PER_CHARGE) { + currentMutationCharges -= VIS_PER_CHARGE; + ++currentMutationCharges; + } + } + } + + private int getVisFromNet(Aspect aspect) { + return VisNetHandler.drainVis(worldObj, xCoord, yCoord, zCoord, aspect, 1); + } + + @Override + public boolean getMutationCharge() { + if (this.currentMutationCharges > 0) { + --this.currentMutationCharges; + return true; + } + return false; + } + + @Override + public boolean getDeathRateCharge() { + if (this.currentDeathCharges > 0) { + --this.currentDeathCharges; + return true; + } + return false; + } + + @Override + public boolean getProductionCharge() { + if (this.currentProductionCharges > 0) { + --this.currentProductionCharges; + return true; + } + return false; + } + + @Override + public void readFromNBT(NBTTagCompound tag) { + super.readFromNBT(tag); + + this.currentMutationCharges = tag.getInteger("mutationCharges"); + this.currentMutationVis = tag.getInteger("mutationVis"); + this.currentDeathCharges = tag.getInteger("deathCharges"); + this.currentDeathVis = tag.getInteger("deathVis"); + this.currentProductionCharges = tag.getInteger("productionCharges"); + this.currentProductionVis = tag.getInteger("productionVis"); + } + + @Override + public void writeToNBT(NBTTagCompound tag) { + super.writeToNBT(tag); + + tag.setInteger("mutationCharges", currentMutationCharges); + tag.setInteger("mutationVis", currentMutationVis); + tag.setInteger("deathCharges", currentDeathCharges); + tag.setInteger("deathVis", currentDeathVis); + tag.setInteger("productionCharges", currentProductionCharges); + tag.setInteger("productionVis", currentProductionVis); + } +} diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang index 3de498c..20de959 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -12,6 +12,7 @@ item.moonDial.name=Jade Moon Dial #Tiles tile.effectJar.name=Bee Collector's Jar tile.magicApiary.name=Magic Apiary +tile.visAuraProvider.name=Vis Apiary Booster tile.hive.curious.name=Curious Hive tile.hive.unusual.name=Unusual Hive tile.hive.deep.name=Deep Hive From cb7b5156264d7793c4444c41ba5e16817cec1cf5 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Sat, 21 Mar 2015 20:45:36 -0700 Subject: [PATCH 09/17] Added network event for updating bit flags. Magic Apiary pulls charges from Aura Providers. --- .../client/gui/ContainerMagicApiary.java | 2 +- .../magicbees/client/gui/GuiMagicApiary.java | 30 ++++-- .../main/utils/net/EventFlagsUpdate.java | 77 ++++++++++++++ .../main/utils/net/NetworkEventHandler.java | 17 ++++ .../tileentity/ITileEntityFlags.java | 6 ++ .../tileentity/TileEntityMagicApiary.java | 96 +++++++++++++++--- .../assets/magicbees/textures/gui/apiary.png | Bin 5194 -> 4840 bytes 7 files changed, 204 insertions(+), 24 deletions(-) create mode 100644 src/main/java/magicbees/main/utils/net/EventFlagsUpdate.java create mode 100644 src/main/java/magicbees/tileentity/ITileEntityFlags.java diff --git a/src/main/java/magicbees/client/gui/ContainerMagicApiary.java b/src/main/java/magicbees/client/gui/ContainerMagicApiary.java index 6e1a59b..92fe6d5 100644 --- a/src/main/java/magicbees/client/gui/ContainerMagicApiary.java +++ b/src/main/java/magicbees/client/gui/ContainerMagicApiary.java @@ -56,7 +56,7 @@ public class ContainerMagicApiary extends ContainerMB { j++; } - addPlayerInventory(inventoryPlayer, 0, 109); + addPlayerInventory(inventoryPlayer, 0, 110); maxSlot = currentSlot; diff --git a/src/main/java/magicbees/client/gui/GuiMagicApiary.java b/src/main/java/magicbees/client/gui/GuiMagicApiary.java index 324286f..2b39482 100644 --- a/src/main/java/magicbees/client/gui/GuiMagicApiary.java +++ b/src/main/java/magicbees/client/gui/GuiMagicApiary.java @@ -1,15 +1,18 @@ package magicbees.client.gui; +import magicbees.main.CommonProxy; +import magicbees.tileentity.TileEntityMagicApiary; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.input.Mouse; +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import magicbees.main.CommonProxy; -import magicbees.tileentity.TileEntityMagicApiary; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class GuiMagicApiary extends GuiContainer @@ -52,12 +55,15 @@ public class GuiMagicApiary extends GuiContainer private static final int MUTATIONBOOST_DEST_Y = 17; private static final int MUTATIONBOOST_SRC_X = 176; private static final int MUTATIONBOOST_SRC_Y = 71; + + private GuiButton mutationButton; public GuiMagicApiary(InventoryPlayer inventoryPlayer, TileEntityMagicApiary thaumicApiary) { super(new ContainerMagicApiary(inventoryPlayer, thaumicApiary)); this.xSize = WIDTH; this.ySize = HEIGHT; + } @Override @@ -97,7 +103,7 @@ public class GuiMagicApiary extends GuiContainer } private void drawWorkBoostIcon(TileEntityMagicApiary apiary) { - if (apiary.isWorkBoosted()) { + if (apiary.isProductionBoosted()) { this.drawTexturedModalRect(this.guiLeft + WORKBOOST_DEST_X, this.guiTop + WORKBOOST_DEST_Y, WORKBOOST_SRC_X, WORKBOOST_SRC_Y, WORKBOOST_WIDTH, WORKBOOST_HEIGHT); } @@ -128,4 +134,10 @@ public class GuiMagicApiary extends GuiContainer return LIFEBAR_SRC_STAGE5_X; } } + + @Override + protected void mouseClicked(int p_73864_1_, int p_73864_2_, int p_73864_3_) { + // TODO Auto-generated method stub + super.mouseClicked(p_73864_1_, p_73864_2_, p_73864_3_); + } } diff --git a/src/main/java/magicbees/main/utils/net/EventFlagsUpdate.java b/src/main/java/magicbees/main/utils/net/EventFlagsUpdate.java new file mode 100644 index 0000000..e5042c9 --- /dev/null +++ b/src/main/java/magicbees/main/utils/net/EventFlagsUpdate.java @@ -0,0 +1,77 @@ +package magicbees.main.utils.net; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.client.FMLClientHandler; +import magicbees.main.utils.ChunkCoords; +import magicbees.main.utils.LogHelper; +import magicbees.main.utils.net.NetworkEventHandler.EventType; +import magicbees.tileentity.ITileEntityFlags; + +public class EventFlagsUpdate extends EventCoords { + + private int[] flags; + + public EventFlagsUpdate(ChunkCoords position, int[] flagValues) { + super(EventType.FLAGS_UPDATE, position); + flags = flagValues; + } + + public EventFlagsUpdate(DataInputStream byteStream) { + super(EventType.FLAGS_UPDATE, byteStream); + + this.readDataFromInputStream(byteStream); + } + + public int[] getFlags() { + return flags; + } + + @Override + protected void writeDataToOutputStream(DataOutputStream byteStream) { + super.writeDataToOutputStream(byteStream); + + try { + byteStream.writeByte(flags.length); + for (int index = 0; index < flags.length; ++index) { + byteStream.writeInt(flags[index]); + } + } + catch (IOException e) { + LogHelper.error("Could not write EventFlagsUpdate data to stream."); + e.printStackTrace(); + } + } + + @Override + protected void readDataFromInputStream(DataInputStream byteStream) { + super.readDataFromInputStream(byteStream); + + try { + byte length = byteStream.readByte(); + + this.flags = new int[length]; + for (int index = 0; index < length; ++index) { + flags[index] = byteStream.readInt(); + } + } + catch (IOException e) { + LogHelper.error("Could not read EventFlagsUpdate data from stream."); + e.printStackTrace(); + } + } + + @Override + public void process(EntityPlayerMP player) { + TileEntity tile = FMLClientHandler.instance().getClient().theWorld.getTileEntity(getCoords().x, getCoords().y, getCoords().z); + + if (tile != null && tile instanceof ITileEntityFlags) { + ((ITileEntityFlags) tile).setFlags(this.flags); + } + } + +} diff --git a/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java b/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java index f8d880a..4d0df50 100644 --- a/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java +++ b/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java @@ -6,6 +6,7 @@ import io.netty.buffer.ByteBufInputStream; import java.io.DataInputStream; import java.io.IOException; +import magicbees.main.MagicBees; import magicbees.main.utils.ChunkCoords; import magicbees.main.utils.LogHelper; import magicbees.main.utils.VersionInfo; @@ -26,9 +27,14 @@ public class NetworkEventHandler { public static final String CHANNEL_NAME = VersionInfo.ModName; + public static NetworkEventHandler getInstance() { + return MagicBees.object.netHandler; + } + public enum EventType { UNKNOWN, INVENTORY_UPDATE, + FLAGS_UPDATE, ; } @@ -56,6 +62,13 @@ public class NetworkEventHandler { sendPacket(packet); } + public void sendFlagsUpdate(TileEntity entity, int[] flags) { + EventFlagsUpdate event = new EventFlagsUpdate(new ChunkCoords(entity), flags); + FMLProxyPacket packet = event.getPacket(); + + sendPacket(packet); + } + private void sendPacket(FMLProxyPacket packet) { if (FMLCommonHandler.instance().getEffectiveSide().isServer()) { channel.sendToAll(packet); @@ -85,6 +98,10 @@ public class NetworkEventHandler { EventInventoryUpdate eventData = new EventInventoryUpdate(data); eventData.process(player); } + else if (eventId == EventType.FLAGS_UPDATE.ordinal()) { + EventFlagsUpdate eventData = new EventFlagsUpdate(data); + eventData.process(player); + } else { throw new InvalidEventTypeIndexException(""); } diff --git a/src/main/java/magicbees/tileentity/ITileEntityFlags.java b/src/main/java/magicbees/tileentity/ITileEntityFlags.java new file mode 100644 index 0000000..8506fac --- /dev/null +++ b/src/main/java/magicbees/tileentity/ITileEntityFlags.java @@ -0,0 +1,6 @@ +package magicbees.tileentity; + +public interface ITileEntityFlags { + + public void setFlags(int[] flags); +} diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index 5ff04a1..d421230 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -7,6 +7,8 @@ import magicbees.main.MagicBees; import magicbees.main.utils.ChunkCoords; import magicbees.main.utils.ItemStackUtils; import magicbees.main.utils.LogHelper; +import magicbees.main.utils.net.EventFlagsUpdate; +import magicbees.main.utils.net.NetworkEventHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; @@ -33,7 +35,7 @@ import forestry.api.core.IErrorState; import forestry.api.genetics.IIndividual; import forestry.core.utils.Utils; -public class TileEntityMagicApiary extends TileEntity implements ISidedInventory, IBeeHousing { +public class TileEntityMagicApiary extends TileEntity implements ISidedInventory, IBeeHousing, ITileEntityFlags { public static final String tileEntityName = CommonProxy.DOMAIN + ".magicApiary"; private GameProfile ownerProfile; @@ -47,9 +49,11 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory private static final int SLOT_PRODUCTS_COUNT = 7; private static final int AURAPROVIDER_SEARCH_RADIUS = 6; + private static int CHARGE_TIME_MUTATION = 240; + private static int CHARGE_TIME_DEATH = 80; + private static int CHARGE_TIME_PRODUCTION = 60; private IBeekeepingLogic logic; - private boolean hasAuraProvider = false; private IMagicApiaryAuraProvider auraProvider; private ChunkCoords auraProviderPosition; private BiomeGenBase biome; @@ -57,9 +61,13 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory private int displayHealth = 0; private boolean init = false; - private static final int FLAG_MUTATIONCHARGE = 1 << 0; - private static final int FLAG_DEATHCHARGE = 1 << 1; - private static final int FLAG_PRODUCTION = 1 << 2; + private static final int OFFSET_MUTATION = 0; + private static final int OFFSET_DEATH = 1; + private static final int OFFSET_PRODUCTION = 2; + private static final int FLAG_MUTATIONCHARGE = 1 << OFFSET_MUTATION; + private static final int FLAG_DEATHCHARGE = 1 << OFFSET_DEATH; + private static final int FLAG_PRODUCTIONCHARGE = 1 << OFFSET_PRODUCTION; + private long[] chargeTimestamps = new long[3]; private int flags; private IErrorState errorState = ErrorStateRegistry.getErrorState("ok"); @@ -196,7 +204,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory mod *= ((IHiveFrame) getStackInSlot(slotIndex).getItem()).getProductionModifier(genome, mod); } } - if (this.isWorkBoosted()) { + if (this.isProductionBoosted()) { mod = mod * 2f; } return mod; @@ -506,6 +514,9 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory ChunkCoords.writeToNBT(this.auraProviderPosition, compound); compound.setInteger("flags", this.flags); + compound.setLong("timestamp0", chargeTimestamps[0]); + compound.setLong("timestamp1", chargeTimestamps[1]); + compound.setLong("timestamp2", chargeTimestamps[2]); } @Override @@ -529,6 +540,9 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory this.auraProviderPosition = ChunkCoords.readFromNBT(compound); this.flags = compound.getInteger("flags"); + this.chargeTimestamps[0] = compound.getLong("timestamp0"); + this.chargeTimestamps[1] = compound.getLong("timestamp1"); + this.chargeTimestamps[2] = compound.getLong("timestamp2"); } public float getExactTemperature() { @@ -576,7 +590,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory } public void updateServerSide() { - if (!this.hasAuraProvider) { + if (this.auraProvider == null) { findAuraProvider(); } else { @@ -618,20 +632,65 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory iCrafting.sendProgressBarUpdate(container, 1, logic.getTotalBreedingTime()); } - public boolean isWorkBoosted() { - return false; + public boolean isProductionBoosted() { + return (flags & FLAG_PRODUCTIONCHARGE) == FLAG_PRODUCTIONCHARGE; } public boolean isDeathRateBoosted() { - return false; + return (flags & FLAG_DEATHCHARGE) == FLAG_DEATHCHARGE; } public boolean isMutationBoosted() { - return false; + return (flags & FLAG_MUTATIONCHARGE) == FLAG_MUTATIONCHARGE; } private void updateAuraProvider() { + int oldFlags = flags; + if (!isMutationBoosted()) { + if (this.auraProvider.getMutationCharge()) { + flags |= FLAG_MUTATIONCHARGE; + chargeTimestamps[OFFSET_MUTATION] = worldObj.getTotalWorldTime(); + } + } + else { + if (chargeTimestamps[OFFSET_MUTATION] + CHARGE_TIME_MUTATION <= worldObj.getTotalWorldTime()) { + if (!this.auraProvider.getMutationCharge()) { + flags = flags & ~FLAG_MUTATIONCHARGE; + } + } + } + + if (!isDeathRateBoosted()) { + if (this.auraProvider.getDeathRateCharge()) { + flags |= FLAG_DEATHCHARGE; + chargeTimestamps[OFFSET_DEATH] = worldObj.getTotalWorldTime(); + } + } + else { + if (chargeTimestamps[OFFSET_DEATH] + CHARGE_TIME_DEATH <= worldObj.getTotalWorldTime()) { + if (!this.auraProvider.getDeathRateCharge()) { + flags = flags & ~FLAG_DEATHCHARGE; + } + } + } + + if (!isProductionBoosted()) { + if (this.auraProvider.getProductionCharge()) { + flags |= FLAG_PRODUCTIONCHARGE; + chargeTimestamps[OFFSET_PRODUCTION] = worldObj.getTotalWorldTime(); + } + } + else { + if (chargeTimestamps[OFFSET_PRODUCTION] + CHARGE_TIME_PRODUCTION <= worldObj.getTotalWorldTime()) { + if (!this.auraProvider.getProductionCharge()) { + flags = flags & ~FLAG_PRODUCTIONCHARGE; + } + } + } + if (oldFlags != flags) { + NetworkEventHandler.getInstance().sendFlagsUpdate(this, new int[] {flags}); + } } private static final int MAX_BLOCKS_SEARCH_PER_CHECK = (AURAPROVIDER_SEARCH_RADIUS * 2 + 1) * 2; @@ -650,10 +709,13 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory else { // Will end up here after loading from save with a valid auraProvider. if (locationHasAuraProvider(auraProviderPosition.x, auraProviderPosition.y, auraProviderPosition.z)) { - this.auraProvider = (IMagicApiaryAuraProvider)(worldObj.getTileEntity(auraProviderPosition.x, + IMagicApiaryAuraProvider provider = (IMagicApiaryAuraProvider)(worldObj.getTileEntity(auraProviderPosition.x, auraProviderPosition.y, auraProviderPosition.x)); - this.hasAuraProvider = true; + if (provider == null) { + // ... well, it WAS here... + this.auraProviderPosition = null; + } return; } } @@ -668,7 +730,6 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory if (locationHasAuraProvider(x, y, z)) { LogHelper.info("Apiary found aura provider!"); this.auraProvider = (IMagicApiaryAuraProvider)(worldObj.getTileEntity(x, y, z)); - this.hasAuraProvider = true; saveAuraProviderPosition(x, y, z); return; } @@ -711,4 +772,11 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory } return false; } + + @Override + public void setFlags(int[] flagArray) { + if (flagArray.length == 1) { + this.flags = flagArray[0]; + } + } } diff --git a/src/main/resources/assets/magicbees/textures/gui/apiary.png b/src/main/resources/assets/magicbees/textures/gui/apiary.png index 6dae19a06c2a4cd560e9723c82b3f247bb281ad2..720edde3565ee2b76eb75c2efad268b32cd8efa7 100644 GIT binary patch delta 3858 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 Bkb?jK delta 4264 zcmbW4c{J2-`^WFk%wPntzLpT#BIKJak*%!J zI#hO|kcyJVRzz7tJo7xi=lT8q`2F|X=lbh?uIpU)Iq&!DKIfj2>rhNKhq<}9c(}Q7 zSS%keuK*5*=i?LL=NH7|h4}di0s_K#yojKnFo7USAP|Lx#l*zKMMOxVqT7kY?c(Aj z5^4MP?Gh3aJH*8$NhHY~J17*20vAx>#ZVcP?hwu%LS~1A`iK%9SurN}q-9-- zEsae5GutNAalPrObfvQoe7+Z^TpM%j7g!0WSh_TeCIx;DL8;zUnNS?3^%`vo1$!;e zdSCCG>G<&e#-oLGc7fA=f3Jz~$=MllmhE^@jhBO6%mg{PbNt6+c<#^2^NnB8VwH{D z;b-Y~jV+686I1WjV=@9L&}A`KPOivGd%W^#<{*M_ z+LJX~Q5i(054`M|;rh#1H1A6n*9i?!&yPP-4vOmWrln;+8Yf3W47N5JCo3P}^c0!m ztf}6X?t8x+!u%ASVHq4qXAY(UEb@3RV!G(Me%SJRmHQY$i*yVXvK2>;1~hJM3L0FV z$Wo~U|EuPldA86~d^=*ksdFdK|EMR@GX+-AHGq z>d{Y6zx5BCifT_ZUo^VaA{8tE@CfTT;mX9)36c{JhCddv`2kx@goeZWjuBtJdf3s~j~WO!n(+gRPn4x%=VG##JdSrpLSz{^nZm z=d@BUKHVel+h}kAZF&?`M9>ivhq}Pwo!^XjmT@3 zUln*1{X4ph-k^DZStk?ucpa3E9K=G6r}ZV*D;0%wxT5JRN@c-Jt7lyTOXrv5!$kJS znMi+n``#qti?UFFK}u=OFrXgS_HPacBa8Ak7_7zE#uoaa(;Jrwc9oC55nMtOnlLGu(&!@Z(IiK2GW)DP#RS0mls zOeKCt%Y*~RXapwEow~TEXK{$573#9#F^IydKXw-&LPK=|0UB-oU_M|X!ID8mh529> zS6VBeDKs$3^8<9;hr9ReH?!?=KsI%hW6b?Bb;SQ;I+%*gxkts+Ml(s!RafD+=%IRF zF&C-X{KS)>_tV?rCz!zIIOLd)Hir7y14(ygh#d-nQW(Hvb%TB?O z(a?i&B{1x^oq*1eq#xr?gj2DG!so6^v_kWlaq|vZILz~V01TU$Y$|6Ekf}t%nDw*U z9gqIA0()@r4GuD^fAOVYcWdqSU_f=wOB zzNUvYqv*RP-SChcDDMao0AcgH!Oa@tegrL%6WO$<{6oE)I^#$L^Hp1uI7$nwdP1P@ z`57|^Q{#C4~PsTAPGa!((JKzM<7_NzVM z0)9=%jSG~~0CkLVP!#57xD8rkfEQi|Q{o7*lsVCCInb`1a12BTVWSFqKgy`u(K0+6 zxshjF{RiTfqm9B(SSxuG*TG`9#W`%UgZx!-+=vfqbk*R7syI}_Y%7=Rmkc-~7_yn( zZ{b7C0sZ9KNOH#Mm(SnYfWor)+K`rH=|XFZnjxONOP}EreW#8p^yD4@jcLIsZ7(%n z5N==y?32w{N}xs8UISQe&ZLE(v6>BE8hC1RW^SEblgc{}N_Lj@YP6CITtxX;Kc2*% zE7nEb-Tc|{^}60-ugvx5zgCn|2rO@+&Fd~6h7QlVrmQAdTp+xrB+(tP-jh8ikz3Joj`3xKo_*L*-#L-%`Wy2FRx`nQe|`i0 zZX=0T0C}j}(FN)9anro8>K$(uq4m42m;B+=pP%2F|BOTGoxBUg!TcUGC*3JDJ$SI1 zh67Te3vnZlDX@(mctf+TW%7fDoPulQMTnkTr+f$vxSGD--+D{fB7sE}qZTK=6kht5 zZsz)eWLfojusrkW>$R<6EGwZ|{e+ZJuyspd7`WBVJb-Uw=4i?qJ2`_;y>i$kohAvM zr~(n9w5@`t2VD@U(LLP*@gPr0sZ}%qBq<4ReNo}%EIRN{o$>>X=J({?;|S!vcb};& zro1B`?A^OO_jyhnr2qo=m~jEt4-Z`v);9ve%SWiVL7+EvGtc20_}tJBl=;Bggleny(_Z_wK|t#7O|2!m!!XTi3#R; z^iU1e7d1Y0gMVGGiHx!UjyE`M%WcN+N{sD&9uk22*G&}_*^CK*=ITb-C%RIm$G+Rz80`<)={S+ zju~11hfoo!E!br$dCo)+tR3jnN{|Gn&ZX!6rH}b1HHX46ZR%J!l1HwCpSnft)sDaG zv) zaM)Vev>;iA#pUKl+#NBCcAG?oyAyOy7tlmm32j>$L~UtSKkanE5H~}SXGTp_Pb9;$ z&usM7w4lp0rn@_TkA((s)TN&KvM*z-G}vhyYtf;n&VYj4;beM~!?1l+BycU<0GaM1aQea7)Ofe_045K#nC*7AzwH1JZehjH%xA z*|dTra&~0cK6!nR(>mezH#yql+!{fU2)Qi`k^4Vtkf71c*Uo{OKyi&-as^DIyhBOs zJ;)e_z?f-g$^bbqO8jdW0;bzkf!hLGu}vJ6%@j1g!6BrbnXG{cokMUCqYG|l%7$a- z(Rsqa@fLaaAqr{(lw8G*{!RAejRm3xKp6rnY(*QciT#J|0N~8l4=qUERR*lX7#m4x zb5qyaO#-8KFnt97^y8B!F}p%Si)& zpCVi-mtDu9L%x$yj$l#**lq)&729r<5qViVfEIgW4clwU0|^b}c6Ui{sM5ix7+y{A zdB_KND#5(U`}h$_$0)S8x<1Nq*S0>46u+fjwH9v#rg~EQCHA!4Pq#2;cfRG&6Qg)8 zVOM8-LOhpx{f}fvew<7^SB&$*rHGTAJ12@fT>}r(5P^k>-BaI_XHU;gTUpDw`#!BT zNlkNyM&Ddi7EbZU=R?Ih$<5srn_JBC2Ai zRekkp$yFy`TxEdCfv)VM$BcKMxgg?7cyl!3`<-#*k<=YR@{W?*A8QrKaicaaQ#BRO zRB8%u(drJ#%fEGRg@OqL67i9|8`sKx7m-?XD;tU10{O6p(BT^tE(SJ2=0jM2s%q9P5Y z{&S(Fc&GNW9b--L$t7@IZkCgtBSE;XUQ;u{g^;RZ6l7{XPcI?FG{-YUr`&8)T8WL) zvJO$~$g3DC1$xgL&y5_{Y0&$VP(q_|dMmMU95?DGSTQo$&W1-~yA$~Lbl=-a=^P&H zo0W$AoF3q*^8DlwJL$@uUDekt zH~eXG0sGw)b1kl0{peNNm#Qk$xg1wjYYx~m^5n0W8(E$U6Wu6>sJ3=ykc-WLxUfs4 zUi~$%H`36xLY~1U(h<|K9;Am8GxiiR%`Pd?%+svF8t6XiIUi)(PwLHbin>kaIQLF@ z>}9bHO#Gr?HeMQ7uuDSroZv2s%-fXesy4e5jmk8K=n+6SEu)WDnWB=*ntuSQT=iqA zGpa#$j+MBC2n@UQfs1HHS+lhLx!h{b$d$6@eHW4hip>sSDkk=N9W2`QRl#eXGv j{@0WLfAE(s;_?Hwy4nyC@%F4O;GBb|mL`=(Zjt{0xauq~ From 6ea6f1e017f6cad7f12f76e996d37489ebc99fb7 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Sat, 21 Mar 2015 21:26:51 -0700 Subject: [PATCH 10/17] Adding temporary crafting recipes for Magic Apiary & vis aura converter. --- src/main/java/magicbees/main/Config.java | 1 + .../magicbees/main/utils/CraftingManager.java | 59 +++++-------------- .../main/utils/compat/ForestryHelper.java | 6 ++ .../tileentity/TileEntityMagicApiary.java | 20 +++++-- 4 files changed, 37 insertions(+), 49 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index cb7cefd..11e5bce 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -136,6 +136,7 @@ public class Config //----- Forestry Blocks ------------------------------------ public static Block fHiveBlock; public static Block fAlvearyBlock; + public static Block fApicultureBlock; //----- Forestry Items ------------------------------------- public static Item fBeeComb; public static Item fHoneydew; diff --git a/src/main/java/magicbees/main/utils/CraftingManager.java b/src/main/java/magicbees/main/utils/CraftingManager.java index 50e003a..f354b99 100644 --- a/src/main/java/magicbees/main/utils/CraftingManager.java +++ b/src/main/java/magicbees/main/utils/CraftingManager.java @@ -351,38 +351,16 @@ public class CraftingManager 'S', Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY) })); } - + + // TODO: Finalize recipe. + output = new ItemStack(Config.magicApiary); + GameRegistry.addShapelessRecipe(output, new Object[] { + Config.pollen.getStackForType(PollenType.UNUSUAL, 2), + new ItemStack(Config.fApicultureBlock, 1, ForestryHelper.ApicultureBlock.APIARY.ordinal()) + }); if (ThaumcraftHelper.isActive()) { - // Slabs - /*for (int i = 0; i < PlankType.values().length; ++i) - { - input = new ItemStack(Config.planksWood, 1, i); - output = new ItemStack(Config.slabWoodHalf, 6, i); - GameRegistry.addRecipe(output, new Object[] { - "PPP", - 'P', input - }); - }*/ - - // Essentia bottles - /*output = new ItemStack(Config.tcEssentiaBottle); - output.stackSize = 8; - GameRegistry.addRecipe(output, new Object[] { - " C ", "GPG", "PGP", - 'G', Config.wax, - 'C', Item.clay, - 'P', Block.thinGlass - }); - - output = new ItemStack(Config.tcEssentiaBottle); - output.stackSize = 4; - GameRegistry.addRecipe(output, new Object[] { - " W ", "W W", " W ", - 'W', Config.wax - });*/ - input = Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT); output = new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.KNOWLEDGE_FRAGMENT.ordinal()); GameRegistry.addShapelessRecipe(output, new Object[] { @@ -400,20 +378,15 @@ public class CraftingManager 'C', Blocks.chest }); } - - // "bottling" Crystal aspects. - /*for (EnumTag tag : EnumTag.values()) - { - if (tag != EnumTag.UNKNOWN) - { - output = new ItemStack(Config.tcEssentiaBottle, 1, tag.id + 1); - GameRegistry.addRecipe(output, new Object[] { - "ccc", "cxc", "ccc", - 'c', new ItemStack(Config.solidFlux, 1, tag.id), - 'x', Config.tcEssentiaBottle - }); - } - }*/ + + // TODO: Finalize recipe. + output = new ItemStack(Config.visAuraProvider); + GameRegistry.addRecipe(output, new Object[] { + " p ", "igi", "iii", + 'p', Config.pollen.getStackForType(PollenType.UNUSUAL), + 'i', Items.iron_ingot, + 'g', Blocks.glass + }); } if (ArsMagicaHelper.isActive()) diff --git a/src/main/java/magicbees/main/utils/compat/ForestryHelper.java b/src/main/java/magicbees/main/utils/compat/ForestryHelper.java index 47c1ea3..02023d8 100644 --- a/src/main/java/magicbees/main/utils/compat/ForestryHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ForestryHelper.java @@ -93,6 +93,11 @@ public class ForestryHelper APATITE, LAPIS,; } + + public enum ApicultureBlock { + APIARY, + ; + } public static final String Name = "Forestry"; @@ -138,6 +143,7 @@ public class ForestryHelper Class c = Class.forName("forestry.core.config.ForestryBlock"); Config.fAlvearyBlock = BlockInterface.getBlock("alveary"); Config.fHiveBlock = BlockInterface.getBlock("beehives"); + Config.fApicultureBlock = BlockInterface.getBlock("apiculture"); } catch (Exception e) { diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index d421230..44ffc5c 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -49,9 +49,9 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory private static final int SLOT_PRODUCTS_COUNT = 7; private static final int AURAPROVIDER_SEARCH_RADIUS = 6; - private static int CHARGE_TIME_MUTATION = 240; - private static int CHARGE_TIME_DEATH = 80; - private static int CHARGE_TIME_PRODUCTION = 60; + private static int CHARGE_TIME_MUTATION = 1200; + private static int CHARGE_TIME_DEATH = 400; + private static int CHARGE_TIME_PRODUCTION = 300; private IBeekeepingLogic logic; private IMagicApiaryAuraProvider auraProvider; @@ -645,6 +645,10 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory } private void updateAuraProvider() { + if (worldObj.getTotalWorldTime() % 15 == 0 && locationHasAuraProvider(auraProviderPosition)) { + + } + int oldFlags = flags; if (!isMutationBoosted()) { if (this.auraProvider.getMutationCharge()) { @@ -692,8 +696,8 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory NetworkEventHandler.getInstance().sendFlagsUpdate(this, new int[] {flags}); } } - - private static final int MAX_BLOCKS_SEARCH_PER_CHECK = (AURAPROVIDER_SEARCH_RADIUS * 2 + 1) * 2; + + private static final int MAX_BLOCKS_SEARCH_PER_CHECK = (AURAPROVIDER_SEARCH_RADIUS * 2 + 1) * 2; private void findAuraProvider() { if (worldObj.getTotalWorldTime() % 10 != 0) { return; @@ -708,7 +712,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory } else { // Will end up here after loading from save with a valid auraProvider. - if (locationHasAuraProvider(auraProviderPosition.x, auraProviderPosition.y, auraProviderPosition.z)) { + if (locationHasAuraProvider(auraProviderPosition)) { IMagicApiaryAuraProvider provider = (IMagicApiaryAuraProvider)(worldObj.getTileEntity(auraProviderPosition.x, auraProviderPosition.y, auraProviderPosition.x)); @@ -765,6 +769,10 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory auraProviderPosition = new ChunkCoords(auraProviderPosition.dimension, x, y, z); } + private boolean locationHasAuraProvider(ChunkCoords coords) { + return locationHasAuraProvider(coords.x, coords.y, coords.z); + } + private boolean locationHasAuraProvider(int x, int y, int z) { TileEntity entity = worldObj.getTileEntity(x, y, z); if (entity != null && entity instanceof IMagicApiaryAuraProvider) { From dc4cd3331ce001cb8064f666a9cae894562cc190 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Tue, 24 Mar 2015 16:18:10 -0700 Subject: [PATCH 11/17] Removing unnessecary try/catch from thaumium tools; moving to item init. --- src/main/java/magicbees/main/Config.java | 27 ++++++------------------ 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 11e5bce..9f8e059 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -269,8 +269,7 @@ public class Config setupThaumcraftItems(); setupFrames(); setupJellyBaby(); - voidCapsule = new ItemCapsule(CapsuleType.VOID, capsuleStackSizeMax); - setupThaumcraftTools(); + voidCapsule = new ItemCapsule(CapsuleType.VOID, capsuleStackSizeMax); moonDial = new ItemMoonDial(); setupNuggets(); @@ -518,25 +517,11 @@ public class Config if (ThaumcraftHelper.isActive()) { // Items - } - } - - private void setupThaumcraftTools() { - if (ThaumcraftHelper.isActive()) - { - try - { - thaumiumScoop = new ItemThaumiumScoop(); - GameRegistry.registerItem(thaumiumScoop, thaumiumScoop.getUnlocalizedName(), CommonProxy.DOMAIN); - - thaumiumGrafter = new ItemThaumiumGrafter(); - GameRegistry.registerItem(thaumiumGrafter, thaumiumGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); - } - catch (Exception e) - { - LogHelper.warn("Couldn't register Thaumium tools!"); - LogHelper.debug(e); - } + thaumiumScoop = new ItemThaumiumScoop(); + GameRegistry.registerItem(thaumiumScoop, thaumiumScoop.getUnlocalizedName(), CommonProxy.DOMAIN); + + thaumiumGrafter = new ItemThaumiumGrafter(); + GameRegistry.registerItem(thaumiumGrafter, thaumiumGrafter.getUnlocalizedName(), CommonProxy.DOMAIN); } } From 07624a3a4c0b3d1079ba0c0363865ef56ddff3da Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Thu, 26 Mar 2015 13:05:15 -0700 Subject: [PATCH 12/17] Change HiveType to check spawn location to see if occupant bees can actually work in the biome, and not spawn if they cannot. --- src/main/java/magicbees/bees/BeeSpecies.java | 26 +++++++++++-- .../java/magicbees/bees/HiveDescription.java | 4 +- .../java/magicbees/block/types/HiveType.java | 39 ++++++++++--------- .../main/utils/compat/ForestryHelper.java | 8 +++- 4 files changed, 52 insertions(+), 25 deletions(-) diff --git a/src/main/java/magicbees/bees/BeeSpecies.java b/src/main/java/magicbees/bees/BeeSpecies.java index b566790..8d00d42 100644 --- a/src/main/java/magicbees/bees/BeeSpecies.java +++ b/src/main/java/magicbees/bees/BeeSpecies.java @@ -6,9 +6,6 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import com.mojang.authlib.GameProfile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import magicbees.item.types.CombType; import magicbees.item.types.DropType; import magicbees.item.types.NuggetType; @@ -32,6 +29,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; + +import com.mojang.authlib.GameProfile; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; @@ -42,7 +44,9 @@ import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IIconProvider; import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; +import forestry.api.genetics.IAlleleTolerance; import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; import forestry.api.genetics.IMutation; @@ -1250,7 +1254,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider int highest = 0; excludeSpecies.add(species); - for (IMutation mutation : getRoot().getPaths(species, EnumBeeChromosome.SPECIES.ordinal())) + for (IMutation mutation : getRoot().getPaths(species, EnumBeeChromosome.SPECIES)) { if (!excludeSpecies.contains(mutation.getAllele0())) { @@ -1417,6 +1421,20 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider return value; } + + public boolean canWorkInTemperature(EnumTemperature temp) { + IAlleleTolerance tolerance = (IAlleleTolerance)genomeTemplate[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()]; + return AlleleManager.climateHelper.isWithinLimits(temp, EnumHumidity.NORMAL, + temperature, tolerance.getValue(), + EnumHumidity.NORMAL, EnumTolerance.NONE); + } + + public boolean canWorkInHumidity(EnumHumidity humid) { + IAlleleTolerance tolerance = (IAlleleTolerance)genomeTemplate[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()]; + return AlleleManager.climateHelper.isWithinLimits(EnumTemperature.NORMAL, humid, + EnumTemperature.NORMAL, EnumTolerance.NONE, + humidity, tolerance.getValue()); + } /// --------- Unused Functions --------------------------------------------- diff --git a/src/main/java/magicbees/bees/HiveDescription.java b/src/main/java/magicbees/bees/HiveDescription.java index 2252131..4d6d85c 100644 --- a/src/main/java/magicbees/bees/HiveDescription.java +++ b/src/main/java/magicbees/bees/HiveDescription.java @@ -185,13 +185,13 @@ public enum HiveDescription implements IHiveDescription { @Override public boolean isGoodHumidity(EnumHumidity humidity) { - return true; + return hiveType.getOccupant().canWorkInHumidity(humidity); } @Override public boolean isGoodTemperature(EnumTemperature temperature) { - return true; + return hiveType.getOccupant().canWorkInTemperature(temperature); } @Override diff --git a/src/main/java/magicbees/block/types/HiveType.java b/src/main/java/magicbees/block/types/HiveType.java index 584d2a3..c9eea00 100644 --- a/src/main/java/magicbees/block/types/HiveType.java +++ b/src/main/java/magicbees/block/types/HiveType.java @@ -2,17 +2,6 @@ package magicbees.block.types; import java.util.ArrayList; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import forestry.api.apiculture.IHiveDrop; - import magicbees.bees.BeeGenomeManager; import magicbees.bees.BeeSpecies; import magicbees.bees.HiveDrop; @@ -20,20 +9,29 @@ import magicbees.item.types.CombType; import magicbees.main.CommonProxy; import magicbees.main.Config; import magicbees.main.utils.compat.ForestryHelper; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import forestry.api.apiculture.IHiveDrop; public enum HiveType { - CURIOUS("curious", 12, true), - UNUSUAL("unusual", 12, true), - RESONANT("resonant", 12, true), - DEEP("deep", 4, false), - INFERNAL("infernal", 15, false), - OBLIVION("oblivion", 7, false), + CURIOUS("curious", BeeSpecies.MYSTICAL, 12, true), + UNUSUAL("unusual", BeeSpecies.UNUSUAL, 12, true), + RESONANT("resonant", BeeSpecies.SORCEROUS, 12, true), + DEEP("deep", BeeSpecies.ATTUNED, 4, false), + INFERNAL("infernal", BeeSpecies.INFERNAL, 15, false), + OBLIVION("oblivion", BeeSpecies.OBLIVION, 7, false), ; private static String[] nameList; private String name; + private BeeSpecies occupant; public boolean show; private int lightLevel; private ArrayList drops; @@ -85,9 +83,10 @@ public enum HiveType OBLIVION.drops.add(new HiveDrop(ForestryHelper.getTemplateForestryForSpecies("Steadfast"), combs, 9)); } - private HiveType(String hiveName, int light, boolean visible) + private HiveType(String hiveName, BeeSpecies occupant, int light, boolean visible) { this.name = hiveName; + this.occupant = occupant; this.lightLevel = light; this.show = visible; this.drops = new ArrayList(); @@ -173,6 +172,10 @@ public enum HiveType return (nameList == null) ? nameList = generateNames() : nameList; } + public BeeSpecies getOccupant() { + return this.occupant; + } + private static String[] generateNames() { String[] names = new String[values().length]; diff --git a/src/main/java/magicbees/main/utils/compat/ForestryHelper.java b/src/main/java/magicbees/main/utils/compat/ForestryHelper.java index 02023d8..742c17f 100644 --- a/src/main/java/magicbees/main/utils/compat/ForestryHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ForestryHelper.java @@ -9,11 +9,12 @@ import magicbees.main.Config; import magicbees.main.utils.BlockInterface; import magicbees.main.utils.ItemInterface; import magicbees.main.utils.VersionInfo; - import forestry.api.apiculture.hives.HiveManager; import forestry.api.apiculture.hives.IHiveRegistry; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; public class ForestryHelper @@ -174,4 +175,9 @@ public class ForestryHelper { return EnumHumidity.getFromValue(rawHumidity); } + + public static boolean isHumidityWithinTolerance(EnumHumidity humid, EnumHumidity beeHumidityBase, EnumTolerance value) { + // TODO Auto-generated method stub + return false; + } } From a5fed5c9b7706c1891278131014129a84623a435 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Thu, 26 Mar 2015 13:57:29 -0700 Subject: [PATCH 13/17] Change Apiary to query chunks for IAuraProvider directly without going through the world object. --- .../tileentity/TileEntityMagicApiary.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index 44ffc5c..9e89cae 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -7,7 +7,6 @@ import magicbees.main.MagicBees; import magicbees.main.utils.ChunkCoords; import magicbees.main.utils.ItemStackUtils; import magicbees.main.utils.LogHelper; -import magicbees.main.utils.net.EventFlagsUpdate; import magicbees.main.utils.net.NetworkEventHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -17,8 +16,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.ChunkPosition; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.util.Constants; import com.mojang.authlib.GameProfile; @@ -697,7 +698,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory } } - private static final int MAX_BLOCKS_SEARCH_PER_CHECK = (AURAPROVIDER_SEARCH_RADIUS * 2 + 1) * 2; + private static int MAX_BLOCKS_SEARCH_PER_CHECK = (AURAPROVIDER_SEARCH_RADIUS * 2 + 1) * 12; private void findAuraProvider() { if (worldObj.getTotalWorldTime() % 10 != 0) { return; @@ -774,7 +775,17 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory } private boolean locationHasAuraProvider(int x, int y, int z) { - TileEntity entity = worldObj.getTileEntity(x, y, z); + Chunk chunk = worldObj.getChunkFromBlockCoords(x, z); + x %= 16; + z %= 16; + if (x < 0) { + x += 16; + } + if (z < 0) { + z += 16; + } + ChunkPosition cPos = new ChunkPosition(x, y, z); + TileEntity entity = (TileEntity)chunk.chunkTileEntityMap.get(cPos); if (entity != null && entity instanceof IMagicApiaryAuraProvider) { return true; } From 52798c8175f9554652ee2c3866ba8f6a44c0726c Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Thu, 26 Mar 2015 22:19:40 -0700 Subject: [PATCH 14/17] Vis aura provider rendering! Rename EfectJarRenderer to RendererEffectJar. --- .../magicbees/block/BlockVisAuraProvider.java | 11 +- .../client/model/ModelEffectJar.java | 4 +- .../client/model/ModelVisAuraProvider.java | 40 ++++ ...arRenderer.java => RendererEffectJar.java} | 4 +- .../render/RendererVisAuraProvider.java | 50 +++++ src/main/java/magicbees/main/ClientProxy.java | 18 +- src/main/java/magicbees/main/CommonProxy.java | 1 + .../tileentity/TileEntityMagicApiary.java | 4 +- .../tileentity/TileEntityVisAuraProvider.java | 2 +- .../magicbees/model/visAuraConverter.obj | 204 ++++++++++++++++++ .../magicbees/model/visAuraProvider.png | Bin 0 -> 2205 bytes 11 files changed, 323 insertions(+), 15 deletions(-) create mode 100644 src/main/java/magicbees/client/model/ModelVisAuraProvider.java rename src/main/java/magicbees/client/render/{EffectJarRenderer.java => RendererEffectJar.java} (92%) create mode 100644 src/main/java/magicbees/client/render/RendererVisAuraProvider.java create mode 100644 src/main/resources/assets/magicbees/model/visAuraConverter.obj create mode 100644 src/main/resources/assets/magicbees/model/visAuraProvider.png diff --git a/src/main/java/magicbees/block/BlockVisAuraProvider.java b/src/main/java/magicbees/block/BlockVisAuraProvider.java index 37edea4..bdb0a4e 100644 --- a/src/main/java/magicbees/block/BlockVisAuraProvider.java +++ b/src/main/java/magicbees/block/BlockVisAuraProvider.java @@ -1,5 +1,6 @@ package magicbees.block; +import magicbees.main.CommonProxy; import magicbees.main.utils.TabMagicBees; import magicbees.tileentity.TileEntityVisAuraProvider; import net.minecraft.block.BlockContainer; @@ -19,7 +20,7 @@ public class BlockVisAuraProvider extends BlockContainer { this.setBlockName("visAuraProvider"); this.setHardness(0.5f); this.setResistance(1.5f); - this.setBlockBounds(0.25f, 0f, 0.25f, 0.75f, 0.5f, 0.75f); + this.setLightLevel(8); } @Override @@ -33,10 +34,16 @@ public class BlockVisAuraProvider extends BlockContainer { return new TileEntityVisAuraProvider(); } + @Override + public int getRenderType() + { + return CommonProxy.RenderIdVisAuraProvider; + } + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - this.blockIcon = Blocks.glass.getIcon(0, 0); + this.blockIcon = Blocks.planks.getIcon(0, 5); } } diff --git a/src/main/java/magicbees/client/model/ModelEffectJar.java b/src/main/java/magicbees/client/model/ModelEffectJar.java index e33ceb2..0db2696 100644 --- a/src/main/java/magicbees/client/model/ModelEffectJar.java +++ b/src/main/java/magicbees/client/model/ModelEffectJar.java @@ -11,7 +11,7 @@ import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class ModelEffectJar { - public static final String objFile = CommonProxy.MODEL_PATH + "effectJar.obj"; + public static final ResourceLocation objFile = new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.MODEL + "effectJar.obj"); public static final ResourceLocation textureLocation = new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.MODEL + "jarTexture.png"); public static final ModelEffectJar model = new ModelEffectJar(); @@ -20,7 +20,7 @@ public class ModelEffectJar public ModelEffectJar() { - this.effectJarObj = AdvancedModelLoader.loadModel(new ResourceLocation("magicbees", "model/effectJar.obj")); + this.effectJarObj = AdvancedModelLoader.loadModel(objFile); } public void render() diff --git a/src/main/java/magicbees/client/model/ModelVisAuraProvider.java b/src/main/java/magicbees/client/model/ModelVisAuraProvider.java new file mode 100644 index 0000000..a64a0f7 --- /dev/null +++ b/src/main/java/magicbees/client/model/ModelVisAuraProvider.java @@ -0,0 +1,40 @@ +package magicbees.client.model; + +import org.lwjgl.opengl.GL11; + +import magicbees.main.CommonProxy; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.AdvancedModelLoader; +import net.minecraftforge.client.model.IModelCustom; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class ModelVisAuraProvider { + public static final ResourceLocation objFile = new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.MODEL + "visAuraConverter.obj"); + public static final ResourceLocation textureLocation = new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.MODEL + "visAuraProvider.png"); + + public static final ModelVisAuraProvider model = new ModelVisAuraProvider(); + + private IModelCustom visAuraProviderObj; + + public ModelVisAuraProvider() { + this.visAuraProviderObj = AdvancedModelLoader.loadModel(objFile); + } + + public void render(long tick) { + GL11.glPushMatrix(); + GL11.glRotated(Math.sin(tick * Math.PI * 2 / 80) * 0.7, 0, 1, 0); + GL11.glRotated(Math.sin((tick + 25) * Math.PI * 2 / 150) * 0.75, 0.5, 0, 0.5); + GL11.glTranslated(Math.sin(tick * Math.PI * 2 / 1000) * 0.025, 0, Math.sin((tick + 30) * Math.PI * 2 / 650) * 0.03); + float red = (float)(Math.sin(tick * Math.PI * 2 / 130) * 0.2 + 0.8); + float green = (float)(Math.cos((tick + 2) * Math.PI * 2 / 140) * 0.2 + 0.8); + float blue = (float)(Math.sin((tick + 5) * Math.PI * 2 / 99) * 0.2 + 0.8); + GL11.glColor3f(red, green, blue); + this.visAuraProviderObj.renderPart("centre"); + GL11.glPopMatrix(); + + GL11.glColor3f(1f, 1f, 1f); + this.visAuraProviderObj.renderPart("frame"); + } +} diff --git a/src/main/java/magicbees/client/render/EffectJarRenderer.java b/src/main/java/magicbees/client/render/RendererEffectJar.java similarity index 92% rename from src/main/java/magicbees/client/render/EffectJarRenderer.java rename to src/main/java/magicbees/client/render/RendererEffectJar.java index 79ad4bf..c28b24f 100644 --- a/src/main/java/magicbees/client/render/EffectJarRenderer.java +++ b/src/main/java/magicbees/client/render/RendererEffectJar.java @@ -9,9 +9,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -public class EffectJarRenderer extends TileEntitySpecialRenderer implements IItemRenderer +public class RendererEffectJar extends TileEntitySpecialRenderer implements IItemRenderer { - public static EffectJarRenderer instance = new EffectJarRenderer(); + public static RendererEffectJar instance = new RendererEffectJar(); @Override public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float tick) diff --git a/src/main/java/magicbees/client/render/RendererVisAuraProvider.java b/src/main/java/magicbees/client/render/RendererVisAuraProvider.java new file mode 100644 index 0000000..75353e6 --- /dev/null +++ b/src/main/java/magicbees/client/render/RendererVisAuraProvider.java @@ -0,0 +1,50 @@ +package magicbees.client.render; + +import magicbees.client.model.ModelVisAuraProvider; +import magicbees.tileentity.TileEntityVisAuraProvider; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.client.IItemRenderer; + +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.client.FMLClientHandler; + +public class RendererVisAuraProvider extends TileEntitySpecialRenderer implements IItemRenderer { + public static RendererVisAuraProvider instance = new RendererVisAuraProvider(); + + @Override + public void renderTileEntityAt(TileEntity entity, double x, double y, double z, float tick) { + if (entity instanceof TileEntityVisAuraProvider) { + this.doRender(x, y, z, 1f, entity.getWorldObj().getTotalWorldTime()); + } + } + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + doRender(0, 0, 0, 1f, 0); + } + + private void doRender(double x, double y, double z, float scale, long tick) { + GL11.glPushMatrix(); + GL11.glScaled(scale, scale, scale); + GL11.glTranslated(x, y, z); + + FMLClientHandler.instance().getClient().renderEngine.bindTexture(ModelVisAuraProvider.textureLocation); + ModelVisAuraProvider.model.render(tick); + + GL11.glPopMatrix(); + } + +} diff --git a/src/main/java/magicbees/main/ClientProxy.java b/src/main/java/magicbees/main/ClientProxy.java index 911c554..f8f9c2e 100644 --- a/src/main/java/magicbees/main/ClientProxy.java +++ b/src/main/java/magicbees/main/ClientProxy.java @@ -1,13 +1,15 @@ package magicbees.main; +import magicbees.client.render.RendererEffectJar; +import magicbees.client.render.RendererVisAuraProvider; +import magicbees.tileentity.TileEntityEffectJar; +import magicbees.tileentity.TileEntityVisAuraProvider; +import net.minecraft.item.Item; +import net.minecraftforge.client.MinecraftForgeClient; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import magicbees.client.render.EffectJarRenderer; -import magicbees.tileentity.TileEntityEffectJar; -import net.minecraft.item.Item; -import net.minecraftforge.client.MinecraftForgeClient; @SideOnly(Side.CLIENT) public class ClientProxy extends CommonProxy @@ -18,7 +20,11 @@ public class ClientProxy extends CommonProxy super.registerRenderers(); RenderIdEffectJar = RenderingRegistry.getNextAvailableRenderId(); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(Config.effectJar), EffectJarRenderer.instance); - ClientRegistry.bindTileEntitySpecialRenderer(TileEntityEffectJar.class, EffectJarRenderer.instance); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(Config.effectJar), RendererEffectJar.instance); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityEffectJar.class, RendererEffectJar.instance); + + RenderIdVisAuraProvider = RenderingRegistry.getNextAvailableRenderId(); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(Config.visAuraProvider), RendererVisAuraProvider.instance); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityVisAuraProvider.class, RendererVisAuraProvider.instance); } } diff --git a/src/main/java/magicbees/main/CommonProxy.java b/src/main/java/magicbees/main/CommonProxy.java index 1d8581b..95bd6ab 100644 --- a/src/main/java/magicbees/main/CommonProxy.java +++ b/src/main/java/magicbees/main/CommonProxy.java @@ -30,6 +30,7 @@ public class CommonProxy public static final String GUI_PATH = TEXTURE_PATH + "gui/"; public static int RenderIdEffectJar; + public static int RenderIdVisAuraProvider; public void registerRenderers() { } diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index 9e89cae..875c3d2 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -50,7 +50,8 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory private static final int SLOT_PRODUCTS_COUNT = 7; private static final int AURAPROVIDER_SEARCH_RADIUS = 6; - private static int CHARGE_TIME_MUTATION = 1200; + private static int MAX_BLOCKS_SEARCH_PER_CHECK = (AURAPROVIDER_SEARCH_RADIUS * 2 + 1) * 8; + private static int CHARGE_TIME_MUTATION = 850; private static int CHARGE_TIME_DEATH = 400; private static int CHARGE_TIME_PRODUCTION = 300; @@ -698,7 +699,6 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory } } - private static int MAX_BLOCKS_SEARCH_PER_CHECK = (AURAPROVIDER_SEARCH_RADIUS * 2 + 1) * 12; private void findAuraProvider() { if (worldObj.getTotalWorldTime() % 10 != 0) { return; diff --git a/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java b/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java index 7a63524..028cf10 100644 --- a/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java +++ b/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java @@ -16,7 +16,7 @@ public class TileEntityVisAuraProvider extends TileEntity implements IMagicApiar int currentDeathCharges; int currentProductionCharges; - private static final int VIS_PER_CHARGE = 10; + private static final int VIS_PER_CHARGE = 8; private static Aspect ASPECT_MUTATION = Aspect.WATER; private static Aspect ASPECT_DEATH = Aspect.ENTROPY; private static Aspect ASPECT_PRODUCTION = Aspect.AIR; diff --git a/src/main/resources/assets/magicbees/model/visAuraConverter.obj b/src/main/resources/assets/magicbees/model/visAuraConverter.obj new file mode 100644 index 0000000..3fc3271 --- /dev/null +++ b/src/main/resources/assets/magicbees/model/visAuraConverter.obj @@ -0,0 +1,204 @@ +# Blender v2.61 (sub 0) OBJ File: 'vis aura converter.blend' +# www.blender.org +o centre +v 0.054523 0.500000 0.504520 +v 0.500000 0.500000 0.949997 +v 0.500000 0.500000 0.059043 +v 0.945477 0.500000 0.504520 +v 0.500000 0.905000 0.504520 +v 0.500000 0.095000 0.504520 +vt 0.500000 0.625000 +vt 1.000000 0.312500 +vt 0.926953 0.782642 +vt 0.693306 0.646921 +vt 0.979384 0.489453 +vt 1.000000 1.000000 +vt 1.000000 0.000000 +vt 0.769790 0.501479 +vt 0.468750 0.000000 +vt 0.000000 0.250000 +vt 0.000000 0.000000 +vt 0.255720 0.132285 +vt 0.437500 0.468750 +vt 0.000000 0.625000 +vt 0.556041 0.266028 +s off +f 6/1 1/2 3/3 +f 3/4 1/5 5/6 +f 5/7 1/8 2/9 +f 2/9 1/2 6/1 +f 4/10 5/11 2/12 +f 6/1 4/10 2/9 +f 3/13 5/14 4/10 +f 6/1 3/15 4/10 +o frame +v 0.250000 0.000000 1.004520 +v 0.250000 0.000000 0.754520 +v 0.750000 0.000000 0.754520 +v 0.750000 0.000000 1.004520 +v 0.250000 0.250000 1.004520 +v 0.000000 0.250000 1.004520 +v 0.000000 0.000000 1.004520 +v 0.750000 0.750000 1.004520 +v 1.000000 0.750000 1.004520 +v 1.000000 1.000000 1.004520 +v 0.750000 1.000000 1.004520 +v 0.250000 0.750000 1.004520 +v 0.000000 0.750000 1.004520 +v 0.750000 1.000000 0.754520 +v 1.000000 1.000000 0.754520 +v 0.250000 1.000000 1.004520 +v 0.000000 1.000000 1.004520 +v 0.000000 0.750000 0.754520 +v 0.000000 1.000000 0.754520 +v 1.000000 0.250000 0.254520 +v 1.000000 0.000000 0.254520 +v 1.000000 0.000000 0.004520 +v 1.000000 0.250000 0.004520 +v 1.000000 1.000000 0.254520 +v 1.000000 0.750000 0.254520 +v 1.000000 0.750000 0.004520 +v 1.000000 1.000000 0.004520 +v 0.000000 0.750000 0.254520 +v 0.000000 1.000000 0.254520 +v 0.000000 1.000000 0.004520 +v 0.000000 0.750000 0.004520 +v 0.000000 0.250000 0.004520 +v 0.250000 0.250000 0.004520 +v 0.250000 0.000000 0.004520 +v 0.000000 0.000000 0.004520 +v 0.250000 1.000000 0.004520 +v 0.750000 1.000000 0.004520 +v 0.750000 1.000000 0.254520 +v 0.250000 1.000000 0.254520 +v 0.750000 0.000000 0.004520 +v 0.750000 0.250000 0.004520 +v 0.250000 0.750000 0.004520 +v 0.250000 0.750000 0.254520 +v 0.250000 0.000000 0.254520 +v 0.000000 0.000000 0.254520 +v 0.000000 0.250000 0.254520 +v 0.750000 0.750000 0.254520 +v 0.750000 0.750000 0.004520 +v 0.750000 0.250000 0.254520 +v 0.250000 0.250000 0.254520 +v 0.750000 0.000000 0.254520 +v 0.000000 0.250000 0.754520 +v 0.000000 0.000000 0.754520 +v 1.000000 0.000000 0.754520 +v 1.000000 0.000000 1.004520 +v 0.750000 0.750000 0.754520 +v 0.750000 0.250000 1.004520 +v 1.000000 0.250000 1.004520 +v 1.000000 0.250000 0.754520 +v 1.000000 0.750000 0.754520 +v 0.250000 1.000000 0.754520 +v 0.250000 0.750000 0.754520 +v 0.750000 0.250000 0.754520 +v 0.250000 0.250000 0.754520 +vt 0.125000 0.875000 +vt 0.125000 1.000000 +vt 0.375000 1.000000 +vt 0.375000 0.875000 +vt 0.500000 1.000000 +vt 0.500000 0.875000 +vt 0.000000 0.625000 +vt 0.125000 0.625000 +vt 0.125000 0.750000 +vt 0.000000 0.750000 +vt 0.375000 0.750000 +vt 0.375000 0.625000 +vt 0.500000 0.625000 +vt 0.500000 0.750000 +vt 0.000000 1.000000 +vt 0.000000 0.875000 +vt 0.750000 1.000000 +vt 0.750000 0.875000 +vt 0.625000 1.000000 +vt 0.750000 0.750000 +vt 0.625000 0.750000 +vt 0.562500 1.000000 +vt 0.687500 1.000000 +vt 0.687500 0.750000 +vt 0.562500 0.750000 +vt 0.750000 0.906250 +vt 0.500000 0.906250 +vt 0.593750 1.000000 +vt 0.593750 0.750000 +vt 0.750000 0.812500 +vt 0.750000 0.937500 +vt 0.500000 0.937500 +vt 0.500000 0.812500 +s off +f 7/16 8/17 9/18 10/19 +f 13/20 7/18 11/19 12/21 +f 14/20 15/18 16/19 17/21 +f 12/17 11/16 18/19 19/18 +f 20/22 17/23 16/24 21/25 +f 19/26 18/27 22/28 23/29 +f 24/17 19/30 23/31 25/16 +f 26/20 27/18 28/19 29/21 +f 30/28 31/29 32/26 33/27 +f 34/28 35/29 36/26 37/27 +f 38/26 39/29 40/21 41/19 +f 42/16 45/17 44/18 43/19 +f 46/16 47/31 29/25 28/24 +f 39/24 38/16 37/19 48/26 +f 48/31 37/25 36/24 42/16 +f 50/19 51/18 41/20 40/21 +f 51/24 52/16 38/31 41/25 +f 39/21 56/20 55/32 47/33 +f 12/26 58/29 59/21 13/19 +f 8/29 7/21 13/19 59/26 +f 31/34 53/32 55/35 26/36 +f 10/25 9/24 60/16 61/31 +f 63/24 64/16 15/19 14/26 +f 65/16 64/31 61/25 60/24 +f 63/30 10/31 61/16 64/17 +f 15/24 66/25 21/22 16/23 +f 22/19 67/21 25/20 23/18 +f 67/16 22/24 17/26 20/19 +f 60/16 9/17 57/18 27/19 +f 25/27 67/26 45/24 35/23 +f 20/18 21/19 30/16 44/17 +f 57/19 50/16 40/17 46/18 +f 27/17 57/30 46/31 28/16 +f 35/20 45/18 42/19 36/21 +f 44/16 30/17 33/30 43/31 +f 8/26 59/27 51/23 50/24 +f 29/26 47/19 54/16 32/24 +f 32/20 54/18 43/19 33/21 +f 65/37 69/38 62/39 66/40 +f 70/20 68/29 18/36 11/34 +f 68/21 49/33 45/32 67/20 +f 56/29 39/20 48/34 49/36 +f 8/24 50/26 56/27 70/23 +f 34/41 49/32 68/20 24/42 +f 52/43 56/20 49/29 34/44 +f 24/35 68/36 70/34 58/32 +f 58/35 70/33 56/21 52/29 +f 63/20 14/29 62/36 69/34 +f 69/16 55/19 57/18 9/17 +f 20/20 44/32 53/33 62/21 +f 53/39 54/44 47/43 55/38 +f 26/35 55/33 69/21 65/29 +f 66/21 62/20 53/32 31/33 +f 50/24 57/26 55/27 56/23 +f 53/35 44/33 45/21 49/29 +f 54/45 53/46 49/47 48/48 +f 70/24 69/26 9/27 8/23 +f 68/35 67/33 20/21 62/29 +f 18/21 68/20 62/32 14/33 +f 63/46 69/45 70/48 11/47 +f 17/26 22/24 18/23 14/27 +f 11/16 7/17 10/18 63/19 +f 65/18 60/17 27/16 26/19 +f 15/19 64/16 65/17 66/18 +f 31/26 26/24 29/16 32/19 +f 31/26 30/27 21/23 66/24 +f 43/19 54/18 48/17 42/16 +f 40/24 39/16 47/19 46/26 +f 34/19 37/26 38/24 52/16 +f 24/26 58/24 12/16 19/19 +f 35/23 34/24 24/26 25/27 +f 52/16 51/17 59/18 58/19 diff --git a/src/main/resources/assets/magicbees/model/visAuraProvider.png b/src/main/resources/assets/magicbees/model/visAuraProvider.png new file mode 100644 index 0000000000000000000000000000000000000000..48b9909567cc1ad341e6b152db3ffa0f49353e3e GIT binary patch literal 2205 zcmd^9`Bzit7LDSF6^Ca9HOv8#NeU^1NrV!Fs3^*$%U4v2*jfQA>cb~mrWQ~Er#cmV zpeV>BLzE$5iUcx2WOZ@jgU>|WkGuQ&TtZ`rF_|kLkmeH3)1c# z@pQ_D)vmT{-0eSicUbG`xYonb#@oqeGi9BRvyBgBov$mIx{(~PX@kF;EzR97*wZe= z%P!E}A;{Aq#LF?v$7!pNQ-m)i($|Gfb&c|Oi}rV8(A;+fy6+0{Dn964df4aTNxzzG zYWw*Bc3}{+WAX+Vy>CR?c*-uNgss**mJwB2qE13QQ5#tzf~f($QX>n2jrdTLL0FGV zp5q**LC}r!d!V2VmoTA*tyfgx_+uQa!SQ+=v|{*E2-_j-f@mjzECXaiK=jm&)=mzv zO~P&hX$Hz}y`sycVZo`gsmaQhFCQT<>kwlvkLVmASOQ~@()3h8v?HcQ+|)qmyHR}) zX6Q8mnJEQXy@*eeGeTF?f^D~*C0 ze3Xd`S;Rm$9D4|r&w-2ukT#(10^k<_?&?7eFgI2Y^sT_q4nQjaOcd+X12(`q0LlWO zQ^ePdDEddWycbgWi;1xjwNyEzL%5o8p+qIniWOX$c0i>NC=`fNEuRppL>xjOz_}98 zHvxxKI9Cft6hNfGYTKOy58kwF~c;W8OijDvBx9+5zu64fc7Mh&>Ip96UU!vG%+ z@xh1)h&WKffm$Ju3bAn!P>ljahP{ws0t6e-0KqsAP5_<`jL3mh3e*}*sl#MiAl6_A zM-MsB&=0^61_l8T7yuujJOG5iAOt{a01{x30HDNB1ppcpg@gV0pb!@fLV?K0k>Z0I zTquJ=Es%4};y^n95CJ9^Lx~JZ6<|yP7IvM=>aZ1_?AMAe5kH z4WK}Q9AG-spaWnW00f{Y2SfQ7CPGmOiYica9L2OKikeMvQ1gDX*(apzJ+XT~{eKr} z@7!V+^GlXyMejRFB3W_%#=N1-+HcH9n{0Y=_TJ1R*=G*@kVeWn^le7AcSc&a1J&Ed z`^&T<-!yZeypD+skEiW&Df@Tw-cw}mg$2u3oVLn1Y3*+rHFt59_RH4)J!^8TdajRgH9U?ITCm4`U69AMYPWxu zHjkOIgIAEppNWl(l}9rCV@8F0r2DQr?QDEoUQw!kHJo$o7s1kvakpk~1@12he{lQ3 z7q@2DP(@~L<@m@e6GxH9q6#`5N+H}2n*$~Jr!xT*X@NLtdR^i{2Y zNO~7izWAYVB_n*(nmV}7FY0#L3dG2FE_uyW{3&xjyp=-kD+>%gdim|SdzW`k_ucg( zvYGo9`Pk;ZwCQna!p@vciVdu8bnZ6TX$rS29b$Y{U^Nq*^X`>)b+qJJQpBHkn+Q;yAzK|k%-UbQ*pYbcn{3k&+V%4i!~W)1+ujPEakeaZ ze>{mbQ`_=YC>X9D*9p8s0 zdmI?sU=`y@Zr*M?H4yGySlyeCiE2s=_rv#d>a7iD@-}~c_S547^co*aodPsk=v)8S z&MfGlzh0k_TUcMajBAx|Z(SNEKM-fj9`4QL$cy|-ikCkidfs_VR$04hQ#D2Z3eH-T zsGzUk6?UgRqot^XjBnf!RCs8#>1V#^dGd^VM8ebN){azz>1YaX?R=$yI&nOMPGdTp z^51WrQd&@roal)B=|T)8ykYvtrQ^0yKlbLBEWG2r!Z!LGeY4zOP`(bxSc8`pK=|Fa7MfG+xQp1uTmbdTZLf6^u&XumsftzmE&; XbRiVGb9&625~LV^S literal 0 HcmV?d00001 From 40fdbb29c6bc9c22e727e553a0acbdbab8a78995 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Fri, 27 Mar 2015 16:31:15 -0700 Subject: [PATCH 15/17] Finalize Vis Apiary Booster crafting recipe. Better IMagicApiaryAuraProvider search algorithm. Reformat ThaumcraftHelper; removed old method, Add enums for wooden & metal TC devices. --- src/main/java/magicbees/main/Config.java | 2 + .../magicbees/main/utils/CraftingManager.java | 12 +- .../main/utils/compat/ThaumcraftHelper.java | 561 +++++++++--------- .../tileentity/TileEntityMagicApiary.java | 94 ++- 4 files changed, 350 insertions(+), 319 deletions(-) diff --git a/src/main/java/magicbees/main/Config.java b/src/main/java/magicbees/main/Config.java index 9f8e059..94b96eb 100644 --- a/src/main/java/magicbees/main/Config.java +++ b/src/main/java/magicbees/main/Config.java @@ -152,6 +152,8 @@ public class Config public static Block tcLog; public static Block tcLeaf; public static Block tcWarded; + public static Block tcWooden; + public static Block tcMetal; //----- Thaumcraft Items ----------------------------------- public static Item tcFilledJar; public static Item tcMiscResource; diff --git a/src/main/java/magicbees/main/utils/CraftingManager.java b/src/main/java/magicbees/main/utils/CraftingManager.java index f354b99..aec19fd 100644 --- a/src/main/java/magicbees/main/utils/CraftingManager.java +++ b/src/main/java/magicbees/main/utils/CraftingManager.java @@ -1,6 +1,5 @@ package magicbees.main.utils; -import cpw.mods.fml.common.registry.GameRegistry; import magicbees.item.ItemCapsule; import magicbees.item.types.CombType; import magicbees.item.types.DropType; @@ -23,6 +22,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; +import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; public class CraftingManager @@ -379,13 +379,13 @@ public class CraftingManager }); } - // TODO: Finalize recipe. output = new ItemStack(Config.visAuraProvider); GameRegistry.addRecipe(output, new Object[] { - " p ", "igi", "iii", - 'p', Config.pollen.getStackForType(PollenType.UNUSUAL), - 'i', Items.iron_ingot, - 'g', Blocks.glass + "ngn", "gvg", "npn", + 'n', Items.gold_nugget, + 'g', new ItemStack(Config.tcWooden, 1, ThaumcraftHelper.WoodenDeviceType.PLANKS_GREATWOOD.ordinal()), + 'v', new ItemStack(Config.tcMetal, 1, ThaumcraftHelper.MetalDeviceType.VIS_RELAY.ordinal()), + 'p', Config.pollen.getStackForType(PollenType.UNUSUAL) }); } diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index 86885ae..3dd321a 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -31,10 +31,8 @@ import thaumcraft.api.research.ResearchPage; import forestry.core.config.ForestryBlock; import forestry.core.config.ForestryItem; -public class ThaumcraftHelper -{ - public enum MiscResource - { +public class ThaumcraftHelper { + public enum MiscResource { ALUMENTUM, NITOR, THAUMIUM, @@ -45,92 +43,119 @@ public class ThaumcraftHelper ENCHANTED_FABRIC, FLUX_FILTER, KNOWLEDGE_FRAGMENT, - MIRRORED_GLASS,; + MIRRORED_GLASS, + ; } - public enum NuggetType - { + public enum NuggetType { IRON, COPPER, TIN, SILVER, LEAD, QUICKSILVER, - THAUMIUM, _7, _8, _9, _10, _11, _12, _13, _14, _15, + THAUMIUM, + _7, _8, _9, _10, _11, _12, _13, _14, _15, NATIVE_IRON, NATIVE_COPPER, NATIVE_TIN, NATIVE_SILVER, - NATIVE_LEAD, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, - NATIVE_GOLD,; + NATIVE_LEAD, + _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, + NATIVE_GOLD, + ; } - public enum ShardType - { + public enum ShardType { AIR, FIRE, WATER, EARTH, ORDER, - CHAOS,; + CHAOS, + BALANCED, + ; } - public enum Entity - { + public enum MetalDeviceType { + CRUCIBLE, + ALEMBIC, + VIS_CHARGE_RELAY, + ADVANCED_ALCHEMICAL_CONSTRUCT, + _4, + ITEM_GRATE, + _6, + ARCANE_LAMP, + LAMP_OF_GROWTH, + ALCHEMICAL_CONSTRUCT, + THAUMATORIUM, + _11, + MNEMONIC_MATRIX, + LAMP_OF_FERTILITY, + VIS_RELAY, + ; + } + + public enum WoodenDeviceType { + BELLOWS, + EAR, + PRESSURE_PLATE, + BORE_BASE, + BORE, + PLANKS_GREATWOOD, + PLANKS_SILVERWOOD, + BANNER, + ; + } + + public enum Entity { BRAINY_ZOMBIE("entBrainyZombie", "EntityBrainyZombie"), GIANT_BRAINY_ZOMBIE("entGiantBrainyZombie", "EntityGiantBrainyZombie"), WISP("entWisp", "EntityWisp"), - FIREBAT("entFirebat", "EntityFireBat"),; + FIREBAT("entFirebat", "EntityFireBat"), + ; private static String packageName = "thaumcraft.common.entities.monster."; public String entityID; private String className; - private Entity(String id, String clazz) - { + private Entity(String id, String clazz) { this.entityID = id; this.className = clazz; } - public String getClassName() - { + public String getClassName() { return packageName + this.className; } } - public enum BlockPlant - { + public enum BlockPlant { GREATWOOD_SAPLING, SILVERWOOD_SAPLING, SHIMMERLEAF, CINDERPEARL, - PURIFYING_PLANT,; + PURIFYING_PLANT, + ; } - public enum TreeType - { + public enum TreeType { GREATWOOD, - SILVERWOOD,; + SILVERWOOD, + ; } - public static final String Name = "Thaumcraft"; private static boolean isThaumcraftPresent = false; - public static boolean isActive() - { + public static boolean isActive() { return isThaumcraftPresent; } - public static void preInit() - { - if (Loader.isModLoaded(Name) && Config.thaumcraftActive) - { + public static void preInit() { + if (Loader.isModLoaded(Name) && Config.thaumcraftActive) { isThaumcraftPresent = true; - } - else - { + } else { // Switch off TC-dependant items. ResourceType.LORE_FRAGMENT.setHidden(); ResourceType.TC_DUST_AIR.setHidden(); @@ -142,23 +167,22 @@ public class ThaumcraftHelper } } - public static void init() - { - //if (isActive()) { } + public static void init() { + // if (isActive()) { } } - public static void postInit() - { - if (isActive()) - { + public static void postInit() { + if (isActive()) { // Apparently the Game Registry isn't populated until now. ): getBlocks(); getItems(); - aspectTime = new Aspect("tempus", 0xB68CFF, new Aspect[] { Aspect.VOID, Aspect.ORDER }, - new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.TEXTURE + "aspects/tempus.png"), 1); + aspectTime = new Aspect("tempus", 0xB68CFF, new Aspect[] { + Aspect.VOID, Aspect.ORDER }, new ResourceLocation( + CommonProxy.DOMAIN, CommonProxy.TEXTURE + + "aspects/tempus.png"), 1); - //addItemsToBackpack(); + // addItemsToBackpack(); setupItemAspects(); setupCrafting(); setupResearch(); @@ -167,8 +191,7 @@ public class ThaumcraftHelper private static Object aspectTime; - private static void getBlocks() - { + private static void getBlocks() { Config.tcPlant = BlockInterface.getBlock(Name, "blockCustomPlant"); Config.tcCandle = BlockInterface.getBlock(Name, "blockCandle"); Config.tcCrystal = BlockInterface.getBlock(Name, "blockCrystal"); @@ -177,69 +200,36 @@ public class ThaumcraftHelper Config.tcLog = BlockInterface.getBlock(Name, "blockMagicalLog"); Config.tcLeaf = BlockInterface.getBlock(Name, "blockMagicalLeaves"); Config.tcWarded = BlockInterface.getBlock(Name, "blockWarded"); + Config.tcWooden = BlockInterface.getBlock(Name, "blockWoodenDevice"); + Config.tcMetal = BlockInterface.getBlock(Name, "blockMetalDevice"); } - private static void getItems() - { + private static void getItems() { Config.tcFilledJar = ItemInterface.getItem(Name, "BlockJarFilledItem"); Config.tcMiscResource = ItemInterface.getItem(Name, "ItemResource"); - //Config.tcEssentiaBottle = ItemInterface.getItem(Name, "BlockJarFilledItem"); + // Config.tcEssentiaBottle = ItemInterface.getItem(Name, + // "BlockJarFilledItem"); Config.tcShard = ItemInterface.getItem(Name, "ItemShard"); Config.tcGolem = ItemInterface.getItem(Name, "ItemGolemPlacer"); - //Config.tcWispEssence = ItemApi.getItem("itemWispEssence", 0).getItem(); + // Config.tcWispEssence = ItemApi.getItem("itemWispEssence", + // 0).getItem(); Config.tcNuggets = ItemInterface.getItem(Name, "ItemNugget"); Config.tcShard = ItemInterface.getItem(Name, "ItemShard"); - Config.tcNuggetChicken = ItemInterface.getItem(Name, "ItemNuggetChicken"); + Config.tcNuggetChicken = ItemInterface.getItem(Name, + "ItemNuggetChicken"); Config.tcNuggetBeef = ItemInterface.getItem(Name, "ItemNuggetBeef"); Config.tcNuggetPork = ItemInterface.getItem(Name, "ItemNuggetPork"); } - private static void addItemsToBackpack() - { -// if (Config.addThaumcraftItemsToBackpacks) -// { -// // Add all shards and Thaumium to miner's backpack -// String ids = Config.tcShard.itemID + ":" + -1 + ";" -// + Config.tcMiscResource.itemID + ":" + ThaumcraftHelper.MiscResource.THAUMIUM.ordinal(); -// FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "miner@" + ids); -// -// // All resources go into Thaumaturge's backpack -// ids = Config.tcMiscResource.itemID + ":" + -1 + ";" -// + Config.tcShard.itemID + ":" + -1 + ";" -// + Config.tcFilledJar.itemID + ":" + -1 + ";" -// + Config.tcCrystal.blockID + ":" + -1 + ";" -// + Config.tcJar.blockID + ":" + -1 + ";" -// + Config.tcGolem.itemID + ":" + -1 + ";"; -// FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "thaumaturge@" + ids); -// -// // Add some plants & saplings to Forester's -// ids = Config.tcPlant.blockID + ":" + "-1" + ";" -// + Config.tcLeaf.blockID + ":" + -1 + ";" -// + Config.tcLog.blockID + ":" + "-1"; -// FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "forester@" + ids); -// -// // Add Wisp & brains to Hunter's -// ids = /*Config.tcWispEssence.itemID + ":" + -1 + ";" -// +*/ Config.tcMiscResource.itemID + ":" + ThaumcraftHelper.MiscResource.ZOMBIE_BRAIN.ordinal(); -// FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "hunter@" + ids); -// -// // Add Marker, warded stone, candle to builder -// ids = Config.tcCandle.blockID + ":" + -1 + ";" -// + Config.tcMarker.blockID + ":" + -1 + ";" -// + Config.tcWarded.blockID + ":" + -1; -// FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "builder@" + ids); -// } - } - - private static void setupCrafting() - { + private static void setupCrafting() { ItemStack input, output; input = Config.miscResources.getStackForType(ResourceType.TC_DUST_AIR); output = new ItemStack(Config.tcShard, 1, ShardType.AIR.ordinal()); GameRegistry.addShapelessRecipe(output, input, input, input, input); - input = Config.miscResources.getStackForType(ResourceType.TC_DUST_WATER); + input = Config.miscResources + .getStackForType(ResourceType.TC_DUST_WATER); output = new ItemStack(Config.tcShard, 1, ShardType.WATER.ordinal()); GameRegistry.addShapelessRecipe(output, input, input, input, input); @@ -247,77 +237,138 @@ public class ThaumcraftHelper output = new ItemStack(Config.tcShard, 1, ShardType.FIRE.ordinal()); GameRegistry.addShapelessRecipe(output, input, input, input, input); - input = Config.miscResources.getStackForType(ResourceType.TC_DUST_EARTH); + input = Config.miscResources + .getStackForType(ResourceType.TC_DUST_EARTH); output = new ItemStack(Config.tcShard, 1, ShardType.EARTH.ordinal()); GameRegistry.addShapelessRecipe(output, input, input, input, input); - input = Config.miscResources.getStackForType(ResourceType.TC_DUST_ORDER); + input = Config.miscResources + .getStackForType(ResourceType.TC_DUST_ORDER); output = new ItemStack(Config.tcShard, 1, ShardType.ORDER.ordinal()); GameRegistry.addShapelessRecipe(output, input, input, input, input); - input = Config.miscResources.getStackForType(ResourceType.TC_DUST_CHAOS); + input = Config.miscResources + .getStackForType(ResourceType.TC_DUST_CHAOS); output = new ItemStack(Config.tcShard, 1, ShardType.CHAOS.ordinal()); GameRegistry.addShapelessRecipe(output, input, input, input, input); - thaumScoop = ThaumcraftApi.addArcaneCraftingRecipe("MB_Scoop", new ItemStack(Config.thaumiumScoop), + thaumScoop = ThaumcraftApi.addArcaneCraftingRecipe("MB_Scoop", + new ItemStack(Config.thaumiumScoop), new AspectList().add(Aspect.ORDER, 2), new Object[] { - "sWs", "sTs", " T ", - 's', Items.stick, - 'W', Blocks.wool, - 'T', new ItemStack(Config.tcMiscResource, 1, MiscResource.THAUMIUM.ordinal()) - }); + "sWs", + "sTs", + " T ", + 's', + Items.stick, + 'W', + Blocks.wool, + 'T', + new ItemStack(Config.tcMiscResource, 1, + MiscResource.THAUMIUM.ordinal()) }); - thaumGrafter = ThaumcraftApi.addArcaneCraftingRecipe("MB_Grafter", new ItemStack(Config.thaumiumGrafter), + thaumGrafter = ThaumcraftApi.addArcaneCraftingRecipe("MB_Grafter", + new ItemStack(Config.thaumiumGrafter), new AspectList().add(Aspect.ORDER, 5), new Object[] { - " T", " s ", "s ", - 's', Items.stick, - 'T', new ItemStack(Config.tcMiscResource, 1, MiscResource.THAUMIUM.ordinal()) - }); + " T", + " s ", + "s ", + 's', + Items.stick, + 'T', + new ItemStack(Config.tcMiscResource, 1, + MiscResource.THAUMIUM.ordinal()) }); - frameMagic = ThaumcraftApi.addArcaneCraftingRecipe("MB_FrameMagic", new ItemStack(Config.hiveFrameMagic), - new AspectList().add(Aspect.ORDER, 5).add(Aspect.AIR, 2).add(Aspect.EARTH, 2), new Object[] { - "sss", "sCs", "sss", - 's', Items.stick, - 'C', new ItemStack(Config.tcMiscResource, 1, MiscResource.ENCHANTED_FABRIC.ordinal()) - }); + frameMagic = ThaumcraftApi.addArcaneCraftingRecipe( + "MB_FrameMagic", + new ItemStack(Config.hiveFrameMagic), + new AspectList().add(Aspect.ORDER, 5).add(Aspect.AIR, 2) + .add(Aspect.EARTH, 2), new Object[] { + "sss", + "sCs", + "sss", + 's', + Items.stick, + 'C', + new ItemStack(Config.tcMiscResource, 1, + MiscResource.ENCHANTED_FABRIC.ordinal()) }); - essenceLife = ThaumcraftApi.addCrucibleRecipe("MB_EssenceLife", Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE), - new ItemStack(Blocks.red_flower), new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.PLANT, 4)); + essenceLife = ThaumcraftApi.addCrucibleRecipe("MB_EssenceLife", + Config.miscResources + .getStackForType(ResourceType.ESSENCE_FALSE_LIFE), + new ItemStack(Blocks.red_flower), + new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.PLANT, 4)); - essenceDeath = ThaumcraftApi.addCrucibleRecipe("MB_EssenceDeath", Config.miscResources.getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE), - new ItemStack(Items.rotten_flesh), new AspectList().add(Aspect.DEATH, 4).add(Aspect.ENTROPY, 4)); + essenceDeath = ThaumcraftApi.addCrucibleRecipe("MB_EssenceDeath", + Config.miscResources + .getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE), + new ItemStack(Items.rotten_flesh), + new AspectList().add(Aspect.DEATH, 4).add(Aspect.ENTROPY, 4)); - essenceArmor = ThaumcraftApi.addCrucibleRecipe("MB_EssenceArmor", Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY), - new ItemStack(Items.leather), new AspectList().add(Aspect.ARMOR, 4).add(Aspect.MAGIC, 2)); + essenceArmor = ThaumcraftApi + .addCrucibleRecipe( + "MB_EssenceArmor", + Config.miscResources + .getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY), + new ItemStack(Items.leather), + new AspectList().add(Aspect.ARMOR, 4).add(Aspect.MAGIC, + 2)); - output = Config.miscResources.getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE); - essenceUnstableA = ThaumcraftApi.addCrucibleRecipe("MB_EssenceUnstable", output, - Config.propolis.getStackForType(PropolisType.UNSTABLE), new AspectList().add(Aspect.ENTROPY, 2).add(Aspect.EXCHANGE, 1)); + output = Config.miscResources + .getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE); + essenceUnstableA = ThaumcraftApi + .addCrucibleRecipe( + "MB_EssenceUnstable", + output, + Config.propolis.getStackForType(PropolisType.UNSTABLE), + new AspectList().add(Aspect.ENTROPY, 2).add( + Aspect.EXCHANGE, 1)); - essenceUnstableB = ThaumcraftApi.addCrucibleRecipe("MB_EssenceUnstable", output, - new ItemStack(Blocks.netherrack), new AspectList().add(Aspect.ENTROPY, 8).add(Aspect.EXCHANGE, 5)); + essenceUnstableB = ThaumcraftApi + .addCrucibleRecipe( + "MB_EssenceUnstable", + output, + new ItemStack(Blocks.netherrack), + new AspectList().add(Aspect.ENTROPY, 8).add( + Aspect.EXCHANGE, 5)); - essenceTime = ThaumcraftApi.addCrucibleRecipe("MB_EssenceTime", Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME), - new ItemStack(Items.clock), new AspectList().add(Aspect.ORDER, 10).add(Aspect.VOID, - 10).add(Aspect.TRAP, 4)); + essenceTime = ThaumcraftApi.addCrucibleRecipe("MB_EssenceTime", + Config.miscResources + .getStackForType(ResourceType.ESSENCE_LOST_TIME), + new ItemStack(Items.clock), + new AspectList().add(Aspect.ORDER, 10).add(Aspect.VOID, 10) + .add(Aspect.TRAP, 4)); input = new ItemStack(Items.ender_pearl); - singularityA = ThaumcraftApi.addInfusionCraftingRecipe("MB_DimensionalSingularity", Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY, 3), - 5, new AspectList().add(Aspect.ELDRITCH, 10).add(Aspect.EXCHANGE, 20), - new ItemStack(Blocks.gold_block), - new ItemStack[] { input, input }); + singularityA = ThaumcraftApi.addInfusionCraftingRecipe( + "MB_DimensionalSingularity", Config.miscResources + .getStackForType(ResourceType.DIMENSIONAL_SINGULARITY, + 3), 5, new AspectList() + .add(Aspect.ELDRITCH, 10).add(Aspect.EXCHANGE, 20), + new ItemStack(Blocks.gold_block), new ItemStack[] { input, + input }); ItemStack in2 = new ItemStack(Items.diamond); - singularityB = ThaumcraftApi.addInfusionCraftingRecipe("MB_DimensionalSingularity", Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY, 3), - 6, new AspectList().add(Aspect.ELDRITCH, 10).add(Aspect.EXCHANGE, 20).add(Aspect.VOID, 15), + singularityB = ThaumcraftApi.addInfusionCraftingRecipe( + "MB_DimensionalSingularity", + Config.miscResources.getStackForType( + ResourceType.DIMENSIONAL_SINGULARITY, 3), + 6, + new AspectList().add(Aspect.ELDRITCH, 10) + .add(Aspect.EXCHANGE, 20).add(Aspect.VOID, 15), Config.propolis.getStackForType(PropolisType.UNSTABLE), new ItemStack[] { input, input, in2 }); - essenceOblivion = ThaumcraftApi.addShapelessArcaneCraftingRecipe("MB_EssenceOblivion", Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION), - new AspectList().add(Aspect.ENTROPY, 25).add(Aspect.AIR, 40).add(Aspect.ORDER, 15), new Object[] { - Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY), - Blocks.dragon_egg, - }); + essenceOblivion = ThaumcraftApi + .addShapelessArcaneCraftingRecipe( + "MB_EssenceOblivion", + Config.miscResources + .getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION), + new AspectList().add(Aspect.ENTROPY, 25) + .add(Aspect.AIR, 40).add(Aspect.ORDER, 15), + new Object[] { + Config.miscResources + .getStackForType(ResourceType.DIMENSIONAL_SINGULARITY), + Blocks.dragon_egg, }); } private static Object frameMagic; @@ -333,57 +384,60 @@ public class ThaumcraftHelper private static Object essenceTime; private static Object essenceOblivion; - private static void setupResearch() - { + private static void setupResearch() { ArrayList list; ItemStack input; IRecipe recipe; String category = "MAGICBEES"; - ResearchCategories.registerCategory(category, new ResourceLocation(CommonProxy.DOMAIN, CommonProxy.ITEM_TEXTURE + "beeInfusion.png"), + ResearchCategories.registerCategory(category, new ResourceLocation( + CommonProxy.DOMAIN, CommonProxy.ITEM_TEXTURE + "beeInfusion.png"), new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png")); - ResearchItem rootNodeR = new ResearchItem("MB_Root", category, new AspectList(), + ResearchItem rootNodeR = new ResearchItem("MB_Root", category, + new AspectList(), 0, 0, 0, Config.miscResources.getStackForType(ResourceType.RESEARCH_BEEINFUSION)) - .setRound().setStub().setAutoUnlock() - .setPages(getResearchPage("MB_Root.1"), getResearchPage("MB_Root.2")) - .registerResearchItem(); + .setRound() + .setStub() + .setAutoUnlock() + .setPages(getResearchPage("MB_Root.1"), getResearchPage("MB_Root.2")).registerResearchItem(); list = new ArrayList(4); list.add(Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT)); list.add(Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT)); list.add(Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT)); list.add(Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT)); - recipe = new ShapelessRecipes(new ItemStack(Config.tcMiscResource, 1, MiscResource.KNOWLEDGE_FRAGMENT.ordinal()), list); + recipe = new ShapelessRecipes(new ItemStack(Config.tcMiscResource, 1, + MiscResource.KNOWLEDGE_FRAGMENT.ordinal()), list); - ResearchItem researchFragment = new ResearchItem("MB_LoreFragment", category, new AspectList(), + ResearchItem researchFragment = new ResearchItem("MB_LoreFragment", category, + new AspectList(), 0, -3, 0, Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT)) - .setPages(getResearchPage("MB_LoreFragment.1"), new ResearchPage(recipe)) - .setParents("MB_Root") - .setStub().setAutoUnlock().setRound() - .registerResearchItem(); + .setPages(getResearchPage("MB_LoreFragment.1"), new ResearchPage(recipe)).setParents("MB_Root") + .setStub().setAutoUnlock().setRound().registerResearchItem(); - ResearchItem thaumiumScoopR = new ResearchItem("MB_Scoop", category, new AspectList().add(Aspect.TOOL, 1).add(Aspect.MAGIC, 1).add(Aspect.AIR, 1), + ResearchItem thaumiumScoopR = new ResearchItem("MB_Scoop", category, + new AspectList().add(Aspect.TOOL, 1).add(Aspect.MAGIC, 1).add(Aspect.AIR, 1), -2, -3, 1, new ItemStack(Config.thaumiumScoop)) - .setPages(getResearchPage("MB_Scoop.1"), new ResearchPage((IArcaneRecipe)thaumScoop)) - .setParentsHidden("THAUMIUM") - .registerResearchItem(); + .setPages(getResearchPage("MB_Scoop.1"), new ResearchPage((IArcaneRecipe) thaumScoop)) + .setParentsHidden("THAUMIUM").registerResearchItem(); - ResearchItem thaumiumGrafterR = new ResearchItem("MB_Grafter", category, new AspectList().add(Aspect.TOOL, 2).add(Aspect.TREE, 1).add(Aspect.GREED, 1), + ResearchItem thaumiumGrafterR = new ResearchItem("MB_Grafter", category, + new AspectList().add(Aspect.TOOL, 2).add(Aspect.TREE, 1).add(Aspect.GREED, 1), -2, -1, 4, new ItemStack(Config.thaumiumGrafter)) - .setPages(getResearchPage("MB_Grafter.1"), new ResearchPage((IArcaneRecipe)thaumGrafter)) - .setParents("MB_Scoop") - .registerResearchItem(); + .setPages(getResearchPage("MB_Grafter.1"), new ResearchPage((IArcaneRecipe) thaumGrafter)) + .setParents("MB_Scoop").registerResearchItem(); - ResearchItem frameMagicR = new ResearchItem("MB_FrameMagic", category, new AspectList().add(Aspect.TOOL, 2).add(Aspect.ARMOR, 1), + ResearchItem frameMagicR = new ResearchItem("MB_FrameMagic", category, + new AspectList().add(Aspect.TOOL, 2).add(Aspect.ARMOR, 1), -2, 1, 2, new ItemStack(Config.hiveFrameMagic)) - .setPages(getResearchPage("MB_FrameMagic"), new ResearchPage((IArcaneRecipe)frameMagic)) - .registerResearchItem(); + .setPages(getResearchPage("MB_FrameMagic"), new ResearchPage((IArcaneRecipe) frameMagic)) + .registerResearchItem(); input = new ItemStack(Config.hiveFrameMagic); list = new ArrayList(2); @@ -391,125 +445,123 @@ public class ThaumcraftHelper list.add(input); recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameGentle), list); - ResearchItem essenceFalseLifeR = new ResearchItem("MB_EssenceLife", category, new AspectList().add(Aspect.LIFE, 2).add(Aspect.MAGIC, 1), + ResearchItem essenceFalseLifeR = new ResearchItem("MB_EssenceLife", category, + new AspectList().add(Aspect.LIFE, 2).add(Aspect.MAGIC, 1), 2, -1, 2, Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE)) - .setPages(getResearchPage("MB_EssenceLife.1"), new ResearchPage((CrucibleRecipe)essenceLife), new ResearchPage(recipe)) - .setParentsHidden("CRUCIBLE") - .registerResearchItem(); + .setPages(getResearchPage("MB_EssenceLife.1"), + new ResearchPage((CrucibleRecipe) essenceLife), + new ResearchPage(recipe)).setParentsHidden("CRUCIBLE") + .registerResearchItem(); list = new ArrayList(2); list.add(Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY)); list.add(input); recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameResilient), list); - ResearchItem essenceDurabilityR = new ResearchItem("MB_EssenceArmor", category, new AspectList().add(Aspect.ARMOR, 1).add(Aspect.MAGIC, 1), + ResearchItem essenceDurabilityR = new ResearchItem("MB_EssenceArmor", category, + new AspectList().add(Aspect.ARMOR, 1).add(Aspect.MAGIC, 1), 5, 0, 3, Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY)) - .setPages(getResearchPage("MB_EssenceArmor.1"), new ResearchPage((CrucibleRecipe)essenceArmor), new ResearchPage(recipe)) - .setParents("MB_EssenceLife") - .registerResearchItem(); + .setPages(getResearchPage("MB_EssenceArmor.1"), + new ResearchPage((CrucibleRecipe) essenceArmor), + new ResearchPage(recipe)).setParents("MB_EssenceLife") + .registerResearchItem(); list = new ArrayList(2); - list.add(Config.miscResources.getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE)); + list.add(Config.miscResources .getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE)); list.add(input); recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameMetabolic), list); - ResearchItem essenceUnstableR = new ResearchItem("MB_EssenceUnstable", category, new AspectList().add(Aspect.ENTROPY, 2).add(Aspect.ORDER, 1), + ResearchItem essenceUnstableR = new ResearchItem( "MB_EssenceUnstable", category, + new AspectList().add(Aspect.ENTROPY, 2).add(Aspect.ORDER, 1), 3, 1, 4, Config.miscResources.getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE)) - .setPages(getResearchPage("MB_EssenceUnstable.1"), new ResearchPage((CrucibleRecipe)essenceUnstableA), - new ResearchPage((CrucibleRecipe)essenceUnstableB), new ResearchPage(recipe)) - .setParents("MB_EssenceLife") - .setConcealed() - .registerResearchItem(); + .setPages(getResearchPage("MB_EssenceUnstable.1"), + new ResearchPage((CrucibleRecipe) essenceUnstableA), + new ResearchPage((CrucibleRecipe) essenceUnstableB), + new ResearchPage(recipe)).setParents("MB_EssenceLife") + .setConcealed().registerResearchItem(); list = new ArrayList(2); - list.add(Config.miscResources.getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE)); + list.add(Config.miscResources .getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE)); list.add(input); recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameNecrotic), list); - ResearchItem essenceShallowGraveR = new ResearchItem("MB_EssenceDeath", category, new AspectList().add(Aspect.DEATH, 2).add(Aspect.MAGIC, 1), + ResearchItem essenceShallowGraveR = new ResearchItem("MB_EssenceDeath", category, + new AspectList().add(Aspect.DEATH, 2).add(Aspect.MAGIC, 1), 2, 3, 2, - Config.miscResources.getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE)) - .setPages(getResearchPage("MB_EssenceDeath.1"), new ResearchPage((CrucibleRecipe)essenceDeath), new ResearchPage(recipe)) - .setParents("MB_EssenceUnstable") - .setConcealed() - .registerResearchItem(); + Config.miscResources .getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE)) + .setPages(getResearchPage("MB_EssenceDeath.1"), + new ResearchPage((CrucibleRecipe) essenceDeath), + new ResearchPage(recipe)) + .setParents("MB_EssenceUnstable").setConcealed() + .registerResearchItem(); list = new ArrayList(2); list.add(Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME)); list.add(input); recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameTemporal), list); - ResearchItem essenceTimeR = new ResearchItem("MB_EssenceTime", category, new AspectList().add((Aspect)aspectTime, 2).add(Aspect.MAGIC, 1), + ResearchItem essenceTimeR = new ResearchItem("MB_EssenceTime", category, + new AspectList().add((Aspect) aspectTime, 2).add(Aspect.MAGIC, 1), 0, 2, 5, Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME)) - .setPages(getResearchPage("MB_EssenceTime.1"), new ResearchPage((CrucibleRecipe)essenceTime), new ResearchPage(recipe)) - .setParents("MB_EssenceUnstable") - .setConcealed() - .registerResearchItem(); + .setPages(getResearchPage("MB_EssenceTime.1"), + new ResearchPage((CrucibleRecipe) essenceTime), + new ResearchPage(recipe)) + .setParents("MB_EssenceUnstable").setConcealed() + .registerResearchItem(); - ResearchItem singularityR = new ResearchItem("MB_DimensionalSingularity", category, new AspectList().add(Aspect.ELDRITCH, 2).add((Aspect)aspectTime, 1).add(Aspect.VOID, 1), + ResearchItem singularityR = new ResearchItem("MB_DimensionalSingularity", category, + new AspectList().add(Aspect.ELDRITCH, 2).add((Aspect) aspectTime, 1).add(Aspect.VOID, 1), -1, 4, 5, Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY)) - .setPages(getResearchPage("MB_DimensionalSingularity.1"), new ResearchPage((InfusionRecipe)singularityA), new ResearchPage((InfusionRecipe)singularityB)) - .setParents("MB_FrameMagic", "MB_EssenceTime", "MB_EssenceDeath") - .setConcealed() - .setSpecial() - .registerResearchItem(); + .setPages(getResearchPage("MB_DimensionalSingularity.1"), + new ResearchPage((InfusionRecipe) singularityA), + new ResearchPage((InfusionRecipe) singularityB)) + .setParents("MB_FrameMagic", "MB_EssenceTime", "MB_EssenceDeath").setConcealed().setSpecial() + .registerResearchItem(); list = new ArrayList(2); list.add(Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION)); list.add(ItemInterface.getItemStack("frameProven")); recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameOblivion), list); - ResearchItem essenceOblivionR = new ResearchItem("MB_EssenceOblivion", category, new AspectList().add(Aspect.VOID, 2).add(Aspect.HUNGER, 1).add((Aspect)aspectTime, 1), + ResearchItem essenceOblivionR = new ResearchItem("MB_EssenceOblivion", category, + new AspectList().add(Aspect.VOID, 2).add(Aspect.HUNGER, 1).add((Aspect) aspectTime, 1), -3, 3, 5, Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION)) - .setPages(getResearchPage("MB_EssenceOblivion.1"), new ResearchPage((IArcaneRecipe)essenceOblivion), new ResearchPage(recipe)) - .setParents("MB_DimensionalSingularity") - .setConcealed() - .registerResearchItem(); + .setPages(getResearchPage("MB_EssenceOblivion.1"), + new ResearchPage((IArcaneRecipe) essenceOblivion), + new ResearchPage(recipe)) + .setParents("MB_DimensionalSingularity").setConcealed() + .registerResearchItem(); } - private static ResearchPage getResearchPage(String ident) - { - // Helps get around all the stupid XML Doctype restrictions. - return new ResearchPage(LocalizationManager.getLocalizedString("tc.research_page." + ident) - .replaceAll("##lineBreak##", "
") - .replaceAll("##horizontalRule##", "") - .replaceAll("##img##", "") - .replaceAll("##/img##", "")); + private static ResearchPage getResearchPage(String ident) { + return new ResearchPage(LocalizationManager.getLocalizedString("tc.research_page." + ident)); } - private static void setupItemAspects() - { + private static void setupItemAspects() { ItemStack item; AspectList list; - ThaumcraftApi.registerObjectTag(new ItemStack(Items.clock), new AspectList(new ItemStack(Items.clock)).add( - (Aspect)aspectTime, 4)); - ThaumcraftApi.registerObjectTag(new ItemStack(Items.repeater), new AspectList(new ItemStack(Items.repeater)).add( - (Aspect)aspectTime, 2)); - + ThaumcraftApi.registerObjectTag(new ItemStack(Items.clock), new AspectList(new ItemStack(Items.clock)).add((Aspect) aspectTime, 4)); + ThaumcraftApi.registerObjectTag(new ItemStack(Items.repeater), new AspectList(new ItemStack(Items.repeater)).add((Aspect) aspectTime, 2)); list = new AspectList(new ItemStack(Blocks.log)); - for (int i = 1; i <= 8; i++) - { + for (int i = 1; i <= 8; i++) { item = ItemInterface.getItemStack("log" + i); - if (item != null) - { + if (item != null) { ThaumcraftApi.registerObjectTag(item, list); } } list = new AspectList(new ItemStack(Blocks.planks)); - for (int i = 1; i <= 2; i++) - { + for (int i = 1; i <= 2; i++) { item = ItemInterface.getItemStack("planks" + i); - if (item != null) - { + if (item != null) { ThaumcraftApi.registerObjectTag(item, list); } } @@ -543,18 +595,15 @@ public class ThaumcraftHelper item = ForestryBlock.saplingGE.getItemStack(); ThaumcraftApi.registerObjectTag(item, list); - list = new AspectList()/*.add(Aspect.SEED, 1)*/.add(Aspect.PLANT, 1); + list = new AspectList()/* .add(Aspect.SEED, 1) */.add(Aspect.PLANT, 1); item = ForestryItem.pollenFertile.getItemStack(); ThaumcraftApi.registerObjectTag(item, list); list = new AspectList().add(Aspect.CRYSTAL, 1).add(Aspect.EARTH, 2); item = ForestryItem.apatite.getItemStack(); - ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.BlockResource.APATITE.ordinal()), - list.copy()/*.add(Aspect.STONE, 2)*/); + ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1,ForestryHelper.BlockResource.APATITE.ordinal()), list.copy()); item = ForestryItem.apatite.getItemStack(); - ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, item.getItemDamage()), - list.copy().add(Aspect.CRYSTAL, 2)); - + ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, item.getItemDamage()), list.copy().add(Aspect.CRYSTAL, 2)); list = new AspectList().add(Aspect.MOTION, 2).add(Aspect.FLIGHT, 1); item = ItemInterface.getItemStack("beeDroneGE"); @@ -585,47 +634,30 @@ public class ThaumcraftHelper list = new AspectList().add(Aspect.SLIME, 1); item = ItemInterface.getItemStack("propolis"); - ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Propolis.NORMAL.ordinal()), - list); - ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Propolis.SILKY.ordinal()), - list.copy().add(Aspect.SLIME, 2)); - ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Propolis.PULSATING.ordinal()), - list.copy().add(Aspect.ELDRITCH, 2)); - ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.UNSTABLE.ordinal()), - list.copy().add(Aspect.ENTROPY, 1).add(Aspect.EXCHANGE, 1)); - ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.AIR.ordinal()), - list.copy().add(Aspect.AIR, 2)); - ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.WATER.ordinal()), - list.copy().add(Aspect.WATER, 2)); - ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.FIRE.ordinal()), - list.copy().add(Aspect.FIRE, 2)); - ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.EARTH.ordinal()), - list.copy().add(Aspect.EARTH, 2)); - ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.ORDER.ordinal()), - list.copy().add(Aspect.ORDER, 2)); - ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.CHAOS.ordinal()), - list.copy().add(Aspect.ENTROPY, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Propolis.NORMAL.ordinal()), list); + ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Propolis.SILKY.ordinal()), list.copy().add(Aspect.SLIME, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Propolis.PULSATING.ordinal()), list.copy().add(Aspect.ELDRITCH, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.UNSTABLE.ordinal()), list.copy().add(Aspect.ENTROPY, 1).add(Aspect.EXCHANGE, 1)); + ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.AIR.ordinal()), list.copy().add(Aspect.AIR, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.WATER.ordinal()), list.copy().add(Aspect.WATER, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.FIRE.ordinal()), list.copy().add(Aspect.FIRE, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.EARTH.ordinal()), list.copy().add(Aspect.EARTH, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.ORDER.ordinal()), list.copy().add(Aspect.ORDER, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(Config.propolis, 1, PropolisType.CHAOS.ordinal()), list.copy().add(Aspect.ENTROPY, 2)); list = new AspectList().add(Aspect.PLANT, 2); item = ItemInterface.getItemStack("pollen"); ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Pollen.NORMAL.ordinal()), list); - ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Pollen.CRYSTALLINE.ordinal()), - list.copy()/*.add(Aspect.ICE, 2)*/); - ThaumcraftApi.registerObjectTag(new ItemStack(Config.pollen, 1, PollenType.UNUSUAL.ordinal()), - list.copy().add(Aspect.MAGIC, 2)); - ThaumcraftApi.registerObjectTag(new ItemStack(Config.pollen, 1, PollenType.PHASED.ordinal()), - list.copy().add((Aspect)aspectTime, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(item.getItem(), 1, ForestryHelper.Pollen.CRYSTALLINE.ordinal()), list.copy()); + ThaumcraftApi.registerObjectTag(new ItemStack(Config.pollen, 1, PollenType.UNUSUAL.ordinal()), list.copy().add(Aspect.MAGIC, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(Config.pollen, 1, PollenType.PHASED.ordinal()), list.copy().add((Aspect) aspectTime, 2)); list = new AspectList().add(Aspect.ORDER, 1); item = ItemInterface.getItemStack("beeswax"); - ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list.copy().add(Aspect.ORDER, - 2)); - ThaumcraftApi.registerObjectTag(new ItemStack(Config.wax, 1, WaxType.MAGIC.ordinal()), - list.copy().add(Aspect.MAGIC, 2)); - ThaumcraftApi.registerObjectTag(new ItemStack(Config.wax, 1, WaxType.SOUL.ordinal()), - list.copy().add(Aspect.SOUL, 2)); - ThaumcraftApi.registerObjectTag(new ItemStack(Config.wax, 1, WaxType.AMNESIC.ordinal()), - list.copy().add(Aspect.MIND, 2)); + ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, list.copy().add(Aspect.ORDER, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(Config.wax, 1, WaxType.MAGIC.ordinal()), list.copy().add(Aspect.MAGIC, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(Config.wax, 1, WaxType.SOUL.ordinal()), list.copy().add(Aspect.SOUL, 2)); + ThaumcraftApi.registerObjectTag(new ItemStack(Config.wax, 1, WaxType.AMNESIC.ordinal()), list.copy().add(Aspect.MIND, 2)); list = new AspectList().add(Aspect.EXCHANGE, 2).add(Aspect.LIFE, 2); item = ItemInterface.getItemStack("honeyDrop"); @@ -653,7 +685,6 @@ public class ThaumcraftHelper ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, new AspectList().add(Aspect.ARMOR, 6)); item = Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME); - ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, new AspectList().add(Aspect.VOID, - 6).add((Aspect)aspectTime, 8)); + ThaumcraftApi.registerObjectTag(item, new int[] { item.getItemDamage() }, new AspectList().add(Aspect.VOID, 6).add((Aspect) aspectTime, 8)); } } diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index 875c3d2..8ccd674 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -1,12 +1,15 @@ package magicbees.tileentity; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import magicbees.api.bees.IMagicApiaryAuraProvider; import magicbees.bees.BeeManager; import magicbees.main.CommonProxy; import magicbees.main.MagicBees; import magicbees.main.utils.ChunkCoords; import magicbees.main.utils.ItemStackUtils; -import magicbees.main.utils.LogHelper; import magicbees.main.utils.net.NetworkEventHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -16,6 +19,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.Vec3; import net.minecraft.world.ChunkPosition; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; @@ -704,14 +708,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory return; } - if (this.auraProviderPosition == null) { - this.auraProviderPosition = new ChunkCoords(0, - xCoord - AURAPROVIDER_SEARCH_RADIUS, - (yCoord - AURAPROVIDER_SEARCH_RADIUS >= 0) ? yCoord - AURAPROVIDER_SEARCH_RADIUS : 0, - zCoord - AURAPROVIDER_SEARCH_RADIUS); - LogHelper.info("Apiary starting search"); - } - else { + if (this.auraProviderPosition != null) { // Will end up here after loading from save with a valid auraProvider. if (locationHasAuraProvider(auraProviderPosition)) { IMagicApiaryAuraProvider provider = (IMagicApiaryAuraProvider)(worldObj.getTileEntity(auraProviderPosition.x, @@ -724,50 +721,51 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory return; } } - - int blocksCounted = 0; - int x = auraProviderPosition.x; - int y = auraProviderPosition.y; - int z = auraProviderPosition.z; - while ((y < yCoord + AURAPROVIDER_SEARCH_RADIUS) && blocksCounted < MAX_BLOCKS_SEARCH_PER_CHECK) { - while ((z < zCoord + AURAPROVIDER_SEARCH_RADIUS) && blocksCounted < MAX_BLOCKS_SEARCH_PER_CHECK) { - while ((x < xCoord + AURAPROVIDER_SEARCH_RADIUS) && blocksCounted < MAX_BLOCKS_SEARCH_PER_CHECK) { - if (locationHasAuraProvider(x, y, z)) { - LogHelper.info("Apiary found aura provider!"); - this.auraProvider = (IMagicApiaryAuraProvider)(worldObj.getTileEntity(x, y, z)); - saveAuraProviderPosition(x, y, z); - return; - } - - ++blocksCounted; - ++x; - } - if (blocksCounted < MAX_BLOCKS_SEARCH_PER_CHECK) { - ++z; - x = xCoord - AURAPROVIDER_SEARCH_RADIUS; + else { + List chunks = getChunksInSearchRange(); + for (Chunk chunk : chunks) { + if (searchChunkForBooster(chunk)) { + break; } } - if (blocksCounted < MAX_BLOCKS_SEARCH_PER_CHECK) { - ++y; - z = zCoord - AURAPROVIDER_SEARCH_RADIUS; - } - } - - LogHelper.info("Apiary suspending search"); - - if (auraProvider == null) { - saveAuraProviderPosition(x, y, z); - - if (auraProviderPosition.y >= yCoord + AURAPROVIDER_SEARCH_RADIUS) { - LogHelper.info("Apiary finished scanning blocks; did not find aura provider."); - this.auraProviderPosition = null; - return; - } } } - + + private List getChunksInSearchRange() { + List chunks = new ArrayList(4); + chunks.add(worldObj.getChunkFromBlockCoords(xCoord - AURAPROVIDER_SEARCH_RADIUS, zCoord - AURAPROVIDER_SEARCH_RADIUS)); + Chunk chunk = worldObj.getChunkFromBlockCoords(xCoord + AURAPROVIDER_SEARCH_RADIUS, zCoord - AURAPROVIDER_SEARCH_RADIUS); + if (!chunks.contains(chunk)) { + chunks.add(chunk); + } + chunk = worldObj.getChunkFromBlockCoords(xCoord - AURAPROVIDER_SEARCH_RADIUS, zCoord + AURAPROVIDER_SEARCH_RADIUS); + if (!chunks.contains(chunk)) { + chunks.add(chunk); + } + chunk = worldObj.getChunkFromBlockCoords(xCoord + AURAPROVIDER_SEARCH_RADIUS, zCoord + AURAPROVIDER_SEARCH_RADIUS); + if (!chunks.contains(chunk)) { + chunks.add(chunk); + } + return chunks; + } + + private boolean searchChunkForBooster(Chunk chunk) { + Vec3 apiaryPos = Vec3.createVectorHelper(xCoord, yCoord, zCoord); + for (Map.Entry entry : ((Map)chunk.chunkTileEntityMap).entrySet()) { + TileEntity entity = entry.getValue(); + if (entity instanceof IMagicApiaryAuraProvider) { + Vec3 tePos = Vec3.createVectorHelper(entity.xCoord, entity.yCoord, entity.zCoord); + Vec3 result = apiaryPos.subtract(tePos); + if (result.lengthVector() <= AURAPROVIDER_SEARCH_RADIUS) { + saveAuraProviderPosition(entity.xCoord, entity.yCoord, entity.zCoord); + } + } + } + return false; + } + private void saveAuraProviderPosition(int x, int y, int z) { - auraProviderPosition = new ChunkCoords(auraProviderPosition.dimension, x, y, z); + auraProviderPosition = new ChunkCoords(worldObj.provider.dimensionId, x, y, z); } private boolean locationHasAuraProvider(ChunkCoords coords) { From 051cc965142bf67b125431ab962bcb3c73460fe7 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Fri, 27 Mar 2015 22:35:33 -0700 Subject: [PATCH 16/17] Research notes for Vis Aura provider, TC crafting & garbage. Apiary logic tweaks. --- gradle.properties | 4 +- .../magicbees/main/utils/CraftingManager.java | 9 - .../main/utils/compat/ThaumcraftHelper.java | 231 ++++++++---------- .../tileentity/TileEntityMagicApiary.java | 117 +++++---- .../assets/magicbees/lang/en_US.lang | 4 + 5 files changed, 173 insertions(+), 192 deletions(-) diff --git a/gradle.properties b/gradle.properties index 642a9fd..8694e87 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ version_major=2 -version_minor=1 -version_rev=24 +version_minor=2 +version_rev=0 version_forestry=3.4.0.7 version_bloodmagic=1.3.1-7 diff --git a/src/main/java/magicbees/main/utils/CraftingManager.java b/src/main/java/magicbees/main/utils/CraftingManager.java index aec19fd..07165d6 100644 --- a/src/main/java/magicbees/main/utils/CraftingManager.java +++ b/src/main/java/magicbees/main/utils/CraftingManager.java @@ -378,15 +378,6 @@ public class CraftingManager 'C', Blocks.chest }); } - - output = new ItemStack(Config.visAuraProvider); - GameRegistry.addRecipe(output, new Object[] { - "ngn", "gvg", "npn", - 'n', Items.gold_nugget, - 'g', new ItemStack(Config.tcWooden, 1, ThaumcraftHelper.WoodenDeviceType.PLANKS_GREATWOOD.ordinal()), - 'v', new ItemStack(Config.tcMetal, 1, ThaumcraftHelper.MetalDeviceType.VIS_RELAY.ordinal()), - 'p', Config.pollen.getStackForType(PollenType.UNUSUAL) - }); } if (ArsMagicaHelper.isActive()) diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index 3dd321a..80a5761 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -191,6 +191,20 @@ public class ThaumcraftHelper { private static Object aspectTime; + private static Object frameMagic; + private static Object thaumScoop; + private static Object thaumGrafter; + private static Object singularityA; + private static Object singularityB; + private static Object essenceLife; + private static Object essenceDeath; + private static Object essenceArmor; + private static Object essenceUnstableA; + private static Object essenceUnstableB; + private static Object essenceTime; + private static Object essenceOblivion; + private static Object visAuraProvider; + private static void getBlocks() { Config.tcPlant = BlockInterface.getBlock(Name, "blockCustomPlant"); Config.tcCandle = BlockInterface.getBlock(Name, "blockCandle"); @@ -252,49 +266,36 @@ public class ThaumcraftHelper { output = new ItemStack(Config.tcShard, 1, ShardType.CHAOS.ordinal()); GameRegistry.addShapelessRecipe(output, input, input, input, input); - thaumScoop = ThaumcraftApi.addArcaneCraftingRecipe("MB_Scoop", - new ItemStack(Config.thaumiumScoop), + thaumScoop = ThaumcraftApi.addArcaneCraftingRecipe("MB_Scoop", new ItemStack(Config.thaumiumScoop), new AspectList().add(Aspect.ORDER, 2), new Object[] { - "sWs", - "sTs", - " T ", - 's', - Items.stick, - 'W', - Blocks.wool, - 'T', - new ItemStack(Config.tcMiscResource, 1, - MiscResource.THAUMIUM.ordinal()) }); + "sWs", "sTs", " T ", + 's', Items.stick, + 'W', Blocks.wool, + 'T', new ItemStack(Config.tcMiscResource, 1, MiscResource.THAUMIUM.ordinal()) }); thaumGrafter = ThaumcraftApi.addArcaneCraftingRecipe("MB_Grafter", new ItemStack(Config.thaumiumGrafter), new AspectList().add(Aspect.ORDER, 5), new Object[] { - " T", - " s ", - "s ", - 's', - Items.stick, - 'T', - new ItemStack(Config.tcMiscResource, 1, - MiscResource.THAUMIUM.ordinal()) }); + " T", " s ", "s ", + 's', Items.stick, + 'T', new ItemStack(Config.tcMiscResource, 1, MiscResource.THAUMIUM.ordinal()) }); - frameMagic = ThaumcraftApi.addArcaneCraftingRecipe( - "MB_FrameMagic", - new ItemStack(Config.hiveFrameMagic), - new AspectList().add(Aspect.ORDER, 5).add(Aspect.AIR, 2) - .add(Aspect.EARTH, 2), new Object[] { - "sss", - "sCs", - "sss", - 's', - Items.stick, - 'C', - new ItemStack(Config.tcMiscResource, 1, - MiscResource.ENCHANTED_FABRIC.ordinal()) }); + frameMagic = ThaumcraftApi.addArcaneCraftingRecipe("MB_FrameMagic", new ItemStack(Config.hiveFrameMagic), + new AspectList().add(Aspect.ORDER, 5).add(Aspect.AIR, 2).add(Aspect.EARTH, 2), new Object[] { + "sss", "sCs", "sss", + 's', Items.stick, + 'C', new ItemStack(Config.tcMiscResource, 1, MiscResource.ENCHANTED_FABRIC.ordinal()) }); + + visAuraProvider = ThaumcraftApi.addArcaneCraftingRecipe("MB_VisAuraProvider", new ItemStack(Config.visAuraProvider), + new AspectList().add(Aspect.ORDER, 60).add(Aspect.AIR, 60).add(Aspect.ENTROPY, 60).add(Aspect.WATER, 60), + new Object[] { + "ngn", "gvg", "npn", + 'n', Items.gold_nugget, + 'g', new ItemStack(Config.tcWooden, 1, ThaumcraftHelper.WoodenDeviceType.PLANKS_GREATWOOD.ordinal()), + 'v', new ItemStack(Config.tcMetal, 1, ThaumcraftHelper.MetalDeviceType.VIS_RELAY.ordinal()), + 'p', Config.pollen.getStackForType(PollenType.UNUSUAL)}); - essenceLife = ThaumcraftApi.addCrucibleRecipe("MB_EssenceLife", - Config.miscResources - .getStackForType(ResourceType.ESSENCE_FALSE_LIFE), + essenceLife = ThaumcraftApi.addCrucibleRecipe("MB_EssenceLife", Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE), new ItemStack(Blocks.red_flower), new AspectList().add(Aspect.EXCHANGE, 4).add(Aspect.PLANT, 4)); @@ -304,86 +305,47 @@ public class ThaumcraftHelper { new ItemStack(Items.rotten_flesh), new AspectList().add(Aspect.DEATH, 4).add(Aspect.ENTROPY, 4)); - essenceArmor = ThaumcraftApi - .addCrucibleRecipe( - "MB_EssenceArmor", - Config.miscResources - .getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY), + essenceArmor = ThaumcraftApi.addCrucibleRecipe("MB_EssenceArmor", Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY), new ItemStack(Items.leather), - new AspectList().add(Aspect.ARMOR, 4).add(Aspect.MAGIC, - 2)); + new AspectList().add(Aspect.ARMOR, 4).add(Aspect.MAGIC, 2)); - output = Config.miscResources - .getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE); - essenceUnstableA = ThaumcraftApi - .addCrucibleRecipe( - "MB_EssenceUnstable", - output, + output = Config.miscResources.getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE); + essenceUnstableA = ThaumcraftApi.addCrucibleRecipe("MB_EssenceUnstable", output, Config.propolis.getStackForType(PropolisType.UNSTABLE), - new AspectList().add(Aspect.ENTROPY, 2).add( - Aspect.EXCHANGE, 1)); + new AspectList().add(Aspect.ENTROPY, 2).add(Aspect.EXCHANGE, 1)); - essenceUnstableB = ThaumcraftApi - .addCrucibleRecipe( - "MB_EssenceUnstable", - output, + essenceUnstableB = ThaumcraftApi.addCrucibleRecipe("MB_EssenceUnstable",output, new ItemStack(Blocks.netherrack), - new AspectList().add(Aspect.ENTROPY, 8).add( - Aspect.EXCHANGE, 5)); + new AspectList().add(Aspect.ENTROPY, 8).add(Aspect.EXCHANGE, 5)); - essenceTime = ThaumcraftApi.addCrucibleRecipe("MB_EssenceTime", - Config.miscResources - .getStackForType(ResourceType.ESSENCE_LOST_TIME), + essenceTime = ThaumcraftApi.addCrucibleRecipe("MB_EssenceTime", Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME), new ItemStack(Items.clock), - new AspectList().add(Aspect.ORDER, 10).add(Aspect.VOID, 10) - .add(Aspect.TRAP, 4)); + new AspectList().add(Aspect.ORDER, 10).add(Aspect.VOID, 10).add(Aspect.TRAP, 4)); input = new ItemStack(Items.ender_pearl); - singularityA = ThaumcraftApi.addInfusionCraftingRecipe( - "MB_DimensionalSingularity", Config.miscResources - .getStackForType(ResourceType.DIMENSIONAL_SINGULARITY, - 3), 5, new AspectList() - .add(Aspect.ELDRITCH, 10).add(Aspect.EXCHANGE, 20), + singularityA = ThaumcraftApi.addInfusionCraftingRecipe("MB_DimensionalSingularity", + Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY,3), + 5, + new AspectList().add(Aspect.ELDRITCH, 10).add(Aspect.EXCHANGE, 20), new ItemStack(Blocks.gold_block), new ItemStack[] { input, input }); ItemStack in2 = new ItemStack(Items.diamond); - singularityB = ThaumcraftApi.addInfusionCraftingRecipe( - "MB_DimensionalSingularity", - Config.miscResources.getStackForType( - ResourceType.DIMENSIONAL_SINGULARITY, 3), + singularityB = ThaumcraftApi.addInfusionCraftingRecipe("MB_DimensionalSingularity", + Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY, 3), 6, - new AspectList().add(Aspect.ELDRITCH, 10) - .add(Aspect.EXCHANGE, 20).add(Aspect.VOID, 15), + new AspectList().add(Aspect.ELDRITCH, 10).add(Aspect.EXCHANGE, 20).add(Aspect.VOID, 15), Config.propolis.getStackForType(PropolisType.UNSTABLE), new ItemStack[] { input, input, in2 }); - essenceOblivion = ThaumcraftApi - .addShapelessArcaneCraftingRecipe( - "MB_EssenceOblivion", - Config.miscResources - .getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION), - new AspectList().add(Aspect.ENTROPY, 25) - .add(Aspect.AIR, 40).add(Aspect.ORDER, 15), - new Object[] { - Config.miscResources - .getStackForType(ResourceType.DIMENSIONAL_SINGULARITY), - Blocks.dragon_egg, }); + essenceOblivion = ThaumcraftApi.addShapelessArcaneCraftingRecipe("MB_EssenceOblivion", + Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION), + new AspectList().add(Aspect.ENTROPY, 25).add(Aspect.AIR, 40).add(Aspect.ORDER, 15), + new Object[] { + Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY), + Blocks.dragon_egg, }); } - private static Object frameMagic; - private static Object thaumScoop; - private static Object thaumGrafter; - private static Object singularityA; - private static Object singularityB; - private static Object essenceLife; - private static Object essenceDeath; - private static Object essenceArmor; - private static Object essenceUnstableA; - private static Object essenceUnstableB; - private static Object essenceTime; - private static Object essenceOblivion; - private static void setupResearch() { ArrayList list; @@ -413,7 +375,7 @@ public class ThaumcraftHelper { ResearchItem researchFragment = new ResearchItem("MB_LoreFragment", category, new AspectList(), - 0, -3, 0, + 0, -3, 1, Config.miscResources.getStackForType(ResourceType.LORE_FRAGMENT)) .setPages(getResearchPage("MB_LoreFragment.1"), new ResearchPage(recipe)).setParents("MB_Root") .setStub().setAutoUnlock().setRound().registerResearchItem(); @@ -426,15 +388,15 @@ public class ThaumcraftHelper { .setParentsHidden("THAUMIUM").registerResearchItem(); ResearchItem thaumiumGrafterR = new ResearchItem("MB_Grafter", category, - new AspectList().add(Aspect.TOOL, 2).add(Aspect.TREE, 1).add(Aspect.GREED, 1), - -2, -1, 4, + new AspectList().add(Aspect.TOOL, 1).add(Aspect.TREE, 1).add(Aspect.GREED, 1), + -2, -1, 2, new ItemStack(Config.thaumiumGrafter)) .setPages(getResearchPage("MB_Grafter.1"), new ResearchPage((IArcaneRecipe) thaumGrafter)) .setParents("MB_Scoop").registerResearchItem(); ResearchItem frameMagicR = new ResearchItem("MB_FrameMagic", category, - new AspectList().add(Aspect.TOOL, 2).add(Aspect.ARMOR, 1), - -2, 1, 2, + new AspectList().add(Aspect.TOOL, 1).add(Aspect.ARMOR, 1), + -2, 1, 1, new ItemStack(Config.hiveFrameMagic)) .setPages(getResearchPage("MB_FrameMagic"), new ResearchPage((IArcaneRecipe) frameMagic)) .registerResearchItem(); @@ -446,8 +408,8 @@ public class ThaumcraftHelper { recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameGentle), list); ResearchItem essenceFalseLifeR = new ResearchItem("MB_EssenceLife", category, - new AspectList().add(Aspect.LIFE, 2).add(Aspect.MAGIC, 1), - 2, -1, 2, + new AspectList().add(Aspect.LIFE, 1).add(Aspect.MAGIC, 1), + 2, -1, 1, Config.miscResources.getStackForType(ResourceType.ESSENCE_FALSE_LIFE)) .setPages(getResearchPage("MB_EssenceLife.1"), new ResearchPage((CrucibleRecipe) essenceLife), @@ -461,7 +423,7 @@ public class ThaumcraftHelper { ResearchItem essenceDurabilityR = new ResearchItem("MB_EssenceArmor", category, new AspectList().add(Aspect.ARMOR, 1).add(Aspect.MAGIC, 1), - 5, 0, 3, + 5, 0, 2, Config.miscResources.getStackForType(ResourceType.ESSENCE_EVERLASTING_DURABILITY)) .setPages(getResearchPage("MB_EssenceArmor.1"), new ResearchPage((CrucibleRecipe) essenceArmor), @@ -474,14 +436,16 @@ public class ThaumcraftHelper { recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameMetabolic), list); ResearchItem essenceUnstableR = new ResearchItem( "MB_EssenceUnstable", category, - new AspectList().add(Aspect.ENTROPY, 2).add(Aspect.ORDER, 1), - 3, 1, 4, + new AspectList().add(Aspect.ENTROPY, 1).add(Aspect.ORDER, 1), + 3, 1, 2, Config.miscResources.getStackForType(ResourceType.ESSENCE_FICKLE_PERMANENCE)) - .setPages(getResearchPage("MB_EssenceUnstable.1"), - new ResearchPage((CrucibleRecipe) essenceUnstableA), - new ResearchPage((CrucibleRecipe) essenceUnstableB), - new ResearchPage(recipe)).setParents("MB_EssenceLife") - .setConcealed().registerResearchItem(); + .setPages(getResearchPage("MB_EssenceUnstable.1"), + new ResearchPage((CrucibleRecipe) essenceUnstableA), + new ResearchPage((CrucibleRecipe) essenceUnstableB), + new ResearchPage(recipe)) + .setParents("MB_EssenceLife") + .setConcealed() + .registerResearchItem(); list = new ArrayList(2); list.add(Config.miscResources .getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE)); @@ -489,14 +453,15 @@ public class ThaumcraftHelper { recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameNecrotic), list); ResearchItem essenceShallowGraveR = new ResearchItem("MB_EssenceDeath", category, - new AspectList().add(Aspect.DEATH, 2).add(Aspect.MAGIC, 1), - 2, 3, 2, + new AspectList().add(Aspect.DEATH, 1).add(Aspect.MAGIC, 1), + 2, 3, 1, Config.miscResources .getStackForType(ResourceType.ESSENCE_SHALLOW_GRAVE)) - .setPages(getResearchPage("MB_EssenceDeath.1"), - new ResearchPage((CrucibleRecipe) essenceDeath), - new ResearchPage(recipe)) - .setParents("MB_EssenceUnstable").setConcealed() - .registerResearchItem(); + .setPages(getResearchPage("MB_EssenceDeath.1"), + new ResearchPage((CrucibleRecipe) essenceDeath), + new ResearchPage(recipe)) + .setParents("MB_EssenceUnstable") + .setConcealed() + .registerResearchItem(); list = new ArrayList(2); list.add(Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME)); @@ -504,23 +469,26 @@ public class ThaumcraftHelper { recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameTemporal), list); ResearchItem essenceTimeR = new ResearchItem("MB_EssenceTime", category, - new AspectList().add((Aspect) aspectTime, 2).add(Aspect.MAGIC, 1), - 0, 2, 5, + new AspectList().add((Aspect) aspectTime, 1).add(Aspect.MAGIC, 1), + 0, 2, 2, Config.miscResources.getStackForType(ResourceType.ESSENCE_LOST_TIME)) .setPages(getResearchPage("MB_EssenceTime.1"), new ResearchPage((CrucibleRecipe) essenceTime), new ResearchPage(recipe)) - .setParents("MB_EssenceUnstable").setConcealed() + .setParents("MB_EssenceUnstable") + .setConcealed() .registerResearchItem(); ResearchItem singularityR = new ResearchItem("MB_DimensionalSingularity", category, - new AspectList().add(Aspect.ELDRITCH, 2).add((Aspect) aspectTime, 1).add(Aspect.VOID, 1), - -1, 4, 5, + new AspectList().add(Aspect.ELDRITCH, 1).add((Aspect) aspectTime, 1).add(Aspect.VOID, 1), + -1, 4, 3, Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY)) .setPages(getResearchPage("MB_DimensionalSingularity.1"), new ResearchPage((InfusionRecipe) singularityA), new ResearchPage((InfusionRecipe) singularityB)) - .setParents("MB_FrameMagic", "MB_EssenceTime", "MB_EssenceDeath").setConcealed().setSpecial() + .setParents("MB_FrameMagic", "MB_EssenceTime", "MB_EssenceDeath") + .setConcealed() + .setSpecial() .registerResearchItem(); list = new ArrayList(2); @@ -529,14 +497,23 @@ public class ThaumcraftHelper { recipe = new ShapelessRecipes(new ItemStack(Config.hiveFrameOblivion), list); ResearchItem essenceOblivionR = new ResearchItem("MB_EssenceOblivion", category, - new AspectList().add(Aspect.VOID, 2).add(Aspect.HUNGER, 1).add((Aspect) aspectTime, 1), - -3, 3, 5, + new AspectList().add(Aspect.VOID, 1).add(Aspect.HUNGER, 1).add((Aspect) aspectTime, 1), + -3, 3, 3, Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION)) .setPages(getResearchPage("MB_EssenceOblivion.1"), new ResearchPage((IArcaneRecipe) essenceOblivion), new ResearchPage(recipe)) .setParents("MB_DimensionalSingularity").setConcealed() .registerResearchItem(); + + ResearchItem visAuraProviderR = new ResearchItem("MB_VisAuraProvider", category, + new AspectList().add(Aspect.MAGIC, 1).add(Aspect.ENERGY, 1).add(Aspect.AURA, 1), + -5, 5, 3, + new ItemStack(Config.visAuraProvider)) + .setPages(getResearchPage("MB_VisAuraProvider.1"), + new ResearchPage((IArcaneRecipe) visAuraProvider)) + .setParentsHidden("NodeRelay") + .registerResearchItem(); } private static ResearchPage getResearchPage(String ident) { diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index 8ccd674..b4ebbd1 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -10,6 +10,7 @@ import magicbees.main.CommonProxy; import magicbees.main.MagicBees; import magicbees.main.utils.ChunkCoords; import magicbees.main.utils.ItemStackUtils; +import magicbees.main.utils.LogHelper; import magicbees.main.utils.net.NetworkEventHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -54,7 +55,6 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory private static final int SLOT_PRODUCTS_COUNT = 7; private static final int AURAPROVIDER_SEARCH_RADIUS = 6; - private static int MAX_BLOCKS_SEARCH_PER_CHECK = (AURAPROVIDER_SEARCH_RADIUS * 2 + 1) * 8; private static int CHARGE_TIME_MUTATION = 850; private static int CHARGE_TIME_DEATH = 400; private static int CHARGE_TIME_PRODUCTION = 300; @@ -602,6 +602,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory else { updateAuraProvider(); } + tickCharges(); logic.update(); @@ -649,79 +650,80 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory public boolean isMutationBoosted() { return (flags & FLAG_MUTATIONCHARGE) == FLAG_MUTATIONCHARGE; } + + @Override + public void validate() { + super.validate(); + if (!worldObj.isRemote) { + NetworkEventHandler.getInstance().sendFlagsUpdate(this, new int[] {flags}); + } + } private void updateAuraProvider() { - if (worldObj.getTotalWorldTime() % 15 == 0 && locationHasAuraProvider(auraProviderPosition)) { - + if (worldObj.getTotalWorldTime() % 10 != 0) { + return; + } + if (!locationHasAuraProvider(auraProviderPosition)) { + this.auraProvider = null; + this.auraProviderPosition = null; + return; } int oldFlags = flags; - if (!isMutationBoosted()) { - if (this.auraProvider.getMutationCharge()) { - flags |= FLAG_MUTATIONCHARGE; - chargeTimestamps[OFFSET_MUTATION] = worldObj.getTotalWorldTime(); - } - } - else { - if (chargeTimestamps[OFFSET_MUTATION] + CHARGE_TIME_MUTATION <= worldObj.getTotalWorldTime()) { - if (!this.auraProvider.getMutationCharge()) { - flags = flags & ~FLAG_MUTATIONCHARGE; - } - } + if (!isMutationBoosted() && this.auraProvider.getMutationCharge()) { + flags |= FLAG_MUTATIONCHARGE; + chargeTimestamps[OFFSET_MUTATION] = worldObj.getTotalWorldTime(); } - if (!isDeathRateBoosted()) { - if (this.auraProvider.getDeathRateCharge()) { - flags |= FLAG_DEATHCHARGE; - chargeTimestamps[OFFSET_DEATH] = worldObj.getTotalWorldTime(); - } - } - else { - if (chargeTimestamps[OFFSET_DEATH] + CHARGE_TIME_DEATH <= worldObj.getTotalWorldTime()) { - if (!this.auraProvider.getDeathRateCharge()) { - flags = flags & ~FLAG_DEATHCHARGE; - } - } + if (!isDeathRateBoosted() && this.auraProvider.getDeathRateCharge()) { + flags |= FLAG_DEATHCHARGE; + chargeTimestamps[OFFSET_DEATH] = worldObj.getTotalWorldTime(); } - if (!isProductionBoosted()) { - if (this.auraProvider.getProductionCharge()) { - flags |= FLAG_PRODUCTIONCHARGE; - chargeTimestamps[OFFSET_PRODUCTION] = worldObj.getTotalWorldTime(); - } - } - else { - if (chargeTimestamps[OFFSET_PRODUCTION] + CHARGE_TIME_PRODUCTION <= worldObj.getTotalWorldTime()) { - if (!this.auraProvider.getProductionCharge()) { - flags = flags & ~FLAG_PRODUCTIONCHARGE; - } - } + if (!isProductionBoosted() && this.auraProvider.getProductionCharge()) { + flags |= FLAG_PRODUCTIONCHARGE; + chargeTimestamps[OFFSET_PRODUCTION] = worldObj.getTotalWorldTime(); } if (oldFlags != flags) { NetworkEventHandler.getInstance().sendFlagsUpdate(this, new int[] {flags}); } } + + private void tickCharges() { + int oldFlags = flags; + if (isMutationBoosted()) { + if (chargeTimestamps[OFFSET_MUTATION] + CHARGE_TIME_MUTATION <= worldObj.getTotalWorldTime()) { + if (auraProvider == null || !this.auraProvider.getMutationCharge()) { + flags = flags & ~FLAG_MUTATIONCHARGE; + } + } + } + if (isDeathRateBoosted()) { + if (chargeTimestamps[OFFSET_DEATH] + CHARGE_TIME_DEATH <= worldObj.getTotalWorldTime()) { + if (auraProvider == null || !this.auraProvider.getDeathRateCharge()) { + flags = flags & ~FLAG_DEATHCHARGE; + } + } + } + if (isProductionBoosted()) { + if (chargeTimestamps[OFFSET_PRODUCTION] + CHARGE_TIME_PRODUCTION <= worldObj.getTotalWorldTime()) { + if (auraProvider == null || !this.auraProvider.getProductionCharge()) { + flags = flags & ~FLAG_PRODUCTIONCHARGE; + } + } + } + if (oldFlags != flags) { + NetworkEventHandler.getInstance().sendFlagsUpdate(this, new int[] {flags}); + } + } private void findAuraProvider() { - if (worldObj.getTotalWorldTime() % 10 != 0) { + if (worldObj.getTotalWorldTime() % 5 != 0) { return; } - if (this.auraProviderPosition != null) { - // Will end up here after loading from save with a valid auraProvider. - if (locationHasAuraProvider(auraProviderPosition)) { - IMagicApiaryAuraProvider provider = (IMagicApiaryAuraProvider)(worldObj.getTileEntity(auraProviderPosition.x, - auraProviderPosition.y, - auraProviderPosition.x)); - if (provider == null) { - // ... well, it WAS here... - this.auraProviderPosition = null; - } - return; - } - } - else { + if (this.auraProviderPosition == null) { List chunks = getChunksInSearchRange(); for (Chunk chunk : chunks) { if (searchChunkForBooster(chunk)) { @@ -729,6 +731,11 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory } } } + else { + if (!locationHasAuraProvider(auraProviderPosition)) { + this.auraProviderPosition = null; + } + } } private List getChunksInSearchRange() { @@ -758,6 +765,8 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory Vec3 result = apiaryPos.subtract(tePos); if (result.lengthVector() <= AURAPROVIDER_SEARCH_RADIUS) { saveAuraProviderPosition(entity.xCoord, entity.yCoord, entity.zCoord); + this.auraProvider = (IMagicApiaryAuraProvider)entity; + return true; } } } diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang index 20de959..e2a52d8 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -514,3 +514,7 @@ tc.research_page.MB_DimensionalSingularity.1=While it may appear similar to the tc.research_name.MB_EssenceOblivion=Essence of Scornful Oblivion tc.research_text.MB_EssenceOblivion=[MB] Cast aside with malice tc.research_page.MB_EssenceOblivion.1=Breeding bees for mutations can be aggrivating, especially whith long-lived species. With a little cleverness and only the slightest hint of smugness, you have found a way to utilize the Dimensional Singularity in a manner that only sucks away the life force of your tiny flying friends, bit by bit. Well, maybe significant amounts all at once. It's probably not going to affect them too badly.
It may be somewhat tricky to obtain more than one of the §5Dragon Eggs§0 nessecary to obtain more than one of these. Perhaps there is a bee species that can assist with the limitation. + +tc.research_name.MB_VisAuraProvider=Vis Apiary Booster +tc.research_text.MB_VisAuraProvider=[MB]Vis? What about Bis? +tc.research_page.MB_VisAuraProvider.1=Blah blah blah. \ No newline at end of file From 0fd8b319debbe0e01dc898323561f64ccf309f5c Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 28 Mar 2015 02:51:41 -0700 Subject: [PATCH 17/17] Fix apiary not retaining AuraCharge state --- .../magicbees/api/bees/IAuraChargeType.java | 4 + .../api/bees/IMagicApiaryAuraProvider.java | 23 ++- .../java/magicbees/bees/AuraChargeType.java | 22 +++ .../main/utils/net/EventAuraChargeUpdate.java | 69 +++++++ .../main/utils/net/NetworkEventHandler.java | 15 ++ .../magicbees/tileentity/AuraCharges.java | 70 +++++++ .../tileentity/ITileEntityAuraCharged.java | 5 + .../tileentity/TileEntityMagicApiary.java | 179 +++++++----------- .../tileentity/TileEntityVisAuraProvider.java | 127 +++++++------ 9 files changed, 341 insertions(+), 173 deletions(-) create mode 100644 src/main/java/magicbees/api/bees/IAuraChargeType.java create mode 100644 src/main/java/magicbees/bees/AuraChargeType.java create mode 100644 src/main/java/magicbees/main/utils/net/EventAuraChargeUpdate.java create mode 100644 src/main/java/magicbees/tileentity/AuraCharges.java create mode 100644 src/main/java/magicbees/tileentity/ITileEntityAuraCharged.java diff --git a/src/main/java/magicbees/api/bees/IAuraChargeType.java b/src/main/java/magicbees/api/bees/IAuraChargeType.java new file mode 100644 index 0000000..72387b3 --- /dev/null +++ b/src/main/java/magicbees/api/bees/IAuraChargeType.java @@ -0,0 +1,4 @@ +package magicbees.api.bees; + +public interface IAuraChargeType { +} diff --git a/src/main/java/magicbees/api/bees/IMagicApiaryAuraProvider.java b/src/main/java/magicbees/api/bees/IMagicApiaryAuraProvider.java index d2d5096..1993b44 100644 --- a/src/main/java/magicbees/api/bees/IMagicApiaryAuraProvider.java +++ b/src/main/java/magicbees/api/bees/IMagicApiaryAuraProvider.java @@ -15,23 +15,32 @@ public interface IMagicApiaryAuraProvider { * * @return True if a charge is given; false otherwise. */ - public boolean getMutationCharge(); - + boolean getMutationCharge(); + /** * Requests a mutation charge from the aura provider. If true is returned, the * aura provider should decrement its internal charge by one. If there are no * charges remaining, it should return false. - * + * * @return True if a charge is given; false otherwise. */ - public boolean getDeathRateCharge(); - + boolean getDeathRateCharge(); + /** * Requests a mutation charge from the aura provider. If true is returned, the * aura provider should decrement its internal charge by one. If there are no * charges remaining, it should return false. - * + * * @return True if a charge is given; false otherwise. */ - public boolean getProductionCharge(); + boolean getProductionCharge(); + + /** + * Requests a mutation charge from the aura provider. If true is returned, the + * aura provider should decrement its internal charge by one. If there are no + * charges remaining, it should return false. + * + * @return True if a charge is given; false otherwise. + */ + boolean getCharge(IAuraChargeType auraChargeType); } diff --git a/src/main/java/magicbees/bees/AuraChargeType.java b/src/main/java/magicbees/bees/AuraChargeType.java new file mode 100644 index 0000000..f811d4d --- /dev/null +++ b/src/main/java/magicbees/bees/AuraChargeType.java @@ -0,0 +1,22 @@ +package magicbees.bees; + +import magicbees.api.bees.IAuraChargeType; +import thaumcraft.api.aspects.Aspect; + +public enum AuraChargeType implements IAuraChargeType { + MUTATION(Aspect.WATER, 850, 11), + DEATH(Aspect.ENTROPY, 400, 5), + PRODUCTION(Aspect.AIR, 300, 3); + + public final int duration; + public final Aspect aspect; + /** The number of ticks to count between draining vis from the environment **/ + public final int tickRate; + public final int flag = 1 << ordinal(); + + AuraChargeType(Aspect aspect, int duration, int tickRate) { + this.aspect = aspect; + this.duration = duration; + this.tickRate = tickRate; + } +} diff --git a/src/main/java/magicbees/main/utils/net/EventAuraChargeUpdate.java b/src/main/java/magicbees/main/utils/net/EventAuraChargeUpdate.java new file mode 100644 index 0000000..d472d33 --- /dev/null +++ b/src/main/java/magicbees/main/utils/net/EventAuraChargeUpdate.java @@ -0,0 +1,69 @@ +package magicbees.main.utils.net; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.tileentity.TileEntity; + +import cpw.mods.fml.client.FMLClientHandler; + +import magicbees.main.utils.ChunkCoords; +import magicbees.main.utils.LogHelper; +import magicbees.main.utils.net.NetworkEventHandler.EventType; +import magicbees.tileentity.AuraCharges; +import magicbees.tileentity.ITileEntityAuraCharged; + +public class EventAuraChargeUpdate extends EventCoords { + + private int flags; + + public EventAuraChargeUpdate(ChunkCoords position, AuraCharges auraCharges) { + super(EventType.AURA_CHARGE_UPDATE, position); + flags = auraCharges.writeToFlags(); + } + + public EventAuraChargeUpdate(DataInputStream byteStream) { + super(EventType.FLAGS_UPDATE, byteStream); + + this.readDataFromInputStream(byteStream); + } + + @Override + protected void writeDataToOutputStream(DataOutputStream byteStream) { + super.writeDataToOutputStream(byteStream); + + try { + byteStream.writeInt(flags); + } + catch (IOException e) { + LogHelper.error("Could not write EventAuraChargeUpdate data to stream."); + e.printStackTrace(); + } + } + + @Override + protected void readDataFromInputStream(DataInputStream byteStream) { + super.readDataFromInputStream(byteStream); + + try { + this.flags = byteStream.readInt(); + } + catch (IOException e) { + LogHelper.error("Could not read EventAuraChargeUpdate data from stream."); + e.printStackTrace(); + } + } + + @Override + public void process(EntityPlayerMP player) { + TileEntity tile = FMLClientHandler.instance().getClient().theWorld.getTileEntity(getCoords().x, getCoords().y, getCoords().z); + + if (tile != null && tile instanceof ITileEntityAuraCharged) { + AuraCharges auraCharges = ((ITileEntityAuraCharged) tile).getAuraCharges(); + auraCharges.readFromFlags(flags); + } + } + +} diff --git a/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java b/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java index 4d0df50..91ef606 100644 --- a/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java +++ b/src/main/java/magicbees/main/utils/net/NetworkEventHandler.java @@ -11,6 +11,9 @@ import magicbees.main.utils.ChunkCoords; import magicbees.main.utils.LogHelper; import magicbees.main.utils.VersionInfo; import magicbees.main.utils.error.InvalidEventTypeIndexException; +import magicbees.tileentity.AuraCharges; +import magicbees.tileentity.ITileEntityAuraCharged; + import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.network.NetHandlerPlayServer; @@ -35,6 +38,7 @@ public class NetworkEventHandler { UNKNOWN, INVENTORY_UPDATE, FLAGS_UPDATE, + AURA_CHARGE_UPDATE ; } @@ -68,6 +72,13 @@ public class NetworkEventHandler { sendPacket(packet); } + + public void sendAuraChargeUpdate(T entity, AuraCharges auraCharges) { + EventAuraChargeUpdate event = new EventAuraChargeUpdate(new ChunkCoords(entity), auraCharges); + FMLProxyPacket packet = event.getPacket(); + + sendPacket(packet); + } private void sendPacket(FMLProxyPacket packet) { if (FMLCommonHandler.instance().getEffectiveSide().isServer()) { @@ -102,6 +113,10 @@ public class NetworkEventHandler { EventFlagsUpdate eventData = new EventFlagsUpdate(data); eventData.process(player); } + else if (eventId == EventType.AURA_CHARGE_UPDATE.ordinal()) { + EventAuraChargeUpdate evenData = new EventAuraChargeUpdate(data); + evenData.process(player); + } else { throw new InvalidEventTypeIndexException(""); } diff --git a/src/main/java/magicbees/tileentity/AuraCharges.java b/src/main/java/magicbees/tileentity/AuraCharges.java new file mode 100644 index 0000000..aa5edcc --- /dev/null +++ b/src/main/java/magicbees/tileentity/AuraCharges.java @@ -0,0 +1,70 @@ +package magicbees.tileentity; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; + +import magicbees.bees.AuraChargeType; + +public class AuraCharges { + private static final String auraChargesTagName = "AuraCharges"; + + private final Map charges = new HashMap(AuraChargeType.values().length); + + public void start(AuraChargeType auraChargeType, World worldObj) { + charges.put(auraChargeType, worldObj.getTotalWorldTime()); + } + + public boolean isActive(AuraChargeType auraChargeType) { + return charges.keySet().contains(auraChargeType); + } + + public boolean isExpired(AuraChargeType auraChargeType, World worldObj) { + Long chargeStart = charges.get(auraChargeType); + return chargeStart == null || chargeStart + auraChargeType.duration <= worldObj.getTotalWorldTime(); + } + + public void stop(AuraChargeType AuraChargeType) { + charges.remove(AuraChargeType); + } + + public void writeToNBT(NBTTagCompound nbtTagCompound) { + NBTTagCompound auraChargeTags = new NBTTagCompound(); + for (Map.Entry chargeEntry : charges.entrySet()) { + String chargeName = chargeEntry.getKey().toString(); + Long chargeStart = chargeEntry.getValue(); + auraChargeTags.setLong(chargeName, chargeStart); + } + nbtTagCompound.setTag(auraChargesTagName, auraChargeTags); + } + + public void readFromNBT(NBTTagCompound nbtTagCompound) { + NBTTagCompound auraChargeTags = nbtTagCompound.getCompoundTag(auraChargesTagName); + for (AuraChargeType auraCharge : AuraChargeType.values()) { + String chargeName = auraCharge.toString(); + Long chargeStart = auraChargeTags.getLong(chargeName); + if (chargeStart > 0) { + charges.put(auraCharge, chargeStart); + } + } + } + + public int writeToFlags() { + int flags = 0; + for (AuraChargeType auraChargeType : charges.keySet()) { + flags |= auraChargeType.flag; + } + return flags; + } + + public void readFromFlags(int flags) { + charges.clear(); + for (AuraChargeType auraCharge : AuraChargeType.values()) { + if ((flags & auraCharge.flag) > 0) { + charges.put(auraCharge, 0L); + } + } + } +} diff --git a/src/main/java/magicbees/tileentity/ITileEntityAuraCharged.java b/src/main/java/magicbees/tileentity/ITileEntityAuraCharged.java new file mode 100644 index 0000000..13abd75 --- /dev/null +++ b/src/main/java/magicbees/tileentity/ITileEntityAuraCharged.java @@ -0,0 +1,5 @@ +package magicbees.tileentity; + +public interface ITileEntityAuraCharged { + AuraCharges getAuraCharges(); +} diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index b4ebbd1..225e7a5 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -4,13 +4,14 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import magicbees.bees.AuraChargeType; import magicbees.api.bees.IMagicApiaryAuraProvider; import magicbees.bees.BeeManager; import magicbees.main.CommonProxy; import magicbees.main.MagicBees; import magicbees.main.utils.ChunkCoords; import magicbees.main.utils.ItemStackUtils; -import magicbees.main.utils.LogHelper; +import magicbees.main.utils.net.EventAuraChargeUpdate; import magicbees.main.utils.net.NetworkEventHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; @@ -19,6 +20,7 @@ import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Vec3; import net.minecraft.world.ChunkPosition; @@ -41,7 +43,7 @@ import forestry.api.core.IErrorState; import forestry.api.genetics.IIndividual; import forestry.core.utils.Utils; -public class TileEntityMagicApiary extends TileEntity implements ISidedInventory, IBeeHousing, ITileEntityFlags { +public class TileEntityMagicApiary extends TileEntity implements ISidedInventory, IBeeHousing, ITileEntityAuraCharged { public static final String tileEntityName = CommonProxy.DOMAIN + ".magicApiary"; private GameProfile ownerProfile; @@ -55,9 +57,6 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory private static final int SLOT_PRODUCTS_COUNT = 7; private static final int AURAPROVIDER_SEARCH_RADIUS = 6; - private static int CHARGE_TIME_MUTATION = 850; - private static int CHARGE_TIME_DEATH = 400; - private static int CHARGE_TIME_PRODUCTION = 300; private IBeekeepingLogic logic; private IMagicApiaryAuraProvider auraProvider; @@ -66,22 +65,14 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory private int displayHealthMax = 0; private int displayHealth = 0; private boolean init = false; - - private static final int OFFSET_MUTATION = 0; - private static final int OFFSET_DEATH = 1; - private static final int OFFSET_PRODUCTION = 2; - private static final int FLAG_MUTATIONCHARGE = 1 << OFFSET_MUTATION; - private static final int FLAG_DEATHCHARGE = 1 << OFFSET_DEATH; - private static final int FLAG_PRODUCTIONCHARGE = 1 << OFFSET_PRODUCTION; - private long[] chargeTimestamps = new long[3]; - private int flags; - + + private final AuraCharges auraCharges = new AuraCharges(); + private IErrorState errorState = ErrorStateRegistry.getErrorState("ok"); private ItemStack[] items; public TileEntityMagicApiary(){ - flags = 0; items = new ItemStack[12]; logic = BeeManager.beeRoot.createBeekeepingLogic(this); } @@ -518,11 +509,8 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory } ChunkCoords.writeToNBT(this.auraProviderPosition, compound); - - compound.setInteger("flags", this.flags); - compound.setLong("timestamp0", chargeTimestamps[0]); - compound.setLong("timestamp1", chargeTimestamps[1]); - compound.setLong("timestamp2", chargeTimestamps[2]); + + auraCharges.writeToNBT(compound); } @Override @@ -532,7 +520,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory NBTTagList items = compound.getTagList("Items", Constants.NBT.TAG_COMPOUND); for (int i = 0; i < items.tagCount(); i++) { - NBTTagCompound item = (NBTTagCompound)items.getCompoundTagAt(i); + NBTTagCompound item = items.getCompoundTagAt(i); int slot = item.getByte("Slot"); if (slot >= 0 && slot < getSizeInventory()) { @@ -543,12 +531,16 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory int biomeId = compound.getInteger("BiomeId"); biome = BiomeGenBase.getBiome(biomeId); logic.readFromNBT(compound); - + this.auraProviderPosition = ChunkCoords.readFromNBT(compound); - this.flags = compound.getInteger("flags"); - this.chargeTimestamps[0] = compound.getLong("timestamp0"); - this.chargeTimestamps[1] = compound.getLong("timestamp1"); - this.chargeTimestamps[2] = compound.getLong("timestamp2"); + + auraCharges.readFromNBT(compound); + } + + @Override + public Packet getDescriptionPacket() { + EventAuraChargeUpdate event = new EventAuraChargeUpdate(new ChunkCoords(this), auraCharges); + return event.getPacket(); } public float getExactTemperature() { @@ -561,7 +553,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory @Override public void updateEntity() { - if (init == false) { + if (!init) { init = true; updateBiome(); } @@ -640,81 +632,52 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory } public boolean isProductionBoosted() { - return (flags & FLAG_PRODUCTIONCHARGE) == FLAG_PRODUCTIONCHARGE; + return auraCharges.isActive(AuraChargeType.PRODUCTION); } public boolean isDeathRateBoosted() { - return (flags & FLAG_DEATHCHARGE) == FLAG_DEATHCHARGE; + return auraCharges.isActive(AuraChargeType.DEATH); } public boolean isMutationBoosted() { - return (flags & FLAG_MUTATIONCHARGE) == FLAG_MUTATIONCHARGE; + return auraCharges.isActive(AuraChargeType.MUTATION); } - - @Override - public void validate() { - super.validate(); - if (!worldObj.isRemote) { - NetworkEventHandler.getInstance().sendFlagsUpdate(this, new int[] {flags}); - } - } private void updateAuraProvider() { if (worldObj.getTotalWorldTime() % 10 != 0) { return; } - if (!locationHasAuraProvider(auraProviderPosition)) { + if (getAuraProvider(auraProviderPosition) == null) { this.auraProvider = null; this.auraProviderPosition = null; return; } - int oldFlags = flags; - if (!isMutationBoosted() && this.auraProvider.getMutationCharge()) { - flags |= FLAG_MUTATIONCHARGE; - chargeTimestamps[OFFSET_MUTATION] = worldObj.getTotalWorldTime(); - } - - if (!isDeathRateBoosted() && this.auraProvider.getDeathRateCharge()) { - flags |= FLAG_DEATHCHARGE; - chargeTimestamps[OFFSET_DEATH] = worldObj.getTotalWorldTime(); - } - - if (!isProductionBoosted() && this.auraProvider.getProductionCharge()) { - flags |= FLAG_PRODUCTIONCHARGE; - chargeTimestamps[OFFSET_PRODUCTION] = worldObj.getTotalWorldTime(); - } + boolean auraChargesChanged = false; + for (AuraChargeType chargeType : AuraChargeType.values()) { + if (!auraCharges.isActive(chargeType) && auraProvider.getCharge(chargeType)) { + auraCharges.start(chargeType, worldObj); + auraChargesChanged = true; + } + } - if (oldFlags != flags) { - NetworkEventHandler.getInstance().sendFlagsUpdate(this, new int[] {flags}); + if (auraChargesChanged) { + NetworkEventHandler.getInstance().sendAuraChargeUpdate(this, auraCharges); } } private void tickCharges() { - int oldFlags = flags; - if (isMutationBoosted()) { - if (chargeTimestamps[OFFSET_MUTATION] + CHARGE_TIME_MUTATION <= worldObj.getTotalWorldTime()) { - if (auraProvider == null || !this.auraProvider.getMutationCharge()) { - flags = flags & ~FLAG_MUTATIONCHARGE; - } - } - } - if (isDeathRateBoosted()) { - if (chargeTimestamps[OFFSET_DEATH] + CHARGE_TIME_DEATH <= worldObj.getTotalWorldTime()) { - if (auraProvider == null || !this.auraProvider.getDeathRateCharge()) { - flags = flags & ~FLAG_DEATHCHARGE; - } - } - } - if (isProductionBoosted()) { - if (chargeTimestamps[OFFSET_PRODUCTION] + CHARGE_TIME_PRODUCTION <= worldObj.getTotalWorldTime()) { - if (auraProvider == null || !this.auraProvider.getProductionCharge()) { - flags = flags & ~FLAG_PRODUCTIONCHARGE; - } - } - } - if (oldFlags != flags) { - NetworkEventHandler.getInstance().sendFlagsUpdate(this, new int[] {flags}); + boolean auraChargesChanged = false; + + for (AuraChargeType chargeType : AuraChargeType.values()) { + if (auraCharges.isActive(chargeType) && auraCharges.isExpired(chargeType, worldObj) && (auraProvider == null || !auraProvider.getCharge(chargeType))) { + auraCharges.stop(chargeType); + auraChargesChanged = true; + } + } + + if (auraChargesChanged) { + NetworkEventHandler.getInstance().sendAuraChargeUpdate(this, auraCharges); } } @@ -722,20 +685,20 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory if (worldObj.getTotalWorldTime() % 5 != 0) { return; } - - if (this.auraProviderPosition == null) { - List chunks = getChunksInSearchRange(); - for (Chunk chunk : chunks) { - if (searchChunkForBooster(chunk)) { - break; - } - } - } - else { - if (!locationHasAuraProvider(auraProviderPosition)) { - this.auraProviderPosition = null; - } - } + + if (this.auraProviderPosition == null) { + List chunks = getChunksInSearchRange(); + for (Chunk chunk : chunks) { + if (searchChunkForBooster(chunk)) { + break; + } + } + } else { + this.auraProvider = getAuraProvider(auraProviderPosition); + if (auraProvider == null) { + this.auraProviderPosition = null; + } + } } private List getChunksInSearchRange() { @@ -777,11 +740,11 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory auraProviderPosition = new ChunkCoords(worldObj.provider.dimensionId, x, y, z); } - private boolean locationHasAuraProvider(ChunkCoords coords) { - return locationHasAuraProvider(coords.x, coords.y, coords.z); + private IMagicApiaryAuraProvider getAuraProvider(ChunkCoords coords) { + return getAuraProvider(coords.x, coords.y, coords.z); } - private boolean locationHasAuraProvider(int x, int y, int z) { + private IMagicApiaryAuraProvider getAuraProvider(int x, int y, int z) { Chunk chunk = worldObj.getChunkFromBlockCoords(x, z); x %= 16; z %= 16; @@ -793,16 +756,14 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory } ChunkPosition cPos = new ChunkPosition(x, y, z); TileEntity entity = (TileEntity)chunk.chunkTileEntityMap.get(cPos); - if (entity != null && entity instanceof IMagicApiaryAuraProvider) { - return true; - } - return false; - } + if (!(entity instanceof IMagicApiaryAuraProvider)) { + return null; + } + return (IMagicApiaryAuraProvider)entity; + } - @Override - public void setFlags(int[] flagArray) { - if (flagArray.length == 1) { - this.flags = flagArray[0]; - } - } + @Override + public AuraCharges getAuraCharges() { + return auraCharges; + } } diff --git a/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java b/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java index 028cf10..e87ab48 100644 --- a/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java +++ b/src/main/java/magicbees/tileentity/TileEntityVisAuraProvider.java @@ -1,5 +1,10 @@ package magicbees.tileentity; +import java.util.HashMap; +import java.util.Map; + +import magicbees.api.bees.IAuraChargeType; +import magicbees.bees.AuraChargeType; import magicbees.api.bees.IMagicApiaryAuraProvider; import magicbees.main.CommonProxy; import net.minecraft.nbt.NBTTagCompound; @@ -12,45 +17,51 @@ public class TileEntityVisAuraProvider extends TileEntity implements IMagicApiar public static final String tileEntityName = CommonProxy.DOMAIN + ".visAuraProvider"; private static final int MAX_CHARGES = 10; - int currentMutationCharges; - int currentDeathCharges; - int currentProductionCharges; - private static final int VIS_PER_CHARGE = 8; - private static Aspect ASPECT_MUTATION = Aspect.WATER; - private static Aspect ASPECT_DEATH = Aspect.ENTROPY; - private static Aspect ASPECT_PRODUCTION = Aspect.AIR; - int currentMutationVis; - int currentDeathVis; - int currentProductionVis; - + + private static class AuraCharge { + int charges; + int vis; + + public int[] toArray() { + return new int[]{charges, vis}; + } + + public void fromArray(int[] array) { + if (array.length == 2) { + charges = array[0]; + vis = array[1]; + } + } + } + + private final Map currentCharges; + public TileEntityVisAuraProvider() { super(); + + AuraChargeType[] auraChargeTypes = AuraChargeType.values(); + currentCharges = new HashMap(auraChargeTypes.length); + for (AuraChargeType auraChargeType : auraChargeTypes) { + currentCharges.put(auraChargeType, new AuraCharge()); + } } @Override public void updateEntity() { - long modTickRate = worldObj.getTotalWorldTime(); - if (currentProductionCharges < MAX_CHARGES && modTickRate % 3 == 0) { - currentProductionVis += getVisFromNet(ASPECT_PRODUCTION); - if (currentProductionVis >= VIS_PER_CHARGE) { - currentProductionVis -= VIS_PER_CHARGE; - ++currentProductionCharges; - } - } - if (currentDeathCharges < MAX_CHARGES && modTickRate % 5 == 0) { - currentDeathVis += getVisFromNet(ASPECT_DEATH); - if (currentDeathVis >= VIS_PER_CHARGE) { - currentDeathVis -= VIS_PER_CHARGE; - ++currentDeathCharges; - } - } - if (currentMutationCharges < MAX_CHARGES && modTickRate % 11 == 0) { - currentMutationCharges += getVisFromNet(ASPECT_MUTATION); - if (currentMutationCharges >= VIS_PER_CHARGE) { - currentMutationCharges -= VIS_PER_CHARGE; - ++currentMutationCharges; + long tick = worldObj.getTotalWorldTime(); + + for (Map.Entry currentCharge : currentCharges.entrySet()) { + AuraChargeType type = currentCharge.getKey(); + AuraCharge auraCharge = currentCharge.getValue(); + + if (auraCharge.charges < MAX_CHARGES && (tick % type.tickRate) == 0) { + auraCharge.vis += getVisFromNet(type.aspect); + if (auraCharge.vis >= VIS_PER_CHARGE) { + auraCharge.vis -= VIS_PER_CHARGE; + auraCharge.charges++; + } } } } @@ -61,52 +72,54 @@ public class TileEntityVisAuraProvider extends TileEntity implements IMagicApiar @Override public boolean getMutationCharge() { - if (this.currentMutationCharges > 0) { - --this.currentMutationCharges; - return true; - } - return false; + return getCharge(AuraChargeType.MUTATION); } @Override public boolean getDeathRateCharge() { - if (this.currentDeathCharges > 0) { - --this.currentDeathCharges; - return true; - } - return false; + return getCharge(AuraChargeType.DEATH); } @Override public boolean getProductionCharge() { - if (this.currentProductionCharges > 0) { - --this.currentProductionCharges; + return getCharge(AuraChargeType.PRODUCTION); + } + + @Override + public boolean getCharge(IAuraChargeType auraChargeType) { + AuraCharge auraCharge = currentCharges.get(auraChargeType); + if (auraCharge == null) { + return false; + } + if (auraCharge.charges > 0) { + auraCharge.charges--; return true; } + return false; } @Override public void readFromNBT(NBTTagCompound tag) { super.readFromNBT(tag); - - this.currentMutationCharges = tag.getInteger("mutationCharges"); - this.currentMutationVis = tag.getInteger("mutationVis"); - this.currentDeathCharges = tag.getInteger("deathCharges"); - this.currentDeathVis = tag.getInteger("deathVis"); - this.currentProductionCharges = tag.getInteger("productionCharges"); - this.currentProductionVis = tag.getInteger("productionVis"); + + for (Map.Entry charge : currentCharges.entrySet()) { + String auraName = charge.getKey().toString(); + int[] array = tag.getIntArray(auraName); + AuraCharge auraCharge = charge.getValue(); + auraCharge.fromArray(array); + } } @Override public void writeToNBT(NBTTagCompound tag) { super.writeToNBT(tag); - - tag.setInteger("mutationCharges", currentMutationCharges); - tag.setInteger("mutationVis", currentMutationVis); - tag.setInteger("deathCharges", currentDeathCharges); - tag.setInteger("deathVis", currentDeathVis); - tag.setInteger("productionCharges", currentProductionCharges); - tag.setInteger("productionVis", currentProductionVis); + + for (Map.Entry charge : currentCharges.entrySet()) { + String auraName = charge.getKey().toString(); + AuraCharge auraCharge = charge.getValue(); + int[] array = auraCharge.toArray(); + tag.setIntArray(auraName, array); + } } }