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

Merge remote-tracking branch 'origin/1.19-multiloader' into 1.19-multiloader

Browse Source 
# Conflicts:
#	Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java
This commit is contained in:
Tschipp 2023-04-24 22:27:25 +02:00
commit dafcf0c0c2
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/src/main/java/tschipp/carryon/common/carry/PickupHandler.java
View File

@ -78,7 +78,7 @@ public class PickupHandler {
if(!ListHandler.isPermitted(state.getBlock())) if(!ListHandler.isPermitted(state.getBlock()))
return false; 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; return false;
if(blockEntity == null && !Constants.COMMON_CONFIG.settings.pickupAllBlocks) if(blockEntity == null && !Constants.COMMON_CONFIG.settings.pickupAllBlocks)

20
Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java
View File

@ -163,12 +163,18 @@ public class CarryConfig
"minecraft:oak_trapdoor[half]", "minecraft:oak_trapdoor[half]",
}; };
@Property( @Property(
type = PropertyType.BOOLEAN, type = PropertyType.BOOLEAN,
description = "Whether Players can be picked up. Creative players can't be picked up in Survival Mode" description = "Whether Players can be picked up. Creative players can't be picked up in Survival Mode"
) )
public boolean pickupPlayers = true; 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( @Property(
type = PropertyType.CATEGORY, type = PropertyType.CATEGORY,
@ -252,7 +258,7 @@ public class CarryConfig
"minecraft:item_frame", "minecraft:painting", "minecraft:shulker_bullet", "minecraft:item_frame", "minecraft:painting", "minecraft:shulker_bullet",
"animania:hamster", "animania:ferret*", "animania:hedgehog*", "animania:cart", "animania:hamster", "animania:ferret*", "animania:hedgehog*", "animania:cart",
"animania:wagon", "mynko:*", "pixelmon:*", "mocreatures:*", "quark:totem", "vehicle:*", "animania:wagon", "mynko:*", "pixelmon:*", "mocreatures:*", "quark:totem", "vehicle:*",
"securitycraft:*", "taterzens:npc" "securitycraft:*", "taterzens:npc", "easy_npc:*"
}; };
@Property( @Property(