From 756d8cd1378a2f13811a06706cb74b71cfdca3f9 Mon Sep 17 00:00:00 2001 From: DaCodia Date: Thu, 25 Jul 2024 21:22:57 -0700 Subject: [PATCH] 15048 errors :thumbsup: --- build.gradle | 92 ++++++------------- settings.gradle | 1 + src/main/resources/createindustry.mixins.json | 5 +- src/main/resources/fabric.mod.json | 2 +- 4 files changed, 30 insertions(+), 70 deletions(-) diff --git a/build.gradle b/build.gradle index dadaa7f6..50540617 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version "1.5.+" + id 'fabric-loom' version "1.5-SNAPSHOT" id 'maven-publish' } @@ -46,13 +46,13 @@ dependencies { processResources { // require dependencies to be the version compiled against or newer - Map properties = Map.of( - "version", version, - "fabric_loader_version", fabric_loader_version, - "fabric_api_version", fabric_api_version, - "create_version", create_version, - "minecraft_version", minecraft_version - ) +// Map properties = Map.of( +// "version", version, +// "fabric_loader_version", fabric_loader_version, +// "fabric_api_version", fabric_api_version, +// "create_version", create_version, +// "minecraft_version", minecraft_version +// ) inputs.properties(properties) @@ -87,69 +87,31 @@ publishing { } } +loom { + runs { + data { + environment = "data" + + defaultMainClass = 'com.drmangotea.createindustry.CreateTFMG.java' + //property 'forge.logging.markers', 'REGISTRIES' + //property 'forge.logging.console.level', 'debug' + programArgs '--mod', 'createindustry', '--all', '--output', 'src/generated/resources/', '--existing', 'src/main/resources/' + } + +// mixin { +// defaultRefmapName = 'mixins.createindustry.refmap.json' +// useRefmap = true +// remap = true +// } + } +} //minecraft { // // // // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default. // -// runs { -// client { -// workingDirectory project.file('run') -// arg '-mixin.config=createindustry.mixins.json' -// property 'forge.logging.markers', 'REGISTRIES' -// property 'forge.logging.console.level', 'debug' -// property 'forge.enabledGameTestNamespaces', 'createindustry' -// property 'mixin.env.remapRefMap', 'true' -// property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg" -// mods { -// createindustry { -// source sourceSets.main -// } -// } -// } -// -// server { -// workingDirectory project.file('run') -// arg '-mixin.config=createindustry.mixins.json' -// property 'forge.logging.markers', 'REGISTRIES' -// property 'forge.logging.console.level', 'debug' -// property 'forge.enabledGameTestNamespaces', 'createindustry' -// property 'mixin.env.remapRefMap', 'true' -// property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg" -// mods { -// createindustry { -// source sourceSets.main -// } -// } -// } -// -// gameTestServer { -// workingDirectory project.file('run') -// property 'forge.logging.markers', 'REGISTRIES' -// property 'forge.logging.console.level', 'debug' -// property 'forge.enabledGameTestNamespaces', 'createindustry' -// property 'mixin.env.remapRefMap', 'true' -// property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg" -// mods { -// createindustry { -// source sourceSets.main -// } -// } -// } -// -// data { -// workingDirectory project.file('run') -// property 'forge.logging.markers', 'REGISTRIES' -// property 'forge.logging.console.level', 'debug' -// args '--mod', 'createindustry', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') -// mods { -// createindustry { -// source sourceSets.main -// } -// } -// } -// } + //} // //// Include resources generated by data generators. diff --git a/settings.gradle b/settings.gradle index 79c3ab9e..0aad8288 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,6 @@ pluginManagement { repositories { + mavenCentral() gradlePluginPortal() maven { url = "https://maven.fabricmc.net/" } maven { url = "https://maven.quiltmc.org/repository/release" } diff --git a/src/main/resources/createindustry.mixins.json b/src/main/resources/createindustry.mixins.json index e7bab038..f6e29338 100644 --- a/src/main/resources/createindustry.mixins.json +++ b/src/main/resources/createindustry.mixins.json @@ -1,7 +1,7 @@ { "required": true, - "minVersion": "0.8", + "minVersion": "0.5", "package": "com.drmangotea.createindustry.mixins", "compatibilityLevel": "JAVA_17", "mixins": [ @@ -10,9 +10,6 @@ "FluidPipeBlockMixin", "PipeAttachmentModelMixin", "BucketItemMixin" - // "ArrowMixin" - //, - // "ScreenEffectRendererMixin" ], "injectors": { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2ed27521..01841321 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -8,7 +8,7 @@ "DrMangoTea, Pepa, Milky, Luna, but mostly DaCodia" ], "contact": { - "sources": "https://github.com/Fabricators-of-Create/create-fabric-addon-template" + "sources": "https://github.com/DrMango14/Create-The_Factory_Must_Grow" }, "license": "CC0", "icon": "logo.png",