22w12a
This commit is contained in:
1 parent
2743908887
commit
ab07a6807a
6 files changed
+12
-8
No files matched your search
@@ -24,9 +24,11 @@ import net.minecraft.world.level.storage.WritableLevelData;
|
||||
@Mixin(ServerLevel.class)
|
||||
public abstract class ServerLevel_tickMixin extends Level
|
||||
{
|
||||
protected ServerLevel_tickMixin(WritableLevelData properties, ResourceKey<Level> registryKey, Holder<DimensionType> dimensionType, Supplier<ProfilerFiller> supplier, boolean bl, boolean bl2, long l)
|
||||
|
||||
|
||||
protected ServerLevel_tickMixin(WritableLevelData writableLevelData, ResourceKey<Level> resourceKey, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean bl, boolean bl2, long l, int i)
|
||||
{
|
||||
super(properties, registryKey, dimensionType, supplier, bl, bl2, l);
|
||||
super(writableLevelData, resourceKey, holder, supplier, bl, bl2, l, i);
|
||||
}
|
||||
|
||||
@Shadow protected abstract void runBlockEvents();
|
||||
|
||||
@@ -3,6 +3,7 @@ package carpet.mixins;
|
||||
import carpet.fakes.BlockPredicateInterface;
|
||||
import carpet.script.value.StringValue;
|
||||
import carpet.script.value.Value;
|
||||
import net.minecraft.core.HolderSet;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
@@ -18,7 +19,7 @@ import net.minecraft.world.level.block.state.BlockState;
|
||||
@Mixin(targets = "net.minecraft.commands.arguments.blocks.BlockPredicateArgument$TagPredicate")
|
||||
public class TagPredicate_scarpetMixin implements BlockPredicateInterface
|
||||
{
|
||||
@Shadow @Final private TagKey<Block> tag;
|
||||
@Shadow @Final private HolderSet<Block> tag;
|
||||
|
||||
@Shadow @Final private Map<String, String> vagueProperties;
|
||||
|
||||
@@ -33,7 +34,8 @@ public class TagPredicate_scarpetMixin implements BlockPredicateInterface
|
||||
@Override
|
||||
public TagKey<Block> getCMBlockTagKey()
|
||||
{
|
||||
return tag;
|
||||
// might be good to explose the holder set nature of it.
|
||||
return tag.unwrap().left().orElse(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user