virt-mirrors/Sit
1
0
Fork 1
mirror of https://github.com/Oth3r/Sit.git synced 2025-09-19 16:03:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

better blockstate checker

Browse source
This commit is contained in:
Oth3r 2024-09-30 15:22:57 -05:00
commit 98c841b875
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/one/oth3r/sit/file/CustomBlock.java
View file

@ -4,6 +4,7 @@ import com.google.gson.annotations.SerializedName;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.registry.Registries; import net.minecraft.registry.Registries;
import net.minecraft.registry.tag.TagKey; import net.minecraft.registry.tag.TagKey;
import net.minecraft.state.State;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import one.oth3r.sit.utl.Utl; import one.oth3r.sit.utl.Utl;
@ -51,14 +52,16 @@ public class CustomBlock {
if (!blockType) return false; if (!blockType) return false;
// now check if the state is one of the acceptable states // now check if the state is one of the acceptable states
for (String state : blockStates) { //todo extract the blockstates to check them better for (String state : blockStates) {
// if there is a NOT (!) blockstate // if there is a NOT (!) blockstate
if (state.startsWith("!")) { if (state.startsWith("!")) {
// if it is contained in the block, return false // if it is contained in the block, return false
if (blockState.toString().contains(state.substring(1))) return false; // remove the '!'
String fixedState = state.substring(1);
if (blockState.getEntries().entrySet().stream().map(State.PROPERTY_MAP_PRINTER).anyMatch(s -> s.equals(fixedState))) return false;
} }
// else check if the blockstate matches, if not return false // else check if the blockstate matches, if not return false
else if (!blockState.toString().contains(state)) return false; else if (blockState.getEntries().entrySet().stream().map(State.PROPERTY_MAP_PRINTER).noneMatch(s -> s.equals(state))) return false;
} }
// if here, all passes have passed // if here, all passes have passed