From f5f913d71759bef045e7bdc6621c59ad341b143d Mon Sep 17 00:00:00 2001 From: coolGi2007 Date: Sun, 30 Jan 2022 16:14:26 +1030 Subject: [PATCH] Cleaned up gradle and temporarily commented out the experimental generator till leetom adds it back --- common/build.gradle | 1 - .../com/seibel/lod/common/wrappers/WrapperFactory.java | 10 +++++----- fabric/build.gradle | 8 ++++---- forge/build.gradle | 8 ++++---- gradle.properties | 4 ++-- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/common/build.gradle b/common/build.gradle index d06826840..3f3751086 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -30,5 +30,4 @@ publishing { dependencies { implementation("com.electronwill.night-config:toml:${rootProject.toml_version}") - shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {} } \ No newline at end of file diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java b/common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java index 9940b8292..96724b256 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java @@ -29,7 +29,7 @@ import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractExperimenta import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractWorldGeneratorWrapper; import com.seibel.lod.common.wrappers.block.BlockPosWrapper; import com.seibel.lod.common.wrappers.chunk.ChunkPosWrapper; -import com.seibel.lod.common.wrappers.worldGeneration.ExperimentalGenerator; +//import com.seibel.lod.common.wrappers.worldGeneration.ExperimentalGenerator; import com.seibel.lod.common.wrappers.worldGeneration.WorldGeneratorWrapper; /** @@ -82,8 +82,8 @@ public class WrapperFactory implements IWrapperFactory { return new WorldGeneratorWrapper(newLodBuilder, newLodDimension, worldWrapper); } - @Override - public AbstractExperimentalWorldGeneratorWrapper createExperimentalWorldGenerator(LodBuilder newLodBuilder, LodDimension newLodDimension, IWorldWrapper worldWrapper) { - return new ExperimentalGenerator(newLodBuilder, newLodDimension, worldWrapper); - } +// @Override +// public AbstractExperimentalWorldGeneratorWrapper createExperimentalWorldGenerator(LodBuilder newLodBuilder, LodDimension newLodDimension, IWorldWrapper worldWrapper) { +// return new ExperimentalGenerator(newLodBuilder, newLodDimension, worldWrapper); +// } } diff --git a/fabric/build.gradle b/fabric/build.gradle index 33d66c2dc..0ebee6bdc 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -3,7 +3,7 @@ plugins { id "com.modrinth.minotaur" version "1.2.1" } -version = project.mod_version+"-"+project.minecraft_version+"-"+new Date().format("MM_dd_yyyy_HH_mm") +version = rootProject.mod_version+"-"+rootProject.minecraft_version+"-"+new Date().format("yyyy_MM_dd_HH_mm") loom { accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener")) @@ -39,14 +39,14 @@ dependencies { } // Sodium - modImplementation "maven.modrinth:sodium:${project.sodium_version}" + modImplementation "maven.modrinth:sodium:${rootProject.sodium_version}" implementation "org.joml:joml:1.10.2" // Lithium -// modImplementation "maven.modrinth:lithium:${project.lithium_version}" +// modImplementation "maven.modrinth:lithium:${rootProject.lithium_version}" // Iris -// modImplementation "maven.modrinth:iris:${project.iris_version}" +// modImplementation "maven.modrinth:iris:${rootProject.iris_version}" // Toml diff --git a/forge/build.gradle b/forge/build.gradle index babcbb342..39a366004 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -2,7 +2,7 @@ plugins { id "com.github.johnrengelman.shadow" version "7.0.0" } -version = project.mod_version+"-"+project.minecraft_version+"-"+new Date().format("MM_dd_yyyy_HH_mm") +version = rootProject.mod_version+"-"+rootProject.minecraft_version+"-"+new Date().format("yyyy_MM_dd_HH_mm") loom { accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener")) @@ -32,8 +32,8 @@ dependencies { common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowMe(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } -// implementation("com.electronwill.night-config:toml:${rootProject.toml_version}") -// forgeDependencies(shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}) +// implementation("com.electronwill.night-config:toml:${rootProject.toml_version}") // This is already included with forge +// forgeDependencies(shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}) // This is already included with forge // forgeDependencies(project(":core")) { transitive false } @@ -94,7 +94,7 @@ shadowJar { configurations = [project.configurations.shadowMe] relocate 'org.tukaani', 'shaded.tukaani' relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress' -// relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig' +// relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig' // This is already included with forge relocate 'com.seibel.lod.common', 'forge.com.seibel.lod.common' diff --git a/gradle.properties b/gradle.properties index 3cd98a452..38a8b72c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,12 +5,12 @@ minecraft_version=1.16.5 archives_base_name=DistantHorizons mod_version=1.6.0a-pre maven_group=com.seibel.lod -toml_version=3.6.0 +toml_version=3.6.4 # Mod info mod_name=Distant Horizons mod_description=This mod generates and renders simplified terrain beyond the normal view distance at a low performance cost. Allowing you to see much farther without turning your game into a slideshow. -mod_authors=James Seibel, Leonardo Amato, Cola, coolGi2007, Ran +mod_authors=James Seibel, Leonardo Amato, Cola, coolGi2007, Ran, LeeTom # Fabric loader fabric_loader_version=0.12.3