R3944Realms/CarryOn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.12

Browse Source
This commit is contained in:
Tschipp 2017-09-17 22:07:46 +02:00
commit dad395fd39
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/tschipp/carryon/common/config/Configs.java
View File

@ -50,10 +50,10 @@ public class Configs {
public boolean allowBabies = false; public boolean allowBabies = false;
@Comment("Use Whitelist instead of Blacklist for Blocks") @Comment("Use Whitelist instead of Blacklist for Blocks")
public boolean useWhiteistBlocks=false; public boolean useWhitelistBlocks=false;
@Comment("Use Whitelist instead of Blacklist for Entities") @Comment("Use Whitelist instead of Blacklist for Entities")
public boolean useWhiteistEntities=false; public boolean useWhitelistEntities=false;
} }
public static class WhiteList public static class WhiteList

8
src/main/java/tschipp/carryon/common/handler/PickupHandler.java
View File

@ -3,7 +3,6 @@ package tschipp.carryon.common.handler;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import com.feed_the_beast.ftbl.lib.math.BlockPosContainer; 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.chunks.BlockInteractionType;
import com.feed_the_beast.ftbu.api_impl.ClaimedChunkStorage; import com.feed_the_beast.ftbu.api_impl.ClaimedChunkStorage;
@ -11,15 +10,12 @@ import net.darkhax.gamestages.capabilities.PlayerDataHandler;
import net.darkhax.gamestages.capabilities.PlayerDataHandler.IStageData; import net.darkhax.gamestages.capabilities.PlayerDataHandler.IStageData;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityAgeable; import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.EnumCreatureType;
import net.minecraft.entity.passive.EntityTameable; import net.minecraft.entity.passive.EntityTameable;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.Container;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@ -38,7 +34,7 @@ public class PickupHandler
player.closeScreen(); player.closeScreen();
if (CarryOnConfig.settings.useWhiteistBlocks) if (CarryOnConfig.settings.useWhitelistBlocks)
{ {
if (!ListHandler.isAllowed(world.getBlockState(pos).getBlock())) if (!ListHandler.isAllowed(world.getBlockState(pos).getBlock()))
{ {
@ -118,7 +114,7 @@ public class PickupHandler
} }
} }
if (CarryOnConfig.settings.useWhiteistEntities) if (CarryOnConfig.settings.useWhitelistEntities)
{ {
if (!ListHandler.isAllowed(toPickUp)) if (!ListHandler.isAllowed(toPickUp))
{ {