diff options
| author | shedaniel <daniel@shedaniel.me> | 2020-04-16 02:48:27 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2020-04-16 02:48:27 +0800 |
| commit | 7d03aae9b4bfa177d4ad642f91b9d46274fa61a9 (patch) | |
| tree | 757d8cc5d5db351abd26d9c177c66fd19ae15952 | |
| parent | 7f2cea976276ef14030964eea6c91ebee9f39204 (diff) | |
| download | RoughlyEnoughItems-7d03aae9b4bfa177d4ad642f91b9d46274fa61a9.tar.gz RoughlyEnoughItems-7d03aae9b4bfa177d4ad642f91b9d46274fa61a9.tar.bz2 RoughlyEnoughItems-7d03aae9b4bfa177d4ad642f91b9d46274fa61a9.zip | |
20w16a update
Signed-off-by: shedaniel <daniel@shedaniel.me>
| -rw-r--r-- | gradle.properties | 12 | ||||
| -rw-r--r-- | src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java | 2 | ||||
| -rw-r--r-- | src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java | 10 | ||||
| -rw-r--r-- | src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java | 2 | ||||
| -rwxr-xr-x | src/main/resources/fabric.mod.json | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/gradle.properties b/gradle.properties index e65a30f05..8b12c36db 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ -mod_version=4.1.7-unstable -minecraft_version=20w14a -yarn_version=20w14a+build.2 -fabricloader_version=0.7.9+build.190 +mod_version=4.1.8-unstable +minecraft_version=20w16a +yarn_version=20w16a+build.1 +fabricloader_version=0.8.2+build.194 cloth_events_version=2.0.2-unstable -cloth_config_version=3.3.1-unstable +cloth_config_version=3.3.2-unstable modmenu_version=1.11.0+build.2 -fabric_api=0.5.7+build.314-1.16 +fabric_api=0.5.11+build.322-1.16 autoconfig1u=2.0.1 api_include=me.shedaniel.cloth:cloth-events,me.shedaniel.cloth:config-2,me.sargunvohra.mcmods:autoconfig1u,org.jetbrains:annotations api_exculde= diff --git a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java index be7b3b696..3632ca029 100644 --- a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java +++ b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCore.java @@ -194,7 +194,7 @@ public class RoughlyEnoughItemsCore implements ClientModInitializer { ClientSidePacketRegistry.INSTANCE.register(RoughlyEnoughItemsNetwork.CREATE_ITEMS_MESSAGE_PACKET, (packetContext, packetByteBuf) -> { ItemStack stack = packetByteBuf.readItemStack(); String player = packetByteBuf.readString(32767); - packetContext.getPlayer().addMessage(new LiteralText(I18n.translate("text.rei.cheat_items").replaceAll("\\{item_name}", SearchArgument.tryGetItemStackName(stack.copy())).replaceAll("\\{item_count}", stack.copy().getCount() + "").replaceAll("\\{player_name}", player)), false); + packetContext.getPlayer().sendMessage(new LiteralText(I18n.translate("text.rei.cheat_items").replaceAll("\\{item_name}", SearchArgument.tryGetItemStackName(stack.copy())).replaceAll("\\{item_count}", stack.copy().getCount() + "").replaceAll("\\{player_name}", player)), false); }); ClientSidePacketRegistry.INSTANCE.register(RoughlyEnoughItemsNetwork.NOT_ENOUGH_ITEMS_PACKET, (packetContext, packetByteBuf) -> { Screen currentScreen = MinecraftClient.getInstance().currentScreen; diff --git a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java index e84b24b93..2898983b7 100644 --- a/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java +++ b/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java @@ -65,7 +65,7 @@ public class RoughlyEnoughItemsNetwork implements ModInitializer { ServerSidePacketRegistry.INSTANCE.register(DELETE_ITEMS_PACKET, (packetContext, packetByteBuf) -> { ServerPlayerEntity player = (ServerPlayerEntity) packetContext.getPlayer(); if (player.getServer().getPermissionLevel(player.getGameProfile()) < player.getServer().getOpPermissionLevel()) { - player.addMessage(new TranslatableText("text.rei.no_permission_cheat").formatted(Formatting.RED), false); + player.sendMessage(new TranslatableText("text.rei.no_permission_cheat").formatted(Formatting.RED), false); return; } if (!player.inventory.getCursorStack().isEmpty()) @@ -74,14 +74,14 @@ public class RoughlyEnoughItemsNetwork implements ModInitializer { ServerSidePacketRegistry.INSTANCE.register(CREATE_ITEMS_PACKET, (packetContext, packetByteBuf) -> { ServerPlayerEntity player = (ServerPlayerEntity) packetContext.getPlayer(); if (player.getServer().getPermissionLevel(player.getGameProfile()) < player.getServer().getOpPermissionLevel()) { - player.addMessage(new TranslatableText("text.rei.no_permission_cheat").formatted(Formatting.RED), false); + player.sendMessage(new TranslatableText("text.rei.no_permission_cheat").formatted(Formatting.RED), false); return; } ItemStack stack = packetByteBuf.readItemStack(); if (player.inventory.insertStack(stack.copy())) { ServerSidePacketRegistry.INSTANCE.sendToPlayer(player, RoughlyEnoughItemsNetwork.CREATE_ITEMS_MESSAGE_PACKET, new PacketByteBuf(Unpooled.buffer()).writeItemStack(stack.copy()).writeString(player.getEntityName(), 32767)); } else - player.addMessage(new TranslatableText("text.rei.failed_cheat_items"), false); + player.sendMessage(new TranslatableText("text.rei.failed_cheat_items"), false); }); ServerSidePacketRegistry.INSTANCE.register(MOVE_ITEMS_PACKET, (packetContext, packetByteBuf) -> { Identifier category = packetByteBuf.readIdentifier(); @@ -118,9 +118,9 @@ public class RoughlyEnoughItemsNetwork implements ModInitializer { ServerSidePacketRegistry.INSTANCE.sendToPlayer(player, NOT_ENOUGH_ITEMS_PACKET, buf); } } catch (IllegalStateException e) { - player.sendMessage(new TranslatableText(e.getMessage()).formatted(Formatting.RED)); + player.sendSystemMessage(new TranslatableText(e.getMessage()).formatted(Formatting.RED)); } catch (Exception e) { - player.sendMessage(new TranslatableText("error.rei.internal.error", e.getMessage()).formatted(Formatting.RED)); + player.sendSystemMessage(new TranslatableText("error.rei.internal.error", e.getMessage()).formatted(Formatting.RED)); e.printStackTrace(); } } catch (Exception e) { diff --git a/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java b/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java index 9b711e155..a098eb5c0 100644 --- a/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java +++ b/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java @@ -174,7 +174,7 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer { String madeUpCommand = og.replaceAll("\\{player_name}", MinecraftClient.getInstance().player.getEntityName()).replaceAll("\\{item_name}", identifier.getPath()).replaceAll("\\{item_identifier}", identifier.toString()).replaceAll("\\{nbt}", tagMessage).replaceAll("\\{count}", String.valueOf(cheatedStack.getCount())); if (madeUpCommand.length() > 256) { madeUpCommand = og.replaceAll("\\{player_name}", MinecraftClient.getInstance().player.getEntityName()).replaceAll("\\{item_name}", identifier.getPath()).replaceAll("\\{item_identifier}", identifier.toString()).replaceAll("\\{nbt}", "").replaceAll("\\{count}", String.valueOf(cheatedStack.getCount())); - MinecraftClient.getInstance().player.addMessage(new TranslatableText("text.rei.too_long_nbt"), false); + MinecraftClient.getInstance().player.sendMessage(new TranslatableText("text.rei.too_long_nbt"), false); } MinecraftClient.getInstance().player.sendChatMessage(madeUpCommand); return true; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index dfe907ef3..98c2e96b2 100755 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -39,7 +39,7 @@ "cloth": ">=2-", "cloth-basic-math": "*", "cloth-config2": ">=3-", - "minecraft": "~1.16-Snapshot.20.14.a" + "minecraft": "~1.16-Snapshot.20.16.a" }, "mixins": [ "mixin.roughlyenoughitems.json", |
