From bd86cf764c871127610468f53c3c534937e50f8e Mon Sep 17 00:00:00 2001
From: Andrew-71 <andrey.nikitin.vladimirovich@gmail.com>
Date: Sun, 28 Apr 2024 01:14:16 +0300
Subject: [PATCH] Merge sourcesets and fix mixins

---
 CHANGELOG                                                | 2 +-
 build.gradle                                             | 9 ---------
 gradle.properties                                        | 2 +-
 .../java/su/a71/new_soviet/NewSovietClient.java          | 0
 .../java/su/a71/new_soviet/config/ModMenuCompat.java     | 0
 .../new_soviet/mixin/client/ItemRendererAccessor.java    | 0
 .../a71/new_soviet/mixin/client/ItemRendererMixin.java   | 0
 .../su/a71/new_soviet/mixin/client/ModelLoaderMixin.java | 0
 src/main/resources/new_soviet.mixins.json                | 1 -
 9 files changed, 2 insertions(+), 12 deletions(-)
 rename src/{client => main}/java/su/a71/new_soviet/NewSovietClient.java (100%)
 rename src/{client => main}/java/su/a71/new_soviet/config/ModMenuCompat.java (100%)
 rename src/{client => main}/java/su/a71/new_soviet/mixin/client/ItemRendererAccessor.java (100%)
 rename src/{client => main}/java/su/a71/new_soviet/mixin/client/ItemRendererMixin.java (100%)
 rename src/{client => main}/java/su/a71/new_soviet/mixin/client/ModelLoaderMixin.java (100%)

diff --git a/CHANGELOG b/CHANGELOG
index 051c866..8a410d0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -50,7 +50,7 @@ This version focuses on QOL and bug fixes
     * Deleted various unused files - code, textures and models
     * Bumped Fabric API, loader and mappings versions
 
-### Changelog 0.3 -> 0.4
+### Changelog 0.3 -> 0.4.0
 Due to sheer amount of changes, many may be undocumented. We hope you enjoy this update! :D
 
 * Added dozens of new blocks
diff --git a/build.gradle b/build.gradle
index bf680b7..4efd670 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,15 +20,6 @@ repositories {
 }
 
 loom {
-    splitEnvironmentSourceSets()
-
-    mods {
-        "modid" {
-            sourceSet sourceSets.main
-            sourceSet sourceSets.client
-        }
-    }
-
 	runs {
 		datagenClient {
 			inherit client
diff --git a/gradle.properties b/gradle.properties
index ebccd20..a8aa778 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@ loader_version=0.15.10
 
 # Mod Properties
 mod_name=New Soviet Era
-mod_version=0.4
+mod_version=0.4.0
 maven_group=su.a71
 mod_id=new_soviet
 
diff --git a/src/client/java/su/a71/new_soviet/NewSovietClient.java b/src/main/java/su/a71/new_soviet/NewSovietClient.java
similarity index 100%
rename from src/client/java/su/a71/new_soviet/NewSovietClient.java
rename to src/main/java/su/a71/new_soviet/NewSovietClient.java
diff --git a/src/client/java/su/a71/new_soviet/config/ModMenuCompat.java b/src/main/java/su/a71/new_soviet/config/ModMenuCompat.java
similarity index 100%
rename from src/client/java/su/a71/new_soviet/config/ModMenuCompat.java
rename to src/main/java/su/a71/new_soviet/config/ModMenuCompat.java
diff --git a/src/client/java/su/a71/new_soviet/mixin/client/ItemRendererAccessor.java b/src/main/java/su/a71/new_soviet/mixin/client/ItemRendererAccessor.java
similarity index 100%
rename from src/client/java/su/a71/new_soviet/mixin/client/ItemRendererAccessor.java
rename to src/main/java/su/a71/new_soviet/mixin/client/ItemRendererAccessor.java
diff --git a/src/client/java/su/a71/new_soviet/mixin/client/ItemRendererMixin.java b/src/main/java/su/a71/new_soviet/mixin/client/ItemRendererMixin.java
similarity index 100%
rename from src/client/java/su/a71/new_soviet/mixin/client/ItemRendererMixin.java
rename to src/main/java/su/a71/new_soviet/mixin/client/ItemRendererMixin.java
diff --git a/src/client/java/su/a71/new_soviet/mixin/client/ModelLoaderMixin.java b/src/main/java/su/a71/new_soviet/mixin/client/ModelLoaderMixin.java
similarity index 100%
rename from src/client/java/su/a71/new_soviet/mixin/client/ModelLoaderMixin.java
rename to src/main/java/su/a71/new_soviet/mixin/client/ModelLoaderMixin.java
diff --git a/src/main/resources/new_soviet.mixins.json b/src/main/resources/new_soviet.mixins.json
index e781f0b..e2aed63 100644
--- a/src/main/resources/new_soviet.mixins.json
+++ b/src/main/resources/new_soviet.mixins.json
@@ -2,7 +2,6 @@
   "required": true,
   "minVersion": "0.8",
   "package": "su.a71.new_soviet.mixin",
-  "refmap": "client-new_soviet-refmap.json",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
     "BrushMixin"