@@ -4,6 +4,7 @@ import net.minecraft.commands.arguments.EntityAnchorArgument
4
4
import net.minecraft.core.BlockPos
5
5
import net.minecraft.core.Direction.Axis
6
6
import net.minecraft.core.registries.BuiltInRegistries
7
+ import net.minecraft.core.registries.Registries
7
8
import net.minecraft.network.chat.Component
8
9
import net.minecraft.resources.ResourceLocation
9
10
import net.minecraft.server.level.ServerLevel
@@ -37,8 +38,8 @@ import org.valkyrienskies.mod.common.util.toDoubles
37
38
import org.valkyrienskies.mod.common.util.toJOMLD
38
39
import org.valkyrienskies.mod.util.logger
39
40
40
- // var ASSEMBLE_BLACKLIST: TagKey<Block> =
41
- // TagKey.create(Registry.BLOCK_REGISTRY , ResourceLocation(EurekaMod.MOD_ID, "assemble_blacklist"))
41
+ var ASSEMBLE_BLACKLIST : TagKey <Block > =
42
+ TagKey .create(Registries . BLOCK , ResourceLocation (EurekaMod .MOD_ID , " assemble_blacklist" ))
42
43
43
44
class ShipHelmBlockEntity (pos : BlockPos , state : BlockState ) :
44
45
BlockEntity (EurekaBlockEntities .SHIP_HELM .get(), pos, state), MenuProvider {
@@ -131,7 +132,9 @@ class ShipHelmBlockEntity(pos: BlockPos, state: BlockState) :
131
132
level,
132
133
blockPos
133
134
) {
134
- val allowed = ! it.isAir && ! EurekaConfig .SERVER .blockBlacklist.contains(BuiltInRegistries .BLOCK .getKey(it.block).toString())
135
+ val allowed = ! it.isAir && ! it.`is `(ASSEMBLE_BLACKLIST ) &&
136
+ // TODO: Remove blockBlacklist
137
+ ! (EurekaConfig .SERVER .blockBlacklist.isNotEmpty() && EurekaConfig .SERVER .blockBlacklist.contains(BuiltInRegistries .BLOCK .getKey(it.block).toString()))
135
138
// This isn't the best way to count helms, but it'll work I promise!
136
139
if (allowed && it.block is ShipHelmBlock ) {
137
140
helmCount++
0 commit comments