mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Further adapt the multiblock code.
This will allow inter-block connected textures. I'll try and get side-specific texture overrides (eg. for the Salination Controller) working next.
This commit is contained in:
1 parent
5ae5036e62
commit
b1a11b0ba2
13 files changed
+116
-108
No files matched your search
@@ -1,6 +1,8 @@
|
||||
package mekanism.common;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.client.render.block.TextureSubmap;
|
||||
@@ -22,26 +24,42 @@ public class CTMData
|
||||
|
||||
public String texture;
|
||||
|
||||
public List<Integer> acceptableMetas;
|
||||
public HashMap<Block, List<Integer>> acceptableBlockMetas = new HashMap<Block, List<Integer>>();
|
||||
|
||||
public CTMData(String textureName, List<Integer> connectableMeta)
|
||||
public CTMData(String textureName, Block block, List<Integer> connectableMeta)
|
||||
{
|
||||
texture = textureName;
|
||||
acceptableMetas = connectableMeta;
|
||||
acceptableBlockMetas.put(block, connectableMeta);
|
||||
}
|
||||
|
||||
public void registerIcons(IIconRegister register)
|
||||
public CTMData registerIcons(IIconRegister register)
|
||||
{
|
||||
icon = register.registerIcon("mekanism:" + texture);
|
||||
submap = new TextureSubmap(register.registerIcon("mekanism:" + texture + "-ctm"), 4, 4);
|
||||
submapSmall = new TextureSubmap(icon, 2, 2);
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
public CTMData addOtherBlockConnectivities(Block block, List<Integer> connectableMeta)
|
||||
{
|
||||
acceptableBlockMetas.put(block, connectableMeta);
|
||||
return this;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public boolean shouldRenderSide(IBlockAccess world, int x, int y, int z, int side, Block block)
|
||||
public boolean shouldRenderSide(IBlockAccess world, int x, int y, int z, int side)
|
||||
{
|
||||
Coord4D obj = new Coord4D(x, y, z);
|
||||
return !(obj.getBlock(world).equals(block) && acceptableMetas.contains(obj.getMetadata(world)));
|
||||
Block coordBlock = obj.getBlock(world);
|
||||
int coordMeta = obj.getMetadata(world);
|
||||
boolean valid = false;
|
||||
|
||||
for(Entry<Block, List<Integer>> entry : acceptableBlockMetas.entrySet())
|
||||
{
|
||||
valid |= entry.getKey().equals(coordBlock) && entry.getValue().contains(coordMeta);
|
||||
}
|
||||
return !valid;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user