icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mapping update

Browse Source
This commit is contained in:
gnembon committed 2020-01-14 14:38:55 -04:00
1 parent 7c7c4733fc
commit 0b4405f5cd
4 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+2 -2
View File
@@ -5,8 +5,8 @@ org.gradle.jvmargs=-Xmx1G
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
# or better: https://modmuss50.me/fabric.html # or better: https://modmuss50.me/fabric.html
minecraft_version=1.15.1 minecraft_version=1.15.1
yarn_mappings=1.15.1+build.28 yarn_mappings=1.15.1+build.37
loader_version=0.7.3+build.176 loader_version=0.7.4+build.177
# Mod Properties # Mod Properties
mod_version = 1.3.5+v200114 mod_version = 1.3.5+v200114
src/main/java/carpet/script/CarpetExpression.java
+1 -1
View File
@@ -3207,7 +3207,7 @@ public class CarpetExpression
this.expr.addLazyFunction("current_dimension", 0, (c, t, lv) -> { this.expr.addLazyFunction("current_dimension", 0, (c, t, lv) -> {
ServerCommandSource s = ((CarpetContext)c).s; 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; return (cc, tt) -> retval;
}); });
src/main/java/carpet/script/value/EntityValue.java
+1 -1
View File
@@ -241,7 +241,7 @@ public class EntityValue extends Value
put("immune_to_fire", (e, a) -> new NumericValue(e.isFireImmune())); put("immune_to_fire", (e, a) -> new NumericValue(e.isFireImmune()));
put("invulnerable", (e, a) -> new NumericValue(e.isInvulnerable())); 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("height", (e, a) -> new NumericValue(e.getDimensions(EntityPose.STANDING).height));
put("width", (e, a) -> new NumericValue(e.getDimensions(EntityPose.STANDING).width)); put("width", (e, a) -> new NumericValue(e.getDimensions(EntityPose.STANDING).width));
put("eye_height", (e, a) -> new NumericValue(e.getStandingEyeHeight())); put("eye_height", (e, a) -> new NumericValue(e.getStandingEyeHeight()));
src/main/java/carpet/utils/CarpetProfiler.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class CarpetProfiler
{ {
return String.format("%s.%s%s", return String.format("%s.%s%s",
world.getDimension().getType().toString().replaceFirst("minecraft:", ""), 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)" : ""); world.isClient ? " (Client)" : "");
} }