Skip to content

Commit

Permalink
update bs+deps
Browse files Browse the repository at this point in the history
  • Loading branch information
Dream-Master committed Jan 20, 2024
1 parent d0bc351 commit 57b4593
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 11 deletions.
27 changes: 23 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//version: 1704751096
//version: 1705357285
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
Expand Down Expand Up @@ -122,6 +122,7 @@ propertyDefaultIfUnset("modrinthProjectId", "")
propertyDefaultIfUnset("modrinthRelations", "")
propertyDefaultIfUnset("curseForgeProjectId", "")
propertyDefaultIfUnset("curseForgeRelations", "")
propertyDefaultIfUnset("versionPattern", "")
propertyDefaultIfUnset("minimizeShadowedDependencies", true)
propertyDefaultIfUnset("relocateShadowedDependencies", true)
// Deprecated properties (kept for backwards compat)
Expand Down Expand Up @@ -370,6 +371,7 @@ catch (Exception ignored) {
// Pulls version first from the VERSION env and then git tag
String identifiedVersion
String versionOverride = System.getenv("VERSION") ?: null
boolean checkVersion = false
try {
// Produce a version based on the tag, or for branches something like 0.2.2-configurable-maven-and-extras.38+43090270b6-dirty
if (versionOverride == null) {
Expand All @@ -388,6 +390,8 @@ try {
}
} else if (isDirty) {
identifiedVersion += "-${branchName}+${gitDetails.gitHash}-dirty"
} else {
checkVersion = true
}
} else {
identifiedVersion = versionOverride
Expand All @@ -409,6 +413,8 @@ ext {

if (identifiedVersion == versionOverride) {
out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
} else if (checkVersion && versionPattern && !(identifiedVersion ==~ versionPattern)) {
throw new GradleException("Invalid version: '$identifiedVersion' does not match version pattern '$versionPattern'")
}

group = "com.github.GTNewHorizons"
Expand All @@ -428,18 +434,31 @@ minecraft {
for (f in replaceGradleTokenInFile.split(',')) {
tagReplacementFiles.add f
}
out.style(Style.Info).text('replaceGradleTokenInFile is deprecated! Consider using generateGradleTokenClass.').println()
}
if (gradleTokenModId) {
injectedTags.put gradleTokenModId, modId
if (replaceGradleTokenInFile) {
injectedTags.put gradleTokenModId, modId
} else {
out.style(Style.Failure).text('gradleTokenModId is deprecated! The field will no longer be generated.').println()
}
}
if (gradleTokenModName) {
injectedTags.put gradleTokenModName, modName
if (replaceGradleTokenInFile) {
injectedTags.put gradleTokenModName, modName
} else {
out.style(Style.Failure).text('gradleTokenModName is deprecated! The field will no longer be generated.').println()
}
}
if (gradleTokenVersion) {
injectedTags.put gradleTokenVersion, modVersion
}
if (gradleTokenGroupName) {
injectedTags.put gradleTokenGroupName, modGroup
if (replaceGradleTokenInFile) {
injectedTags.put gradleTokenGroupName, modGroup
} else {
out.style(Style.Failure).text('gradleTokenGroupName is deprecated! The field will no longer be generated.').println()
}
}
if (enableGenericInjection.toBoolean()) {
injectMissingGenerics.set(true)
Expand Down
10 changes: 5 additions & 5 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ configurations {
}

dependencies {
api("com.github.GTNewHorizons:GTNHLib:0.1.0:dev")
api("com.github.GTNewHorizons:GTNHLib:0.2.1:dev")

transformedMod("com.github.GTNewHorizons:NotEnoughItems:2.5.4-GTNH:dev") // force a more up-to-date NEI version
transformedMod("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-310-GTNH")
transformedMod("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-312-GTNH")
transformedMod("com.github.GTNewHorizons:Baubles:1.0.4:dev")
// Transitive updates to make runClient17 work
transformedMod("com.github.GTNewHorizons:ForgeMultipart:1.4.7:dev")
transformedMod("com.github.GTNewHorizons:GT5-Unofficial:5.09.45.27:dev")
transformedMod("com.github.GTNewHorizons:harvestcraft:1.1.5-GTNH:dev")
transformedMod("com.github.GTNewHorizons:GT5-Unofficial:5.09.45.41:dev")
transformedMod("com.github.GTNewHorizons:harvestcraft:1.1.6-GTNH:dev")
transformedMod("com.github.GTNewHorizons:HungerOverhaul:1.1.0-GTNH:dev")
transformedMod("com.github.GTNewHorizons:MrTJPCore:1.1.6:dev") // Do not update, fixed afterwards
transformedMod("com.github.GTNewHorizons:Railcraft:9.15.5:dev") { exclude group: "thaumcraft", module: "Thaumcraft" }
transformedMod("com.github.GTNewHorizons:TinkersConstruct:1.11.5-GTNH:dev")
transformedMod("com.github.GTNewHorizons:TinkersConstruct:1.11.8-GTNH:dev")
transformedMod(deobfCurse("bibliocraft-228027:2423369"))
transformedMod("curse.maven:biomes-o-plenty-220318:2499612")
transformedMod("curse.maven:cofh-core-69162:2388751")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ developmentEnvironmentUserName = Developer
# Generate a class with String fields for the mod id, name, version and group name named with the fields below
generateGradleTokenClass = com.mitchej123.hodgepodge.Tags
gradleTokenModId =
gradleTokenModName = MODNAME
gradleTokenModName =
gradleTokenVersion = VERSION
gradleTokenGroupName =
# [DEPRECATED]
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/mitchej123/hodgepodge/Hodgepodge.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class Hodgepodge {
public static final HodgepodgeEventHandler EVENT_HANDLER = new HodgepodgeEventHandler();
public static final String MODID = "hodgepodge";
public static final String VERSION = Tags.VERSION;
public static final String NAME = Tags.MODNAME;
public static final String NAME = "Hodgepodge";

@EventHandler
public void preinit(FMLPreInitializationEvent event) {
Expand Down

0 comments on commit 57b4593

Please sign in to comment.