Skip to content

Commit

Permalink
FG6 pls
Browse files Browse the repository at this point in the history
  • Loading branch information
robotgryphon committed Jun 23, 2023
1 parent c06af71 commit 17378d4
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 25 deletions.
Empty file removed build.gradle.kts
Empty file.
24 changes: 2 additions & 22 deletions forge-main/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ plugins {
id("idea")
id("eclipse")
id("maven-publish")
id("net.minecraftforge.gradle") version ("5.1.+")
id("net.minecraftforge.gradle") version "[6.0,6.2)"
id("org.parchmentmc.librarian.forgegradle") version ("1.+")
}

Expand Down Expand Up @@ -64,15 +64,7 @@ repositories {
}
}

maven("https://www.cursemaven.com") {
content {
includeGroup("curse.maven")
}
}

// location of the maven that hosts JEI files
maven("https://dvs1.progwml6.com/files/maven") {
name = "Progwml Repo"
maven("https://maven.blamejared.com") {
content {
includeGroup("mezz.jei")
}
Expand Down Expand Up @@ -112,16 +104,6 @@ dependencies {
// The One Probe
compileOnly(fg.deobf("mcjty.theoneprobe:theoneprobe:$top_version:api"))
runtimeOnly(fg.deobf("mcjty.theoneprobe:theoneprobe:$top_version"))

// if(!System.getenv().containsKey("CI")) {
// // Nicephore - Screenshots and Stuff
// runtimeOnly(fg.deobf("curse.maven:nicephore-401014:3574658"))
//
// // Shut up Experimental Settings - so we don't have to deal with that CONSTANTLY
// runtimeOnly(fg.deobf("curse.maven:shutupexperimental-407174:3544525"))
//
// runtimeOnly(fg.deobf("mezz.jei:jei-${jei_mc_version}:${jei_version}"))
// }
}

minecraft {
Expand Down Expand Up @@ -170,7 +152,6 @@ minecraft {
create("data") {
taskName("runData")
workingDirectory(file("run/data"))
forceExit(false)

args("--mod", mod_id)
args("--existing", project.file("src/main/resources"))
Expand All @@ -182,7 +163,6 @@ minecraft {
taskName("runGameTestServer")
workingDirectory(project.file("run/test"))
environment("CC_TEST_RESOURCES", file("src/test/resources"))
forceExit(false)

mods.named(mod_id) {
source(sourceSets.test.get())
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ forge_version=40.2.0
parchment_version=2022.11.06

mod_id=compactcrafting
core_version=2.0.3
core_version=2.0.4

# Dependencies and Libs
jei_mc_version=1.18.2
jei_version=10.2.1.283
jei_version=10.2.1.1005
top_version=1.18-5.1.2-9

# Curseforge
Expand Down
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-7.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 2 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ pluginManagement {
id("idea")
id("eclipse")
id("maven-publish")

id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0"
}

repositories {
Expand Down

0 comments on commit 17378d4

Please sign in to comment.