diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java index 2b088d529..d14ce5238 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyClimatiser.java @@ -12,17 +12,19 @@ package forestry.apiculture.multiblock; import javax.annotation.Nullable; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; + +import net.minecraftforge.common.capabilities.Capability; + import forestry.api.climate.IClimateControlled; import forestry.api.multiblock.IAlvearyComponent; -import forestry.apiculture.network.packets.PacketActiveUpdate; +import forestry.core.network.packets.PacketActiveUpdate; import forestry.core.tiles.IActivatable; import forestry.core.utils.NetworkUtil; import forestry.energy.EnergyHelper; import forestry.energy.EnergyManager; import forestry.energy.EnergyTransferMode; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.common.capabilities.Capability; public abstract class TileAlvearyClimatiser extends TileAlveary implements IActivatable, IAlvearyComponent.Climatiser { diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java index 40a7552ba..0bcf3f8ef 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearySwarmer.java @@ -14,6 +14,17 @@ import javax.annotation.Nullable; import java.util.Map.Entry; import java.util.Stack; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; @@ -22,23 +33,14 @@ import forestry.apiculture.blocks.BlockAlvearyType; import forestry.apiculture.gui.ContainerAlvearySwarmer; import forestry.apiculture.gui.GuiAlvearySwarmer; import forestry.apiculture.inventory.InventorySwarmer; -import forestry.apiculture.network.packets.PacketActiveUpdate; import forestry.apiculture.worldgen.Hive; import forestry.apiculture.worldgen.HiveDecorator; import forestry.apiculture.worldgen.HiveDescriptionSwarmer; import forestry.core.inventory.IInventoryAdapter; +import forestry.core.network.packets.PacketActiveUpdate; import forestry.core.tiles.IActivatable; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.NetworkUtil; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class TileAlvearySwarmer extends TileAlveary implements ISidedInventory, IActivatable, IAlvearyComponent.Active { diff --git a/src/main/java/forestry/apiculture/network/PacketRegistryApiculture.java b/src/main/java/forestry/apiculture/network/PacketRegistryApiculture.java index 313dfdd99..1f0e6fedf 100644 --- a/src/main/java/forestry/apiculture/network/PacketRegistryApiculture.java +++ b/src/main/java/forestry/apiculture/network/PacketRegistryApiculture.java @@ -10,7 +10,9 @@ ******************************************************************************/ package forestry.apiculture.network; -import forestry.apiculture.network.packets.PacketActiveUpdate; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.apiculture.network.packets.PacketAlvearyChange; import forestry.apiculture.network.packets.PacketBeeLogicActive; import forestry.apiculture.network.packets.PacketBeeLogicActiveEntity; @@ -21,8 +23,6 @@ import forestry.apiculture.network.packets.PacketImprintSelectionResponse; import forestry.core.network.IPacketRegistry; import forestry.core.network.PacketIdClient; import forestry.core.network.PacketIdServer; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class PacketRegistryApiculture implements IPacketRegistry { @Override @@ -34,7 +34,6 @@ public class PacketRegistryApiculture implements IPacketRegistry { @SideOnly(Side.CLIENT) public void registerPacketsClient() { PacketIdClient.IMPRINT_SELECTION_RESPONSE.setPacketHandler(new PacketImprintSelectionResponse.Handler()); - PacketIdClient.TILE_FORESTRY_ACTIVE.setPacketHandler(new PacketActiveUpdate.Handler()); PacketIdClient.BEE_LOGIC_ACTIVE.setPacketHandler(new PacketBeeLogicActive.Handler()); PacketIdClient.BEE_LOGIC_ACTIVE_ENTITY.setPacketHandler(new PacketBeeLogicActiveEntity.Handler()); PacketIdClient.HABITAT_BIOME_POINTER.setPacketHandler(new PacketHabitatBiomePointer.Handler()); diff --git a/src/main/java/forestry/apiculture/tiles/TileHive.java b/src/main/java/forestry/apiculture/tiles/TileHive.java index 7dba24428..6ad100944 100644 --- a/src/main/java/forestry/apiculture/tiles/TileHive.java +++ b/src/main/java/forestry/apiculture/tiles/TileHive.java @@ -16,8 +16,6 @@ import javax.annotation.Nullable; import java.util.Collections; import java.util.List; -import forestry.apiculture.WorldgenBeekeepingLogic; -import forestry.core.utils.TickHelper; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -61,6 +59,7 @@ import forestry.api.core.EnumTemperature; import forestry.api.core.ForestryAPI; import forestry.api.core.IErrorLogic; import forestry.api.genetics.IAllele; +import forestry.apiculture.WorldgenBeekeepingLogic; import forestry.apiculture.blocks.BlockBeeHives; import forestry.apiculture.genetics.BeeDefinition; import forestry.apiculture.genetics.alleles.AlleleEffect; @@ -68,12 +67,14 @@ import forestry.apiculture.network.packets.PacketActiveUpdate; import forestry.apiculture.ModuleApiculture; import forestry.core.config.Config; import forestry.core.inventory.InventoryAdapter; +import forestry.core.network.packets.PacketActiveUpdate; import forestry.core.tiles.IActivatable; import forestry.core.utils.ClimateUtil; import forestry.core.utils.DamageSourceForestry; import forestry.core.utils.InventoryUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.NetworkUtil; +import forestry.core.utils.TickHelper; public class TileHive extends TileEntity implements ITickable, IHiveTile, IActivatable, IBeeHousing { private static final DamageSource damageSourceBeeHive = new DamageSourceForestry("bee.hive"); diff --git a/src/main/java/forestry/core/network/PacketRegistryCore.java b/src/main/java/forestry/core/network/PacketRegistryCore.java index c92300722..148874b42 100644 --- a/src/main/java/forestry/core/network/PacketRegistryCore.java +++ b/src/main/java/forestry/core/network/PacketRegistryCore.java @@ -13,6 +13,7 @@ package forestry.core.network; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import forestry.core.network.packets.PacketActiveUpdate; import forestry.core.network.packets.PacketChipsetClick; import forestry.core.network.packets.PacketErrorUpdate; import forestry.core.network.packets.PacketErrorUpdateEntity; @@ -51,6 +52,7 @@ public class PacketRegistryCore implements IPacketRegistry { PacketIdClient.GUI_ENERGY.setPacketHandler(new PacketGuiEnergy.Handler()); PacketIdClient.SOCKET_UPDATE.setPacketHandler(new PacketSocketUpdate.Handler()); PacketIdClient.TILE_FORESTRY_UPDATE.setPacketHandler(new PacketTileStream.Handler()); + PacketIdClient.TILE_FORESTRY_ACTIVE.setPacketHandler(new PacketActiveUpdate.Handler()); PacketIdClient.ITEMSTACK_DISPLAY.setPacketHandler(new PacketItemStackDisplay.Handler()); PacketIdClient.FX_SIGNAL.setPacketHandler(new PacketFXSignal.Handler()); PacketIdClient.TANK_LEVEL_UPDATE.setPacketHandler(new PacketTankLevelUpdate.Handler()); diff --git a/src/main/java/forestry/apiculture/network/packets/PacketActiveUpdate.java b/src/main/java/forestry/core/network/packets/PacketActiveUpdate.java similarity index 95% rename from src/main/java/forestry/apiculture/network/packets/PacketActiveUpdate.java rename to src/main/java/forestry/core/network/packets/PacketActiveUpdate.java index 604f62d46..18924e327 100644 --- a/src/main/java/forestry/apiculture/network/packets/PacketActiveUpdate.java +++ b/src/main/java/forestry/core/network/packets/PacketActiveUpdate.java @@ -1,70 +1,72 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.apiculture.network.packets; - -import java.io.IOException; - -import forestry.api.multiblock.IMultiblockComponent; -import forestry.core.network.ForestryPacket; -import forestry.core.network.IForestryPacketClient; -import forestry.core.network.IForestryPacketHandlerClient; -import forestry.core.network.PacketBufferForestry; -import forestry.core.network.PacketIdClient; -import forestry.core.tiles.IActivatable; -import forestry.core.tiles.TileUtil; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public class PacketActiveUpdate extends ForestryPacket implements IForestryPacketClient { - private final BlockPos pos; - private final boolean active; - - public PacketActiveUpdate(IActivatable tile) { - this.pos = tile.getCoordinates(); - this.active = tile.isActive(); - } - - @Override - public PacketIdClient getPacketId() { - return PacketIdClient.TILE_FORESTRY_ACTIVE; - } - - @Override - protected void writeData(PacketBufferForestry data) throws IOException { - data.writeBlockPos(pos); - data.writeBoolean(active); - } - - @SideOnly(Side.CLIENT) - public static class Handler implements IForestryPacketHandlerClient { - @Override - public void onPacketData(PacketBufferForestry data, EntityPlayer player) { - BlockPos pos = data.readBlockPos(); - boolean active = data.readBoolean(); - - WorldClient world = Minecraft.getMinecraft().world; - TileEntity tile = TileUtil.getTile(world, pos); - if (tile instanceof IActivatable) { - ((IActivatable) tile).setActive(active); - } else if (tile instanceof IMultiblockComponent) { - IMultiblockComponent component = (IMultiblockComponent) tile; - if (component.getMultiblockLogic().isConnected() && component.getMultiblockLogic().getController() instanceof IActivatable) { - ((IActivatable) component.getMultiblockLogic().getController()).setActive(active); - } - } - } - } -} +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.core.network.packets; + +import java.io.IOException; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import forestry.api.multiblock.IMultiblockComponent; +import forestry.core.network.ForestryPacket; +import forestry.core.network.IForestryPacketClient; +import forestry.core.network.IForestryPacketHandlerClient; +import forestry.core.network.PacketBufferForestry; +import forestry.core.network.PacketIdClient; +import forestry.core.tiles.IActivatable; +import forestry.core.tiles.TileUtil; + +public class PacketActiveUpdate extends ForestryPacket implements IForestryPacketClient { + private final BlockPos pos; + private final boolean active; + + public PacketActiveUpdate(IActivatable tile) { + this.pos = tile.getCoordinates(); + this.active = tile.isActive(); + } + + @Override + public PacketIdClient getPacketId() { + return PacketIdClient.TILE_FORESTRY_ACTIVE; + } + + @Override + protected void writeData(PacketBufferForestry data) throws IOException { + data.writeBlockPos(pos); + data.writeBoolean(active); + } + + @SideOnly(Side.CLIENT) + public static class Handler implements IForestryPacketHandlerClient { + @Override + public void onPacketData(PacketBufferForestry data, EntityPlayer player) { + BlockPos pos = data.readBlockPos(); + boolean active = data.readBoolean(); + + WorldClient world = Minecraft.getMinecraft().world; + TileEntity tile = TileUtil.getTile(world, pos); + if (tile instanceof IActivatable) { + ((IActivatable) tile).setActive(active); + } else if (tile instanceof IMultiblockComponent) { + IMultiblockComponent component = (IMultiblockComponent) tile; + if (component.getMultiblockLogic().isConnected() && component.getMultiblockLogic().getController() instanceof IActivatable) { + ((IActivatable) component.getMultiblockLogic().getController()).setActive(active); + } + } + } + } +} diff --git a/src/main/java/forestry/core/tiles/TileEngine.java b/src/main/java/forestry/core/tiles/TileEngine.java index 0db8cdc41..545a0d4f7 100644 --- a/src/main/java/forestry/core/tiles/TileEngine.java +++ b/src/main/java/forestry/core/tiles/TileEngine.java @@ -13,24 +13,27 @@ package forestry.core.tiles; import javax.annotation.Nullable; import java.io.IOException; +import net.minecraft.block.state.IBlockState; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumFacing; + +import net.minecraftforge.common.capabilities.Capability; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.core.IErrorLogic; -import forestry.apiculture.network.packets.PacketActiveUpdate; import forestry.core.blocks.BlockBase; import forestry.core.config.Constants; import forestry.core.errors.EnumErrorCode; import forestry.core.network.IStreamableGui; import forestry.core.network.PacketBufferForestry; +import forestry.core.network.packets.PacketActiveUpdate; import forestry.core.utils.NetworkUtil; import forestry.energy.EnergyHelper; import forestry.energy.EnergyManager; import forestry.energy.EnergyTransferMode; -import net.minecraft.block.state.IBlockState; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public abstract class TileEngine extends TileBase implements IActivatable, IStreamableGui { private static final int CANT_SEND_ENERGY_TIME = 20; diff --git a/src/main/java/forestry/greenhouse/tiles/TileClimatiser.java b/src/main/java/forestry/greenhouse/tiles/TileClimatiser.java index 13f0c2621..5802c305c 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileClimatiser.java +++ b/src/main/java/forestry/greenhouse/tiles/TileClimatiser.java @@ -28,11 +28,11 @@ import forestry.api.circuits.ICircuitBoard; import forestry.api.circuits.ICircuitSocketType; import forestry.api.core.ICamouflageHandler; import forestry.api.core.ICamouflagedTile; -import forestry.apiculture.network.packets.PacketActiveUpdate; import forestry.core.circuits.ISocketable; import forestry.core.inventory.InventoryAdapter; import forestry.core.network.IStreamableGui; import forestry.core.network.PacketBufferForestry; +import forestry.core.network.packets.PacketActiveUpdate; import forestry.core.tiles.IActivatable; import forestry.core.tiles.TileForestry; import forestry.core.utils.ItemStackUtil; diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseWindow.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseWindow.java index 495e018c2..8c8f60ed2 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseWindow.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseWindow.java @@ -19,7 +19,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import forestry.apiculture.network.packets.PacketActiveUpdate; +import forestry.core.network.packets.PacketActiveUpdate; import forestry.core.tiles.IActivatable; import forestry.core.utils.NetworkUtil; import forestry.greenhouse.api.climate.IClimateSource;