From 8bffa2dc1fe1be9cfa7782975de3e6c6741ab9cb Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 16 Nov 2014 08:53:06 -0500 Subject: [PATCH] - Add config to stop travelling through unbreakable blocks - Add support for ttCore /reloadConfigs --- build.gradle | 2 ++ gradle.properties | 3 ++- .../crazypants/enderio/config/Config.java | 27 ++++++++++++++++--- .../enderio/teleport/TravelController.java | 2 +- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 38b21845..fa963769 100644 --- a/build.gradle +++ b/build.gradle @@ -40,6 +40,7 @@ repositories { maven { url = "http://mobiusstrip.eu/maven" } maven { url = "http://chickenbones.net/maven/" } maven { url = "http://dl.tsr.me/artifactory/libs-release-local" } + maven { url = "http://maven.tterrag.com" } } dependencies { @@ -47,6 +48,7 @@ dependencies { compile "com.mod-buildcraft:buildcraft:${buildcraft_version}:api" compile "mcp.mobius.waila:Waila:${waila_version}" + compile "tterrag.core:ttCore:${ttCore_version}" } sourceSets { diff --git a/gradle.properties b/gradle.properties index cc19f880..e8eacff0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,4 +8,5 @@ mod_version=2.2.0 buildcraft_version=6.1.5 waila_version=1.5.5_1.7.10 -ae2_version=rv1-stable-1 \ No newline at end of file +ae2_version=rv1-stable-1 +ttCore_version=MC1.7.10-0.0.3-33 \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 91448b22..0b749381 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -4,9 +4,11 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import tterrag.core.common.event.ConfigFileChangedEvent; import net.minecraftforge.common.config.Configuration; import cpw.mods.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.enderio.EnderIO; @@ -124,6 +126,7 @@ public final class Config { public static boolean travelStaffBlinkEnabled = true; public static boolean travelStaffBlinkThroughSolidBlocksEnabled = true; public static boolean travelStaffBlinkThroughClearBlocksEnabled = true; + public static boolean travelStaffBlinkThroughUnbreakableBlocksEnabled = false; public static String[] travelStaffBlinkBlackList = new String[] { "minecraft:bedrock" }; @@ -392,11 +395,14 @@ public final class Config { File configFile = new File(configDirectory, "EnderIO.cfg"); config = new Configuration(configFile); - syncConfig(); + syncConfig(false); } - public static void syncConfig() { + public static void syncConfig(boolean load) { try { + if (load) { + config.load(); + } Config.processConfig(config); } catch (Exception e) { Log.error("EnderIO has a problem loading it's configuration"); @@ -412,7 +418,17 @@ public final class Config { public void onConfigChanged(OnConfigChangedEvent event) { if(event.modID.equals(EnderIO.MODID)) { Log.info("Updating config..."); - syncConfig(); + syncConfig(false); + } + } + + @SubscribeEvent + @Method(modid = "ttCore") + public void onConfigFileChanged(ConfigFileChangedEvent event) { + if (event.modID.equals(EnderIO.MODID)) { + Log.info("Updating config..."); + syncConfig(true); + event.setSuccessful(); } } @@ -589,7 +605,10 @@ public final class Config { "staff can only be used to blink through transparent or partial blocks (e.g. torches). " + "If both are false: only air blocks may be teleported through.") .getBoolean(travelStaffBlinkThroughClearBlocksEnabled); - travelStaffBlinkBlackList = config.getStringList("travelStaffBlinkBlackList", sectionStaff.name, travelStaffBlinkBlackList, + travelStaffBlinkThroughUnbreakableBlocksEnabled = config.get(sectionItems.name, "travelStaffBlinkThroughUnbreakableBlocksEnabled", + travelStaffBlinkThroughUnbreakableBlocksEnabled, "Allows the travel staff to blink through unbreakable blocks such as warded blocks and bedrock.") + .getBoolean(); + travelStaffBlinkBlackList = config.getStringList("travelStaffBlinkBlackList", sectionStaff.name, travelStaffBlinkBlackList, "Lists the blocks that cannot be teleported through in the form 'modID:blockName'"); travelAnchorZoomScale = config.getFloat("travelAnchorZoomScale", sectionStaff.name, travelAnchorZoomScale, 0, 1, "Set the max zoomed size of a travel anchor as an aprox. percentage of screen height"); diff --git a/src/main/java/crazypants/enderio/teleport/TravelController.java b/src/main/java/crazypants/enderio/teleport/TravelController.java index fe1300d3..1f90ec2c 100644 --- a/src/main/java/crazypants/enderio/teleport/TravelController.java +++ b/src/main/java/crazypants/enderio/teleport/TravelController.java @@ -184,7 +184,7 @@ public class TravelController { if(ui == null) { return false; } - return blackList.contains(ui); + return blackList.contains(ui) && (hitBlock.getBlockHardness(player.worldObj, pos.blockX, pos.blockY, pos.blockZ) < 0 || !Config.travelStaffBlinkThroughUnbreakableBlocksEnabled); } private boolean doBlinkAround(EntityPlayer player, Vector3d sample, boolean conserveMomentum) {