Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix merge mistake

Browse source
This commit is contained in:
yrsegal@gmail.com 2022-04-10 10:57:17 -04:00
parent 74e74ddc85
commit 76f701763d
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/at/petrak/hexcasting/common/network/GuiOpener.java
View file

@ -7,11 +7,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
public record GuiOpener(MsgOpenSpellGuiAck msg) {
@OnlyIn(Dist.CLIENT)
<<<<<<< HEAD
public void open() {
=======
public void openGui() {
>>>>>>> aae172093c4a71951f424ef3c6f21c5924cb72a7
var mc = Minecraft.getInstance();
mc.setScreen(new GuiSpellcasting(msg.hand(), msg.patterns(), msg.components()));
}

4
src/main/java/at/petrak/hexcasting/common/network/MsgOpenSpellGuiAck.java
View file

@ -57,11 +57,7 @@ public record MsgOpenSpellGuiAck(InteractionHand hand, List<ResolvedPattern> pat
public void handle(Supplier<NetworkEvent.Context> ctx) {
ctx.get().enqueueWork(() -> {
GuiOpener opener = new GuiOpener(this);
<<<<<<< HEAD
DistExecutor.safeRunWhenOn(Dist.CLIENT, () -> opener::open);
=======
DistExecutor.safeRunWhenOn(Dist.CLIENT, () -> opener::openGui);
>>>>>>> aae172093c4a71951f424ef3c6f21c5924cb72a7
});
ctx.get().setPacketHandled(true);
}