diff --git a/Common/src/main/java/tschipp/carryon/common/carry/PlacementHandler.java b/Common/src/main/java/tschipp/carryon/common/carry/PlacementHandler.java index 07e816b..ef306da 100644 --- a/Common/src/main/java/tschipp/carryon/common/carry/PlacementHandler.java +++ b/Common/src/main/java/tschipp/carryon/common/carry/PlacementHandler.java @@ -78,8 +78,11 @@ public class PlacementHandler } level.setBlockAndUpdate(pos, state); - if (blockEntity != null) + if (blockEntity != null) { + blockEntity.setBlockState(state); level.setBlockEntity(blockEntity); + } + level.updateNeighborsAt(pos.relative(Direction.DOWN), level.getBlockState(pos.relative(Direction.DOWN)).getBlock()); carry.clear(); CarryOnDataManager.setCarryData(player, carry); 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 711ce00..2b85360 100644 --- a/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java +++ b/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java @@ -245,7 +245,10 @@ public class CarryConfig "betterstorage:*", "practicallogistics2:*", "wearablebackpacks:*", "rftools:screen", "rftools:creative_screen", "create:*", "magic_doorknob:*", "iceandfire:*", "ftbquests:*", "waystones:*", "contact:*", "framedblocks:*", "securitycraft:*", "forgemultipartcbe:*", "integrateddynamics:cable", - "mekanismgenerators:wind_generator" + "mekanismgenerators:wind_generator", "cookingforblockheads:cabinet", "cookingforblockheads:corner", "cookingforblockheads:counter", + "cookingforblockheads:oven", "cookingforblockheads:toaster", "cookingforblockheads:milk_jar", "cookingforblockheads:cow_jar", + "cookingforblockheads:fruit_basket", "cookingforblockheads:cooking_table", "cookingforblockheads:fridge", "cookingforblockheads:sink", + "powah:*" }; @Property( diff --git a/Common/src/main/java/tschipp/carryon/common/config/ListHandler.java b/Common/src/main/java/tschipp/carryon/common/config/ListHandler.java index 2cc7702..7930f07 100644 --- a/Common/src/main/java/tschipp/carryon/common/config/ListHandler.java +++ b/Common/src/main/java/tschipp/carryon/common/config/ListHandler.java @@ -30,7 +30,7 @@ public class ListHandler { private static List>> FORBIDDEN_STACKING_TAGS = new ArrayList<>(); private static List>> ALLOWED_STACKING_TAGS = new ArrayList<>(); - private static Set> PROPERTY_EXCEPTION_CLASSES = new HashSet<>(); + private static Set> PROPERTY_EXCEPTION_CLASSES = new HashSet<>(); public static boolean isPermitted(Block block) { @@ -58,7 +58,7 @@ public class ListHandler { public static boolean isPropertyException(Property prop) { - return PROPERTY_EXCEPTION_CLASSES.contains(prop.getValueClass()); + return PROPERTY_EXCEPTION_CLASSES.contains(prop); } private static boolean doCheck(Block block, Set regular, List> tags) @@ -136,7 +136,7 @@ public class ListHandler { for(String propName : props.split(",")) { for (Property prop : blk.defaultBlockState().getProperties()) { if (prop.getName().equals(propName)) - PROPERTY_EXCEPTION_CLASSES.add(prop.getValueClass()); + PROPERTY_EXCEPTION_CLASSES.add(prop); } } } diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml index 7cc7826..731397f 100644 --- a/Forge/src/main/resources/META-INF/mods.toml +++ b/Forge/src/main/resources/META-INF/mods.toml @@ -19,7 +19,7 @@ issueTrackerURL="https://github.com/Tschipp/CarryOn/issues" # Does this dependency have to exist - if not, ordering below must be specified mandatory=true #mandatory # The version range of the dependency - versionRange="[47,)" #mandatory + versionRange="[47,47.1.3]" #mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory ordering="NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER @@ -28,6 +28,6 @@ issueTrackerURL="https://github.com/Tschipp/CarryOn/issues" [[dependencies.carryon]] modId="minecraft" mandatory=true - versionRange="[1.20.1,1.21)" + versionRange="[1.20,1.21)" ordering="NONE" side="BOTH" diff --git a/gradle.properties b/gradle.properties index 217e703..f2ecc64 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project -version=2.1.1 +version=2.1.2 group=tschipp.carryon # Common