From 7245a0a54c427574b06019fc18c05ed8914dd63c Mon Sep 17 00:00:00 2001
From: Asek3 <64613894+Asek3@users.noreply.github.com>
Date: Fri, 8 Sep 2023 11:59:12 +0300
Subject: [PATCH] Setup jar name & Static refmap name

---
 build.gradle                                                   | 3 ++-
 src/main/resources/mixins.oculus.bettermipmaps.json            | 1 -
 src/main/resources/mixins.oculus.compat.json                   | 1 -
 src/main/resources/mixins.oculus.compat.sodium.json            | 1 -
 src/main/resources/mixins.oculus.fantastic.json                | 1 -
 src/main/resources/mixins.oculus.fixes.maxfpscrash.json        | 1 -
 src/main/resources/mixins.oculus.integrationtest.json          | 1 -
 src/main/resources/mixins.oculus.json                          | 1 -
 src/main/resources/mixins.oculus.optimized-stitching.json      | 1 -
 src/main/resources/mixins.oculus.vertexformat.json             | 1 -
 src/main/resources/oculus-batched-entity-rendering.mixins.json | 1 -
 11 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8e831836ae..400fc65a5c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,12 +19,13 @@ loom {
 				"mixins.oculus.compat.json"
 		]
 	}
+	mixin.defaultRefmapName = "oculus-mixins-refmap.json"
 }
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
-archivesBaseName = project.archives_base_name
+archivesBaseName = "${project.archives_base_name}-mc${project.minecraft_version}"
 version = project.mod_version
 group = project.maven_group
 
diff --git a/src/main/resources/mixins.oculus.bettermipmaps.json b/src/main/resources/mixins.oculus.bettermipmaps.json
index 980d820499..e252528771 100644
--- a/src/main/resources/mixins.oculus.bettermipmaps.json
+++ b/src/main/resources/mixins.oculus.bettermipmaps.json
@@ -2,7 +2,6 @@
   "required": true,
   "minVersion": "0.8",
   "package": "net.coderbot.iris.mixin.bettermipmaps",
-  "refmap": "oculus-refmap.json",
   "compatibilityLevel": "JAVA_8",
   "client": [
     "MixinMipmapGenerator",
diff --git a/src/main/resources/mixins.oculus.compat.json b/src/main/resources/mixins.oculus.compat.json
index ded45ebf41..c905f1497c 100644
--- a/src/main/resources/mixins.oculus.compat.json
+++ b/src/main/resources/mixins.oculus.compat.json
@@ -3,7 +3,6 @@
   "minVersion": "0.8",
   "package": "net.coderbot.iris.mixin.compat",
   "plugin": "net.coderbot.iris.mixin.compat.CompatMixinPlugin",
-  "refmap": "oculus-refmap.json",
   "compatibilityLevel": "JAVA_8",
   "client": [
     "epicfight.MixinEpicFightRenderTypes",
diff --git a/src/main/resources/mixins.oculus.compat.sodium.json b/src/main/resources/mixins.oculus.compat.sodium.json
index 44004ed6c0..30fb8556ac 100644
--- a/src/main/resources/mixins.oculus.compat.sodium.json
+++ b/src/main/resources/mixins.oculus.compat.sodium.json
@@ -1,7 +1,6 @@
 {
   "package": "net.coderbot.iris.compat.sodium.mixin",
   "plugin": "net.coderbot.iris.compat.sodium.mixin.IrisSodiumCompatMixinPlugin",
-  "refmap": "oculus-refmap.json",
   "required": true,
   "minVersion": "0.8",
   "compatibilityLevel": "JAVA_8",
diff --git a/src/main/resources/mixins.oculus.fantastic.json b/src/main/resources/mixins.oculus.fantastic.json
index 229868570f..7ca045f5cb 100644
--- a/src/main/resources/mixins.oculus.fantastic.json
+++ b/src/main/resources/mixins.oculus.fantastic.json
@@ -2,7 +2,6 @@
   "required": true,
   "minVersion": "0.8",
   "package": "net.coderbot.iris.mixin.fantastic",
-  "refmap": "oculus-refmap.json",
   "compatibilityLevel": "JAVA_8",
   "client": [
     "MixinBarrierParticle",
diff --git a/src/main/resources/mixins.oculus.fixes.maxfpscrash.json b/src/main/resources/mixins.oculus.fixes.maxfpscrash.json
index a7136673ef..e62f2ccb6b 100644
--- a/src/main/resources/mixins.oculus.fixes.maxfpscrash.json
+++ b/src/main/resources/mixins.oculus.fixes.maxfpscrash.json
@@ -2,7 +2,6 @@
   "required": true,
   "minVersion": "0.8",
   "package": "net.coderbot.iris.mixin",
-  "refmap": "oculus-refmap.json",
   "compatibilityLevel": "JAVA_8",
   "client": [
     "MixinMaxFpsCrashFix"
diff --git a/src/main/resources/mixins.oculus.integrationtest.json b/src/main/resources/mixins.oculus.integrationtest.json
index 9d4fed6ac1..1e03280b7c 100644
--- a/src/main/resources/mixins.oculus.integrationtest.json
+++ b/src/main/resources/mixins.oculus.integrationtest.json
@@ -2,7 +2,6 @@
   "required": true,
   "minVersion": "0.8",
   "package": "net.coderbot.iris.mixin.integrationtest",
-  "refmap": "oculus-refmap.json",
   "compatibilityLevel": "JAVA_8",
   "client": [
     "MixinRenderTarget_StencilBufferTest"
diff --git a/src/main/resources/mixins.oculus.json b/src/main/resources/mixins.oculus.json
index 7b34ff7278..72da01fdd1 100644
--- a/src/main/resources/mixins.oculus.json
+++ b/src/main/resources/mixins.oculus.json
@@ -2,7 +2,6 @@
   "required": true,
   "minVersion": "0.8",
   "package": "net.coderbot.iris.mixin",
-  "refmap": "oculus-refmap.json",
   "compatibilityLevel": "JAVA_8",
   "client": [
     "DimensionTypeAccessor",
diff --git a/src/main/resources/mixins.oculus.optimized-stitching.json b/src/main/resources/mixins.oculus.optimized-stitching.json
index 64d4effa1f..1e3a6bc331 100644
--- a/src/main/resources/mixins.oculus.optimized-stitching.json
+++ b/src/main/resources/mixins.oculus.optimized-stitching.json
@@ -2,7 +2,6 @@
   "required": true,
   "minVersion": "0.8",
   "package": "net.coderbot.iris.mixin.optimized_stitching",
-  "refmap": "oculus-refmap.json",
   "compatibilityLevel": "JAVA_8",
   "client": [
     "MixinStitcher"
diff --git a/src/main/resources/mixins.oculus.vertexformat.json b/src/main/resources/mixins.oculus.vertexformat.json
index 9372b7d7a2..38de4a772c 100644
--- a/src/main/resources/mixins.oculus.vertexformat.json
+++ b/src/main/resources/mixins.oculus.vertexformat.json
@@ -2,7 +2,6 @@
   "required": true,
   "minVersion": "0.8",
   "package": "net.coderbot.iris.mixin.vertices",
-  "refmap": "oculus-refmap.json",
   "compatibilityLevel": "JAVA_8",
   "client": [
     "MixinBufferBuilder",
diff --git a/src/main/resources/oculus-batched-entity-rendering.mixins.json b/src/main/resources/oculus-batched-entity-rendering.mixins.json
index 48d1050fbc..93aeccba97 100644
--- a/src/main/resources/oculus-batched-entity-rendering.mixins.json
+++ b/src/main/resources/oculus-batched-entity-rendering.mixins.json
@@ -2,7 +2,6 @@
   "required": true,
   "minVersion": "0.8",
   "package": "net.coderbot.batchedentityrendering.mixin",
-  "refmap": "oculus-refmap.json",
   "compatibilityLevel": "JAVA_8",
   "client": [
     "ChunkBufferBuilderPackAccessor",