Merge pull request #1985 from Toshayo/master

Support for more unusual pylons
This commit is contained in:
HbmMods 2025-03-17 08:09:03 +01:00 committed by GitHub
commit 11e9bc22ed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 77 additions and 75 deletions

View File

@ -27,9 +27,7 @@ public abstract class RenderPylonBase extends TileEntitySpecialRenderer {
this.bindTexture(pyl.color == 0 ? ResourceManager.wire_tex : ResourceManager.wire_greyscale_tex);
for(int i = 0; i < pyl.connected.size(); i++) {
int[] wire = pyl.connected.get(i);
pyl.getConnected().forEach(wire -> {
TileEntity tile = pyl.getWorldObj().getTileEntity(wire[0], wire[1], wire[2]);
if(tile instanceof TileEntityPylonBase) {
@ -75,7 +73,7 @@ public abstract class RenderPylonBase extends TileEntitySpecialRenderer {
first.zCoord + (sZ - first.zCoord) * 0.5);
}
}
}
});
}
/**

View File

@ -24,7 +24,7 @@ import net.minecraftforge.common.util.ForgeDirection;
public abstract class TileEntityPylonBase extends TileEntityCableBaseNT {
public List<int[]> connected = new ArrayList<int[]>();
protected List<int[]> connected = new ArrayList<>();
public int color;
public static int canConnect(TileEntityPylonBase first, TileEntityPylonBase second) {
@ -136,6 +136,10 @@ public abstract class TileEntityPylonBase extends TileEntityCableBaseNT {
return mounts[0].addVector(xCoord, yCoord, zCoord);
}
public List<int[]> getConnected() {
return connected;
}
@Override
public void writeToNBT(NBTTagCompound nbt) {
super.writeToNBT(nbt);
@ -175,7 +179,7 @@ public abstract class TileEntityPylonBase extends TileEntityCableBaseNT {
this.readFromNBT(pkt.func_148857_g());
}
public static enum ConnectionType {
public enum ConnectionType {
SINGLE,
TRIPLE,
QUAD