From 7c559cddb92412af743e72e96e1dfc2627d69f36 Mon Sep 17 00:00:00 2001
From: Tschipp <11649893+Tschipp@users.noreply.github.com>
Date: Wed, 30 Aug 2023 22:01:43 +0200
Subject: [PATCH] fixed bugs relating to placement

---
 .../java/tschipp/carryon/common/carry/PlacementHandler.java | 5 ++++-
 .../java/tschipp/carryon/common/config/CarryConfig.java     | 5 ++++-
 .../java/tschipp/carryon/common/config/ListHandler.java     | 6 +++---
 gradle.properties                                           | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

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 c690490..9c840c4 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 342baf0..dd3deb3 100644
--- a/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java
+++ b/Common/src/main/java/tschipp/carryon/common/config/CarryConfig.java
@@ -239,7 +239,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 2b7f5a4..bb4da29 100644
--- a/Common/src/main/java/tschipp/carryon/common/config/ListHandler.java
+++ b/Common/src/main/java/tschipp/carryon/common/config/ListHandler.java
@@ -29,7 +29,7 @@ public class ListHandler {
     private static List<TagKey<EntityType<?>>> FORBIDDEN_STACKING_TAGS = new ArrayList<>();
     private static List<TagKey<EntityType<?>>> ALLOWED_STACKING_TAGS = new ArrayList<>();
 
-    private static Set<Class<?>> PROPERTY_EXCEPTION_CLASSES = new HashSet<>();
+    private static Set<Property<?>> PROPERTY_EXCEPTION_CLASSES = new HashSet<>();
 
     public static boolean isPermitted(Block block)
     {
@@ -57,7 +57,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<String> regular, List<TagKey<Block>> tags)
@@ -135,7 +135,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/gradle.properties b/gradle.properties
index 79f11af..e5cc9d1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 # Project
-version=2.1.0
+version=2.1.1
 group=tschipp.carryon
 
 # Common