mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-21 20:42:35 +00:00
Fix a alvery bug
This commit is contained in:
1 parent
d794207dae
commit
a401995e7e
5 files changed
+57
-1
No files matched your search
@@ -37,6 +37,7 @@ import forestry.api.core.IModelManager;
|
||||
import forestry.api.core.IStateMapperRegister;
|
||||
import forestry.api.core.Tabs;
|
||||
import forestry.apiculture.MaterialBeehive;
|
||||
import forestry.apiculture.multiblock.IAlvearyControllerInternal;
|
||||
import forestry.apiculture.multiblock.TileAlveary;
|
||||
import forestry.apiculture.multiblock.TileAlvearyFan;
|
||||
import forestry.apiculture.multiblock.TileAlvearyHeater;
|
||||
@@ -45,6 +46,7 @@ import forestry.apiculture.multiblock.TileAlvearyPlain;
|
||||
import forestry.apiculture.multiblock.TileAlvearySieve;
|
||||
import forestry.apiculture.multiblock.TileAlvearyStabiliser;
|
||||
import forestry.apiculture.multiblock.TileAlvearySwarmer;
|
||||
import forestry.apiculture.network.packets.PacketAlveryChange;
|
||||
import forestry.core.blocks.BlockStructure;
|
||||
import forestry.core.proxy.Proxies;
|
||||
import forestry.core.tiles.IActivatable;
|
||||
@@ -258,7 +260,9 @@ public abstract class BlockAlveary extends BlockStructure implements IStateMappe
|
||||
TileAlveary tileAlveary = (TileAlveary) tileEntity;
|
||||
|
||||
// We must check that the slabs on top were not removed
|
||||
tileAlveary.getMultiblockLogic().getController().reassemble();
|
||||
IAlvearyControllerInternal alvery = tileAlveary.getMultiblockLogic().getController();
|
||||
alvery.reassemble();
|
||||
Proxies.net.sendNetworkPacket(new PacketAlveryChange(alvery), world);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,7 @@
|
||||
package forestry.apiculture.network;
|
||||
|
||||
import forestry.apiculture.network.packets.PacketActiveUpdate;
|
||||
import forestry.apiculture.network.packets.PacketAlveryChange;
|
||||
import forestry.apiculture.network.packets.PacketBeeLogicActive;
|
||||
import forestry.apiculture.network.packets.PacketBeeLogicActiveEntity;
|
||||
import forestry.apiculture.network.packets.PacketBeeLogicEntityRequest;
|
||||
@@ -30,5 +31,7 @@ public class PacketRegistryApiculture extends PacketRegistry {
|
||||
registerClientPacket(new PacketCandleUpdate());
|
||||
|
||||
registerServerPacket(new PacketBeeLogicEntityRequest());
|
||||
|
||||
registerClientPacket(new PacketAlveryChange());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
/*******************************************************************************
|
||||
* 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 net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import forestry.api.multiblock.IMultiblockComponent;
|
||||
import forestry.apiculture.multiblock.IAlvearyControllerInternal;
|
||||
import forestry.core.network.DataInputStreamForestry;
|
||||
import forestry.core.network.IForestryPacketClient;
|
||||
import forestry.core.network.PacketIdClient;
|
||||
import forestry.core.network.packets.PacketCoordinates;
|
||||
import forestry.core.proxy.Proxies;
|
||||
|
||||
public class PacketAlveryChange extends PacketCoordinates implements IForestryPacketClient {
|
||||
|
||||
public PacketAlveryChange() {
|
||||
}
|
||||
|
||||
public PacketAlveryChange(IAlvearyControllerInternal controller) {
|
||||
super(controller.getReferenceCoord());
|
||||
}
|
||||
|
||||
@Override
|
||||
public PacketIdClient getPacketId() {
|
||||
return PacketIdClient.ALVERAY_CONTROLLER_CHANGE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onPacketData(DataInputStreamForestry data, EntityPlayer player) {
|
||||
TileEntity tile = getTarget(Proxies.common.getRenderWorld());
|
||||
if (tile instanceof IMultiblockComponent) {
|
||||
((IMultiblockComponent) tile).getMultiblockLogic().getController().reassemble();;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -48,6 +48,7 @@ public enum PacketIdClient implements IPacketId {
|
||||
HABITAT_BIOME_POINTER,
|
||||
CANDLE_UPDATE,
|
||||
IMPRINT_SELECTION_RESPONSE,
|
||||
ALVERAY_CONTROLLER_CHANGE,
|
||||
|
||||
// Arboriculture
|
||||
RIPENING_UPDATE,
|
||||
|
||||
@@ -20,6 +20,7 @@ import net.minecraft.block.BlockPlanks;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
@@ -117,6 +118,9 @@ public abstract class BlockUtil {
|
||||
if (block == null || block.isAir(world, pos)) {
|
||||
return false;
|
||||
}
|
||||
if(Item.getItemFromBlock(block) == null){
|
||||
return false;
|
||||
}
|
||||
int[] oreIds = OreDictionary.getOreIDs(new ItemStack(block));
|
||||
for (int oreId : oreIds) {
|
||||
if (oreId == slabWoodId) {
|
||||
|
||||
Reference in new issue
Block a user