tilera/IndustrialWires
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed invisible wires on dedicated servers

Browse source
This commit is contained in:
malte0811 2017-10-07 18:51:28 +02:00
parent e9449440fd
commit ab77d28bc9
2 changed files with 126 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/malte0811/industrialWires/blocks/hv/TileEntityMarx.java
View file

@ -127,6 +127,7 @@ public class TileEntityMarx extends TileEntityIWMultiblock implements ITickable,
@Override
public void writeNBT(NBTTagCompound out, boolean updatePacket) {
super.writeNBT(out, updatePacket);
MiscUtils.writeConnsToNBT(out, this);
out.setInteger(TYPE, type.ordinal());
out.setInteger(STAGES, stageCount);
out.setBoolean(HAS_CONN, hasConnection);
@ -143,6 +144,7 @@ public class TileEntityMarx extends TileEntityIWMultiblock implements ITickable,
@Override
public void readNBT(NBTTagCompound in, boolean updatePacket) {
super.readNBT(in, updatePacket);
MiscUtils.loadConnsFromNBT(in, this);
type = IWProperties.MarxType.values()[in.getInteger(TYPE)];
setStageCount(in.getInteger(STAGES));
NBTTagList voltages = in.getTagList(CAP_VOLTAGES, 6);//DOUBLE
@ -603,6 +605,11 @@ public class TileEntityMarx extends TileEntityIWMultiblock implements ITickable,
@Override
public void removeCable(ImmersiveNetHandler.Connection connection) {
hasConnection = false;
if(world != null)
{
IBlockState state = world.getBlockState(pos);
world.notifyBlockUpdate(pos, state,state, 3);
}
}
@Override
@ -620,6 +627,28 @@ public class TileEntityMarx extends TileEntityIWMultiblock implements ITickable,
return getRaytraceOffset(null);
}
@Override
public void validate()
{
super.validate();
ImmersiveNetHandler.INSTANCE.resetCachedIndirectConnections();
}
@Override
public void invalidate()
{
super.invalidate();
if (world.isRemote)
ImmersiveNetHandler.INSTANCE.clearConnectionsOriginatingFrom(pos, world);
}
@Override
public boolean receiveClientEvent(int id, int type) {
return MiscUtils.handleUpdate(id, pos, world)||super.receiveClientEvent(id, type);
}
// Redstone wire stuff
private RedstoneWireNetwork net = new RedstoneWireNetwork();
@Override
public void setNetwork(RedstoneWireNetwork net) {

132
src/main/java/malte0811/industrialWires/util/MiscUtils.java
View file

@ -18,19 +18,28 @@
package malte0811.industrialWires.util;
import blusunrize.immersiveengineering.ImmersiveEngineering;
import blusunrize.immersiveengineering.api.ApiUtils;
import blusunrize.immersiveengineering.api.energy.wires.IImmersiveConnectable;
import blusunrize.immersiveengineering.api.energy.wires.ImmersiveNetHandler;
import blusunrize.immersiveengineering.common.blocks.IEBlockInterfaces;
import blusunrize.immersiveengineering.common.util.IELogger;
import blusunrize.immersiveengineering.common.util.Utils;
import blusunrize.immersiveengineering.common.util.chickenbones.Matrix4;
import com.google.common.collect.ImmutableSet;
import malte0811.industrialWires.IndustrialWires;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraftforge.common.property.IExtendedBlockState;
import javax.annotation.Nonnull;
import java.util.ArrayList;
@ -43,37 +52,6 @@ public final class MiscUtils {
private MiscUtils() {
}
public static Set<ImmersiveNetHandler.Connection> genConnBlockstate(Set<ImmersiveNetHandler.Connection> conns, World world) {
if (conns == null)
return ImmutableSet.of();
Set<ImmersiveNetHandler.Connection> ret = new HashSet<ImmersiveNetHandler.Connection>() {
@Override
public boolean equals(Object o) {
if (o == this)
return true;
if (!(o instanceof HashSet))
return false;
HashSet<ImmersiveNetHandler.Connection> other = (HashSet<ImmersiveNetHandler.Connection>) o;
if (other.size() != this.size())
return false;
for (ImmersiveNetHandler.Connection c : this)
if (!other.contains(c))
return false;
return true;
}
};
for (ImmersiveNetHandler.Connection c : conns) {
IImmersiveConnectable end = ApiUtils.toIIC(c.end, world, false);
if (end == null)
continue;
// generate subvertices
c.getSubVertices(world);
ret.add(c);
}
return ret;
}
public static List<BlockPos> discoverLocal(World w, BlockPos here, BiPredicate<BlockPos, Integer> isValid) {
List<BlockPos> ret = new ArrayList<>();
List<BlockPos> open = new ArrayList<>();
@ -104,14 +82,15 @@ public final class MiscUtils {
/**
* Calculates the parameters for offset to generate here from origin
*
* @return right, forward, up
*/
public static BlockPos getOffset(BlockPos origin, EnumFacing f, boolean mirror, BlockPos here) {
int dX = origin.getZ()-here.getZ();
int dZ = origin.getX()-here.getX();
int dX = origin.getZ() - here.getZ();
int dZ = origin.getX() - here.getX();
int forward = 0;
int right = 0;
int up = here.getY()-origin.getY();
int up = here.getY() - origin.getY();
switch (f) {
case NORTH:
forward = dZ;
@ -135,6 +114,7 @@ public final class MiscUtils {
}
return new BlockPos(right, forward, up);
}
@Nonnull
public static AxisAlignedBB apply(@Nonnull Matrix4 mat, @Nonnull AxisAlignedBB in) {
Vec3d min = new Vec3d(in.minX, in.minY, in.minZ);
@ -159,4 +139,86 @@ public final class MiscUtils {
}
return ret;
}
}
// Taken from TEImmersiveConnectable
public static Set<ImmersiveNetHandler.Connection> genConnBlockstate(Set<ImmersiveNetHandler.Connection> conns, World world) {
if (conns == null)
return ImmutableSet.of();
Set<ImmersiveNetHandler.Connection> ret = new HashSet<ImmersiveNetHandler.Connection>() {
@Override
public boolean equals(Object o) {
if (o == this)
return true;
if (!(o instanceof HashSet))
return false;
HashSet<ImmersiveNetHandler.Connection> other = (HashSet<ImmersiveNetHandler.Connection>) o;
if (other.size() != this.size())
return false;
for (ImmersiveNetHandler.Connection c : this)
if (!other.contains(c))
return false;
return true;
}
};
for (ImmersiveNetHandler.Connection c : conns) {
IImmersiveConnectable end = ApiUtils.toIIC(c.end, world, false);
if (end == null)
continue;
// generate subvertices
c.getSubVertices(world);
ret.add(c);
}
return ret;
}
public static void writeConnsToNBT(NBTTagCompound nbt, TileEntity te) {
World world = te.getWorld();
if (world != null && !world.isRemote && nbt != null) {
NBTTagList connectionList = new NBTTagList();
Set<ImmersiveNetHandler.Connection> conL = ImmersiveNetHandler.INSTANCE.getConnections(world, Utils.toCC(te));
if (conL != null)
for (ImmersiveNetHandler.Connection con : conL)
connectionList.appendTag(con.writeToNBT());
nbt.setTag("connectionList", connectionList);
}
}
public static void loadConnsFromNBT(NBTTagCompound nbt, TileEntity te) {
World world = te.getWorld();
if (world != null && world.isRemote && !Minecraft.getMinecraft().isSingleplayer() && nbt != null) {
NBTTagList connectionList = nbt.getTagList("connectionList", 10);
ImmersiveNetHandler.INSTANCE.clearConnectionsOriginatingFrom(Utils.toCC(te), world);
for (int i = 0; i < connectionList.tagCount(); i++) {
NBTTagCompound conTag = connectionList.getCompoundTagAt(i);
ImmersiveNetHandler.Connection con = ImmersiveNetHandler.Connection.readFromNBT(conTag);
if (con != null) {
ImmersiveNetHandler.INSTANCE.addConnection(world, Utils.toCC(te), con);
} else
IndustrialWires.logger.error("CLIENT read connection as null");
}
}
}
public static boolean handleUpdate(int id, BlockPos pos, World world) {
if (id == -1 || id == 255) {
IBlockState state = world.getBlockState(pos);
world.notifyBlockUpdate(pos, state, state, 3);
return true;
} else if (id == 254) {
IBlockState state = world.getBlockState(pos);
if (state instanceof IExtendedBlockState) {
state = state.getActualState(world, pos);
state = state.getBlock().getExtendedState(state, world, pos);
ImmersiveEngineering.proxy.removeStateFromSmartModelCache((IExtendedBlockState) state);
ImmersiveEngineering.proxy.removeStateFromConnectionModelCache((IExtendedBlockState) state);
}
world.notifyBlockUpdate(pos, state, state, 3);
return true;
}
return false;
}
//End of code from TEImmersiveConnectable
}