From 058398cd2d72e45f0603136eb1b8d5db16789f37 Mon Sep 17 00:00:00 2001 From: Tschipp Date: Sun, 17 Sep 2017 21:27:29 +0200 Subject: [PATCH] ok real fixed it --- src/main/java/tschipp/carryon/common/config/Configs.java | 4 ++-- .../tschipp/carryon/common/handler/PickupHandler.java | 8 +++----- src/main/resources/mcmod.info | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/tschipp/carryon/common/config/Configs.java b/src/main/java/tschipp/carryon/common/config/Configs.java index bef9d56..1295470 100644 --- a/src/main/java/tschipp/carryon/common/config/Configs.java +++ b/src/main/java/tschipp/carryon/common/config/Configs.java @@ -50,10 +50,10 @@ public class Configs { public boolean allowBabies = false; @Comment("Use Whitelist instead of Blacklist for Blocks") - public boolean useWhiteistBlocks=false; + public boolean useWhitelistBlocks=false; @Comment("Use Whitelist instead of Blacklist for Entities") - public boolean useWhiteistEntities=false; + public boolean useWhitelistEntities=false; } public static class WhiteList diff --git a/src/main/java/tschipp/carryon/common/handler/PickupHandler.java b/src/main/java/tschipp/carryon/common/handler/PickupHandler.java index 6ba2ffc..596afb9 100644 --- a/src/main/java/tschipp/carryon/common/handler/PickupHandler.java +++ b/src/main/java/tschipp/carryon/common/handler/PickupHandler.java @@ -3,7 +3,6 @@ package tschipp.carryon.common.handler; import javax.annotation.Nullable; import com.feed_the_beast.ftbl.lib.math.BlockPosContainer; -import com.feed_the_beast.ftbu.FTBUPermissions; import com.feed_the_beast.ftbu.api.chunks.BlockInteractionType; import com.feed_the_beast.ftbu.api_impl.ClaimedChunkStorage; @@ -11,13 +10,12 @@ import net.darkhax.gamestages.capabilities.PlayerDataHandler; import net.darkhax.gamestages.capabilities.PlayerDataHandler.IStageData; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityAgeable; import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.passive.EntityTameable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; @@ -36,7 +34,7 @@ public class PickupHandler player.closeScreen(); - if (CarryOnConfig.settings.useWhiteistBlocks) + if (CarryOnConfig.settings.useWhitelistBlocks) { if (!ListHandler.isAllowed(world.getBlockState(pos).getBlock())) { @@ -116,7 +114,7 @@ public class PickupHandler } } - if (CarryOnConfig.settings.useWhiteistEntities) + if (CarryOnConfig.settings.useWhitelistEntities) { if (!ListHandler.isAllowed(toPickUp)) { diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index d49374a..2aafec5 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ { "modid" : "carryon", "name" : "Carry On", - "version" : "1.4.1", "mcversion" : "1.11.2", + "version" : "1.5", "mcversion" : "1.11.2", "url" : "", "credits" : "Tschipp, Purplicious_Cow, cy4n", "authorList" : ["Tschipp, Purplicious_Cow, cy4n"],