From b98ce50af39b51ba821049f6d5a1e6ab1319cb5a Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Wed, 8 Aug 2018 08:42:04 +0200
Subject: [PATCH] Remove the common sourceset and restore original build.gradle
 as suggested

---
 build.gradle                                   | 18 ++----------------
 .../java/com/minelittlepony/gui/Button.java    |  0
 .../java/com/minelittlepony/gui/Checkbox.java  |  0
 .../java/com/minelittlepony/gui/GameGui.java   |  0
 .../com/minelittlepony/gui/IActionable.java    |  0
 .../com/minelittlepony/gui/IGuiAction.java     |  0
 .../com/minelittlepony/gui/IGuiCallback.java   |  0
 .../com/minelittlepony/gui/IGuiTooltipped.java |  0
 .../com/minelittlepony/gui/IconicButton.java   |  0
 .../java/com/minelittlepony/gui/Label.java     |  0
 .../com/minelittlepony/gui/SettingsPanel.java  |  0
 .../java/com/minelittlepony/gui/Slider.java    |  0
 12 files changed, 2 insertions(+), 16 deletions(-)
 rename src/{common => hdskins}/java/com/minelittlepony/gui/Button.java (100%)
 rename src/{common => hdskins}/java/com/minelittlepony/gui/Checkbox.java (100%)
 rename src/{common => hdskins}/java/com/minelittlepony/gui/GameGui.java (100%)
 rename src/{common => hdskins}/java/com/minelittlepony/gui/IActionable.java (100%)
 rename src/{common => hdskins}/java/com/minelittlepony/gui/IGuiAction.java (100%)
 rename src/{common => hdskins}/java/com/minelittlepony/gui/IGuiCallback.java (100%)
 rename src/{common => hdskins}/java/com/minelittlepony/gui/IGuiTooltipped.java (100%)
 rename src/{common => hdskins}/java/com/minelittlepony/gui/IconicButton.java (100%)
 rename src/{common => hdskins}/java/com/minelittlepony/gui/Label.java (100%)
 rename src/{common => hdskins}/java/com/minelittlepony/gui/SettingsPanel.java (100%)
 rename src/{common => hdskins}/java/com/minelittlepony/gui/Slider.java (100%)

diff --git a/build.gradle b/build.gradle
index 79b7fe1f..3b9f6693 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,26 +37,12 @@ minecraft {
 
 sourceSets {
     hdskins {
-        java {
-            srcDirs "src/hdskins/java", "src/common/java"
-        }
-        resources {
-            srcDirs "src/hdskins/resources"
-        }
-        refMap = 'hdskins.mixin.refmap.json'
-        
         compileClasspath += main.compileClasspath
+        ext.refMap = 'hdskins.mixin.refmap.json'
     }
     main {
-        java {
-            srcDirs "src/main/java", "src/common/java"
-        }
-        resources {
-            srcDirs "src/main/resources"
-        }
-        refMap = 'minelp.mixin.refmap.json'
-        
         compileClasspath += hdskins.output
+        ext.refMap = 'minelp.mixin.refmap.json'
     }
 }
 
diff --git a/src/common/java/com/minelittlepony/gui/Button.java b/src/hdskins/java/com/minelittlepony/gui/Button.java
similarity index 100%
rename from src/common/java/com/minelittlepony/gui/Button.java
rename to src/hdskins/java/com/minelittlepony/gui/Button.java
diff --git a/src/common/java/com/minelittlepony/gui/Checkbox.java b/src/hdskins/java/com/minelittlepony/gui/Checkbox.java
similarity index 100%
rename from src/common/java/com/minelittlepony/gui/Checkbox.java
rename to src/hdskins/java/com/minelittlepony/gui/Checkbox.java
diff --git a/src/common/java/com/minelittlepony/gui/GameGui.java b/src/hdskins/java/com/minelittlepony/gui/GameGui.java
similarity index 100%
rename from src/common/java/com/minelittlepony/gui/GameGui.java
rename to src/hdskins/java/com/minelittlepony/gui/GameGui.java
diff --git a/src/common/java/com/minelittlepony/gui/IActionable.java b/src/hdskins/java/com/minelittlepony/gui/IActionable.java
similarity index 100%
rename from src/common/java/com/minelittlepony/gui/IActionable.java
rename to src/hdskins/java/com/minelittlepony/gui/IActionable.java
diff --git a/src/common/java/com/minelittlepony/gui/IGuiAction.java b/src/hdskins/java/com/minelittlepony/gui/IGuiAction.java
similarity index 100%
rename from src/common/java/com/minelittlepony/gui/IGuiAction.java
rename to src/hdskins/java/com/minelittlepony/gui/IGuiAction.java
diff --git a/src/common/java/com/minelittlepony/gui/IGuiCallback.java b/src/hdskins/java/com/minelittlepony/gui/IGuiCallback.java
similarity index 100%
rename from src/common/java/com/minelittlepony/gui/IGuiCallback.java
rename to src/hdskins/java/com/minelittlepony/gui/IGuiCallback.java
diff --git a/src/common/java/com/minelittlepony/gui/IGuiTooltipped.java b/src/hdskins/java/com/minelittlepony/gui/IGuiTooltipped.java
similarity index 100%
rename from src/common/java/com/minelittlepony/gui/IGuiTooltipped.java
rename to src/hdskins/java/com/minelittlepony/gui/IGuiTooltipped.java
diff --git a/src/common/java/com/minelittlepony/gui/IconicButton.java b/src/hdskins/java/com/minelittlepony/gui/IconicButton.java
similarity index 100%
rename from src/common/java/com/minelittlepony/gui/IconicButton.java
rename to src/hdskins/java/com/minelittlepony/gui/IconicButton.java
diff --git a/src/common/java/com/minelittlepony/gui/Label.java b/src/hdskins/java/com/minelittlepony/gui/Label.java
similarity index 100%
rename from src/common/java/com/minelittlepony/gui/Label.java
rename to src/hdskins/java/com/minelittlepony/gui/Label.java
diff --git a/src/common/java/com/minelittlepony/gui/SettingsPanel.java b/src/hdskins/java/com/minelittlepony/gui/SettingsPanel.java
similarity index 100%
rename from src/common/java/com/minelittlepony/gui/SettingsPanel.java
rename to src/hdskins/java/com/minelittlepony/gui/SettingsPanel.java
diff --git a/src/common/java/com/minelittlepony/gui/Slider.java b/src/hdskins/java/com/minelittlepony/gui/Slider.java
similarity index 100%
rename from src/common/java/com/minelittlepony/gui/Slider.java
rename to src/hdskins/java/com/minelittlepony/gui/Slider.java