+ Implemented Blacklist for OB Glider. Closes #584.

+ Added default versioning file.

4 files changed, 144 insertions, 1 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
index b7efcf08ea..cd25fdb1c3 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
@@ -12,6 +12,7 @@ import gtPlusPlus.xmod.galacticraft.HANDLER_GalactiCraft;
 import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.growthcraft.HANDLER_GC;
 import gtPlusPlus.xmod.ic2.HANDLER_IC2;
+import gtPlusPlus.xmod.ob.HANDLER_OpenBlocks;
 import gtPlusPlus.xmod.railcraft.HANDLER_Railcraft;
 import gtPlusPlus.xmod.reliquary.HANDLER_Reliquary;
 import gtPlusPlus.xmod.sc2.HANDLER_SC2;
@@ -37,6 +38,7 @@ public class COMPAT_IntermodStaging {
 		HANDLER_CropsPlusPlus.preInit(preinit);
 		HANDLER_Railcraft.preInit();
 		HANDLER_Reliquary.preInit();
+		HANDLER_OpenBlocks.preInit();
 	}
 
 	public static void init(FMLInitializationEvent init){
@@ -55,6 +57,7 @@ public class COMPAT_IntermodStaging {
 		HANDLER_CropsPlusPlus.init(init);
 		HANDLER_Railcraft.init();
 		HANDLER_Reliquary.init();
+		HANDLER_OpenBlocks.init();
 	}
 
 	public static void postInit(FMLPostInitializationEvent postinit){
@@ -73,6 +76,7 @@ public class COMPAT_IntermodStaging {
 		HANDLER_CropsPlusPlus.postInit(postinit);
 		HANDLER_Railcraft.postInit();
 		HANDLER_Reliquary.postInit();
+		HANDLER_OpenBlocks.postInit();
 	}
 
 	public static void onLoadComplete(FMLLoadCompleteEvent event) {
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
index c269e9463e..d81c96dcca 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
@@ -15,7 +15,6 @@ import gtPlusPlus.preloader.asm.transformers.Preloader_ClassTransformer.OreDicti
 import net.minecraft.launchwrapper.IClassTransformer;
 import net.minecraft.launchwrapper.Launch;
 
-@SuppressWarnings("static-access")
 public class Preloader_Transformer_Handler implements IClassTransformer {
 
 	private final boolean mEnabled = false;
diff --git a/src/Java/gtPlusPlus/xmod/ob/GliderHandler.java b/src/Java/gtPlusPlus/xmod/ob/GliderHandler.java
new file mode 100644
index 0000000000..b1874b7ed2
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/ob/GliderHandler.java
@@ -0,0 +1,102 @@
+package gtPlusPlus.xmod.ob;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraftforge.event.entity.player.PlayerInteractEvent;
+import net.minecraftforge.event.entity.player.PlayerUseItemEvent;
+
+public class GliderHandler {
+	
+	private static final AutoMap<Integer> mDimensionalBlacklist = new AutoMap<Integer>();
+	
+	@SubscribeEvent
+	public void onItemUsage(final PlayerUseItemEvent event) {		
+		if (event != null) {			
+			ItemStack aItem = event.item;			
+			if (ItemUtils.checkForInvalidItems(aItem)) {
+				Class aItemGliderClass = ReflectionUtils.getClass("openblocks.common.item.ItemHangGlider");
+				if (aItemGliderClass.isInstance(aItem.getItem())) {
+					if (!canPlayerGlideInThisDimension(event.entityPlayer)){
+						event.setCanceled(true);						
+					}
+				}
+			}			
+		}		
+	}
+	
+	private static final boolean canPlayerGlideInThisDimension(EntityPlayer aPlayer) {
+		World aWorld = aPlayer.worldObj;
+		if (aWorld == null) {
+			return false;
+		}
+		else {
+			if (aWorld.provider == null) {
+				return false;
+			}
+			else {
+				int aDimID = aWorld.provider.dimensionId;
+				for (int i : mDimensionalBlacklist) {
+					if (i == aDimID) {
+						return false;
+					}
+				}
+			}
+		}		
+		return true;		
+	}
+	
+	static final void populateBlacklist() {		
+		if (!mDimensionalBlacklist.isEmpty()) {
+			return;
+		}		
+		File aBlacklist = gtPlusPlus.core.util.data.FileUtils.getFile("config/GTplusplus/", "GliderBlacklist", "cfg");
+		List<String> lines = new ArrayList<String>();
+		try {
+			lines = org.apache.commons.io.FileUtils.readLines(aBlacklist, "utf-8");
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		if (lines.isEmpty()) {
+			FileWriter fw;
+			try {
+				String aInfoTip = "# Add one dimension ID per line. Lines with a # are comments and are ignored.";
+				fw = new FileWriter(aBlacklist);
+				fw.write(aInfoTip);			 
+				fw.close();
+				lines.add(aInfoTip);
+			} catch (IOException e) {				
+				e.printStackTrace();
+			}			
+		}
+		if (!lines.isEmpty()) {
+			for (String s : lines) {
+				if (s != null && !s.equals("") && !s.contains("#")) {
+					s = StringUtils.remove(s, " ");
+					s = StringUtils.trim(s);
+					s = StringUtils.remove(s, ",");
+					Integer g = Integer.decode(s);
+					if (g != null) {
+						mDimensionalBlacklist.add(g);
+						Logger.INFO("[OpenBlocks] Added Dimension with ID '"+g+"' to Blacklist for Glider.");
+					}
+				}
+			}			
+		}		
+	}
+	
+	
+}
diff --git a/src/Java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java b/src/Java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java
new file mode 100644
index 0000000000..c1b678f5ee
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java
@@ -0,0 +1,38 @@
+package gtPlusPlus.xmod.ob;
+
+import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
+
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.item.base.BaseItemBurnable;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.railcraft.utils.RailcraftUtils;
+import net.minecraft.init.Blocks;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
+public class HANDLER_OpenBlocks {
+
+	public static void preInit() {
+		if (LoadedMods.OpenBlocks) {
+			
+		}
+	}
+
+	public static void init() {
+		if (LoadedMods.OpenBlocks) {
+			GliderHandler.populateBlacklist();
+		}
+	}
+
+	public static void postInit() {
+		if (LoadedMods.OpenBlocks) {
+			Utils.registerEvent(new GliderHandler());
+		}
+	}	
+
+}