From a5dd6ed1c29951d152242d9af5ad7c3a6b8d23c3 Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 17 Nov 2020 08:41:16 -0400 Subject: [PATCH] mappings --- gradle.properties | 4 ++-- src/main/java/carpet/script/api/Scoreboards.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1cfbcf0f..d7e4e95d 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=20w46a - yarn_mappings=20w46a+build.11 - loader_version=0.10.7 + yarn_mappings=20w46a+build.15 + loader_version=0.10.8 # Mod Properties mod_version = 1.4.17+v201111 diff --git a/src/main/java/carpet/script/api/Scoreboards.java b/src/main/java/carpet/script/api/Scoreboards.java index 748d1124..009df20e 100644 --- a/src/main/java/carpet/script/api/Scoreboards.java +++ b/src/main/java/carpet/script/api/Scoreboards.java @@ -113,7 +113,7 @@ public class Scoreboards { else { String critetionName = lv.get(1).evalValue(c).getString(); - criterion = ScoreboardCriterion.createStatCriterion(critetionName).orElse(null); + criterion = ScoreboardCriterion.getOrCreateStatCriterion(critetionName).orElse(null); if (criterion==null) { throw new InternalExpressionException("Unknown scoreboard criterion: "+critetionName); @@ -124,7 +124,7 @@ public class Scoreboards { if (objective != null) return LazyValue.FALSE; - scoreboard.addObjective(objectiveName, criterion, new LiteralText(objectiveName), criterion.getCriterionType()); + scoreboard.addObjective(objectiveName, criterion, new LiteralText(objectiveName), criterion.getDefaultRenderType()); return LazyValue.TRUE; });