Skip to content

Commit

Permalink
Fixed an issue with installing the mod on servers
Browse files Browse the repository at this point in the history
  • Loading branch information
MehradN committed Apr 28, 2023
1 parent 0f9d851 commit de154fd
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 27 deletions.
2 changes: 0 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@ subprojects {

implementation "com.github.LlamaLad7:MixinExtras:${rootProject.mixin_extras_version}"
annotationProcessor "com.github.LlamaLad7:MixinExtras:${rootProject.mixin_extras_version}"
include "com.github.LlamaLad7:MixinExtras:${rootProject.mixin_extras_version}"

modImplementation "net.fabricmc:fabric-loader:${rootProject.loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}"
}
}

Expand Down
14 changes: 7 additions & 7 deletions client/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
archivesBaseName = rootProject.client_name

configurations {
dev {
canBeResolved = false
canBeConsumed = true
}
loom {
accessWidenerPath = project(":common").loom.accessWidenerPath
}

artifacts {
dev jar
dependencies {
include "com.github.LlamaLad7:MixinExtras:${rootProject.mixin_extras_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}"

implementation include(project(path: ":common", configuration: "namedElements")) { transitive false }
}

processResources {
Expand Down

This file was deleted.

7 changes: 5 additions & 2 deletions client/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@
"ir.mehradn.cavesurvey.CaveSurveyClient"
],
"preLaunch": [
"ir.mehradn.cavesurvey.CaveSurveyClientPreLaunch"
"ir.mehradn.cavesurvey.CaveSurveyPreLaunch"
]
},
"mixins": [
"cave-survey-client.mixins.json"
{
"config": "cave-survey-client.mixins.json",
"environment": "client"
}
],
"depends": {
"java": ">=17",
Expand Down
1 change: 1 addition & 0 deletions common/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
archivesBaseName = rootProject.common_name
4 changes: 3 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ org.gradle.parallel=true
minecraft_version=1.19.4
parchment_version=1.19.3:2023.03.12
loader_version=0.14.19
fabric.loom.multiProjectOptimisation=true

# Mod Properties
mod_version=1.0.0
mod_version=1.0.1
maven_group=ir.mehradn
server_name=cave-survey
common_name=cave-survey-common
client_name=cave-survey-client

# Dependencies
Expand Down
8 changes: 6 additions & 2 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,19 @@ repositories {
}

loom {
accessWidenerPath = project(":client").loom.accessWidenerPath
accessWidenerPath = project(":common").loom.accessWidenerPath
}

dependencies {
include "com.github.LlamaLad7:MixinExtras:${rootProject.mixin_extras_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}"

modImplementation include("eu.pb4:polymer-core:${rootProject.polymer_version}")
modImplementation include("eu.pb4:polymer-resource-pack:${rootProject.polymer_version}")
modImplementation include("xyz.nucleoid:server-translations-api:${rootProject.translation_version}")

implementation include(project(path: ":client", configuration: "dev"))
implementation include(project(path: ":common", configuration: "namedElements")) { transitive false }
implementation include(project(path: ":client", configuration: "namedElements"))
}

processResources {
Expand Down
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ pluginManagement {
}
}

include "common"
include "client"
include "server"

Expand Down

0 comments on commit de154fd

Please sign in to comment.