From 7cd979d3e78cda788ef093ccf76e890c9f3991f1 Mon Sep 17 00:00:00 2001 From: Markus Bordihn Date: Sat, 25 Feb 2023 00:38:21 +0100 Subject: [PATCH 1/3] Added easy_npc entities to the forbiddenEntities list. --- .../main/java/tschipp/carryon/common/config/CarryConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java b/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java index 6f8853a..93f7e31 100644 --- a/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java +++ b/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java @@ -231,7 +231,7 @@ public class CarryConfig { "magneticraft:multiblock_gap", "refinedstorage:*", "mcmultipart:*", "enderstorage:*", "betterstorage:*", "practicallogistics2:*", "wearablebackpacks:*", "rftools:screen", "rftools:creative_screen", "create:*", "magic_doorknob:*", "iceandfire:*", "ftbquests:*", - "waystones:*", "contact:*", "framedblocks:*", "securitycraft:*" + "waystones:*", "contact:*", "framedblocks:*", "securitycraft:*", "easy_npc:*" }; @Property( From b1e6ea286595be2a8ef9be71f959b896a63a3335 Mon Sep 17 00:00:00 2001 From: Markus Bordihn Date: Sat, 25 Feb 2023 02:18:10 +0100 Subject: [PATCH 2/3] Update CarryConfig.java --- .../main/java/tschipp/carryon/common/config/CarryConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java b/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java index 93f7e31..d5877c5 100644 --- a/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java +++ b/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java @@ -231,7 +231,7 @@ public class CarryConfig { "magneticraft:multiblock_gap", "refinedstorage:*", "mcmultipart:*", "enderstorage:*", "betterstorage:*", "practicallogistics2:*", "wearablebackpacks:*", "rftools:screen", "rftools:creative_screen", "create:*", "magic_doorknob:*", "iceandfire:*", "ftbquests:*", - "waystones:*", "contact:*", "framedblocks:*", "securitycraft:*", "easy_npc:*" + "waystones:*", "contact:*", "framedblocks:*", "securitycraft:*" }; @Property( @@ -244,7 +244,7 @@ public class CarryConfig { "minecraft:item_frame", "minecraft:painting", "minecraft:shulker_bullet", "animania:hamster", "animania:ferret*", "animania:hedgehog*", "animania:cart", "animania:wagon", "mynko:*", "pixelmon:*", "mocreatures:*", "quark:totem", "vehicle:*", - "securitycraft:*" + "securitycraft:*", "easy_npc:*" }; @Property( From a5b619a77c164ba2de7001ea7b443fdc0c32bad1 Mon Sep 17 00:00:00 2001 From: Meowlala Date: Tue, 21 Mar 2023 11:13:40 -0500 Subject: [PATCH 3/3] Config option for picking unbreakable blocks in Survival This was supported in earlier versions of CarryOn, and has some use cases, e.g. moving BetterEnd's eternal pedestals. Off by default, simply disables the destroySpeed check when picking up a block. Best combined with a whitelist. --- .../java/tschipp/carryon/common/carry/PickupHandler.java | 2 +- .../java/tschipp/carryon/common/config/CarryConfig.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java b/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java index 7a6077b..d401512 100644 --- a/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java +++ b/Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java @@ -78,7 +78,7 @@ public class PickupHandler { if(!ListHandler.isPermitted(state.getBlock())) return false; - if(state.getDestroySpeed(level, pos) == -1 && !player.isCreative()) + if(state.getDestroySpeed(level, pos) == -1 && !player.isCreative() && !Constants.COMMON_CONFIG.settings.pickupUnbreakableBlocks) return false; if(blockEntity == null && !Constants.COMMON_CONFIG.settings.pickupAllBlocks) diff --git a/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java b/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java index 6f8853a..1487472 100644 --- a/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java +++ b/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java @@ -165,6 +165,12 @@ public class CarryConfig { description = "Whether Players can be picked up. Creative players can't be picked up in Survival Mode" ) public boolean pickupPlayers = true; + + @Property( + type = PropertyType.BOOLEAN, + description = "Whether players in Survival Mode can pick up unbreakable blocks. Creative players always can." + ) + public boolean pickupUnbreakableBlocks = false; } @Property(