mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-21 20:52:42 +00:00
Split internal and external connector textures
This commit is contained in:
1 parent
b60a44fe7a
commit
3a1da27d3c
8 files changed
+16
-22
No files matched your search
@@ -64,6 +64,7 @@ import crazypants.util.Util;
|
||||
public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade, IRedNetOmniNode {
|
||||
|
||||
private static final String KEY_CONNECTOR_ICON = "enderIO:conduitConnector";
|
||||
private static final String KEY_CONNECTOR_ICON_EXTERNAL = "enderIO:conduitConnectorExternal";
|
||||
|
||||
public static BlockConduitBundle create() {
|
||||
|
||||
@@ -90,7 +91,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade
|
||||
|
||||
public static int rendererId = -1;
|
||||
|
||||
private IIcon connectorIcon;
|
||||
private IIcon connectorIcon, connectorIconExternal;
|
||||
|
||||
private IIcon lastRemovedComponetIcon = null;
|
||||
|
||||
@@ -233,14 +234,15 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade
|
||||
return 0;
|
||||
}
|
||||
|
||||
public IIcon getConnectorIcon() {
|
||||
return connectorIcon;
|
||||
public IIcon getConnectorIcon(Object data) {
|
||||
return data == ConduitConnectorType.EXTERNAL ? connectorIconExternal : connectorIcon;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerBlockIcons(IIconRegister IIconRegister) {
|
||||
connectorIcon = IIconRegister.registerIcon(KEY_CONNECTOR_ICON);
|
||||
connectorIconExternal = IIconRegister.registerIcon(KEY_CONNECTOR_ICON_EXTERNAL);
|
||||
blockIcon = connectorIcon;
|
||||
}
|
||||
|
||||
|
||||
@@ -548,26 +548,17 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
|
||||
}
|
||||
}
|
||||
|
||||
List<CollidableComponent> internals = Lists.newArrayList();
|
||||
// Merge all internal conduit connectors into one box
|
||||
BoundingBox conBB = null;
|
||||
for (int i = 0; i < result.size(); i++) {
|
||||
CollidableComponent cc = result.get(i);
|
||||
if (cc.conduitType == null && cc.data == ConduitConnectorType.INTERNAL) {
|
||||
internals.add(cc);
|
||||
conBB = conBB == null ? cc.bound : conBB.expandBy(cc.bound);
|
||||
result.remove(i);
|
||||
i--;
|
||||
cachedConnectors.remove(cc);
|
||||
}
|
||||
}
|
||||
|
||||
BoundingBox conBB = null;
|
||||
for (CollidableComponent cc : internals) {
|
||||
if (conBB == null) {
|
||||
conBB = cc.bound;
|
||||
} else {
|
||||
conBB = conBB.expandBy(cc.bound);
|
||||
}
|
||||
}
|
||||
|
||||
if(conBB != null) {
|
||||
CollidableComponent cc = new CollidableComponent(null, conBB, ForgeDirection.UNKNOWN, ConduitConnectorType.INTERNAL);
|
||||
@@ -595,7 +586,6 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle {
|
||||
}
|
||||
|
||||
connectorsDirty = false;
|
||||
|
||||
}
|
||||
|
||||
private boolean axisOfConnectionsEqual(Set<ForgeDirection> cons) {
|
||||
|
||||
@@ -115,7 +115,7 @@ public class GasConduitRenderer extends DefaultConduitRenderer {
|
||||
}
|
||||
|
||||
if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) {
|
||||
tex = EnderIO.blockConduitBundle.getConnectorIcon();
|
||||
tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data);
|
||||
List<Vertex> corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV());
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
for (Vertex c : corners) {
|
||||
|
||||
@@ -118,7 +118,7 @@ public class AdvancedLiquidConduitRenderer extends DefaultConduitRenderer {
|
||||
}
|
||||
|
||||
if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) {
|
||||
tex = EnderIO.blockConduitBundle.getConnectorIcon();
|
||||
tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data);
|
||||
List<Vertex> corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV());
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
for (Vertex c : corners) {
|
||||
|
||||
@@ -66,7 +66,7 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer {
|
||||
}
|
||||
|
||||
if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) {
|
||||
tex = EnderIO.blockConduitBundle.getConnectorIcon();
|
||||
tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data);
|
||||
List<Vertex> corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV());
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
for (Vertex c : corners) {
|
||||
|
||||
@@ -8,6 +8,7 @@ import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.conduit.IConduit;
|
||||
import crazypants.enderio.conduit.IConduitBundle;
|
||||
import crazypants.enderio.conduit.geom.CollidableComponent;
|
||||
import crazypants.enderio.conduit.geom.ConduitConnectorType;
|
||||
import crazypants.enderio.conduit.geom.ConduitGeometryUtil;
|
||||
import crazypants.enderio.conduit.render.ConduitBundleRenderer;
|
||||
import crazypants.enderio.conduit.render.DefaultConduitRenderer;
|
||||
@@ -54,7 +55,7 @@ public class RedstoneSwitchRenderer extends DefaultConduitRenderer {
|
||||
|
||||
IIcon[] icons = new IIcon[6];
|
||||
for (int i = 0; i < icons.length; i++) {
|
||||
icons[i] = EnderIO.blockConduitBundle.getConnectorIcon();
|
||||
icons[i] = EnderIO.blockConduitBundle.getConnectorIcon(ConduitConnectorType.INTERNAL);
|
||||
}
|
||||
icons[3] = sw.getSwitchIcon();
|
||||
|
||||
|
||||
@@ -39,6 +39,7 @@ import crazypants.enderio.conduit.IConduitBundle.FacadeRenderState;
|
||||
import crazypants.enderio.conduit.TileConduitBundle;
|
||||
import crazypants.enderio.conduit.facade.BlockConduitFacade;
|
||||
import crazypants.enderio.conduit.geom.CollidableComponent;
|
||||
import crazypants.enderio.conduit.geom.ConduitConnectorType;
|
||||
import crazypants.enderio.conduit.geom.ConduitGeometryUtil;
|
||||
import crazypants.enderio.config.Config;
|
||||
import crazypants.render.BoundingBox;
|
||||
@@ -244,7 +245,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
|
||||
}
|
||||
|
||||
} else if(ConduitUtil.getDisplayMode(player) == ConduitDisplayMode.ALL && !rb.hasOverrideBlockTexture()) {
|
||||
IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon();
|
||||
IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data);
|
||||
CubeRenderer.render(component.bound, tex);
|
||||
}
|
||||
}
|
||||
@@ -267,7 +268,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
|
||||
}
|
||||
|
||||
private void renderExternalConnection(ForgeDirection dir) {
|
||||
IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon();
|
||||
IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(ConduitConnectorType.EXTERNAL);
|
||||
BoundingBox[] bbs = ConduitGeometryUtil.instance.getExternalConnectorBoundingBoxes(dir);
|
||||
for (BoundingBox bb : bbs) {
|
||||
CubeRenderer.render(bb, tex, true);
|
||||
|
||||
@@ -80,7 +80,7 @@ public class DefaultConduitRenderer implements ConduitRenderer {
|
||||
drawSection(bb, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, false);
|
||||
|
||||
if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) {
|
||||
tex = EnderIO.blockConduitBundle.getConnectorIcon();
|
||||
tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data);
|
||||
List<Vertex> corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV());
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
for (Vertex c : corners) {
|
||||
|
||||
Reference in new issue
Block a user