From ab07a6807adf52cee1a9f2d138d40393b739c95e Mon Sep 17 00:00:00 2001 From: gnembon Date: Thu, 24 Mar 2022 21:48:29 +0100 Subject: [PATCH] 22w12a --- gradle.properties | 2 +- src/main/java/carpet/mixins/ServerLevel_tickMixin.java | 6 ++++-- src/main/java/carpet/mixins/TagPredicate_scarpetMixin.java | 6 ++++-- src/main/java/carpet/script/api/WorldAccess.java | 2 +- src/main/java/carpet/script/value/ValueConversions.java | 2 +- src/main/java/carpet/utils/BlockInfo.java | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 379daf3f..00a4c99f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=22w11a + minecraft_version=22w12a loader_version=0.13.3 fabric_version=0.46.4+1.18 diff --git a/src/main/java/carpet/mixins/ServerLevel_tickMixin.java b/src/main/java/carpet/mixins/ServerLevel_tickMixin.java index 73350ad4..b1d2abd5 100644 --- a/src/main/java/carpet/mixins/ServerLevel_tickMixin.java +++ b/src/main/java/carpet/mixins/ServerLevel_tickMixin.java @@ -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 registryKey, Holder dimensionType, Supplier supplier, boolean bl, boolean bl2, long l) + + + protected ServerLevel_tickMixin(WritableLevelData writableLevelData, ResourceKey resourceKey, Holder holder, Supplier 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(); diff --git a/src/main/java/carpet/mixins/TagPredicate_scarpetMixin.java b/src/main/java/carpet/mixins/TagPredicate_scarpetMixin.java index 88b518dc..61bb1a85 100644 --- a/src/main/java/carpet/mixins/TagPredicate_scarpetMixin.java +++ b/src/main/java/carpet/mixins/TagPredicate_scarpetMixin.java @@ -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 tag; + @Shadow @Final private HolderSet tag; @Shadow @Final private Map vagueProperties; @@ -33,7 +34,8 @@ public class TagPredicate_scarpetMixin implements BlockPredicateInterface @Override public TagKey getCMBlockTagKey() { - return tag; + // might be good to explose the holder set nature of it. + return tag.unwrap().left().orElse(null); } @Override diff --git a/src/main/java/carpet/script/api/WorldAccess.java b/src/main/java/carpet/script/api/WorldAccess.java index e9ffcc34..aa3df9b5 100644 --- a/src/main/java/carpet/script/api/WorldAccess.java +++ b/src/main/java/carpet/script/api/WorldAccess.java @@ -513,7 +513,7 @@ public class WorldAccess { genericStateTest(c, "see_sky", lv, (s, p, w) -> BooleanValue.of(w.canSeeSky(p)))); expression.addContextFunction("brightness", -1, (c, t, lv) -> - genericStateTest(c, "brightness", lv, (s, p, w) -> new NumericValue(w.getBrightness(p)))); + genericStateTest(c, "brightness", lv, (s, p, w) -> new NumericValue(w.getLightLevelDependentMagicValue(p)))); expression.addContextFunction("hardness", -1, (c, t, lv) -> genericStateTest(c, "hardness", lv, (s, p, w) -> new NumericValue(s.getDestroySpeed(w, p)))); diff --git a/src/main/java/carpet/script/value/ValueConversions.java b/src/main/java/carpet/script/value/ValueConversions.java index 5cdcb1b9..ef0d7e12 100644 --- a/src/main/java/carpet/script/value/ValueConversions.java +++ b/src/main/java/carpet/script/value/ValueConversions.java @@ -66,7 +66,7 @@ public class ValueConversions return ListValue.of(new NumericValue(vec.x), new NumericValue(vec.y), new NumericValue(vec.z)); } - public static Value of(ColumnPos cpos) { return ListValue.of(new NumericValue(cpos.x), new NumericValue(cpos.z));} + public static Value of(ColumnPos cpos) { return ListValue.of(new NumericValue(cpos.x()), new NumericValue(cpos.z()));} public static Value of(ServerLevel world) { diff --git a/src/main/java/carpet/utils/BlockInfo.java b/src/main/java/carpet/utils/BlockInfo.java index 5eafb833..de270520 100644 --- a/src/main/java/carpet/utils/BlockInfo.java +++ b/src/main/java/carpet/utils/BlockInfo.java @@ -246,7 +246,7 @@ public class BlockInfo lst.add(Messenger.s(String.format(" - Light in: %d, above: %d", Math.max(world.getBrightness(LightLayer.BLOCK, pos),world.getBrightness(LightLayer.SKY, pos)) , Math.max(world.getBrightness(LightLayer.BLOCK, pos.above()),world.getBrightness(LightLayer.SKY, pos.above()))))); - lst.add(Messenger.s(String.format(" - Brightness in: %.2f, above: %.2f", world.getBrightness(pos), world.getBrightness(pos.above())))); + lst.add(Messenger.s(String.format(" - Brightness in: %.2f, above: %.2f", world.getLightLevelDependentMagicValue(pos), world.getLightLevelDependentMagicValue(pos.above())))); lst.add(Messenger.s(String.format(" - Is opaque: %s", material.isSolid() ))); //lst.add(Messenger.s(String.format(" - Light opacity: %d", state.getOpacity(world,pos)))); lst.add(Messenger.s(String.format(" - Blocks light: %s", state.getMaterial().isSolidBlocking())));