- cleanUp gradle process -> shading from local mavenrepo works

Author: yannicklamprecht

.gitignore

@@ -2,16 +2,13 @@
 *.class
 
 # Log file
-*.log
-
 # BlueJ files
 *.ctxt
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
 # Package Files #
-*.jar
 *.war
 *.ear
 *.zip
@@ -20,3 +17,11 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+.gradle/
+.idea/
+target
+gradlew
+gradlew.bat
+build
+*.iml
+gradle/

build.gradle

@@ -1,8 +1,7 @@
-
-
 buildscript {
     repositories {
         jcenter()
+
         maven { url = "http://files.minecraftforge.net/maven" }
     }
     dependencies {
@@ -34,8 +33,21 @@ minecraft {
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 }
 
+repositories{
+    mavenLocal()
+}
+
+configurations {
+    shade
+    compile.extendsFrom shade
+}
+
+
 dependencies {
-    compile project(':Backend')
+
+
+    shade group:"net.nickac.lithium", name: "Backend", version: "1.0"
+
     // you may put jars on which you depend on in ./libs
     // or you may define them like so..
     //compile "some.group:artifact:version:classifier"
@@ -79,3 +91,12 @@ processResources {
         exclude 'mcmod.info'
     }
 }
+
+jar {
+    configurations.shade.each { dep ->
+        from(project.zipTree(dep)){
+            exclude 'META-INF', 'META-INF/**'
+            // you may exclude other things here if you want, or maybe copy the META-INF
+        }
+    }
+}

settings.gradle

@@ -1,2 +0,0 @@
-include ':Backend'
-project(':Backend').projectDir = new File(settingsDir, '../Backend')

src/main/java/net/nickac/lithium/frontend/mod/network/LithiumMessage.java

@@ -31,6 +31,8 @@
 import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
 import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
 import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import net.nickac.lithium.backend.controls.LContainer;
 import net.nickac.lithium.backend.controls.LControl;
 import net.nickac.lithium.backend.controls.impl.LOverlay;
@@ -80,26 +82,27 @@ public void toBytes(ByteBuf buf) {
 
 	public static class Handle implements IMessageHandler<LithiumMessage, IMessage> {
 
+		@SideOnly(Side.CLIENT)
 		@Override
 		public IMessage onMessage(LithiumMessage message, MessageContext ctx) {
 			//TODO: Handle all other stuff
 			String receivedMessage = message.text.trim();
 			//System.out.println(String.format("Received %s.", message.text.trim()));
-			if (receivedMessage.startsWith(LITHIUM_RECEIVE_WINDOW)) {
-				String w = receivedMessage.substring(LITHIUM_RECEIVE_WINDOW.length());
+			if (receivedMessage.startsWith(TO_CLIENT.RECEIVE_WINDOW)) {
+				String w = receivedMessage.substring(TO_CLIENT.RECEIVE_WINDOW.length());
 
 				LWindow receivedWindow = SerializationUtils.stringToObject(w, LWindow.class);
 
 				if (receivedWindow != null) {
-					ModCoderPackUtils.sendLithiumMessageToServer(new LithiumMessage(LITHIUM_WINDOW_OPEN + receivedWindow.getUUID()));
+					ModCoderPackUtils.sendLithiumMessageToServer(new LithiumMessage(TO_SERVER.WINDOW_OPEN + receivedWindow.getUUID()));
 					Minecraft.getMinecraft().addScheduledTask(() -> {
 						NewLithiumGUI gui = new NewLithiumGUI(receivedWindow);
 						Minecraft.getMinecraft().displayGuiScreen(gui);
 					});
 
 				}
-			} else if (receivedMessage.startsWith(LITHIUM_CONTROL_CHANGED)) {
-				String c = receivedMessage.substring(LITHIUM_CONTROL_CHANGED.length());
+			} else if (receivedMessage.startsWith(TO_CLIENT.CONTROL_CHANGED)) {
+				String c = receivedMessage.substring(TO_CLIENT.CONTROL_CHANGED.length());
 				LControl newC = SerializationUtils.stringToObject(c, LControl.class);
 
 				if (newC.getParent() != null) {
@@ -110,10 +113,10 @@ public IMessage onMessage(LithiumMessage message, MessageContext ctx) {
 					LithiumMod.replaceControl(LithiumMod.getCurrentLithium().getBaseWindow(), newC.getUUID(), newC);
 				}*/
 
-			} else if (receivedMessage.equals(LITHIUM_CLOSE_WINDOW)) {
+			} else if (receivedMessage.equals(TO_CLIENT.CLOSE_WINDOW)) {
 				Minecraft.getMinecraft().addScheduledTask(() -> Minecraft.getMinecraft().displayGuiScreen(null));
-			} else if (receivedMessage.startsWith(LITHIUM_ADD_TO_CONTAINER)) {
-				String w = receivedMessage.substring(LITHIUM_ADD_TO_CONTAINER.length());
+			} else if (receivedMessage.startsWith(TO_CLIENT.ADD_TO_CONTAINER)) {
+				String w = receivedMessage.substring(TO_CLIENT.ADD_TO_CONTAINER.length());
 				String[] split = w.split("\\|");
 
 				try {
@@ -148,8 +151,8 @@ public IMessage onMessage(LithiumMessage message, MessageContext ctx) {
 				} catch (ArrayIndexOutOfBoundsException | IllegalArgumentException ex) {
 					LithiumMod.log("Received malformed packet from server. Ignoring!");
 				}
-			} else if (receivedMessage.startsWith(LITHIUM_REMOVE_FROM_CONTAINER)) {
-				String w = receivedMessage.substring(LITHIUM_REMOVE_FROM_CONTAINER.length());
+			} else if (receivedMessage.startsWith(TO_CLIENT.REMOVE_FROM_CONTAINER)) {
+				String w = receivedMessage.substring(TO_CLIENT.REMOVE_FROM_CONTAINER.length());
 				String[] split = w.split("\\|");
 
 				UUID containerUUID = UUID.fromString(split[0]);
@@ -166,9 +169,9 @@ public IMessage onMessage(LithiumMessage message, MessageContext ctx) {
 					}
 				}
 
-			} else if (receivedMessage.startsWith(LITHIUM_SHOW_OVERLAY)) {
+			} else if (receivedMessage.startsWith(TO_CLIENT.SHOW_OVERLAY)) {
 				try {
-					String w = receivedMessage.substring(LITHIUM_SHOW_OVERLAY.length());
+					String w = receivedMessage.substring(TO_CLIENT.SHOW_OVERLAY.length());
 					LOverlay overlay = SerializationUtils.stringToObject(w, LOverlay.class);
 					LithiumMod.setCurrentLithiumOverlay(overlay);
 				} catch (Exception e) {

src/main/java/net/nickac/lithium/frontend/mod/ui/NewLithiumGUI.java

@@ -242,7 +242,7 @@ protected void keyTyped(char typedChar, int keyCode) throws IOException {
 					if (lTextBox != null) {
 						ModCoderPackUtils.sendLithiumMessageToServer(
 								new LithiumMessage(
-										LITHIUM_TEXTBOX_TEXT_CHANGED
+										TO_SERVER.TEXTBOX_TEXT_CHANGED
 												+ lTextBox.getUUID()
 												+ "|"
 												+ SerializationUtils.objectToString(t.getText())
@@ -395,7 +395,7 @@ public void onGuiClosed() {
 		//We can unregister the window, because everything has an UUID, and it wouldn't make sense to reuse a window or its controls.
 		LithiumMod.getWindowManager().unregisterWindow(baseWindow);
 		//Then we need to the server that the window was closed (event)
-		ModCoderPackUtils.sendLithiumMessageToServer(new LithiumMessage(LITHIUM_WINDOW_CLOSE + baseWindow.getUUID()));
+		ModCoderPackUtils.sendLithiumMessageToServer(new LithiumMessage(TO_SERVER.WINDOW_CLOSE + baseWindow.getUUID()));
 		//Then, we can "safely" set the current LithiumGUI to null.
 		LithiumMod.setCurrentLithium(null);
 	}
@@ -416,7 +416,7 @@ protected void actionPerformed(GuiButton button) throws IOException {
 		//Later, it will invoke an event on the spigot side.
 		if (buttonId != -1) {
 			ModCoderPackUtils.sendLithiumMessageToServer(
-					new LithiumMessage(LITHIUM_BUTTON_ACTION + buttonsCounter.get(buttonId).getUUID())
+					new LithiumMessage(TO_SERVER.BUTTON_ACTION + buttonsCounter.get(buttonId).getUUID())
 			);
 		}
 	}

src/main/java/net/nickac/lithium/frontend/mod/ui/renders/CheckBoxRenderer.java

@@ -26,6 +26,8 @@
 package net.nickac.lithium.frontend.mod.ui.renders;
 
 import net.minecraft.client.gui.GuiScreen;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import net.nickac.lithium.backend.controls.impl.LCheckBox;
 import net.nickac.lithium.backend.other.LithiumConstants;
 import net.nickac.lithium.backend.other.objects.Point;
@@ -43,6 +45,7 @@ public class CheckBoxRenderer implements ILithiumControlRenderer<LCheckBox, GuiS
 	private final int PADDING = 4;
 	private final int PADDING_LEFT = 3;
 
+	@SideOnly(Side.CLIENT)
 	private Rectangle getCheckBoxRect(LCheckBox c) {
 		Point loc = NewLithiumGUI.centerControl(c);
 
@@ -52,6 +55,7 @@ private Rectangle getCheckBoxRect(LCheckBox c) {
 		return new Rectangle(left + PADDING_LEFT, top + PADDING, sz, sz);
 	}
 
+	@SideOnly(Side.CLIENT)
 	@Override
 	public void renderLithiumControl(LCheckBox control, GuiScreen gui) {
 		//Get the outer most rectangle
@@ -73,13 +77,14 @@ public void renderLithiumControl(LCheckBox control, GuiScreen gui) {
 		}
 	}
 
+	@SideOnly(Side.CLIENT)
 	@Override
 	public void mouseClick(LCheckBox control, GuiScreen gui, int mouseX, int mouseY, int mouseButton) {
 		Rectangle rect = getCheckBoxRect(control).inflate(-1, -1);
 		if (rect.contains(new Point(mouseX, mouseY))) {
 			control.setChecked(!control.isChecked());
 			//Here, we risk having a desync from the server, but I'll try my best to sync it.
-			ModCoderPackUtils.sendLithiumMessageToServer(new LithiumMessage(LithiumConstants.LITHIUM_TOGGLE_ACTION + control.getUUID()));
+			ModCoderPackUtils.sendLithiumMessageToServer(new LithiumMessage(LithiumConstants.TO_SERVER.TOGGLE_ACTION + control.getUUID()));
 		}
 	}
 

src/main/java/net/nickac/lithium/frontend/mod/ui/renders/SliderRenderer.java

@@ -27,6 +27,8 @@
 
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiScreen;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import net.nickac.lithium.backend.controls.impl.LSlider;
 import net.nickac.lithium.backend.other.LithiumConstants;
 import net.nickac.lithium.backend.other.objects.Point;
@@ -43,6 +45,7 @@
 public class SliderRenderer implements ILithiumControlRenderer<LSlider, GuiScreen> {
 	private final int HANDLE_LENGHT = 8;
 
+	@SideOnly(Side.CLIENT)
 	@Override
 	public void renderLithiumControl(LSlider control, GuiScreen gui) {
 		Point loc = NewLithiumGUI.centerControl(control);
@@ -101,6 +104,7 @@ public void renderLithiumControl(LSlider control, GuiScreen gui) {
 
 	}
 
+	@SideOnly(Side.CLIENT)
 	@Override
 	public void mouseClick(LSlider control, GuiScreen gui, int mouseX, int mouseY, int mouseButton) {
 		Point point = NewLithiumGUI.centerControl(control);
@@ -141,11 +145,12 @@ public void changeSlider(LSlider control, Point clickedPoint) {
 		);
 		ModCoderPackUtils.sendLithiumMessageToServer(
 				new LithiumMessage(
-						LithiumConstants.LITHIUM_SLIDER_VALUE_CHANGED + control.getUUID() + "|" + control.getValue()
+						LithiumConstants.TO_SERVER.SLIDER_VALUE_CHANGED + control.getUUID() + "|" + control.getValue()
 				)
 		);
 	}
 
+	@SideOnly(Side.CLIENT)
 	@Override
 	public void mouseClickMove(LSlider control, GuiScreen gui, int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) {
 		Point point = NewLithiumGUI.centerControl(control);