Skip to content

Commit 2d12ea7

Browse files
committed
Bump version to 1.0.0-beta7, added command to open config gui
1 parent 64c2395 commit 2d12ea7

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ org.gradle.jvmargs=-Xmx2g
33
baseGroup = com.github.kdgaming0.packcore
44
mcVersion = 1.8.9
55
modid = packcore
6-
version = 1.0.0-beta6.1
6+
version = 1.0.0-beta7

src/main/java/com/github/kdgaming0/packcore/PackCore.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
package com.github.kdgaming0.packcore;
22

3+
import com.github.kdgaming0.packcore.command.CommandOpenGui;
34
import com.github.kdgaming0.packcore.config.ModConfig;
45
import com.github.kdgaming0.packcore.screen.SEMainMenu;
56
import com.github.kdgaming0.packcore.utils.ModpackInfo;
67

78
import net.minecraft.client.Minecraft;
89
import net.minecraft.client.gui.GuiMainMenu;
10+
import net.minecraft.client.gui.GuiScreen;
911
import net.minecraft.client.settings.KeyBinding;
12+
import net.minecraftforge.client.ClientCommandHandler;
1013
import net.minecraftforge.common.MinecraftForge;
1114
import net.minecraftforge.fml.client.registry.ClientRegistry;
1215
import net.minecraftforge.fml.common.Mod;
1316
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
1417
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
1518
import net.minecraftforge.client.event.GuiOpenEvent;
1619

20+
import net.minecraftforge.fml.common.gameevent.TickEvent;
1721
import org.apache.logging.log4j.LogManager;
1822
import org.apache.logging.log4j.Logger;
1923
import org.lwjgl.input.Keyboard;
@@ -23,12 +27,12 @@ public class PackCore {
2327
public static final String MOD_ID = "packcore";
2428
public static KeyBinding OPEN_GUI_KEY;
2529
private static final Logger LOGGER = LogManager.getLogger(MOD_ID);
30+
public static GuiScreen screenToOpenNextTick = null;
2631

2732
@Mod.EventHandler
2833
public void init(FMLInitializationEvent event) {
2934
MinecraftForge.EVENT_BUS.register(this);
30-
OPEN_GUI_KEY = new KeyBinding("Open Pack Menu", Keyboard.KEY_K, "Pack Core");
31-
ClientRegistry.registerKeyBinding(OPEN_GUI_KEY);
35+
ClientCommandHandler.instance.registerCommand(new CommandOpenGui());
3236
ModpackInfo.loadModpackInfo();
3337
ModConfig.loadConfig();
3438
}
@@ -50,4 +54,13 @@ public void onGuiOpen(GuiOpenEvent event) {
5054
}
5155
}
5256
}
57+
58+
@SubscribeEvent
59+
public void onTick(TickEvent.ClientTickEvent event) {
60+
if (event.phase == TickEvent.Phase.END) return;
61+
if (screenToOpenNextTick != null) {
62+
Minecraft.getMinecraft().displayGuiScreen(screenToOpenNextTick);
63+
screenToOpenNextTick = null;
64+
}
65+
}
5366
}

src/main/java/com/github/kdgaming0/packcore/command/CommandOpenGui.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.github.kdgaming0.packcore.command;
22

3+
import com.github.kdgaming0.packcore.PackCore;
34
import com.github.kdgaming0.packcore.screen.ConfigGui;
5+
import com.github.kdgaming0.packcore.screen.ConfigManagementScreen;
46
import net.minecraft.client.Minecraft;
57
import net.minecraft.command.CommandBase;
68
import net.minecraft.command.ICommandSender;// Create a command class
@@ -9,18 +11,18 @@
911
public class CommandOpenGui extends CommandBase {
1012
@Override
1113
public String getCommandName() {
12-
return "opengui";
14+
return "packcore";
1315
}
1416

1517
@Override
1618
public String getCommandUsage(ICommandSender sender) {
17-
return "/opengui";
19+
return "/packcore";
1820
}
1921

2022
@Override
2123
public void processCommand(ICommandSender sender, String[] args) {
2224
if (sender instanceof EntityPlayer) {
23-
Minecraft.getMinecraft().displayGuiScreen(new ConfigGui());
25+
PackCore.screenToOpenNextTick = new ConfigManagementScreen();
2426
}
2527
}
2628

0 commit comments

Comments
 (0)