dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-06-19 19:06:38 +02:00
parent 0d3ffa4986
commit dbdca44b3d
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/refinedstorage/block/BlockController.java
View File

@@ -91,10 +91,18 @@ public class BlockController extends BlockBase {
public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack itemStack) { public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack itemStack) {
super.onBlockPlacedBy(world, pos, state, player, itemStack); super.onBlockPlacedBy(world, pos, state, player, itemStack);
NBTTagCompound tag = itemStack.getTagCompound(); if (!world.isRemote) {
StorageNetwork network = new StorageNetwork(world, pos, (EnumControllerType) state.getValue(TYPE));
if (tag != null && tag.hasKey(StorageNetwork.NBT_ENERGY)) { NBTTagCompound tag = itemStack.getTagCompound();
StorageNetworkRegistry.NETWORKS.get(pos).getEnergy().receiveEnergy(tag.getInteger(StorageNetwork.NBT_ENERGY), false);
if (tag != null && tag.hasKey(StorageNetwork.NBT_ENERGY)) {
network.getEnergy().receiveEnergy(tag.getInteger(StorageNetwork.NBT_ENERGY), false);
}
StorageNetworkRegistry.NETWORKS.put(pos, network);
((TileController) world.getTileEntity(pos)).setNetwork(network);
} }
} }

18
src/main/java/refinedstorage/tile/controller/TileController.java
View File

@@ -10,7 +10,6 @@ import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.ByteBufUtils;
import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageBlocks;
import refinedstorage.api.storagenet.StorageNetwork; import refinedstorage.api.storagenet.StorageNetwork;
import refinedstorage.api.storagenet.StorageNetworkRegistry;
import refinedstorage.block.BlockController; import refinedstorage.block.BlockController;
import refinedstorage.block.EnumControllerType; import refinedstorage.block.EnumControllerType;
import refinedstorage.container.ContainerController; import refinedstorage.container.ContainerController;
@@ -24,26 +23,17 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
public class TileController extends TileBase implements IEnergyReceiver, ISynchronizedContainer, IRedstoneModeConfig { public class TileController extends TileBase implements IEnergyReceiver, ISynchronizedContainer, IRedstoneModeConfig {
private StorageNetwork network = StorageNetworkRegistry.NETWORKS.get(pos); private StorageNetwork network;
// Only used client side
private List<ClientMachine> clientMachines = new ArrayList<ClientMachine>(); private List<ClientMachine> clientMachines = new ArrayList<ClientMachine>();
private int energy; private int energy;
private int energyUsage; private int energyUsage;
private EnumControllerType type; private EnumControllerType type;
private RedstoneMode redstoneMode; private RedstoneMode redstoneMode;
@Override public void setNetwork(StorageNetwork network) {
public NBTTagCompound write(NBTTagCompound tag) { this.network = network;
super.write(tag);
return network.write(tag);
}
@Override
public void read(NBTTagCompound tag) {
super.read(tag);
network.read(tag);
} }
@Override @Override