From c94ba6a0214fc33832b2468a2b7afe43da7b5e60 Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 2 Jun 2020 12:23:52 -0300 Subject: [PATCH] mappings --- gradle.properties | 4 ++-- src/main/java/carpet/helpers/BlockRotator.java | 2 +- src/main/java/carpet/helpers/FeatureGenerator.java | 6 +++--- src/main/java/carpet/logging/Logger.java | 2 +- .../java/carpet/mixins/World_movableTEMixin.java | 4 ++-- src/main/java/carpet/script/CarpetExpression.java | 2 +- src/main/java/carpet/utils/Messenger.java | 12 ++++++------ 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index f726a05b..c74cf62f 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=20w22a - yarn_mappings=20w22a+build.1 - loader_version=0.8.4+build.198 + yarn_mappings=20w22a+build.10 + loader_version=0.8.5+build.199 # Mod Properties mod_version = 1.3.25+v200527 diff --git a/src/main/java/carpet/helpers/BlockRotator.java b/src/main/java/carpet/helpers/BlockRotator.java index 2d83f824..3314d642 100644 --- a/src/main/java/carpet/helpers/BlockRotator.java +++ b/src/main/java/carpet/helpers/BlockRotator.java @@ -365,7 +365,7 @@ public class BlockRotator if (newState != null) { world.setBlockState(pos, newState, 2 | 1024); - world.checkBlockRerender(pos, state, newState); + world.scheduleBlockRerenderIfNeeded(pos, state, newState); return true; } return false; diff --git a/src/main/java/carpet/helpers/FeatureGenerator.java b/src/main/java/carpet/helpers/FeatureGenerator.java index c788e084..65b1a91d 100644 --- a/src/main/java/carpet/helpers/FeatureGenerator.java +++ b/src/main/java/carpet/helpers/FeatureGenerator.java @@ -17,7 +17,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biomes; -import net.minecraft.world.biome.DefaultBiomeFeatures; +import net.minecraft.world.gen.feature.DefaultBiomeFeatures; import net.minecraft.world.biome.source.BiomeAccess; //import net.minecraft.world.biome.source.BiomeSource; //import net.minecraft.world.biome.source.FixedBiomeSource; @@ -56,8 +56,8 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import static net.minecraft.world.biome.DefaultBiomeFeatures.FANCY_TREE_CONFIG; -import static net.minecraft.world.biome.DefaultBiomeFeatures.OAK_TREE_CONFIG; +import static net.minecraft.world.gen.feature.DefaultBiomeFeatures.FANCY_TREE_CONFIG; +import static net.minecraft.world.gen.feature.DefaultBiomeFeatures.OAK_TREE_CONFIG; public class FeatureGenerator { diff --git a/src/main/java/carpet/logging/Logger.java b/src/main/java/carpet/logging/Logger.java index 3a23f7bd..1d30aa66 100644 --- a/src/main/java/carpet/logging/Logger.java +++ b/src/main/java/carpet/logging/Logger.java @@ -182,7 +182,7 @@ public class Logger public void sendPlayerMessage(ServerPlayerEntity player, BaseText ... messages) { - Arrays.stream(messages).forEach(message -> player.sendSystemMessage(message, Util.field_25140)); + Arrays.stream(messages).forEach(message -> player.sendSystemMessage(message, Util.NIL_UUID)); } /** diff --git a/src/main/java/carpet/mixins/World_movableTEMixin.java b/src/main/java/carpet/mixins/World_movableTEMixin.java index 143f4317..0a53ff68 100644 --- a/src/main/java/carpet/mixins/World_movableTEMixin.java +++ b/src/main/java/carpet/mixins/World_movableTEMixin.java @@ -39,7 +39,7 @@ public abstract class World_movableTEMixin implements WorldInterface, WorldAcces //public abstract ChunkManager getChunkManager(); @Shadow - public abstract void checkBlockRerender(BlockPos blockPos_1, BlockState s1, BlockState s2); + public abstract void scheduleBlockRerenderIfNeeded(BlockPos blockPos_1, BlockState s1, BlockState s2); @Shadow public abstract void updateListeners(BlockPos var1, BlockState var2, BlockState var3, int var4); @@ -105,7 +105,7 @@ public abstract class World_movableTEMixin implements WorldInterface, WorldAcces { if (blockState_2 != blockState_3) { - this.checkBlockRerender(blockPos_1, blockState_2, blockState_3); + this.scheduleBlockRerenderIfNeeded(blockPos_1, blockState_2, blockState_3); } if ((int_1 & 2) != 0 && (!this.isClient || (int_1 & 4) == 0) && (this.isClient || worldChunk_1.getLevelType() != null && worldChunk_1.getLevelType().isAfter(ChunkHolder.LevelType.TICKING))) diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 715ccc81..cc3d4acc 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -860,7 +860,7 @@ public class CarpetExpression boolean dropLoot = true; if (playerBreak) { - boolean isUsingEffectiveTool = !state.method_29291() || tool.isEffectiveOn(state); //!can break by hand + boolean isUsingEffectiveTool = !state.isToolRequired() || tool.isEffectiveOn(state); //postMine() durability from item classes float hardness = state.getHardness(world, where); int damageAmount = 0; diff --git a/src/main/java/carpet/utils/Messenger.java b/src/main/java/carpet/utils/Messenger.java index 9a2e5641..05b7c57b 100644 --- a/src/main/java/carpet/utils/Messenger.java +++ b/src/main/java/carpet/utils/Messenger.java @@ -258,7 +258,7 @@ public class Messenger } public static void m(PlayerEntity player, Object ... fields) { - player.sendSystemMessage(Messenger.c(fields), Util.field_25140); //NULL UUID + player.sendSystemMessage(Messenger.c(fields), Util.NIL_UUID); } /* @@ -302,7 +302,7 @@ public class Messenger public static void send(PlayerEntity player, Collection lines) { - lines.forEach(message -> player.sendSystemMessage(message, Util.field_25140)); + lines.forEach(message -> player.sendSystemMessage(message, Util.NIL_UUID)); } public static void send(ServerCommandSource source, Collection lines) { @@ -314,21 +314,21 @@ public class Messenger { if (server == null) LOG.error("Message not delivered: "+message); - server.sendSystemMessage(new LiteralText(message), Util.field_25140); + server.sendSystemMessage(new LiteralText(message), Util.NIL_UUID); BaseText txt = c("gi "+message); for (PlayerEntity entityplayer : server.getPlayerManager().getPlayerList()) { - entityplayer.sendSystemMessage(txt, Util.field_25140); + entityplayer.sendSystemMessage(txt, Util.NIL_UUID); } } public static void print_server_message(MinecraftServer server, BaseText message) { if (server == null) LOG.error("Message not delivered: "+message.getString()); - server.sendSystemMessage(message, Util.field_25140); + server.sendSystemMessage(message, Util.NIL_UUID); for (PlayerEntity entityplayer : server.getPlayerManager().getPlayerList()) { - entityplayer.sendSystemMessage(message, Util.field_25140); + entityplayer.sendSystemMessage(message, Util.NIL_UUID); } } }