Skip to content

Commit

Permalink
Fix buildscript
Browse files Browse the repository at this point in the history
  • Loading branch information
Patbox committed Oct 22, 2024
1 parent f2c300b commit a109ccc
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 18 deletions.
22 changes: 14 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.7.+'
id 'fabric-loom' version '1.8.+'
id "com.modrinth.minotaur" version "2.+"
id 'com.matthewprenger.cursegradle' version '1.4.0'
}
Expand Down Expand Up @@ -114,13 +114,19 @@ subprojects {
}

dependencies {
api include(project(path: ":polymer-autohost", configuration: "namedElements"))
api include(project(path: ":polymer-core", configuration: "namedElements"))
api include(project(path: ":polymer-common", configuration: "namedElements"))
api include(project(path: ":polymer-resource-pack", configuration: "namedElements"))
api include(project(path: ":polymer-blocks", configuration: "namedElements"))
api include(project(path: ":polymer-virtual-entity", configuration: "namedElements"))
//include(project(":polymer-client-extensions"))
api project(path: ":polymer-autohost", configuration: "namedElements")
api project(path: ":polymer-core", configuration: "namedElements")
api project(path: ":polymer-common", configuration: "namedElements")
api project(path: ":polymer-resource-pack", configuration: "namedElements")
api project(path: ":polymer-blocks", configuration: "namedElements")
api project(path: ":polymer-virtual-entity", configuration: "namedElements")

include(project(path: ":polymer-autohost"))
include(project(path: ":polymer-core"))
include(project(path: ":polymer-common"))
include(project(path: ":polymer-resource-pack"))
include(project(path: ":polymer-blocks"))
include(project(path: ":polymer-virtual-entity"))
}

void setupRepositories(RepositoryHandler repositories) {
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ org.gradle.jvmargs=-Xmx4G
# Fabric Properties
# check these on https://fabricmc.net/use

minecraft_version=1.21.2-rc2
yarn_mappings=1.21.2-rc2+build.1
minecraft_version=1.21.2
yarn_mappings=1.21.2+build.1
loader_version=0.16.7

# Fabric API
fabric_version=0.106.0+1.21.2

maven_group = eu.pb4

mod_version = 0.10.0-rc.2
mod_version = 0.10.0

minecraft_version_supported = ">=1.21.2-"

packet_tweaker_version = 0.6.0-pre.1+1.21.2-pre3

is_stable = false
is_stable = true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 4 additions & 2 deletions polymer-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,11 @@ dependencies {

testmodImplementation sourceSets.main.output

api include(project(path: ':polymer-reg-sync-manipulator', configuration: 'namedElements'))
api (project(path: ':polymer-reg-sync-manipulator', configuration: 'namedElements'))
include(project(path: ':polymer-reg-sync-manipulator'))
api project(path: ':polymer-common', configuration: 'namedElements')
api include(project(path: ':polymer-networking', configuration: 'namedElements'))
api (project(path: ':polymer-networking', configuration: 'namedElements'))
include(project(path: ':polymer-networking'))

compileOnly (project(path: ':polymer-resource-pack', configuration: 'namedElements'))
localRuntime (project(path: ':polymer-resource-pack', configuration: 'namedElements'))
Expand Down
3 changes: 2 additions & 1 deletion polymer-networking/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ loom {
}

dependencies {
api include(project(path: ':polymer-common', configuration: 'namedElements'))
api project(path: ':polymer-common', configuration: 'namedElements')
include(project(path: ':polymer-common'))
}

afterEvaluate {
Expand Down
3 changes: 2 additions & 1 deletion polymer-resource-pack/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ dependencies {
}
modCompileOnly "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_version}"

api include(project(path: ':polymer-common', configuration: 'namedElements'))
api (project(path: ':polymer-common', configuration: 'namedElements'))
include(project(path: ':polymer-common'))
}

afterEvaluate {
Expand Down
3 changes: 2 additions & 1 deletion polymer-virtual-entity/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ loom {

dependencies {
//modCompileOnly ('nl.theepicblock:PolyMc:5.1.0+1.19')
api include(project(path: ':polymer-common', configuration: 'namedElements'))
api project(path: ':polymer-common', configuration: 'namedElements')
include(project(path: ':polymer-common'))

modCompileOnly 'com.github.iPortalTeam:ImmersivePortalsMod:v5.1.0-mc1.20.4'

Expand Down

0 comments on commit a109ccc

Please sign in to comment.