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

Fixed various bugs relating to placement

Browse Source
This commit is contained in:
Tschipp 2023-08-30 22:01:43 +02:00
parent a5366a9a2f
commit 68341b7ff1
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Common/src/main/java/tschipp/carryon/common/carry/PlacementHandler.java
View File

@ -78,8 +78,11 @@ public class PlacementHandler
} }
level.setBlockAndUpdate(pos, state); level.setBlockAndUpdate(pos, state);
if (blockEntity != null) if (blockEntity != null) {
blockEntity.setBlockState(state);
level.setBlockEntity(blockEntity); level.setBlockEntity(blockEntity);
}
level.updateNeighborsAt(pos.relative(Direction.DOWN), level.getBlockState(pos.relative(Direction.DOWN)).getBlock()); level.updateNeighborsAt(pos.relative(Direction.DOWN), level.getBlockState(pos.relative(Direction.DOWN)).getBlock());
carry.clear(); carry.clear();
CarryOnDataManager.setCarryData(player, carry); CarryOnDataManager.setCarryData(player, carry);

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

@ -245,7 +245,10 @@ public class CarryConfig
"betterstorage:*", "practicallogistics2:*", "wearablebackpacks:*", "rftools:screen", "betterstorage:*", "practicallogistics2:*", "wearablebackpacks:*", "rftools:screen",
"rftools:creative_screen", "create:*", "magic_doorknob:*", "iceandfire:*", "ftbquests:*", "rftools:creative_screen", "create:*", "magic_doorknob:*", "iceandfire:*", "ftbquests:*",
"waystones:*", "contact:*", "framedblocks:*", "securitycraft:*", "forgemultipartcbe:*", "integrateddynamics:cable", "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( @Property(

6
Common/src/main/java/tschipp/carryon/common/config/ListHandler.java
View File

@ -30,7 +30,7 @@ public class ListHandler {
private static List<TagKey<EntityType<?>>> FORBIDDEN_STACKING_TAGS = new ArrayList<>(); private static List<TagKey<EntityType<?>>> FORBIDDEN_STACKING_TAGS = new ArrayList<>();
private static List<TagKey<EntityType<?>>> ALLOWED_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) public static boolean isPermitted(Block block)
{ {
@ -58,7 +58,7 @@ public class ListHandler {
public static boolean isPropertyException(Property<?> prop) 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) private static boolean doCheck(Block block, Set<String> regular, List<TagKey<Block>> tags)
@ -136,7 +136,7 @@ public class ListHandler {
for(String propName : props.split(",")) { for(String propName : props.split(",")) {
for (Property<?> prop : blk.defaultBlockState().getProperties()) { for (Property<?> prop : blk.defaultBlockState().getProperties()) {
if (prop.getName().equals(propName)) if (prop.getName().equals(propName))
PROPERTY_EXCEPTION_CLASSES.add(prop.getValueClass()); PROPERTY_EXCEPTION_CLASSES.add(prop);
} }
} }
} }

4
Forge/src/main/resources/META-INF/mods.toml
View File

@ -19,7 +19,7 @@ issueTrackerURL="https://github.com/Tschipp/CarryOn/issues"
# Does this dependency have to exist - if not, ordering below must be specified # Does this dependency have to exist - if not, ordering below must be specified
mandatory=true #mandatory mandatory=true #mandatory
# The version range of the dependency # 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 # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
ordering="NONE" ordering="NONE"
# Side this dependency is applied on - BOTH, CLIENT or SERVER # Side this dependency is applied on - BOTH, CLIENT or SERVER
@ -28,6 +28,6 @@ issueTrackerURL="https://github.com/Tschipp/CarryOn/issues"
[[dependencies.carryon]] [[dependencies.carryon]]
modId="minecraft" modId="minecraft"
mandatory=true mandatory=true
versionRange="[1.20.1,1.21)" versionRange="[1.20,1.21)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"

2
gradle.properties
View File

@ -1,5 +1,5 @@
# Project # Project
version=2.1.1 version=2.1.2
group=tschipp.carryon group=tschipp.carryon
# Common # Common