Merge pull request #1779 from MatthiasMann/meconduit_fixes

ME counduits should now behave better
This commit is contained in:
tterrag1098 committed 2015-01-27 18:48:59 -05:00
commit 35c13a0650
17 files changed
+89 -130

No files matched your search

@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumMap;
import java.util.HashSet;
import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -26,9 +26,9 @@ import crazypants.util.BlockCoord;
public abstract class AbstractConduit implements IConduit {
protected final Set<ForgeDirection> conduitConnections = new HashSet<ForgeDirection>();
protected final Set<ForgeDirection> conduitConnections = EnumSet.noneOf(ForgeDirection.class);
protected final Set<ForgeDirection> externalConnections = new HashSet<ForgeDirection>();
protected final Set<ForgeDirection> externalConnections = EnumSet.noneOf(ForgeDirection.class);
public static final float STUB_WIDTH = 0.2f;
@@ -52,8 +52,6 @@ public abstract class AbstractConduit implements IConduit {
private boolean dodgyChangeSinceLastCallFlagForBundle = true;
private int lastNumConections = -1;
protected boolean connectionsDirty = true;
protected AbstractConduit() {
@@ -194,11 +192,7 @@ public abstract class AbstractConduit implements IConduit {
if(bundle == null) {
return null;
}
TileEntity te = bundle.getEntity();
if(te == null) {
return null;
}
return new BlockCoord(te.xCoord, te.yCoord, te.zCoord);
return bundle.getLocation();
}
@Override
@@ -225,13 +219,11 @@ public abstract class AbstractConduit implements IConduit {
@Override
public void conduitConnectionAdded(ForgeDirection fromDirection) {
conduitConnections.add(fromDirection);
connectionsChanged();
}
@Override
public void conduitConnectionRemoved(ForgeDirection fromDirection) {
conduitConnections.remove(fromDirection);
connectionsChanged();
}
@Override
@@ -275,13 +267,11 @@ public abstract class AbstractConduit implements IConduit {
@Override
public void externalConnectionAdded(ForgeDirection fromDirection) {
externalConnections.add(fromDirection);
connectionsChanged();
}
@Override
public void externalConnectionRemoved(ForgeDirection fromDirection) {
externalConnections.remove(fromDirection);
connectionsChanged();
}
@Override
@@ -428,7 +418,8 @@ public abstract class AbstractConduit implements IConduit {
connectionsDirty = false;
}
protected void connectionsChanged() {
@Override
public void connectionsChanged() {
collidablesDirty = true;
clientStateDirty = true;
dodgyChangeSinceLastCallFlagForBundle = true;
@@ -463,6 +454,7 @@ public abstract class AbstractConduit implements IConduit {
if(neighbour != null && neighbour.canConnectToConduit(dir.getOpposite(), this)) {
conduitConnections.add(dir);
neighbour.conduitConnectionAdded(dir.getOpposite());
neighbour.connectionsChanged();
}
}
@@ -485,6 +477,7 @@ public abstract class AbstractConduit implements IConduit {
IConduit neighbour = ConduitUtil.getConduit(world, te, dir, getBaseConduitType());
if(neighbour != null) {
neighbour.conduitConnectionRemoved(dir.getOpposite());
neighbour.connectionsChanged();
}
}
conduitConnections.clear();
@@ -513,7 +506,7 @@ public abstract class AbstractConduit implements IConduit {
// Check for changes to external connections, connections to conduits are
// handled by the bundle
Set<ForgeDirection> newCons = new HashSet<ForgeDirection>();
Set<ForgeDirection> newCons = EnumSet.noneOf(ForgeDirection.class);
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
if(!containsConduitConnection(dir) && canConnectToExternal(dir, false)) {
newCons.add(dir);
@@ -560,8 +553,6 @@ public abstract class AbstractConduit implements IConduit {
}
List<CollidableComponent> result = new ArrayList<CollidableComponent>();
CollidableCache cc = CollidableCache.instance;
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
Collection<CollidableComponent> col = getCollidables(dir);
if(col != null) {
@@ -61,12 +61,10 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
TileEntity te = world.getTileEntity(placeAt.x, placeAt.y, placeAt.z);
if(te instanceof IConduitBundle) {
IConduitBundle bundle = (IConduitBundle) te;
if(bundle != null) {
bundle.addConduit(createConduit(stack));
Block b = EnderIO.blockConduitBundle;
world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, b.stepSound.getStepResourcePath(),
(b.stepSound.getVolume() + 1.0F) / 2.0F, b.stepSound.getPitch() * 0.8F);
}
bundle.addConduit(createConduit(stack, player));
Block b = EnderIO.blockConduitBundle;
world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, b.stepSound.getStepResourcePath(),
(b.stepSound.getVolume() + 1.0F) / 2.0F, b.stepSound.getPitch() * 0.8F);
}
}
}
@@ -89,7 +87,7 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem {
System.out.println("AbstractItemConduit.onItemUse: Bundle null");
return false;
}
IConduit con = createConduit(stack);
IConduit con = createConduit(stack, player);
if(con == null) {
System.out.println("AbstractItemConduit.onItemUse: Conduit null.");
return false;
@@ -593,7 +593,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade
private boolean handleConduitClick(World world, int x, int y, int z, EntityPlayer player, IConduitBundle bundle, ItemStack stack) {
IConduitItem equipped = (IConduitItem) stack.getItem();
if(!bundle.hasType(equipped.getBaseConduitType())) {
bundle.addConduit(equipped.createConduit(stack));
bundle.addConduit(equipped.createConduit(stack, player));
if(!player.capabilities.isCreativeMode) {
world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, stepSound.getStepResourcePath(),
(stepSound.getVolume() + 1.0F) / 2.0F, stepSound.getPitch() * 0.8F);
@@ -124,6 +124,10 @@ public class ConduitUtil {
if(con.getNetwork() != null) { //this should have been destroyed when destroying the neighbours network but lets just make sure
con.getNetwork().destroyNetwork();
}
con.connectionsChanged();
if(neighbour != null) {
neighbour.connectionsChanged();
}
}
public static <T extends IConduit> boolean joinConduits(T con, ForgeDirection faceHit) {
@@ -138,6 +142,8 @@ public class ConduitUtil {
if(neighbour.getNetwork() != null) {
neighbour.getNetwork().destroyNetwork();
}
con.connectionsChanged();
neighbour.connectionsChanged();
return true;
}
return false;
@@ -66,6 +66,8 @@ public interface IConduit {
void conduitConnectionRemoved(ForgeDirection fromDirection);
void connectionsChanged();
AbstractConduitNetwork<?, ?> getNetwork();
boolean setNetwork(AbstractConduitNetwork<?, ?> network);
@@ -1,12 +1,13 @@
package crazypants.enderio.conduit;
import net.minecraft.item.ItemStack;
import net.minecraft.entity.player.EntityPlayer;
import crazypants.enderio.api.tool.IHideFacades;
public interface IConduitItem extends IHideFacades {
Class<? extends IConduit> getBaseConduitType();
IConduit createConduit(ItemStack item);
IConduit createConduit(ItemStack item, EntityPlayer player);
}
@@ -6,8 +6,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import com.google.common.collect.Lists;
import mekanism.api.gas.Gas;
import mekanism.api.gas.GasStack;
import net.minecraft.block.Block;
@@ -894,8 +892,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
if (cond == null) {
return AECableType.NONE;
} else {
ConnectionMode mode = cond.getConnectionMode(dir);
return mode == ConnectionMode.DISABLED ? AECableType.NONE : AECableType.SMART;
return cond.isConnectedTo(dir) ? AECableType.SMART : AECableType.NONE;
}
}
@@ -40,7 +40,7 @@ public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTool
}
@Override
public IConduit createConduit(ItemStack stack) {
public IConduit createConduit(ItemStack stack, EntityPlayer player) {
return new GasConduit();
}
@@ -33,7 +33,7 @@ public class ItemItemConduit extends AbstractItemConduit {
}
@Override
public IConduit createConduit(ItemStack item) {
public IConduit createConduit(ItemStack item, EntityPlayer player) {
return new ItemConduit(item.getItemDamage());
}
@@ -40,7 +40,7 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT
}
@Override
public IConduit createConduit(ItemStack stack) {
public IConduit createConduit(ItemStack stack, EntityPlayer player) {
if(stack.getItemDamage() == 1) {
return new AdvancedLiquidConduit();
} else if(stack.getItemDamage() == 2) {
@@ -341,7 +341,7 @@ public class LiquidConduit extends AbstractTankConduit {
// -----------------------------
@Override
protected void connectionsChanged() {
public void connectionsChanged() {
super.connectionsChanged();
updateTank();
}
@@ -1,5 +1,6 @@
package crazypants.enderio.conduit.me;
import appeng.api.AEApi;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import crazypants.enderio.ModObject;
@@ -32,8 +33,10 @@ public class ItemMEConduit extends AbstractItemConduit {
}
@Override
public IConduit createConduit(ItemStack item) {
return new MEConduit(item.getItemDamage());
public IConduit createConduit(ItemStack item, EntityPlayer player) {
MEConduit con = new MEConduit(item.getItemDamage());
con.setPlayerID(AEApi.instance().registries().players().getID(player));
return con;
}
@Override
@@ -1,20 +1,15 @@
package crazypants.enderio.conduit.me;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.api.networking.IGridHost;
@@ -29,6 +24,7 @@ import crazypants.enderio.conduit.AbstractConduitNetwork;
import crazypants.enderio.conduit.ConduitUtil;
import crazypants.enderio.conduit.ConnectionMode;
import crazypants.enderio.conduit.IConduit;
import crazypants.enderio.conduit.IConduitBundle;
import crazypants.enderio.conduit.RaytraceResult;
import crazypants.enderio.conduit.TileConduitBundle;
import crazypants.enderio.conduit.geom.CollidableComponent;
@@ -45,8 +41,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
public static IIcon[] longTextures;
private boolean isDense;
EnumSet<ForgeDirection> validConnections = EnumSet.copyOf(Arrays.asList(ForgeDirection.VALID_DIRECTIONS));
private int playerID = -1;
public MEConduit() {
this(0);
@@ -107,39 +102,32 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
@Override
public void writeToNBT(NBTTagCompound nbtRoot) {
super.writeToNBT(nbtRoot);
NBTTagList list = new NBTTagList();
for (ForgeDirection dir : validConnections) {
NBTTagString name = new NBTTagString(dir.name());
list.appendTag(name);
}
nbtRoot.setTag("validConnections", list);
nbtRoot.setBoolean("isDense", isDense);
nbtRoot.setInteger("playerID", playerID);
}
@Override
public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) {
super.readFromNBT(nbtRoot, nbtVersion);
if(nbtRoot.hasKey("validConnections")) {
validConnections.clear();
NBTTagList connections = nbtRoot.getTagList("validConnections", Constants.NBT.TAG_STRING);
for (int i = 0; i < connections.tagCount(); i++) {
validConnections.add(ForgeDirection.valueOf(connections.getStringTagAt(i)));
}
}
isDense = nbtRoot.getBoolean("isDense");
if(nbtRoot.hasKey("playerID")) {
playerID = nbtRoot.getInteger("playerID");
} else {
playerID = -1;
}
}
public void setPlayerID(int playerID) {
this.playerID = playerID;
}
@Override
@Method(modid = "appliedenergistics2")
public boolean canConnectToExternal(ForgeDirection dir, boolean ignoreConnectionMode) {
public boolean canConnectToExternal(ForgeDirection dir, boolean ignoreDisabled) {
World world = getBundle().getWorld();
BlockCoord pos = getLocation();
TileEntity te = world.getTileEntity(pos.x + dir.offsetX, pos.y + dir.offsetY, pos.z + dir.offsetZ);
if(!ignoreConnectionMode && getConnectionMode(dir) == ConnectionMode.DISABLED) {
return false;
}
if(te instanceof IPartHost) {
IPart part = ((IPartHost) te).getPart(dir.getOpposite());
if(part == null) {
@@ -178,6 +166,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
if(getNode() == null && !worldObj.isRemote) {
IGridNode node = AEApi.instance().createGridNode(grid);
if(node != null) {
node.setPlayerID(playerID);
getBundle().setGridNode(node);
getNode().updateState();
}
@@ -193,58 +182,31 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
return mode;
}
@Override
public ConnectionMode getConnectionMode(ForgeDirection dir) {
return validConnections.contains(dir) ? ConnectionMode.IN_OUT : ConnectionMode.DISABLED;
}
@Override
public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) {
super.setConnectionMode(dir, mode);
if(mode == ConnectionMode.DISABLED) {
validConnections.remove(dir);
} else {
validConnections.add(dir);
}
if(hasNode()) {
getNode().updateState();
getNode().getWorld().markBlockForUpdate(getLocation().x, getLocation().y, getLocation().z);
}
}
@Override
public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) {
if(conduit == null) {
if(!super.canConnectToConduit(direction, conduit)) {
return false;
}
return conduit instanceof IMEConduit;
}
@Override
public void conduitConnectionAdded(ForgeDirection fromDirection) {
super.conduitConnectionAdded(fromDirection);
validConnections.add(fromDirection);
}
@Override
public void conduitConnectionRemoved(ForgeDirection fromDirection) {
super.conduitConnectionRemoved(fromDirection);
// validConnections.remove(fromDirection); // this causes more annoying behavior than wanted behavior. Let's leave it out for now.
}
@Override
@Method(modid = "appliedenergistics2")
protected void connectionsChanged() {
public void connectionsChanged() {
super.connectionsChanged();
onNodeChanged();
if(getNode() != null) {
getNode().updateState();
BlockCoord loc = getLocation();
if(loc != null) {
onNodeChanged(loc);
IGridNode node = getNode();
if(node != null) {
node.updateState();
node.getWorld().markBlockForUpdate(loc.x, loc.y, loc.z);
}
}
}
@Override
public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List<RaytraceResult> all) {
super.onBlockActivated(player, res, all);
if(ToolUtil.isToolEquipped(player)) {
if(!getBundle().getEntity().getWorldObj().isRemote) {
if(res != null && res.component != null) {
@@ -252,20 +214,15 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit);
if(connDir == ForgeDirection.UNKNOWN || connDir == faceHit) {
if(getConnectionMode(faceHit) == ConnectionMode.DISABLED) {
setConnectionMode(faceHit, getNextConnectionMode(faceHit));
setConnectionMode(faceHit, ConnectionMode.IN_OUT);
return true;
}
// Attempt to join networks
boolean retVal = ConduitUtil.joinConduits(this, faceHit);
if(retVal) {
onNodeChanged();
}
return retVal;
return ConduitUtil.joinConduits(this, faceHit);
} else if(externalConnections.contains(connDir)) {
setConnectionMode(connDir, getNextConnectionMode(connDir));
return true;
} else if(containsConduitConnection(connDir)) {
ConduitUtil.disconectConduits(this, connDir);
onNodeChanged();
return true;
}
}
@@ -275,14 +232,12 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
}
@Method(modid = "appliedenergistics2")
public void onNodeChanged() {
boolean foundConnection = false;
private void onNodeChanged(BlockCoord location) {
World world = getBundle().getWorld();
for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
TileEntity te = getBundle().getLocation().getLocation(dir).getTileEntity(getBundle().getWorld());
if(te != null && te instanceof IGridHost) {
TileEntity te = location.getLocation(dir).getTileEntity(world);
if(te != null && te instanceof IGridHost && !(te instanceof IConduitBundle)) {
IGridNode node = ((IGridHost) te).getGridNode(ForgeDirection.UNKNOWN);
foundConnection |= validConnections.contains(dir);
if(node == null) {
node = ((IGridHost) te).getGridNode(dir.getOpposite());
}
@@ -291,9 +246,6 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
}
}
}
if(!foundConnection && hasNode()) {
getNode().destroy();
}
}
@Override
@@ -318,6 +270,16 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
getBundle().setGridNode(null);
}
@Override
@Method(modid = "appliedenergistics2")
public void onChunkUnload(World worldObj) {
super.onChunkUnload(worldObj);
if(getNode() != null) {
getNode().destroy();
getBundle().setGridNode(null);
}
}
@Override
public MEConduitGrid getGrid() {
return grid;
@@ -328,21 +290,18 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
return getBundle().getGridNode(null);
}
private boolean hasNode() {
return getNode() != null;
}
@Override
public EnumSet<ForgeDirection> getConnections() {
Set<ForgeDirection> cons = getConduitConnections();
cons.addAll(getExternalConnections());
if(cons.isEmpty()) {
return EnumSet.noneOf(ForgeDirection.class);
EnumSet<ForgeDirection> cons = EnumSet.noneOf(ForgeDirection.class);
cons.addAll(getConduitConnections());
for(ForgeDirection dir : getExternalConnections()) {
if(getConnectionMode(dir) != ConnectionMode.DISABLED) {
cons.add(dir);
}
}
return EnumSet.copyOf(cons);
// return validConnections;
return cons;
}
@Override
public boolean isDense() {
return isDense;
@@ -41,7 +41,7 @@ public class ItemPowerConduit extends AbstractItemConduit {
}
@Override
public IConduit createConduit(ItemStack stack) {
public IConduit createConduit(ItemStack stack, EntityPlayer player) {
return new PowerConduit(stack.getItemDamage());
}
@@ -197,6 +197,8 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula
}
neighbour.conduitConnectionRemoved(connDir.getOpposite());
conduitConnectionRemoved(connDir);
neighbour.connectionsChanged();
connectionsChanged();
updateNetwork();
neighbour.updateNetwork();
return true;
@@ -32,7 +32,7 @@ public class ItemRedstoneConduit extends AbstractItemConduit {
}
@Override
public IConduit createConduit(ItemStack stack) {
public IConduit createConduit(ItemStack stack, EntityPlayer player) {
if(stack.getItemDamage() == 0) {
return new RedstoneConduit();
}
@@ -74,7 +74,7 @@ public class CapBankClientNetwork implements ICapBankNetwork {
BlockCoord bc = state.getInventoryImplLocation();
if(bc == null) {
inventory.setCapBank(null);
} else {
} else if(world != null) {
TileEntity te = world.getTileEntity(bc.x, bc.y, bc.z);
if(te instanceof TileCapBank) {
inventory.setCapBank((TileCapBank) te);