0.6

mcalec-dev · Mar 5, 2024 · d1de87c · d1de87c
1 parent 5de1810
commit d1de87c
Show file tree

Hide file tree

Showing 55 changed files with 648 additions and 217 deletions.
diff --git a/build-BACKUP.gradle b/build-BACKUP.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+    id 'org.spongepowered.mixin' version '0.7.+'
 }
 
 version = '0.6-1.20.1'
@@ -25,6 +26,8 @@ minecraft {
             property 'forge.logging.markers', 'REGISTRIES'
             property 'forge.logging.console.level', 'debug'
             property 'forge.enabledGameTestNamespaces', 'mcalecs'
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
             mods {
                 "${mod_id}" {
                     source sourceSets.main
@@ -49,20 +52,32 @@ minecraft {
 
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
+mixin {
+    // MixinGradle Settings
+    add sourceSets.main, 'net.mcalecs.refmap.json'
+    config 'net.mcalec.mcalecs'
+
+    debug.verbose = true
+    debug.export = true
+    dumpTargetOnFailure = true
+
+    quiet
+}
+
 repositories {
 	// Mod Location
     flatDir {
         dirs 'libs'
     }
 
     maven {
-    	// Curse Maven (Curseforge)
+    	// Curse Maven
     	name = "Curse Maven"
         url "https://cursemaven.com"
     }
 
     maven {
-    	// Modrinth Maven (Modrinth)
+    	// Modrinth Maven
     	name = "Modrinth Maven"
         url = "https://api.modrinth.com/maven"
     }
@@ -78,13 +93,26 @@ repositories {
         name = "Progwml6 Maven"
         url = "https://dvs1.progwml6.com/files/maven/"
     }
+    maven {
+    	// Fuzs Maven
+        name = "Fuzs Mod Resources"
+        url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/"
+    }
 
 }
 
 dependencies {
     minecraft 'net.minecraftforge:forge:1.20.1-47.2.20' // Forge 1.20.1 (47.2.20)
+    implementation fg.deobf("curse.maven:oauth-account-manager-546462:4620007")
+    implementation fg.deobf("curse.maven:u-team-core-273744:4681290")
+
+	implementation fg.deobf("curse.maven:configured-457570:5101367")
+	implementation fg.deobf("curse.maven:catalogue-459701:4766090")
+
+	runtimeOnly(fg.deobf("fuzs.forgeconfigscreens:forgeconfigscreens-forge:8.0.0"))
+	implementation fg.deobf("curse.maven:config-menus-forge-544048:4672356")
 
-	annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
+    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 
 }
 

diff --git a/build.gradle b/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'net.minecraftforge.gradle' version '[6.0,6.2)'
+    id 'org.spongepowered.mixin' version '0.7.+'
 }
 
 version = '0.6-1.20.1'
@@ -25,6 +26,8 @@ minecraft {
             property 'forge.logging.markers', 'REGISTRIES'
             property 'forge.logging.console.level', 'debug'
             property 'forge.enabledGameTestNamespaces', 'mcalecs'
+            property 'mixin.env.remapRefMap', 'true'
+            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
             mods {
                 "${mod_id}" {
                     source sourceSets.main
@@ -49,20 +52,32 @@ minecraft {
 
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
+mixin {
+    // MixinGradle Settings
+    add sourceSets.main, 'net.mcalecs.refmap.json'
+    config 'net.mcalec.mcalecs'
+
+    debug.verbose = true
+    debug.export = true
+    dumpTargetOnFailure = true
+
+    quiet
+}
+
 repositories {
 	// Mod Location
     flatDir {
         dirs 'libs'
     }
 
     maven {
-    	// Curse Maven (Curseforge)
+    	// Curse Maven
     	name = "Curse Maven"
         url "https://cursemaven.com"
     }
 
     maven {
-    	// Modrinth Maven (Modrinth)
+    	// Modrinth Maven
     	name = "Modrinth Maven"
         url = "https://api.modrinth.com/maven"
     }
@@ -78,13 +93,26 @@ repositories {
         name = "Progwml6 Maven"
         url = "https://dvs1.progwml6.com/files/maven/"
     }
+    maven {
+    	// Fuzs Maven
+        name = "Fuzs Mod Resources"
+        url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/"
+    }
 
 }
 
 dependencies {
     minecraft 'net.minecraftforge:forge:1.20.1-47.2.20' // Forge 1.20.1 (47.2.20)
+    implementation fg.deobf("curse.maven:oauth-account-manager-546462:4620007")
+    implementation fg.deobf("curse.maven:u-team-core-273744:4681290")
+
+	implementation fg.deobf("curse.maven:configured-457570:5101367")
+	implementation fg.deobf("curse.maven:catalogue-459701:4766090")
+
+	runtimeOnly(fg.deobf("fuzs.forgeconfigscreens:forgeconfigscreens-forge:8.0.0"))
+	implementation fg.deobf("curse.maven:config-menus-forge-544048:4672356")
 
-	annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
+    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 
 }
 

diff --git a/elements/Boykisser.mod.json b/elements/Boykisser.mod.json
@@ -4,7 +4,7 @@
   "definition": {
     "mobName": "Boykisser",
     "mobLabel": "",
-    "mobModelName": "Modelcustom_model",
+    "mobModelName": "ModelSlim",
     "mobModelTexture": "boykisser-event.png",
     "transparentModelCondition": {
       "fixedValue": false
@@ -67,8 +67,8 @@
     "movementSpeed": 0.3,
     "stepHeight": 0.6,
     "armorBaseValue": 0.0,
-    "trackingRange": 32,
-    "followRange": 16,
+    "trackingRange": 64,
+    "followRange": 32,
     "health": 20,
     "xpAmount": 0,
     "waterMob": false,

diff --git a/elements/BoykisserMaid.mod.json b/elements/BoykisserMaid.mod.json
@@ -4,7 +4,7 @@
   "definition": {
     "mobName": "Boykisser Maid",
     "mobLabel": "",
-    "mobModelName": "Modelcustom_model",
+    "mobModelName": "ModelSlim",
     "mobModelTexture": "boykisser.png",
     "transparentModelCondition": {
       "fixedValue": false
@@ -69,7 +69,7 @@
     "armorBaseValue": 0.0,
     "trackingRange": 64,
     "followRange": 32,
-    "health": 10,
+    "health": 20,
     "xpAmount": 0,
     "waterMob": false,
     "breatheUnderwater": {

diff --git a/elements/ConfigGUI.mod.json b/elements/ConfigGUI.mod.json
@@ -19,8 +19,8 @@
           "scale": 30,
           "rotationX": 0,
           "followMouseMovement": true,
-          "x": 18,
-          "y": 18
+          "x": 203,
+          "y": 109
         }
       }
     ],

diff --git a/elements/McAlecPerson.mod.json b/elements/McAlecPerson.mod.json
@@ -4,7 +4,7 @@
   "definition": {
     "mobName": "McAlec",
     "mobLabel": "McAlec1",
-    "mobModelName": "Modelcustom_model",
+    "mobModelName": "ModelSlim",
     "mobModelTexture": "teal_and_brown.png",
     "transparentModelCondition": {
       "fixedValue": false

diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,10 @@
-org.gradle.jvmargs=-Xmx6G
-org.gradle.daemon=true
+org.gradle.jvmargs=-Xmx4G
+# Base properties
+    minecraft_version=1.20.1
+    forge_version=1.20.1-47.2.20
+# Mod Properties
+    mod_version=0.6
+    maven_group=net.mcalec.mcalecs
+    archives_base_name=mcalecs
+    mod_id=mcalecs
+    mod_author=McAlec