Merge pull request #1 from alkcorp/DevTop

Dev top

5 files changed, 49 insertions, 64 deletions

diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
index 42890ddfa6..251230932c 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTile.java
@@ -26,28 +26,43 @@ public class ItemBlockBasicTile extends ItemBlock {
 			list.add("Can also be placed beside upto 4 other fish traps");
 			list.add("Requires at least two faces touching water");
 			list.add("1/1000 chance to produce triple loot.");
-		} else if (this.mID == 1) { // Modularity
+		} 
+		else if (this.mID == 1) { // Modularity
 			list.add("Used to construct modular armour & bauble upgrades..");
-		} else if (this.mID == 2) { // Trade
+		} 
+		else if (this.mID == 2) { // Trade
 			list.add("Allows for SMP trade-o-mat type trading.");
-		} else if (this.mID == 3) { // Project
+		} 
+		else if (this.mID == 3) { // Project
 			list.add("Scan any crafting recipe in this to mass fabricate them in the Autocrafter..");
-		} else if (this.mID == 4) { // Circuit Table
+		} 
+		else if (this.mID == 4) { // Circuit Table
 			list.add("Easy Circuit Configuration");
 			list.add("Change default setting with a Screwdriver");
 			list.add("Default is used to select slot for auto-insertion");
-		} else if (this.mID == 5) { // Decayables Chest
+		} 
+		else if (this.mID == 5) { // Decayables Chest
 			list.add("Chest which holds radioactive materials");
 			list.add("Items which decay will tick while inside");
 			list.add("Place with right click");
-		} else if (this.mID == 6) { // Butterfly Killer
+		} 
+		else if (this.mID == 6) { // Butterfly Killer
 			list.add("Kills Forestry Butterflies, Bats and other pests");
 			list.add("Use either Formaldehyde or Hydrogen cyanide");
 			list.add("Be weary of your neighbours");
-		} else if (this.mID == 7) {
-		} else {
-			list.add("Bad Tooltip ID - " + mID);
+		} 
+		else if (this.mID == 7) {
 
+		} 
+		else if (this.mID == 8){
+			
+		}
+		else if (this.mID == 9){
+			
+		}
+
+		else {
+			list.add("Bad Tooltip ID - " + mID);
 		}
 		super.addInformation(stack, aPlayer, list, bool);
 	}
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java
deleted file mode 100644
index 9badd384d8..0000000000
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockBasicTooltip.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package gtPlusPlus.core.item.base.itemblock;
-
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-
-import gtPlusPlus.api.interfaces.ITileTooltip;
-
-public class ItemBlockBasicTooltip extends ItemBlock{
-
-	protected final int mID;
-	
-	public ItemBlockBasicTooltip(final Block block) {
-		super(block);
-		this.mID = ((ITileTooltip) block).getTooltipID();
-	}	
-	
-
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	@Override
-	public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
-		if (this.mID == 0){ //blockDarkWorldPortalFrame
-			list.add("Assembled in the same shape as the Nether Portal.");			
-		}
-		else if (this.mID == 1){ //Modularity
-			list.add("Used to construct modular armour & bauble upgrades..");			
-		}
-	}
-	
-
-}
diff --git a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
index f586695eb7..2d0fd00dd9 100644
--- a/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
+++ b/src/Java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java
@@ -16,8 +16,6 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata
 	public ItemBlockRoundRobinator(final Block aBlock){
 		super(aBlock, aBlock);
 		this.mBlock = aBlock;
-		this.setMaxDamage(4);
-		this.setHasSubtypes(true);
 	}
 	
 
@@ -40,7 +38,7 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata
 		else if (stack.getItemDamage() == 4) {
 			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("Top and bottom do not pull, so you must push items 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);		
@@ -62,7 +60,7 @@ public class ItemBlockRoundRobinator extends ItemBlockWithMetadata
 	@Override
 	public int getMetadata(final int p_77647_1_)
 	{
-		return super.getMetadata(p_77647_1_);
+		return p_77647_1_;
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java b/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
index 1c28f99ff8..3f8e31d8d2 100644
--- a/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
+++ b/src/Java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java
@@ -26,7 +26,9 @@ public class ItemDummyResearch extends ItemGenericToken {
 		RESEARCH_4_BASIC_PHYSICS("Basic Physics", "Fundamental laws of motion"),
 		RESEARCH_5_ADV_PHYSICS("Advanced Physics", "Advanced knowledge!"),
 		RESEARCH_6_BASIC_METALLURGY("Basic Metallurgy", "Information about material smelting"),
-		RESEARCH_7_ADV_METALLURGY("Advanced Metallurgy", "Advanced Material Sciences!");	
+		RESEARCH_7_ADV_METALLURGY("Advanced Metallurgy", "Advanced Material Sciences!"),
+		RESEARCH_8_TURBINE_AUTOMATION("Turbine Automation", "You really don't want to share this with anyone!"), 
+		RESEARCH_9_CLOAKING("Cloaking Technologies", "Sneaking around like a mouse");	
 		
 		
 		
diff --git a/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java b/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
index c151a16f09..fa008bf1a3 100644
--- a/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
+++ b/src/Java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java
@@ -2,10 +2,15 @@ package gtPlusPlus.core.item.general;
 
 import java.util.List;
 
+import baubles.api.BaubleType;
+import baubles.api.IBauble;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
-
-import net.minecraft.client.Minecraft;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import gtPlusPlus.core.handler.events.CustomMovementHandler;
+import gtPlusPlus.core.handler.events.SneakManager;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -14,14 +19,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.world.World;
 
-import baubles.api.BaubleType;
-import baubles.api.IBauble;
-import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.handler.events.CustomMovementHandler;
-import gtPlusPlus.core.handler.events.SneakManager;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
-
 @Optional.InterfaceList(value = {@Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles"), @Optional.Interface(iface = "baubles.api.BaubleType", modid = "Baubles")})
 public class ItemSlowBuildingRing extends Item implements IBauble{
 
@@ -84,7 +81,17 @@ public class ItemSlowBuildingRing extends Item implements IBauble{
 
 	@Override //TODO
 	public void onEquipped(final ItemStack arg0, final EntityLivingBase arg1) {
-		doEffect(arg1);
+		try {
+			EntityPlayer aPlayer;
+			if (arg1 instanceof EntityPlayer) {
+				aPlayer = (EntityPlayer) arg1;
+				SneakManager s = SneakManager.get(aPlayer);				
+				s.putRingOn();
+			}
+		}
+		catch (Throwable t) {
+			t.printStackTrace();
+		}
 	}
 
 	@Override //TODO
@@ -94,8 +101,7 @@ public class ItemSlowBuildingRing extends Item implements IBauble{
 			if (arg1 instanceof EntityPlayer) {
 				aPlayer = (EntityPlayer) arg1;
 				SneakManager s = SneakManager.get(aPlayer);				
-				s.setSprintingStateON();
-				s.setCrouchingStateOFF();
+				s.takeRingOff();
 			}
 		}
 		catch (Throwable t) {
@@ -122,9 +128,7 @@ public class ItemSlowBuildingRing extends Item implements IBauble{
 					}						
 					if (aPlayer.isSprinting()) {
 						aPlayer.setSprinting(false);						
-					}
-					s.setSprintingStateOFF();
-					s.setCrouchingStateON();				
+					}				
 				}				
 			}
 		}