From 0b4405f5cd614cdc938ed62621bdb6259c940607 Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 14 Jan 2020 14:38:55 -0400 Subject: [PATCH] mapping update --- gradle.properties | 4 ++-- src/main/java/carpet/script/CarpetExpression.java | 2 +- src/main/java/carpet/script/value/EntityValue.java | 2 +- src/main/java/carpet/utils/CarpetProfiler.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 84965023..ae30adb4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,8 +5,8 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=1.15.1 - yarn_mappings=1.15.1+build.28 - loader_version=0.7.3+build.176 + yarn_mappings=1.15.1+build.37 + loader_version=0.7.4+build.177 # Mod Properties mod_version = 1.3.5+v200114 diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 08d6e77f..67bece95 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -3207,7 +3207,7 @@ public class CarpetExpression this.expr.addLazyFunction("current_dimension", 0, (c, t, lv) -> { ServerCommandSource s = ((CarpetContext)c).s; - Value retval = new StringValue(NBTSerializableValue.nameFromRegistryId(Registry.DIMENSION.getId(s.getWorld().dimension.getType()))); + Value retval = new StringValue(NBTSerializableValue.nameFromRegistryId(Registry.DIMENSION_TYPE.getId(s.getWorld().dimension.getType()))); return (cc, tt) -> retval; }); diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index 456c8f70..8b2d3f9d 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/src/main/java/carpet/script/value/EntityValue.java @@ -241,7 +241,7 @@ public class EntityValue extends Value put("immune_to_fire", (e, a) -> new NumericValue(e.isFireImmune())); put("invulnerable", (e, a) -> new NumericValue(e.isInvulnerable())); - put("dimension", (e, a) -> new StringValue(nameFromRegistryId(Registry.DIMENSION.getId(e.dimension)))); + put("dimension", (e, a) -> new StringValue(nameFromRegistryId(Registry.DIMENSION_TYPE.getId(e.dimension)))); put("height", (e, a) -> new NumericValue(e.getDimensions(EntityPose.STANDING).height)); put("width", (e, a) -> new NumericValue(e.getDimensions(EntityPose.STANDING).width)); put("eye_height", (e, a) -> new NumericValue(e.getStandingEyeHeight())); diff --git a/src/main/java/carpet/utils/CarpetProfiler.java b/src/main/java/carpet/utils/CarpetProfiler.java index 57ec9ea1..3502e86b 100644 --- a/src/main/java/carpet/utils/CarpetProfiler.java +++ b/src/main/java/carpet/utils/CarpetProfiler.java @@ -73,7 +73,7 @@ public class CarpetProfiler { return String.format("%s.%s%s", world.getDimension().getType().toString().replaceFirst("minecraft:", ""), - Registry.BLOCK_ENTITY.getId(be.getType()).toString().replaceFirst("minecraft:", ""), + Registry.BLOCK_ENTITY_TYPE.getId(be.getType()).toString().replaceFirst("minecraft:", ""), world.isClient ? " (Client)" : ""); }