From 02b4e85f05abc4940c45bc537ba01342da3e592f Mon Sep 17 00:00:00 2001
From: Arminias <arminias@t-online.de>
Date: Sat, 16 Mar 2024 10:55:39 +0100
Subject: [PATCH] Small update

---
 build.gradle                                  | 51 +++++++++++++++----
 src/main/resources/fabric.mod.json            |  5 +-
 .../metadataextensionmod.accesswidener        |  4 +-
 .../metadataextensionmod.mixins.json          |  3 +-
 4 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index e61fe4b..c77c896 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,7 @@
 import net.fabricmc.loom.task.RunClientTask
 import net.fabricmc.loom.task.RunServerTask
+import org.gradle.plugins.ide.idea.model.FilePath
+import org.gradle.plugins.ide.idea.model.Module
 
 buildscript {
     dependencies {
@@ -10,6 +12,7 @@ buildscript {
 plugins {
     id 'maven-publish'
     id 'fabric-loom' version "0.7-SNAPSHOT"
+    id 'idea'
 }
 
 sourceCompatibility = JavaVersion.VERSION_1_8
@@ -31,6 +34,9 @@ repositories {
         name 'HalfOf2'
         url 'https://storage.googleapis.com/devan-maven/'
     }
+    maven {
+        url file('mavenRepo')
+    }
     maven {
         url = 'https://raw.githubusercontent.com/Devan-Kerman/Devan-Repo/master/'
     }
@@ -59,25 +65,29 @@ dependencies {
     implementation "org.lwjgl.lwjgl:lwjgl-platform:${lwjglVersion}"
 
     implementation 'it.unimi.dsi:fastutil:8.5.12'
-    modImplementation(group: 'net.devtech', name: 'grossfabrichacks', version: '6.1') {
+    modImplementation(group: 'net.devtech', name: 'grossfabrichacks', version: '4.5') {
         exclude group: 'net.fabricmc'
     }
 
-    include 'it.unimi.dsi:fastutil:8.5.12'
-    include 'net.devtech:grossfabrichacks:6.1'
+    //include 'it.unimi.dsi:fastutil:8.5.12'
+    //include 'net.devtech:grossfabrichacks:6.1'
 
     implementation fileTree(dir: "libs", include: "**.zip")
     compileOnly fileTree(dir: "$projectDir/BTW_dev", include: "*.zip")
-    compileOnly fileTree(dir: "$buildDir/BTW_dev", include: "**.jar")
+    compileOnly fileTree(dir: "$buildDir/BTW_dev", include: "BTW_dev.jar")
+    //implementation fileTree(dir: "$buildDir/BTW_dev", include: "BTW_dev.jar")
+    runtimeClasspath fileTree(dir: "$buildDir/BTW_dev", include: "BTW_dev.jar")
 
-    runtimeClasspath fileTree(dir: "$buildDir/dev_run", include: "dev.jar")
+    implementation fileTree(dir: "mavenRepo/group/dev/1.0", include: "dev-1.0.jar")
 
     mappings fileTree(dir: "custom_mappings", include: "**.zip")
     modImplementation("io.github.minecraft-cursed-legacy:cursed-fabric-loader:${loader_version}") {
         transitive false
     }
+
 }
 
+
 configurations {
     btwCompileClasspath.extendsFrom implementation, modImplementation
 }
@@ -91,6 +101,10 @@ configurations.all {
         force "org.lwjgl.lwjgl:lwjgl-platform:${lwjglVersion}"
     }
 }
+loom {
+    // Set accesswidener
+    accessWidener = file("src/main/resources/metadataextensionmod.accesswidener")
+}
 
 processResources {
     inputs.property "version", project.version
@@ -99,9 +113,24 @@ processResources {
     }
 }
 
-loom {
-    // Set accesswidener
-    accessWidener = file("src/main/resources/metadataextensionmod.accesswidener")
+idea {
+    module {
+        iml {
+            whenMerged { Module cp ->
+                def entry = cp.dependencies.find { entry -> entry.classes.any {
+                    it.file.path.endsWith('dev.jar')
+                }}
+                // add javadoc jar
+                entry.javadoc.add getPathFactory().path("$buildDir/dev_run/dev-javadoc.jar")
+            }
+
+            generateTo = file(".idea/modules")
+        }
+    }
+}
+
+openIdea {
+
 }
 
 tasks.withType(JavaCompile).configureEach {
@@ -133,8 +162,8 @@ task devPackRun(type:Jar) {
     from fileTree("$buildDir/classes/java/btw")
     from fileTree("$projectDir/BTW_dev/")
     from sourceSets.btw.output.resourcesDir
-    destinationDirectory = file("$buildDir/dev_run")
-    archiveFileName = "dev.jar"
+    destinationDirectory = file("mavenRepo/group/dev/1.0/")
+    archiveFileName = "dev-1.0.jar"
 }
 
 jar {
@@ -189,3 +218,5 @@ clean.doFirst {
     delete "$buildDir/dev_run"
     delete "$buildDir/BTW_dev"
 }
+
+downloadAssets.enabled = false
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 464131c..399408f 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -14,15 +14,12 @@
   },
 
   "license": "CC-BY-4.0",
-  "icon": "assets/metadataextensionmod/icon.png",
+  "icon": "metadataextensionmod/icon.png",
 
   "environment": "*",
   "entrypoints": {
     "init": [
       "btw.community.arminias.metadata.MetadataExtensionMod"
-    ],
-    "gfh:prePreLaunch": [
-      "btw.community.arminias.metadata.MetadataExtensionMod"
     ]
   },
   "mixins": [
diff --git a/src/main/resources/metadataextensionmod.accesswidener b/src/main/resources/metadataextensionmod.accesswidener
index 6a196ee..6900c3b 100644
--- a/src/main/resources/metadataextensionmod.accesswidener
+++ b/src/main/resources/metadataextensionmod.accesswidener
@@ -1,4 +1,4 @@
 accessWidener v1 named
 
-accessible method net.minecraft.nbt.NBTBase write (Ljava/io/DataOutput;)V
-accessible method net.minecraft.nbt.NBTBase load (Ljava/io/DataInput;)V
\ No newline at end of file
+accessible method net.minecraft.src.NBTBase write (Ljava/io/DataOutput;)V
+accessible method net.minecraft.src.NBTBase load (Ljava/io/DataInput;)V
diff --git a/src/main/resources/metadataextensionmod.mixins.json b/src/main/resources/metadataextensionmod.mixins.json
index 1d61997..55f24ad 100644
--- a/src/main/resources/metadataextensionmod.mixins.json
+++ b/src/main/resources/metadataextensionmod.mixins.json
@@ -32,5 +32,6 @@
   "injectors": {
     "defaultRequire": 1,
     "maxShiftBy": 5
-  }
+  },
+  "plugin": "net.devtech.grossfabrichacks.GrossFabricHacks"
 }