% Tweaked recipes for Round-Robinators.

% Tweaked composition of Ancient Granite, Black Metal, Rare Earth MID/HIGH.

7 files changed, 59 insertions, 52 deletions

diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java b/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
index 8ba7c2533b..cd480dcffe 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java
@@ -3,7 +3,6 @@ package gtPlusPlus.core.block.machine;
 import java.util.List;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
@@ -124,7 +123,7 @@ public class Machine_RoundRobinator extends BlockContainer implements ITileToolt
 
 	@Override
 	public int getRenderBlockPass() {
-		return 1;
+		return 0;
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/container/Container_RoundRobinator.java b/src/Java/gtPlusPlus/core/container/Container_RoundRobinator.java
index 0da2933dfa..cbd08c2cca 100644
--- a/src/Java/gtPlusPlus/core/container/Container_RoundRobinator.java
+++ b/src/Java/gtPlusPlus/core/container/Container_RoundRobinator.java
@@ -54,19 +54,8 @@ public class Container_RoundRobinator extends Container {
 		this.posX = te.xCoord;
 		this.posY = te.yCoord;
 		this.posZ = te.zCoord;
-		Logger.INFO("1");
 
 		int o = 0;
-
-		// Storage Side
-		/*for (var6 = 0; var6 < 3; var6++) {
-			for (var7 = 0; var7 < 5; var7++) {
-				this.addSlotToContainer(new SlotIntegratedCircuit(o, this.inventoryChest, o, 44 + (var7 * 18), 15 + (var6 * 18)));
-				o++;
-			}
-		}*/
-		
-		
 		int xStart = 134;
 		int yStart = 32;
 
@@ -76,14 +65,6 @@ public class Container_RoundRobinator extends Container {
 		this.addSlotToContainer(new SlotNoInput(this.inventoryChest, o++, xStart+18, yStart));
 		this.addSlotToContainer(new SlotNoInput(this.inventoryChest, o++, xStart, yStart+17));
 		this.addSlotToContainer(new SlotNoInput(this.inventoryChest, o++, xStart+18, yStart+17));		
-		Logger.INFO("2");
-		
-		//Add Output
-		//this.addSlotToContainer(new SlotNoInput(this.inventoryChest, SLOT_OUTPUT, xStart+(8*18), yStart+54));
-		//o++;
-		Logger.INFO("3");
-
-		
 		
 		// Player Inventory
 		for (var6 = 0; var6 < 3; ++var6) {
@@ -95,12 +76,10 @@ public class Container_RoundRobinator extends Container {
 		for (var6 = 0; var6 < 9; ++var6) {
 			this.addSlotToContainer(new Slot(inventory, var6, 8 + (var6 * 18), 142));
 		}
-		
-		
-		
-		Logger.INFO("4");
 		}
-		catch (Throwable t) {}
+		catch (Throwable t) {
+			t.printStackTrace();
+		}
 		this.detectAndSendChanges();
 
 	}
@@ -110,11 +89,9 @@ public class Container_RoundRobinator extends Container {
 			final EntityPlayer aPlayer) {
 
 		if (!aPlayer.worldObj.isRemote) {
-			if ((aSlotIndex == 999) || (aSlotIndex == -999)) {
-			}
-			else if (aSlotIndex < 4) {
+			if (aSlotIndex < 4) {
 				this.tile_entity.toggleSide(aSlotIndex+2);				
-				Logger.INFO("Toggling side: "+(aSlotIndex+2)+" | Active: "+this.tile_entity.getSideActive(aSlotIndex+2)+" | Data:"+this.tile_entity.getDataString());
+				//Logger.INFO("Toggling side: "+(aSlotIndex+2)+" | Active: "+this.tile_entity.getSideActive(aSlotIndex+2)+" | Data:"+this.tile_entity.getDataString());
 			}
 		}
 		return GT_Values.NI;
@@ -141,7 +118,7 @@ public class Container_RoundRobinator extends Container {
 		try {
 			super.addCraftingToCrafters(par1ICrafting);
 		} catch (Throwable var3) {
-			
+			var3.printStackTrace();			
 		}
 	}
 
@@ -149,6 +126,7 @@ public class Container_RoundRobinator extends Container {
 		try {
 			super.removeCraftingFromCrafters(par1ICrafting);
 		} catch (Throwable var3) {
+			var3.printStackTrace();		
 		}
 	}
 
@@ -157,6 +135,7 @@ public class Container_RoundRobinator extends Container {
 			super.detectAndSendChanges();
 			detectAndSendChangesEx();
 		} catch (Throwable var2) {
+			var2.printStackTrace();		
 		}
 	}
 
@@ -165,6 +144,7 @@ public class Container_RoundRobinator extends Container {
 			super.updateProgressBar(par1, par2);
 			updateProgressBarEx(par1, par2);
 		} catch (Throwable var4) {
+			var4.printStackTrace();		
 		}
 	}
 	
@@ -200,9 +180,6 @@ public class Container_RoundRobinator extends Container {
 			this.mSide_4 = aTemp[3] ? 1 : 0;
 			this.mTier = this.tile_entity.getTier();
 			this.mTickRate = this.tile_entity.getTickRate();
-
-			String InventoryContents = ArrayUtils.toString(aTemp, "null");
-			//Logger.INFO("Test: "+InventoryContents);
 			++this.mTimer;
 			Iterator var2 = this.crafters.iterator();
 
diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java
index c5a8341d8a..edb53e8ec0 100644
--- a/src/Java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java
+++ b/src/Java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java
@@ -105,7 +105,9 @@ public class GUI_RoundRobinator extends GuiContainer {
 					mDrawItemStack.invoke(this, new Object[]{aRedGlass, x, y, ""});
 				}
 			}
-			catch (Throwable t) {}
+			catch (Throwable t) {
+				t.printStackTrace();
+			}
 		}
 	}
 
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
index fa18d745fb..f586695eb7 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
@@ -16,7 +16,7 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata
 	public ItemBlockRoundRobinator(final Block aBlock){
 		super(aBlock, aBlock);
 		this.mBlock = aBlock;
-		this.setMaxDamage(0);
+		this.setMaxDamage(4);
 		this.setHasSubtypes(true);
 	}
 	
@@ -38,10 +38,11 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata
 			list.add("1 Item per enabled side every 10 ticks");			
 		}
 		else if (stack.getItemDamage() == 4) {
-			list.add("1 Item per enabled side every 1 ticks");			
+			list.add("1 Item per enabled side every tick");			
 		}		
 		list.add("Top and bottom do not pull, so you must push item in");
 		list.add("Sides can also be disabled with a screwdriver");	
+		list.add("Shift+RMB with empty hand to view inventory contents");	
 		super.addInformation(stack, aPlayer, list, bool);		
 	}
 
@@ -52,7 +53,7 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata
 	@SideOnly(Side.CLIENT)
 	public IIcon getIconFromDamage(final int p_77617_1_)
 	{
-		return this.mBlock.getIcon(2, p_77617_1_);
+		return this.mBlock.getIcon(0, p_77617_1_);
 	}
 
 	/**
@@ -61,7 +62,7 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata
 	@Override
 	public int getMetadata(final int p_77647_1_)
 	{
-		return p_77647_1_;
+		return super.getMetadata(p_77647_1_);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java
index 99586b37fe..ba2579aa97 100644
--- a/src/Java/gtPlusPlus/core/material/ELEMENT.java
+++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java
@@ -217,9 +217,32 @@ public final class ELEMENT {
 		
 		
 		//Runescape materials
-		public static final Material BLACK_METAL = new Material("Black Metal", MaterialState.SOLID, TextureSet.SET_METALLIC, new short[] {5, 5, 5}, 2350, 4650, 24, 17, false, "҈", 0, new MaterialStack[]{new MaterialStack(getInstance().LEAD, 15), new MaterialStack(getInstance().TUNGSTEN, 25), new MaterialStack(getInstance().CARBON, 60)});//Not a GT Inherited Material
+		public static final Material BLACK_METAL = new Material("Black Metal", MaterialState.SOLID, TextureSet.SET_METALLIC, new short[] {5, 5, 5}, 2350, 4650, 24, 17, false, "҈", 0, new MaterialStack[]{new MaterialStack(getInstance().LEAD, 15), new MaterialStack(getInstance().MANGANESE, 25), new MaterialStack(getInstance().CARBON, 60)});//Not a GT Inherited Material
 		public static final Material WHITE_METAL = new Material("White Metal", MaterialState.SOLID, TextureSet.SET_METALLIC, new short[] {255, 255, 255}, 4560, 7580, 35, 41, false, "҉", 0, new MaterialStack[]{new MaterialStack(getInstance().COPPER, 5), new MaterialStack(getInstance().ANTIMONY, 10), new MaterialStack(getInstance().PLATINUM, 10), new MaterialStack(getInstance().TIN, 75)});//Not a GT Inherited Material
-		public static final Material GRANITE = new Material("Ancient Granite", MaterialState.SOLID, TextureSet.SET_SAND, new short[] {107, 107, 107}, 500, 2000, 16, 12, false, "«»", 0, false);//Not a GT Inherited Material
+		
+		public static final Material GRANITE = new Material(
+				"Ancient Granite", 
+				MaterialState.SOLID, 
+				TextureSet.SET_SAND, 
+				new short[] {107, 107, 107}, 
+				500, 
+				2000,
+				16,
+				12,
+				false,
+				"«»",
+				0,
+				false,
+				new MaterialStack[]{
+						new MaterialStack(getInstance().OXYGEN, 30),
+						new MaterialStack(getInstance().IRON, 20),
+						new MaterialStack(getInstance().SILICON, 20),
+						new MaterialStack(getInstance().ALUMINIUM, 10),
+						new MaterialStack(getInstance().POTASSIUM, 10),
+						new MaterialStack(getInstance().CALCIUM, 5),
+						new MaterialStack(getInstance().SODIUM, 5)
+						});//Not a GT Inherited Material
+		
 		public static final Material RUNITE = new Material("Runite", MaterialState.SOLID, TextureSet.SET_FINE, new short[] {60, 200, 190}, 6750, 11550, 73, 87, true, "§", 0);//Not a GT Inherited Material
 		public static final Material DRAGON_METAL = new Material("Dragonblood", MaterialState.SOLID, TextureSet.SET_SHINY, new short[] {220, 40, 20, 2}, 10160, 17850, 96, 105, true, "۞", 0);//Not a GT Inherited Material
 		
diff --git a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
index 0e661fd429..6e1e6ea5ad 100644
--- a/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
+++ b/src/Java/gtPlusPlus/core/material/MISC_MATERIALS.java
@@ -142,7 +142,7 @@ public final class MISC_MATERIALS {
 					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Galena), 1),
 					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Chalcopyrite), 1),
 					new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Cobaltite), 1),
-					new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1)
+					new MaterialStack(ELEMENT.STANDALONE.GRANITE, 1)
 			});
 
 	public static final Material RARE_EARTH_MID = new Material(
@@ -162,8 +162,8 @@ public final class MISC_MATERIALS {
 					new MaterialStack(ORES.CROCROITE, 1),					
 					new MaterialStack(ORES.NICHROMITE, 1),					
 					new MaterialStack(ORES.ZIRCON, 1),
+					new MaterialStack(ELEMENT.STANDALONE.GRANITE, 1),
 					new MaterialStack(ELEMENT.STANDALONE.BLACK_METAL, 1),
-					new MaterialStack(ELEMENT.STANDALONE.WHITE_METAL, 1),
 					new MaterialStack(ELEMENT.STANDALONE.RUNITE, 1)			
 			});
 
diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java
index 4950718f4a..a220997c84 100644
--- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java
+++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java
@@ -118,14 +118,16 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
 				
 				if (tickCount % getTickRate() == 0) {
 					if (hasInventoryContents()) {
-						Logger.INFO("Trying to move items. "+aTickRate);
+						Logger.WARNING("Trying to move items. "+aTickRate);
 						this.tryProcessItems();							
 					}	
 				}
 				this.tickCount++;
 			}
 		}
-		catch (final Throwable t){}
+		catch (final Throwable t){
+			t.printStackTrace();
+		}
 	}
 
 	public boolean anyPlayerInRange() {
@@ -270,6 +272,7 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
 			return true;
 		}
 		catch (Throwable t) {
+			t.printStackTrace();
 			return false;
 		}		
 	}
@@ -333,6 +336,7 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
 			}	
 		}
 		catch (Throwable t) {
+			t.printStackTrace();
 		}
 	}
 
@@ -362,6 +366,7 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
 			}	
 		}
 		catch (Throwable t) {
+			t.printStackTrace();
 			return false;
 		}
 	}
@@ -476,7 +481,7 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
 		if (this.worldObj != null && !this.worldObj.isRemote) {
 			boolean didSomething = false;
 			if (!this.isEmpty()) {
-				Logger.INFO("Has Items, Trying to push to all active directions.");
+				Logger.WARNING("Has Items, Trying to push to all active directions.");
 				didSomething = this.tryPushItemsIntoNeighbours();
 			}			
 			if (didSomething) {
@@ -512,28 +517,28 @@ public class TileEntityRoundRobinator extends TileEntity implements ISidedInvent
 
 		for (int u = 2; u < 6; u++) {
 			if (!this.getSideActive(u)) {
-				Logger.INFO("Not pushing on side "+u);
+				Logger.WARNING("Not pushing on side "+u);
 				continue;
 			}			
 			
-			Logger.INFO("Pushing on side "+u);
+			Logger.WARNING("Pushing on side "+u);
 			IInventory iinventory = this.getInventoryFromFacing(u);
 
 			if (iinventory == null) {
-				Logger.INFO("No inventory found.");
+				Logger.WARNING("No inventory found.");
 				continue;
 			}
 			else {			
 
 				int i = Facing.oppositeSide[u];
-				Logger.INFO("Using Opposite direction: "+i);
+				Logger.WARNING("Using Opposite direction: "+i);
 
 				if (this.isInventoryFull(iinventory, i)) {
-					Logger.INFO("Target is full, skipping.");
+					Logger.WARNING("Target is full, skipping.");
 					continue;
 				}
 				else {
-					Logger.INFO("Target has space, let's move a single item.");
+					Logger.WARNING("Target has space, let's move a single item.");
 					for (int j = 0; j < this.getSizeInventory(); ++j) {
 						if (this.getStackInSlot(j) != null) {
 							ItemStack itemstack = this.getStackInSlot(j).copy();