Skip to content

Commit 9cc9146

Browse files
committed
Now its fixed.
1 parent cdfc41a commit 9cc9146

3 files changed

Lines changed: 9 additions & 4 deletions

File tree

common/src/main/java/generations/gg/generations/core/generationscore/common/client/screen/mails/MailEditScreen.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ public MailEditScreen(Player arg, ItemStack arg2, InteractionHand arg3) {
8888
location = ((MailItem) arg2.getItem()).getType().location;
8989
}
9090

91+
9192
private void setClipboard(String clipboardValue) {
9293
if (this.minecraft != null) {
9394
TextFieldHelper.setClipboardContents(this.minecraft, clipboardValue);

common/src/main/java/generations/gg/generations/core/generationscore/common/network/ClientPacketProxy.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ class ClientPacketProxy : PacketProxy() {
3131
}
3232

3333
private fun <T : GenerationsNetworkPacket<T>> createConsumer(handler: ClientNetworkPacketHandler<T>): Consumer<T> {
34-
return Consumer { handler.handle(it, Minecraft.getInstance())}
34+
return Consumer {
35+
var minecraft =Minecraft.getInstance()
36+
minecraft.execute { handler.handle(it, minecraft) }
37+
}
3538
}
3639
}

common/src/main/java/generations/gg/generations/core/generationscore/common/network/packets/S2COpenMailEditScreenPacketHandler.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ import generations.gg.generations.core.generationscore.common.client.screen.mail
66
import generations.gg.generations.core.generationscore.common.network.ClientNetworkPacketHandler
77
import generations.gg.generations.core.generationscore.common.tags.GenerationsItemTags
88
import net.minecraft.client.Minecraft
9+
import kotlin.math.min
910

1011
object S2COpenMailEditScreenPacketHandler : ClientNetworkPacketHandler<S2COpenMailEditScreenPacket> {
1112
override fun handle(packet: S2COpenMailEditScreenPacket, minecraft: Minecraft) {
12-
val itemStack = Minecraft.getInstance().player!!.getItemInHand(packet.hand)
13+
val itemStack = minecraft.player!!.getItemInHand(packet.hand)
1314
if (itemStack.`is`(GenerationsItemTags.CLOSED_POKEMAIL))
14-
Minecraft.getInstance().setScreen(MailViewScreen(WrittenMailAccess(itemStack)))
15+
minecraft.setScreen(MailViewScreen(WrittenMailAccess(itemStack)))
1516
else if (itemStack.`is`(GenerationsItemTags.POKEMAIL))
16-
Minecraft.getInstance().setScreen(MailEditScreen(Minecraft.getInstance().player, itemStack, packet.hand))
17+
minecraft.setScreen(MailEditScreen(minecraft.player, itemStack, packet.hand))
1718
}
1819
}

0 commit comments

Comments
 (0)