Cleaned up gradle and temporarily commented out the experimental generator till leetom adds it back

This commit is contained in:
coolGi2007
2022-01-30 16:14:26 +10:30
parent b79f47886f
commit f5f913d717
5 changed files with 15 additions and 16 deletions
-1
View File
@@ -30,5 +30,4 @@ publishing {
dependencies {
implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}
}
@@ -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);
// }
}
+4 -4
View File
@@ -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
+4 -4
View File
@@ -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'
+2 -2
View File
@@ -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