mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 04:09:43 +00:00
Use old ME conduit art
This commit is contained in:
1 parent
c764cfdd0d
commit
86330ff2af
3 files changed
+58
-3
No files matched your search
@@ -33,6 +33,8 @@ import crazypants.enderio.conduit.liquid.EnderLiquidConduit;
|
||||
import crazypants.enderio.conduit.liquid.EnderLiquidConduitRenderer;
|
||||
import crazypants.enderio.conduit.liquid.LiquidConduit;
|
||||
import crazypants.enderio.conduit.liquid.LiquidConduitRenderer;
|
||||
import crazypants.enderio.conduit.me.MEConduit;
|
||||
import crazypants.enderio.conduit.me.MEConduitNetwork;
|
||||
import crazypants.enderio.conduit.power.PowerConduit;
|
||||
import crazypants.enderio.conduit.power.PowerConduitRenderer;
|
||||
import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit;
|
||||
@@ -144,6 +146,7 @@ public class ClientProxy extends CommonProxy {
|
||||
EnderLiquidConduit.initIcons();
|
||||
ItemConduit.initIcons();
|
||||
GasConduit.initIcons();
|
||||
MEConduit.initIcons();
|
||||
}
|
||||
|
||||
private List<ConduitRenderer> conduitRenderers = new ArrayList<ConduitRenderer>();
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
package crazypants.enderio.conduit.me;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import appeng.api.AEApi;
|
||||
import appeng.api.networking.IGridHost;
|
||||
import appeng.api.networking.IGridNode;
|
||||
import appeng.api.networking.events.MENetworkEvent;
|
||||
import appeng.api.util.AECableType;
|
||||
import appeng.api.util.DimensionalCoord;
|
||||
import appeng.me.helpers.AENetworkProxy;
|
||||
@@ -15,6 +17,8 @@ import crazypants.enderio.conduit.AbstractConduit;
|
||||
import crazypants.enderio.conduit.AbstractConduitNetwork;
|
||||
import crazypants.enderio.conduit.IConduit;
|
||||
import crazypants.enderio.conduit.geom.CollidableComponent;
|
||||
import crazypants.render.IconUtil;
|
||||
import crazypants.util.BlockCoord;
|
||||
|
||||
public class MEConduit extends AbstractConduit implements IMEConduit {
|
||||
|
||||
@@ -23,7 +27,27 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
|
||||
protected MEConduitNetwork network;
|
||||
|
||||
protected MEConduitGrid grid;
|
||||
|
||||
private static IIcon coreTexture;
|
||||
private static IIcon longTexture;
|
||||
|
||||
public static void initIcons() {
|
||||
IconUtil.addIconProvider(new IconUtil.IIconProvider() {
|
||||
|
||||
@Override
|
||||
public void registerIcons(IIconRegister register) {
|
||||
coreTexture = register.registerIcon(EnderIO.MODID + ":meConduitCore");
|
||||
longTexture = register.registerIcon(EnderIO.MODID + ":meConduit");
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getTextureType() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
public MEConduit() {
|
||||
grid = new MEConduitGrid(this);
|
||||
}
|
||||
@@ -48,10 +72,32 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
|
||||
this.network = (MEConduitNetwork) network;
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) {
|
||||
return super.canConnectToConduit(direction, conduit);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canConnectToExternal(ForgeDirection direction, boolean ignoreConnectionMode) {
|
||||
return canConnectTo(getBundle().getWorld(), direction, getBundle().getBlockCoord());
|
||||
}
|
||||
|
||||
private boolean canConnectTo(World world, ForgeDirection dir, BlockCoord pos) {
|
||||
TileEntity te = world.getTileEntity(pos.x + dir.offsetX, pos.y + dir.offsetY, pos.z + dir.offsetZ);
|
||||
if (te instanceof IGridHost) {
|
||||
return ((IGridHost)te).getCableConnectionType(dir.getOpposite()) != AECableType.NONE;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIcon getTextureForState(CollidableComponent component) {
|
||||
return null;
|
||||
if (component.dir == ForgeDirection.UNKNOWN) {
|
||||
return coreTexture;
|
||||
} else {
|
||||
return longTexture;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -99,6 +145,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit {
|
||||
|
||||
@Override
|
||||
public void onRemovedFromBundle() {
|
||||
connectionsChanged();
|
||||
node.destroy();
|
||||
node = null;
|
||||
}
|
||||
|
||||
@@ -12,5 +12,10 @@ public class MEConduitNetwork extends AbstractConduitNetwork<IMEConduit, IMECond
|
||||
public Class<IMEConduit> getBaseConduitType() {
|
||||
return IMEConduit.class;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void addConduit(IMEConduit con) {
|
||||
// TODO Auto-generated method stub
|
||||
super.addConduit(con);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user