From d8647e8ab8f31e68e765c405a4694ba9cb7b5e9b Mon Sep 17 00:00:00 2001 From: Tschipp Date: Sat, 4 Nov 2017 09:38:38 +0100 Subject: [PATCH] Update to latest FTBUtils --- build.gradle | 4 ++-- src/main/java/tschipp/carryon/CarryOn.java | 4 ++-- .../java/tschipp/carryon/common/handler/PickupHandler.java | 4 ++-- src/main/resources/mcmod.info | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index fd1132f..c065b68 100644 --- a/build.gradle +++ b/build.gradle @@ -47,8 +47,8 @@ dependencies { deobfCompile "net.darkhax.gamestages:GameStages-1.12:1.0.13" - deobfCompile "LatMod:FTBUtilities:4.1.0" - deobfCompile "LatMod:FTBLib:4.1.0" + deobfCompile "LatMod:FTBUtilities:4.1.6" + deobfCompile "LatMod:FTBLib:4.1.6" } diff --git a/src/main/java/tschipp/carryon/CarryOn.java b/src/main/java/tschipp/carryon/CarryOn.java index 378807b..7c578d8 100644 --- a/src/main/java/tschipp/carryon/CarryOn.java +++ b/src/main/java/tschipp/carryon/CarryOn.java @@ -21,7 +21,7 @@ import tschipp.carryon.common.command.CommandCarryOn; import tschipp.carryon.common.command.CommandCarryOnReload; @EventBusSubscriber -@Mod(modid = CarryOn.MODID, name = CarryOn.NAME, version = CarryOn.VERSION, guiFactory = "tschipp.carryon.client.gui.GuiFactoryCarryOn", dependencies = "required-after:forge@[13.20.1.2386,)", updateJSON = CarryOn.UPDATE_JSON) +@Mod(modid = CarryOn.MODID, name = CarryOn.NAME, version = CarryOn.VERSION, guiFactory = "tschipp.carryon.client.gui.GuiFactoryCarryOn", dependencies = "required-after:forge@[13.20.1.2386,);after:ftbu@[4.1.4,)", updateJSON = CarryOn.UPDATE_JSON) public class CarryOn { @SidedProxy(clientSide = "tschipp.carryon.client.ClientProxy", serverSide = "tschipp.carryon.common.CommonProxy") @@ -32,7 +32,7 @@ public class CarryOn { public static CarryOn instance; public static final String MODID = "carryon"; - public static final String VERSION = "1.6"; + public static final String VERSION = "1.6.1"; public static final String NAME = "Carry On"; public static final String UPDATE_JSON = "https://gist.githubusercontent.com/Tschipp/dccadee7c90d7a34e6e76a35d9d6fa2e/raw/"; public static final Logger LOGGER = LogManager.getFormatterLogger("CarryOn"); diff --git a/src/main/java/tschipp/carryon/common/handler/PickupHandler.java b/src/main/java/tschipp/carryon/common/handler/PickupHandler.java index fc09258..123acaa 100644 --- a/src/main/java/tschipp/carryon/common/handler/PickupHandler.java +++ b/src/main/java/tschipp/carryon/common/handler/PickupHandler.java @@ -4,7 +4,7 @@ import javax.annotation.Nullable; import com.feed_the_beast.ftbl.lib.math.BlockPosContainer; import com.feed_the_beast.ftbu.api.chunks.BlockInteractionType; -import com.feed_the_beast.ftbu.api_impl.ClaimedChunkStorage; +import com.feed_the_beast.ftbu.api_impl.ClaimedChunks; import net.darkhax.gamestages.capabilities.PlayerDataHandler; import net.darkhax.gamestages.capabilities.PlayerDataHandler.IStageData; @@ -192,7 +192,7 @@ public class PickupHandler if (Loader.isModLoaded("ftbu")) { BlockPosContainer container = new BlockPosContainer(world, pos, state); - return ClaimedChunkStorage.INSTANCE.canPlayerInteract((EntityPlayerMP) player, EnumHand.MAIN_HAND, container, BlockInteractionType.CNB_BREAK); + return ClaimedChunks.INSTANCE.canPlayerInteract((EntityPlayerMP) player, EnumHand.MAIN_HAND, container, BlockInteractionType.CNB_BREAK); } return true; } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 0255303..bc1e688 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ { "modid" : "carryon", "name" : "Carry On", - "version" : "1.6", "mcversion" : "1.12", + "version" : "1.6.1", "mcversion" : "1.12", "url" : "", "credits" : "Tschipp, Purplicious_Cow, cy4n", "authorList" : ["Tschipp, Purplicious_Cow, cy4n"],