Compare commits

..
3 Commits
Author SHA1 Message Date
Glease ea38c4e1d6 add API to get hologram item 2023-02-11 01:26:46 +08:00
Glease 50e8c97aa3 fix javadoc 2023-02-11 01:26:46 +08:00
Raven Szewczyk 9a82239f2c [ci skip] upgraded build system 2023-01-31 09:56:09 +00:00
3 changed files with 16 additions and 16 deletions

No files matched your search

+7 -14
View File
@@ -1,4 +1,4 @@
//version: 1675074449 //version: 1675110695
/* /*
DO NOT CHANGE THIS FILE! DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available. Also, you may replace this file at any time if there is an update available.
@@ -66,7 +66,7 @@ plugins {
id 'com.diffplug.spotless' version '6.7.2' apply false id 'com.diffplug.spotless' version '6.7.2' apply false
id 'com.modrinth.minotaur' version '2.+' apply false id 'com.modrinth.minotaur' version '2.+' apply false
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
id 'com.gtnewhorizons.retrofuturagradle' version '1.0.18' id 'com.gtnewhorizons.retrofuturagradle' version '1.1.2'
} }
boolean settingsupdated = verifySettingsGradle() boolean settingsupdated = verifySettingsGradle()
settingsupdated = verifyGitAttributes() || settingsupdated settingsupdated = verifyGitAttributes() || settingsupdated
@@ -166,6 +166,9 @@ pluginManager.withPlugin('org.jetbrains.kotlin.jvm') {
"kaptMcLauncherKotlin", "kaptMcLauncherKotlin",
"kaptPatchedMcKotlin", "kaptPatchedMcKotlin",
"kaptInjectedTagsKotlin", "kaptInjectedTagsKotlin",
"kspMcLauncherKotlin",
"kspPatchedMcKotlin",
"kspInjectedTagsKotlin",
] ]
tasks.configureEach { task -> tasks.configureEach { task ->
if (task.name in disabledKotlinTaskList) { if (task.name in disabledKotlinTaskList) {
@@ -334,7 +337,7 @@ if (identifiedVersion == versionOverride) {
out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7') out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
} }
group = modGroup group = "com.github.GTNewHorizons"
if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) { if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
archivesBaseName = customArchiveBaseName archivesBaseName = customArchiveBaseName
} else { } else {
@@ -711,16 +714,6 @@ if (usesShadowedDependencies.toBoolean()) {
ext.publishableDevJar = usesShadowedDependencies.toBoolean() ? tasks.shadowJar : tasks.jar ext.publishableDevJar = usesShadowedDependencies.toBoolean() ? tasks.shadowJar : tasks.jar
ext.publishableObfJar = tasks.reobfJar ext.publishableObfJar = tasks.reobfJar
tasks.named('extractForgeUserdev', Copy).configure { efu ->
doLast {
// Fix CoFH-repackaged CCL not finding mappings
project.copy {
from(mcpTasks.userdevDir("conf"))
into(new File(project.buildDir, "unpacked/conf"))
}
}
}
tasks.register('apiJar', Jar) { tasks.register('apiJar', Jar) {
from(sourceSets.main.allSource) { from(sourceSets.main.allSource) {
include modGroupPath + "/" + apiPackagePath + '/**' include modGroupPath + "/" + apiPackagePath + '/**'
@@ -825,7 +818,7 @@ publishing {
artifact apiJar artifact apiJar
} }
groupId = System.getenv("ARTIFACT_GROUP_ID") ?: "com.github.GTNewHorizons" groupId = System.getenv("ARTIFACT_GROUP_ID") ?: project.group
artifactId = System.getenv("ARTIFACT_ID") ?: project.name artifactId = System.getenv("ARTIFACT_ID") ?: project.name
// Using the identified version, not project.version as it has the prepended 1.7.10 // Using the identified version, not project.version as it has the prepended 1.7.10
version = System.getenv("RELEASE_VERSION") ?: identifiedVersion version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
@@ -86,7 +86,7 @@ public class StructureLibAPI {
/** /**
* Check if instrumenting is enabled. * Check if instrumenting is enabled.
* *
* @return true if enabled, false otherwise * @return true if enabled, false otherwise
*/ */
public static boolean isInstrumentEnabled() { public static boolean isInstrumentEnabled() {
@@ -272,6 +272,13 @@ public class StructureLibAPI {
return StructureLib.itemBlockHint; return StructureLib.itemBlockHint;
} }
/**
* Get the hologram item.
*/
public static Item getDefaultHologramItem() {
return StructureLib.itemConstructableTrigger;
}
/** /**
* Check if structure debug mode is on. * Check if structure debug mode is on.
* *
+1 -1
View File
@@ -221,7 +221,7 @@ import com.gtnewhorizon.structurelib.structure.IStructureElement;
public class MyHatchElement<T> implements IStructureElement<T> { public class MyHatchElement<T> implements IStructureElement<T> {
//... //...
@Override {@literal @}Override
public PlaceResult survivalPlaceBlock( public PlaceResult survivalPlaceBlock(
Object o, Object o,
World world, World world,