diff --git a/dependencies.gradle b/dependencies.gradle index 0eb821a0..3666a617 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,8 +1,8 @@ // Add your dependencies here dependencies { - api("com.github.GTNewHorizons:GTNHLib:0.4.2:dev") - runtimeOnly("com.github.GTNewHorizons:NotEnoughItems:2.6.19-GTNH:dev") + api("com.github.GTNewHorizons:GTNHLib:0.5.19:dev") + runtimeOnly("com.github.GTNewHorizons:NotEnoughItems:2.6.44-GTNH:dev") testImplementation(platform('org.junit:junit-bom:5.9.2')) testImplementation('org.junit.jupiter:junit-jupiter') diff --git a/gradle.properties b/gradle.properties index bad69f41..f11afa94 100644 --- a/gradle.properties +++ b/gradle.properties @@ -50,10 +50,10 @@ enableGenericInjection = true # Generate a class with a String field for the mod version named as defined below. # If generateGradleTokenClass is empty or not missing, no such class will be generated. # If gradleTokenVersion is empty or missing, the field will not be present in the class. -generateGradleTokenClass = +generateGradleTokenClass = com.gtnewhorizon.structurelib.Tags # Name of the token containing the project's current version to generate/replace. -gradleTokenVersion = GRADLETOKEN_VERSION +gradleTokenVersion = VERSION # [DEPRECATED] Mod ID replacement token. gradleTokenModId = @@ -70,7 +70,7 @@ gradleTokenGroupName = # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's # version in @Mod([...], version = VERSION, [...]). # Leave these properties empty to skip individual token replacements. -replaceGradleTokenInFile = StructureLib.java +replaceGradleTokenInFile = # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can # leave this property empty. diff --git a/settings.gradle b/settings.gradle index 242692e5..aa612ade 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.26' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29' } diff --git a/src/main/java/com/gtnewhorizon/structurelib/StructureLib.java b/src/main/java/com/gtnewhorizon/structurelib/StructureLib.java index 3f220256..c441bc40 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/StructureLib.java +++ b/src/main/java/com/gtnewhorizon/structurelib/StructureLib.java @@ -42,7 +42,7 @@ @Mod( modid = StructureLibAPI.MOD_ID, name = "StructureLib", - version = "GRADLETOKEN_VERSION", + version = Tags.VERSION, acceptableRemoteVersions = "*", guiFactory = "com.gtnewhorizon.structurelib.GuiFactory") public class StructureLib { diff --git a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureElementChain.java b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureElementChain.java index 5bc55cd8..819990fd 100644 --- a/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureElementChain.java +++ b/src/main/java/com/gtnewhorizon/structurelib/structure/IStructureElementChain.java @@ -62,7 +62,8 @@ default BlocksToPlace getBlocksToPlace(T t, World world, int x, int y, int z, It if (e == null) continue; if (predicate == null) predicate = e.getPredicate(); else predicate = predicate.or(e.getPredicate()); - is.add(e.getStacks()); + Iterable stacks = e.getStacks(); + if (stacks != null) is.add(stacks); } if (predicate == null) return null; return new BlocksToPlace(predicate, Iterables.concat(is));