Skip to content

Commit 9238af9

Browse files
committed
Pauses the game when you open in browser in inventory
1 parent 37fcf07 commit 9238af9

26 files changed

Lines changed: 132 additions & 60 deletions

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## Changes
44
- Now works for hovering items in recipe book and trade menu (#71)
5+
- The game now pauses when you open in browser while your inventory is open (#73)
56
- New wiki: [Doggy Talents Next Wiki](https://doggytalentsnext.wiki.gg/) (#74)
67

78
## Fixes

common/src/main/java/wiki/minecraft/heywiki/HeyWikiConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import net.minecraft.text.Text;
1919
import net.minecraft.util.Identifier;
2020
import org.slf4j.Logger;
21-
import wiki.minecraft.heywiki.wiki.target.Target;
21+
import wiki.minecraft.heywiki.target.Target;
2222

2323
import java.io.BufferedWriter;
2424
import java.io.IOException;

common/src/main/java/wiki/minecraft/heywiki/Raycast.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import net.minecraft.util.hit.HitResult;
1212
import org.jetbrains.annotations.Nullable;
1313
import wiki.minecraft.heywiki.mixin.GameRendererMixin;
14-
import wiki.minecraft.heywiki.wiki.target.Target;
14+
import wiki.minecraft.heywiki.target.Target;
1515
import wiki.minecraft.heywiki.wiki.WikiPage;
1616

1717
import java.util.List;

common/src/main/java/wiki/minecraft/heywiki/command/WhatBiomeCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.mojang.brigadier.tree.LiteralCommandNode;
55
import dev.architectury.event.events.client.ClientCommandRegistrationEvent.ClientCommandSourceStack;
66
import net.minecraft.client.MinecraftClient;
7-
import wiki.minecraft.heywiki.wiki.target.Target;
7+
import wiki.minecraft.heywiki.target.Target;
88
import wiki.minecraft.heywiki.wiki.WikiPage;
99

1010
import static dev.architectury.event.events.client.ClientCommandRegistrationEvent.literal;

common/src/main/java/wiki/minecraft/heywiki/command/WhatIsThisCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import dev.architectury.event.events.client.ClientCommandRegistrationEvent.ClientCommandSourceStack;
77
import net.minecraft.text.Text;
88
import wiki.minecraft.heywiki.Raycast;
9-
import wiki.minecraft.heywiki.wiki.target.Target;
9+
import wiki.minecraft.heywiki.target.Target;
1010
import wiki.minecraft.heywiki.wiki.WikiPage;
1111

1212
import static dev.architectury.event.events.client.ClientCommandRegistrationEvent.literal;

common/src/main/java/wiki/minecraft/heywiki/command/WhatIsThisItemCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import net.minecraft.client.MinecraftClient;
99
import net.minecraft.item.ItemStack;
1010
import net.minecraft.text.Text;
11-
import wiki.minecraft.heywiki.wiki.target.Target;
11+
import wiki.minecraft.heywiki.target.Target;
1212
import wiki.minecraft.heywiki.wiki.WikiPage;
1313

1414
import static dev.architectury.event.events.client.ClientCommandRegistrationEvent.literal;

common/src/main/java/wiki/minecraft/heywiki/command/WhatStructureCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import net.minecraft.world.chunk.Chunk;
1616
import net.minecraft.world.chunk.ChunkStatus;
1717
import net.minecraft.world.gen.structure.Structure;
18-
import wiki.minecraft.heywiki.wiki.target.Target;
18+
import wiki.minecraft.heywiki.target.Target;
1919
import wiki.minecraft.heywiki.wiki.WikiPage;
2020

2121
import java.util.Map;

common/src/main/java/wiki/minecraft/heywiki/MerchantScreenInterface.java renamed to common/src/main/java/wiki/minecraft/heywiki/extension/MerchantScreenInterface.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wiki.minecraft.heywiki;
1+
package wiki.minecraft.heywiki.extension;
22

33
import net.minecraft.item.ItemStack;
44
import org.jetbrains.annotations.Nullable;
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package wiki.minecraft.heywiki.gui.screen;
2+
3+
import net.minecraft.client.MinecraftClient;
4+
import net.minecraft.client.gui.screen.GameMenuScreen;
5+
import net.minecraft.client.gui.screen.Screen;
6+
7+
import java.util.Objects;
8+
9+
public class CallbackGameMenuScreen extends GameMenuScreen {
10+
private final Runnable callback;
11+
12+
public CallbackGameMenuScreen(boolean showMenu, Runnable callback) {
13+
super(showMenu);
14+
this.callback = callback;
15+
}
16+
17+
@Override
18+
public void close() {
19+
super.close();
20+
this.callback.run();
21+
}
22+
23+
public static void openWithParent(Screen parent, boolean showMenu) {
24+
var client = MinecraftClient.getInstance();
25+
boolean integratedServer = client.isIntegratedServerRunning() && !Objects.requireNonNull(client.getServer())
26+
.isRemote();
27+
if (integratedServer) {
28+
client.setScreen(new CallbackGameMenuScreen(showMenu, () -> client.setScreen(parent)));
29+
client.getSoundManager().pauseAll();
30+
} else {
31+
client.setScreen(new CallbackGameMenuScreen(true, () -> client.setScreen(parent)));
32+
}
33+
}
34+
}

common/src/main/java/wiki/minecraft/heywiki/gui/screen/ConfirmWikiPageScreen.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,10 @@ public static void open(Screen parent, String url, Optional<CompletableFuture<Pa
126126
client.setScreen(new ConfirmWikiPageScreen((confirmed) -> {
127127
if (confirmed) {
128128
Util.getOperatingSystem().open(url);
129+
CallbackGameMenuScreen.openWithParent(parent, true);
130+
} else {
131+
client.setScreen(parent);
129132
}
130-
131-
client.setScreen(parent);
132133
}, url, excerpt, page));
133134
}
134135

0 commit comments

Comments
 (0)