Merge pull request #6 from Ugachaga/MC1.7.x

Added forbidden dimensions config

Author: runescapejon

src/main/java/de/eydamos/backpack/helper/GuiHelper.java

@@ -1,21 +1,22 @@
 package de.eydamos.backpack.helper;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import de.eydamos.backpack.Backpack;
 import de.eydamos.backpack.factory.FactoryBackpack;
 import de.eydamos.backpack.gui.GuiBackpackRename;
+import de.eydamos.backpack.misc.ConfigurationBackpack;
 import de.eydamos.backpack.network.message.MessageGuiCommand;
 import de.eydamos.backpack.network.message.MessageOpenBackpack;
 import de.eydamos.backpack.network.message.MessageOpenGui;
 import de.eydamos.backpack.network.message.MessageOpenPersonalSlot;
 import de.eydamos.backpack.network.message.MessageRenameBackpack;
 import de.eydamos.backpack.saves.BackpackSave;
 import de.eydamos.backpack.saves.PlayerSave;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
 
 public class GuiHelper {
     @SideOnly(Side.CLIENT)
@@ -24,6 +25,9 @@ public static void displayRenameGui() {
     }
 
     public static void displayBackpack(BackpackSave backpackSave, IInventory inventory, EntityPlayerMP entityPlayer) {
+
+        if (!isDimensionAllowed(entityPlayer)) return;
+
         prepare(entityPlayer);
 
         MessageOpenBackpack message = new MessageOpenBackpack(backpackSave, inventory, entityPlayer.currentWindowId);
@@ -34,6 +38,9 @@ public static void displayBackpack(BackpackSave backpackSave, IInventory invento
     }
 
     public static void displayPersonalSlot(EntityPlayerMP entityPlayer) {
+
+        if (!isDimensionAllowed(entityPlayer)) return;
+
         PlayerSave playerSave = new PlayerSave(entityPlayer);
         playerSave.setType((byte) -1);
 
@@ -46,6 +53,14 @@ public static void displayPersonalSlot(EntityPlayerMP entityPlayer) {
         openContainer(container, entityPlayer);
     }
 
+    private static boolean isDimensionAllowed (EntityPlayerMP entityPlayer) {
+        Integer currentDimID = (entityPlayer.worldObj.provider.dimensionId);
+        for (String id : ConfigurationBackpack.FORBIDDEN_DIMENSIONS) {
+            if (id.equals(currentDimID.toString())) return false;
+        }
+        return true;
+    }
+
     @SideOnly(Side.CLIENT)
     public static void sendOpenPersonalGui(byte gui) {
         MessageOpenGui message = new MessageOpenGui(gui);

src/main/java/de/eydamos/backpack/misc/ConfigurationBackpack.java

@@ -21,7 +21,8 @@ public class ConfigurationBackpack {
     public static boolean DISABLE_WORKBENCH_BACKPACKS;
     public static boolean BIG_BY_UPGRADE_ONLY;
     public static String[] DISALLOW_ITEM_IDS;
-    public static String[] DEFAULT_ITEM_IDS = {};
+    public static String[] FORBIDDEN_DIMENSIONS;
+    public static String[] DEFAULT_IDS = {};
 
     public static boolean NEISupport = false;
 
@@ -62,7 +63,8 @@ public static void loadConfiguration() {
         DISABLE_WORKBENCH_BACKPACKS = config.get(Configuration.CATEGORY_GENERAL, "disableWorkbenchBackpack", false, getDisableWorkbenchBackpacksComment()).getBoolean(false);
         BIG_BY_UPGRADE_ONLY = config.get(Configuration.CATEGORY_GENERAL, "bigByUpgradeOnly", false, getBigByUpgradeOnlyComment()).getBoolean(false);
 
-        DISALLOW_ITEM_IDS = config.get(Configuration.CATEGORY_GENERAL, "disallowItems", DEFAULT_ITEM_IDS, getDisallowItemsComment()).getStringList();
+        DISALLOW_ITEM_IDS = config.get(Configuration.CATEGORY_GENERAL, "disallowItems", DEFAULT_IDS, getDisallowItemsComment()).getStringList();
+        FORBIDDEN_DIMENSIONS = config.get(Configuration.CATEGORY_GENERAL, "forbiddenDimensions", DEFAULT_IDS, getForbiddenDimensionsComment()).getStringList();
 
         if(config.hasChanged()) {
             config.save();
@@ -116,4 +118,9 @@ private static String getBigByUpgradeOnlyComment() {
     private static String getDisallowItemsComment() {
         return "##############\n" + "Example:\n" + "disallowItems: minecraft:dirt\n\n" + "This will disallow dirt in backpacks.\n" + "##############";
     }
+    
+    private static String getForbiddenDimensionsComment() {
+        return "##############\n" + "Example:\n" + "forbiddenDimensions: 0\n\n" + "This will disallow backpacks inventory for Overworld (id = 0).\n" + "##############";
+    }
+    
 }