From ec0be058ac4643d424457a35085ddfe6c34b261a Mon Sep 17 00:00:00 2001 From: gnembon Date: Thu, 10 Oct 2019 00:28:49 -0300 Subject: [PATCH] 41a complete --- src/main/java/carpet/mixins/MinecraftClientMixin.java | 2 +- src/main/java/carpet/patches/EntityPlayerMPFake.java | 2 +- src/main/java/carpet/script/CarpetExpression.java | 8 ++++---- src/main/resources/carpet.mixins.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/carpet/mixins/MinecraftClientMixin.java b/src/main/java/carpet/mixins/MinecraftClientMixin.java index fe3e942b..58b3b924 100644 --- a/src/main/java/carpet/mixins/MinecraftClientMixin.java +++ b/src/main/java/carpet/mixins/MinecraftClientMixin.java @@ -14,7 +14,7 @@ public class MinecraftClientMixin { //to inject right before // this.tickWorlds(booleanSupplier_1); - @Inject(method = "start", at = @At(value = "HEAD") + @Inject(method = "run", at = @At(value = "HEAD") ) private void onInit(CallbackInfo ci) { //CM start game hook diff --git a/src/main/java/carpet/patches/EntityPlayerMPFake.java b/src/main/java/carpet/patches/EntityPlayerMPFake.java index bb7b98db..bd4b0f8f 100644 --- a/src/main/java/carpet/patches/EntityPlayerMPFake.java +++ b/src/main/java/carpet/patches/EntityPlayerMPFake.java @@ -110,7 +110,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity this.getServerWorld().method_14178().updateCameraPosition(this); } super.tick(); - this.method_14226(); + this.playerTick(); } @Override diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index b9a787ec..fac1be06 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -2811,8 +2811,8 @@ public class CarpetExpression return (cc, tt) -> retval; }); - /*this.expr.addLazyFunction("plop", 4, (c, t, lv) ->{ - BlockValue.LocatorResult locator = BlockValue.fromParams((CarpetContext)c, lv, 0); + this.expr.addLazyFunction("plop", 4, (c, t, lv) ->{ + return LazyValue.NULL;/*BlockValue.LocatorResult locator = BlockValue.fromParams((CarpetContext)c, lv, 0); if (lv.size() <= locator.offset) throw new InternalExpressionException("plop needs extra argument indicating what to plop"); String what = lv.get(locator.offset).evalValue(c).getString(); @@ -2821,8 +2821,8 @@ public class CarpetExpression return (c_, t_) -> Value.NULL; if (what.equalsIgnoreCase("boulder")) // there might be more of those this.forceChunkUpdate(locator.block.getPos(), ((CarpetContext)c).s.getWorld()); - return (c_, t_) -> new NumericValue(res); - });*/ + return (c_, t_) -> new NumericValue(res);*/ + }); this.expr.addLazyFunction("schedule", -1, (c, t, lv) -> { if (lv.size()<2) diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index fc54826d..1da9f15e 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -68,7 +68,7 @@ "SaplingBlockMixin", "EntityMixin", - "class_4548_getBiomeArrayMixin", + "BiomeArray_getBiomeArrayMixin", "GuardianEntityMixin", "DesertPyramidFeatureMixin",