diff --git a/src/main/java/tschipp/carryon/CarryOn.java b/src/main/java/tschipp/carryon/CarryOn.java index c708da4..e81d18f 100644 --- a/src/main/java/tschipp/carryon/CarryOn.java +++ b/src/main/java/tschipp/carryon/CarryOn.java @@ -32,7 +32,7 @@ public class CarryOn { public static CarryOn instance; 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 ACCEPTED_VERSIONS = "[1.12.2,1.13)"; public static final String UPDATE_JSON = "https://gist.githubusercontent.com/Tschipp/dccadee7c90d7a34e6e76a35d9d6fa2e/raw/"; diff --git a/src/main/java/tschipp/carryon/common/config/Configs.java b/src/main/java/tschipp/carryon/common/config/Configs.java index d5c2082..1c999bf 100644 --- a/src/main/java/tschipp/carryon/common/config/Configs.java +++ b/src/main/java/tschipp/carryon/common/config/Configs.java @@ -150,6 +150,21 @@ public class Configs { "thaumcraft:infusion_matrix", "thaumcraft:golem_builder", "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", }; diff --git a/src/main/java/tschipp/carryon/common/event/ItemEvents.java b/src/main/java/tschipp/carryon/common/event/ItemEvents.java index e9a23ff..498de66 100644 --- a/src/main/java/tschipp/carryon/common/event/ItemEvents.java +++ b/src/main/java/tschipp/carryon/common/event/ItemEvents.java @@ -255,6 +255,7 @@ public class ItemEvents TileEntity te = world.getTileEntity(pos); if (PickupHandler.canPlayerPickUpBlock(player, te, world, pos)) { + player.closeScreen(); if (ItemTile.storeTileData(te, world, pos, state.getActualState(world, pos), stack)) { diff --git a/src/main/java/tschipp/carryon/common/handler/PickupHandler.java b/src/main/java/tschipp/carryon/common/handler/PickupHandler.java index 6fa977a..4b9f1d3 100644 --- a/src/main/java/tschipp/carryon/common/handler/PickupHandler.java +++ b/src/main/java/tschipp/carryon/common/handler/PickupHandler.java @@ -38,8 +38,6 @@ public class PickupHandler IBlockState state = world.getBlockState(pos); Block block = state.getBlock(); - player.closeScreen(); - NBTTagCompound tag = new NBTTagCompound(); if (tile != null) tile.writeToNBT(tag); @@ -57,7 +55,6 @@ public class PickupHandler { return false; } - CarryOn.LOGGER.info("Block is allowed"); } else { diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 41061c0..9a48c90 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ { "modid" : "carryon", "name" : "Carry On", - "version" : "1.9.2", "mcversion" : "1.12.2", + "version" : "1.9.3", "mcversion" : "1.12.2", "url" : "", "credits" : "Tschipp, Purplicious_Cow, cy4n", "authorList" : ["Tschipp, Purplicious_Cow, cy4n"],