Update to 1.10.2

Author: shadowfacts

build.gradle

@@ -28,6 +28,9 @@ minecraft {
 	runDir = "run"
 
 	mappings = mcp_mappings
+
+	replaceIn "DiscordChat.java"
+	replace "@VERSION@", mod_version
 }
 
 processResources {
@@ -54,9 +57,9 @@ repositories {
 }
 
 dependencies {
-	compile group: "net.shadowfacts", name: "ShadowMC", version: mc_version + "-" + shadowmc_version
+	deobfCompile group: "net.shadowfacts", name: "ShadowMC", version: mc_version + "-" + shadowmc_version
 
-	compile group: "net.dv8tion", name: "JDA", version: "2.0.0_242", classifier: "withDependencies"
+	compile group: "net.dv8tion", name: "JDA", version: "2.1.3_327", classifier: "withDependencies"
 }
 
 shadowJar {
@@ -79,7 +82,7 @@ shadowJar {
 	relocate "org.apache.commons.logging", "net.shadowfacts.discordchat.repack.org.apache.commons.logging"
 
 	dependencies {
-		include(dependency("net.dv8tion:JDA:2.0.0_242:withDependencies"))
+		include(dependency("net.dv8tion:JDA:2.1.3_327:withDependencies"))
 	}
 }
 
@@ -89,7 +92,7 @@ curseforge {
 	project {
 		id = "240995"
 
-		addGameVersion "1.9"
+		addGameVersion "1.10.2"
 		addGameVersion "Java 8"
 
 		mainArtifact(shadowJar) {

gradle.properties

@@ -1,9 +1,9 @@
-mod_version = 1.2.1
+mod_version = 1.3.0
 group = net.shadowfacts
 archivesBaseName = DiscordChat
 
-mc_version = 1.9.4
-forge_version = 12.17.0.1910-1.9.4
-mcp_mappings = snapshot_20160521
+mc_version = 1.10.2
+forge_version = 12.18.1.2014
+mcp_mappings = snapshot_20160715
 
-shadowmc_version = 3.3.0
+shadowmc_version = 3.4.2

libs/JDA-2.0.0_242-withDependencies.jar libs/JDA-2.1.3_327-withDependencies.jar

@@ -13,11 +13,11 @@
 /**
  * @author shadowfacts
  */
-@Mod(modid = DiscordChat.modId, name = DiscordChat.modId, version = DiscordChat.version, acceptableRemoteVersions = "*", acceptedMinecraftVersions = "[1.9.4]", dependencies = "required-after:shadowmc;")
+@Mod(modid = DiscordChat.modId, name = DiscordChat.modId, version = DiscordChat.version, acceptableRemoteVersions = "*", acceptedMinecraftVersions = "[1.10.2]", dependencies = "required-after:shadowmc;")
 public class DiscordChat {
 
 	public static final String modId = "DiscordChat";
-	public static final String version = "1.2.1";
+	public static final String version = "@VERSION@";
 
 	public static Logger log = LogManager.getLogger(modId);
 

src/main/java/net/shadowfacts/discordchat/DiscordChat.java

@@ -1,84 +1,59 @@
 package net.shadowfacts.discordchat.client;
 
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiMainMenu;
 import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.I18n;
 import net.shadowfacts.discordchat.DCConfig;
 import net.shadowfacts.discordchat.DCPrivateProps;
-import net.shadowfacts.shadowlib.util.DesktopUtils;
-import net.shadowfacts.shadowmc.gui.component.GUIComponentText;
-import net.shadowfacts.shadowmc.gui.component.button.GUIButtonText;
-import net.shadowfacts.shadowmc.gui.mcwrapper.GuiScreenWrapper;
-import net.shadowfacts.shadowmc.gui.mcwrapper.MCBaseGUI;
+import net.shadowfacts.discordchat.DiscordChat;
+import net.shadowfacts.shadowmc.ui.element.UILabel;
+import net.shadowfacts.shadowmc.ui.element.button.UIButtonLink;
+import net.shadowfacts.shadowmc.ui.element.button.UIButtonText;
+import net.shadowfacts.shadowmc.ui.element.view.UIStackView;
+import net.shadowfacts.shadowmc.ui.util.UIBuilder;
 import net.shadowfacts.shadowmc.util.MouseButton;
-import net.shadowfacts.shadowmc.util.StringHelper;
-
-import java.net.URISyntaxException;
 
 /**
  * @author shadowfacts
  */
-public class GUISetup extends MCBaseGUI {
+public class GUISetup {
 
+	public static GuiScreen create() {
+		UIStackView view = new UIStackView("setup");
 
-	public GUISetup(GuiScreenWrapper wrapper) {
-		super(wrapper);
+		UILabel line1 = new UILabel(I18n.format("dc.gui.setup.line1"), "line1");
+		view.add(line1);
 
-		String line1 = StringHelper.localize("dc.gui.setup.line1");
-		String line2 = StringHelper.localize("dc.gui.setup.line2");
+		UILabel line2 = new UILabel(I18n.format("dc.gui.setup.line2"), "line2");
+		view.add(line2);
 
-		addChild(new GUIComponentText(-(mc.fontRendererObj.getStringWidth(line1) / 2), 10, line1));
-		addChild(new GUIComponentText(-(mc.fontRendererObj.getStringWidth(line2) / 2), mc.fontRendererObj.FONT_HEIGHT + 14, line2));
+		UIButtonText instructions = new UIButtonLink(I18n.format("dc.gui.setup.instructions"), "https://git.io/vrGte", "instructions");
+		view.add(instructions);
 
-		addChild(new GUIButtonText(-100, 40, 200, 20, this::handleInstructions, StringHelper.localize("dc.gui.setup.instructions")));
-		addChild(new GUIButtonText(-100, 70, 200, 20, this::handleFinished, StringHelper.localize("dc.gui.setup.finished")));
-		addChild(new GUIButtonText(-100, 100, 200, 20, this::handleSkip, StringHelper.localize("dc.gui.setup.skip")));
-	}
+		UIButtonText finished = new UIButtonText(I18n.format("dc.gui.setup.finished"), GUISetup::handleFinished, "finished");
+		view.add(finished);
 
-	@Override
-	public void setInitialized(boolean initialized) {
-		super.setInitialized(initialized);
-		updatePosition(width / 2, y);
-	}
+		UIButtonText skip = new UIButtonText(I18n.format("dc.gui.setup.skip"), GUISetup::handleSkip, "skip");
+		view.add(skip);
 
-	private boolean handleInstructions(GUIButtonText button, MouseButton mouseButton) {
-		try {
-			DesktopUtils.openWebpage("https://git.io/vrGte");
-		} catch (URISyntaxException ignored) {}
-		return true;
+		return new UIBuilder().add(view).style(DiscordChat.modId + ":setup").createScreen();
 	}
 
-	private boolean handleFinished(GUIButtonText button, MouseButton mouseButton) {
+	private static boolean handleFinished(UIButtonText button, MouseButton mouseButton) {
 		DCPrivateProps.setup = true;
 		DCPrivateProps.save();
 		DCConfig.load();
-		mc.displayGuiScreen(new GuiMainMenu());
+		Minecraft.getMinecraft().displayGuiScreen(new GuiMainMenu());
 		return true;
 	}
 
-	private boolean handleSkip(GUIButtonText button, MouseButton mouseButton) {
+	private static boolean handleSkip(UIButtonText button, MouseButton mouseButton) {
 		DCPrivateProps.setup = true;
 		DCPrivateProps.save();
 		DCConfig.load();
-		mc.displayGuiScreen(new GuiMainMenu());
+		Minecraft.getMinecraft().displayGuiScreen(new GuiMainMenu());
 		return true;
 	}
 
-	@Override
-	public void draw(int mouseX, int mouseY) {
-		// because something else disables GL_TEXTURE_2D without using the GlStateManager
-		GlStateManager.disableTexture2D();
-		GlStateManager.enableTexture2D();
-
-		super.draw(mouseX, mouseY);
-	}
-
-	public static GuiScreen create() {
-		GuiScreenWrapper wrapper = new GuiScreenWrapper();
-		GUISetup gui = new GUISetup(wrapper);
-		gui.setZLevel(0);
-		wrapper.gui = gui;
-		return wrapper;
-	}
-
 }

src/main/java/net/shadowfacts/discordchat/client/GUISetup.java

@@ -0,0 +1,5 @@
+#setup {
+	vertical-layout: top
+	margin-top: 10
+	stack-spacing: 10
+}