Skip to content

Commit

Permalink
Update creosote burn value as fluid to match burn value when in a buc…
Browse files Browse the repository at this point in the history
…ket (#52)

* update buildscript and dependencies

* normalize creosote value vs bucket
  • Loading branch information
bombcar authored Dec 4, 2023
1 parent 5d93361 commit ade6d59
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 25 deletions.
25 changes: 5 additions & 20 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//version: 1699290261
//version: 1701530445
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
Expand Down Expand Up @@ -28,27 +28,12 @@ import java.util.concurrent.TimeUnit

buildscript {
repositories {
mavenCentral()

maven {
name 'forge'
url 'https://maven.minecraftforge.net'
}
maven {
// GTNH RetroFuturaGradle and ASM Fork
name "GTNH Maven"
url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
allowInsecureProtocol = true
}
maven {
name 'sonatype'
url 'https://oss.sonatype.org/content/repositories/snapshots/'
}
maven {
name 'Scala CI dependencies'
url 'https://repo1.maven.org/maven2/'
}

mavenLocal()
}
}
Expand Down Expand Up @@ -302,7 +287,7 @@ if (apiPackage) {
}

if (accessTransformersFile) {
for (atFile in accessTransformersFile.split(",")) {
for (atFile in accessTransformersFile.split(" ")) {
String targetFile = "src/main/resources/META-INF/" + atFile.trim()
if (!getFile(targetFile).exists()) {
throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
Expand Down Expand Up @@ -793,12 +778,12 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
}

dependencies {
def lwjgl3ifyVersion = '1.5.1'
def lwjgl3ifyVersion = '1.5.7'
if (modId != 'lwjgl3ify') {
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
}
if (modId != 'hodgepodge') {
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17')
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35')
}

java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
Expand Down Expand Up @@ -1310,7 +1295,7 @@ def addCurseForgeRelation(String type, String name) {

// Updating

def buildscriptGradleVersion = "8.2.1"
def buildscriptGradleVersion = "8.5"

tasks.named('wrapper', Wrapper).configure {
gradleVersion = buildscriptGradleVersion
Expand Down
8 changes: 4 additions & 4 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Add your dependencies here

dependencies {
compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.36:dev")
compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.37:dev")
implementation("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
implementation("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
compileOnly("curse.maven:cofh-lib-220333:2388748")
compileOnly("com.github.GTNewHorizons:ForestryMC:4.6.14:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForestryMC:4.7.0:dev") { transitive = false }
compileOnly("curse.maven:craftguide-75557:2459320")

runtimeOnly("com.github.GTNewHorizons:Baubles:1.0.1.16:dev") // for Thaumcraft
runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.4.9-GTNH:dev")
runtimeOnly("com.github.GTNewHorizons:Baubles:1.0.3:dev") // for Thaumcraft
runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev")
}
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public static void addLiquidFuels() {
// Pyrotheum

Fluid creosote = Fluids.CREOSOTE.get();
if (creosote != null) FuelManager.addBoilerFuel(creosote, 4800); // Creosote
if (creosote != null) FuelManager.addBoilerFuel(creosote, 6400); // Creosote
}

@Override
Expand Down

0 comments on commit ade6d59

Please sign in to comment.