Start work on a connected texture renderer, remove old textures, fix recipes for Vaygrim’s issue (closes #481)

common/mekanism/common/ConnectedTextureRenderer.java

@@ -0,0 +1,124 @@
+package mekanism.common;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import mekanism.api.Object3D;
+import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.util.Icon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.common.ForgeDirection;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class ConnectedTextureRenderer
+{
+	public static final byte[][] sideEdges = {{2, 5, 3, 4}, {2, 5, 3, 4}, {1, 4, 0, 5}, {1, 5, 0, 4}, {1, 3, 0, 2}, {1, 2, 0, 3}};
+	
+	public int blockID;
+	public int metadata;
+	
+	public String iconTitle;
+	
+	public Map<Integer, Icon> glassMap = new HashMap<Integer, Icon>();
+	
+	public ConnectedTextureRenderer(String title, int id, int meta)
+	{
+		iconTitle = title;
+		blockID = id;
+		metadata = meta;
+	}
+	
+	@SideOnly(Side.CLIENT)
+	public void registerTextures(IconRegister register)
+	{
+	    glassMap.put(0, register.registerIcon("mekanism:" + iconTitle + "_13"));
+	    glassMap.put(1, register.registerIcon("mekanism:" + iconTitle + "_20"));
+	    glassMap.put(4, register.registerIcon("mekanism:" + iconTitle + "_19"));
+	    glassMap.put(5, register.registerIcon("mekanism:" + iconTitle + "_23"));
+	    glassMap.put(7, register.registerIcon("mekanism:" + iconTitle + "_1"));
+	    glassMap.put(16, register.registerIcon("mekanism:" + iconTitle + "_7"));
+	    glassMap.put(17, register.registerIcon("mekanism:" + iconTitle + "_35"));
+	    glassMap.put(20, register.registerIcon("mekanism:" + iconTitle + "_40"));
+	    glassMap.put(21, register.registerIcon("mekanism:" + iconTitle + "_21"));
+	    glassMap.put(23, register.registerIcon("mekanism:" + iconTitle + "_31"));
+	    glassMap.put(28, register.registerIcon("mekanism:" + iconTitle + "_14"));
+	    glassMap.put(29, register.registerIcon("mekanism:" + iconTitle + "_45"));
+	    glassMap.put(31, register.registerIcon("mekanism:" + iconTitle + "_2"));
+	    glassMap.put(64, register.registerIcon("mekanism:" + iconTitle + "_8"));
+	    glassMap.put(65, register.registerIcon("mekanism:" + iconTitle + "_41"));
+	    glassMap.put(68, register.registerIcon("mekanism:" + iconTitle + "_46"));
+	    glassMap.put(69, register.registerIcon("mekanism:" + iconTitle + "_22"));
+	    glassMap.put(71, register.registerIcon("mekanism:" + iconTitle + "_32"));
+	    glassMap.put(80, register.registerIcon("mekanism:" + iconTitle + "_11"));
+	    glassMap.put(81, register.registerIcon("mekanism:" + iconTitle + "_10"));
+	    glassMap.put(84, register.registerIcon("mekanism:" + iconTitle + "_9"));
+	    glassMap.put(85, register.registerIcon("mekanism:" + iconTitle + "_17"));
+	    glassMap.put(87, register.registerIcon("mekanism:" + iconTitle + "_5"));
+	    glassMap.put(92, register.registerIcon("mekanism:" + iconTitle + "_34"));
+	    glassMap.put(93, register.registerIcon("mekanism:" + iconTitle + "_18"));
+	    glassMap.put(95, register.registerIcon("mekanism:" + iconTitle + "_6"));
+	    glassMap.put(112, register.registerIcon("mekanism:" + iconTitle + "_25"));
+	    glassMap.put(113, register.registerIcon("mekanism:" + iconTitle + "_43"));
+	    glassMap.put(116, register.registerIcon("mekanism:" + iconTitle + "_42"));
+	    glassMap.put(117, register.registerIcon("mekanism:" + iconTitle + "_29"));
+	    glassMap.put(119, register.registerIcon("mekanism:" + iconTitle + "_37"));
+	    glassMap.put(124, register.registerIcon("mekanism:" + iconTitle + "_26"));
+	    glassMap.put(125, register.registerIcon("mekanism:" + iconTitle + "_30"));
+	    glassMap.put(127, register.registerIcon("mekanism:" + iconTitle + "_38"));
+	    glassMap.put(193, register.registerIcon("mekanism:" + iconTitle + "_12"));
+	    glassMap.put(197, register.registerIcon("mekanism:" + iconTitle + "_44"));
+	    glassMap.put(199, register.registerIcon("mekanism:" + iconTitle + "_0"));
+	    glassMap.put(209, register.registerIcon("mekanism:" + iconTitle + "_33"));
+	    glassMap.put(213, register.registerIcon("mekanism:" + iconTitle + "_16"));
+	    glassMap.put(215, register.registerIcon("mekanism:" + iconTitle + "_4"));
+	    glassMap.put(221, register.registerIcon("mekanism:" + iconTitle + "_15"));
+	    glassMap.put(223, register.registerIcon("mekanism:" + iconTitle + "_3"));
+	    glassMap.put(241, register.registerIcon("mekanism:" + iconTitle + "_24"));
+	    glassMap.put(245, register.registerIcon("mekanism:" + iconTitle + "_28"));
+	    glassMap.put(247, register.registerIcon("mekanism:" + iconTitle + "_36"));
+	    glassMap.put(253, register.registerIcon("mekanism:" + iconTitle + "_27"));
+	    glassMap.put(255, register.registerIcon("mekanism:" + iconTitle + "_39"));
+	}
+	
+    @SideOnly(Side.CLIENT)
+	public Icon getIcon(IBlockAccess world, int x, int y, int z, int side)
+	{
+		int map = 0;
+		
+		for(int face = 0; face < 4; face++)
+		{
+			int side0 = sideEdges[side][((face + 3) % 4)];
+			int side1 = sideEdges[side][face];
+
+			if(!canConnect(world, new Object3D(x, y, z), sideEdges[side][face], side)) 
+			{
+				map |= (7 << face * 2) % 256 | 7 >>> 8 - face * 2;
+			} 
+			else if(!canConnect(world, new Object3D(x, y, z).getFromSide(ForgeDirection.getOrientation(side0)), side1, side))
+			{
+				map |= 1 << face * 2;
+			}
+			else if(!canConnect(world, new Object3D(x, y, z).getFromSide(ForgeDirection.getOrientation(side1)), side0, side))
+			{
+				map |= 1 << face * 2;
+			}
+		}
+
+		return glassMap.get(map);
+	}
+
+	private boolean canConnect(IBlockAccess access, Object3D obj, int side, int face)
+	{
+	    Object3D block = obj.getFromSide(ForgeDirection.getOrientation(side));
+	    Object3D blockabove = obj.getFromSide(ForgeDirection.getOrientation(face));
+
+	    return (block.getBlockId(access) == blockID && block.getMetadata(access) == metadata) && (blockabove.getBlockId(access) != blockID || blockabove.getMetadata(access) != metadata);
+	}
+	
+	public boolean shouldRenderSide(IBlockAccess world, int x, int y, int z, int side)
+	{
+		Object3D obj = new Object3D(x, y, z).getFromSide(ForgeDirection.getOrientation(side).getOpposite());
+		return obj.getBlockId(world) != blockID || obj.getMetadata(world) != metadata;
+	}
+}

common/mekanism/common/Mekanism.java

@@ -427,6 +427,9 @@ public class Mekanism
 			"ACA", "SES", "TIT", Character.valueOf('A'), AtomicCore, Character.valueOf('C'), "circuitBasic", Character.valueOf('S'), new ItemStack(MachineBlock, 1, 15), Character.valueOf('E'), Robit.getUnchargedItem(),
 			Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('T'), TeleportationCore
 		}));
+		CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Transmitter, 1, 4), new Object[] {
+			"RRR", "SBS", "RRR", Character.valueOf('R'), Item.redstone, Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Block.fenceIron
+		}));
 		
 		for(RecipeType type : RecipeType.values())
 		{

common/mekanism/induction/common/MekanismInduction.java

@@ -2,7 +2,9 @@ package mekanism.induction.common;
 
 import mekanism.common.IModule;
 import mekanism.common.Mekanism;
+import mekanism.common.Tier.EnergyCubeTier;
 import mekanism.common.Version;
+import mekanism.common.util.MekanismUtils;
 import mekanism.induction.common.block.BlockBattery;
 import mekanism.induction.common.block.BlockEMContractor;
 import mekanism.induction.common.block.BlockMultimeter;
@@ -21,7 +23,6 @@ import net.minecraftforge.common.Configuration;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import universalelectricity.compatibility.Compatibility;
-import universalelectricity.core.item.IItemElectric;
 import universalelectricity.core.vector.Vector3;
 import calclavia.lib.UniversalRecipes;
 import cpw.mods.fml.common.Mod;
@@ -135,13 +136,13 @@ public class MekanismInduction implements IModule
 		GameRegistry.addRecipe(new ShapedOreRecipe(Linker, " E ", "GCG", " E ", 'E', Item.eyeOfEnder, 'C', Mekanism.EnergyTablet, 'G', UniversalRecipes.SECONDARY_METAL));
 
 		/** Tesla - by Jyzarc */
-		GameRegistry.addRecipe(new ShapedOreRecipe(Tesla, "WEW", " C ", " I ", 'W', Mekanism.EnrichedAlloy, 'E', Item.eyeOfEnder, 'C', Mekanism.EnergyTablet, 'I', Mekanism.MachineBlock));
+		GameRegistry.addRecipe(new ShapedOreRecipe(Tesla, "WEW", " C ", " I ", 'W', Mekanism.EnrichedAlloy, 'E', Item.eyeOfEnder, 'C', Mekanism.EnergyTablet, 'I', new ItemStack(Mekanism.BasicBlock, 1, 8)));
 
 		/** Multimeter */
 		GameRegistry.addRecipe(new ShapedOreRecipe(Multimeter, "WWW", "ICI", 'W', Mekanism.EnrichedAlloy, 'C', Mekanism.EnergyTablet, 'I', UniversalRecipes.PRIMARY_METAL));
 
 		/** Battery */
-		GameRegistry.addRecipe(new ShapedOreRecipe(Battery, "III", "IRI", "III", 'R', Block.blockRedstone, 'I', Mekanism.EnergyCube));
+		GameRegistry.addRecipe(new ShapedOreRecipe(Battery, "III", "IRI", "III", 'R', Block.blockRedstone, 'I', MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC)));
 
 		/** EM Contractor */
 		GameRegistry.addRecipe(new ShapedOreRecipe(ElectromagneticContractor, " I ", "GCG", "WWW", 'W', UniversalRecipes.PRIMARY_METAL, 'C', Mekanism.EnergyTablet, 'G', UniversalRecipes.SECONDARY_METAL, 'I', UniversalRecipes.PRIMARY_METAL));

resources/assets/mekanism/textures/blocks/LogisticalSorterSideOn.png.mcmeta

@@ -1,5 +0,0 @@
-{
-  "animation": {
-    "frametime": 1
-  }
-}