Added things to blacklist and fixed Gui close issue

This commit is contained in:
Unknown 2018-08-03 17:50:49 +02:00
parent bca7534257
commit 29a9cffe8c
5 changed files with 18 additions and 5 deletions

View File

@ -32,7 +32,7 @@ public class CarryOn {
public static CarryOn instance; public static CarryOn instance;
public static final String MODID = "carryon"; public static final String MODID = "carryon";
public static final String VERSION = "1.9.2"; public static final String VERSION = "1.9.3";
public static final String NAME = "Carry On"; public static final String NAME = "Carry On";
public static final String ACCEPTED_VERSIONS = "[1.12.2,1.13)"; public static final String ACCEPTED_VERSIONS = "[1.12.2,1.13)";
public static final String UPDATE_JSON = "https://gist.githubusercontent.com/Tschipp/dccadee7c90d7a34e6e76a35d9d6fa2e/raw/"; public static final String UPDATE_JSON = "https://gist.githubusercontent.com/Tschipp/dccadee7c90d7a34e6e76a35d9d6fa2e/raw/";

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",
}; };

View File

@ -255,6 +255,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))
{ {

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
{ {

View File

@ -2,7 +2,7 @@
{ {
"modid" : "carryon", "modid" : "carryon",
"name" : "Carry On", "name" : "Carry On",
"version" : "1.9.2", "mcversion" : "1.12.2", "version" : "1.9.3", "mcversion" : "1.12.2",
"url" : "", "url" : "",
"credits" : "Tschipp, Purplicious_Cow, cy4n", "credits" : "Tschipp, Purplicious_Cow, cy4n",
"authorList" : ["Tschipp, Purplicious_Cow, cy4n"], "authorList" : ["Tschipp, Purplicious_Cow, cy4n"],