Null checks and item rendering

added null checks for itemstacks - should help with #6 and #7
(mostly) fixed the squiffy item rendering - I am excusing my laziness in
this area by saying "they are disabled - they shouldn't look normal*

Author: hilburn

build.gradle

@@ -17,7 +17,7 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "0.9.0-1.7.10"
+version = "0.9.2-1.7.10"
 group= "com.hilburn.dimensionguard" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "DimensionGuard"
 

src/main/java/com/hilburn/dimensionguard/ModInformation.java

@@ -8,5 +8,5 @@
 public class ModInformation {
 	public static final String MODID = "dimensionguard";
 	public static final String NAME = "DimensionGuard";
-	public static final String VERSION = "0.9.0-1.7.10";
+	public static final String VERSION = "0.9.2-1.7.10";
 }

src/main/java/com/hilburn/dimensionguard/client/DisabledRenderer.java

@@ -7,6 +7,8 @@
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.entity.RenderPlayer;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
@@ -120,9 +122,13 @@ public void renderItem (ItemRenderType type, ItemStack itemStack, Object... data
 		            {
 		            case EQUIPPED_FIRST_PERSON:
 		            	//TODO: get items to render in the right place
+		            	GL11.glRotated(90F, 0F, 1F, 0F);
+		            	GL11.glTranslatef(-1F, 0.5F, 0F);
+		            	break;
 		            case EQUIPPED:
 		            	GL11.glRotated(90F, 0F, 1F, 0F);
-		            	GL11.glTranslatef(-0.8F, 0.7F, -0.8F);
+		            	GL11.glTranslatef(-1F, 0.5F, 0F);
+		            	GL11.glRotated(90F, 1F, 0F, 0F);
 		                //GL11.glTranslatef(0, -4 / 16f, 0);
 		                break;
 		            case ENTITY:

src/main/java/com/hilburn/dimensionguard/handlers/DisabledHandler.java

@@ -34,10 +34,7 @@ public class DisabledHandler {
 	private static ArrayList<String> registeredItems;
 
 	public static void init(){
-		//Logger.log(EntityList.classToStringMapping.toString());
 		ConfigHandler.init(DimensionGuard.config);
-		//disabledBlocks = new ArrayList<Disabled>();
-		//registeredBlocks=new ArrayList<String>();
 		registeredItems=new ArrayList<String>();
 
 //		for (Object key:GameData.getBlockRegistry().getKeys()){
@@ -149,29 +146,32 @@ public static void scanInventory(EntityPlayer player, boolean setCanBeDisabled){
 	}
 
 	public static ItemStack scanStack(ItemStack thisStack, int dim, boolean setCanBeDisabled){
-		if(thisStack.stackTagCompound==null){
-			thisStack.stackTagCompound=new NBTTagCompound();
-		}
-		if(!thisStack.stackTagCompound.hasKey("DimensionGuard"))
-			thisStack.stackTagCompound.setTag("DimensionGuard", new NBTTagCompound());
-		if(!thisStack.stackTagCompound.getCompoundTag("DimensionGuard").hasKey("CanBeDisabled")||setCanBeDisabled)
-			thisStack.stackTagCompound.getCompoundTag("DimensionGuard").setBoolean("CanBeDisabled", 
-					DisabledHandler.canBeDisabled(GameRegistry.findUniqueIdentifierFor(thisStack.getItem()).toString(), thisStack.getItemDamage()));
-		if(thisStack.stackTagCompound.getCompoundTag("DimensionGuard").getBoolean("CanBeDisabled")||thisStack.getItem()==ModItems.disable){
-			if(!thisStack.stackTagCompound.getCompoundTag("DimensionGuard").hasKey("LastDimChecked"))
-				thisStack.stackTagCompound.getCompoundTag("DimensionGuard").setInteger("LastDimChecked",Integer.MIN_VALUE);
-			if(thisStack.stackTagCompound.getCompoundTag("DimensionGuard").getInteger("LastDimChecked")!=dim){
-				if (thisStack.getItem()==ModItems.disable){
-					ItemStack storeStack = DisableItem.recoverItemStack(thisStack);
-					//Logger.log(storeStack.getDisplayName());
-					if (!DisabledHandler.isDisabled(GameRegistry.findUniqueIdentifierFor(storeStack.getItem()).toString(), storeStack.getItemDamage(),dim)){
-						return storeStack;
-					}
-				}else{
-					if (DisabledHandler.isDisabled(GameRegistry.findUniqueIdentifierFor(thisStack.getItem()).toString(), thisStack.getItemDamage(),dim)){
-						return DisableItem.storeItem(new ItemStack(ModItems.disable,1), thisStack);
+		if (thisStack!=null&&thisStack.getItem()!=null)
+		{
+			if(thisStack.stackTagCompound==null){
+				thisStack.stackTagCompound=new NBTTagCompound();
+			}
+			if(!thisStack.stackTagCompound.hasKey("DimensionGuard"))
+				thisStack.stackTagCompound.setTag("DimensionGuard", new NBTTagCompound());
+			if(!thisStack.stackTagCompound.getCompoundTag("DimensionGuard").hasKey("CanBeDisabled")||setCanBeDisabled)
+				thisStack.stackTagCompound.getCompoundTag("DimensionGuard").setBoolean("CanBeDisabled", 
+						DisabledHandler.canBeDisabled(GameRegistry.findUniqueIdentifierFor(thisStack.getItem()).toString(), thisStack.getItemDamage()));
+			if(thisStack.stackTagCompound.getCompoundTag("DimensionGuard").getBoolean("CanBeDisabled")||thisStack.getItem()==ModItems.disable){
+				if(!thisStack.stackTagCompound.getCompoundTag("DimensionGuard").hasKey("LastDimChecked"))
+					thisStack.stackTagCompound.getCompoundTag("DimensionGuard").setInteger("LastDimChecked",Integer.MIN_VALUE);
+				if(thisStack.stackTagCompound.getCompoundTag("DimensionGuard").getInteger("LastDimChecked")!=dim){
+					if (thisStack.getItem()==ModItems.disable){
+						ItemStack storeStack = DisableItem.recoverItemStack(thisStack);
+						//Logger.log(storeStack.getDisplayName());
+						if (!DisabledHandler.isDisabled(GameRegistry.findUniqueIdentifierFor(storeStack.getItem()).toString(), storeStack.getItemDamage(),dim)){
+							return storeStack;
+						}
 					}else{
-						thisStack.stackTagCompound.getCompoundTag("DimensionGuard").setInteger("LastDimChecked",dim);
+						if (DisabledHandler.isDisabled(GameRegistry.findUniqueIdentifierFor(thisStack.getItem()).toString(), thisStack.getItemDamage(),dim)){
+							return DisableItem.storeItem(new ItemStack(ModItems.disable,1), thisStack);
+						}else{
+							thisStack.stackTagCompound.getCompoundTag("DimensionGuard").setInteger("LastDimChecked",dim);
+						}
 					}
 				}
 			}