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

Merge remote-tracking branch 'origin/1.12' into 1.12

Browse Source
This commit is contained in:
Tschipp 2018-08-14 23:38:54 +02:00
commit 4e30e55f3a
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,6 +150,21 @@ public class Configs {
"thaumcraft:infusion_matrix", "thaumcraft:infusion_matrix",
"thaumcraft:golem_builder", "thaumcraft:golem_builder",
"thaumcraft:thaumatorium*", "thaumcraft:thaumatorium*",
"magneticraft:oil_heater",
"magneticraft:solar_panel",
"magneticraft:steam_engine",
"magneticraft:shelving_unit",
"magneticraft:grinder",
"magneticraft:sieve",
"magneticraft:solar_tower",
"magneticraft:solar_mirror",
"magneticraft:container",
"magneticraft:pumpjack",
"magneticraft:solar_panel",
"magneticraft:refinery",
"magneticraft:oil_heater",
"magneticraft:hydraulic_press",
"magneticraft:multiblock_gap",
"refinedstorage:*", "refinedstorage:*",
"practicallogistics2:*", "practicallogistics2:*",
"mcmultipart:*", "mcmultipart:*",

1
src/main/java/tschipp/carryon/common/event/ItemEvents.java
View File

@ -268,6 +268,7 @@ public class ItemEvents
TileEntity te = world.getTileEntity(pos); TileEntity te = world.getTileEntity(pos);
if (PickupHandler.canPlayerPickUpBlock(player, te, world, pos)) if (PickupHandler.canPlayerPickUpBlock(player, te, world, pos))
{ {
player.closeScreen();
if (ItemTile.storeTileData(te, world, pos, state.getActualState(world, pos), stack)) if (ItemTile.storeTileData(te, world, pos, state.getActualState(world, pos), stack))
{ {

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

@ -38,8 +38,6 @@ public class PickupHandler
IBlockState state = world.getBlockState(pos); IBlockState state = world.getBlockState(pos);
Block block = state.getBlock(); Block block = state.getBlock();
player.closeScreen();
NBTTagCompound tag = new NBTTagCompound(); NBTTagCompound tag = new NBTTagCompound();
if (tile != null) if (tile != null)
tile.writeToNBT(tag); tile.writeToNBT(tag);
@ -57,7 +55,6 @@ public class PickupHandler
{ {
return false; return false;
} }
CarryOn.LOGGER.info("Block is allowed");
} }
else else
{ {