From 3a0a8325e123aa9331e8d19875c12c5a874f9c99 Mon Sep 17 00:00:00 2001 From: gnembon Date: Sat, 7 Mar 2020 20:29:05 -0400 Subject: [PATCH] mappings --- gradle.properties | 2 +- .../mixins/ThrownEnderpearlEntity_fakePlayersMixin.java | 2 +- src/main/java/carpet/script/CarpetExpression.java | 2 +- src/main/java/carpet/utils/BlockInfo.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9bad16b2..bdc9687a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=20w10a - yarn_mappings=20w10a+build.2 + yarn_mappings=20w10a+build.10 loader_version=0.7.8+build.186 # Mod Properties diff --git a/src/main/java/carpet/mixins/ThrownEnderpearlEntity_fakePlayersMixin.java b/src/main/java/carpet/mixins/ThrownEnderpearlEntity_fakePlayersMixin.java index feabee78..fe88571d 100644 --- a/src/main/java/carpet/mixins/ThrownEnderpearlEntity_fakePlayersMixin.java +++ b/src/main/java/carpet/mixins/ThrownEnderpearlEntity_fakePlayersMixin.java @@ -24,6 +24,6 @@ public abstract class ThrownEnderpearlEntity_fakePlayersMixin extends ThrownItem )) private boolean isConnectionGood(ClientConnection clientConnection) { - return clientConnection.isOpen() || method_24921() instanceof EntityPlayerMPFake; // getOwner() + return clientConnection.isOpen() || getOwner() instanceof EntityPlayerMPFake; } } diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 49e3d5d4..e4a2a5b8 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -1098,7 +1098,7 @@ public class CarpetExpression { BlockPos pos = BlockValue.fromParams((CarpetContext)c, lv, 0).block.getPos(); ChunkPos chunkPos = new ChunkPos(pos); - Value ret = new NumericValue(ChunkRandom.create( + Value ret = new NumericValue(ChunkRandom.getSlimeRandom( chunkPos.x, chunkPos.z, ((CarpetContext)c).s.getWorld().getSeed(), 987234911L diff --git a/src/main/java/carpet/utils/BlockInfo.java b/src/main/java/carpet/utils/BlockInfo.java index bd0e1b16..ebcd7033 100644 --- a/src/main/java/carpet/utils/BlockInfo.java +++ b/src/main/java/carpet/utils/BlockInfo.java @@ -6,7 +6,7 @@ import net.minecraft.entity.SpawnType; import net.minecraft.entity.ai.TargetFinder; import net.minecraft.entity.ai.goal.WanderAroundGoal; import net.minecraft.entity.mob.MobEntityWithAi; -import net.minecraft.entity.mob.ZombiePigmanEntity; +import net.minecraft.entity.mob.ZombifiedPiglinEntity; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.text.BaseText; import net.minecraft.util.math.BlockPos; @@ -218,7 +218,7 @@ public class BlockInfo private static BaseText wander_chances(BlockPos pos, World worldIn) { - MobEntityWithAi creature = new ZombiePigmanEntity(EntityType.ZOMBIFIED_PIGLIN, worldIn); + MobEntityWithAi creature = new ZombifiedPiglinEntity(EntityType.ZOMBIFIED_PIGLIN, worldIn); creature.initialize(worldIn, worldIn.getLocalDifficulty(pos), SpawnType.NATURAL, null, null); creature.refreshPositionAndAngles(pos, 0.0F, 0.0F); WanderAroundGoal wander = new WanderAroundGoal(creature, 0.8D);