diff --git a/.gitignore b/.gitignore index 08a84962..372ca995 100644 --- a/.gitignore +++ b/.gitignore @@ -16,10 +16,12 @@ out # gradle build .gradle +.kotlin # other eclipse run +runs # Files from Forge MDK forge*changelog.txt diff --git a/build.gradle.kts b/build.gradle.kts index 68ae580e..cbe70645 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,322 +1,51 @@ -import net.darkhax.curseforgegradle.Constants -import net.darkhax.curseforgegradle.TaskPublishCurseForge -import java.time.LocalDateTime - -val mod_id: String by extra -val mod_name: String by extra -val mod_author: String by extra -val release_type: String by extra - -val repository: String by extra -val maven_group: String by extra -val modrinth_project: String by extra -val curseforge_project: String by extra - -val minecraft_version: String by extra -val forge_version: String by extra -val blueprint_version: String by extra -val mixin_version: String by extra -val mixin_extras_version: String by extra -val supplementaries_version: String by extra -val amendments_version: String by extra -val moonlight_lib_version: String by extra -val oreganized_version: String by extra -val dye_depot_version: String by extra -val jei_version: String by extra -val galena_hats_version: String by extra - -val mod_version = System.getenv("RELEASE_VERSION") ?: extra["mod_version"] as String - plugins { - java - `maven-publish` - id("net.minecraftforge.gradle") version "[6.0,6.2)" - id("org.spongepowered.mixin") version "0.7-SNAPSHOT" - id("org.parchmentmc.librarian.forgegradle") version "1.+" - id("com.diffplug.spotless") version "7.0.4" - id("org.sonarqube") version "6.2.0.5505" - id("com.modrinth.minotaur") version "2.+" - id("net.darkhax.curseforgegradle") version "1.1.15" -} - -base { - archivesName.set("$mod_name $minecraft_version") -} - -mixin { - add(sourceSets.main.get(), "${mod_id}.refmap.json") - config("${mod_id}.mixins.json") -} - -java { - toolchain.languageVersion = JavaLanguageVersion.of(17) - withSourcesJar() + id("com.possible-triangle.core") + id("com.possible-triangle.architectury") apply false + id("com.possible-triangle.forge") apply false + id("com.possible-triangle.fabric") apply false } -minecraft { - mappings("parchment", "2023.09.03-1.20.1") +subprojects { + apply(plugin = "com.possible-triangle.core") - accessTransformer(file("src/main/resources/META-INF/accesstransformer.cfg")) - - runs { - create("client") { - taskName("Client") - } - - create("server") { - taskName("Server") - } - - create("data") { - args( - "--mod", - mod_id, - "--all", - "--output", - project.file("src/generated/resources/"), - "--existing", - project.file("src/main/resources/"), - "--existing-mod", - "blueprint" - ) - taskName("Data") - } - - forEach { - it.workingDirectory(project.file("run")) - it.args("-mixin.config=${mod_id}.mixins.json") - it.mods.create(mod_id) { - source(sourceSets.main.get()) + repositories { + maven { + url = uri("https://maven.blamejared.com/") + content { + includeGroup("mezz.jei") } } - } -} - -sourceSets.main.get().resources { - srcDir("src/generated/resources") -} - -repositories { - mavenLocal() - - maven { - url = uri("https://maven.teamabnormals.com/") - content { - includeGroup("com.teamabnormals") - } - } - maven { - url = uri("https://modmaven.dev") - content { - includeGroup("mezz.jei") - } - } - maven { - url = uri("https://api.modrinth.com/maven") - content { - includeGroup("maven.modrinth") + nexus { + content { + includeGroup("com.possible-triangle") + includeGroup("dev.galena") + includeGroup("net.mehvahdjukaar") + includeGroup("com.ninni.dye_depot") + } } - } - maven { - url = uri("https://registry.somethingcatchy.net/repository/maven-releases/") - content { - includeGroup("dev.galena") + maven { + url = uri("https://maven.teamabnormals.com/") + content { + includeGroup("com.teamabnormals") + } } } -} - -dependencies { - minecraft("net.minecraftforge:forge:${minecraft_version}-${forge_version}") - implementation(fg.deobf("com.teamabnormals:blueprint:${minecraft_version}-${blueprint_version}")) - annotationProcessor("org.spongepowered:mixin:${mixin_version}:processor") - compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${mixin_extras_version}")!!) - implementation(jarJar("io.github.llamalad7:mixinextras-forge:${mixin_extras_version}")) { - jarJar.ranged(this, "[${mixin_extras_version},)") - } - - val hatsVersion = "${minecraft_version}-${galena_hats_version}" - implementation(fg.deobf(jarJar("dev.galena:hats-forge:${hatsVersion}") { - version { - strictly("[${hatsVersion},)") - prefer(hatsVersion) + upload { + maven { + nexus() } - })) - - // Compatibilities - implementation(fg.deobf("maven.modrinth:supplementaries:${supplementaries_version}")) - implementation(fg.deobf("maven.modrinth:amendments:${amendments_version}")) - implementation(fg.deobf("maven.modrinth:moonlight:${moonlight_lib_version}")) - - // For dev testing - runtimeOnly(fg.deobf("dev.galena:oreganized:${oreganized_version}:slim")) - runtimeOnly(fg.deobf("maven.modrinth:dye-depot:${dye_depot_version}")) - - compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")) - compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")) - runtimeOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")) -} - - -tasks.jar { - archiveClassifier.set("slim") - finalizedBy("reobfJar") - val now = LocalDateTime.now().toString() - - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - from(rootProject.file("LICENSE")) { - rename { "${it}_${mod_name}" } - } - - manifest { - attributes( - mapOf( - "Specification-Title" to mod_name, - "Specification-Vendor" to mod_author, - "Specification-Version" to mod_version, - "Implementation-Title" to mod_name, - "Implementation-Version" to mod_version, - "Implementation-Vendor" to mod_author, - "Implementation-Timestamp" to now, - ) - ) - } -} - -tasks.withType { - // this will ensure that this task is redone when the versions change. - inputs.property("version", mod_version) - - filesMatching( - listOf( - "META-INF/mods.toml", - "META-INF/neoforge.mods.toml", - "pack.mcmeta", - "fabric.mod.json", - "${mod_id}*.mixins.json", - ) - ) { - expand( - mapOf( - "mod_version" to mod_version, - "mod_name" to mod_name, - "mod_id" to mod_id, - "mod_author" to mod_author, - "repository" to repository, - ) - ) - } -} - - -jarJar.enable() -tasks.jarJar { - archiveClassifier.set("") -} - -tasks.jar { - archiveClassifier.set("raw") - finalizedBy("reobfJar") -} - -publishing { - publications { - create("maven") { - groupId = maven_group - artifactId = mod_id - version = mod_version - - artifact(tasks.getByName("sourcesJar")) - artifact(tasks.jar) - artifact(tasks.jarJar) - - pom.withXml { - val node = asNode() - val list = node.get("dependencies") as groovy.util.NodeList - list.forEach { node.remove(it as groovy.util.Node) } - } - } - } - repositories { - mavenLocal() + forEach { + includeKotlinDependency = false - val nexusToken = System.getenv("NEXUS_TOKEN") - val nexusUser = System.getenv("NEXUS_USER") - if (nexusToken != null && nexusUser != null) { - maven { - url = uri("https://registry.somethingcatchy.net/repository/maven-releases/") - credentials { - username = nexusUser - password = nexusToken - } + dependencies { + required("moonlight") + optional("oreganized") } } } } -tasks.withType { - enabled = false -} - -spotless { - java { - importOrder() - removeUnusedImports() - } - - kotlinGradle { - ktlint() - suppressLintsFor { shortCode = "standard:property-naming" } - } - - json { - target("src/main/**/*.json") - gson().indentWithSpaces(2) - } -} - -sonar { - properties { - property("sonar.projectKey", mod_id) - property("sonar.gradle.skipCompile", "true") - property("sonar.links.scm", "https://github.com/${repository}") - } -} - -val outputJar = tasks.jarJar.get().archiveFile.get() -val changelogMarkdown = System.getenv("CHANGELOG") - -modrinth { - token = System.getenv("MODRINTH_TOKEN") - projectId = modrinth_project - versionNumber = mod_version - versionType = release_type - versionName = "$mod_name $mod_version" - uploadFile = outputJar - gameVersions = listOf(minecraft_version) - loaders = listOf("forge") - changelog = changelogMarkdown - - dependencies { - required.project("blueprint") - optional.project("oreganized") - } -} - -tasks.register("curseforge") { - group = "publishing" - - apiToken = System.getenv("CURSEFORGE_TOKEN") - upload(curseforge_project, outputJar).apply { - changelogType = Constants.CHANGELOG_MARKDOWN - changelog = changelogMarkdown - releaseType = release_type - addModLoader("forge") - addGameVersion(minecraft_version) - displayName = "$mod_name $mod_version" - - addRelation("382216", Constants.RELATION_REQUIRED) - addRelation("769203", Constants.RELATION_OPTIONAL) - } -} +enableSpotless() +enableSonarQube() diff --git a/common/build.gradle.kts b/common/build.gradle.kts new file mode 100644 index 00000000..0ac14e15 --- /dev/null +++ b/common/build.gradle.kts @@ -0,0 +1,16 @@ +plugins { + id("com.possible-triangle.architectury") +} + +common { + accessWidener() +} + +dependencies { + modApi(libs.moonlight.lib.common) { + isTransitive = false + } + + // TODO replace with common module + modImplementation(pack.forge.modrinth.amendments) +} diff --git a/common/src/generated/.gitignore b/common/src/generated/.gitignore new file mode 100644 index 00000000..1998c294 --- /dev/null +++ b/common/src/generated/.gitignore @@ -0,0 +1 @@ +.cache \ No newline at end of file diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/amber_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/amber_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/amber_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/amber_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/aqua_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/aqua_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/aqua_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/aqua_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/beige_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/beige_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/beige_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/beige_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/black_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/black_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/black_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/black_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/blue_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/blue_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/blue_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/blue_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/bone_pile.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/bone_pile.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/bone_pile.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/bone_pile.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/brown_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/brown_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/brown_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/brown_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/burial_dirt.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/burial_dirt.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/burial_dirt.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/burial_dirt.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/coral_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/coral_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/coral_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/coral_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/cracked_stone_tablet.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/cracked_stone_tablet.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/cracked_stone_tablet.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/cracked_stone_tablet.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/cyan_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/cyan_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/cyan_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/cyan_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/engraved_stone_tablet.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/engraved_stone_tablet.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/engraved_stone_tablet.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/engraved_stone_tablet.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/forest_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/forest_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/forest_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/forest_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/ginger_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/ginger_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/ginger_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/ginger_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/gray_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/gray_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/gray_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/gray_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/green_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/green_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/green_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/green_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/indigo_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/indigo_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/indigo_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/indigo_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/light_blue_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/light_blue_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/light_blue_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/light_blue_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/light_gray_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/light_gray_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/light_gray_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/light_gray_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/lime_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/lime_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/lime_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/lime_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/magenta_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/magenta_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/magenta_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/magenta_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/maroon_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/maroon_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/maroon_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/maroon_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/mint_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/mint_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/mint_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/mint_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/navy_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/navy_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/navy_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/navy_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/olive_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/olive_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/olive_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/olive_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/orange_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/orange_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/orange_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/orange_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/pink_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/pink_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/pink_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/pink_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/purple_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/purple_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/purple_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/purple_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/red_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/red_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/red_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/red_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/rose_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/rose_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/rose_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/rose_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/rotting_flesh.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/rotting_flesh.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/rotting_flesh.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/rotting_flesh.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/sepulcher.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/sepulcher.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/sepulcher.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/sepulcher.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/slate_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/slate_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/slate_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/slate_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/stone_tablet.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/stone_tablet.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/stone_tablet.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/stone_tablet.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/tan_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/tan_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/tan_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/tan_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/teal_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/teal_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/teal_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/teal_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/verdant_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/verdant_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/verdant_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/verdant_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/white_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/white_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/white_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/white_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/blockstates/yellow_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/blockstates/yellow_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/blockstates/yellow_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/blockstates/yellow_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/lang/en_us.json b/common/src/generated/resources/assets/doom_and_gloom/lang/en_us.json similarity index 97% rename from src/generated/resources/assets/doom_and_gloom/lang/en_us.json rename to common/src/generated/resources/assets/doom_and_gloom/lang/en_us.json index da11cc14..4ffacc74 100644 --- a/src/generated/resources/assets/doom_and_gloom/lang/en_us.json +++ b/common/src/generated/resources/assets/doom_and_gloom/lang/en_us.json @@ -43,9 +43,9 @@ "effect.doom_and_gloom.fog.description": "An eerie fog that accompanies the holler", "effect.doom_and_gloom.warding": "Warding", "effect.doom_and_gloom.warding.description": "Wards against evil spirits", - "entity.doom_and_gloom.dirt_mound": "Dirt Mound", - "entity.doom_and_gloom.holler": "Holler", "entity.minecraft.villager.doom_and_gloom.gravetender": "Gravetender", + "entity_type.doom_and_gloom.dirt_mound": "Dirt Mound", + "entity_type.doom_and_gloom.holler": "Holler", "gui.doom_and_gloom.stone_tablet.cancel": "Cancel", "gui.doom_and_gloom.stone_tablet.engrave": "Engrave", "item.doom_and_gloom.bush_hammer": "Bush Hammer", diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/amber_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/aqua_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/beige_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/black_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/blue_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/bone_pile.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/bone_pile.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/bone_pile.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/bone_pile.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/brown_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/burial_dirt.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/burial_dirt.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/burial_dirt.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/burial_dirt.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/coral_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cracked_stone_tablet.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cracked_stone_tablet.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cracked_stone_tablet.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cracked_stone_tablet.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cracked_stone_tablet_floor.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cracked_stone_tablet_floor.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cracked_stone_tablet_floor.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cracked_stone_tablet_floor.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cracked_stone_tablet_wall.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cracked_stone_tablet_wall.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cracked_stone_tablet_wall.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cracked_stone_tablet_wall.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/cyan_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/defaultvigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/engraved_stone_tablet.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/engraved_stone_tablet.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/engraved_stone_tablet.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/engraved_stone_tablet.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/engraved_stone_tablet_floor.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/engraved_stone_tablet_floor.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/engraved_stone_tablet_floor.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/engraved_stone_tablet_floor.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/engraved_stone_tablet_wall.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/engraved_stone_tablet_wall.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/engraved_stone_tablet_wall.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/engraved_stone_tablet_wall.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/forest_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/ginger_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/gray_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/green_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/indigo_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_blue_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/light_gray_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/lime_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/magenta_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/maroon_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/mint_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/navy_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/olive_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/orange_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/pink_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/purple_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/red_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rose_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/rotting_flesh.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/rotting_flesh.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/rotting_flesh.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/rotting_flesh.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_bones.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_bones.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_bones.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_bones.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_1.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_1.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_1.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_1.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_10.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_10.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_10.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_10.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_11.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_11.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_11.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_11.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_12.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_12.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_12.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_12.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_13.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_13.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_13.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_13.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_2.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_2.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_2.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_2.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_3.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_3.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_3.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_3.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_4.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_4.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_4.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_4.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_5.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_5.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_5.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_5.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_6.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_6.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_6.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_6.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_7.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_7.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_7.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_7.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_8.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_8.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_8.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_8.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_9.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_9.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_9.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_filled_9.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_rotting_1.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_rotting_1.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_rotting_1.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_rotting_1.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_rotting_2.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_rotting_2.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_rotting_2.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_rotting_2.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_rotting_3.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_rotting_3.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_rotting_3.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_rotting_3.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_rotting_4.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_rotting_4.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_rotting_4.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/sepulcher_rotting_4.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/slate_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/stone_tablet.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/stone_tablet.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/stone_tablet.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/stone_tablet.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/stone_tablet_floor.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/stone_tablet_floor.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/stone_tablet_floor.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/stone_tablet_floor.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/stone_tablet_wall.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/stone_tablet_wall.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/stone_tablet_wall.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/stone_tablet_wall.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/tan_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/teal_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/verdant_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/white_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_double.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_double.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_double.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_double.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_double_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_double_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_double_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_double_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_double_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_double_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_double_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_double_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_double_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_double_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_double_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_double_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_quadruple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_quadruple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_quadruple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_quadruple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_quadruple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_quadruple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_quadruple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_quadruple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_quadruple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_quadruple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_quadruple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_quadruple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_quadruple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_quadruple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_quadruple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_single.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_single.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_single.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_single.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_single_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_single_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_single_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_single_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_single_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_single_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_single_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_single_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_single_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_single_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_single_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_single_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_triple.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_triple.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_triple.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_triple.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_triple_ceiling.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_triple_ceiling.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_triple_ceiling.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_triple_ceiling_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_triple_ceiling_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_triple_ceiling_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_triple_ceiling_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_triple_lit.json b/common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_triple_lit.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_triple_lit.json rename to common/src/generated/resources/assets/doom_and_gloom/models/block/yellow_vigil_candle_triple_lit.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/amber_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/amber_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/amber_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/amber_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/aqua_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/aqua_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/aqua_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/aqua_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/beige_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/beige_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/beige_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/beige_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/black_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/black_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/black_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/black_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/blue_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/blue_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/blue_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/blue_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/bone_pile.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/bone_pile.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/bone_pile.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/bone_pile.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/brown_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/brown_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/brown_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/brown_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/burial_dirt.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/burial_dirt.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/burial_dirt.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/burial_dirt.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/bush_hammer.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/bush_hammer.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/bush_hammer.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/bush_hammer.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/coral_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/coral_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/coral_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/coral_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/cracked_stone_tablet.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/cracked_stone_tablet.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/cracked_stone_tablet.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/cracked_stone_tablet.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/cyan_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/cyan_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/cyan_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/cyan_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/engraved_stone_tablet.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/engraved_stone_tablet.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/engraved_stone_tablet.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/engraved_stone_tablet.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/forest_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/forest_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/forest_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/forest_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/ginger_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/ginger_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/ginger_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/ginger_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/gray_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/gray_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/gray_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/gray_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/green_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/green_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/green_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/green_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/hammer_and_chisel.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/hammer_and_chisel.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/hammer_and_chisel.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/hammer_and_chisel.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/holler_spawn_egg.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/holler_spawn_egg.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/holler_spawn_egg.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/holler_spawn_egg.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/indigo_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/indigo_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/indigo_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/indigo_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/light_blue_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/light_blue_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/light_blue_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/light_blue_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/light_gray_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/light_gray_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/light_gray_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/light_gray_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/lime_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/lime_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/lime_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/lime_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/magenta_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/magenta_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/magenta_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/magenta_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/maroon_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/maroon_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/maroon_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/maroon_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/mint_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/mint_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/mint_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/mint_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/music_disc_afterlife.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/music_disc_afterlife.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/music_disc_afterlife.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/music_disc_afterlife.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/navy_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/navy_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/navy_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/navy_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/olive_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/olive_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/olive_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/olive_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/orange_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/orange_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/orange_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/orange_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/pink_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/pink_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/pink_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/pink_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/purple_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/purple_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/purple_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/purple_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/red_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/red_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/red_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/red_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/rose_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/rose_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/rose_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/rose_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/sepulcher.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/sepulcher.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/sepulcher.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/sepulcher.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/slate_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/slate_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/slate_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/slate_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/stone_tablet.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/stone_tablet.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/stone_tablet.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/stone_tablet.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/tan_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/tan_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/tan_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/tan_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/teal_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/teal_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/teal_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/teal_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/verdant_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/verdant_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/verdant_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/verdant_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/white_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/white_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/white_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/white_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/models/item/yellow_vigil_candle.json b/common/src/generated/resources/assets/doom_and_gloom/models/item/yellow_vigil_candle.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/models/item/yellow_vigil_candle.json rename to common/src/generated/resources/assets/doom_and_gloom/models/item/yellow_vigil_candle.json diff --git a/src/generated/resources/assets/doom_and_gloom/sounds.json b/common/src/generated/resources/assets/doom_and_gloom/sounds.json similarity index 100% rename from src/generated/resources/assets/doom_and_gloom/sounds.json rename to common/src/generated/resources/assets/doom_and_gloom/sounds.json diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/amber.json b/common/src/generated/resources/data/c/tags/blocks/dyed/amber.json new file mode 100644 index 00000000..8956aabd --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/amber.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:amber_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/aqua.json b/common/src/generated/resources/data/c/tags/blocks/dyed/aqua.json new file mode 100644 index 00000000..f22d06c7 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/aqua.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:aqua_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/beige.json b/common/src/generated/resources/data/c/tags/blocks/dyed/beige.json new file mode 100644 index 00000000..f694e878 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/beige.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:beige_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/black.json b/common/src/generated/resources/data/c/tags/blocks/dyed/black.json new file mode 100644 index 00000000..f869c189 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/black.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:black_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/blue.json b/common/src/generated/resources/data/c/tags/blocks/dyed/blue.json new file mode 100644 index 00000000..4798d1f7 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/blue.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:blue_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/brown.json b/common/src/generated/resources/data/c/tags/blocks/dyed/brown.json new file mode 100644 index 00000000..1d58550b --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/brown.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:brown_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/coral.json b/common/src/generated/resources/data/c/tags/blocks/dyed/coral.json new file mode 100644 index 00000000..65fc5499 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/coral.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:coral_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/cyan.json b/common/src/generated/resources/data/c/tags/blocks/dyed/cyan.json new file mode 100644 index 00000000..8aa9fa9d --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/cyan.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:cyan_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/forest.json b/common/src/generated/resources/data/c/tags/blocks/dyed/forest.json new file mode 100644 index 00000000..9d2fdd35 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/forest.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:forest_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/ginger.json b/common/src/generated/resources/data/c/tags/blocks/dyed/ginger.json new file mode 100644 index 00000000..eb4b414f --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/ginger.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:ginger_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/gray.json b/common/src/generated/resources/data/c/tags/blocks/dyed/gray.json new file mode 100644 index 00000000..88c273a0 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/gray.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:gray_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/green.json b/common/src/generated/resources/data/c/tags/blocks/dyed/green.json new file mode 100644 index 00000000..e0caeae8 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/green.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:green_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/indigo.json b/common/src/generated/resources/data/c/tags/blocks/dyed/indigo.json new file mode 100644 index 00000000..1365bec5 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/indigo.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:indigo_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/light_blue.json b/common/src/generated/resources/data/c/tags/blocks/dyed/light_blue.json new file mode 100644 index 00000000..ddea3cbb --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/light_blue.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:light_blue_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/light_gray.json b/common/src/generated/resources/data/c/tags/blocks/dyed/light_gray.json new file mode 100644 index 00000000..8ee6714a --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/light_gray.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:light_gray_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/lime.json b/common/src/generated/resources/data/c/tags/blocks/dyed/lime.json new file mode 100644 index 00000000..0669f47a --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/lime.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:lime_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/magenta.json b/common/src/generated/resources/data/c/tags/blocks/dyed/magenta.json new file mode 100644 index 00000000..c3bc6d74 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/magenta.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:magenta_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/maroon.json b/common/src/generated/resources/data/c/tags/blocks/dyed/maroon.json new file mode 100644 index 00000000..565a9cf1 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/maroon.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:maroon_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/mint.json b/common/src/generated/resources/data/c/tags/blocks/dyed/mint.json new file mode 100644 index 00000000..aef97a2e --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/mint.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:mint_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/navy.json b/common/src/generated/resources/data/c/tags/blocks/dyed/navy.json new file mode 100644 index 00000000..8ca479f9 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/navy.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:navy_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/olive.json b/common/src/generated/resources/data/c/tags/blocks/dyed/olive.json new file mode 100644 index 00000000..3013ec61 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/olive.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:olive_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/orange.json b/common/src/generated/resources/data/c/tags/blocks/dyed/orange.json new file mode 100644 index 00000000..e153a95c --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/orange.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:orange_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/pink.json b/common/src/generated/resources/data/c/tags/blocks/dyed/pink.json new file mode 100644 index 00000000..4d60fb12 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/pink.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:pink_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/purple.json b/common/src/generated/resources/data/c/tags/blocks/dyed/purple.json new file mode 100644 index 00000000..bc250e18 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/purple.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:purple_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/red.json b/common/src/generated/resources/data/c/tags/blocks/dyed/red.json new file mode 100644 index 00000000..456da6d0 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/red.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:red_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/rose.json b/common/src/generated/resources/data/c/tags/blocks/dyed/rose.json new file mode 100644 index 00000000..76d203d4 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/rose.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:rose_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/slate.json b/common/src/generated/resources/data/c/tags/blocks/dyed/slate.json new file mode 100644 index 00000000..39eefdcb --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/slate.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:slate_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/tan.json b/common/src/generated/resources/data/c/tags/blocks/dyed/tan.json new file mode 100644 index 00000000..a7425362 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/tan.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:tan_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/teal.json b/common/src/generated/resources/data/c/tags/blocks/dyed/teal.json new file mode 100644 index 00000000..596bb806 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/teal.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:teal_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/verdant.json b/common/src/generated/resources/data/c/tags/blocks/dyed/verdant.json new file mode 100644 index 00000000..fad7af1c --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/verdant.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:verdant_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/white.json b/common/src/generated/resources/data/c/tags/blocks/dyed/white.json new file mode 100644 index 00000000..d015d4cd --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/white.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:white_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/blocks/dyed/yellow.json b/common/src/generated/resources/data/c/tags/blocks/dyed/yellow.json new file mode 100644 index 00000000..d4d08ac3 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/blocks/dyed/yellow.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:yellow_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/amber.json b/common/src/generated/resources/data/c/tags/items/dyed/amber.json new file mode 100644 index 00000000..8956aabd --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/amber.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:amber_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/aqua.json b/common/src/generated/resources/data/c/tags/items/dyed/aqua.json new file mode 100644 index 00000000..f22d06c7 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/aqua.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:aqua_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/beige.json b/common/src/generated/resources/data/c/tags/items/dyed/beige.json new file mode 100644 index 00000000..f694e878 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/beige.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:beige_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/black.json b/common/src/generated/resources/data/c/tags/items/dyed/black.json new file mode 100644 index 00000000..f869c189 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/black.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:black_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/blue.json b/common/src/generated/resources/data/c/tags/items/dyed/blue.json new file mode 100644 index 00000000..4798d1f7 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/blue.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:blue_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/brown.json b/common/src/generated/resources/data/c/tags/items/dyed/brown.json new file mode 100644 index 00000000..1d58550b --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/brown.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:brown_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/coral.json b/common/src/generated/resources/data/c/tags/items/dyed/coral.json new file mode 100644 index 00000000..65fc5499 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/coral.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:coral_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/cyan.json b/common/src/generated/resources/data/c/tags/items/dyed/cyan.json new file mode 100644 index 00000000..8aa9fa9d --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/cyan.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:cyan_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/forest.json b/common/src/generated/resources/data/c/tags/items/dyed/forest.json new file mode 100644 index 00000000..9d2fdd35 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/forest.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:forest_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/ginger.json b/common/src/generated/resources/data/c/tags/items/dyed/ginger.json new file mode 100644 index 00000000..eb4b414f --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/ginger.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:ginger_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/gray.json b/common/src/generated/resources/data/c/tags/items/dyed/gray.json new file mode 100644 index 00000000..88c273a0 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/gray.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:gray_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/green.json b/common/src/generated/resources/data/c/tags/items/dyed/green.json new file mode 100644 index 00000000..e0caeae8 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/green.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:green_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/indigo.json b/common/src/generated/resources/data/c/tags/items/dyed/indigo.json new file mode 100644 index 00000000..1365bec5 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/indigo.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:indigo_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/light_blue.json b/common/src/generated/resources/data/c/tags/items/dyed/light_blue.json new file mode 100644 index 00000000..ddea3cbb --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/light_blue.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:light_blue_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/light_gray.json b/common/src/generated/resources/data/c/tags/items/dyed/light_gray.json new file mode 100644 index 00000000..8ee6714a --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/light_gray.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:light_gray_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/lime.json b/common/src/generated/resources/data/c/tags/items/dyed/lime.json new file mode 100644 index 00000000..0669f47a --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/lime.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:lime_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/magenta.json b/common/src/generated/resources/data/c/tags/items/dyed/magenta.json new file mode 100644 index 00000000..c3bc6d74 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/magenta.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:magenta_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/maroon.json b/common/src/generated/resources/data/c/tags/items/dyed/maroon.json new file mode 100644 index 00000000..565a9cf1 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/maroon.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:maroon_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/mint.json b/common/src/generated/resources/data/c/tags/items/dyed/mint.json new file mode 100644 index 00000000..aef97a2e --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/mint.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:mint_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/navy.json b/common/src/generated/resources/data/c/tags/items/dyed/navy.json new file mode 100644 index 00000000..8ca479f9 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/navy.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:navy_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/olive.json b/common/src/generated/resources/data/c/tags/items/dyed/olive.json new file mode 100644 index 00000000..3013ec61 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/olive.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:olive_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/orange.json b/common/src/generated/resources/data/c/tags/items/dyed/orange.json new file mode 100644 index 00000000..e153a95c --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/orange.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:orange_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/pink.json b/common/src/generated/resources/data/c/tags/items/dyed/pink.json new file mode 100644 index 00000000..4d60fb12 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/pink.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:pink_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/purple.json b/common/src/generated/resources/data/c/tags/items/dyed/purple.json new file mode 100644 index 00000000..bc250e18 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/purple.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:purple_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/red.json b/common/src/generated/resources/data/c/tags/items/dyed/red.json new file mode 100644 index 00000000..456da6d0 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/red.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:red_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/rose.json b/common/src/generated/resources/data/c/tags/items/dyed/rose.json new file mode 100644 index 00000000..76d203d4 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/rose.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:rose_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/slate.json b/common/src/generated/resources/data/c/tags/items/dyed/slate.json new file mode 100644 index 00000000..39eefdcb --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/slate.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:slate_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/tan.json b/common/src/generated/resources/data/c/tags/items/dyed/tan.json new file mode 100644 index 00000000..a7425362 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/tan.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:tan_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/teal.json b/common/src/generated/resources/data/c/tags/items/dyed/teal.json new file mode 100644 index 00000000..596bb806 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/teal.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:teal_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/verdant.json b/common/src/generated/resources/data/c/tags/items/dyed/verdant.json new file mode 100644 index 00000000..fad7af1c --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/verdant.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:verdant_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/white.json b/common/src/generated/resources/data/c/tags/items/dyed/white.json new file mode 100644 index 00000000..d015d4cd --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/white.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:white_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/dyed/yellow.json b/common/src/generated/resources/data/c/tags/items/dyed/yellow.json new file mode 100644 index 00000000..d4d08ac3 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/dyed/yellow.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "doom_and_gloom:yellow_vigil_candle", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/ingots/lead.json b/common/src/generated/resources/data/c/tags/items/ingots/lead.json new file mode 100644 index 00000000..199586db --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/ingots/lead.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#forge:ingots/lead", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/generated/resources/data/c/tags/items/ingots/silver.json b/common/src/generated/resources/data/c/tags/items/ingots/silver.json new file mode 100644 index 00000000..33461383 --- /dev/null +++ b/common/src/generated/resources/data/c/tags/items/ingots/silver.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#forge:ingots/silver", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/amber_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/amber_vigil_candle.json similarity index 68% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/amber_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/amber_vigil_candle.json index c574853e..120a6495 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/amber_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/amber_vigil_candle.json @@ -1,11 +1,17 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_silver": { "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, @@ -18,6 +24,14 @@ "trigger": "minecraft:recipe_unlocked" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_silver", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/amber_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/amber_vigil_candle_dyeing.json similarity index 74% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/amber_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/amber_vigil_candle_dyeing.json index 05488fef..2d6ff3bd 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/amber_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/amber_vigil_candle_dyeing.json @@ -1,5 +1,11 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_the_recipe": { "conditions": { @@ -20,6 +26,14 @@ "trigger": "minecraft:inventory_changed" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_vigil_candle", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/aqua_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/aqua_vigil_candle.json similarity index 68% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/aqua_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/aqua_vigil_candle.json index d9237b68..eea3f424 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/aqua_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/aqua_vigil_candle.json @@ -1,11 +1,17 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_silver": { "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, @@ -18,6 +24,14 @@ "trigger": "minecraft:recipe_unlocked" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_silver", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/aqua_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/aqua_vigil_candle_dyeing.json similarity index 74% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/aqua_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/aqua_vigil_candle_dyeing.json index c576088b..f381bfb5 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/aqua_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/aqua_vigil_candle_dyeing.json @@ -1,5 +1,11 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_the_recipe": { "conditions": { @@ -20,6 +26,14 @@ "trigger": "minecraft:inventory_changed" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_vigil_candle", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/beige_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/beige_vigil_candle.json similarity index 68% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/beige_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/beige_vigil_candle.json index 80d0dcf8..f6a09fbc 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/beige_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/beige_vigil_candle.json @@ -1,11 +1,17 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_silver": { "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, @@ -18,6 +24,14 @@ "trigger": "minecraft:recipe_unlocked" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_silver", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/beige_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/beige_vigil_candle_dyeing.json similarity index 74% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/beige_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/beige_vigil_candle_dyeing.json index 7720c707..29b45d15 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/beige_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/beige_vigil_candle_dyeing.json @@ -1,5 +1,11 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_the_recipe": { "conditions": { @@ -20,6 +26,14 @@ "trigger": "minecraft:inventory_changed" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_vigil_candle", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/black_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/black_vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/black_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/black_vigil_candle.json index 4422174a..305025e8 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/black_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/black_vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/black_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/black_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/black_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/black_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/blue_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/blue_vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/blue_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/blue_vigil_candle.json index d5379980..e634d30e 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/blue_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/blue_vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/blue_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/blue_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/blue_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/blue_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/bone_pile.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/bone_pile.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/bone_pile.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/bone_pile.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/brown_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/brown_vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/brown_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/brown_vigil_candle.json index 5856d4e4..f0f202b6 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/brown_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/brown_vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/brown_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/brown_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/brown_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/brown_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/coral_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/coral_vigil_candle.json similarity index 68% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/coral_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/coral_vigil_candle.json index e545bdef..cd696dd6 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/coral_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/coral_vigil_candle.json @@ -1,11 +1,17 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_silver": { "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, @@ -18,6 +24,14 @@ "trigger": "minecraft:recipe_unlocked" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_silver", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/coral_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/coral_vigil_candle_dyeing.json similarity index 74% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/coral_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/coral_vigil_candle_dyeing.json index c75c54cd..04fd03d2 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/coral_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/coral_vigil_candle_dyeing.json @@ -1,5 +1,11 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_the_recipe": { "conditions": { @@ -20,6 +26,14 @@ "trigger": "minecraft:inventory_changed" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_vigil_candle", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/cyan_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/cyan_vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/cyan_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/cyan_vigil_candle.json index 2abbe919..b0142d05 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/cyan_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/cyan_vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/cyan_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/cyan_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/cyan_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/cyan_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/forest_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/forest_vigil_candle.json similarity index 68% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/forest_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/forest_vigil_candle.json index c761756a..7f667005 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/forest_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/forest_vigil_candle.json @@ -1,11 +1,17 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_silver": { "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, @@ -18,6 +24,14 @@ "trigger": "minecraft:recipe_unlocked" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_silver", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/forest_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/forest_vigil_candle_dyeing.json similarity index 74% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/forest_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/forest_vigil_candle_dyeing.json index 8ed9fba4..bccea18f 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/forest_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/forest_vigil_candle_dyeing.json @@ -1,5 +1,11 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_the_recipe": { "conditions": { @@ -20,6 +26,14 @@ "trigger": "minecraft:inventory_changed" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_vigil_candle", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/ginger_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/ginger_vigil_candle.json similarity index 68% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/ginger_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/ginger_vigil_candle.json index a3eeb2c8..3c3b1cfb 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/ginger_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/ginger_vigil_candle.json @@ -1,11 +1,17 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_silver": { "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, @@ -18,6 +24,14 @@ "trigger": "minecraft:recipe_unlocked" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_silver", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/ginger_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/ginger_vigil_candle_dyeing.json similarity index 74% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/ginger_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/ginger_vigil_candle_dyeing.json index c4e8d970..2a59509c 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/ginger_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/ginger_vigil_candle_dyeing.json @@ -1,5 +1,11 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_the_recipe": { "conditions": { @@ -20,6 +26,14 @@ "trigger": "minecraft:inventory_changed" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_vigil_candle", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/gray_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/gray_vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/gray_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/gray_vigil_candle.json index ae9117da..8ca63372 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/gray_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/gray_vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/gray_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/gray_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/gray_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/gray_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/green_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/green_vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/green_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/green_vigil_candle.json index 44882d38..159c3811 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/green_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/green_vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/green_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/green_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/green_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/green_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/indigo_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/indigo_vigil_candle.json similarity index 68% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/indigo_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/indigo_vigil_candle.json index 7fcd368f..58fb170d 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/indigo_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/indigo_vigil_candle.json @@ -1,11 +1,17 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_silver": { "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, @@ -18,6 +24,14 @@ "trigger": "minecraft:recipe_unlocked" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_silver", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/indigo_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/indigo_vigil_candle_dyeing.json similarity index 74% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/indigo_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/indigo_vigil_candle_dyeing.json index a1866b04..1213431e 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/indigo_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/indigo_vigil_candle_dyeing.json @@ -1,5 +1,11 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_the_recipe": { "conditions": { @@ -20,6 +26,14 @@ "trigger": "minecraft:inventory_changed" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_vigil_candle", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_blue_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_blue_vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_blue_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_blue_vigil_candle.json index 73124af5..066a17f8 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_blue_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_blue_vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_blue_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_blue_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_blue_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_blue_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_gray_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_gray_vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_gray_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_gray_vigil_candle.json index 05f93b07..1fa47f49 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_gray_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_gray_vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_gray_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_gray_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_gray_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/light_gray_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/lime_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/lime_vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/lime_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/lime_vigil_candle.json index 8bebe3e9..5bcfc721 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/lime_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/lime_vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/lime_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/lime_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/lime_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/lime_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/magenta_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/magenta_vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/magenta_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/magenta_vigil_candle.json index 34c43fe8..7d0dfa03 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/magenta_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/magenta_vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/magenta_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/magenta_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/magenta_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/magenta_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/maroon_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/maroon_vigil_candle.json similarity index 68% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/maroon_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/maroon_vigil_candle.json index d7b2dc6f..bd5da110 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/maroon_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/maroon_vigil_candle.json @@ -1,11 +1,17 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_silver": { "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, @@ -18,6 +24,14 @@ "trigger": "minecraft:recipe_unlocked" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_silver", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/maroon_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/maroon_vigil_candle_dyeing.json similarity index 74% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/maroon_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/maroon_vigil_candle_dyeing.json index 56cdaabd..065def41 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/maroon_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/maroon_vigil_candle_dyeing.json @@ -1,5 +1,11 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_the_recipe": { "conditions": { @@ -20,6 +26,14 @@ "trigger": "minecraft:inventory_changed" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_vigil_candle", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/mint_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/mint_vigil_candle.json similarity index 68% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/mint_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/mint_vigil_candle.json index 3c152b28..b247afa5 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/mint_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/mint_vigil_candle.json @@ -1,11 +1,17 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_silver": { "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, @@ -18,6 +24,14 @@ "trigger": "minecraft:recipe_unlocked" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_silver", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/mint_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/mint_vigil_candle_dyeing.json similarity index 74% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/mint_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/mint_vigil_candle_dyeing.json index 59e652e6..092cd8bc 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/mint_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/mint_vigil_candle_dyeing.json @@ -1,5 +1,11 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_the_recipe": { "conditions": { @@ -20,6 +26,14 @@ "trigger": "minecraft:inventory_changed" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_vigil_candle", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/navy_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/navy_vigil_candle.json similarity index 68% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/navy_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/navy_vigil_candle.json index 22cdf86d..6bbbdde8 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/navy_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/navy_vigil_candle.json @@ -1,11 +1,17 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_silver": { "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, @@ -18,6 +24,14 @@ "trigger": "minecraft:recipe_unlocked" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_silver", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/navy_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/navy_vigil_candle_dyeing.json similarity index 74% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/navy_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/navy_vigil_candle_dyeing.json index 935ab67c..ea054b54 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/navy_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/navy_vigil_candle_dyeing.json @@ -1,5 +1,11 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_the_recipe": { "conditions": { @@ -20,6 +26,14 @@ "trigger": "minecraft:inventory_changed" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_vigil_candle", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/olive_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/olive_vigil_candle.json similarity index 68% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/olive_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/olive_vigil_candle.json index 22bfa445..50701eb4 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/olive_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/olive_vigil_candle.json @@ -1,11 +1,17 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_silver": { "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, @@ -18,6 +24,14 @@ "trigger": "minecraft:recipe_unlocked" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_silver", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/olive_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/olive_vigil_candle_dyeing.json similarity index 74% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/olive_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/olive_vigil_candle_dyeing.json index c33fc194..4cee7132 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/olive_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/olive_vigil_candle_dyeing.json @@ -1,5 +1,11 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_the_recipe": { "conditions": { @@ -20,6 +26,14 @@ "trigger": "minecraft:inventory_changed" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_vigil_candle", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/orange_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/orange_vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/orange_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/orange_vigil_candle.json index 539058ec..3cb81827 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/orange_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/orange_vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/orange_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/orange_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/orange_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/orange_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/pink_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/pink_vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/pink_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/pink_vigil_candle.json index c14f8809..a99a1636 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/pink_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/pink_vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/pink_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/pink_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/pink_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/pink_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/purple_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/purple_vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/purple_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/purple_vigil_candle.json index bbe9c95e..c8b31b14 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/purple_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/purple_vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/purple_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/purple_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/purple_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/purple_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/red_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/red_vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/red_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/red_vigil_candle.json index 95a5295f..05176086 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/red_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/red_vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/red_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/red_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/red_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/red_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/rose_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/rose_vigil_candle.json similarity index 68% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/rose_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/rose_vigil_candle.json index b7addc07..ec9c039c 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/rose_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/rose_vigil_candle.json @@ -1,11 +1,17 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_silver": { "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, @@ -18,6 +24,14 @@ "trigger": "minecraft:recipe_unlocked" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_silver", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/rose_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/rose_vigil_candle_dyeing.json similarity index 74% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/rose_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/rose_vigil_candle_dyeing.json index 12c73ff8..f38c7b9d 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/rose_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/rose_vigil_candle_dyeing.json @@ -1,5 +1,11 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_the_recipe": { "conditions": { @@ -20,6 +26,14 @@ "trigger": "minecraft:inventory_changed" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_vigil_candle", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/slate_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/slate_vigil_candle.json similarity index 68% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/slate_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/slate_vigil_candle.json index fcefb79e..d8fe4767 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/slate_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/slate_vigil_candle.json @@ -1,11 +1,17 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_silver": { "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, @@ -18,6 +24,14 @@ "trigger": "minecraft:recipe_unlocked" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_silver", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/slate_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/slate_vigil_candle_dyeing.json similarity index 74% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/slate_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/slate_vigil_candle_dyeing.json index f5d751af..b104f8dc 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/slate_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/slate_vigil_candle_dyeing.json @@ -1,5 +1,11 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_the_recipe": { "conditions": { @@ -20,6 +26,14 @@ "trigger": "minecraft:inventory_changed" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_vigil_candle", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/tan_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/tan_vigil_candle.json similarity index 67% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/tan_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/tan_vigil_candle.json index 0db12185..b287eaed 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/tan_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/tan_vigil_candle.json @@ -1,11 +1,17 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_silver": { "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, @@ -18,6 +24,14 @@ "trigger": "minecraft:recipe_unlocked" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_silver", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/tan_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/tan_vigil_candle_dyeing.json similarity index 74% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/tan_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/tan_vigil_candle_dyeing.json index e113f550..75bbd65a 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/tan_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/tan_vigil_candle_dyeing.json @@ -1,5 +1,11 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_the_recipe": { "conditions": { @@ -20,6 +26,14 @@ "trigger": "minecraft:inventory_changed" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_vigil_candle", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/teal_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/teal_vigil_candle.json similarity index 68% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/teal_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/teal_vigil_candle.json index f4183ffd..8a0da173 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/teal_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/teal_vigil_candle.json @@ -1,11 +1,17 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_silver": { "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, @@ -18,6 +24,14 @@ "trigger": "minecraft:recipe_unlocked" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_silver", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/teal_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/teal_vigil_candle_dyeing.json similarity index 74% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/teal_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/teal_vigil_candle_dyeing.json index ba1a68e9..f0bb09bf 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/teal_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/teal_vigil_candle_dyeing.json @@ -1,5 +1,11 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_the_recipe": { "conditions": { @@ -20,6 +26,14 @@ "trigger": "minecraft:inventory_changed" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_vigil_candle", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/verdant_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/verdant_vigil_candle.json similarity index 68% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/verdant_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/verdant_vigil_candle.json index 62fb6ea7..25226572 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/verdant_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/verdant_vigil_candle.json @@ -1,11 +1,17 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_silver": { "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, @@ -18,6 +24,14 @@ "trigger": "minecraft:recipe_unlocked" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_silver", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/verdant_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/verdant_vigil_candle_dyeing.json similarity index 74% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/verdant_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/verdant_vigil_candle_dyeing.json index 479b8109..c718d559 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/verdant_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/verdant_vigil_candle_dyeing.json @@ -1,5 +1,11 @@ { "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], "criteria": { "has_the_recipe": { "conditions": { @@ -20,6 +26,14 @@ "trigger": "minecraft:inventory_changed" } }, + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "requirements": [ [ "has_vigil_candle", diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/vigil_candle.json index d2478b5d..9520b4a1 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/white_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/white_vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/white_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/white_vigil_candle.json index 39b29ff7..119bca09 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/white_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/white_vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/white_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/white_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/white_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/white_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/yellow_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/yellow_vigil_candle.json similarity index 93% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/yellow_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/yellow_vigil_candle.json index a1c163c0..807f21ce 100644 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/yellow_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/yellow_vigil_candle.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } ] }, diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/yellow_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/yellow_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/yellow_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/advancements/recipes/building_blocks/yellow_vigil_candle_dyeing.json diff --git a/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/decorations/sepulcher.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/decorations/sepulcher.json new file mode 100644 index 00000000..e462a6a4 --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/decorations/sepulcher.json @@ -0,0 +1,50 @@ +{ + "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "c:ingots/silver" + } + } + ], + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "tag": "c:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "doom_and_gloom:sepulcher" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "fabric:load_conditions": [ + { + "condition": "fabric:tags_populated", + "values": [ + "c:ingots/silver" + ] + } + ], + "requirements": [ + [ + "has_ingredient", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "doom_and_gloom:sepulcher" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/decorations/sepulcher_fallback.json b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/decorations/sepulcher_fallback.json new file mode 100644 index 00000000..3e1ed56a --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/advancements/recipes/decorations/sepulcher_fallback.json @@ -0,0 +1,52 @@ +{ + "parent": "minecraft:recipes/root", + "conditions": [ + { + "type": "forge:tag_empty", + "tag": "c:ingots/silver" + } + ], + "criteria": { + "has_ingredient": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "doom_and_gloom:sepulcher_fallback" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "fabric:load_conditions": [ + { + "condition": "fabric:not", + "value": { + "condition": "fabric:tags_populated", + "values": [ + "c:ingots/silver" + ] + } + } + ], + "requirements": [ + [ + "has_ingredient", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "doom_and_gloom:sepulcher_fallback" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/amber_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/amber_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/amber_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/amber_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/aqua_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/aqua_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/aqua_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/aqua_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/beige_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/beige_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/beige_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/beige_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/black_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/black_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/black_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/black_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/blue_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/blue_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/blue_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/blue_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/bone_pile.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/bone_pile.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/bone_pile.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/bone_pile.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/brown_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/brown_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/brown_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/brown_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/burial_dirt.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/burial_dirt.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/burial_dirt.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/burial_dirt.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/coral_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/coral_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/coral_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/coral_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/cracked_stone_tablet.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/cracked_stone_tablet.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/cracked_stone_tablet.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/cracked_stone_tablet.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/cyan_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/cyan_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/cyan_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/cyan_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/engraved_stone_tablet.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/engraved_stone_tablet.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/engraved_stone_tablet.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/engraved_stone_tablet.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/forest_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/forest_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/forest_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/forest_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/ginger_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/ginger_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/ginger_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/ginger_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/gray_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/gray_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/gray_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/gray_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/green_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/green_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/green_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/green_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/indigo_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/indigo_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/indigo_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/indigo_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/light_blue_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/light_blue_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/light_blue_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/light_blue_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/light_gray_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/light_gray_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/light_gray_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/light_gray_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/lime_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/lime_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/lime_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/lime_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/magenta_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/magenta_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/magenta_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/magenta_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/maroon_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/maroon_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/maroon_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/maroon_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/mint_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/mint_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/mint_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/mint_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/navy_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/navy_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/navy_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/navy_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/olive_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/olive_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/olive_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/olive_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/orange_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/orange_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/orange_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/orange_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/pink_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/pink_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/pink_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/pink_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/purple_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/purple_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/purple_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/purple_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/red_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/red_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/red_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/red_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/rose_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/rose_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/rose_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/rose_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/rotting_flesh.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/rotting_flesh.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/rotting_flesh.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/rotting_flesh.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/sepulcher.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/sepulcher.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/sepulcher.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/sepulcher.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/slate_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/slate_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/slate_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/slate_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/stone_tablet.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/stone_tablet.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/stone_tablet.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/stone_tablet.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/tan_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/tan_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/tan_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/tan_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/teal_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/teal_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/teal_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/teal_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/verdant_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/verdant_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/verdant_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/verdant_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/white_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/white_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/white_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/white_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/yellow_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/yellow_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/blocks/yellow_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/blocks/yellow_vigil_candle.json diff --git a/src/generated/resources/data/doom_and_gloom/loot_tables/entities/holler.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/entities/holler.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/loot_tables/entities/holler.json rename to common/src/generated/resources/data/doom_and_gloom/loot_tables/entities/holler.json diff --git a/common/src/generated/resources/data/doom_and_gloom/loot_tables/inject/desert_pyramid_bone_pile.json b/common/src/generated/resources/data/doom_and_gloom/loot_tables/inject/desert_pyramid_bone_pile.json new file mode 100644 index 00000000..89efd6e5 --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/loot_tables/inject/desert_pyramid_bone_pile.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "chance": 0.2, + "condition": "minecraft:random_chance" + } + ], + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 3.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "doom_and_gloom:bone_pile" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "doom_and_gloom:inject/desert_pyramid_bone_pile" +} \ No newline at end of file diff --git a/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/buy_candles.json b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/buy_candles.json new file mode 100644 index 00000000..0e8b6e25 --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/buy_candles.json @@ -0,0 +1,13 @@ +{ + "type": "doom_and_gloom:buy_tag", + "count": 6, + "level": 3, + "max_trades": 12, + "offer": { + "Count": 2, + "id": "minecraft:emerald" + }, + "price": "minecraft:candles", + "price_multiplier": 0.2, + "xp": 2 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/buy_cornflower.json b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/buy_cornflower.json new file mode 100644 index 00000000..46efbf63 --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/buy_cornflower.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:simple", + "max_trades": 12, + "offer": { + "Count": 1, + "id": "minecraft:emerald" + }, + "price": { + "Count": 8, + "id": "minecraft:cornflower" + }, + "price_multiplier": 0.2, + "xp": 1 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/buy_lantern.json b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/buy_lantern.json new file mode 100644 index 00000000..2de4134d --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/buy_lantern.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:simple", + "level": 4, + "max_trades": 8, + "offer": { + "Count": 2, + "id": "minecraft:emerald" + }, + "price": { + "Count": 1, + "id": "minecraft:lantern" + }, + "price_multiplier": 0.2, + "xp": 15 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/buy_poppy.json b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/buy_poppy.json new file mode 100644 index 00000000..f1ae0512 --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/buy_poppy.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:simple", + "max_trades": 12, + "offer": { + "Count": 1, + "id": "minecraft:emerald" + }, + "price": { + "Count": 8, + "id": "minecraft:poppy" + }, + "price_multiplier": 0.2, + "xp": 1 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_enchanted_diamond_shovel.json b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_enchanted_diamond_shovel.json new file mode 100644 index 00000000..83628ba5 --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_enchanted_diamond_shovel.json @@ -0,0 +1,18 @@ +{ + "type": "doom_and_gloom:sell_enchanted", + "level": 5, + "max_trades": 3, + "offer": { + "Count": 1, + "id": "minecraft:diamond_shovel", + "tag": { + "Damage": 0 + } + }, + "price": { + "Count": 13, + "id": "minecraft:emerald" + }, + "price_multiplier": 0.2, + "xp": 30 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_enchanted_iron_shovel.json b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_enchanted_iron_shovel.json new file mode 100644 index 00000000..e0ef6f7c --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_enchanted_iron_shovel.json @@ -0,0 +1,18 @@ +{ + "type": "doom_and_gloom:sell_enchanted", + "level": 3, + "max_trades": 3, + "offer": { + "Count": 1, + "id": "minecraft:iron_shovel", + "tag": { + "Damage": 0 + } + }, + "price": { + "Count": 1, + "id": "minecraft:emerald" + }, + "price_multiplier": 0.2, + "xp": 10 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_gold_nugget.json b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_gold_nugget.json new file mode 100644 index 00000000..782e862a --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_gold_nugget.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:simple", + "level": 2, + "max_trades": 8, + "offer": { + "Count": 1, + "id": "minecraft:gold_nugget" + }, + "price": { + "Count": 1, + "id": "minecraft:emerald" + }, + "price_multiplier": 0.2, + "xp": 5 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_poppy.json b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_poppy.json new file mode 100644 index 00000000..843e922e --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_poppy.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:simple", + "level": 2, + "max_trades": 12, + "offer": { + "Count": 8, + "id": "minecraft:flower_pot" + }, + "price": { + "Count": 1, + "id": "minecraft:emerald" + }, + "price_multiplier": 0.2, + "xp": 5 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_rose_bush.json b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_rose_bush.json new file mode 100644 index 00000000..026a4f77 --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_rose_bush.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:simple", + "max_trades": 8, + "offer": { + "Count": 1, + "id": "minecraft:rose_bush" + }, + "price": { + "Count": 1, + "id": "minecraft:emerald" + }, + "price_multiplier": 0.2, + "xp": 2 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_stone_shovel.json b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_stone_shovel.json new file mode 100644 index 00000000..369b8539 --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_stone_shovel.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:simple", + "max_trades": 12, + "offer": { + "Count": 1, + "id": "minecraft:stone_shovel", + "tag": { + "Damage": 0 + } + }, + "price": { + "Count": 1, + "id": "minecraft:emerald" + }, + "price_multiplier": 0.2, + "xp": 1 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_vigil_candles.json b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_vigil_candles.json new file mode 100644 index 00000000..3eb7068b --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_vigil_candles.json @@ -0,0 +1,12 @@ +{ + "type": "doom_and_gloom:sell_tag", + "level": 2, + "max_trades": 12, + "offer": "doom_and_gloom:vigil_candles", + "price": { + "Count": 2, + "id": "minecraft:emerald" + }, + "price_multiplier": 0.2, + "xp": 10 +} \ No newline at end of file diff --git a/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_wither_rose.json b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_wither_rose.json new file mode 100644 index 00000000..824af954 --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/moonlight/villager_trades/gravetender/sell_wither_rose.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:simple", + "level": 4, + "max_trades": 20, + "offer": { + "Count": 2, + "id": "minecraft:wither_rose" + }, + "price": { + "Count": 10, + "id": "minecraft:emerald" + }, + "price_multiplier": 0.2, + "xp": 8 +} \ No newline at end of file diff --git a/src/generated/resources/data/doom_and_gloom/recipes/amber_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/amber_vigil_candle.json similarity index 54% rename from src/generated/resources/data/doom_and_gloom/recipes/amber_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/amber_vigil_candle.json index e008fceb..b929e000 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/amber_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/amber_vigil_candle.json @@ -1,13 +1,27 @@ { "type": "minecraft:crafting_shaped", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "key": { "C": { "item": "dye_depot:amber_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/amber_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/amber_vigil_candle_dyeing.json similarity index 55% rename from src/generated/resources/data/doom_and_gloom/recipes/amber_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/amber_vigil_candle_dyeing.json index ef11fbaa..18717870 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/amber_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/amber_vigil_candle_dyeing.json @@ -1,6 +1,20 @@ { "type": "minecraft:crafting_shapeless", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "ingredients": [ { diff --git a/src/generated/resources/data/doom_and_gloom/recipes/aqua_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/aqua_vigil_candle.json similarity index 54% rename from src/generated/resources/data/doom_and_gloom/recipes/aqua_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/aqua_vigil_candle.json index 7d877c6e..2adb2f94 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/aqua_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/aqua_vigil_candle.json @@ -1,13 +1,27 @@ { "type": "minecraft:crafting_shaped", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "key": { "C": { "item": "dye_depot:aqua_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/aqua_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/aqua_vigil_candle_dyeing.json similarity index 55% rename from src/generated/resources/data/doom_and_gloom/recipes/aqua_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/aqua_vigil_candle_dyeing.json index 926ffd88..8db62d7e 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/aqua_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/aqua_vigil_candle_dyeing.json @@ -1,6 +1,20 @@ { "type": "minecraft:crafting_shapeless", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "ingredients": [ { diff --git a/src/generated/resources/data/doom_and_gloom/recipes/beige_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/beige_vigil_candle.json similarity index 54% rename from src/generated/resources/data/doom_and_gloom/recipes/beige_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/beige_vigil_candle.json index b768acf5..a00b3eb9 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/beige_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/beige_vigil_candle.json @@ -1,13 +1,27 @@ { "type": "minecraft:crafting_shaped", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "key": { "C": { "item": "dye_depot:beige_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/beige_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/beige_vigil_candle_dyeing.json similarity index 55% rename from src/generated/resources/data/doom_and_gloom/recipes/beige_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/beige_vigil_candle_dyeing.json index 164cf0d4..52b1c7e9 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/beige_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/beige_vigil_candle_dyeing.json @@ -1,6 +1,20 @@ { "type": "minecraft:crafting_shapeless", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "ingredients": [ { diff --git a/src/generated/resources/data/doom_and_gloom/recipes/black_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/black_vigil_candle.json similarity index 90% rename from src/generated/resources/data/doom_and_gloom/recipes/black_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/black_vigil_candle.json index 7efbd022..b84580a4 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/black_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/black_vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:black_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/black_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/black_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/black_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/black_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/recipes/blue_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/blue_vigil_candle.json similarity index 90% rename from src/generated/resources/data/doom_and_gloom/recipes/blue_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/blue_vigil_candle.json index ad8f871d..9eaf6fcc 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/blue_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/blue_vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:blue_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/blue_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/blue_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/blue_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/blue_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/recipes/bone_pile.json b/common/src/generated/resources/data/doom_and_gloom/recipes/bone_pile.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/bone_pile.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/bone_pile.json diff --git a/src/generated/resources/data/doom_and_gloom/recipes/brown_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/brown_vigil_candle.json similarity index 90% rename from src/generated/resources/data/doom_and_gloom/recipes/brown_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/brown_vigil_candle.json index af2a849b..08cd94ae 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/brown_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/brown_vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:brown_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/brown_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/brown_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/brown_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/brown_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/recipes/coral_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/coral_vigil_candle.json similarity index 54% rename from src/generated/resources/data/doom_and_gloom/recipes/coral_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/coral_vigil_candle.json index 6aeb5296..742bf0a5 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/coral_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/coral_vigil_candle.json @@ -1,13 +1,27 @@ { "type": "minecraft:crafting_shaped", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "key": { "C": { "item": "dye_depot:coral_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/coral_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/coral_vigil_candle_dyeing.json similarity index 55% rename from src/generated/resources/data/doom_and_gloom/recipes/coral_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/coral_vigil_candle_dyeing.json index 9c344216..5f1691dd 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/coral_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/coral_vigil_candle_dyeing.json @@ -1,6 +1,20 @@ { "type": "minecraft:crafting_shapeless", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "ingredients": [ { diff --git a/common/src/generated/resources/data/doom_and_gloom/recipes/cutting/stone_tablet.json b/common/src/generated/resources/data/doom_and_gloom/recipes/cutting/stone_tablet.json new file mode 100644 index 00000000..9a05f353 --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/cutting/stone_tablet.json @@ -0,0 +1,30 @@ +{ + "type": "farmersdelight:cutting", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "farmersdelight" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "farmersdelight" + ] + } + ], + "ingredients": [ + { + "item": "doom_and_gloom:stone_tablet" + } + ], + "result": [ + { + "item": "doom_and_gloom:cracked_stone_tablet" + } + ], + "tool": { + "tag": "minecraft:pickaxes" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/doom_and_gloom/recipes/cyan_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/cyan_vigil_candle.json similarity index 90% rename from src/generated/resources/data/doom_and_gloom/recipes/cyan_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/cyan_vigil_candle.json index 7426b591..b354a473 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/cyan_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/cyan_vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:cyan_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/cyan_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/cyan_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/cyan_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/cyan_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/recipes/forest_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/forest_vigil_candle.json similarity index 54% rename from src/generated/resources/data/doom_and_gloom/recipes/forest_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/forest_vigil_candle.json index 23c0a69b..a55c566b 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/forest_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/forest_vigil_candle.json @@ -1,13 +1,27 @@ { "type": "minecraft:crafting_shaped", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "key": { "C": { "item": "dye_depot:forest_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/forest_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/forest_vigil_candle_dyeing.json similarity index 55% rename from src/generated/resources/data/doom_and_gloom/recipes/forest_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/forest_vigil_candle_dyeing.json index da998170..b715745b 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/forest_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/forest_vigil_candle_dyeing.json @@ -1,6 +1,20 @@ { "type": "minecraft:crafting_shapeless", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "ingredients": [ { diff --git a/src/generated/resources/data/doom_and_gloom/recipes/ginger_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/ginger_vigil_candle.json similarity index 54% rename from src/generated/resources/data/doom_and_gloom/recipes/ginger_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/ginger_vigil_candle.json index 1d553b11..ec5e66d5 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/ginger_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/ginger_vigil_candle.json @@ -1,13 +1,27 @@ { "type": "minecraft:crafting_shaped", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "key": { "C": { "item": "dye_depot:ginger_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/ginger_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/ginger_vigil_candle_dyeing.json similarity index 55% rename from src/generated/resources/data/doom_and_gloom/recipes/ginger_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/ginger_vigil_candle_dyeing.json index 60758312..4c21dd0f 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/ginger_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/ginger_vigil_candle_dyeing.json @@ -1,6 +1,20 @@ { "type": "minecraft:crafting_shapeless", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "ingredients": [ { diff --git a/src/generated/resources/data/doom_and_gloom/recipes/gray_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/gray_vigil_candle.json similarity index 90% rename from src/generated/resources/data/doom_and_gloom/recipes/gray_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/gray_vigil_candle.json index b90ba0b2..3cf3d714 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/gray_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/gray_vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:gray_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/gray_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/gray_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/gray_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/gray_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/recipes/green_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/green_vigil_candle.json similarity index 90% rename from src/generated/resources/data/doom_and_gloom/recipes/green_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/green_vigil_candle.json index 45f04663..2480393e 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/green_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/green_vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:green_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/green_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/green_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/green_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/green_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/recipes/indigo_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/indigo_vigil_candle.json similarity index 54% rename from src/generated/resources/data/doom_and_gloom/recipes/indigo_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/indigo_vigil_candle.json index 50b387a8..f25ac6cb 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/indigo_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/indigo_vigil_candle.json @@ -1,13 +1,27 @@ { "type": "minecraft:crafting_shaped", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "key": { "C": { "item": "dye_depot:indigo_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/indigo_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/indigo_vigil_candle_dyeing.json similarity index 55% rename from src/generated/resources/data/doom_and_gloom/recipes/indigo_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/indigo_vigil_candle_dyeing.json index e04c7bdf..d75684aa 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/indigo_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/indigo_vigil_candle_dyeing.json @@ -1,6 +1,20 @@ { "type": "minecraft:crafting_shapeless", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "ingredients": [ { diff --git a/src/generated/resources/data/doom_and_gloom/recipes/light_blue_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/light_blue_vigil_candle.json similarity index 90% rename from src/generated/resources/data/doom_and_gloom/recipes/light_blue_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/light_blue_vigil_candle.json index ed99f6cf..77a97052 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/light_blue_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/light_blue_vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:light_blue_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/light_blue_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/light_blue_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/light_blue_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/light_blue_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/recipes/light_gray_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/light_gray_vigil_candle.json similarity index 90% rename from src/generated/resources/data/doom_and_gloom/recipes/light_gray_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/light_gray_vigil_candle.json index 082b8bc1..d1971d5c 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/light_gray_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/light_gray_vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:light_gray_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/light_gray_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/light_gray_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/light_gray_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/light_gray_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/recipes/lime_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/lime_vigil_candle.json similarity index 90% rename from src/generated/resources/data/doom_and_gloom/recipes/lime_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/lime_vigil_candle.json index 7a4a3aef..1242dc34 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/lime_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/lime_vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:lime_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/lime_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/lime_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/lime_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/lime_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/recipes/magenta_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/magenta_vigil_candle.json similarity index 90% rename from src/generated/resources/data/doom_and_gloom/recipes/magenta_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/magenta_vigil_candle.json index d98355a4..827df557 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/magenta_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/magenta_vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:magenta_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/magenta_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/magenta_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/magenta_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/magenta_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/recipes/maroon_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/maroon_vigil_candle.json similarity index 54% rename from src/generated/resources/data/doom_and_gloom/recipes/maroon_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/maroon_vigil_candle.json index 488d04bf..f582982c 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/maroon_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/maroon_vigil_candle.json @@ -1,13 +1,27 @@ { "type": "minecraft:crafting_shaped", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "key": { "C": { "item": "dye_depot:maroon_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/maroon_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/maroon_vigil_candle_dyeing.json similarity index 55% rename from src/generated/resources/data/doom_and_gloom/recipes/maroon_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/maroon_vigil_candle_dyeing.json index e7165388..64439a60 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/maroon_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/maroon_vigil_candle_dyeing.json @@ -1,6 +1,20 @@ { "type": "minecraft:crafting_shapeless", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "ingredients": [ { diff --git a/src/generated/resources/data/doom_and_gloom/recipes/mint_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/mint_vigil_candle.json similarity index 54% rename from src/generated/resources/data/doom_and_gloom/recipes/mint_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/mint_vigil_candle.json index 39c9c246..a78e56d1 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/mint_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/mint_vigil_candle.json @@ -1,13 +1,27 @@ { "type": "minecraft:crafting_shaped", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "key": { "C": { "item": "dye_depot:mint_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/mint_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/mint_vigil_candle_dyeing.json similarity index 55% rename from src/generated/resources/data/doom_and_gloom/recipes/mint_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/mint_vigil_candle_dyeing.json index ffd305af..974b4363 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/mint_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/mint_vigil_candle_dyeing.json @@ -1,6 +1,20 @@ { "type": "minecraft:crafting_shapeless", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "ingredients": [ { diff --git a/src/generated/resources/data/doom_and_gloom/recipes/navy_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/navy_vigil_candle.json similarity index 54% rename from src/generated/resources/data/doom_and_gloom/recipes/navy_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/navy_vigil_candle.json index 50fad821..078634f8 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/navy_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/navy_vigil_candle.json @@ -1,13 +1,27 @@ { "type": "minecraft:crafting_shaped", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "key": { "C": { "item": "dye_depot:navy_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/navy_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/navy_vigil_candle_dyeing.json similarity index 55% rename from src/generated/resources/data/doom_and_gloom/recipes/navy_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/navy_vigil_candle_dyeing.json index e8b31321..13b359a5 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/navy_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/navy_vigil_candle_dyeing.json @@ -1,6 +1,20 @@ { "type": "minecraft:crafting_shapeless", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "ingredients": [ { diff --git a/src/generated/resources/data/doom_and_gloom/recipes/olive_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/olive_vigil_candle.json similarity index 54% rename from src/generated/resources/data/doom_and_gloom/recipes/olive_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/olive_vigil_candle.json index 9a2254d3..ed86eab3 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/olive_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/olive_vigil_candle.json @@ -1,13 +1,27 @@ { "type": "minecraft:crafting_shaped", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "key": { "C": { "item": "dye_depot:olive_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/olive_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/olive_vigil_candle_dyeing.json similarity index 55% rename from src/generated/resources/data/doom_and_gloom/recipes/olive_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/olive_vigil_candle_dyeing.json index 948a1b13..248908e3 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/olive_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/olive_vigil_candle_dyeing.json @@ -1,6 +1,20 @@ { "type": "minecraft:crafting_shapeless", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "ingredients": [ { diff --git a/src/generated/resources/data/doom_and_gloom/recipes/orange_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/orange_vigil_candle.json similarity index 90% rename from src/generated/resources/data/doom_and_gloom/recipes/orange_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/orange_vigil_candle.json index d9685612..4c5fc16e 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/orange_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/orange_vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:orange_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/orange_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/orange_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/orange_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/orange_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/recipes/pink_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/pink_vigil_candle.json similarity index 90% rename from src/generated/resources/data/doom_and_gloom/recipes/pink_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/pink_vigil_candle.json index d65d88f6..946aefc5 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/pink_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/pink_vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:pink_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/pink_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/pink_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/pink_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/pink_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/recipes/purple_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/purple_vigil_candle.json similarity index 90% rename from src/generated/resources/data/doom_and_gloom/recipes/purple_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/purple_vigil_candle.json index ca715bbd..df1d01ef 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/purple_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/purple_vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:purple_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/purple_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/purple_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/purple_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/purple_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/recipes/red_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/red_vigil_candle.json similarity index 89% rename from src/generated/resources/data/doom_and_gloom/recipes/red_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/red_vigil_candle.json index 60419d27..2444b6d1 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/red_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/red_vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:red_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/red_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/red_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/red_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/red_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/recipes/rose_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/rose_vigil_candle.json similarity index 54% rename from src/generated/resources/data/doom_and_gloom/recipes/rose_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/rose_vigil_candle.json index 8e391e81..b564a94f 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/rose_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/rose_vigil_candle.json @@ -1,13 +1,27 @@ { "type": "minecraft:crafting_shaped", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "key": { "C": { "item": "dye_depot:rose_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/rose_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/rose_vigil_candle_dyeing.json similarity index 55% rename from src/generated/resources/data/doom_and_gloom/recipes/rose_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/rose_vigil_candle_dyeing.json index 5555ed4a..005dad25 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/rose_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/rose_vigil_candle_dyeing.json @@ -1,6 +1,20 @@ { "type": "minecraft:crafting_shapeless", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "ingredients": [ { diff --git a/common/src/generated/resources/data/doom_and_gloom/recipes/sepulcher.json b/common/src/generated/resources/data/doom_and_gloom/recipes/sepulcher.json new file mode 100644 index 00000000..0c4d468f --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/sepulcher.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "conditions": [ + { + "type": "forge:not", + "value": { + "type": "forge:tag_empty", + "tag": "c:ingots/silver" + } + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:tags_populated", + "values": [ + "c:ingots/silver" + ] + } + ], + "key": { + "#": { + "tag": "c:ingots/silver" + } + }, + "pattern": [ + "# #", + "# #", + "###" + ], + "result": { + "item": "doom_and_gloom:sepulcher" + }, + "show_notification": true +} \ No newline at end of file diff --git a/common/src/generated/resources/data/doom_and_gloom/recipes/sepulcher_fallback.json b/common/src/generated/resources/data/doom_and_gloom/recipes/sepulcher_fallback.json new file mode 100644 index 00000000..3f41ea4d --- /dev/null +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/sepulcher_fallback.json @@ -0,0 +1,35 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "conditions": [ + { + "type": "forge:tag_empty", + "tag": "c:ingots/silver" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:not", + "value": { + "condition": "fabric:tags_populated", + "values": [ + "c:ingots/silver" + ] + } + } + ], + "key": { + "#": { + "item": "minecraft:iron_ingot" + } + }, + "pattern": [ + "# #", + "# #", + "###" + ], + "result": { + "item": "doom_and_gloom:sepulcher" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/doom_and_gloom/recipes/slate_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/slate_vigil_candle.json similarity index 54% rename from src/generated/resources/data/doom_and_gloom/recipes/slate_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/slate_vigil_candle.json index 8121cbbf..59738abd 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/slate_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/slate_vigil_candle.json @@ -1,13 +1,27 @@ { "type": "minecraft:crafting_shaped", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "key": { "C": { "item": "dye_depot:slate_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/slate_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/slate_vigil_candle_dyeing.json similarity index 55% rename from src/generated/resources/data/doom_and_gloom/recipes/slate_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/slate_vigil_candle_dyeing.json index 7e57d4ac..1484703a 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/slate_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/slate_vigil_candle_dyeing.json @@ -1,6 +1,20 @@ { "type": "minecraft:crafting_shapeless", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "ingredients": [ { diff --git a/src/generated/resources/data/doom_and_gloom/recipes/tan_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/tan_vigil_candle.json similarity index 54% rename from src/generated/resources/data/doom_and_gloom/recipes/tan_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/tan_vigil_candle.json index 0a3c12c5..124bb8c8 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/tan_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/tan_vigil_candle.json @@ -1,13 +1,27 @@ { "type": "minecraft:crafting_shaped", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "key": { "C": { "item": "dye_depot:tan_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/tan_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/tan_vigil_candle_dyeing.json similarity index 55% rename from src/generated/resources/data/doom_and_gloom/recipes/tan_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/tan_vigil_candle_dyeing.json index 77c0e2cb..98163738 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/tan_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/tan_vigil_candle_dyeing.json @@ -1,6 +1,20 @@ { "type": "minecraft:crafting_shapeless", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "ingredients": [ { diff --git a/src/generated/resources/data/doom_and_gloom/recipes/teal_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/teal_vigil_candle.json similarity index 54% rename from src/generated/resources/data/doom_and_gloom/recipes/teal_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/teal_vigil_candle.json index 8e7e6421..183c268c 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/teal_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/teal_vigil_candle.json @@ -1,13 +1,27 @@ { "type": "minecraft:crafting_shaped", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "key": { "C": { "item": "dye_depot:teal_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/teal_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/teal_vigil_candle_dyeing.json similarity index 55% rename from src/generated/resources/data/doom_and_gloom/recipes/teal_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/teal_vigil_candle_dyeing.json index e47a046c..45c1e419 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/teal_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/teal_vigil_candle_dyeing.json @@ -1,6 +1,20 @@ { "type": "minecraft:crafting_shapeless", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "ingredients": [ { diff --git a/src/generated/resources/data/doom_and_gloom/recipes/verdant_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/verdant_vigil_candle.json similarity index 54% rename from src/generated/resources/data/doom_and_gloom/recipes/verdant_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/verdant_vigil_candle.json index 83a528b3..c45f5e8d 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/verdant_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/verdant_vigil_candle.json @@ -1,13 +1,27 @@ { "type": "minecraft:crafting_shaped", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "key": { "C": { "item": "dye_depot:verdant_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/verdant_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/verdant_vigil_candle_dyeing.json similarity index 55% rename from src/generated/resources/data/doom_and_gloom/recipes/verdant_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/verdant_vigil_candle_dyeing.json index 6704947c..349d09da 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/verdant_vigil_candle_dyeing.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/verdant_vigil_candle_dyeing.json @@ -1,6 +1,20 @@ { "type": "minecraft:crafting_shapeless", "category": "building", + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "dye_depot" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "dye_depot" + ] + } + ], "group": "vigil_candle", "ingredients": [ { diff --git a/src/generated/resources/data/doom_and_gloom/recipes/vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/vigil_candle.json similarity index 89% rename from src/generated/resources/data/doom_and_gloom/recipes/vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/vigil_candle.json index 4838ab7d..0e4594df 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/white_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/white_vigil_candle.json similarity index 90% rename from src/generated/resources/data/doom_and_gloom/recipes/white_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/white_vigil_candle.json index e78b4772..54009788 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/white_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/white_vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:white_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/white_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/white_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/white_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/white_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/recipes/yellow_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/recipes/yellow_vigil_candle.json similarity index 90% rename from src/generated/resources/data/doom_and_gloom/recipes/yellow_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/yellow_vigil_candle.json index 5fbd4e7e..e310f651 100644 --- a/src/generated/resources/data/doom_and_gloom/recipes/yellow_vigil_candle.json +++ b/common/src/generated/resources/data/doom_and_gloom/recipes/yellow_vigil_candle.json @@ -7,7 +7,7 @@ "item": "minecraft:yellow_candle" }, "S": { - "tag": "forge:ingots/silver" + "tag": "c:ingots/silver" } }, "pattern": [ diff --git a/src/generated/resources/data/doom_and_gloom/recipes/yellow_vigil_candle_dyeing.json b/common/src/generated/resources/data/doom_and_gloom/recipes/yellow_vigil_candle_dyeing.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/recipes/yellow_vigil_candle_dyeing.json rename to common/src/generated/resources/data/doom_and_gloom/recipes/yellow_vigil_candle_dyeing.json diff --git a/src/generated/resources/data/doom_and_gloom/tags/blocks/burial_dirt_convertible.json b/common/src/generated/resources/data/doom_and_gloom/tags/blocks/burial_dirt_convertible.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/tags/blocks/burial_dirt_convertible.json rename to common/src/generated/resources/data/doom_and_gloom/tags/blocks/burial_dirt_convertible.json diff --git a/src/generated/resources/data/doom_and_gloom/tags/blocks/gravetender_lightables.json b/common/src/generated/resources/data/doom_and_gloom/tags/blocks/gravetender_lightables.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/tags/blocks/gravetender_lightables.json rename to common/src/generated/resources/data/doom_and_gloom/tags/blocks/gravetender_lightables.json diff --git a/src/generated/resources/data/doom_and_gloom/tags/blocks/vigil_candles.json b/common/src/generated/resources/data/doom_and_gloom/tags/blocks/vigil_candles.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/tags/blocks/vigil_candles.json rename to common/src/generated/resources/data/doom_and_gloom/tags/blocks/vigil_candles.json diff --git a/src/generated/resources/data/doom_and_gloom/tags/entity_types/fills_sepulcher.json b/common/src/generated/resources/data/doom_and_gloom/tags/entity_types/fills_sepulcher.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/tags/entity_types/fills_sepulcher.json rename to common/src/generated/resources/data/doom_and_gloom/tags/entity_types/fills_sepulcher.json diff --git a/src/generated/resources/data/forge/tags/items/tools/bush_hammer.json b/common/src/generated/resources/data/doom_and_gloom/tags/items/tools/bush_hammer.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tools/bush_hammer.json rename to common/src/generated/resources/data/doom_and_gloom/tags/items/tools/bush_hammer.json diff --git a/src/generated/resources/data/doom_and_gloom/tags/items/vigil_candles.json b/common/src/generated/resources/data/doom_and_gloom/tags/items/vigil_candles.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/tags/items/vigil_candles.json rename to common/src/generated/resources/data/doom_and_gloom/tags/items/vigil_candles.json diff --git a/src/generated/resources/data/doom_and_gloom/tags/mob_effect/cleared_by_vigil_candle.json b/common/src/generated/resources/data/doom_and_gloom/tags/mob_effect/cleared_by_vigil_candle.json similarity index 100% rename from src/generated/resources/data/doom_and_gloom/tags/mob_effect/cleared_by_vigil_candle.json rename to common/src/generated/resources/data/doom_and_gloom/tags/mob_effect/cleared_by_vigil_candle.json diff --git a/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/bone.json b/common/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/bone.json similarity index 100% rename from src/generated/resources/data/minecraft/advancements/recipes/building_blocks/bone.json rename to common/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/bone.json diff --git a/src/generated/resources/data/minecraft/recipes/bone.json b/common/src/generated/resources/data/minecraft/recipes/bone.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/bone.json rename to common/src/generated/resources/data/minecraft/recipes/bone.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/candles.json b/common/src/generated/resources/data/minecraft/tags/blocks/candles.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/candles.json rename to common/src/generated/resources/data/minecraft/tags/blocks/candles.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/dirt.json b/common/src/generated/resources/data/minecraft/tags/blocks/dirt.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/dirt.json rename to common/src/generated/resources/data/minecraft/tags/blocks/dirt.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json diff --git a/src/generated/resources/data/minecraft/tags/items/music_discs.json b/common/src/generated/resources/data/minecraft/tags/items/music_discs.json similarity index 100% rename from src/generated/resources/data/minecraft/tags/items/music_discs.json rename to common/src/generated/resources/data/minecraft/tags/items/music_discs.json diff --git a/src/generated/resources/data/oreganized/tags/blocks/fire_source.json b/common/src/generated/resources/data/oreganized/tags/blocks/fire_source.json similarity index 100% rename from src/generated/resources/data/oreganized/tags/blocks/fire_source.json rename to common/src/generated/resources/data/oreganized/tags/blocks/fire_source.json diff --git a/src/generated/resources/pack.mcmeta b/common/src/generated/resources/pack.mcmeta similarity index 100% rename from src/generated/resources/pack.mcmeta rename to common/src/generated/resources/pack.mcmeta diff --git a/common/src/main/java/galena/doom_and_gloom/DGConfig.java b/common/src/main/java/galena/doom_and_gloom/DGConfig.java new file mode 100644 index 00000000..d29958de --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/DGConfig.java @@ -0,0 +1,60 @@ +package galena.doom_and_gloom; + +import java.util.function.Supplier; +import net.mehvahdjukaar.moonlight.api.platform.configs.ConfigBuilder; +import net.mehvahdjukaar.moonlight.api.platform.configs.ConfigSpec; +import net.mehvahdjukaar.moonlight.api.platform.configs.ConfigType; + +//TODO: add mod menu compat +public class DGConfig { + public static final Common COMMON; + private static final ConfigSpec COMMON_SPEC; + + public static final Client CLIENT; + private static final ConfigSpec CLIENT_SPEC; + + public static void init() { + //just classloads this + } + + public static class Common { + public final Supplier sepulcherDuration; + + private Common(ConfigBuilder builder) { + builder.comment("Common"); + builder.push("common"); + + sepulcherDuration = builder.comment("Time in ticks the sepulcher takes to turn meat into bones") + .define("sepulcherDuration", 20 * 30, 0, Integer.MAX_VALUE); + + builder.pop(); + } + } + + public static class Client { + public final Supplier fancyRenderType; + + private Client(ConfigBuilder builder) { + builder.comment("Client"); + builder.push("client"); + + fancyRenderType = builder.comment("Use fancy render type for hollers") + .define("glowy_render_type", false); + + builder.pop(); + } + } + + static { + + ConfigBuilder commonBuilder = ConfigBuilder.create(DoomAndGloom.MOD_ID, ConfigType.COMMON); + + COMMON = new Common(commonBuilder); + COMMON_SPEC = commonBuilder.buildAndRegister(); + + ConfigBuilder clientBuilder = ConfigBuilder.create(DoomAndGloom.MOD_ID, ConfigType.CLIENT); + CLIENT = new Client(clientBuilder); + CLIENT_SPEC = clientBuilder.buildAndRegister(); + } + +} diff --git a/common/src/main/java/galena/doom_and_gloom/DGItemTabContents.java b/common/src/main/java/galena/doom_and_gloom/DGItemTabContents.java new file mode 100644 index 00000000..57e19fb4 --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/DGItemTabContents.java @@ -0,0 +1,39 @@ +package galena.doom_and_gloom; + +import galena.doom_and_gloom.index.DGBlocks; +import galena.doom_and_gloom.index.DGItems; +import net.mehvahdjukaar.moonlight.api.misc.RegSupplier; +import net.mehvahdjukaar.moonlight.api.platform.RegHelper; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.ItemLike; + +public class DGItemTabContents { + + public static void addItemsToTabs(RegHelper.ItemToTabEvent event) { + var vigilCandles = DGBlocks.vigilCandles().map(RegSupplier::get).toArray(ItemLike[]::new); + + event.addAfter(CreativeModeTabs.FUNCTIONAL_BLOCKS, stack -> stack.is(Items.SOUL_LANTERN), vigilCandles); + event.addAfter(CreativeModeTabs.COLORED_BLOCKS, stack -> stack.is(ItemTags.CANDLES), vigilCandles); + + event.add(CreativeModeTabs.BUILDING_BLOCKS, DGBlocks.BONE_PILE.get()); + event.addAfter(CreativeModeTabs.FUNCTIONAL_BLOCKS, stack -> stack.is(Items.COMPOSTER), DGBlocks.SEPULCHER.get()); + event.addAfter(CreativeModeTabs.FUNCTIONAL_BLOCKS, stack -> stack.is(Items.INFESTED_DEEPSLATE), DGBlocks.BURIAL_DIRT.get()); + + event.add(CreativeModeTabs.SPAWN_EGGS, DGItems.HOLLER_SPAWN_EGG.get()); + + event.addAfter(CreativeModeTabs.TOOLS_AND_UTILITIES, stack -> stack.is(ItemTags.MUSIC_DISCS), DGItems.MUSIC_DISC_AFTERLIFE.get()); + + //if (tab == CreativeModeTabs.TOOLS_AND_UTILITIES) { + // event.accept(new ItemStack(OItems.BUSH_HAMMER.get())); + // event.accept(new ItemStack(OItems.HAMMER_AND_CHISEL.get())); + //} + + //if (tab == CreativeModeTabs.FUNCTIONAL_BLOCKS) { + // event.accept(new ItemStack(OBlocks.STONE_TABLET.get())); + // event.accept(new ItemStack(OBlocks.CRACKED_STONE_TABLET.get())); + //} + } + +} diff --git a/common/src/main/java/galena/doom_and_gloom/DoomAndGloom.java b/common/src/main/java/galena/doom_and_gloom/DoomAndGloom.java new file mode 100644 index 00000000..66362936 --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/DoomAndGloom.java @@ -0,0 +1,45 @@ +package galena.doom_and_gloom; + +import galena.doom_and_gloom.gen.VillageStructureModifier; +import galena.doom_and_gloom.index.*; +import galena.doom_and_gloom.network.DGNetwork; +import net.mehvahdjukaar.moonlight.api.platform.RegHelper; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.MinecraftServer; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class DoomAndGloom { + public static final Logger LOGGER = LogManager.getLogger(); + public static final String MOD_ID = "doom_and_gloom"; + + public static ResourceLocation modLoc(String location) { + return new ResourceLocation(MOD_ID, location); + } + + public static void init() { + + DGConfig.init(); + DGSoundEvents.init(); + DGBlocks.init(); + DGBlockEntities.init(); + DGEffects.init(); + DGEntityTypes.init(); + DGItems.init(); + DGParticleTypes.init(); + DGPoi.init(); + DGVillagerTypes.init(); + DGItemListings.init(); + DGLootInjects.init(); + + DGNetwork.register(); + + RegHelper.addItemsToTabsRegistration(DGItemTabContents::addItemsToTabs); + } + + + public static void onServerAboutToStart(MinecraftServer server) { + VillageStructureModifier.setup(server.registryAccess()); + } + +} diff --git a/common/src/main/java/galena/doom_and_gloom/client/DGModelLayers.java b/common/src/main/java/galena/doom_and_gloom/client/DGModelLayers.java new file mode 100644 index 00000000..76f082fc --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/client/DGModelLayers.java @@ -0,0 +1,11 @@ +package galena.doom_and_gloom.client; + +import galena.doom_and_gloom.DoomAndGloom; +import net.minecraft.client.model.geom.ModelLayerLocation; + +public class DGModelLayers { + + public static final ModelLayerLocation HOLLER = new ModelLayerLocation(DoomAndGloom.modLoc("holler"), "main"); + public static final ModelLayerLocation DIRT_MOUND = new ModelLayerLocation(DoomAndGloom.modLoc("dirt_mound"), "main"); + +} diff --git a/src/main/java/galena/doom_and_gloom/client/OReloadListener.java b/common/src/main/java/galena/doom_and_gloom/client/DGReloadListener.java similarity index 97% rename from src/main/java/galena/doom_and_gloom/client/OReloadListener.java rename to common/src/main/java/galena/doom_and_gloom/client/DGReloadListener.java index d2d69fb8..3fa796ca 100644 --- a/src/main/java/galena/doom_and_gloom/client/OReloadListener.java +++ b/common/src/main/java/galena/doom_and_gloom/client/DGReloadListener.java @@ -11,7 +11,7 @@ import net.minecraft.server.packs.resources.SimplePreparableReloadListener; import net.minecraft.util.profiling.ProfilerFiller; -public class OReloadListener extends SimplePreparableReloadListener> { +public class DGReloadListener extends SimplePreparableReloadListener> { public static final List STONE_TABLET_TEXT_COLORS = new ArrayList<>(); diff --git a/src/main/java/galena/doom_and_gloom/client/ORenderTypes.java b/common/src/main/java/galena/doom_and_gloom/client/DGRenderTypes.java similarity index 64% rename from src/main/java/galena/doom_and_gloom/client/ORenderTypes.java rename to common/src/main/java/galena/doom_and_gloom/client/DGRenderTypes.java index 36a78c1c..f4f08ff7 100644 --- a/src/main/java/galena/doom_and_gloom/client/ORenderTypes.java +++ b/common/src/main/java/galena/doom_and_gloom/client/DGRenderTypes.java @@ -4,25 +4,19 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.VertexFormat; -import galena.doom_and_gloom.DoomAndGloom; -import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; +import net.mehvahdjukaar.moonlight.api.client.CoreShaderContainer; import net.minecraft.Util; +import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.RenderStateShard; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.ShaderInstance; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.RegisterShadersEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid = DoomAndGloom.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) -public abstract class ORenderTypes extends RenderType { - //TODO: check if iris is on. If on use default render type - private static final AtomicReference NO_ALPHA_CUTOFF_SHADER = new AtomicReference<>(); +public abstract class DGRenderTypes extends RenderType { - protected static final ShaderStateShard NO_ALPHA_CUTOFF_SHARD = new ShaderStateShard(NO_ALPHA_CUTOFF_SHADER::get); + public static final CoreShaderContainer NO_ALPHA_CUTOFF_SHADER = new CoreShaderContainer(GameRenderer::getRendertypeEntityTranslucentShader); + + protected static final ShaderStateShard NO_ALPHA_CUTOFF_SHARD = new ShaderStateShard(NO_ALPHA_CUTOFF_SHADER); protected static final TransparencyStateShard ADDITIVE_TRANSPARENCY = new TransparencyStateShard("lightning_transparency", () -> { RenderSystem.enableBlend(); @@ -58,22 +52,8 @@ public abstract class ORenderTypes extends RenderType { return create("doom_and_gloom_entity_translucent_no_alpha_cutoff", DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS, 256, true, true, rendertype$compositestate); }); - - - public ORenderTypes(String pName, VertexFormat pFormat, VertexFormat.Mode pMode, int pBufferSize, boolean pAffectsCrumbling, boolean pSortOnUpload, Runnable pSetupState, Runnable pClearState) { + public DGRenderTypes(String pName, VertexFormat pFormat, VertexFormat.Mode pMode, int pBufferSize, boolean pAffectsCrumbling, boolean pSortOnUpload, Runnable pSetupState, Runnable pClearState) { super(pName, pFormat, pMode, pBufferSize, pAffectsCrumbling, pSortOnUpload, pSetupState, pClearState); } - @SubscribeEvent - public static void registerShaders(RegisterShadersEvent event) { - try { - ShaderInstance shader = new ShaderInstance(event.getResourceProvider(), - DoomAndGloom.modLoc("rendertype_entity_translucent_additive"), DefaultVertexFormat.NEW_ENTITY); - - event.registerShader(shader, NO_ALPHA_CUTOFF_SHADER::set); - } catch (Exception e) { - DoomAndGloom.LOGGER.error("Failed to register shader", e); - } - - } } diff --git a/common/src/main/java/galena/doom_and_gloom/client/DoomAndGloomClient.java b/common/src/main/java/galena/doom_and_gloom/client/DoomAndGloomClient.java new file mode 100644 index 00000000..b9f84b3b --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/client/DoomAndGloomClient.java @@ -0,0 +1,88 @@ +package galena.doom_and_gloom.client; + +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import galena.doom_and_gloom.DoomAndGloom; +import galena.doom_and_gloom.client.model.DirtMoundModel; +import galena.doom_and_gloom.client.model.HollerModel; +import galena.doom_and_gloom.client.particle.BoneFragmentParticle; +import galena.doom_and_gloom.client.particle.FogParticle; +import galena.doom_and_gloom.client.render.entity.DirtMoundRenderer; +import galena.doom_and_gloom.client.render.entity.HollerRender; +import galena.doom_and_gloom.client.screen.StoneTabletScreen; +import galena.doom_and_gloom.content.block.StoneTabletBlockEntity; +import galena.doom_and_gloom.index.DGBlocks; +import galena.doom_and_gloom.index.DGEntityTypes; +import galena.doom_and_gloom.index.DGParticleTypes; +import net.mehvahdjukaar.moonlight.api.platform.ClientHelper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.SoulParticle; +import net.minecraft.client.particle.TerrainParticle; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; + +public class DoomAndGloomClient { + + + public static void init() { + ClientHelper.addClientReloadListener(DGReloadListener::new, DoomAndGloom.modLoc("tablets_reloader")); + ClientHelper.addEntityRenderersRegistration(DoomAndGloomClient::registerEntityRenderers); + ClientHelper.addModelLayerRegistration(DoomAndGloomClient::registerModelLayers); + ClientHelper.addShaderRegistration(DoomAndGloomClient::registerShaders); + ClientHelper.addClientSetup(DoomAndGloomClient::setup); + ClientHelper.addParticleRegistration(DoomAndGloomClient::registerParticleFactories); + } + + public static void setup() { + //render layers + RenderType cutout = RenderType.cutout(); + ClientHelper.registerRenderType(DGBlocks.SEPULCHER.get(), cutout); + DGBlocks.vigilCandles().forEach(block -> ClientHelper.registerRenderType(block.get(), cutout)); + } + + + public static void registerShaders(ClientHelper.ShaderEvent event) { + event.register(DoomAndGloom.modLoc("rendertype_entity_translucent_additive"), + DefaultVertexFormat.NEW_ENTITY, DGRenderTypes.NO_ALPHA_CUTOFF_SHADER::assign); + } + + private static void registerEntityRenderers(ClientHelper.EntityRendererEvent event) { + event.register(DGEntityTypes.HOLLER.get(), HollerRender::new); + event.register(DGEntityTypes.DIRT_MOUND.get(), DirtMoundRenderer::new); + } + + public static void registerModelLayers(ClientHelper.ModelLayerEvent event) { + event.register(DGModelLayers.HOLLER, HollerModel::createBodyLayer); + event.register(DGModelLayers.DIRT_MOUND, DirtMoundModel::createBodyLayer); + } + + public static void registerParticleFactories(ClientHelper.ParticleEvent event) { + event.register(DGParticleTypes.BONE_FRAGMENT.get(), BoneFragmentParticle.Provider::new); + event.register(DGParticleTypes.FOG.get(), sprites -> new FogParticle.Provider(sprites, 200)); + event.register(DGParticleTypes.FOG_WATER.get(), sprites -> new FogParticle.Provider(sprites, 100)); + event.register(DGParticleTypes.HOLLERING_SOUL.get(), SoulParticle.Provider::new); + } + + public static void spawnConsumeParticles(Vec3 at) { + var level = Minecraft.getInstance().level; + if (level == null) return; + + var particles = Minecraft.getInstance().particleEngine; + var state = DGBlocks.ROTTING_FLESH.get().defaultBlockState(); + for (int i = 0; i < 20; i++) { + var vec = at.add(level.random.nextDouble() - 0.5, level.random.nextDouble() * 2, level.random.nextDouble() - 0.5); + particles.add(new TerrainParticle(level, vec.x, vec.y, vec.z, 0.0, 0.0, 0.0, state)); + } + } + + public static void openStoneTabletScreen(BlockPos pos) { + Minecraft mc = Minecraft.getInstance(); + var level = mc.level; + var player = mc.player; + if (level != null && player != null && level.getBlockEntity(pos) instanceof StoneTabletBlockEntity tile) { + var stack = player.getItemInHand(player.getUsedItemHand()); + mc.setScreen(new StoneTabletScreen(tile, stack, mc.isTextFilteringEnabled())); + } + } + +} diff --git a/src/main/java/galena/doom_and_gloom/client/FogAmbientSoundHandler.java b/common/src/main/java/galena/doom_and_gloom/client/fog/FogAmbientSoundHandler.java similarity index 83% rename from src/main/java/galena/doom_and_gloom/client/FogAmbientSoundHandler.java rename to common/src/main/java/galena/doom_and_gloom/client/fog/FogAmbientSoundHandler.java index e681a005..e83e1390 100644 --- a/src/main/java/galena/doom_and_gloom/client/FogAmbientSoundHandler.java +++ b/common/src/main/java/galena/doom_and_gloom/client/fog/FogAmbientSoundHandler.java @@ -1,7 +1,7 @@ -package galena.doom_and_gloom.client; +package galena.doom_and_gloom.client.fog; -import galena.doom_and_gloom.index.OEffects; -import galena.doom_and_gloom.index.OSoundEvents; +import galena.doom_and_gloom.index.DGEffects; +import galena.doom_and_gloom.index.DGSoundEvents; import net.minecraft.client.resources.sounds.AmbientSoundHandler; import net.minecraft.client.resources.sounds.BiomeAmbientSoundsHandler; import net.minecraft.client.sounds.SoundManager; @@ -21,7 +21,7 @@ public FogAmbientSoundHandler(Player player, SoundManager soundManager) { private void startPlaying() { if (sound != null) return; - sound = new BiomeAmbientSoundsHandler.LoopSoundInstance(OSoundEvents.FOG_AMBIENCE.get()); + sound = new BiomeAmbientSoundsHandler.LoopSoundInstance(DGSoundEvents.FOG_AMBIENCE.get()); soundManager.play(sound); sound.fadeIn(); @@ -38,7 +38,7 @@ public void tick() { sound = null; } - if (player.hasEffect(OEffects.FOG.get())) { + if (player.hasEffect(DGEffects.FOG.get())) { startPlaying(); } else { stopPlaying(); diff --git a/common/src/main/java/galena/doom_and_gloom/client/fog/FogRendering.java b/common/src/main/java/galena/doom_and_gloom/client/fog/FogRendering.java new file mode 100644 index 00000000..06f5f0dc --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/client/fog/FogRendering.java @@ -0,0 +1,100 @@ +package galena.doom_and_gloom.client.fog; + +import com.mojang.blaze3d.shaders.FogShape; +import galena.doom_and_gloom.index.DGEffects; +import galena.doom_and_gloom.index.DGParticleTypes; +import java.util.Optional; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.FogRenderer; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleOptions; +import net.minecraft.tags.FluidTags; +import net.minecraft.util.Mth; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.material.FogType; +import org.jetbrains.annotations.Nullable; + +public class FogRendering { + + @Nullable + private static MobEffectInstance fogEffect; + + public static Optional activeEffect() { + return Optional.ofNullable(fogEffect); + } + + public static void clientTick() { + if (!(Minecraft.getInstance().gameRenderer.getMainCamera().getEntity() instanceof Player player)) return; + fogEffect = player.getEffect(DGEffects.FOG.get()); + + if (fogEffect == null) return; + if (Minecraft.getInstance().isPaused()) return; + var level = Minecraft.getInstance().level; + if (level == null) return; + + var range = 24; + var at = player.position().add((level.random.nextDouble() - 0.5) * range, level.random.nextDouble() * 4 - 2, (level.random.nextDouble() - 0.5) * range); + var blockAt = BlockPos.containing(at.x, at.y, at.z); + var stateAt = level.getBlockState(blockAt); + + if (!stateAt.canBeReplaced() || !stateAt.getFluidState().isEmpty()) return; + + var below = level.getBlockState(blockAt.below()); + + if (below.getFluidState().is(FluidTags.WATER)) { + addFogGroup(level, DGParticleTypes.FOG_WATER.get(), blockAt, 3, 0); + } else if (!below.canBeReplaced()) { + addFogGroup(level, DGParticleTypes.FOG.get(), blockAt, 5, 1); + } + } + + private static void addFogGroup(Level level, ParticleOptions type, BlockPos at, int amount, double yRange) { + if (level.random.nextInt(amount * 2) != 0) return; + + var realAmount = amount - level.random.nextInt(2); + + for (int i = 0; i < realAmount; i++) { + level.addParticle(type, + at.getX() + level.random.nextDouble() * 2 - 1, at.getY() + 0.5 + level.random.nextDouble() * yRange, at.getZ() + level.random.nextDouble() * 2 - 1, + level.random.nextFloat() + 0.5F, 0.0, 0.0 + ); + } + } + + public static float @Nullable [] modifyFogColor(float r, float g, float b, float partialTicks) { + return activeEffect() + .flatMap(MobEffectInstance::getFactorData) + .map(factorData -> { + Entity cameraEntity = Minecraft.getInstance().gameRenderer.getMainCamera().getEntity(); + if (!(cameraEntity instanceof LivingEntity le)) return null; + float factor = factorData.getFactor(le, partialTicks); + // target color components (0x697180) + float targetR = 0x85 / 255f; + float targetG = 0x90 / 255f; + float targetB = 0xA0 / 255f; + + float red = Mth.lerp(factor, r, targetR); + float green = Mth.lerp(factor, g, targetG); + float blue = Mth.lerp(factor, b, targetB); + + return new float[]{red, green, blue}; + }).orElse(null); + } + + public static float @Nullable [] modifyPlanes(float start, float end, + FogRenderer.FogMode mode, FogShape fogShape, FogType fogType, + float partialTicks) { + if (fogType != FogType.NONE) return null; + return FogRendering.activeEffect().flatMap(MobEffectInstance::getFactorData).map(factorData -> { + Entity camE = Minecraft.getInstance().gameRenderer.getMainCamera().getEntity(); + if (!(camE instanceof LivingEntity le)) return null; + float far = Mth.lerp(factorData.getFactor(le, partialTicks), end, 15F); + float near = (mode == FogRenderer.FogMode.FOG_SKY ? -2F : far * -0.5F); + return new float[]{near, far}; + }).orElse(null); + } +} diff --git a/src/main/java/galena/doom_and_gloom/client/model/DirtMoundModel.java b/common/src/main/java/galena/doom_and_gloom/client/model/DirtMoundModel.java similarity index 100% rename from src/main/java/galena/doom_and_gloom/client/model/DirtMoundModel.java rename to common/src/main/java/galena/doom_and_gloom/client/model/DirtMoundModel.java diff --git a/src/main/java/galena/doom_and_gloom/client/model/HollerModel.java b/common/src/main/java/galena/doom_and_gloom/client/model/HollerModel.java similarity index 97% rename from src/main/java/galena/doom_and_gloom/client/model/HollerModel.java rename to common/src/main/java/galena/doom_and_gloom/client/model/HollerModel.java index f5a36080..68a8a25a 100644 --- a/src/main/java/galena/doom_and_gloom/client/model/HollerModel.java +++ b/common/src/main/java/galena/doom_and_gloom/client/model/HollerModel.java @@ -4,7 +4,7 @@ import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; import galena.doom_and_gloom.DGConfig; -import galena.doom_and_gloom.client.ORenderTypes; +import galena.doom_and_gloom.client.DGRenderTypes; import galena.doom_and_gloom.content.entity.holler.Holler; import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.HeadedModel; @@ -28,8 +28,8 @@ public class HollerModel extends EntityModel implements Hea public HollerModel(ModelPart root) { // fancy render type. Needst more experimentation. Try me out - super(true ? ORenderTypes.ADDITIVE_TRANSLUCENCY : - ORenderTypes.ENTITY_TRANSLUCENT_NO_ALPHA_CUTOFF); + super(true ? DGRenderTypes.ADDITIVE_TRANSLUCENCY : + DGRenderTypes.ENTITY_TRANSLUCENT_NO_ALPHA_CUTOFF); //super(); this.head = root.getChild("head"); this.body = root.getChild("body"); diff --git a/src/main/java/galena/doom_and_gloom/client/particle/BoneFragmentParticle.java b/common/src/main/java/galena/doom_and_gloom/client/particle/BoneFragmentParticle.java similarity index 100% rename from src/main/java/galena/doom_and_gloom/client/particle/BoneFragmentParticle.java rename to common/src/main/java/galena/doom_and_gloom/client/particle/BoneFragmentParticle.java diff --git a/src/main/java/galena/doom_and_gloom/client/particle/FogParticle.java b/common/src/main/java/galena/doom_and_gloom/client/particle/FogParticle.java similarity index 90% rename from src/main/java/galena/doom_and_gloom/client/particle/FogParticle.java rename to common/src/main/java/galena/doom_and_gloom/client/particle/FogParticle.java index 3ff177c7..08f55a78 100644 --- a/src/main/java/galena/doom_and_gloom/client/particle/FogParticle.java +++ b/common/src/main/java/galena/doom_and_gloom/client/particle/FogParticle.java @@ -3,7 +3,6 @@ import java.util.List; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.particle.Particle; -import net.minecraft.client.particle.ParticleEngine; import net.minecraft.client.particle.ParticleProvider; import net.minecraft.client.particle.ParticleRenderType; import net.minecraft.client.particle.SpriteSet; @@ -70,15 +69,11 @@ public void tick() { } } - public static ParticleEngine.SpriteParticleRegistration provider(int lifetime) { - return sprites -> new Provider(sprites, lifetime); - } - public static class Provider implements ParticleProvider { private final SpriteSet sprites; private final int lifetime; - private Provider(SpriteSet sprites, int lifetime) { + public Provider(SpriteSet sprites, int lifetime) { this.sprites = sprites; this.lifetime = lifetime; } diff --git a/src/main/java/galena/doom_and_gloom/client/render/entity/DirtMoundRenderer.java b/common/src/main/java/galena/doom_and_gloom/client/render/entity/DirtMoundRenderer.java similarity index 79% rename from src/main/java/galena/doom_and_gloom/client/render/entity/DirtMoundRenderer.java rename to common/src/main/java/galena/doom_and_gloom/client/render/entity/DirtMoundRenderer.java index 261ff67b..16b0f2ce 100644 --- a/src/main/java/galena/doom_and_gloom/client/render/entity/DirtMoundRenderer.java +++ b/common/src/main/java/galena/doom_and_gloom/client/render/entity/DirtMoundRenderer.java @@ -3,7 +3,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.client.OModelLayers; +import galena.doom_and_gloom.client.DGModelLayers; import galena.doom_and_gloom.client.model.DirtMoundModel; import galena.doom_and_gloom.content.entity.DirtMound; import net.minecraft.client.model.EntityModel; @@ -12,19 +12,16 @@ import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class DirtMoundRenderer extends EntityRenderer { - private static final ResourceLocation TEXTURE = new ResourceLocation(DoomAndGloom.MOD_ID, "textures/entity/dirt_mound.png"); + private static final ResourceLocation TEXTURE = DoomAndGloom.modLoc("textures/entity/dirt_mound.png"); private final EntityModel model; public DirtMoundRenderer(EntityRendererProvider.Context context) { super(context); - this.model = new DirtMoundModel(context.bakeLayer(OModelLayers.DIRT_MOUND)); + this.model = new DirtMoundModel(context.bakeLayer(DGModelLayers.DIRT_MOUND)); } @Override diff --git a/src/main/java/galena/doom_and_gloom/client/render/entity/HollerRender.java b/common/src/main/java/galena/doom_and_gloom/client/render/entity/HollerRender.java similarity index 77% rename from src/main/java/galena/doom_and_gloom/client/render/entity/HollerRender.java rename to common/src/main/java/galena/doom_and_gloom/client/render/entity/HollerRender.java index 4c68f017..2446ee17 100644 --- a/src/main/java/galena/doom_and_gloom/client/render/entity/HollerRender.java +++ b/common/src/main/java/galena/doom_and_gloom/client/render/entity/HollerRender.java @@ -1,23 +1,20 @@ package galena.doom_and_gloom.client.render.entity; import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.client.OModelLayers; +import galena.doom_and_gloom.client.DGModelLayers; import galena.doom_and_gloom.client.model.HollerModel; import galena.doom_and_gloom.content.entity.holler.Holler; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.MobRenderer; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -@OnlyIn(Dist.CLIENT) public class HollerRender extends MobRenderer> { private static final ResourceLocation HOLLER_TEXTURE = DoomAndGloom.modLoc( "textures/entity/holler.png"); public HollerRender(EntityRendererProvider.Context context) { - super(context, new HollerModel<>(context.bakeLayer(OModelLayers.HOLLER)), 0.4F); + super(context, new HollerModel<>(context.bakeLayer(DGModelLayers.HOLLER)), 0.4F); } @Override diff --git a/src/main/java/galena/doom_and_gloom/client/screen/StoneTabletScreen.java b/common/src/main/java/galena/doom_and_gloom/client/screen/StoneTabletScreen.java similarity index 96% rename from src/main/java/galena/doom_and_gloom/client/screen/StoneTabletScreen.java rename to common/src/main/java/galena/doom_and_gloom/client/screen/StoneTabletScreen.java index 4b74cd76..13cc45ee 100644 --- a/src/main/java/galena/doom_and_gloom/client/screen/StoneTabletScreen.java +++ b/common/src/main/java/galena/doom_and_gloom/client/screen/StoneTabletScreen.java @@ -3,11 +3,11 @@ import com.mojang.blaze3d.platform.Lighting; import com.mojang.blaze3d.vertex.PoseStack; import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.client.OReloadListener; +import galena.doom_and_gloom.client.DGReloadListener; import galena.doom_and_gloom.content.block.StoneTabletBlock; import galena.doom_and_gloom.content.block.StoneTabletBlockEntity; import galena.doom_and_gloom.content.block.StoneTabletText; -import galena.doom_and_gloom.index.OItems; +import galena.doom_and_gloom.index.DGItems; import galena.doom_and_gloom.network.DGNetwork; import galena.doom_and_gloom.network.packet.StoneTabletUpdatePacket; import java.util.stream.IntStream; @@ -56,7 +56,7 @@ public StoneTabletScreen(StoneTabletBlockEntity tablet, ItemStack stack, boolean .mapToObj(i -> this.text.getMessage(i, isFiltered)) .map(Component::getString).toArray(String[]::new); - this.canEdit = tablet.type == StoneTabletBlock.Type.DEFAULT && stack.is(OItems.BUSH_HAMMER.get()); + this.canEdit = tablet.type == StoneTabletBlock.Type.DEFAULT && stack.is(DGItems.BUSH_HAMMER.get()); } @Override @@ -167,9 +167,9 @@ private void renderSign(GuiGraphics guiGraphics) { private void renderText(GuiGraphics guiGraphics) { guiGraphics.pose().translate(0.0F, -5.0F, 4.0F); - int color = OReloadListener.getColor(); - int darkColor2 = OReloadListener.getLightColor(); - int darkColor = OReloadListener.getDarkColor(); + int color = DGReloadListener.getColor(); + int darkColor2 = DGReloadListener.getLightColor(); + int darkColor = DGReloadListener.getDarkColor(); boolean showCursor = this.frame / 6 % 2 == 0 && canEdit; int j = this.signField.getCursorPos(); int k = this.signField.getSelectionPos(); diff --git a/src/main/java/galena/doom_and_gloom/compat/amendments/AmendmentsCompat.java b/common/src/main/java/galena/doom_and_gloom/compat/AmendmentsCompat.java similarity index 56% rename from src/main/java/galena/doom_and_gloom/compat/amendments/AmendmentsCompat.java rename to common/src/main/java/galena/doom_and_gloom/compat/AmendmentsCompat.java index 15a33660..d1fe6efb 100644 --- a/src/main/java/galena/doom_and_gloom/compat/amendments/AmendmentsCompat.java +++ b/common/src/main/java/galena/doom_and_gloom/compat/AmendmentsCompat.java @@ -1,31 +1,30 @@ -package galena.doom_and_gloom.compat.amendments; +package galena.doom_and_gloom.compat; import net.mehvahdjukaar.amendments.common.tile.WallLanternBlockTile; +import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; +import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import net.minecraft.world.level.Level; import net.minecraft.world.level.block.CandleBlock; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; public class AmendmentsCompat { - public static void register() { - MinecraftForge.EVENT_BUS.addListener(AmendmentsCompat::onBlockInteract); - } - private static void onBlockInteract(PlayerInteractEvent.RightClickBlock event) { - var pos = event.getPos(); - var level = event.getLevel(); + //TODO: add better amendments API to register interactions on wall lanterns + public static boolean onBlockInteract(Level level, BlockPos pos, + Player player, InteractionHand hand, ItemStack held) { + var be = level.getBlockEntity(pos); - var held = event.getItemStack(); - var player = event.getEntity(); - if (!(be instanceof WallLanternBlockTile lantern)) return; + if (!(be instanceof WallLanternBlockTile lantern)) return false; var state = lantern.getHeldBlock(); - if (!state.hasProperty(CandleBlock.LIT)) return; + if (!state.hasProperty(CandleBlock.LIT)) return false; boolean lit = state.getValue(CandleBlock.LIT); @@ -36,22 +35,20 @@ private static void onBlockInteract(PlayerInteractEvent.RightClickBlock event) { lantern.setHeldBlock(state.setValue(CandleBlock.LIT, true)); if (player != null) { held.hurtAndBreak(1, player, it -> - it.broadcastBreakEvent(event.getHand()) + it.broadcastBreakEvent(hand) ); } - result = InteractionResult.sidedSuccess(level.isClientSide()); + return true; } else if (held.isEmpty() && lit) { level.playSound(player, pos, SoundEvents.CANDLE_EXTINGUISH, SoundSource.BLOCKS, 1.0F, 1.0F); lantern.setHeldBlock(state.setValue(CandleBlock.LIT, false)); - result = InteractionResult.sidedSuccess(level.isClientSide()); + return true; } - if (result != InteractionResult.PASS) { - event.setCancellationResult(result); - event.setCanceled(true); - } + return false; } + } diff --git a/common/src/main/java/galena/doom_and_gloom/compat/CompatMods.java b/common/src/main/java/galena/doom_and_gloom/compat/CompatMods.java new file mode 100644 index 00000000..5308b380 --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/compat/CompatMods.java @@ -0,0 +1,15 @@ +package galena.doom_and_gloom.compat; + +import net.mehvahdjukaar.moonlight.api.platform.PlatHelper; + +public class CompatMods { + + public static final String DYE_DEPOT_NAME = "dye_depot"; + public static final String AMENDMENTS_NAME = "moonlight"; + public static final String FARMERS_DELIGHT_NAME = "farmersdelight"; + public static final String OREGANIZED_NAME = "oreganized"; + + public static final boolean DYE_DEPOT = PlatHelper.isModLoaded(DYE_DEPOT_NAME); + public static final boolean AMENDMENTS = PlatHelper.isModLoaded(AMENDMENTS_NAME); + public static final boolean OREGANIZED = PlatHelper.isModLoaded(OREGANIZED_NAME); +} diff --git a/src/main/java/galena/doom_and_gloom/compat/moonlight/CandleSensor.java b/common/src/main/java/galena/doom_and_gloom/compat/moonlight/CandleSensor.java similarity index 88% rename from src/main/java/galena/doom_and_gloom/compat/moonlight/CandleSensor.java rename to common/src/main/java/galena/doom_and_gloom/compat/moonlight/CandleSensor.java index 8d8e5f04..398d822f 100644 --- a/src/main/java/galena/doom_and_gloom/compat/moonlight/CandleSensor.java +++ b/common/src/main/java/galena/doom_and_gloom/compat/moonlight/CandleSensor.java @@ -1,8 +1,8 @@ package galena.doom_and_gloom.compat.moonlight; import com.google.common.collect.ImmutableSet; -import galena.doom_and_gloom.index.OTags; -import galena.doom_and_gloom.index.OVillagerTypes; +import galena.doom_and_gloom.index.DGTags; +import galena.doom_and_gloom.index.DGVillagerTypes; import java.util.Set; import net.minecraft.core.BlockPos; import net.minecraft.core.GlobalPos; @@ -22,7 +22,7 @@ public CandleSensor() { @Override protected void doTick(ServerLevel pLevel, Villager pEntity) { - if (!pEntity.isBaby() && pEntity.getVillagerData().getProfession() == OVillagerTypes.GRAVETENDER.get()) { + if (!pEntity.isBaby() && pEntity.getVillagerData().getProfession() == DGVillagerTypes.GRAVETENDER.get()) { ResourceKey resourcekey = pLevel.dimension(); BlockPos blockpos = pEntity.blockPosition(); GlobalPos found = null; @@ -32,7 +32,7 @@ protected void doTick(ServerLevel pLevel, Villager pEntity) { for (int k = -2; k <= 2; ++k) { for (int l = -rad; l <= rad; ++l) { BlockPos blockpos1 = blockpos.offset(j, k, l); - if (pLevel.getBlockState(blockpos1).is(OTags.Blocks.GRAVETENDER_LIGHTABLE)) { + if (pLevel.getBlockState(blockpos1).is(DGTags.Blocks.GRAVETENDER_LIGHTABLE)) { found = (GlobalPos.of(resourcekey, blockpos1)); break; } diff --git a/src/main/java/galena/doom_and_gloom/compat/moonlight/LightUpCandles.java b/common/src/main/java/galena/doom_and_gloom/compat/moonlight/LightUpCandles.java similarity index 85% rename from src/main/java/galena/doom_and_gloom/compat/moonlight/LightUpCandles.java rename to common/src/main/java/galena/doom_and_gloom/compat/moonlight/LightUpCandles.java index 0b2a7931..e41f9b9c 100644 --- a/src/main/java/galena/doom_and_gloom/compat/moonlight/LightUpCandles.java +++ b/common/src/main/java/galena/doom_and_gloom/compat/moonlight/LightUpCandles.java @@ -2,14 +2,14 @@ import com.google.common.collect.ImmutableMap; import com.mojang.authlib.GameProfile; -import galena.doom_and_gloom.index.OTags; +import galena.doom_and_gloom.index.DGTags; import java.util.UUID; import net.mehvahdjukaar.moonlight.api.platform.PlatHelper; +import net.mehvahdjukaar.moonlight.api.util.FakePlayerManager; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.GlobalPos; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.ai.behavior.Behavior; import net.minecraft.world.entity.ai.behavior.BlockPosTracker; @@ -17,13 +17,11 @@ import net.minecraft.world.entity.ai.memory.MemoryStatus; import net.minecraft.world.entity.ai.memory.WalkTarget; import net.minecraft.world.entity.npc.Villager; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; -import net.minecraftforge.common.util.FakePlayerFactory; public class LightUpCandles extends Behavior { private final float speedModifier; @@ -79,7 +77,7 @@ protected boolean canStillUse(ServerLevel pLevel, Villager pEntity, long pGameTi private static final GameProfile GRAVETENDER = new GameProfile(UUID.fromString("f3f3f3f3-2233-f3f3-f3f3-f3f3f3f3f3f3"), "[Gravetender]"); @Override - protected void tick(ServerLevel pLevel, Villager pOwner, long pGameTime) { + protected void tick(ServerLevel level, Villager pOwner, long pGameTime) { BlockPos pos = targetPos.pos(); //hax @@ -90,8 +88,8 @@ protected void tick(ServerLevel pLevel, Villager pOwner, long pGameTime) { if (pos.closerToCenterThan(pOwner.position(), 2.3)) { this.ticksSinceReached++; - BlockState state = pLevel.getBlockState(pos); - if (!state.is(OTags.Blocks.GRAVETENDER_LIGHTABLE)) { + BlockState state = level.getBlockState(pos); + if (!state.is(DGTags.Blocks.GRAVETENDER_LIGHTABLE)) { pOwner.getBrain().eraseMemory(MoonlightCompat.NEAREST_UNLIT_CANDLE.get()); } else { //breaking animation. same as fodder lol. might have the same issues @@ -102,13 +100,13 @@ protected void tick(ServerLevel pLevel, Villager pOwner, long pGameTime) { //TODO: this task is run for candles that are already on too. We would need to clear them off first and validate thatthey canbe extinguished if (ticksSinceReached > 20) { - ServerPlayer player = FakePlayerFactory.get(pLevel, GRAVETENDER); - ItemStack itemStack = Items.FLINT_AND_STEEL.getDefaultInstance(); + var player = FakePlayerManager.get(GRAVETENDER, level); + var itemStack = Items.FLINT_AND_STEEL.getDefaultInstance(); player.setItemInHand(InteractionHand.MAIN_HAND, itemStack); BlockHitResult hit = new BlockHitResult(Vec3.atBottomCenterOf(pos), Direction.UP, pos, false); - if(!itemStack.useOn(new UseOnContext(player, InteractionHand.MAIN_HAND,hit)).consumesAction()){ - state.use(pLevel, player, InteractionHand.MAIN_HAND, hit); + if (!itemStack.useOn(new UseOnContext(player, InteractionHand.MAIN_HAND, hit)).consumesAction()) { + state.use(level, player, InteractionHand.MAIN_HAND, hit); } pOwner.getBrain().eraseMemory(MemoryModuleType.LOOK_TARGET); } diff --git a/src/main/java/galena/doom_and_gloom/compat/moonlight/MoonlightCompat.java b/common/src/main/java/galena/doom_and_gloom/compat/moonlight/MoonlightCompat.java similarity index 95% rename from src/main/java/galena/doom_and_gloom/compat/moonlight/MoonlightCompat.java rename to common/src/main/java/galena/doom_and_gloom/compat/moonlight/MoonlightCompat.java index 749b8c47..6a7129bf 100644 --- a/src/main/java/galena/doom_and_gloom/compat/moonlight/MoonlightCompat.java +++ b/common/src/main/java/galena/doom_and_gloom/compat/moonlight/MoonlightCompat.java @@ -2,7 +2,7 @@ import com.mojang.datafixers.util.Pair; import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.index.OVillagerTypes; +import galena.doom_and_gloom.index.DGVillagerTypes; import java.util.List; import java.util.Optional; import java.util.function.Supplier; @@ -43,7 +43,7 @@ public static void init() { public static void onVillagerBrainInitialize(IVillagerBrainEvent event) { Villager villager = event.getVillager(); - if (!villager.isBaby() && villager.getVillagerData().getProfession() == OVillagerTypes.GRAVETENDER.get()) { + if (!villager.isBaby() && villager.getVillagerData().getProfession() == DGVillagerTypes.GRAVETENDER.get()) { event.addTaskToActivity(Activity.WORK, Pair.of(3, new LightUpCandles(0.5f))); event.addTaskToActivity(Activity.IDLE, Pair.of(3, new TurnOffCandles(0.5f))); event.addSensor(CANDLES_SENSOR.get()); diff --git a/src/main/java/galena/doom_and_gloom/compat/moonlight/TurnOffCandles.java b/common/src/main/java/galena/doom_and_gloom/compat/moonlight/TurnOffCandles.java similarity index 95% rename from src/main/java/galena/doom_and_gloom/compat/moonlight/TurnOffCandles.java rename to common/src/main/java/galena/doom_and_gloom/compat/moonlight/TurnOffCandles.java index 5b3b3abc..92de3c4e 100644 --- a/src/main/java/galena/doom_and_gloom/compat/moonlight/TurnOffCandles.java +++ b/common/src/main/java/galena/doom_and_gloom/compat/moonlight/TurnOffCandles.java @@ -2,16 +2,16 @@ import com.google.common.collect.ImmutableMap; import com.mojang.authlib.GameProfile; -import galena.doom_and_gloom.index.OTags; +import galena.doom_and_gloom.index.DGTags; import java.util.List; import java.util.Optional; import java.util.UUID; import net.mehvahdjukaar.moonlight.api.platform.PlatHelper; +import net.mehvahdjukaar.moonlight.api.util.FakePlayerManager; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.GlobalPos; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.ai.behavior.Behavior; import net.minecraft.world.entity.ai.behavior.BlockPosTracker; @@ -24,7 +24,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; -import net.minecraftforge.common.util.FakePlayerFactory; import org.jetbrains.annotations.Nullable; //TODO: this isnt working! villagers arent persisting their added memory! @@ -112,7 +111,7 @@ protected void tick(ServerLevel pLevel, Villager pOwner, long pGameTime) { this.ticksSinceReached++; BlockState state = pLevel.getBlockState(pos); - if (!state.is(OTags.Blocks.GRAVETENDER_LIGHTABLE)) { + if (!state.is(DGTags.Blocks.GRAVETENDER_LIGHTABLE)) { var list = pOwner.getBrain().getMemory(MoonlightCompat.CANDLES_I_LIT.get()); if (list.isPresent()) { list.get().remove(targetPos); @@ -129,7 +128,7 @@ protected void tick(ServerLevel pLevel, Villager pOwner, long pGameTime) { //TODO: this task is run for candles that are already on too. We would need to clear them off first and validate thatthey canbe extinguished if (ticksSinceReached > 20) { - ServerPlayer player = FakePlayerFactory.get(pLevel, GRAVETENDER); + var player = FakePlayerManager.get(GRAVETENDER, pLevel); player.setItemInHand(InteractionHand.MAIN_HAND, ItemStack.EMPTY); BlockHitResult hit = new BlockHitResult(Vec3.atBottomCenterOf(pos), Direction.UP, pos, false); state.use(pLevel, player, InteractionHand.MAIN_HAND, hit); diff --git a/src/main/java/galena/doom_and_gloom/content/block/BonePileBlock.java b/common/src/main/java/galena/doom_and_gloom/content/block/BonePileBlock.java similarity index 54% rename from src/main/java/galena/doom_and_gloom/content/block/BonePileBlock.java rename to common/src/main/java/galena/doom_and_gloom/content/block/BonePileBlock.java index d0681a3f..c75d1256 100644 --- a/src/main/java/galena/doom_and_gloom/content/block/BonePileBlock.java +++ b/common/src/main/java/galena/doom_and_gloom/content/block/BonePileBlock.java @@ -1,14 +1,10 @@ package galena.doom_and_gloom.content.block; -import galena.doom_and_gloom.index.OParticleTypes; -import galena.doom_and_gloom.index.OSoundEvents; -import java.util.function.Consumer; -import net.minecraft.client.particle.ParticleEngine; +import galena.doom_and_gloom.index.DGParticleTypes; +import galena.doom_and_gloom.index.DGSoundEvents; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundSource; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.item.FallingBlockEntity; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; @@ -20,7 +16,6 @@ import net.minecraft.world.phys.shapes.EntityCollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraftforge.client.extensions.common.IClientBlockExtensions; public class BonePileBlock extends FallingBlock { @@ -50,49 +45,19 @@ public VoxelShape getVisualShape(BlockState state, BlockGetter level, BlockPos p public void onLand(Level level, BlockPos pos, BlockState state, BlockState other, FallingBlockEntity entity) { super.onLand(level, pos, state, other, entity); if (!entity.isSilent()) - level.playSound(null, pos, OSoundEvents.BONE_PILE_FALL.get(), SoundSource.BLOCKS, 1F, 1F); + level.playSound(null, pos, DGSoundEvents.BONE_PILE_FALL.get(), SoundSource.BLOCKS, 1F, 1F); particles(level, Vec3.atCenterOf(pos), 20); } - @Override - public boolean addLandingEffects(BlockState state, ServerLevel level, BlockPos pos, BlockState other, LivingEntity entity, int numberOfParticles) { - particles(level, entity.position().add(0, 0.2, 0.0), numberOfParticles / 2); - return true; - } - - @Override - public boolean addRunningEffects(BlockState state, Level level, BlockPos pos, Entity entity) { - var vec = entity.position().add(0, 0.2, 0.0); - var speed = entity.isSprinting() ? 0.5F : 0.2F; - var halfSpeed = speed / 2; - level.addParticle(OParticleTypes.BONE_FRAGMENT.get(), vec.x, vec.y, vec.z, level.random.nextDouble() * speed - halfSpeed, level.random.nextDouble() * speed - halfSpeed, level.random.nextDouble() * speed - halfSpeed); - return true; - } - - @Override - public void initializeClient(Consumer consumer) { - consumer.accept(new ClientProperties()); - } - - private void particles(Level level, Vec3 vec, int numberOfParticles) { + public void particles(Level level, Vec3 vec, int numberOfParticles) { if (level instanceof ServerLevel serverLevel) { - serverLevel.sendParticles(OParticleTypes.BONE_FRAGMENT.get(), vec.x, vec.y, vec.z, numberOfParticles, 0.35, 0.35, 0.35, 0.1); + serverLevel.sendParticles(DGParticleTypes.BONE_FRAGMENT.get(), vec.x, vec.y, vec.z, numberOfParticles, 0.35, 0.35, 0.35, 0.1); } else for (int i = 0; i < numberOfParticles; i++) { - level.addParticle(OParticleTypes.BONE_FRAGMENT.get(), + level.addParticle(DGParticleTypes.BONE_FRAGMENT.get(), vec.x + level.random.nextDouble() - 0.5, vec.y + level.random.nextDouble() - 0.5, vec.z + level.random.nextDouble() - 0.5, level.random.nextDouble() * 0.3 - 0.15, level.random.nextDouble() * 0.3 - 0.15, level.random.nextDouble() * 0.3 - 0.15 ); } } - public class ClientProperties implements IClientBlockExtensions { - - @Override - public boolean addDestroyEffects(BlockState state, Level level, BlockPos pos, ParticleEngine manager) { - particles(level, Vec3.atCenterOf(pos), 20); - return IClientBlockExtensions.super.addDestroyEffects(state, level, pos, manager); - } - - } - } diff --git a/src/main/java/galena/doom_and_gloom/content/block/BurialDirtBlock.java b/common/src/main/java/galena/doom_and_gloom/content/block/BurialDirtBlock.java similarity index 100% rename from src/main/java/galena/doom_and_gloom/content/block/BurialDirtBlock.java rename to common/src/main/java/galena/doom_and_gloom/content/block/BurialDirtBlock.java diff --git a/src/main/java/galena/doom_and_gloom/content/block/SepulcherBlock.java b/common/src/main/java/galena/doom_and_gloom/content/block/SepulcherBlock.java similarity index 83% rename from src/main/java/galena/doom_and_gloom/content/block/SepulcherBlock.java rename to common/src/main/java/galena/doom_and_gloom/content/block/SepulcherBlock.java index 6aa72a5d..dddb93a4 100644 --- a/src/main/java/galena/doom_and_gloom/content/block/SepulcherBlock.java +++ b/common/src/main/java/galena/doom_and_gloom/content/block/SepulcherBlock.java @@ -1,13 +1,12 @@ package galena.doom_and_gloom.content.block; import galena.doom_and_gloom.content.entity.SepulcherBlockEntity; -import galena.doom_and_gloom.index.OBlockEntities; -import galena.doom_and_gloom.index.OBlocks; -import galena.doom_and_gloom.index.OSoundEvents; +import galena.doom_and_gloom.index.DGBlockEntities; +import galena.doom_and_gloom.index.DGBlocks; +import galena.doom_and_gloom.index.DGSoundEvents; import java.awt.*; import net.minecraft.Util; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.TerrainParticle; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.server.level.ServerLevel; @@ -34,8 +33,6 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import org.jetbrains.annotations.Nullable; public class SepulcherBlock extends Block implements TickingEntityBlock { @@ -87,7 +84,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player public static boolean tryInsert(ItemStack stack, @Nullable Player player, BlockState state, Level level, BlockPos pos, boolean simulate) { int fillLevel = state.getValue(LEVEL); - var food = stack.getFoodProperties(null); + var food = stack.getItem().getFoodProperties(); if (fillLevel < MAX_LEVEL && food != null && food.isMeat()) { if (!simulate) insert(player, state, level, pos, level.random.nextIntBetweenInclusive(1, 2)); @@ -107,13 +104,13 @@ public static void insert(@Nullable Entity user, BlockState state, Level level, serverLevel.sendParticles(ParticleTypes.COMPOSTER, vec.x, vec.y, vec.z, 10, 0.3, 0.3, 0.3, 0.0); } - level.playSound(null, pos, OSoundEvents.SEPULCHER_FILLED.get(), SoundSource.BLOCKS, 0.5F, 1.0F); + level.playSound(null, pos, DGSoundEvents.SEPULCHER_FILLED.get(), SoundSource.BLOCKS, 0.5F, 1.0F); } public static void extract(@Nullable Entity user, BlockState state, Level level, BlockPos pos) { if (!level.isClientSide()) { Vec3 vec = Vec3.atLowerCornerWithOffset(pos, 0.5, 1.01, 0.5).offsetRandom(level.random, 0.7F); - ItemEntity item = new ItemEntity(level, vec.x(), vec.y(), vec.z(), new ItemStack(OBlocks.BONE_PILE.get())); + ItemEntity item = new ItemEntity(level, vec.x(), vec.y(), vec.z(), new ItemStack(DGBlocks.BONE_PILE.get())); item.setDefaultPickUpDelay(); level.addFreshEntity(item); } @@ -121,20 +118,6 @@ public static void extract(@Nullable Entity user, BlockState state, Level level, clear(user, state, level, pos); } - @OnlyIn(Dist.CLIENT) - public static void spawnConsumeParticles(Vec3 at) { - var level = Minecraft.getInstance().level; - if (level == null) return; - - var particles = Minecraft.getInstance().particleEngine; - var state = OBlocks.ROTTING_FLESH.get().defaultBlockState(); - for (int i = 0; i < 20; i++) { - var vec = at.add(level.random.nextDouble() - 0.5, level.random.nextDouble() * 2, level.random.nextDouble() - 0.5); - particles.add(new TerrainParticle(level, vec.x, vec.y, vec.z, 0.0, 0.0, 0.0, state)); - } - } - - @OnlyIn(Dist.CLIENT) public static void spawnRottingParticles(BlockPos at) { var level = Minecraft.getInstance().level; if (level == null) return; @@ -151,7 +134,7 @@ public static void clear(@Nullable Entity user, BlockState state, Level level, B level.setBlockAndUpdate(pos, empty); level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(user, empty)); - level.playSound(null, pos, OSoundEvents.SEPULCHER_HARVEST.get(), SoundSource.BLOCKS, 1.0F, 1.0F); + level.playSound(null, pos, DGSoundEvents.SEPULCHER_HARVEST.get(), SoundSource.BLOCKS, 1.0F, 1.0F); } @Override @@ -169,7 +152,7 @@ public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, Co @Override public BlockEntityType getType() { - return OBlockEntities.SEPULCHER.get(); + return DGBlockEntities.SEPULCHER.get(); } } diff --git a/src/main/java/galena/doom_and_gloom/content/block/StoneTabletBlock.java b/common/src/main/java/galena/doom_and_gloom/content/block/StoneTabletBlock.java similarity index 86% rename from src/main/java/galena/doom_and_gloom/content/block/StoneTabletBlock.java rename to common/src/main/java/galena/doom_and_gloom/content/block/StoneTabletBlock.java index c8534dcc..1e2ba301 100644 --- a/src/main/java/galena/doom_and_gloom/content/block/StoneTabletBlock.java +++ b/common/src/main/java/galena/doom_and_gloom/content/block/StoneTabletBlock.java @@ -1,13 +1,11 @@ package galena.doom_and_gloom.content.block; -import galena.doom_and_gloom.client.screen.StoneTabletScreen; -import galena.doom_and_gloom.index.OBlockEntities; -import galena.doom_and_gloom.index.OBlocks; +import galena.doom_and_gloom.index.DGBlockEntities; +import galena.doom_and_gloom.index.DGBlocks; import galena.doom_and_gloom.network.DGNetwork; import galena.doom_and_gloom.network.packet.EngraveStoneTabletPacket; import java.util.Arrays; import java.util.UUID; -import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -37,12 +35,8 @@ import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.network.PacketDistributor; import org.jetbrains.annotations.Nullable; public class StoneTabletBlock extends Block implements SimpleWaterloggedBlock, TickingEntityBlock { @@ -180,7 +174,7 @@ private boolean clear(Level level, BlockPos pos, ServerPlayer player, Interactio if (!held.is(ItemTags.PICKAXES)) return false; if (type != Type.ENGRAVED) return false; - var tablet = level.random.nextInt(5) == 0 ? OBlocks.CRACKED_STONE_TABLET : OBlocks.STONE_TABLET; + var tablet = level.random.nextInt(5) == 0 ? DGBlocks.CRACKED_STONE_TABLET : DGBlocks.STONE_TABLET; level.setBlockAndUpdate(pos, tablet.get().withPropertiesOf(state)); @@ -201,17 +195,17 @@ public FluidState getFluidState(BlockState state) { } @Override - public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGetter level, BlockPos pos, Player player) { + public ItemStack getCloneItemStack(BlockGetter level, BlockPos pos, BlockState state) { if (level.getBlockEntity(pos) instanceof StoneTabletBlockEntity tile) { - ItemStack stack = this.asItem().getDefaultInstance(); - CompoundTag tag = new CompoundTag(); + var stack = this.asItem().getDefaultInstance(); + var tag = new CompoundTag(); tag.put("BlockEntityTag", tile.saveWithoutMetadata()); - CompoundTag c = new CompoundTag(); - tag.put("BlockStateTag", c); + var stateTag = new CompoundTag(); + tag.put("BlockStateTag", stateTag); stack.setTag(tag); return stack; } - return super.getCloneItemStack(state, target, level, pos, player); + return super.getCloneItemStack(level, pos, state); } public boolean openTextEdit(ServerPlayer player, StoneTabletBlockEntity blockEntity) { @@ -220,9 +214,7 @@ public boolean openTextEdit(ServerPlayer player, StoneTabletBlockEntity blockEnt if (!hasEditableText(player, blockEntity)) return false; blockEntity.setAllowedPlayerEditor(player.getUUID()); - DGNetwork.CHANNEL.send( - PacketDistributor.PLAYER.with(() -> player), - new EngraveStoneTabletPacket(blockEntity.getBlockPos())); + DGNetwork.CHANNEL.sendToClientPlayer(player, new EngraveStoneTabletPacket(blockEntity.getBlockPos())); return true; } @@ -232,20 +224,9 @@ private boolean otherPlayerIsEditingSign(Player player, StoneTabletBlockEntity s return id != null && !id.equals(player.getUUID()); } - @OnlyIn(Dist.CLIENT) - public static void openScreen(BlockPos pos) { - Minecraft mc = Minecraft.getInstance(); - var level = mc.level; - var player = mc.player; - if (level != null && player != null && level.getBlockEntity(pos) instanceof StoneTabletBlockEntity tile) { - var stack = player.getItemInHand(player.getUsedItemHand()); - mc.setScreen(new StoneTabletScreen(tile, stack, mc.isTextFilteringEnabled())); - } - } - @Override public BlockEntityType getType() { - return OBlockEntities.STONE_TABLET.get(); + return DGBlockEntities.STONE_TABLET.get(); } public enum Type implements StringRepresentable { diff --git a/src/main/java/galena/doom_and_gloom/content/block/StoneTabletBlockEntity.java b/common/src/main/java/galena/doom_and_gloom/content/block/StoneTabletBlockEntity.java similarity index 98% rename from src/main/java/galena/doom_and_gloom/content/block/StoneTabletBlockEntity.java rename to common/src/main/java/galena/doom_and_gloom/content/block/StoneTabletBlockEntity.java index 91420181..1c56ce58 100644 --- a/src/main/java/galena/doom_and_gloom/content/block/StoneTabletBlockEntity.java +++ b/common/src/main/java/galena/doom_and_gloom/content/block/StoneTabletBlockEntity.java @@ -3,7 +3,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import galena.doom_and_gloom.DoomAndGloom; import galena.doom_and_gloom.content.entity.Ticking; -import galena.doom_and_gloom.index.OBlockEntities; +import galena.doom_and_gloom.index.DGBlockEntities; import java.util.List; import java.util.UUID; import java.util.function.UnaryOperator; @@ -37,7 +37,7 @@ public class StoneTabletBlockEntity extends BlockEntity implements Ticking { public final StoneTabletBlock.Type type; public StoneTabletBlockEntity(BlockPos pos, BlockState blockState) { - super(OBlockEntities.STONE_TABLET.get(), pos, blockState); + super(DGBlockEntities.STONE_TABLET.get(), pos, blockState); this.type = ((StoneTabletBlock) blockState.getBlock()).type; } diff --git a/src/main/java/galena/doom_and_gloom/content/block/StoneTabletText.java b/common/src/main/java/galena/doom_and_gloom/content/block/StoneTabletText.java similarity index 100% rename from src/main/java/galena/doom_and_gloom/content/block/StoneTabletText.java rename to common/src/main/java/galena/doom_and_gloom/content/block/StoneTabletText.java diff --git a/src/main/java/galena/doom_and_gloom/content/block/TickingEntityBlock.java b/common/src/main/java/galena/doom_and_gloom/content/block/TickingEntityBlock.java similarity index 100% rename from src/main/java/galena/doom_and_gloom/content/block/TickingEntityBlock.java rename to common/src/main/java/galena/doom_and_gloom/content/block/TickingEntityBlock.java diff --git a/src/main/java/galena/doom_and_gloom/content/block/VigilCandleBlock.java b/common/src/main/java/galena/doom_and_gloom/content/block/VigilCandleBlock.java similarity index 98% rename from src/main/java/galena/doom_and_gloom/content/block/VigilCandleBlock.java rename to common/src/main/java/galena/doom_and_gloom/content/block/VigilCandleBlock.java index 8fc70a17..a1302da2 100644 --- a/src/main/java/galena/doom_and_gloom/content/block/VigilCandleBlock.java +++ b/common/src/main/java/galena/doom_and_gloom/content/block/VigilCandleBlock.java @@ -6,7 +6,7 @@ import static net.minecraft.world.level.block.state.properties.BlockStateProperties.CANDLES; import galena.doom_and_gloom.content.entity.VigilCandleBlockEntity; -import galena.doom_and_gloom.index.OBlockEntities; +import galena.doom_and_gloom.index.DGBlockEntities; import java.util.Optional; import java.util.function.ToIntFunction; import net.minecraft.core.BlockPos; @@ -132,7 +132,7 @@ public boolean placeLiquid(LevelAccessor level, BlockPos pos, BlockState state, @Override public BlockEntityType getType() { - return OBlockEntities.VIGIL_CANDLE.get(); + return DGBlockEntities.VIGIL_CANDLE.get(); } @Override diff --git a/src/main/java/galena/doom_and_gloom/content/effect/FogEffect.java b/common/src/main/java/galena/doom_and_gloom/content/effect/FogEffect.java similarity index 87% rename from src/main/java/galena/doom_and_gloom/content/effect/FogEffect.java rename to common/src/main/java/galena/doom_and_gloom/content/effect/FogEffect.java index 74387e9e..be79e06e 100644 --- a/src/main/java/galena/doom_and_gloom/content/effect/FogEffect.java +++ b/common/src/main/java/galena/doom_and_gloom/content/effect/FogEffect.java @@ -7,7 +7,7 @@ public class FogEffect extends MobEffect { public FogEffect() { - super(MobEffectCategory.HARMFUL, 2696993); + super(MobEffectCategory.HARMFUL, 0x514AA1); this.setFactorDataFactory(() -> new MobEffectInstance.FactorData(22)); } diff --git a/src/main/java/galena/doom_and_gloom/content/effect/WardingEffect.java b/common/src/main/java/galena/doom_and_gloom/content/effect/WardingEffect.java similarity index 100% rename from src/main/java/galena/doom_and_gloom/content/effect/WardingEffect.java rename to common/src/main/java/galena/doom_and_gloom/content/effect/WardingEffect.java diff --git a/src/main/java/galena/doom_and_gloom/content/entity/DirtMound.java b/common/src/main/java/galena/doom_and_gloom/content/entity/DirtMound.java similarity index 95% rename from src/main/java/galena/doom_and_gloom/content/entity/DirtMound.java rename to common/src/main/java/galena/doom_and_gloom/content/entity/DirtMound.java index c1bc49ef..df60e979 100644 --- a/src/main/java/galena/doom_and_gloom/content/entity/DirtMound.java +++ b/common/src/main/java/galena/doom_and_gloom/content/entity/DirtMound.java @@ -1,6 +1,6 @@ package galena.doom_and_gloom.content.entity; -import galena.doom_and_gloom.index.OTags; +import galena.doom_and_gloom.index.DGTags; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; @@ -43,7 +43,7 @@ public void tick() { var pos = blockPosition(); if(tickCount % 10 != 0) return; - if (!level.getBlockState(pos).isAir() || !level.getBlockState(pos.below()).is(OTags.Blocks.CAN_TURN_INTO_BURIAL_DIRT)) { + if (!level.getBlockState(pos).isAir() || !level.getBlockState(pos.below()).is(DGTags.Blocks.CAN_TURN_INTO_BURIAL_DIRT)) { spawnMonster(level, pos); discard(); return; diff --git a/common/src/main/java/galena/doom_and_gloom/content/entity/ISepulcherable.java b/common/src/main/java/galena/doom_and_gloom/content/entity/ISepulcherable.java new file mode 100644 index 00000000..e639e130 --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/content/entity/ISepulcherable.java @@ -0,0 +1,17 @@ +package galena.doom_and_gloom.content.entity; + +import galena.doom_and_gloom.DoomAndGloom; +import net.minecraft.world.entity.LivingEntity; + +public interface ISepulcherable { + String DG_TAG_KEY = DoomAndGloom.MOD_ID + ":sepulched"; + + static ISepulcherable cast(LivingEntity entity) { + return (ISepulcherable) entity; + } + + void DG$setSepulchered(boolean sepulchered); + + boolean DG$wasSepulchered(); + +} diff --git a/src/main/java/galena/doom_and_gloom/content/entity/SepulcherBlockEntity.java b/common/src/main/java/galena/doom_and_gloom/content/entity/SepulcherBlockEntity.java similarity index 67% rename from src/main/java/galena/doom_and_gloom/content/entity/SepulcherBlockEntity.java rename to common/src/main/java/galena/doom_and_gloom/content/entity/SepulcherBlockEntity.java index 9f760944..e1ab705f 100644 --- a/src/main/java/galena/doom_and_gloom/content/entity/SepulcherBlockEntity.java +++ b/common/src/main/java/galena/doom_and_gloom/content/entity/SepulcherBlockEntity.java @@ -1,18 +1,16 @@ package galena.doom_and_gloom.content.entity; import galena.doom_and_gloom.DGConfig; -import galena.doom_and_gloom.DoomAndGloom; import galena.doom_and_gloom.content.block.SepulcherBlock; -import galena.doom_and_gloom.index.OBlockEntities; -import galena.doom_and_gloom.index.OBlocks; -import galena.doom_and_gloom.index.OSoundEvents; -import galena.doom_and_gloom.index.OTags; +import galena.doom_and_gloom.index.DGBlockEntities; +import galena.doom_and_gloom.index.DGBlocks; +import galena.doom_and_gloom.index.DGSoundEvents; +import galena.doom_and_gloom.index.DGTags; import galena.doom_and_gloom.network.DGNetwork; import galena.doom_and_gloom.network.packet.SepulcherConsumesDeathPacket; import galena.doom_and_gloom.network.packet.SepulcherRotsPacket; import java.util.function.Supplier; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvent; @@ -31,24 +29,16 @@ import net.minecraft.world.level.gameevent.GameEventListener; import net.minecraft.world.level.gameevent.PositionSource; import net.minecraft.world.phys.Vec3; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.ForgeCapabilities; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.items.wrapper.InvWrapper; -import net.minecraftforge.network.PacketDistributor; -import org.jetbrains.annotations.NotNull; public class SepulcherBlockEntity extends BlockEntity implements Ticking, Container, GameEventListener.Holder { private final DeathListener listener; - private LazyOptional itemHandler; private int progress = 0; private boolean heated = false; public SepulcherBlockEntity(BlockPos pos, BlockState state) { - super(OBlockEntities.SEPULCHER.get(), pos, state); + super(DGBlockEntities.SEPULCHER.get(), pos, state); this.listener = new DeathListener(); - this.itemHandler = createItemHandler(); } private int progressNeeded(int fillLevel) { @@ -76,18 +66,15 @@ public void tick(BlockState state, Level level, BlockPos pos) { progress = 0; if (fillLevel == SepulcherBlock.MAX_LEVEL) { - sound(OSoundEvents.SEPULCHER_SEALING, 1F); + sound(DGSoundEvents.SEPULCHER_SEALING, 1F); } else if (nextLevel == SepulcherBlock.READY) { - sound(OSoundEvents.SEPULCHER_UNSEALING, 1F); + sound(DGSoundEvents.SEPULCHER_UNSEALING, 1F); } else { - sound(OSoundEvents.SEPULCHER_ROTTING, 0.5F); + sound(DGSoundEvents.SEPULCHER_ROTTING, 0.5F); } - if(!level.isClientSide()) { - DGNetwork.CHANNEL.send( - PacketDistributor.NEAR.with(PacketDistributor.TargetPoint.p(pos.getX(), pos.getY(), pos.getZ(), 16.0, level.dimension())), - new SepulcherRotsPacket(pos) - ); + if (!level.isClientSide()) { + DGNetwork.CHANNEL.sendToAllClientPlayersInRange(level, pos, 16.0, new SepulcherRotsPacket(pos)); } } @@ -99,7 +86,7 @@ private void sound(Supplier sound, float volume) { private void checkHeatSource(Level level, BlockPos pos) { var below = pos.below(); var belowState = level.getBlockState(below); - heated = belowState.is(OTags.Blocks.HEAT_SOURCE); + heated = belowState.is(DGTags.Blocks.HEAT_SOURCE); } @Override @@ -116,10 +103,6 @@ public void load(CompoundTag nbt) { heated = nbt.getBoolean("heated"); } - public static boolean wasConsumerBySepulcher(Entity entity) { - return entity.getPersistentData().getBoolean(DeathListener.TAG_KEY); - } - @Override public DeathListener getListener() { return listener; @@ -129,48 +112,48 @@ public class DeathListener implements GameEventListener { private final PositionSource listenerSource; private final int listenerRadius; - private static final String TAG_KEY = DoomAndGloom.MOD_ID + ":sepulched"; - public DeathListener() { this.listenerSource = new BlockPositionSource(SepulcherBlockEntity.this.getBlockPos()); this.listenerRadius = 3; } + @Override public PositionSource getListenerSource() { return this.listenerSource; } + @Override public int getListenerRadius() { return this.listenerRadius; } + @Override public boolean handleGameEvent(ServerLevel level, GameEvent event, GameEvent.Context context, Vec3 vec) { if (event != GameEvent.ENTITY_DIE) return false; - var entity = context.sourceEntity(); - if (entity == null) return false; - if (wasConsumerBySepulcher(entity)) return false; + Entity entity = context.sourceEntity(); + if (!(entity instanceof LivingEntity living)) return false; + ISepulcherable sepulchered = ISepulcherable.cast(living); + if (sepulchered.DG$wasSepulchered()) return false; - if (!entity.getType().is(OTags.Entities.FILLS_SEPULCHER)) return false; + if (!entity.getType().is(DGTags.Entities.FILLS_SEPULCHER)) return false; - var state = getBlockState(); - var fillLevel = state.getValue(SepulcherBlock.LEVEL); + BlockState state = getBlockState(); + int fillLevel = state.getValue(SepulcherBlock.LEVEL); if (fillLevel >= SepulcherBlock.MAX_LEVEL) return false; - entity.getPersistentData().putBoolean(TAG_KEY, true); + sepulchered.DG$setSepulchered(true); - if (entity instanceof LivingEntity living && !(entity instanceof Player)) { + if (!(entity instanceof Player)) { living.skipDropExperience(); } SepulcherBlock.insert(null, state, level, getBlockPos(), level.random.nextIntBetweenInclusive(3, 4)); - sound(OSoundEvents.SEPULCHER_CORPSE_STUFFED, 1F); + sound(DGSoundEvents.SEPULCHER_CORPSE_STUFFED, 1F); - DGNetwork.CHANNEL.send( - PacketDistributor.NEAR.with(PacketDistributor.TargetPoint.p(vec.x, vec.y, vec.z, 16.0, entity.level().dimension())), - new SepulcherConsumesDeathPacket(vec) + DGNetwork.CHANNEL.sendToAllClientPlayersInRange(entity.level(), BlockPos.containing(vec), 16.0, new SepulcherConsumesDeathPacket(vec) ); entity.setPos(Vec3.atCenterOf(getBlockPos())); @@ -180,22 +163,6 @@ public boolean handleGameEvent(ServerLevel level, GameEvent event, GameEvent.Con } } - @Override - public void invalidateCaps() { - super.invalidateCaps(); - itemHandler.invalidate(); - } - - @Override - public void reviveCaps() { - super.reviveCaps(); - itemHandler = createItemHandler(); - } - - private LazyOptional createItemHandler() { - return LazyOptional.of(() -> new InvWrapper(this)); - } - @Override public int getContainerSize() { return 1; @@ -210,7 +177,7 @@ public boolean isEmpty() { @Override public ItemStack getItem(int slot) { var fillLevel = getBlockState().getValue(SepulcherBlock.LEVEL); - if (fillLevel == SepulcherBlock.READY) return new ItemStack(OBlocks.BONE_PILE.get()); + if (fillLevel == SepulcherBlock.READY) return new ItemStack(DGBlocks.BONE_PILE.get()); return ItemStack.EMPTY; } @@ -251,12 +218,4 @@ public void clearContent() { SepulcherBlock.clear(null, getBlockState(), getLevel(), getBlockPos()); } - @Override - public @NotNull LazyOptional getCapability(@NotNull Capability capability, Direction facing) { - if (capability == ForgeCapabilities.ITEM_HANDLER && facing != null && !this.remove) { - return itemHandler.cast(); - } else { - return super.getCapability(capability, facing); - } - } } diff --git a/src/main/java/galena/doom_and_gloom/content/entity/Ticking.java b/common/src/main/java/galena/doom_and_gloom/content/entity/Ticking.java similarity index 100% rename from src/main/java/galena/doom_and_gloom/content/entity/Ticking.java rename to common/src/main/java/galena/doom_and_gloom/content/entity/Ticking.java diff --git a/src/main/java/galena/doom_and_gloom/content/entity/VigilCandleBlockEntity.java b/common/src/main/java/galena/doom_and_gloom/content/entity/VigilCandleBlockEntity.java similarity index 67% rename from src/main/java/galena/doom_and_gloom/content/entity/VigilCandleBlockEntity.java rename to common/src/main/java/galena/doom_and_gloom/content/entity/VigilCandleBlockEntity.java index 247421e8..d154f873 100644 --- a/src/main/java/galena/doom_and_gloom/content/entity/VigilCandleBlockEntity.java +++ b/common/src/main/java/galena/doom_and_gloom/content/entity/VigilCandleBlockEntity.java @@ -1,8 +1,8 @@ package galena.doom_and_gloom.content.entity; -import galena.doom_and_gloom.index.OBlockEntities; -import galena.doom_and_gloom.index.OEffects; -import galena.doom_and_gloom.index.OTags; +import galena.doom_and_gloom.index.DGBlockEntities; +import galena.doom_and_gloom.index.DGEffects; +import galena.doom_and_gloom.index.DGTags; import net.minecraft.core.BlockPos; import net.minecraft.core.registries.Registries; import net.minecraft.world.effect.MobEffectInstance; @@ -16,7 +16,7 @@ public class VigilCandleBlockEntity extends BlockEntity implements Ticking { public VigilCandleBlockEntity(BlockPos pos, BlockState state) { - super(OBlockEntities.VIGIL_CANDLE.get(), pos, state); + super(DGBlockEntities.VIGIL_CANDLE.get(), pos, state); } @Override @@ -28,16 +28,16 @@ public void tick(BlockState state, Level level, BlockPos pos) { var entities = level.getEntitiesOfClass(LivingEntity.class, new AABB(pos).inflate(range)); var effects = level.registryAccess().registryOrThrow(Registries.MOB_EFFECT); - var shouldClear = effects.getTagOrEmpty(OTags.Effects.VIGIL_CANDLE_CLEARS); + var shouldClear = effects.getTagOrEmpty(DGTags.Effects.VIGIL_CANDLE_CLEARS); entities.forEach(entity -> { shouldClear.forEach(effect -> { - entity.removeEffect(effect.get()); + entity.removeEffect(effect.value()); }); var duration = 20 * 5; - if (!entity.hasEffect(OEffects.WARDING.get()) || entity.getEffect(OEffects.WARDING.get()).endsWithin(duration - 1)) { - entity.addEffect(new MobEffectInstance(OEffects.WARDING.get(), duration, 0, false, false, false)); + if (!entity.hasEffect(DGEffects.WARDING.get()) || entity.getEffect(DGEffects.WARDING.get()).endsWithin(duration - 1)) { + entity.addEffect(new MobEffectInstance(DGEffects.WARDING.get(), duration, 0, false, false, false)); } }); } diff --git a/src/main/java/galena/doom_and_gloom/content/entity/holler/Holler.java b/common/src/main/java/galena/doom_and_gloom/content/entity/holler/Holler.java similarity index 89% rename from src/main/java/galena/doom_and_gloom/content/entity/holler/Holler.java rename to common/src/main/java/galena/doom_and_gloom/content/entity/holler/Holler.java index 036f5cb1..55b301fc 100644 --- a/src/main/java/galena/doom_and_gloom/content/entity/holler/Holler.java +++ b/common/src/main/java/galena/doom_and_gloom/content/entity/holler/Holler.java @@ -1,7 +1,7 @@ package galena.doom_and_gloom.content.entity.holler; import galena.doom_and_gloom.index.*; -import galena.doom_and_gloom.index.OBlocks; +import galena.doom_and_gloom.index.DGBlocks; import java.time.LocalDate; import java.time.temporal.ChronoField; import java.util.List; @@ -77,7 +77,7 @@ protected void registerGoals() { goalSelector.addGoal(4, new LookAtPlayerGoal(this, Player.class, 16.0F)); goalSelector.addGoal(9, new HollerStrollGoal(this, 1F)); - targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, false, it -> !it.hasEffect(OEffects.WARDING.get()))); + targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, false, it -> !it.hasEffect(DGEffects.WARDING.get()))); } @Override @@ -99,13 +99,13 @@ public static void applyFogAround(ServerLevel level, Vec3 pos, Entity source, in var applied = level.getPlayers(player -> player.gameMode.isSurvival() && pos.closerThan(player.position(), radius) - && (!player.hasEffect(OEffects.FOG.get()) || player.getEffect(OEffects.FOG.get()).endsWithin(duration - 1)) - && !player.hasEffect(OEffects.WARDING.get()) + && (!player.hasEffect(DGEffects.FOG.get()) || player.getEffect(DGEffects.FOG.get()).endsWithin(duration - 1)) + && !player.hasEffect(DGEffects.WARDING.get()) ); applied.forEach(it -> { - it.addEffect(new MobEffectInstance(OEffects.FOG.get(), 260, 0, false, false), source); - level.playSound(it, source, OSoundEvents.HOLLER_SHRIEKS.get(), source.getSoundSource(), 1F, 1F); + it.addEffect(new MobEffectInstance(DGEffects.FOG.get(), 260, 0, false, false), source); + level.playSound(it, source, DGSoundEvents.HOLLER_SHRIEKS.get(), source.getSoundSource(), 1F, 1F); }); } @@ -214,17 +214,17 @@ protected void checkFallDamage(double p_218316_, boolean p_218317_, BlockState s @Override protected SoundEvent getAmbientSound() { - return OSoundEvents.HOLLER_HOLLERS.get(); + return DGSoundEvents.HOLLER_HOLLERS.get(); } @Override public SoundEvent getHurtSound(DamageSource damageSource) { - return OSoundEvents.HOLLER_HURTS.get(); + return DGSoundEvents.HOLLER_HURTS.get(); } @Override protected SoundEvent getDeathSound() { - return OSoundEvents.HOLLER_DEATH.get(); + return DGSoundEvents.HOLLER_DEATH.get(); } @Override @@ -233,7 +233,7 @@ protected float getSoundVolume() { } void disappear() { - playSound(OSoundEvents.HOLLER_SHRIEKS.get(), 1F, 1F); + playSound(DGSoundEvents.HOLLER_SHRIEKS.get(), 1F, 1F); discard(); } @@ -250,11 +250,11 @@ public void panicFinish(Vec3 target) { for (int i = 0; i < 6; i++) { var vec = Vec3.atCenterOf(blockPosition()).add(Math.random() * 1 - 0.5, Math.random() * 1 - 0.5, Math.random() * 1 - 0.5); - level.sendParticles(OParticleTypes.HOLLERING_SOUL.get(), vec.x, vec.y, vec.z, 1, 0, 0, 0, 0); + level.sendParticles(DGParticleTypes.HOLLERING_SOUL.get(), vec.x, vec.y, vec.z, 1, 0, 0, 0, 0); } level.getBlockEntity(blockPosition(), BlockEntityType.JUKEBOX).ifPresent(jukebox -> { - var stack = new ItemStack(OItems.MUSIC_DISC_AFTERLIFE.get()); + var stack = new ItemStack(DGItems.MUSIC_DISC_AFTERLIFE.get()); jukebox.setFirstItem(stack); }); } else { @@ -267,7 +267,7 @@ private void curseBlock(ServerLevel level, BlockPos pos) { if (level.random.nextDouble() > 0.3) return; if (level.random.nextBoolean()) { - level.setBlockAndUpdate(pos, OBlocks.BURIAL_DIRT.get().defaultBlockState()); + level.setBlockAndUpdate(pos, DGBlocks.BURIAL_DIRT.get().defaultBlockState()); } else if (level.random.nextBoolean()) { level.setBlockAndUpdate(pos, Blocks.DIRT.defaultBlockState()); } else { @@ -275,7 +275,7 @@ private void curseBlock(ServerLevel level, BlockPos pos) { } var vec = Vec3.atCenterOf(pos.above()); - level.sendParticles(OParticleTypes.HOLLERING_SOUL.get(), vec.x, vec.y, vec.z, 4, 0.5, 0.5, 0.5, 0.01); + level.sendParticles(DGParticleTypes.HOLLERING_SOUL.get(), vec.x, vec.y, vec.z, 4, 0.5, 0.5, 0.5, 0.01); } private void curseGround(ServerLevel level, BlockPos center) { @@ -283,7 +283,7 @@ private void curseGround(ServerLevel level, BlockPos center) { BlockPos.betweenClosedStream(aabb).forEach(pos -> { var state = level.getBlockState(pos); var above = level.getBlockState(pos.above()); - if (state.is(OTags.Blocks.CAN_TURN_INTO_BURIAL_DIRT) && above.canBeReplaced()) { + if (state.is(DGTags.Blocks.CAN_TURN_INTO_BURIAL_DIRT) && above.canBeReplaced()) { curseBlock(level, pos); } }); diff --git a/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerAvoidGoal.java b/common/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerAvoidGoal.java similarity index 94% rename from src/main/java/galena/doom_and_gloom/content/entity/holler/HollerAvoidGoal.java rename to common/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerAvoidGoal.java index 53cffe75..24f4bbbf 100644 --- a/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerAvoidGoal.java +++ b/common/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerAvoidGoal.java @@ -1,6 +1,6 @@ package galena.doom_and_gloom.content.entity.holler; -import galena.doom_and_gloom.index.OEffects; +import galena.doom_and_gloom.index.DGEffects; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.ai.goal.Goal; import net.minecraft.world.entity.ai.targeting.TargetingConditions; @@ -42,7 +42,7 @@ public boolean canUse() { } if (avoid != null) { - disapearAfterwards = avoid.hasEffect(OEffects.WARDING.get()); + disapearAfterwards = avoid.hasEffect(DGEffects.WARDING.get()); var target = mob.position().subtract(avoid.position()); var radius = disapearAfterwards ? 24 : 4; var away = AirRandomPos.getPosTowards(mob, radius, 1, 0, target, 1F); diff --git a/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerFollowGoal.java b/common/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerFollowGoal.java similarity index 95% rename from src/main/java/galena/doom_and_gloom/content/entity/holler/HollerFollowGoal.java rename to common/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerFollowGoal.java index 7573f028..40475424 100644 --- a/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerFollowGoal.java +++ b/common/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerFollowGoal.java @@ -1,6 +1,6 @@ package galena.doom_and_gloom.content.entity.holler; -import galena.doom_and_gloom.index.OEffects; +import galena.doom_and_gloom.index.DGEffects; import net.minecraft.world.entity.PathfinderMob; import net.minecraft.world.entity.ai.behavior.EntityTracker; import net.minecraft.world.entity.ai.goal.Goal; @@ -38,7 +38,7 @@ private boolean tooClose() { if(target == null) return false; var distanceSquared = mob.distanceToSqr(target); - if(target.hasEffect(OEffects.FOG.get())) { + if(target.hasEffect(DGEffects.FOG.get())) { return false; } diff --git a/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerPanicGoal.java b/common/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerPanicGoal.java similarity index 93% rename from src/main/java/galena/doom_and_gloom/content/entity/holler/HollerPanicGoal.java rename to common/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerPanicGoal.java index 738a7da8..e16b7ac9 100644 --- a/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerPanicGoal.java +++ b/common/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerPanicGoal.java @@ -1,6 +1,6 @@ package galena.doom_and_gloom.content.entity.holler; -import galena.doom_and_gloom.index.OTags; +import galena.doom_and_gloom.index.DGTags; import java.util.Optional; import java.util.function.Predicate; import net.minecraft.core.BlockPos; @@ -59,6 +59,6 @@ private Optional findPos(Predicate filter) { private Optional findTargetPos() { return findPos(state -> state.is(Blocks.JUKEBOX) && !state.getValue(JukeboxBlock.HAS_RECORD)) - .or(() -> findPos(state -> state.is(OTags.Blocks.CAN_TURN_INTO_BURIAL_DIRT))); + .or(() -> findPos(state -> state.is(DGTags.Blocks.CAN_TURN_INTO_BURIAL_DIRT))); } } diff --git a/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerStrollGoal.java b/common/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerStrollGoal.java similarity index 100% rename from src/main/java/galena/doom_and_gloom/content/entity/holler/HollerStrollGoal.java rename to common/src/main/java/galena/doom_and_gloom/content/entity/holler/HollerStrollGoal.java diff --git a/src/main/java/galena/doom_and_gloom/content/item/BushHammerItem.java b/common/src/main/java/galena/doom_and_gloom/content/item/BushHammerItem.java similarity index 63% rename from src/main/java/galena/doom_and_gloom/content/item/BushHammerItem.java rename to common/src/main/java/galena/doom_and_gloom/content/item/BushHammerItem.java index b6426e61..98f736dd 100644 --- a/src/main/java/galena/doom_and_gloom/content/item/BushHammerItem.java +++ b/common/src/main/java/galena/doom_and_gloom/content/item/BushHammerItem.java @@ -1,12 +1,12 @@ package galena.doom_and_gloom.content.item; -import galena.doom_and_gloom.index.OTags; +import galena.doom_and_gloom.index.DGTags; import net.minecraft.world.item.*; public class BushHammerItem extends DiggerItem { public BushHammerItem(Tier tier, float attack, float modifier, Item.Properties properties) { - super(attack, modifier, tier, OTags.Blocks.MINEABLE_WITH_BUSH_HAMMER, properties); + super(attack, modifier, tier, DGTags.Blocks.MINEABLE_WITH_BUSH_HAMMER, properties); } } diff --git a/src/main/java/galena/doom_and_gloom/content/item/HammerAndChiselItem.java b/common/src/main/java/galena/doom_and_gloom/content/item/HammerAndChiselItem.java similarity index 83% rename from src/main/java/galena/doom_and_gloom/content/item/HammerAndChiselItem.java rename to common/src/main/java/galena/doom_and_gloom/content/item/HammerAndChiselItem.java index 929dc0df..7816485d 100644 --- a/src/main/java/galena/doom_and_gloom/content/item/HammerAndChiselItem.java +++ b/common/src/main/java/galena/doom_and_gloom/content/item/HammerAndChiselItem.java @@ -2,11 +2,13 @@ import galena.doom_and_gloom.content.block.StoneTabletBlock; import galena.doom_and_gloom.content.block.StoneTabletBlockEntity; -import galena.doom_and_gloom.index.OItems; +import galena.doom_and_gloom.index.DGItems; +import java.util.Map; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; @@ -26,7 +28,7 @@ protected boolean updateCustomBlockEntityTag(BlockPos pos, Level level, @Nullabl if (!updated && player instanceof ServerPlayer serverPlayer) { if (level.getBlockEntity(pos) instanceof StoneTabletBlockEntity blockEntity && state.getBlock() instanceof StoneTabletBlock block) { if(!serverPlayer.getAbilities().instabuild) { - serverPlayer.setItemInHand(serverPlayer.getUsedItemHand(), new ItemStack(OItems.BUSH_HAMMER.get())); + serverPlayer.setItemInHand(serverPlayer.getUsedItemHand(), new ItemStack(DGItems.BUSH_HAMMER.get())); } block.openTextEdit(serverPlayer, blockEntity); } @@ -39,4 +41,10 @@ protected boolean updateCustomBlockEntityTag(BlockPos pos, Level level, @Nullabl public String getDescriptionId() { return this.getOrCreateDescriptionId(); } + + @Override + public void registerBlocks(Map map, Item item) { + // we don't want this to replace the actual stone_tablet item + } + } \ No newline at end of file diff --git a/common/src/main/java/galena/doom_and_gloom/content/listing/BuyTagListing.java b/common/src/main/java/galena/doom_and_gloom/content/listing/BuyTagListing.java new file mode 100644 index 00000000..098b5005 --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/content/listing/BuyTagListing.java @@ -0,0 +1,53 @@ +package galena.doom_and_gloom.content.listing; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.mehvahdjukaar.moonlight.api.misc.StrOpt; +import net.mehvahdjukaar.moonlight.api.trades.ModItemListing; +import net.minecraft.core.Holder; +import net.minecraft.core.registries.Registries; +import net.minecraft.tags.TagKey; +import net.minecraft.util.ExtraCodecs; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.trading.MerchantOffer; + +public record BuyTagListing(TagKey want, int count, ItemStack offer, int maxTrades, int xp, float priceMult, + int level) implements ModItemListing { + + public static final Codec CODEC = RecordCodecBuilder.create(builder -> + builder.group( + TagKey.codec(Registries.ITEM).fieldOf("price").forGetter(BuyTagListing::want), + StrOpt.of(ExtraCodecs.POSITIVE_INT, "count", 1).forGetter(BuyTagListing::count), + ItemStack.CODEC.fieldOf("offer").forGetter(BuyTagListing::offer), + StrOpt.of(ExtraCodecs.POSITIVE_INT, "max_trades", 16).forGetter(BuyTagListing::maxTrades), + StrOpt.of(ExtraCodecs.POSITIVE_INT, "xp", 1).forGetter(BuyTagListing::xp), + StrOpt.of(ExtraCodecs.POSITIVE_FLOAT, "price_multiplier", 1F).forGetter(BuyTagListing::priceMult), + StrOpt.of(Codec.intRange(1, 5), "level", 1).forGetter(BuyTagListing::level) + ).apply(builder, BuyTagListing::new) + ); + + @Override + public Codec getCodec() { + return CODEC; + } + + @Override + public int getLevel() { + return level; + } + + @Override + public MerchantOffer getOffer(Entity entity, RandomSource random) { + var registry = entity.level().registryAccess().registryOrThrow(Registries.ITEM); + return registry.getOrCreateTag(want) + .getRandomElement(random) + .map(Holder::value) + .map(Item::getDefaultInstance) + .map(want -> new MerchantOffer(want, offer, maxTrades, xp, priceMult)) + .orElse(null); + } + +} diff --git a/common/src/main/java/galena/doom_and_gloom/content/listing/SellEnchantedListing.java b/common/src/main/java/galena/doom_and_gloom/content/listing/SellEnchantedListing.java new file mode 100644 index 00000000..2834ef9c --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/content/listing/SellEnchantedListing.java @@ -0,0 +1,48 @@ +package galena.doom_and_gloom.content.listing; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.mehvahdjukaar.moonlight.api.misc.StrOpt; +import net.mehvahdjukaar.moonlight.api.trades.ModItemListing; +import net.minecraft.util.ExtraCodecs; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.enchantment.EnchantmentHelper; +import net.minecraft.world.item.trading.MerchantOffer; + +/** + * this can be done on 1.21.1 with the default {@link net.mehvahdjukaar.moonlight.api.trades.SimpleItemListing} and loot functions + */ +public record SellEnchantedListing(ItemStack want, ItemStack offer, int maxTrades, int xp, float priceMult, + int level) implements ModItemListing { + + public static final Codec CODEC = RecordCodecBuilder.create(builder -> + builder.group( + ItemStack.CODEC.fieldOf("price").forGetter(SellEnchantedListing::want), + ItemStack.CODEC.fieldOf("offer").forGetter(SellEnchantedListing::offer), + StrOpt.of(ExtraCodecs.POSITIVE_INT, "max_trades", 16).forGetter(SellEnchantedListing::maxTrades), + StrOpt.of(ExtraCodecs.POSITIVE_INT, "xp", 1).forGetter(SellEnchantedListing::xp), + StrOpt.of(ExtraCodecs.POSITIVE_FLOAT, "price_multiplier", 1F).forGetter(SellEnchantedListing::priceMult), + StrOpt.of(Codec.intRange(1, 5), "level", 1).forGetter(SellEnchantedListing::level) + ).apply(builder, SellEnchantedListing::new) + ); + + @Override + public Codec getCodec() { + return CODEC; + } + + @Override + public int getLevel() { + return level; + } + + @Override + public MerchantOffer getOffer(Entity entity, RandomSource random) { + int level = 5 + random.nextInt(15); + var enchanted = EnchantmentHelper.enchantItem(random, offer.copy(), level, false); + return new MerchantOffer(want, enchanted, maxTrades, xp, priceMult); + } + +} diff --git a/common/src/main/java/galena/doom_and_gloom/content/listing/SellTagListing.java b/common/src/main/java/galena/doom_and_gloom/content/listing/SellTagListing.java new file mode 100644 index 00000000..0bee8ded --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/content/listing/SellTagListing.java @@ -0,0 +1,53 @@ +package galena.doom_and_gloom.content.listing; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import net.mehvahdjukaar.moonlight.api.misc.StrOpt; +import net.mehvahdjukaar.moonlight.api.trades.ModItemListing; +import net.minecraft.core.Holder; +import net.minecraft.core.registries.Registries; +import net.minecraft.tags.TagKey; +import net.minecraft.util.ExtraCodecs; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.trading.MerchantOffer; + +public record SellTagListing(ItemStack want, TagKey offer, int count, int maxTrades, int xp, float priceMult, + int level) implements ModItemListing { + + public static final Codec CODEC = RecordCodecBuilder.create(builder -> + builder.group( + ItemStack.CODEC.fieldOf("price").forGetter(SellTagListing::want), + TagKey.codec(Registries.ITEM).fieldOf("offer").forGetter(SellTagListing::offer), + StrOpt.of(ExtraCodecs.POSITIVE_INT, "count", 1).forGetter(SellTagListing::count), + StrOpt.of(ExtraCodecs.POSITIVE_INT, "max_trades", 16).forGetter(SellTagListing::maxTrades), + StrOpt.of(ExtraCodecs.POSITIVE_INT, "xp", 1).forGetter(SellTagListing::xp), + StrOpt.of(ExtraCodecs.POSITIVE_FLOAT, "price_multiplier", 1F).forGetter(SellTagListing::priceMult), + StrOpt.of(Codec.intRange(1, 5), "level", 1).forGetter(SellTagListing::level) + ).apply(builder, SellTagListing::new) + ); + + @Override + public Codec getCodec() { + return CODEC; + } + + @Override + public int getLevel() { + return level; + } + + @Override + public MerchantOffer getOffer(Entity entity, RandomSource random) { + var registry = entity.level().registryAccess().registryOrThrow(Registries.ITEM); + return registry.getOrCreateTag(offer) + .getRandomElement(random) + .map(Holder::value) + .map(Item::getDefaultInstance) + .map(offer -> new MerchantOffer(want, offer, maxTrades, xp, priceMult)) + .orElse(null); + } + +} diff --git a/src/main/java/galena/doom_and_gloom/world/gen/VillageStructureModifier.java b/common/src/main/java/galena/doom_and_gloom/gen/VillageStructureModifier.java similarity index 99% rename from src/main/java/galena/doom_and_gloom/world/gen/VillageStructureModifier.java rename to common/src/main/java/galena/doom_and_gloom/gen/VillageStructureModifier.java index 9e470bf0..f5d4bff4 100644 --- a/src/main/java/galena/doom_and_gloom/world/gen/VillageStructureModifier.java +++ b/common/src/main/java/galena/doom_and_gloom/gen/VillageStructureModifier.java @@ -1,4 +1,4 @@ -package galena.doom_and_gloom.world.gen; +package galena.doom_and_gloom.gen; import com.mojang.datafixers.util.Pair; import galena.doom_and_gloom.DoomAndGloom; diff --git a/common/src/main/java/galena/doom_and_gloom/index/DGBlockEntities.java b/common/src/main/java/galena/doom_and_gloom/index/DGBlockEntities.java new file mode 100644 index 00000000..812b09b2 --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/index/DGBlockEntities.java @@ -0,0 +1,33 @@ +package galena.doom_and_gloom.index; + +import static galena.doom_and_gloom.DoomAndGloom.modLoc; + +import galena.doom_and_gloom.content.block.StoneTabletBlockEntity; +import galena.doom_and_gloom.content.entity.SepulcherBlockEntity; +import galena.doom_and_gloom.content.entity.VigilCandleBlockEntity; +import java.util.function.BiFunction; +import java.util.function.Supplier; +import net.mehvahdjukaar.moonlight.api.misc.RegSupplier; +import net.mehvahdjukaar.moonlight.api.platform.RegHelper; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; + +public class DGBlockEntities { + + public static final RegSupplier> VIGIL_CANDLE = register("vigil_candle", VigilCandleBlockEntity::new, DGBlocks.vigilCandles().toArray(Supplier[]::new)); + public static final RegSupplier> SEPULCHER = register("sepulcher", SepulcherBlockEntity::new, DGBlocks.SEPULCHER); + public static final RegSupplier> STONE_TABLET = register("stone_tablet", StoneTabletBlockEntity::new, DGBlocks.STONE_TABLET); + + @SafeVarargs + private static RegSupplier> register(String name, BiFunction factory, Supplier... blocks) { + return RegHelper.registerBlockEntityType(modLoc(name), factory, blocks); + } + + public static void init() { + // Loads this class + } + +} diff --git a/common/src/main/java/galena/doom_and_gloom/index/DGBlocks.java b/common/src/main/java/galena/doom_and_gloom/index/DGBlocks.java new file mode 100644 index 00000000..0674c42f --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/index/DGBlocks.java @@ -0,0 +1,72 @@ +package galena.doom_and_gloom.index; + +import static galena.doom_and_gloom.DoomAndGloom.modLoc; +import static net.mehvahdjukaar.moonlight.api.platform.RegHelper.*; + +import galena.doom_and_gloom.content.block.*; +import java.util.Arrays; +import java.util.Map; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import net.mehvahdjukaar.moonlight.api.misc.RegSupplier; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.material.PushReaction; + +public class DGBlocks { + + public static final RegSupplier SEPULCHER = register("sepulcher", () -> new SepulcherBlock(BlockBehaviour.Properties.copy(Blocks.CAULDRON).sound(DGSoundTypes.SEPULCHER))); + public static final RegSupplier BONE_PILE = register("bone_pile", () -> new BonePileBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK).sound(DGSoundTypes.BONE_PILE).strength(1F))); + public static final RegSupplier ROTTING_FLESH = registerBlock(modLoc("rotting_flesh"), () -> new Block(BlockBehaviour.Properties.copy(Blocks.DIRT))); + public static final RegSupplier STONE_TABLET = register("stone_tablet", () -> new StoneTabletBlock(BlockBehaviour.Properties.copy(Blocks.STONE), StoneTabletBlock.Type.DEFAULT)); + public static final RegSupplier ENGRAVED_STONE_TABLET = register("engraved_stone_tablet", () -> new StoneTabletBlock(BlockBehaviour.Properties.copy(Blocks.STONE), StoneTabletBlock.Type.ENGRAVED)); + public static final RegSupplier CRACKED_STONE_TABLET = register("cracked_stone_tablet", () -> new StoneTabletBlock(BlockBehaviour.Properties.copy(Blocks.STONE), StoneTabletBlock.Type.ENGRAVED)); + + private static final Supplier VIGIL_CANDLE_PROPERTIES = () -> BlockBehaviour.Properties.of().noOcclusion().lightLevel(VigilCandleBlock.LIGHT_EMISSION).sound(SoundType.METAL).pushReaction(PushReaction.DESTROY); + public static final RegSupplier VIGIL_CANDLE = register("vigil_candle", () -> new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get())); + public static final Map> COLORED_VIGIL_CANDLES = registerColored("vigil_candle", color -> new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get().mapColor(color))); + + public static final RegSupplier BURIAL_DIRT = register("burial_dirt", () -> new BurialDirtBlock(BlockBehaviour.Properties.copy(Blocks.DIRT))); + + public static Stream> vigilCandles() { + return Stream.of( + Stream.of(VIGIL_CANDLE), + COLORED_VIGIL_CANDLES.entrySet().stream() + .sorted(Map.Entry.comparingByKey()) + .map(Map.Entry::getValue) + ).flatMap(Function.identity()); + } + + public static Map> registerColored(String baseName, Function factory) { + return Arrays.stream(DyeColor.values()).collect(Collectors.toMap( + it -> it, + color -> register(color.getSerializedName() + "_" + baseName, () -> factory.apply(color)) + )); + } + + public static RegSupplier register(String name, Supplier block, Function item) { + RegSupplier register = registerBlock(modLoc(name), block); + registerItem(modLoc(name), () -> item.apply(register.get())); + return register; + } + + public static RegSupplier register(String name, Supplier block) { + return registerBlockWithItem(modLoc(name), block); + } + + public static RegSupplier register(String name, Supplier block, Item.Properties prop) { + return registerBlockWithItem(modLoc(name), block, prop, 0); + } + + public static void init() { + // Loads this class + } + +} diff --git a/common/src/main/java/galena/doom_and_gloom/index/DGEffects.java b/common/src/main/java/galena/doom_and_gloom/index/DGEffects.java new file mode 100644 index 00000000..e1bebe10 --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/index/DGEffects.java @@ -0,0 +1,20 @@ +package galena.doom_and_gloom.index; + +import static galena.doom_and_gloom.DoomAndGloom.modLoc; +import static net.mehvahdjukaar.moonlight.api.platform.RegHelper.registerEffect; + +import galena.doom_and_gloom.content.effect.FogEffect; +import galena.doom_and_gloom.content.effect.WardingEffect; +import net.mehvahdjukaar.moonlight.api.misc.RegSupplier; +import net.minecraft.world.effect.MobEffect; + +public class DGEffects { + + public static final RegSupplier FOG = registerEffect(modLoc("fog"), FogEffect::new); + public static final RegSupplier WARDING = registerEffect(modLoc("warding"), WardingEffect::new); + + public static void init() { + // Loads this class + } + +} diff --git a/common/src/main/java/galena/doom_and_gloom/index/DGEntityTypes.java b/common/src/main/java/galena/doom_and_gloom/index/DGEntityTypes.java new file mode 100644 index 00000000..4ecaa5cc --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/index/DGEntityTypes.java @@ -0,0 +1,47 @@ +package galena.doom_and_gloom.index; + +import static galena.doom_and_gloom.DoomAndGloom.modLoc; + +import galena.doom_and_gloom.content.entity.DirtMound; +import galena.doom_and_gloom.content.entity.holler.Holler; +import java.util.function.Supplier; +import net.mehvahdjukaar.moonlight.api.misc.RegSupplier; +import net.mehvahdjukaar.moonlight.api.platform.RegHelper; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.MobCategory; +import net.minecraft.world.entity.SpawnPlacements; +import net.minecraft.world.level.levelgen.Heightmap; + +public class DGEntityTypes { + + public static final RegSupplier> HOLLER = register("holler", () -> + EntityType.Builder.of(Holler::new, MobCategory.MONSTER).sized(0.4F, 0.8F).clientTrackingRange(8).updateInterval(2) + ); + + public static final RegSupplier> DIRT_MOUND = register("dirt_mound", () -> + EntityType.Builder.of(DirtMound::new, MobCategory.MISC).sized(0.8F, 0.25F) + ); + + private static RegSupplier> register(String name, Supplier> type) { + return RegHelper.registerEntityType(modLoc(name), () -> type.get().build(name)); + } + + public static void init() { + // Loads this class + RegHelper.addAttributeRegistration(DGEntityTypes::registerAttributes); + RegHelper.addSpawnPlacementsRegistration(DGEntityTypes::registerSpawnPlacements); + } + + private static void registerSpawnPlacements(RegHelper.SpawnPlacementEvent event) { + event.register(DGEntityTypes.HOLLER.get(), SpawnPlacements.Type.ON_GROUND, + Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, + Holler::checkHollerSpawnRules); + } + + private static void registerAttributes(RegHelper.AttributeEvent event) { + event.register(DGEntityTypes.HOLLER.get(), Holler.createAttributes()); + } + + +} diff --git a/common/src/main/java/galena/doom_and_gloom/index/DGItemListings.java b/common/src/main/java/galena/doom_and_gloom/index/DGItemListings.java new file mode 100644 index 00000000..ed742325 --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/index/DGItemListings.java @@ -0,0 +1,17 @@ +package galena.doom_and_gloom.index; + +import galena.doom_and_gloom.DoomAndGloom; +import galena.doom_and_gloom.content.listing.BuyTagListing; +import galena.doom_and_gloom.content.listing.SellEnchantedListing; +import galena.doom_and_gloom.content.listing.SellTagListing; +import net.mehvahdjukaar.moonlight.api.trades.ItemListingRegistry; + +public class DGItemListings { + + public static void init() { + ItemListingRegistry.registerSerializer(DoomAndGloom.modLoc("buy_tag"), BuyTagListing.CODEC); + ItemListingRegistry.registerSerializer(DoomAndGloom.modLoc("sell_tag"), SellTagListing.CODEC); + ItemListingRegistry.registerSerializer(DoomAndGloom.modLoc("sell_enchanted"), SellEnchantedListing.CODEC); + } + +} diff --git a/common/src/main/java/galena/doom_and_gloom/index/DGItemTiers.java b/common/src/main/java/galena/doom_and_gloom/index/DGItemTiers.java new file mode 100644 index 00000000..11737dad --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/index/DGItemTiers.java @@ -0,0 +1,18 @@ +package galena.doom_and_gloom.index; + +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.Tiers; + +public class DGItemTiers { + + private static Tier HAMMER_TIER = Tiers.IRON; + + public static Tier getHammerTier() { + return HAMMER_TIER; + } + + public static void replaceHammerTier(Tier tier) { + HAMMER_TIER = tier; + } + +} diff --git a/common/src/main/java/galena/doom_and_gloom/index/DGItems.java b/common/src/main/java/galena/doom_and_gloom/index/DGItems.java new file mode 100644 index 00000000..5a75be91 --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/index/DGItems.java @@ -0,0 +1,39 @@ +package galena.doom_and_gloom.index; + +import static galena.doom_and_gloom.DoomAndGloom.modLoc; + +import galena.doom_and_gloom.content.item.BushHammerItem; +import galena.doom_and_gloom.content.item.HammerAndChiselItem; +import java.util.function.Supplier; +import net.mehvahdjukaar.moonlight.api.misc.RegSupplier; +import net.mehvahdjukaar.moonlight.api.platform.PlatHelper; +import net.mehvahdjukaar.moonlight.api.platform.RegHelper; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.RecordItem; + +public class DGItems { + + // Discs + public static final RegSupplier MUSIC_DISC_AFTERLIFE = register("music_disc_afterlife", () -> + PlatHelper.newMusicDisc(13, DGSoundEvents.MUSIC_DISC_AFTERLIFE, new Item.Properties() + .stacksTo(1).rarity(Rarity.RARE), 155)); + + // Crafting Materials + public static final RegSupplier BUSH_HAMMER = register("bush_hammer", () -> + new BushHammerItem(DGItemTiers.getHammerTier(), 2.5F, -2.8F, (new Item.Properties()).stacksTo(1))); + public static final RegSupplier HAMMER_AND_CHISEL = register("hammer_and_chisel", () -> + new HammerAndChiselItem(DGBlocks.STONE_TABLET.get())); + + public static final RegSupplier HOLLER_SPAWN_EGG = register("holler_spawn_egg", () -> + PlatHelper.newSpawnEgg(DGEntityTypes.HOLLER, 0x84EED2, 0x24352F, new Item.Properties())); + + private static RegSupplier register(String name, Supplier factory) { + return RegHelper.registerItem(modLoc(name), factory); + } + + public static void init() { + // Loads this class + } + +} \ No newline at end of file diff --git a/common/src/main/java/galena/doom_and_gloom/index/DGLootInjects.java b/common/src/main/java/galena/doom_and_gloom/index/DGLootInjects.java new file mode 100644 index 00000000..abbd61f0 --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/index/DGLootInjects.java @@ -0,0 +1,27 @@ +package galena.doom_and_gloom.index; + +import galena.doom_and_gloom.DoomAndGloom; +import java.util.Set; +import net.mehvahdjukaar.moonlight.api.platform.RegHelper; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.storage.loot.BuiltInLootTables; + +public class DGLootInjects { + + public static void init() { + RegHelper.addLootTableInjects(DGLootInjects::injectLootTables); + } + + //TODO: add repurposed structures or similar compat here + private static final Set PYRAMIDS = Set.of( + BuiltInLootTables.DESERT_PYRAMID + ); + + public static final ResourceLocation PYRAMID_BONES = DoomAndGloom.modLoc("inject/desert_pyramid_bone_pile"); + + private static void injectLootTables(RegHelper.LootInjectEvent event) { + if (PYRAMIDS.contains(event.getTable())) + event.addTableReference(PYRAMID_BONES); + + } +} diff --git a/common/src/main/java/galena/doom_and_gloom/index/DGParticleTypes.java b/common/src/main/java/galena/doom_and_gloom/index/DGParticleTypes.java new file mode 100644 index 00000000..1c9bd6b3 --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/index/DGParticleTypes.java @@ -0,0 +1,20 @@ +package galena.doom_and_gloom.index; + +import static galena.doom_and_gloom.DoomAndGloom.modLoc; +import static net.mehvahdjukaar.moonlight.api.platform.RegHelper.registerParticle; + +import net.mehvahdjukaar.moonlight.api.misc.RegSupplier; +import net.minecraft.core.particles.SimpleParticleType; + +public class DGParticleTypes { + + public static final RegSupplier BONE_FRAGMENT = registerParticle(modLoc("bone_fragment")); + public static final RegSupplier FOG = registerParticle(modLoc("fog")); + public static final RegSupplier FOG_WATER = registerParticle(modLoc("fog_water")); + public static final RegSupplier HOLLERING_SOUL = registerParticle(modLoc("hollering_soul")); + + public static void init() { + // Loads this class + } + +} diff --git a/common/src/main/java/galena/doom_and_gloom/index/DGPoi.java b/common/src/main/java/galena/doom_and_gloom/index/DGPoi.java new file mode 100644 index 00000000..d676b94c --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/index/DGPoi.java @@ -0,0 +1,20 @@ +package galena.doom_and_gloom.index; + +import static galena.doom_and_gloom.DoomAndGloom.modLoc; + +import java.util.HashSet; +import net.mehvahdjukaar.moonlight.api.misc.RegSupplier; +import net.mehvahdjukaar.moonlight.api.platform.RegHelper; +import net.minecraft.world.entity.ai.village.poi.PoiType; + +public class DGPoi { + + public static final RegSupplier GRAVETENDER_POI = RegHelper.registerPOI(modLoc("gravetender"), + () -> new PoiType(new HashSet<>(DGBlocks.SEPULCHER.get().getStateDefinition().getPossibleStates()), + 1, 1)); + + public static void init() { + // Loads this class + } + +} diff --git a/common/src/main/java/galena/doom_and_gloom/index/DGSoundEvents.java b/common/src/main/java/galena/doom_and_gloom/index/DGSoundEvents.java new file mode 100644 index 00000000..41fd65f3 --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/index/DGSoundEvents.java @@ -0,0 +1,47 @@ +package galena.doom_and_gloom.index; + +import static galena.doom_and_gloom.DoomAndGloom.modLoc; +import static net.mehvahdjukaar.moonlight.api.platform.RegHelper.registerSound; + +import net.mehvahdjukaar.moonlight.api.misc.RegSupplier; +import net.minecraft.sounds.SoundEvent; + +public class DGSoundEvents { + + public static final RegSupplier MUSIC_DISC_AFTERLIFE = registerSound(modLoc("music.disc.afterlife")); + + public static final RegSupplier BONE_PILE_BREAK = registerSound(modLoc("block.bone_pile.break")); + public static final RegSupplier BONE_PILE_STEP = registerSound(modLoc("block.bone_pile.step")); + public static final RegSupplier BONE_PILE_FALL = registerSound(modLoc("block.bone_pile.fall")); + public static final RegSupplier BONE_PILE_HIT = registerSound(modLoc("block.bone_pile.hit")); + public static final RegSupplier BONE_PILE_PLACE = registerSound(modLoc("block.bone_pile.place")); + + public static final RegSupplier SEPULCHER_BREAK = registerSound(modLoc("block.sepulcher.break")); + public static final RegSupplier SEPULCHER_STEP = registerSound(modLoc("block.sepulcher.step")); + public static final RegSupplier SEPULCHER_FALL = registerSound(modLoc("block.sepulcher.fall")); + public static final RegSupplier SEPULCHER_HIT = registerSound(modLoc("block.sepulcher.hit")); + public static final RegSupplier SEPULCHER_PLACE = registerSound(modLoc("block.sepulcher.place")); + public static final RegSupplier SEPULCHER_CORPSE_STUFFED = registerSound(modLoc("block.sepulcher.corpse_stuffed")); + public static final RegSupplier SEPULCHER_FILLED = registerSound(modLoc("block.sepulcher.filled")); + public static final RegSupplier SEPULCHER_ROTTING = registerSound(modLoc("block.sepulcher.rotting")); + public static final RegSupplier SEPULCHER_SEALING = registerSound(modLoc("block.sepulcher.sealing")); + public static final RegSupplier SEPULCHER_UNSEALING = registerSound(modLoc("block.sepulcher.unsealing")); + public static final RegSupplier SEPULCHER_HARVEST = registerSound(modLoc("block.sepulcher.harvest")); + + //TODO: add these 2 + public static final RegSupplier GRAVETENDER_WORK = registerSound(modLoc("entity.villager.work_gravetender")); + + public static final RegSupplier STONE_TABLET_ENGRAVE = registerSound(modLoc("block.stone_tablet.engrave")); + + public static final RegSupplier HOLLER_DEATH = registerSound(modLoc("entity.holler_death")); + public static final RegSupplier HOLLER_HURTS = registerSound(modLoc("entity.holler_hurts")); + public static final RegSupplier HOLLER_HOLLERS = registerSound(modLoc("entity.holler_hollers")); + public static final RegSupplier HOLLER_SHRIEKS = registerSound(modLoc("entity.holler_shrieks")); + + public static final RegSupplier FOG_AMBIENCE = registerSound(modLoc("ambient.fog")); + + public static void init() { + // Loads this class + } + +} diff --git a/common/src/main/java/galena/doom_and_gloom/index/DGSoundTypes.java b/common/src/main/java/galena/doom_and_gloom/index/DGSoundTypes.java new file mode 100644 index 00000000..f72409b3 --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/index/DGSoundTypes.java @@ -0,0 +1,11 @@ +package galena.doom_and_gloom.index; + +import net.mehvahdjukaar.moonlight.api.misc.ModSoundType; +import net.minecraft.world.level.block.SoundType; + +public class DGSoundTypes { + + public static final SoundType BONE_PILE = new ModSoundType(1.5F, 1.0F, DGSoundEvents.BONE_PILE_BREAK, DGSoundEvents.BONE_PILE_STEP, DGSoundEvents.BONE_PILE_PLACE, DGSoundEvents.BONE_PILE_HIT, DGSoundEvents.BONE_PILE_FALL); + public static final SoundType SEPULCHER = new ModSoundType(1.0F, 1.0F, DGSoundEvents.SEPULCHER_BREAK, DGSoundEvents.SEPULCHER_STEP, DGSoundEvents.SEPULCHER_PLACE, DGSoundEvents.SEPULCHER_HIT, DGSoundEvents.SEPULCHER_FALL); + +} diff --git a/src/main/java/galena/doom_and_gloom/index/OTags.java b/common/src/main/java/galena/doom_and_gloom/index/DGTags.java similarity index 52% rename from src/main/java/galena/doom_and_gloom/index/OTags.java rename to common/src/main/java/galena/doom_and_gloom/index/DGTags.java index 1491b7ea..73d0ad36 100644 --- a/src/main/java/galena/doom_and_gloom/index/OTags.java +++ b/common/src/main/java/galena/doom_and_gloom/index/DGTags.java @@ -1,31 +1,40 @@ package galena.doom_and_gloom.index; import galena.doom_and_gloom.DoomAndGloom; +import java.util.Arrays; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import net.minecraft.core.Registry; import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.*; +import net.minecraft.tags.TagKey; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.entity.EntityType; +import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; -import net.minecraftforge.versions.forge.ForgeVersion; -public class OTags { +public class DGTags { public static class Items { - public static final TagKey INGOTS_SILVER = forgeTag("ingots/silver"); - public static final TagKey INGOTS_LEAD = forgeTag("ingots/lead"); + public static final TagKey INGOTS_SILVER = cTag("ingots/silver"); + public static final TagKey INGOTS_LEAD = cTag("ingots/lead"); - public static final TagKey TOOLS_BUSH_HAMMER = forgeTag("tools/bush_hammer"); + public static final TagKey TOOLS_BUSH_HAMMER = tag("tools/bush_hammer"); public static final TagKey VIGIL_CANDLES = tag("vigil_candles"); + public static final Map> DYED = dyedTags(Registries.ITEM); + private static TagKey tag(String name) { - return ItemTags.create(DoomAndGloom.modLoc(name)); + return TagKey.create(Registries.ITEM, DoomAndGloom.modLoc(name)); } - private static TagKey forgeTag(String name) { - return ItemTags.create(new ResourceLocation(ForgeVersion.MOD_ID, name)); + + private static TagKey cTag(String name) { + return createCTag(Registries.ITEM, name); } } @@ -34,16 +43,15 @@ public static class Blocks { public static final TagKey MINEABLE_WITH_BUSH_HAMMER = tag("mineable/bush_hammer"); public static final TagKey ENGRAVABLE = tag("engravable"); public static final TagKey ENGRAVABLE_NEEDS_PLATE = tag("engravable/needs_plate"); - public static final TagKey HEAT_SOURCE = BlockTags.create(new ResourceLocation("oreganized", "fire_source")); + public static final TagKey HEAT_SOURCE = TagKey.create(Registries.BLOCK, new ResourceLocation("oreganized", "fire_source")); public static final TagKey VIGIL_CANDLES = tag("vigil_candles"); public static final TagKey CAN_TURN_INTO_BURIAL_DIRT = tag("burial_dirt_convertible"); public static final TagKey GRAVETENDER_LIGHTABLE = tag("gravetender_lightables"); + public static final Map> DYED = dyedTags(Registries.BLOCK); + private static TagKey tag(String name) { - return BlockTags.create(DoomAndGloom.modLoc(name)); - } - private static TagKey forgeTag(String name) { - return BlockTags.create(new ResourceLocation(ForgeVersion.MOD_ID, name)); + return TagKey.create(Registries.BLOCK, DoomAndGloom.modLoc(name)); } } @@ -51,6 +59,7 @@ public static class Entities { public static final TagKey> FILLS_SEPULCHER = tag("fills_sepulcher"); + private static TagKey> tag(String name) { return TagKey.create(Registries.ENTITY_TYPE, DoomAndGloom.modLoc(name)); } @@ -63,5 +72,19 @@ public static class Effects { private static TagKey tag(String name) { return TagKey.create(Registries.MOB_EFFECT, DoomAndGloom.modLoc(name)); } + } + + private static Map> dyedTags(ResourceKey> registry) { + return Arrays.stream(DyeColor.values()).collect(Collectors.toMap( + Function.identity(), + color -> createCTag(registry, "dyed/" + color) + )); + } + + private static TagKey createCTag(ResourceKey> registry, String name) { + var id = new ResourceLocation("c", name); + return TagKey.create(registry, id); + } + } diff --git a/common/src/main/java/galena/doom_and_gloom/index/DGVillagerTypes.java b/common/src/main/java/galena/doom_and_gloom/index/DGVillagerTypes.java new file mode 100644 index 00000000..bff292cd --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/index/DGVillagerTypes.java @@ -0,0 +1,32 @@ +package galena.doom_and_gloom.index; + +import static galena.doom_and_gloom.DoomAndGloom.modLoc; + +import com.google.common.collect.ImmutableSet; +import java.util.function.Supplier; +import net.mehvahdjukaar.moonlight.api.misc.RegSupplier; +import net.mehvahdjukaar.moonlight.api.platform.RegHelper; +import net.minecraft.core.registries.Registries; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.entity.ai.village.poi.PoiType; +import net.minecraft.world.entity.npc.VillagerProfession; + +public class DGVillagerTypes { + + public static final RegSupplier GRAVETENDER = register("gravetender", + DGPoi.GRAVETENDER_POI, DGSoundEvents.GRAVETENDER_WORK); + + private static RegSupplier register(String name, Supplier jobSite, Supplier workSound) { + Supplier factory = () -> new VillagerProfession(name, + (holder) -> holder.value() == jobSite.get(), + (holder) -> holder.value() == jobSite.get(), + ImmutableSet.of(), ImmutableSet.of(), workSound.get()); + + return RegHelper.register(modLoc(name), factory, Registries.VILLAGER_PROFESSION); + } + + public static void init() { + // Loads this class + } + +} diff --git a/src/main/java/galena/doom_and_gloom/mixin/EntityMixin.java b/common/src/main/java/galena/doom_and_gloom/mixin/EntityMixin.java similarity index 91% rename from src/main/java/galena/doom_and_gloom/mixin/EntityMixin.java rename to common/src/main/java/galena/doom_and_gloom/mixin/EntityMixin.java index 364e4776..45d280ea 100644 --- a/src/main/java/galena/doom_and_gloom/mixin/EntityMixin.java +++ b/common/src/main/java/galena/doom_and_gloom/mixin/EntityMixin.java @@ -1,7 +1,7 @@ package galena.doom_and_gloom.mixin; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; -import galena.doom_and_gloom.index.OBlocks; +import galena.doom_and_gloom.index.DGBlocks; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.Level; @@ -25,7 +25,7 @@ public abstract class EntityMixin { ) public boolean isSprinting(boolean original) { return original || ( - this.level.getBlockState(this.getBlockPosBelowThatAffectsMyMovement()).is(OBlocks.BONE_PILE.get()) + this.level.getBlockState(this.getBlockPosBelowThatAffectsMyMovement()).is(DGBlocks.BONE_PILE.get()) && (this.getDeltaMovement().x != 0.0 || this.getDeltaMovement().z != 0.0) ); } diff --git a/src/main/java/galena/doom_and_gloom/mixin/client/LevelRendererMixin.java b/common/src/main/java/galena/doom_and_gloom/mixin/client/LevelRendererMixin.java similarity index 88% rename from src/main/java/galena/doom_and_gloom/mixin/client/LevelRendererMixin.java rename to common/src/main/java/galena/doom_and_gloom/mixin/client/LevelRendererMixin.java index 486a016a..35d817eb 100644 --- a/src/main/java/galena/doom_and_gloom/mixin/client/LevelRendererMixin.java +++ b/common/src/main/java/galena/doom_and_gloom/mixin/client/LevelRendererMixin.java @@ -3,7 +3,7 @@ import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.mojang.blaze3d.vertex.PoseStack; import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.index.OEffects; +import galena.doom_and_gloom.index.DGEffects; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.resources.ResourceLocation; @@ -30,7 +30,7 @@ public class LevelRendererMixin { ) private void disableClouds(PoseStack pose, Matrix4f matrix, float p_254364_, double p_253843_, double p_253663_, double p_253795_, CallbackInfo ci) { var player = Minecraft.getInstance().player; - if (player != null && player.hasEffect(OEffects.FOG.get())) { + if (player != null && player.hasEffect(DGEffects.FOG.get())) { ci.cancel(); } } @@ -41,7 +41,7 @@ private void disableClouds(PoseStack pose, Matrix4f matrix, float p_254364_, dou ) private ResourceLocation replaceSun(ResourceLocation original) { var player = Minecraft.getInstance().player; - if (player != null && player.hasEffect(OEffects.FOG.get())) return SUN_LOCATION; + if (player != null && player.hasEffect(DGEffects.FOG.get())) return SUN_LOCATION; else return original; } @@ -51,7 +51,7 @@ private ResourceLocation replaceSun(ResourceLocation original) { ) private ResourceLocation replaceMoon(ResourceLocation original) { var player = Minecraft.getInstance().player; - if (player != null && player.hasEffect(OEffects.FOG.get())) return MOON_LOCATION; + if (player != null && player.hasEffect(DGEffects.FOG.get())) return MOON_LOCATION; else return original; } @@ -61,7 +61,7 @@ private ResourceLocation replaceMoon(ResourceLocation original) { ) private float hideStars(float original) { var player = Minecraft.getInstance().player; - if (player != null && player.hasEffect(OEffects.FOG.get())) return 0F; + if (player != null && player.hasEffect(DGEffects.FOG.get())) return 0F; else return original; } diff --git a/src/main/java/galena/doom_and_gloom/mixin/client/LocalPlayerAccessor.java b/common/src/main/java/galena/doom_and_gloom/mixin/client/LocalPlayerAccessor.java similarity index 100% rename from src/main/java/galena/doom_and_gloom/mixin/client/LocalPlayerAccessor.java rename to common/src/main/java/galena/doom_and_gloom/mixin/client/LocalPlayerAccessor.java diff --git a/src/main/java/galena/doom_and_gloom/mixin/client/LocalPlayerMixin.java b/common/src/main/java/galena/doom_and_gloom/mixin/client/LocalPlayerMixin.java similarity index 94% rename from src/main/java/galena/doom_and_gloom/mixin/client/LocalPlayerMixin.java rename to common/src/main/java/galena/doom_and_gloom/mixin/client/LocalPlayerMixin.java index e48c52e3..9a6178da 100644 --- a/src/main/java/galena/doom_and_gloom/mixin/client/LocalPlayerMixin.java +++ b/common/src/main/java/galena/doom_and_gloom/mixin/client/LocalPlayerMixin.java @@ -1,6 +1,6 @@ package galena.doom_and_gloom.mixin.client; -import galena.doom_and_gloom.client.FogAmbientSoundHandler; +import galena.doom_and_gloom.client.fog.FogAmbientSoundHandler; import net.minecraft.client.ClientRecipeBook; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; diff --git a/common/src/main/java/galena/doom_and_gloom/network/DGNetwork.java b/common/src/main/java/galena/doom_and_gloom/network/DGNetwork.java new file mode 100644 index 00000000..188fb446 --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/network/DGNetwork.java @@ -0,0 +1,25 @@ +package galena.doom_and_gloom.network; + +import galena.doom_and_gloom.DoomAndGloom; +import galena.doom_and_gloom.network.packet.EngraveStoneTabletPacket; +import galena.doom_and_gloom.network.packet.SepulcherConsumesDeathPacket; +import galena.doom_and_gloom.network.packet.SepulcherRotsPacket; +import galena.doom_and_gloom.network.packet.StoneTabletUpdatePacket; +import net.mehvahdjukaar.moonlight.api.platform.network.ChannelHandler; +import net.mehvahdjukaar.moonlight.api.platform.network.NetworkDir; + +public class DGNetwork { + + public static final ChannelHandler CHANNEL = ChannelHandler.builder(DoomAndGloom.MOD_ID) + .version(2) + .register(NetworkDir.PLAY_TO_CLIENT, SepulcherConsumesDeathPacket.class, SepulcherConsumesDeathPacket::from) + .register(NetworkDir.PLAY_TO_CLIENT, SepulcherRotsPacket.class, SepulcherRotsPacket::from) + .register(NetworkDir.PLAY_TO_SERVER, StoneTabletUpdatePacket.class, StoneTabletUpdatePacket::from) + .register(NetworkDir.PLAY_TO_CLIENT, EngraveStoneTabletPacket.class, EngraveStoneTabletPacket::from) + .build(); + + public static void register() { + // Loads this class + } + +} \ No newline at end of file diff --git a/common/src/main/java/galena/doom_and_gloom/network/packet/EngraveStoneTabletPacket.java b/common/src/main/java/galena/doom_and_gloom/network/packet/EngraveStoneTabletPacket.java new file mode 100644 index 00000000..5c63259d --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/network/packet/EngraveStoneTabletPacket.java @@ -0,0 +1,26 @@ +package galena.doom_and_gloom.network.packet; + +import galena.doom_and_gloom.client.DoomAndGloomClient; +import net.mehvahdjukaar.moonlight.api.platform.network.ChannelHandler; +import net.mehvahdjukaar.moonlight.api.platform.network.Message; +import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; + +public record EngraveStoneTabletPacket(BlockPos pos) implements Message { + + @Override + public void writeToBuffer(FriendlyByteBuf buffer) { + buffer.writeBlockPos(pos); + } + + @Override + public void handle(ChannelHandler.Context context) { + DoomAndGloomClient.openStoneTabletScreen(pos); + } + + public static EngraveStoneTabletPacket from(FriendlyByteBuf buffer) { + var pos = buffer.readBlockPos(); + return new EngraveStoneTabletPacket(pos); + } + +} diff --git a/common/src/main/java/galena/doom_and_gloom/network/packet/SepulcherConsumesDeathPacket.java b/common/src/main/java/galena/doom_and_gloom/network/packet/SepulcherConsumesDeathPacket.java new file mode 100644 index 00000000..281f9c09 --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/network/packet/SepulcherConsumesDeathPacket.java @@ -0,0 +1,26 @@ +package galena.doom_and_gloom.network.packet; + +import galena.doom_and_gloom.client.DoomAndGloomClient; +import net.mehvahdjukaar.moonlight.api.platform.network.ChannelHandler; +import net.mehvahdjukaar.moonlight.api.platform.network.Message; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.phys.Vec3; + +public record SepulcherConsumesDeathPacket(Vec3 at) implements Message { + + @Override + public void writeToBuffer(FriendlyByteBuf buffer) { + buffer.writeVector3f(at.toVector3f()); + } + + @Override + public void handle(ChannelHandler.Context context) { + DoomAndGloomClient.spawnConsumeParticles(at); + } + + public static SepulcherConsumesDeathPacket from(FriendlyByteBuf buffer) { + var at = new Vec3(buffer.readVector3f()); + return new SepulcherConsumesDeathPacket(at); + } + +} diff --git a/common/src/main/java/galena/doom_and_gloom/network/packet/SepulcherRotsPacket.java b/common/src/main/java/galena/doom_and_gloom/network/packet/SepulcherRotsPacket.java new file mode 100644 index 00000000..43f4abc8 --- /dev/null +++ b/common/src/main/java/galena/doom_and_gloom/network/packet/SepulcherRotsPacket.java @@ -0,0 +1,26 @@ +package galena.doom_and_gloom.network.packet; + +import galena.doom_and_gloom.content.block.SepulcherBlock; +import net.mehvahdjukaar.moonlight.api.platform.network.ChannelHandler; +import net.mehvahdjukaar.moonlight.api.platform.network.Message; +import net.minecraft.core.BlockPos; +import net.minecraft.network.FriendlyByteBuf; + +public record SepulcherRotsPacket(BlockPos at) implements Message { + + @Override + public void writeToBuffer(FriendlyByteBuf buffer) { + buffer.writeBlockPos(at); + } + + @Override + public void handle(ChannelHandler.Context context) { + SepulcherBlock.spawnRottingParticles(at); + } + + public static SepulcherRotsPacket from(FriendlyByteBuf buffer) { + var at = buffer.readBlockPos(); + return new SepulcherRotsPacket(at); + } + +} diff --git a/src/main/java/galena/doom_and_gloom/network/packet/StoneTabletUpdatePacket.java b/common/src/main/java/galena/doom_and_gloom/network/packet/StoneTabletUpdatePacket.java similarity index 61% rename from src/main/java/galena/doom_and_gloom/network/packet/StoneTabletUpdatePacket.java rename to common/src/main/java/galena/doom_and_gloom/network/packet/StoneTabletUpdatePacket.java index 2b60a3af..2cccc2c6 100644 --- a/src/main/java/galena/doom_and_gloom/network/packet/StoneTabletUpdatePacket.java +++ b/common/src/main/java/galena/doom_and_gloom/network/packet/StoneTabletUpdatePacket.java @@ -1,12 +1,13 @@ package galena.doom_and_gloom.network.packet; import galena.doom_and_gloom.content.block.StoneTabletBlockEntity; -import galena.doom_and_gloom.index.OBlocks; -import galena.doom_and_gloom.index.OSoundEvents; +import galena.doom_and_gloom.index.DGBlocks; +import galena.doom_and_gloom.index.DGSoundEvents; import java.util.List; import java.util.concurrent.CompletableFuture; -import java.util.function.Supplier; import java.util.stream.Stream; +import net.mehvahdjukaar.moonlight.api.platform.network.ChannelHandler; +import net.mehvahdjukaar.moonlight.api.platform.network.Message; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; @@ -16,11 +17,11 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.gameevent.GameEvent; -import net.minecraftforge.network.NetworkEvent; -public record StoneTabletUpdatePacket(BlockPos pos, String[] lines) { +public record StoneTabletUpdatePacket(BlockPos pos, String[] lines) implements Message { - public void write(FriendlyByteBuf buffer) { + @Override + public void writeToBuffer(FriendlyByteBuf buffer) { buffer.writeBlockPos(pos); buffer.writeVarInt(lines.length); for (var line : lines) { @@ -28,24 +29,21 @@ public void write(FriendlyByteBuf buffer) { } } - public void handle(Supplier contextSupplier) { - var context = contextSupplier.get(); - context.enqueueWork(() -> { - // text filtering yay - var sender = context.getSender(); - CompletableFuture.supplyAsync(() -> - Stream.of(lines) - .map(ChatFormatting::stripFormatting) - .map(innerList -> - sender.connection.filterTextPacket(innerList)) - .map(CompletableFuture::join) - .toList() - ).thenAcceptAsync((l) -> { - this.updateSignText(sender, l); - }, sender.server); - }); + @Override + public void handle(ChannelHandler.Context context) { + if (!(context.getSender() instanceof ServerPlayer sender)) return; - context.setPacketHandled(true); + // text filtering yay + CompletableFuture.supplyAsync(() -> + Stream.of(lines) + .map(ChatFormatting::stripFormatting) + .map(innerList -> + sender.connection.filterTextPacket(innerList)) + .map(CompletableFuture::join) + .toList() + ).thenAcceptAsync((l) -> { + this.updateSignText(sender, l); + }, sender.server); } private void updateSignText(ServerPlayer player, List filteredText) { @@ -57,8 +55,8 @@ private void updateSignText(ServerPlayer player, List filteredText te.updateStoneTabletText(player, filteredText); if (engraved) { - level.setBlockAndUpdate(pos, OBlocks.ENGRAVED_STONE_TABLET.get().withPropertiesOf(level.getBlockState(pos))); - level.playSound(null, pos, OSoundEvents.STONE_TABLET_ENGRAVE.get(), + level.setBlockAndUpdate(pos, DGBlocks.ENGRAVED_STONE_TABLET.get().withPropertiesOf(level.getBlockState(pos))); + level.playSound(null, pos, DGSoundEvents.STONE_TABLET_ENGRAVE.get(), SoundSource.BLOCKS, 1.0f, 1.0f); level.gameEvent(player, GameEvent.BLOCK_CHANGE, pos); diff --git a/src/main/resources/assets/doom_and_gloom/lang/de_de.json b/common/src/main/resources/assets/doom_and_gloom/lang/de_de.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/lang/de_de.json rename to common/src/main/resources/assets/doom_and_gloom/lang/de_de.json diff --git a/src/main/resources/assets/doom_and_gloom/lang/pt_br.json b/common/src/main/resources/assets/doom_and_gloom/lang/pt_br.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/lang/pt_br.json rename to common/src/main/resources/assets/doom_and_gloom/lang/pt_br.json diff --git a/src/main/resources/assets/doom_and_gloom/logo.png b/common/src/main/resources/assets/doom_and_gloom/logo.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/logo.png rename to common/src/main/resources/assets/doom_and_gloom/logo.png diff --git a/src/main/resources/assets/doom_and_gloom/models/block/sepulcher.json b/common/src/main/resources/assets/doom_and_gloom/models/block/sepulcher.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/models/block/sepulcher.json rename to common/src/main/resources/assets/doom_and_gloom/models/block/sepulcher.json diff --git a/src/main/resources/assets/doom_and_gloom/models/block/sepulcher_seal.json b/common/src/main/resources/assets/doom_and_gloom/models/block/sepulcher_seal.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/models/block/sepulcher_seal.json rename to common/src/main/resources/assets/doom_and_gloom/models/block/sepulcher_seal.json diff --git a/src/main/resources/assets/doom_and_gloom/models/block/template/stone_tablet.json b/common/src/main/resources/assets/doom_and_gloom/models/block/template/stone_tablet.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/models/block/template/stone_tablet.json rename to common/src/main/resources/assets/doom_and_gloom/models/block/template/stone_tablet.json diff --git a/src/main/resources/assets/doom_and_gloom/models/block/template/stone_tablet_floor.json b/common/src/main/resources/assets/doom_and_gloom/models/block/template/stone_tablet_floor.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/models/block/template/stone_tablet_floor.json rename to common/src/main/resources/assets/doom_and_gloom/models/block/template/stone_tablet_floor.json diff --git a/src/main/resources/assets/doom_and_gloom/models/block/template/stone_tablet_wall.json b/common/src/main/resources/assets/doom_and_gloom/models/block/template/stone_tablet_wall.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/models/block/template/stone_tablet_wall.json rename to common/src/main/resources/assets/doom_and_gloom/models/block/template/stone_tablet_wall.json diff --git a/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_double.json b/common/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_double.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_double.json rename to common/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_double.json diff --git a/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_double_ceiling.json b/common/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_double_ceiling.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_double_ceiling.json rename to common/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_double_ceiling.json diff --git a/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_quadruple.json b/common/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_quadruple.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_quadruple.json rename to common/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_quadruple.json diff --git a/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_quadruple_ceiling.json b/common/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_quadruple_ceiling.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_quadruple_ceiling.json rename to common/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_quadruple_ceiling.json diff --git a/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_single.json b/common/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_single.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_single.json rename to common/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_single.json diff --git a/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_single_ceiling.json b/common/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_single_ceiling.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_single_ceiling.json rename to common/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_single_ceiling.json diff --git a/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_triple.json b/common/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_triple.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_triple.json rename to common/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_triple.json diff --git a/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_triple_ceiling.json b/common/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_triple_ceiling.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_triple_ceiling.json rename to common/src/main/resources/assets/doom_and_gloom/models/block/vigil_candle_triple_ceiling.json diff --git a/src/main/resources/assets/doom_and_gloom/particles/bone_fragment.json b/common/src/main/resources/assets/doom_and_gloom/particles/bone_fragment.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/particles/bone_fragment.json rename to common/src/main/resources/assets/doom_and_gloom/particles/bone_fragment.json diff --git a/src/main/resources/assets/doom_and_gloom/particles/fog.json b/common/src/main/resources/assets/doom_and_gloom/particles/fog.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/particles/fog.json rename to common/src/main/resources/assets/doom_and_gloom/particles/fog.json diff --git a/src/main/resources/assets/doom_and_gloom/particles/fog_water.json b/common/src/main/resources/assets/doom_and_gloom/particles/fog_water.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/particles/fog_water.json rename to common/src/main/resources/assets/doom_and_gloom/particles/fog_water.json diff --git a/src/main/resources/assets/doom_and_gloom/particles/hollering_soul.json b/common/src/main/resources/assets/doom_and_gloom/particles/hollering_soul.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/particles/hollering_soul.json rename to common/src/main/resources/assets/doom_and_gloom/particles/hollering_soul.json diff --git a/src/main/resources/assets/doom_and_gloom/shaders/core/rendertype_entity_translucent_additive.fsh b/common/src/main/resources/assets/doom_and_gloom/shaders/core/rendertype_entity_translucent_additive.fsh similarity index 100% rename from src/main/resources/assets/doom_and_gloom/shaders/core/rendertype_entity_translucent_additive.fsh rename to common/src/main/resources/assets/doom_and_gloom/shaders/core/rendertype_entity_translucent_additive.fsh diff --git a/src/main/resources/assets/doom_and_gloom/shaders/core/rendertype_entity_translucent_additive.json b/common/src/main/resources/assets/doom_and_gloom/shaders/core/rendertype_entity_translucent_additive.json similarity index 100% rename from src/main/resources/assets/doom_and_gloom/shaders/core/rendertype_entity_translucent_additive.json rename to common/src/main/resources/assets/doom_and_gloom/shaders/core/rendertype_entity_translucent_additive.json diff --git a/src/main/resources/assets/doom_and_gloom/sounds/ambient/fog_ambience.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/ambient/fog_ambience.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/ambient/fog_ambience.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/ambient/fog_ambience.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_0.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_0.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_0.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_0.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_1.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_1.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_1.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_1.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_2.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_2.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_2.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_2.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_3.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_3.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_3.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_3.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_4.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_4.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_4.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_break_4.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_step_0.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_step_0.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_step_0.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_step_0.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_step_1.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_step_1.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_step_1.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_step_1.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_step_2.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_step_2.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_step_2.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_step_2.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_step_3.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_step_3.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_step_3.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/bone_pile_step_3.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_break_0.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_break_0.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_break_0.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_break_0.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_break_1.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_break_1.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_break_1.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_break_1.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_break_2.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_break_2.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_break_2.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_break_2.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_break_3.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_break_3.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_break_3.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_break_3.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_corpse_stuffed_0.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_corpse_stuffed_0.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_corpse_stuffed_0.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_corpse_stuffed_0.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_corpse_stuffed_1.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_corpse_stuffed_1.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_corpse_stuffed_1.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_corpse_stuffed_1.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_filled_0.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_filled_0.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_filled_0.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_filled_0.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_filled_1.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_filled_1.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_filled_1.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_filled_1.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_filled_2.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_filled_2.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_filled_2.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_filled_2.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_filled_3.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_filled_3.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_filled_3.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_filled_3.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_harvest_0.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_harvest_0.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_harvest_0.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_harvest_0.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_harvest_1.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_harvest_1.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_harvest_1.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_harvest_1.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_harvest_2.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_harvest_2.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_harvest_2.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_harvest_2.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_rotting_0.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_rotting_0.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_rotting_0.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_rotting_0.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_rotting_1.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_rotting_1.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_rotting_1.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_rotting_1.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_rotting_2.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_rotting_2.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_rotting_2.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_rotting_2.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_rotting_3.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_rotting_3.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_rotting_3.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_rotting_3.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_sealing.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_sealing.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_sealing.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_sealing.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_0.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_0.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_0.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_0.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_1.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_1.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_1.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_1.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_2.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_2.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_2.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_2.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_3.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_3.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_3.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_3.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_4.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_4.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_4.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_step_4.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_unsealing.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_unsealing.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_unsealing.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/block/sepulcher_unsealing.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_dies_0.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_dies_0.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/entity/holler_dies_0.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_dies_0.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_dies_1.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_dies_1.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/entity/holler_dies_1.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_dies_1.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hollers_0.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hollers_0.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hollers_0.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hollers_0.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hollers_1.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hollers_1.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hollers_1.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hollers_1.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hollers_2.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hollers_2.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hollers_2.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hollers_2.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hollers_3.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hollers_3.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hollers_3.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hollers_3.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hurts_0.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hurts_0.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hurts_0.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hurts_0.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hurts_1.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hurts_1.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hurts_1.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_hurts_1.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_shrieks_0.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_shrieks_0.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/entity/holler_shrieks_0.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_shrieks_0.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_shrieks_1.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_shrieks_1.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/entity/holler_shrieks_1.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_shrieks_1.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_shrieks_2.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_shrieks_2.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/entity/holler_shrieks_2.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/entity/holler_shrieks_2.ogg diff --git a/src/main/resources/assets/doom_and_gloom/sounds/music/disc/afterlife.ogg b/common/src/main/resources/assets/doom_and_gloom/sounds/music/disc/afterlife.ogg similarity index 100% rename from src/main/resources/assets/doom_and_gloom/sounds/music/disc/afterlife.ogg rename to common/src/main/resources/assets/doom_and_gloom/sounds/music/disc/afterlife.ogg diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/amber_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/amber_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/amber_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/amber_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/amber_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/amber_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/amber_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/amber_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/amber_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/amber_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/amber_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/amber_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/aqua_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/aqua_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/aqua_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/aqua_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/aqua_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/aqua_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/aqua_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/aqua_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/aqua_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/aqua_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/aqua_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/aqua_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/beige_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/beige_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/beige_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/beige_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/beige_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/beige_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/beige_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/beige_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/beige_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/beige_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/beige_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/beige_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/black_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/black_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/black_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/black_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/black_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/black_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/black_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/black_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/black_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/black_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/black_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/black_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/blue_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/blue_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/blue_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/blue_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/blue_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/blue_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/blue_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/blue_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/blue_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/blue_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/blue_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/blue_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/bone_pile_side.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/bone_pile_side.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/bone_pile_side.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/bone_pile_side.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/brown_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/brown_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/brown_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/brown_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/brown_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/brown_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/brown_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/brown_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/brown_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/brown_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/brown_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/brown_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/burial_dirt.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/burial_dirt.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/burial_dirt.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/burial_dirt.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/coral_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/coral_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/coral_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/coral_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/coral_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/coral_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/coral_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/coral_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/coral_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/coral_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/coral_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/coral_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/cyan_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/cyan_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/cyan_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/cyan_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/cyan_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/cyan_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/cyan_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/cyan_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/cyan_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/cyan_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/cyan_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/cyan_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/bricks.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/bricks.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/bricks.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/bricks.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_cut_copper.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_cut_copper.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_cut_copper.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_cut_copper.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_deepslate_bricks.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_deepslate_bricks.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_deepslate_bricks.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_deepslate_bricks.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_end_stone_bricks.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_end_stone_bricks.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_end_stone_bricks.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_end_stone_bricks.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_exposed_cut_copper.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_exposed_cut_copper.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_exposed_cut_copper.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_exposed_cut_copper.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_glance_bricks.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_glance_bricks.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_glance_bricks.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_glance_bricks.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_nether_bricks.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_nether_bricks.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_nether_bricks.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_nether_bricks.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_oxidized_cut_copper.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_oxidized_cut_copper.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_oxidized_cut_copper.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_oxidized_cut_copper.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_polished_blackstone_bricks.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_polished_blackstone_bricks.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_polished_blackstone_bricks.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_polished_blackstone_bricks.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_prismarine_bricks.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_prismarine_bricks.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_prismarine_bricks.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_prismarine_bricks.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_quartz_bricks.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_quartz_bricks.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_quartz_bricks.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_quartz_bricks.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_red_nether_bricks.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_red_nether_bricks.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_red_nether_bricks.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_red_nether_bricks.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_stone_bricks.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_stone_bricks.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_stone_bricks.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_stone_bricks.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_waxed_cut_copper.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_waxed_cut_copper.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_waxed_cut_copper.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_waxed_cut_copper.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_waxed_exposed_cut_copper.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_waxed_exposed_cut_copper.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_waxed_exposed_cut_copper.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_waxed_exposed_cut_copper.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_waxed_oxidized_cut_copper.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_waxed_oxidized_cut_copper.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_waxed_oxidized_cut_copper.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_waxed_oxidized_cut_copper.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_waxed_weathered_cut_copper.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_waxed_weathered_cut_copper.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_waxed_weathered_cut_copper.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_waxed_weathered_cut_copper.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_weathered_cut_copper.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_weathered_cut_copper.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_weathered_cut_copper.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved/engraved_weathered_cut_copper.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/engraved_cut_silver.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/engraved_cut_silver.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/engraved_cut_silver.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/engraved_cut_silver.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/forest_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/forest_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/forest_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/forest_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/forest_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/forest_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/forest_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/forest_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/forest_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/forest_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/forest_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/forest_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/ginger_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/ginger_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/ginger_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/ginger_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/ginger_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/ginger_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/ginger_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/ginger_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/ginger_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/ginger_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/ginger_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/ginger_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/gray_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/gray_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/gray_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/gray_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/gray_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/gray_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/gray_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/gray_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/gray_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/gray_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/gray_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/gray_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/green_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/green_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/green_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/green_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/green_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/green_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/green_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/green_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/green_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/green_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/green_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/green_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/indigo_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/indigo_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/indigo_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/indigo_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/indigo_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/indigo_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/indigo_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/indigo_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/indigo_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/indigo_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/indigo_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/indigo_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/light_blue_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/light_blue_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/light_blue_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/light_blue_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/light_blue_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/light_blue_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/light_blue_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/light_blue_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/light_blue_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/light_blue_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/light_blue_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/light_blue_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/light_gray_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/light_gray_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/light_gray_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/light_gray_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/light_gray_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/light_gray_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/light_gray_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/light_gray_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/light_gray_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/light_gray_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/light_gray_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/light_gray_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/lime_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/lime_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/lime_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/lime_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/lime_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/lime_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/lime_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/lime_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/lime_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/lime_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/lime_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/lime_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/magenta_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/magenta_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/magenta_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/magenta_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/magenta_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/magenta_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/magenta_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/magenta_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/magenta_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/magenta_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/magenta_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/magenta_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/maroon_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/maroon_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/maroon_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/maroon_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/maroon_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/maroon_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/maroon_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/maroon_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/maroon_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/maroon_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/maroon_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/maroon_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/mint_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/mint_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/mint_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/mint_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/mint_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/mint_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/mint_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/mint_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/mint_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/mint_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/mint_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/mint_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/navy_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/navy_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/navy_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/navy_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/navy_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/navy_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/navy_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/navy_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/navy_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/navy_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/navy_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/navy_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/olive_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/olive_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/olive_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/olive_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/olive_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/olive_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/olive_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/olive_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/olive_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/olive_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/olive_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/olive_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/orange_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/orange_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/orange_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/orange_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/orange_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/orange_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/orange_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/orange_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/orange_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/orange_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/orange_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/orange_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/pink_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/pink_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/pink_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/pink_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/pink_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/pink_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/pink_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/pink_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/pink_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/pink_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/pink_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/pink_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/purple_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/purple_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/purple_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/purple_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/purple_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/purple_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/purple_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/purple_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/purple_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/purple_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/purple_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/purple_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/red_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/red_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/red_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/red_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/red_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/red_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/red_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/red_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/red_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/red_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/red_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/red_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/rose_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/rose_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/rose_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/rose_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/rose_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/rose_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/rose_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/rose_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/rose_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/rose_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/rose_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/rose_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/sepulcher.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_1.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_1.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_1.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_1.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_2.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_2.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_2.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_2.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_3.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_3.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_3.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_3.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_4.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_4.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_4.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_4.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_5.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_5.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_5.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/sepulcher_rot_5.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/slate_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/slate_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/slate_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/slate_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/slate_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/slate_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/slate_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/slate_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/slate_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/slate_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/slate_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/slate_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/stone_tablet.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/stone_tablet.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/stone_tablet.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/stone_tablet.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/stone_tablet_cracked.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/stone_tablet_cracked.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/stone_tablet_cracked.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/stone_tablet_cracked.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/stone_tablet_engraved.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/stone_tablet_engraved.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/stone_tablet_engraved.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/stone_tablet_engraved.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/stone_tablet_old.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/stone_tablet_old.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/stone_tablet_old.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/stone_tablet_old.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/tan_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/tan_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/tan_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/tan_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/tan_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/tan_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/tan_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/tan_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/tan_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/tan_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/tan_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/tan_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/teal_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/teal_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/teal_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/teal_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/teal_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/teal_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/teal_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/teal_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/teal_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/teal_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/teal_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/teal_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/verdant_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/verdant_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/verdant_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/verdant_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/verdant_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/verdant_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/verdant_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/verdant_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/verdant_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/verdant_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/verdant_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/verdant_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/white_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/white_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/white_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/white_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/white_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/white_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/white_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/white_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/white_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/white_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/white_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/white_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/yellow_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/yellow_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/yellow_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/yellow_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/yellow_vigil_candle_lit.png b/common/src/main/resources/assets/doom_and_gloom/textures/block/yellow_vigil_candle_lit.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/yellow_vigil_candle_lit.png rename to common/src/main/resources/assets/doom_and_gloom/textures/block/yellow_vigil_candle_lit.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/block/yellow_vigil_candle_lit.png.mcmeta b/common/src/main/resources/assets/doom_and_gloom/textures/block/yellow_vigil_candle_lit.png.mcmeta similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/block/yellow_vigil_candle_lit.png.mcmeta rename to common/src/main/resources/assets/doom_and_gloom/textures/block/yellow_vigil_candle_lit.png.mcmeta diff --git a/src/main/resources/assets/doom_and_gloom/textures/entity/dirt_mound.bbmodel b/common/src/main/resources/assets/doom_and_gloom/textures/entity/dirt_mound.bbmodel similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/entity/dirt_mound.bbmodel rename to common/src/main/resources/assets/doom_and_gloom/textures/entity/dirt_mound.bbmodel diff --git a/src/main/resources/assets/doom_and_gloom/textures/entity/dirt_mound.png b/common/src/main/resources/assets/doom_and_gloom/textures/entity/dirt_mound.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/entity/dirt_mound.png rename to common/src/main/resources/assets/doom_and_gloom/textures/entity/dirt_mound.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/entity/holler.bbmodel b/common/src/main/resources/assets/doom_and_gloom/textures/entity/holler.bbmodel similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/entity/holler.bbmodel rename to common/src/main/resources/assets/doom_and_gloom/textures/entity/holler.bbmodel diff --git a/src/main/resources/assets/doom_and_gloom/textures/entity/holler.png b/common/src/main/resources/assets/doom_and_gloom/textures/entity/holler.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/entity/holler.png rename to common/src/main/resources/assets/doom_and_gloom/textures/entity/holler.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/entity/villager/profession/gravetender.png b/common/src/main/resources/assets/doom_and_gloom/textures/entity/villager/profession/gravetender.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/entity/villager/profession/gravetender.png rename to common/src/main/resources/assets/doom_and_gloom/textures/entity/villager/profession/gravetender.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/entity/zombie_villager/profession/gravetender.png b/common/src/main/resources/assets/doom_and_gloom/textures/entity/zombie_villager/profession/gravetender.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/entity/zombie_villager/profession/gravetender.png rename to common/src/main/resources/assets/doom_and_gloom/textures/entity/zombie_villager/profession/gravetender.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/environment/moon_phases_fog.png b/common/src/main/resources/assets/doom_and_gloom/textures/environment/moon_phases_fog.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/environment/moon_phases_fog.png rename to common/src/main/resources/assets/doom_and_gloom/textures/environment/moon_phases_fog.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/environment/sun_fog.png b/common/src/main/resources/assets/doom_and_gloom/textures/environment/sun_fog.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/environment/sun_fog.png rename to common/src/main/resources/assets/doom_and_gloom/textures/environment/sun_fog.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/gui/tablet.png b/common/src/main/resources/assets/doom_and_gloom/textures/gui/tablet.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/gui/tablet.png rename to common/src/main/resources/assets/doom_and_gloom/textures/gui/tablet.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/gui/tablet_vertical.png b/common/src/main/resources/assets/doom_and_gloom/textures/gui/tablet_vertical.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/gui/tablet_vertical.png rename to common/src/main/resources/assets/doom_and_gloom/textures/gui/tablet_vertical.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/amber_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/amber_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/amber_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/amber_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/aqua_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/aqua_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/aqua_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/aqua_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/beige_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/beige_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/beige_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/beige_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/black_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/black_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/black_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/black_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/blue_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/blue_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/blue_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/blue_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/brown_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/brown_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/brown_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/brown_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/bush_hammer.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/bush_hammer.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/bush_hammer.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/bush_hammer.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/coral_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/coral_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/coral_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/coral_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/cracked_stone_tablet.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/cracked_stone_tablet.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/cracked_stone_tablet.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/cracked_stone_tablet.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/cyan_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/cyan_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/cyan_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/cyan_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/engraved_stone_tablet.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/engraved_stone_tablet.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/engraved_stone_tablet.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/engraved_stone_tablet.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/forest_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/forest_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/forest_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/forest_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/ginger_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/ginger_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/ginger_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/ginger_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/gray_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/gray_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/gray_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/gray_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/green_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/green_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/green_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/green_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/hammer_and_chisel.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/hammer_and_chisel.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/hammer_and_chisel.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/hammer_and_chisel.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/indigo_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/indigo_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/indigo_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/indigo_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/light_blue_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/light_blue_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/light_blue_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/light_blue_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/light_gray_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/light_gray_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/light_gray_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/light_gray_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/lime_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/lime_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/lime_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/lime_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/magenta_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/magenta_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/magenta_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/magenta_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/maroon_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/maroon_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/maroon_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/maroon_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/mint_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/mint_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/mint_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/mint_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/music_disc_afterlife.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/music_disc_afterlife.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/music_disc_afterlife.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/music_disc_afterlife.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/navy_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/navy_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/navy_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/navy_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/olive_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/olive_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/olive_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/olive_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/orange_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/orange_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/orange_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/orange_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/pink_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/pink_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/pink_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/pink_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/purple_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/purple_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/purple_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/purple_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/red_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/red_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/red_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/red_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/rose_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/rose_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/rose_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/rose_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/slate_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/slate_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/slate_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/slate_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/stone_tablet.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/stone_tablet.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/stone_tablet.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/stone_tablet.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/tan_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/tan_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/tan_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/tan_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/teal_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/teal_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/teal_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/teal_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/verdant_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/verdant_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/verdant_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/verdant_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/white_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/white_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/white_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/white_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/item/yellow_vigil_candle.png b/common/src/main/resources/assets/doom_and_gloom/textures/item/yellow_vigil_candle.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/item/yellow_vigil_candle.png rename to common/src/main/resources/assets/doom_and_gloom/textures/item/yellow_vigil_candle.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/misc/stone_tablet_text_colors.png b/common/src/main/resources/assets/doom_and_gloom/textures/misc/stone_tablet_text_colors.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/misc/stone_tablet_text_colors.png rename to common/src/main/resources/assets/doom_and_gloom/textures/misc/stone_tablet_text_colors.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/mob_effect/fog.png b/common/src/main/resources/assets/doom_and_gloom/textures/mob_effect/fog.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/mob_effect/fog.png rename to common/src/main/resources/assets/doom_and_gloom/textures/mob_effect/fog.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/mob_effect/warding.png b/common/src/main/resources/assets/doom_and_gloom/textures/mob_effect/warding.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/mob_effect/warding.png rename to common/src/main/resources/assets/doom_and_gloom/textures/mob_effect/warding.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_0.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_0.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_0.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_0.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_1.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_1.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_1.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_1.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_2.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_2.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_2.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_2.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_3.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_3.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_3.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_3.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_4.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_4.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_4.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/bone_fragment_4.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_0.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_0.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_0.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_0.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_1.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_1.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_1.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_1.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_10.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_10.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_10.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_10.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_11.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_11.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_11.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_11.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_12.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_12.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_12.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_12.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_13.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_13.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_13.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_13.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_14.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_14.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_14.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_14.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_15.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_15.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_15.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_15.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_16.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_16.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_16.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_16.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_17.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_17.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_17.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_17.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_18.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_18.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_18.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_18.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_19.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_19.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_19.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_19.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_2.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_2.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_2.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_2.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_20.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_20.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_20.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_20.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_21.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_21.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_21.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_21.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_22.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_22.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_22.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_22.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_23.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_23.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_23.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_23.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_3.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_3.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_3.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_3.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_4.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_4.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_4.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_4.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_5.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_5.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_5.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_5.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_6.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_6.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_6.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_6.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_7.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_7.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_7.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_7.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_8.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_8.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_8.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_8.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_9.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_9.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_9.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_cloud_9.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_0.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_0.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_0.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_0.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_1.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_1.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_1.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_1.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_10.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_10.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_10.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_10.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_11.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_11.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_11.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_11.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_2.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_2.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_2.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_2.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_3.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_3.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_3.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_3.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_4.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_4.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_4.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_4.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_5.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_5.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_5.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_5.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_6.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_6.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_6.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_6.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_7.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_7.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_7.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_7.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_8.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_8.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_8.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_8.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_9.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_9.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_9.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/fog_water_cloud_9.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_0.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_0.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_0.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_0.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_1.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_1.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_1.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_1.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_10.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_10.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_10.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_10.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_2.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_2.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_2.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_2.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_3.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_3.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_3.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_3.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_4.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_4.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_4.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_4.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_5.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_5.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_5.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_5.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_6.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_6.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_6.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_6.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_7.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_7.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_7.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_7.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_8.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_8.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_8.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_8.png diff --git a/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_9.png b/common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_9.png similarity index 100% rename from src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_9.png rename to common/src/main/resources/assets/doom_and_gloom/textures/particle/hollering_soul_9.png diff --git a/common/src/main/resources/data/doom_and_gloom/recipes/jeed/fog.json b/common/src/main/resources/data/doom_and_gloom/recipes/jeed/fog.json new file mode 100644 index 00000000..433afd6b --- /dev/null +++ b/common/src/main/resources/data/doom_and_gloom/recipes/jeed/fog.json @@ -0,0 +1,25 @@ +{ + "type": "jeed:effect_provider", + "effect": { + "id": "doom_and_gloom:fog" + }, + "providers": [ + { + "item": "doom_and_gloom:holler_spawn_egg" + } + ], + "conditions": [ + { + "type": "forge:mod_loaded", + "modid": "jeed" + } + ], + "fabric:load_conditions": [ + { + "condition": "fabric:all_mods_loaded", + "values": [ + "jeed" + ] + } + ] +} diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/desert_large.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/desert_large.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/desert_large.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/desert_large.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/desert_medium.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/desert_medium.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/desert_medium.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/desert_medium.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/desert_small.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/desert_small.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/desert_small.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/desert_small.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/desert_tomb.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/desert_tomb.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/desert_tomb.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/desert_tomb.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/plains_large.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/plains_large.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/plains_large.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/plains_large.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/plains_mausuleum.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/plains_mausuleum.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/plains_mausuleum.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/plains_mausuleum.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/plains_medium.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/plains_medium.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/plains_medium.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/plains_medium.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/plains_small.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/plains_small.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/plains_small.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/plains_small.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/savanna_large.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/savanna_large.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/savanna_large.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/savanna_large.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/savanna_medium.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/savanna_medium.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/savanna_medium.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/savanna_medium.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/savanna_small.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/savanna_small.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/savanna_small.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/savanna_small.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/snowy_burial_mound.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/snowy_burial_mound.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/snowy_burial_mound.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/snowy_burial_mound.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/snowy_large.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/snowy_large.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/snowy_large.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/snowy_large.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/snowy_medium.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/snowy_medium.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/snowy_medium.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/snowy_medium.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/snowy_small.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/snowy_small.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/snowy_small.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/snowy_small.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/taiga_large.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/taiga_large.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/taiga_large.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/taiga_large.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/taiga_medium.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/taiga_medium.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/taiga_medium.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/taiga_medium.nbt diff --git a/src/main/resources/data/doom_and_gloom/structures/village/graveyard/taiga_small.nbt b/common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/taiga_small.nbt similarity index 100% rename from src/main/resources/data/doom_and_gloom/structures/village/graveyard/taiga_small.nbt rename to common/src/main/resources/data/doom_and_gloom/structures/village/graveyard/taiga_small.nbt diff --git a/src/main/resources/data/minecraft/tags/point_of_interest_type/acquirable_job_site.json b/common/src/main/resources/data/minecraft/tags/point_of_interest_type/acquirable_job_site.json similarity index 100% rename from src/main/resources/data/minecraft/tags/point_of_interest_type/acquirable_job_site.json rename to common/src/main/resources/data/minecraft/tags/point_of_interest_type/acquirable_job_site.json diff --git a/common/src/main/resources/doom_and_gloom.accesswidener b/common/src/main/resources/doom_and_gloom.accesswidener new file mode 100644 index 00000000..0c2d64df --- /dev/null +++ b/common/src/main/resources/doom_and_gloom.accesswidener @@ -0,0 +1,8 @@ +accessWidener v1 named + +accessible method net/minecraft/server/network/ServerGamePacketListenerImpl filterTextPacket (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; +accessible field net/minecraft/world/level/levelgen/structure/pools/StructureTemplatePool templates Lit/unimi/dsi/fastutil/objects/ObjectArrayList; +accessible field net/minecraft/world/level/levelgen/structure/pools/StructureTemplatePool rawTemplates Ljava/util/List; +mutable field net/minecraft/world/level/levelgen/structure/pools/StructureTemplatePool rawTemplates Ljava/util/List; +accessible method net/minecraft/client/renderer/RenderType create (Ljava/lang/String;Lcom/mojang/blaze3d/vertex/VertexFormat;Lcom/mojang/blaze3d/vertex/VertexFormat$Mode;IZZLnet/minecraft/client/renderer/RenderType$CompositeState;)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType; +accessible method net/minecraft/world/entity/ai/sensing/SensorType (Ljava/util/function/Supplier;)V diff --git a/src/main/resources/doom_and_gloom.mixins.json b/common/src/main/resources/doom_and_gloom.mixins.json similarity index 89% rename from src/main/resources/doom_and_gloom.mixins.json rename to common/src/main/resources/doom_and_gloom.mixins.json index 2d20838d..619da953 100644 --- a/src/main/resources/doom_and_gloom.mixins.json +++ b/common/src/main/resources/doom_and_gloom.mixins.json @@ -14,6 +14,5 @@ "server": [], "injectors": { "defaultRequire": 1 - }, - "refmap": "${mod_id}.refmap.json" + } } diff --git a/src/main/resources/doom_and_gloom.png b/common/src/main/resources/doom_and_gloom.png similarity index 100% rename from src/main/resources/doom_and_gloom.png rename to common/src/main/resources/doom_and_gloom.png diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts new file mode 100644 index 00000000..94dcd625 --- /dev/null +++ b/fabric/build.gradle.kts @@ -0,0 +1,55 @@ +plugins { + id("com.possible-triangle.fabric") +} + +fabric { + dependOn(project(":common")) + accessWidener(project(":common")) +} + +repositories { + maven { + url = uri("https://mvn.devos.one/releases/") + content { + includeGroup("io.github.fabricators_of_create.Porting-Lib") + } + } + maven { + url = uri("https://jitpack.io") + content { + includeGroup("com.github.Chocohead") + } + } + maven { + url = uri("https://maven.jamieswhiteshirt.com/libs-release") + content { + includeGroup("com.jamieswhiteshirt") + } + } + maven { + url = uri("https://maven.greenhouse.lgbt/releases/") + content { + includeGroup("vectorwing") + } + } +} + +dependencies { + modApi(libs.moonlight.lib.fabric) { + isTransitive = false + } + + modImplementation(libs.farmers.delight.fabric) { + exclude(group = "net.fabricmc") + } + + modImplementation(pack.fabric.modrinth.supplementaries) + modImplementation(pack.fabric.modrinth.amendments) + + modImplementation(libs.dye.depot.fabric) + + if (!env.isCI) { + modRuntimeOnly(libs.jei.fabric) + modRuntimeOnly(libs.pathfinding.debug.fabric) + } +} diff --git a/fabric/pack/.gitattributes b/fabric/pack/.gitattributes new file mode 100644 index 00000000..b6dd0bbb --- /dev/null +++ b/fabric/pack/.gitattributes @@ -0,0 +1 @@ +*.ogg filter=lfs diff=lfs merge=lfs -text diff --git a/fabric/pack/index.toml b/fabric/pack/index.toml new file mode 100644 index 00000000..4504767b --- /dev/null +++ b/fabric/pack/index.toml @@ -0,0 +1,16 @@ +hash-format = "sha256" + +[[files]] +file = "mods/amendments.pw.toml" +hash = "deba8bfb9a55d3a857079d3da87b24ece7223eeb3934e5cc028df48c1a7123c7" +metafile = true + +[[files]] +file = "mods/moonlight.pw.toml" +hash = "9830d4b93e2fea7e398078143efdb7a271b04a4f23565dd9b02744f2aca23647" +metafile = true + +[[files]] +file = "mods/supplementaries.pw.toml" +hash = "3135bb6ec401e951d248de79dbdf40608e362e64b89fe9e7d2e74399f3b49375" +metafile = true diff --git a/fabric/pack/mods/amendments.pw.toml b/fabric/pack/mods/amendments.pw.toml new file mode 100644 index 00000000..f561283f --- /dev/null +++ b/fabric/pack/mods/amendments.pw.toml @@ -0,0 +1,13 @@ +name = "Amendments" +filename = "amendments-1.20-2.2.3-fabric.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/6iTJugQR/versions/JjsSf9MI/amendments-1.20-2.2.3-fabric.jar" +hash-format = "sha512" +hash = "580191ef9b27e0ee4472e3163af8b4a38c89a00500a2c0e7813777859989f6f24648d26383346ea18a8112be661f2dcb5c1e9088f8996079714d5cc66cc3bd60" + +[update] +[update.modrinth] +mod-id = "6iTJugQR" +version = "JjsSf9MI" diff --git a/fabric/pack/mods/moonlight.pw.toml b/fabric/pack/mods/moonlight.pw.toml new file mode 100644 index 00000000..6297eeae --- /dev/null +++ b/fabric/pack/mods/moonlight.pw.toml @@ -0,0 +1,13 @@ +name = "Moonlight Lib" +filename = "moonlight-1.20-2.16.15-fabric.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/twkfQtEc/versions/kD8s6Jem/moonlight-1.20-2.16.15-fabric.jar" +hash-format = "sha512" +hash = "51a3114127357226fc62d36c9ceee3d2d12a2f46ce5f2f648cb0bbb3954f1e07246b38ac6aaa4002f3c85501be4f8b74290f12596dbc322b7e440cf2158042fd" + +[update] +[update.modrinth] +mod-id = "twkfQtEc" +version = "kD8s6Jem" diff --git a/fabric/pack/mods/supplementaries.pw.toml b/fabric/pack/mods/supplementaries.pw.toml new file mode 100644 index 00000000..5f44e59d --- /dev/null +++ b/fabric/pack/mods/supplementaries.pw.toml @@ -0,0 +1,13 @@ +name = "Supplementaries" +filename = "supplementaries-1.20-3.1.41-fabric.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/fFEIiSDQ/versions/RWLHsKXP/supplementaries-1.20-3.1.41-fabric.jar" +hash-format = "sha512" +hash = "63f31edea9eadb7af4a1a221ad950128c91a1c642b1418531d5fb98dd1360216b71e9183f4ccb76e9d0fcde0f5b8fd6a1432b3af103e1c5b44798e2b35acf4ff" + +[update] +[update.modrinth] +mod-id = "fFEIiSDQ" +version = "RWLHsKXP" diff --git a/fabric/pack/pack.toml b/fabric/pack/pack.toml new file mode 100644 index 00000000..3d498f4d --- /dev/null +++ b/fabric/pack/pack.toml @@ -0,0 +1,11 @@ +name = "doom-gloom" +pack-format = "packwiz:1.1.0" + +[index] +file = "index.toml" +hash-format = "sha256" +hash = "104c0c7cb8cf13484e3c911dd8ca9537c67f53f5f14463d3ca4f0b5b4e5d55c2" + +[versions] +fabric = "0.17.3" +minecraft = "1.20.1" diff --git a/fabric/src/main/java/galena/doom_and_gloom/fabric/FabricClientEntrypoint.java b/fabric/src/main/java/galena/doom_and_gloom/fabric/FabricClientEntrypoint.java new file mode 100644 index 00000000..176b7a92 --- /dev/null +++ b/fabric/src/main/java/galena/doom_and_gloom/fabric/FabricClientEntrypoint.java @@ -0,0 +1,19 @@ +package galena.doom_and_gloom.fabric; + +import galena.doom_and_gloom.client.DoomAndGloomClient; +import galena.doom_and_gloom.client.fog.FogRendering; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; + +public class FabricClientEntrypoint implements ClientModInitializer { + + @Override + public void onInitializeClient() { + DoomAndGloomClient.init(); + + ClientTickEvents.END_CLIENT_TICK.register(minecraft -> { + FogRendering.clientTick(); + }); + } + +} diff --git a/fabric/src/main/java/galena/doom_and_gloom/fabric/FabricEntrypoint.java b/fabric/src/main/java/galena/doom_and_gloom/fabric/FabricEntrypoint.java new file mode 100644 index 00000000..04c2f455 --- /dev/null +++ b/fabric/src/main/java/galena/doom_and_gloom/fabric/FabricEntrypoint.java @@ -0,0 +1,32 @@ +package galena.doom_and_gloom.fabric; + +import galena.doom_and_gloom.DoomAndGloom; +import galena.doom_and_gloom.compat.AmendmentsCompat; +import galena.doom_and_gloom.compat.CompatMods; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.fabricmc.fabric.api.event.player.UseBlockCallback; +import net.minecraft.world.InteractionResult; + +public class FabricEntrypoint implements ModInitializer { + + @Override + public void onInitialize() { + DoomAndGloom.init(); + + //if this doesnt work use server started + ServerLifecycleEvents.SERVER_STARTING.register(DoomAndGloom::onServerAboutToStart); + if (CompatMods.AMENDMENTS) { + UseBlockCallback.EVENT.register((player, level, interactionHand, blockHitResult) -> { + boolean res = AmendmentsCompat.onBlockInteract(level, blockHitResult.getBlockPos(), player, + interactionHand, player.getItemInHand(interactionHand)); + if (res) { + return InteractionResult.sidedSuccess(level.isClientSide); + } + else return InteractionResult.PASS; + }); + } + } + + +} diff --git a/fabric/src/main/java/galena/doom_and_gloom/fabric/mixin/FogRendererMixin.java b/fabric/src/main/java/galena/doom_and_gloom/fabric/mixin/FogRendererMixin.java new file mode 100644 index 00000000..5e1f2d6b --- /dev/null +++ b/fabric/src/main/java/galena/doom_and_gloom/fabric/mixin/FogRendererMixin.java @@ -0,0 +1,60 @@ +package galena.doom_and_gloom.fabric.mixin; + +import com.llamalad7.mixinextras.sugar.Local; +import com.mojang.blaze3d.shaders.FogShape; +import com.mojang.blaze3d.systems.RenderSystem; +import galena.doom_and_gloom.client.fog.FogRendering; +import net.minecraft.client.Camera; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.renderer.FogRenderer; +import net.minecraft.world.level.material.FogType; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(FogRenderer.class) +public abstract class FogRendererMixin { + + @Shadow + private static float fogRed; + + @Shadow + private static float fogGreen; + + @Shadow + private static float fogBlue; + + @Inject(method = "setupFog", at = @At(value = "TAIL")) + private static void dg$modifyFogShape(Camera camera, FogRenderer.FogMode fogMode, + float renderDistance, boolean shouldCreateFog, + float partialTick, CallbackInfo ci, @Local FogType fogType) { + + float start = RenderSystem.getShaderFogStart(); + float end = RenderSystem.getShaderFogEnd(); + FogShape fogShape = RenderSystem.getShaderFogShape(); + + float[] nearFar = FogRendering.modifyPlanes(start, end, //near far wherever we are + fogMode, fogShape, fogType, partialTick); + + if (nearFar != null) { + RenderSystem.setShaderFogStart(nearFar[0]); + RenderSystem.setShaderFogEnd(nearFar[1]); + } + } + + //not ideal. should happen before set clear color but just setting it again should do the trick too + @Inject(method = "setupColor", at = @At(value = "TAIL")) + private static void dg$modifyFogColor(Camera camera, float partialTick, ClientLevel clientLevel, int i, float g, CallbackInfo ci) { + + float[] newColor = FogRendering.modifyFogColor( + fogRed, fogGreen, fogBlue, partialTick); + if (newColor != null) { + fogRed = newColor[0]; + fogGreen = newColor[1]; + fogBlue = newColor[2]; + RenderSystem.clearColor(fogRed, fogGreen, fogBlue, 0.0F); + } + } +} diff --git a/fabric/src/main/java/galena/doom_and_gloom/fabric/mixin/LivingEntityMixin.java b/fabric/src/main/java/galena/doom_and_gloom/fabric/mixin/LivingEntityMixin.java new file mode 100644 index 00000000..150fd3de --- /dev/null +++ b/fabric/src/main/java/galena/doom_and_gloom/fabric/mixin/LivingEntityMixin.java @@ -0,0 +1,44 @@ +package galena.doom_and_gloom.fabric.mixin; + +import galena.doom_and_gloom.content.entity.ISepulcherable; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.entity.LivingEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(LivingEntity.class) +public class LivingEntityMixin implements ISepulcherable { + + @Unique + private boolean dg$sepulchered = false; + + @Inject(method = "dropAllDeathLoot", at = @At("HEAD"), cancellable = true) + public void DG$cancelDrops(DamageSource damageSource, CallbackInfo ci) { + ci.cancel(); + } + + @Override + public void DG$setSepulchered(boolean sepulchered) { + this.dg$sepulchered = sepulchered; + } + + @Override + public boolean DG$wasSepulchered() { + return dg$sepulchered; + } + + @Inject(method = "readAdditionalSaveData", at = @At("TAIL")) + public void dg$readSepulchered(CompoundTag nbt, CallbackInfo ci) { + if (nbt.contains(ISepulcherable.DG_TAG_KEY)) + dg$sepulchered = nbt.getBoolean(ISepulcherable.DG_TAG_KEY); + } + + @Inject(method = "addAdditionalSaveData", at = @At("TAIL")) + public void dg$addSepulchered(CompoundTag nbt, CallbackInfo ci) { + if (dg$sepulchered) nbt.putBoolean(ISepulcherable.DG_TAG_KEY, dg$sepulchered); + } +} diff --git a/fabric/src/main/resources/doom_and_gloom.fabric.mixins.json b/fabric/src/main/resources/doom_and_gloom.fabric.mixins.json new file mode 100644 index 00000000..b4623e2f --- /dev/null +++ b/fabric/src/main/resources/doom_and_gloom.fabric.mixins.json @@ -0,0 +1,16 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "galena.doom_and_gloom.fabric.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "LivingEntityMixin" + ], + "server": [], + "injectors": { + "defaultRequire": 1 + }, + "client": [ + "FogRendererMixin" + ] +} diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json new file mode 100644 index 00000000..75f1e028 --- /dev/null +++ b/fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,36 @@ +{ + "schemaVersion": 1, + "id": "${mod_id}", + "version": "${mod_version}", + "name": "${mod_name}", + "description": "An addon-mod for Oreganized adding Halloween-themed content", + "authors": [ + "${mod_author}" + ], + "contact": { + "sources": "https://github.com/${repository}", + "issues": "https://github.com/${repository}/issues" + }, + "license": "https://github.com/${repository}/blob/1.20.x/LICENSE.txt", + "environment": "*", + "accessWidener": "${mod_id}.accesswidener", + "entrypoints": { + "main": [ + "galena.doom_and_gloom.fabric.FabricEntrypoint" + ], + "client": [ + "galena.doom_and_gloom.fabric.FabricClientEntrypoint" + ] + }, + "mixins": [ + "${mod_id}.mixins.json", + "${mod_id}.fabric.mixins.json" + ], + "depends": { + "fabricloader": ">=0.16", + "fabric-api": "*", + "minecraft": ">=1.20.1", + "moonlight": "*", + "java": ">=17" + } +} diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts new file mode 100644 index 00000000..02d6cd2e --- /dev/null +++ b/forge/build.gradle.kts @@ -0,0 +1,56 @@ +import org.spongepowered.asm.gradle.plugins.MixinExtension + +plugins { + id("com.possible-triangle.forge") + alias(libs.plugins.parchment) +} + +mod { + mods.include(libs.galena.hats) + mods.include(libs.multikulti.datagen.fix) +} + +forge { + dependOn(project(":common")) + + mappingChannel = "parchment" + mappingVersion = "2023.09.03-1.20.1" + + enableMixins() + accessWidener(project(":common")) + + dataGen { + existing("blueprint") + splitSourceSet() + } +} + +tasks.compileJava { + dependsOn(tasks.getByName("transformAccessWidener")) +} + +configure { + config("${mod.id.get()}.forge.mixins.json") +} + +dependencies { + modImplementation(libs.moonlight.lib.forge) { + isTransitive = false + } + + modImplementation(pack.forge.modrinth.farmers.delight) + modImplementation(pack.forge.modrinth.supplementaries) + modImplementation(pack.forge.modrinth.amendments) + modImplementation(libs.oreganized) + + modImplementation(libs.multikulti.core) + modImplementation(libs.multikulti.datagen) + modImplementation(libs.dye.depot.forge) + + if (!env.isCI) { + // this should be included transient with oreganized on 1.21 neoforge (just not possible with how forge works) + modRuntimeOnly(libs.blueprint) + modRuntimeOnly(libs.jei.forge) + modRuntimeOnly(libs.pathfinding.debug.forge) + } +} diff --git a/forge/pack/index.toml b/forge/pack/index.toml new file mode 100644 index 00000000..95473585 --- /dev/null +++ b/forge/pack/index.toml @@ -0,0 +1,21 @@ +hash-format = "sha256" + +[[files]] +file = "mods/amendments.pw.toml" +hash = "4eb0979fd7cada4b6e3dd3fec8ced79ee0892e2b7ffba6466430387cd520acee" +metafile = true + +[[files]] +file = "mods/farmers-delight.pw.toml" +hash = "9f2ffb0d4c65fcb2a96878287a7119459b9d0637c395e5097d691416690d6563" +metafile = true + +[[files]] +file = "mods/moonlight.pw.toml" +hash = "59ddb20cb1fddab5a1a0349e0452f5100c2bec8c51e746658553f92dc8239512" +metafile = true + +[[files]] +file = "mods/supplementaries.pw.toml" +hash = "3848bc11aa2acabef74eb85ca74b8ca8e23733b7fcbc77293165c5c7161e3288" +metafile = true diff --git a/forge/pack/mods/amendments.pw.toml b/forge/pack/mods/amendments.pw.toml new file mode 100644 index 00000000..ee39b5a0 --- /dev/null +++ b/forge/pack/mods/amendments.pw.toml @@ -0,0 +1,13 @@ +name = "Amendments" +filename = "amendments-1.20-2.2.2.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/6iTJugQR/versions/NCs7sRuH/amendments-1.20-2.2.2.jar" +hash-format = "sha512" +hash = "ed6ebc3ead0481c7e195ec39cc34a38470a572f5f24825a6599245da2513a6a0bce96f4b6e461e6f0ded2b5029d2179a2e62be5518aed49d4f54c420ca4471d0" + +[update] +[update.modrinth] +mod-id = "6iTJugQR" +version = "NCs7sRuH" diff --git a/forge/pack/mods/farmers-delight.pw.toml b/forge/pack/mods/farmers-delight.pw.toml new file mode 100644 index 00000000..4c08ceae --- /dev/null +++ b/forge/pack/mods/farmers-delight.pw.toml @@ -0,0 +1,13 @@ +name = "Farmer's Delight" +filename = "FarmersDelight-1.20.1-1.2.9.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/R2OftAxM/versions/8rPF1pFi/FarmersDelight-1.20.1-1.2.9.jar" +hash-format = "sha512" +hash = "b628f9818301788dfba535615dde964e1727b8b3b22884f26df1f8a2b5a11a063f3803de00bc6eb8d148440286d43a29b98352afb33bd447b847c21b870442cb" + +[update] +[update.modrinth] +mod-id = "R2OftAxM" +version = "8rPF1pFi" diff --git a/forge/pack/mods/moonlight.pw.toml b/forge/pack/mods/moonlight.pw.toml new file mode 100644 index 00000000..7cb597d1 --- /dev/null +++ b/forge/pack/mods/moonlight.pw.toml @@ -0,0 +1,13 @@ +name = "Moonlight Lib" +filename = "moonlight-1.20-2.16.15-forge.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/twkfQtEc/versions/q6pVkPDR/moonlight-1.20-2.16.15-forge.jar" +hash-format = "sha512" +hash = "9eba41fa2bef4558bfe7a3a31b0b3ae2484eba87a2f6feda6d4e0c18d9074b08bb0a5637446a9df2a87171a27bb84af703a716cfc0f49fab2882da4ffdf2a76c" + +[update] +[update.modrinth] +mod-id = "twkfQtEc" +version = "q6pVkPDR" diff --git a/forge/pack/mods/supplementaries.pw.toml b/forge/pack/mods/supplementaries.pw.toml new file mode 100644 index 00000000..01bbd3ac --- /dev/null +++ b/forge/pack/mods/supplementaries.pw.toml @@ -0,0 +1,13 @@ +name = "Supplementaries" +filename = "supplementaries-1.20-3.1.41.jar" +side = "both" + +[download] +url = "https://cdn.modrinth.com/data/fFEIiSDQ/versions/LAQ22yJj/supplementaries-1.20-3.1.41.jar" +hash-format = "sha512" +hash = "b220c48a6fd07396b2f6eaa21bba0971f81b1111bdf91b0d36325b88b873e9413560bd6b924972c37fe2864910ea03bc537c90904bdb76971df416f901c3931d" + +[update] +[update.modrinth] +mod-id = "fFEIiSDQ" +version = "LAQ22yJj" diff --git a/forge/pack/pack.toml b/forge/pack/pack.toml new file mode 100644 index 00000000..581e0936 --- /dev/null +++ b/forge/pack/pack.toml @@ -0,0 +1,11 @@ +name = "doom-gloom" +pack-format = "packwiz:1.1.0" + +[index] +file = "index.toml" +hash-format = "sha256" +hash = "429fd3d3981ef9aa3a54adbe128c4f9f88b1082eaa752ea50b1679f1df579019" + +[versions] +forge = "47.3.10" +minecraft = "1.20.1" diff --git a/forge/src/data/java/galena/doom_and_gloom/data/DGBlockStates.java b/forge/src/data/java/galena/doom_and_gloom/data/DGBlockStates.java new file mode 100644 index 00000000..c6cc9ef3 --- /dev/null +++ b/forge/src/data/java/galena/doom_and_gloom/data/DGBlockStates.java @@ -0,0 +1,34 @@ +package galena.doom_and_gloom.data; + +import galena.doom_and_gloom.DoomAndGloom; +import galena.doom_and_gloom.data.provider.DGBlockStateProvider; +import galena.doom_and_gloom.index.DGBlocks; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.common.data.ExistingFileHelper; + +public class DGBlockStates extends DGBlockStateProvider { + + public DGBlockStates(PackOutput output, ExistingFileHelper helper) { + super(output, helper); + } + + @Override + public String getName() { + return DoomAndGloom.MOD_ID + " Block States"; + } + + @Override + protected void registerStatesAndModels() { + sepulcherBlock(DGBlocks.SEPULCHER); + simpleBlock(DGBlocks.BONE_PILE.get(), models().cubeColumn(blockTexture(DGBlocks.BONE_PILE.get()).getPath(), DoomAndGloom.modLoc("block/bone_pile_side"), DoomAndGloom.modLoc("block/sepulcher_rot_5"))); + simpleBlock(DGBlocks.ROTTING_FLESH.get(), models().cubeAll(blockTexture(DGBlocks.ROTTING_FLESH.get()).getPath(), DoomAndGloom.modLoc("block/sepulcher_rot_1"))); + vigilCandle(DGBlocks.VIGIL_CANDLE, null); + simpleBlock(DGBlocks.BURIAL_DIRT.get(), models().cubeTop("burial_dirt", new ResourceLocation("block/dirt"), DoomAndGloom.modLoc("block/burial_dirt"))); + DGBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> vigilCandle(block, color.getSerializedName())); + stoneTablet(DGBlocks.STONE_TABLET, null); + stoneTablet(DGBlocks.ENGRAVED_STONE_TABLET, "engraved"); + stoneTablet(DGBlocks.CRACKED_STONE_TABLET, "cracked"); + } + +} diff --git a/src/main/java/galena/doom_and_gloom/data/OBlockTags.java b/forge/src/data/java/galena/doom_and_gloom/data/DGBlockTags.java similarity index 58% rename from src/main/java/galena/doom_and_gloom/data/OBlockTags.java rename to forge/src/data/java/galena/doom_and_gloom/data/DGBlockTags.java index 713e67f3..1210351e 100644 --- a/src/main/java/galena/doom_and_gloom/data/OBlockTags.java +++ b/forge/src/data/java/galena/doom_and_gloom/data/DGBlockTags.java @@ -1,9 +1,8 @@ package galena.doom_and_gloom.data; -import static galena.doom_and_gloom.index.OTags.Blocks.*; - import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.index.OBlocks; +import galena.doom_and_gloom.index.DGBlocks; +import galena.doom_and_gloom.index.DGTags; import java.util.concurrent.CompletableFuture; import javax.annotation.Nullable; import net.minecraft.core.HolderLookup; @@ -18,9 +17,9 @@ import net.minecraftforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.NotNull; -public class OBlockTags extends IntrinsicHolderTagsProvider { +public class DGBlockTags extends IntrinsicHolderTagsProvider { - public OBlockTags(PackOutput output, CompletableFuture future, @Nullable ExistingFileHelper helper) { + public DGBlockTags(PackOutput output, CompletableFuture future, @Nullable ExistingFileHelper helper) { super(output, Registries.BLOCK, future, block -> block.builtInRegistryHolder().key(), DoomAndGloom.MOD_ID, helper); } @@ -32,25 +31,25 @@ public OBlockTags(PackOutput output, CompletableFuture fu @SuppressWarnings("unchecked") @Override protected void addTags(HolderLookup.Provider provider) { - tag(HEAT_SOURCE).addTag(BlockTags.FIRE).addTag(BlockTags.CAMPFIRES); + tag(DGTags.Blocks.HEAT_SOURCE).addTag(BlockTags.FIRE).addTag(BlockTags.CAMPFIRES); tag(BlockTags.MINEABLE_WITH_PICKAXE).add( - OBlocks.SEPULCHER.get(), - OBlocks.BONE_PILE.get() + DGBlocks.SEPULCHER.get(), + DGBlocks.BONE_PILE.get() ); - var vigilCandles = tag(VIGIL_CANDLES); + var vigilCandles = tag(DGTags.Blocks.VIGIL_CANDLES); - OBlocks.vigilCandles().forEach(block -> { + DGBlocks.vigilCandles().forEach(block -> { var id = BuiltInRegistries.BLOCK.getKey(block.get()); vigilCandles.addOptional(id); }); - tag(BlockTags.CANDLES).addTags(VIGIL_CANDLES); - tag(BlockTags.MINEABLE_WITH_PICKAXE).addTags(VIGIL_CANDLES); - tag(BlockTags.MINEABLE_WITH_PICKAXE).add(OBlocks.SEPULCHER.get()); + tag(BlockTags.CANDLES).addTags(DGTags.Blocks.VIGIL_CANDLES); + tag(BlockTags.MINEABLE_WITH_PICKAXE).addTags(DGTags.Blocks.VIGIL_CANDLES); + tag(BlockTags.MINEABLE_WITH_PICKAXE).add(DGBlocks.SEPULCHER.get()); - tag(CAN_TURN_INTO_BURIAL_DIRT).add( + tag(DGTags.Blocks.CAN_TURN_INTO_BURIAL_DIRT).add( Blocks.DIRT, Blocks.GRASS_BLOCK, Blocks.PODZOL, @@ -59,10 +58,14 @@ protected void addTags(HolderLookup.Provider provider) { Blocks.ROOTED_DIRT ); - tag(GRAVETENDER_LIGHTABLE) + tag(DGTags.Blocks.GRAVETENDER_LIGHTABLE) .addTag(BlockTags.CANDLES) .addOptionalTag(new ResourceLocation("amendments:skull_candles")); - tag(BlockTags.DIRT).add(OBlocks.BURIAL_DIRT.get()); + tag(BlockTags.DIRT).add(DGBlocks.BURIAL_DIRT.get()); + + DGBlocks.COLORED_VIGIL_CANDLES.forEach((dye, block) -> + tag(DGTags.Blocks.DYED.get(dye)).addOptional(block.getId()) + ); } } diff --git a/src/main/java/galena/doom_and_gloom/data/ODamageTags.java b/forge/src/data/java/galena/doom_and_gloom/data/DGDamageTags.java similarity index 81% rename from src/main/java/galena/doom_and_gloom/data/ODamageTags.java rename to forge/src/data/java/galena/doom_and_gloom/data/DGDamageTags.java index 24f79a70..6adeaeec 100644 --- a/src/main/java/galena/doom_and_gloom/data/ODamageTags.java +++ b/forge/src/data/java/galena/doom_and_gloom/data/DGDamageTags.java @@ -11,9 +11,9 @@ import net.minecraftforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.NotNull; -public class ODamageTags extends TagsProvider { +public class DGDamageTags extends TagsProvider { - public ODamageTags(PackOutput output, CompletableFuture future, @Nullable ExistingFileHelper helper) { + public DGDamageTags(PackOutput output, CompletableFuture future, @Nullable ExistingFileHelper helper) { super(output, Registries.DAMAGE_TYPE, future, DoomAndGloom.MOD_ID, helper); } diff --git a/src/main/java/galena/doom_and_gloom/data/OEntityTags.java b/forge/src/data/java/galena/doom_and_gloom/data/DGEntityTags.java similarity index 74% rename from src/main/java/galena/doom_and_gloom/data/OEntityTags.java rename to forge/src/data/java/galena/doom_and_gloom/data/DGEntityTags.java index 065d49bc..e75093ad 100644 --- a/src/main/java/galena/doom_and_gloom/data/OEntityTags.java +++ b/forge/src/data/java/galena/doom_and_gloom/data/DGEntityTags.java @@ -1,7 +1,7 @@ package galena.doom_and_gloom.data; import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.index.OTags; +import galena.doom_and_gloom.index.DGTags; import java.util.concurrent.CompletableFuture; import javax.annotation.Nullable; import net.minecraft.core.HolderLookup; @@ -10,9 +10,9 @@ import net.minecraft.world.entity.EntityType; import net.minecraftforge.common.data.ExistingFileHelper; -public class OEntityTags extends EntityTypeTagsProvider { +public class DGEntityTags extends EntityTypeTagsProvider { - public OEntityTags(PackOutput output, CompletableFuture future, @Nullable ExistingFileHelper help) { + public DGEntityTags(PackOutput output, CompletableFuture future, @Nullable ExistingFileHelper help) { super(output, future, DoomAndGloom.MOD_ID, help); } @@ -23,7 +23,7 @@ public String getName() { @Override protected void addTags(HolderLookup.Provider provider) { - tag(OTags.Entities.FILLS_SEPULCHER) + tag(DGTags.Entities.FILLS_SEPULCHER) .add(EntityType.PLAYER) .add(EntityType.ZOMBIE) .add(EntityType.ZOMBIE_VILLAGER) diff --git a/forge/src/data/java/galena/doom_and_gloom/data/DGItemListings.java b/forge/src/data/java/galena/doom_and_gloom/data/DGItemListings.java new file mode 100644 index 00000000..529d4095 --- /dev/null +++ b/forge/src/data/java/galena/doom_and_gloom/data/DGItemListings.java @@ -0,0 +1,44 @@ +package galena.doom_and_gloom.data; + +import galena.doom_and_gloom.DoomAndGloom; +import galena.doom_and_gloom.data.provider.ItemListingProvider; +import galena.doom_and_gloom.index.DGTags; +import galena.doom_and_gloom.index.DGVillagerTypes; +import net.minecraft.data.PackOutput; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraftforge.common.data.ExistingFileHelper; + +public class DGItemListings extends ItemListingProvider { + + public DGItemListings(PackOutput output, ExistingFileHelper fileHelper) { + super(output, fileHelper, DoomAndGloom.MOD_ID); + } + + @Override + protected void run() { + builder(DGVillagerTypes.GRAVETENDER.getKey(), 1) + .sell("stone_shovel", 1, new ItemStack(Items.STONE_SHOVEL), 12, 1) + .sell("rose_bush", 1, new ItemStack(Items.ROSE_BUSH), 8, 2) + .buy("poppy", 1, new ItemStack(Items.POPPY, 8), 12, 1) + .buy("cornflower", 1, new ItemStack(Items.CORNFLOWER, 8), 12, 1); + + builder(DGVillagerTypes.GRAVETENDER.getKey(), 2) + .sell("gold_nugget", 1, new ItemStack(Items.GOLD_NUGGET), 8, 5) + .sell("vigil_candles", 2, DGTags.Items.VIGIL_CANDLES, 1, 12, 10) + .sell("poppy", 1, new ItemStack(Items.FLOWER_POT, 8), 12, 5); + + builder(DGVillagerTypes.GRAVETENDER.getKey(), 3) + .sellEnchanted("iron_shovel", 1, new ItemStack(Items.IRON_SHOVEL), 3, 10) + .buy("candles", 2, ItemTags.CANDLES, 6, 12, 2); + + builder(DGVillagerTypes.GRAVETENDER.getKey(), 4) + .buy("lantern", 2, new ItemStack(Items.LANTERN), 8, 15) + .sell("wither_rose", 10, new ItemStack(Items.WITHER_ROSE, 2), 20, 8); + + builder(DGVillagerTypes.GRAVETENDER.getKey(), 5) + .sellEnchanted("diamond_shovel", 13, new ItemStack(Items.DIAMOND_SHOVEL), 3, 30); + } + +} diff --git a/forge/src/data/java/galena/doom_and_gloom/data/DGItemModels.java b/forge/src/data/java/galena/doom_and_gloom/data/DGItemModels.java new file mode 100644 index 00000000..75d03a4d --- /dev/null +++ b/forge/src/data/java/galena/doom_and_gloom/data/DGItemModels.java @@ -0,0 +1,36 @@ +package galena.doom_and_gloom.data; + +import galena.doom_and_gloom.DoomAndGloom; +import galena.doom_and_gloom.data.provider.DGItemModelProvider; +import galena.doom_and_gloom.index.DGBlocks; +import galena.doom_and_gloom.index.DGItems; +import net.minecraft.data.PackOutput; +import net.minecraftforge.common.data.ExistingFileHelper; + +public class DGItemModels extends DGItemModelProvider { + + public DGItemModels(PackOutput output, ExistingFileHelper helper) { + super(output, helper); + } + + @Override + public String getName() { + return DoomAndGloom.MOD_ID + " Item Models"; + } + + @Override + protected void registerModels() { + toolItem(DGItems.BUSH_HAMMER); + block(DGBlocks.SEPULCHER); + block(DGBlocks.BONE_PILE); + block(DGBlocks.BURIAL_DIRT); + DGBlocks.vigilCandles().forEach(this::normalItem); + spawnEggItem(DGItems.HOLLER_SPAWN_EGG); + normalItem(DGItems.MUSIC_DISC_AFTERLIFE); + normalItem(DGBlocks.STONE_TABLET); + normalItem(DGBlocks.ENGRAVED_STONE_TABLET); + normalItem(DGBlocks.CRACKED_STONE_TABLET); + normalItem(DGItems.HAMMER_AND_CHISEL); + } + +} diff --git a/forge/src/data/java/galena/doom_and_gloom/data/DGItemTags.java b/forge/src/data/java/galena/doom_and_gloom/data/DGItemTags.java new file mode 100644 index 00000000..29ea6a4b --- /dev/null +++ b/forge/src/data/java/galena/doom_and_gloom/data/DGItemTags.java @@ -0,0 +1,54 @@ +package galena.doom_and_gloom.data; + +import static galena.doom_and_gloom.index.DGTags.Items.TOOLS_BUSH_HAMMER; + +import galena.doom_and_gloom.DoomAndGloom; +import galena.doom_and_gloom.index.DGBlocks; +import galena.doom_and_gloom.index.DGItems; +import galena.doom_and_gloom.index.DGTags; +import java.util.concurrent.CompletableFuture; +import javax.annotation.Nullable; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.common.data.ExistingFileHelper; + +public class DGItemTags extends ItemTagsProvider { + + public DGItemTags(PackOutput output, CompletableFuture future, CompletableFuture> provider, @Nullable ExistingFileHelper helper) { + super(output, future, provider, DoomAndGloom.MOD_ID, helper); + } + + @Override + public String getName() { + return "Oreganized Item Tags"; + } + + @Override + protected void addTags(HolderLookup.Provider provider) { + tag(TOOLS_BUSH_HAMMER).add(DGItems.BUSH_HAMMER.get()); + + tag(ItemTags.MUSIC_DISCS).add(DGItems.MUSIC_DISC_AFTERLIFE.get()); + + copy(DGTags.Blocks.VIGIL_CANDLES, DGTags.Items.VIGIL_CANDLES); + + DGBlocks.COLORED_VIGIL_CANDLES.forEach((dye, block) -> + tag(DGTags.Items.DYED.get(dye)).addOptional(block.getId()) + ); + + migrate(DGTags.Items.INGOTS_LEAD); + migrate(DGTags.Items.INGOTS_SILVER); + } + + // no longer necessary on 1.21.1 since neoforge will also use 'c' namespace + private void migrate(TagKey tag) { + var forgeId = new ResourceLocation("forge", tag.location().getPath()); + tag(tag).addOptionalTag(TagKey.create(tag.registry(), forgeId)); + } + +} diff --git a/forge/src/data/java/galena/doom_and_gloom/data/DGLang.java b/forge/src/data/java/galena/doom_and_gloom/data/DGLang.java new file mode 100644 index 00000000..5dde1da2 --- /dev/null +++ b/forge/src/data/java/galena/doom_and_gloom/data/DGLang.java @@ -0,0 +1,63 @@ +package galena.doom_and_gloom.data; + +import galena.doom_and_gloom.DoomAndGloom; +import galena.doom_and_gloom.data.provider.DGLangProvider; +import galena.doom_and_gloom.index.DGBlocks; +import galena.doom_and_gloom.index.DGEffects; +import galena.doom_and_gloom.index.DGEntityTypes; +import galena.doom_and_gloom.index.DGItems; +import net.mehvahdjukaar.moonlight.api.misc.RegSupplier; +import net.minecraft.data.PackOutput; + +public class DGLang extends DGLangProvider { + + public DGLang(PackOutput output) { + super(output, DoomAndGloom.MOD_ID, "en_us"); + } + + @Override + protected void addTranslations() { + addDisc(DGItems.MUSIC_DISC_AFTERLIFE, "Firch", "afterlife"); + + addBlock(DGBlocks.BONE_PILE, "Pile of Bones"); + add(DGBlocks.SEPULCHER.getHolder()); + add(DGBlocks.ROTTING_FLESH.getHolder()); + add(DGBlocks.STONE_TABLET.getHolder()); + add(DGBlocks.ENGRAVED_STONE_TABLET.getHolder()); + add(DGBlocks.CRACKED_STONE_TABLET.getHolder()); + DGBlocks.vigilCandles().map(RegSupplier::getHolder).forEach(this::add); + add(DGBlocks.BURIAL_DIRT.getHolder()); + + add(DGItems.BUSH_HAMMER.getHolder()); + add(DGItems.HOLLER_SPAWN_EGG.getHolder()); + add(DGItems.HAMMER_AND_CHISEL.getHolder()); + + add(DGEntityTypes.DIRT_MOUND.getHolder()); + add(DGEntityTypes.HOLLER.getHolder()); + + addEffect(DGEffects.FOG, "Fog"); + addEffect(DGEffects.WARDING, "Warding"); + + // JEED compat + add("effect.doom_and_gloom.fog.description", "An eerie fog that accompanies the holler"); + add("effect.doom_and_gloom.warding.description", "Wards against evil spirits"); + + addSubtitle("block", "sepulcher.unsealing", "Sepulcher opened"); + addSubtitle("block", "sepulcher.sealing", "Sepulcher sealed"); + addSubtitle("block", "sepulcher.rotting", "Sepulcher rotting"); + addSubtitle("block", "sepulcher.harvest", "Sepulcher emptied"); + addSubtitle("block", "sepulcher.filled", "Sepulcher filled"); + addSubtitle("block", "sepulcher.corpse_stuffed", "Sepulcher consumes corpse"); + + addSubtitle("entity", "holler_death", "Holler dies"); + addSubtitle("entity", "holler_hurt", "Holler hurts"); + addSubtitle("entity", "holler_shrieks", "Holler shrieks"); + addSubtitle("entity", "holler_hollers", "Holler wails"); + + add("entity.minecraft.villager." + DoomAndGloom.MOD_ID + ".gravetender", "Gravetender"); + + add("gui.doom_and_gloom.stone_tablet.engrave", "Engrave"); + add("gui.doom_and_gloom.stone_tablet.cancel", "Cancel"); + } + +} diff --git a/src/main/java/galena/doom_and_gloom/data/OLootTables.java b/forge/src/data/java/galena/doom_and_gloom/data/DGLootTables.java similarity index 50% rename from src/main/java/galena/doom_and_gloom/data/OLootTables.java rename to forge/src/data/java/galena/doom_and_gloom/data/DGLootTables.java index e6cc59dc..16ae5063 100644 --- a/src/main/java/galena/doom_and_gloom/data/OLootTables.java +++ b/forge/src/data/java/galena/doom_and_gloom/data/DGLootTables.java @@ -1,39 +1,42 @@ package galena.doom_and_gloom.data; -import galena.doom_and_gloom.DoomAndGloom; import galena.doom_and_gloom.content.block.SepulcherBlock; -import galena.doom_and_gloom.data.provider.OBlockLootProvider; -import galena.doom_and_gloom.index.OBlocks; -import galena.doom_and_gloom.index.OEntityTypes; +import galena.doom_and_gloom.data.provider.DGBlockLootProvider; +import galena.doom_and_gloom.index.DGBlocks; +import galena.doom_and_gloom.index.DGEntityTypes; +import galena.doom_and_gloom.index.DGLootInjects; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.function.Supplier; -import java.util.stream.Collectors; +import java.util.function.BiConsumer; import java.util.stream.Stream; import net.minecraft.advancements.critereon.StatePropertiesPredicate; import net.minecraft.data.PackOutput; import net.minecraft.data.loot.EntityLootSubProvider; import net.minecraft.data.loot.LootTableProvider; +import net.minecraft.data.loot.LootTableSubProvider; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EntityType; import net.minecraft.world.flag.FeatureFlags; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable; import net.minecraft.world.level.storage.loot.ValidationContext; import net.minecraft.world.level.storage.loot.entries.LootItem; +import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction; import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition; +import net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; +import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator; -public class OLootTables extends LootTableProvider { +public class DGLootTables extends LootTableProvider { - public OLootTables(PackOutput output) { + public DGLootTables(PackOutput output) { super(output, Set.of(), List.of( new SubProviderEntry(BlockLoot::new, LootContextParamSets.BLOCK), - new SubProviderEntry(EntityLoot::new, LootContextParamSets.ENTITY) + new SubProviderEntry(EntityLoot::new, LootContextParamSets.ENTITY), + new SubProviderEntry(InjectedLoot::new, LootContextParamSets.BLOCK) )); } @@ -41,28 +44,23 @@ public OLootTables(PackOutput output) { protected void validate(Map map, ValidationContext tracker) { } - public static class BlockLoot extends OBlockLootProvider { + public static class BlockLoot extends DGBlockLootProvider { protected void generate() { - add(OBlocks.SEPULCHER.get(), it -> createSingleItemTable(it) + add(DGBlocks.SEPULCHER.get(), it -> createSingleItemTable(it) .withPool(LootPool.lootPool() .setRolls(ConstantValue.exactly(1.0F)) - .add(LootItem.lootTableItem(OBlocks.BONE_PILE.get())) + .add(LootItem.lootTableItem(DGBlocks.BONE_PILE.get())) .when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(it).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(SepulcherBlock.LEVEL, SepulcherBlock.READY))) ) ); - dropSelf(OBlocks.BONE_PILE); - dropNothing(OBlocks.ROTTING_FLESH); - stoneTablet(OBlocks.STONE_TABLET); - stoneTablet(OBlocks.ENGRAVED_STONE_TABLET); - stoneTablet(OBlocks.CRACKED_STONE_TABLET); - dropOther(OBlocks.BURIAL_DIRT, Blocks.DIRT); - OBlocks.vigilCandles().forEach(this::vigilCandle); - } - - @Override - protected Iterable getKnownBlocks() { - return DoomAndGloom.REGISTRY_HELPER.getBlockSubHelper().getDeferredRegister().getEntries().stream().map(Supplier::get).collect(Collectors.toList()); + dropSelf(DGBlocks.BONE_PILE); + dropNothing(DGBlocks.ROTTING_FLESH); + stoneTablet(DGBlocks.STONE_TABLET); + stoneTablet(DGBlocks.ENGRAVED_STONE_TABLET); + stoneTablet(DGBlocks.CRACKED_STONE_TABLET); + dropOther(DGBlocks.BURIAL_DIRT, Blocks.DIRT); + DGBlocks.vigilCandles().forEach(this::vigilCandle); } } @@ -74,12 +72,29 @@ public EntityLoot() { @Override public void generate() { - add(OEntityTypes.HOLLER.get(), LootTable.lootTable()); + add(DGEntityTypes.HOLLER.get(), LootTable.lootTable()); } @Override protected Stream> getKnownEntityTypes() { - return OEntityTypes.ENTITIES.getEntries().stream().map(Supplier::get); + return Stream.of(DGEntityTypes.HOLLER.get()); } } + + public static class InjectedLoot implements LootTableSubProvider { + + @Override + public void generate(BiConsumer consumer) { + consumer.accept(DGLootInjects.PYRAMID_BONES, LootTable.lootTable() + .withPool(LootPool.lootPool() + .when(LootItemRandomChanceCondition.randomChance(0.2F)) + .add(LootItem.lootTableItem(DGBlocks.BONE_PILE.get()) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 3))) + ) + ) + ); + } + + } + } diff --git a/src/main/java/galena/doom_and_gloom/data/OMobEffectTags.java b/forge/src/data/java/galena/doom_and_gloom/data/DGMobEffectTags.java similarity index 68% rename from src/main/java/galena/doom_and_gloom/data/OMobEffectTags.java rename to forge/src/data/java/galena/doom_and_gloom/data/DGMobEffectTags.java index c18233f5..2749803f 100644 --- a/src/main/java/galena/doom_and_gloom/data/OMobEffectTags.java +++ b/forge/src/data/java/galena/doom_and_gloom/data/DGMobEffectTags.java @@ -1,7 +1,7 @@ package galena.doom_and_gloom.data; import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.index.OTags; +import galena.doom_and_gloom.index.DGTags; import java.util.concurrent.CompletableFuture; import javax.annotation.Nullable; import net.minecraft.core.HolderLookup; @@ -13,9 +13,9 @@ import net.minecraftforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.NotNull; -public class OMobEffectTags extends TagsProvider { +public class DGMobEffectTags extends TagsProvider { - public OMobEffectTags(PackOutput output, CompletableFuture future, @Nullable ExistingFileHelper helper) { + public DGMobEffectTags(PackOutput output, CompletableFuture future, @Nullable ExistingFileHelper helper) { super(output, Registries.MOB_EFFECT, future, DoomAndGloom.MOD_ID, helper); } @@ -26,6 +26,6 @@ public OMobEffectTags(PackOutput output, CompletableFuture consumer) { + vigilCandle(DGBlocks.VIGIL_CANDLE, Blocks.CANDLE).save(consumer); + + DGBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> { + var namespace = DDDyes.isModDye(color) ? Optional.of(CompatMods.DYE_DEPOT_NAME) : Optional.empty(); + var conditions = namespace.map(ModLoaded::new).map(List::of).orElseGet(List::of); + + Conditional.with(this, conditions, () -> { + var candle = BuiltInRegistries.BLOCK.get(new ResourceLocation(namespace.orElse(ResourceLocation.DEFAULT_NAMESPACE), color.getSerializedName() + "_candle")); + vigilCandle(block, candle).save(consumer); + + ShapelessRecipeBuilder.shapeless(RecipeCategory.BUILDING_BLOCKS, block.get()) + .requires(DGBlocks.VIGIL_CANDLE.get()) + .requires(DyeItem.byColor(color)) + .unlockedBy("has_vigil_candle", has(DGBlocks.VIGIL_CANDLE.get())) + .group("vigil_candle") + .save(consumer, RecipeBuilder.getDefaultRecipeId(block.get()).withSuffix("_dyeing")); + }); + }); + + withFallback(DGTags.Items.INGOTS_SILVER, Items.IRON_INGOT, ingot -> + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, DGBlocks.SEPULCHER.get()) + .pattern("# #") + .pattern("# #") + .pattern("###") + .define('#', ingot) + ).accept(consumer); + + compact(DGBlocks.BONE_PILE.get().asItem(), Items.BONE).save(consumer); + unCompact(Items.BONE, DGBlocks.BONE_PILE.get().asItem()).save(consumer); + + Conditional.with(this, List.of(new ModLoaded(CompatMods.FARMERS_DELIGHT_NAME)), () -> { + CuttingBoardRecipeBuilder.cuttingRecipe( + Ingredient.of(DGBlocks.STONE_TABLET.get()), + Ingredient.of(ItemTags.PICKAXES), + DGBlocks.CRACKED_STONE_TABLET.get() + ).build(consumer, DoomAndGloom.modLoc("cutting/stone_tablet")); + }); + + /* + withFallback(OTags.Items.INGOTS_LEAD, Items.COPPER_INGOT, ingot -> + ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, OItems.BUSH_HAMMER.get()) + .pattern("AA") + .pattern("B ") + .define('A', ingot) + .define('B', Tags.Items.RODS_WOODEN) + .unlockedBy("has_stick", has(Tags.Items.RODS_WOODEN)) + ).accept(consumer); + + ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, OBlocks.STONE_TABLET.get()) + .pattern("##") + .pattern("##") + .define('#', Blocks.STONE_PRESSURE_PLATE) + .unlockedBy("has_stone", has(Blocks.STONE_PRESSURE_PLATE)) + .save(consumer); + + ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, OItems.HAMMER_AND_CHISEL.get()) + .pattern("## ") + .pattern("##H") + .define('#', Blocks.STONE_PRESSURE_PLATE) + .define('H', OItems.BUSH_HAMMER.get()) + .unlockedBy("has_hammer", has(OItems.BUSH_HAMMER.get())) + .save(consumer); + + ShapelessRecipeBuilder.shapeless(RecipeCategory.TOOLS, OItems.HAMMER_AND_CHISEL.get()) + .requires(OItems.BUSH_HAMMER.get()) + .requires(OBlocks.STONE_TABLET.get()) + .unlockedBy("has_hammer", has(OItems.BUSH_HAMMER.get())) + .save(consumer, DoomAndGloom.modLoc("hammer_and_chisel_from_tablet")); + + smeltingResultFromBase(consumer, OBlocks.CRACKED_STONE_TABLET.get(), OBlocks.STONE_TABLET.get()); + */ + } + + private Consumer> withFallback(TagKey prefer, Item fallback, Function builder) { + return consumer -> { + var preferredRecipe = builder.apply(Ingredient.of(prefer)).unlockedBy("has_ingredient", has(prefer)); + var fallbackRecipe = builder.apply(Ingredient.of(fallback)).unlockedBy("has_ingredient", has(fallback)); + var id = RecipeBuilder.getDefaultRecipeId(preferredRecipe.getResult()); + + Conditional.with(this, List.of(new TagPopulated(prefer)), () -> + preferredRecipe.save(consumer, id) + ); + + Conditional.with(this, List.of(new TagEmpty(prefer)), () -> + fallbackRecipe.save(consumer, id.withSuffix("_fallback")) + ); + + }; + } + +} diff --git a/src/main/java/galena/doom_and_gloom/data/OSoundDefinitions.java b/forge/src/data/java/galena/doom_and_gloom/data/DGSoundDefinitions.java similarity index 68% rename from src/main/java/galena/doom_and_gloom/data/OSoundDefinitions.java rename to forge/src/data/java/galena/doom_and_gloom/data/DGSoundDefinitions.java index a2eb410f..0403480c 100644 --- a/src/main/java/galena/doom_and_gloom/data/OSoundDefinitions.java +++ b/forge/src/data/java/galena/doom_and_gloom/data/DGSoundDefinitions.java @@ -1,21 +1,21 @@ package galena.doom_and_gloom.data; import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.index.OSoundEvents; +import galena.doom_and_gloom.index.DGSoundEvents; import net.minecraft.data.PackOutput; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.common.data.SoundDefinition; import net.minecraftforge.common.data.SoundDefinitionsProvider; -public class OSoundDefinitions extends SoundDefinitionsProvider { +public class DGSoundDefinitions extends SoundDefinitionsProvider { - public OSoundDefinitions(PackOutput output, ExistingFileHelper helper) { + public DGSoundDefinitions(PackOutput output, ExistingFileHelper helper) { super(output, DoomAndGloom.MOD_ID, helper); } @Override public void registerSounds() { - add(OSoundEvents.MUSIC_DISC_AFTERLIFE, definition().with( + add(DGSoundEvents.MUSIC_DISC_AFTERLIFE, definition().with( sound(DoomAndGloom.MOD_ID + ":music/disc/afterlife").stream() )); @@ -34,11 +34,11 @@ public void registerSounds() { sound(DoomAndGloom.MOD_ID + ":block/bone_pile_step_3") }; - add(OSoundEvents.BONE_PILE_BREAK, definition().with(bonePileBreakSounds).subtitle("subtitles.block.generic.break")); - add(OSoundEvents.BONE_PILE_PLACE, definition().with(bonePileBreakSounds).subtitle("subtitles.block.generic.place")); - add(OSoundEvents.BONE_PILE_HIT, definition().with(bonePileStepSounds).subtitle("subtitles.block.generic.hit")); - add(OSoundEvents.BONE_PILE_STEP, definition().with(bonePileStepSounds).subtitle("subtitles.block.generic.footsteps")); - add(OSoundEvents.BONE_PILE_FALL, definition().with(bonePileStepSounds)); + add(DGSoundEvents.BONE_PILE_BREAK, definition().with(bonePileBreakSounds).subtitle("subtitles.block.generic.break")); + add(DGSoundEvents.BONE_PILE_PLACE, definition().with(bonePileBreakSounds).subtitle("subtitles.block.generic.place")); + add(DGSoundEvents.BONE_PILE_HIT, definition().with(bonePileStepSounds).subtitle("subtitles.block.generic.hit")); + add(DGSoundEvents.BONE_PILE_STEP, definition().with(bonePileStepSounds).subtitle("subtitles.block.generic.footsteps")); + add(DGSoundEvents.BONE_PILE_FALL, definition().with(bonePileStepSounds)); SoundDefinition.Sound[] sepulcherBreakSounds = { sound(DoomAndGloom.MOD_ID + ":block/sepulcher_break_0"), @@ -55,66 +55,66 @@ public void registerSounds() { sound(DoomAndGloom.MOD_ID + ":block/sepulcher_step_4") }; - add(OSoundEvents.SEPULCHER_BREAK, definition().with(sepulcherBreakSounds).subtitle("subtitles.block.generic.break")); - add(OSoundEvents.SEPULCHER_PLACE, definition().with(sepulcherBreakSounds).subtitle("subtitles.block.generic.place")); - add(OSoundEvents.SEPULCHER_HIT, definition().with(sepulcherStepSounds).subtitle("subtitles.block.generic.hit")); - add(OSoundEvents.SEPULCHER_STEP, definition().with(sepulcherStepSounds).subtitle("subtitles.block.generic.footsteps")); - add(OSoundEvents.SEPULCHER_FALL, definition().with(sepulcherStepSounds)); + add(DGSoundEvents.SEPULCHER_BREAK, definition().with(sepulcherBreakSounds).subtitle("subtitles.block.generic.break")); + add(DGSoundEvents.SEPULCHER_PLACE, definition().with(sepulcherBreakSounds).subtitle("subtitles.block.generic.place")); + add(DGSoundEvents.SEPULCHER_HIT, definition().with(sepulcherStepSounds).subtitle("subtitles.block.generic.hit")); + add(DGSoundEvents.SEPULCHER_STEP, definition().with(sepulcherStepSounds).subtitle("subtitles.block.generic.footsteps")); + add(DGSoundEvents.SEPULCHER_FALL, definition().with(sepulcherStepSounds)); - add(OSoundEvents.SEPULCHER_CORPSE_STUFFED, definition().with( + add(DGSoundEvents.SEPULCHER_CORPSE_STUFFED, definition().with( sound(DoomAndGloom.MOD_ID + ":block/sepulcher_corpse_stuffed_0"), sound(DoomAndGloom.MOD_ID + ":block/sepulcher_corpse_stuffed_1") ).subtitle("subtitles.block.sepulcher.corpse_stuffed")); - add(OSoundEvents.SEPULCHER_FILLED, definition().with( + add(DGSoundEvents.SEPULCHER_FILLED, definition().with( sound(DoomAndGloom.MOD_ID + ":block/sepulcher_filled_0"), sound(DoomAndGloom.MOD_ID + ":block/sepulcher_filled_1"), sound(DoomAndGloom.MOD_ID + ":block/sepulcher_filled_2"), sound(DoomAndGloom.MOD_ID + ":block/sepulcher_filled_3") ).subtitle("subtitles.block.sepulcher.filled")); - add(OSoundEvents.SEPULCHER_ROTTING, definition().with( + add(DGSoundEvents.SEPULCHER_ROTTING, definition().with( sound(DoomAndGloom.MOD_ID + ":block/sepulcher_rotting_0"), sound(DoomAndGloom.MOD_ID + ":block/sepulcher_rotting_1"), sound(DoomAndGloom.MOD_ID + ":block/sepulcher_rotting_2"), sound(DoomAndGloom.MOD_ID + ":block/sepulcher_rotting_3") ).subtitle("subtitles.block.sepulcher.rotting")); - add(OSoundEvents.SEPULCHER_HARVEST, definition().with( + add(DGSoundEvents.SEPULCHER_HARVEST, definition().with( sound(DoomAndGloom.MOD_ID + ":block/sepulcher_harvest_0"), sound(DoomAndGloom.MOD_ID + ":block/sepulcher_harvest_1"), sound(DoomAndGloom.MOD_ID + ":block/sepulcher_harvest_2") ).subtitle("subtitles.block.sepulcher.harvest")); - add(OSoundEvents.SEPULCHER_SEALING, definition() + add(DGSoundEvents.SEPULCHER_SEALING, definition() .with(sound(DoomAndGloom.MOD_ID + ":block/sepulcher_sealing")) .subtitle("subtitles.block.sepulcher.sealing")); - add(OSoundEvents.SEPULCHER_UNSEALING, definition() + add(DGSoundEvents.SEPULCHER_UNSEALING, definition() .with(sound(DoomAndGloom.MOD_ID + ":block/sepulcher_unsealing")) .subtitle("subtitles.block.sepulcher.unsealing")); - add(OSoundEvents.FOG_AMBIENCE, definition().with( + add(DGSoundEvents.FOG_AMBIENCE, definition().with( sound(DoomAndGloom.MOD_ID + ":ambient/fog_ambience").stream() )); - add(OSoundEvents.HOLLER_DEATH, definition().with( + add(DGSoundEvents.HOLLER_DEATH, definition().with( sound(DoomAndGloom.MOD_ID + ":entity/holler_dies_0"), sound(DoomAndGloom.MOD_ID + ":entity/holler_dies_1") ).subtitle("subtitles.entity.holler_death")); - add(OSoundEvents.HOLLER_HURTS, definition().with( + add(DGSoundEvents.HOLLER_HURTS, definition().with( sound(DoomAndGloom.MOD_ID + ":entity/holler_hurts_0"), sound(DoomAndGloom.MOD_ID + ":entity/holler_hurts_1") ).subtitle("subtitles.entity.holler_hurt")); - add(OSoundEvents.HOLLER_SHRIEKS, definition().with( + add(DGSoundEvents.HOLLER_SHRIEKS, definition().with( sound(DoomAndGloom.MOD_ID + ":entity/holler_shrieks_0"), sound(DoomAndGloom.MOD_ID + ":entity/holler_shrieks_1"), sound(DoomAndGloom.MOD_ID + ":entity/holler_shrieks_2") ).subtitle("subtitles.entity.holler_shrieks")); - add(OSoundEvents.HOLLER_HOLLERS, definition().with( + add(DGSoundEvents.HOLLER_HOLLERS, definition().with( sound(DoomAndGloom.MOD_ID + ":entity/holler_hollers_0"), sound(DoomAndGloom.MOD_ID + ":entity/holler_hollers_1"), sound(DoomAndGloom.MOD_ID + ":entity/holler_hollers_2"), diff --git a/forge/src/data/java/galena/doom_and_gloom/data/ForgeDataEntrypoint.java b/forge/src/data/java/galena/doom_and_gloom/data/ForgeDataEntrypoint.java new file mode 100644 index 00000000..4c33d281 --- /dev/null +++ b/forge/src/data/java/galena/doom_and_gloom/data/ForgeDataEntrypoint.java @@ -0,0 +1,58 @@ +package galena.doom_and_gloom.data; + +import galena.doom_and_gloom.DoomAndGloom; +import java.util.Arrays; +import java.util.concurrent.CompletableFuture; +import java.util.function.Function; +import java.util.stream.Collectors; +import net.minecraft.DetectedVersion; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.PackOutput; +import net.minecraft.data.metadata.PackMetadataGenerator; +import net.minecraft.network.chat.Component; +import net.minecraft.server.packs.PackType; +import net.minecraft.server.packs.metadata.pack.PackMetadataSection; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.data.event.GatherDataEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod.EventBusSubscriber; + +@EventBusSubscriber(modid = DoomAndGloom.MOD_ID, bus = EventBusSubscriber.Bus.MOD) +public class ForgeDataEntrypoint { + + @SubscribeEvent + public static void gatherData(GatherDataEvent event) { + DataGenerator generator = event.getGenerator(); + PackOutput output = generator.getPackOutput(); + CompletableFuture future = event.getLookupProvider(); + ExistingFileHelper helper = event.getExistingFileHelper(); + boolean client = event.includeClient(); + boolean server = event.includeServer(); + + var lang = new DGLang(output); + + generator.addProvider(client, new DGBlockStates(output, helper)); + generator.addProvider(client, new DGItemModels(output, helper)); + generator.addProvider(client, lang); + generator.addProvider(client, new DGSoundDefinitions(output, helper)); + + generator.addProvider(server, new DGRecipes(output)); + generator.addProvider(server, new DGLootTables(output)); + DGBlockTags blockTags = new DGBlockTags(output, future, helper); + generator.addProvider(server, blockTags); + generator.addProvider(server, new DGItemTags(output, future, blockTags.contentsGetter(), helper)); + generator.addProvider(server, new DGEntityTags(output, future, helper)); + CompletableFuture lookupProvider = event.getLookupProvider(); + generator.addProvider(server, new DGDamageTags(output, lookupProvider, helper)); + generator.addProvider(server, new DGMobEffectTags(output, lookupProvider, helper)); + generator.addProvider(server, new DGItemListings(output, helper)); + + generator.addProvider(server, new PackMetadataGenerator(output).add(PackMetadataSection.TYPE, new PackMetadataSection( + Component.literal("Doom & Gloom resources"), + DetectedVersion.BUILT_IN.getPackVersion(PackType.CLIENT_RESOURCES), + Arrays.stream(PackType.values()).collect(Collectors.toMap(Function.identity(), DetectedVersion.BUILT_IN::getPackVersion)) + ))); + } + +} diff --git a/src/main/java/galena/doom_and_gloom/data/provider/OBlockLootProvider.java b/forge/src/data/java/galena/doom_and_gloom/data/provider/DGBlockLootProvider.java similarity index 78% rename from src/main/java/galena/doom_and_gloom/data/provider/OBlockLootProvider.java rename to forge/src/data/java/galena/doom_and_gloom/data/provider/DGBlockLootProvider.java index 0e0778f2..d033aa3e 100644 --- a/src/main/java/galena/doom_and_gloom/data/provider/OBlockLootProvider.java +++ b/forge/src/data/java/galena/doom_and_gloom/data/provider/DGBlockLootProvider.java @@ -1,5 +1,7 @@ package galena.doom_and_gloom.data.provider; +import java.util.Collection; +import java.util.HashSet; import java.util.Set; import java.util.function.Supplier; import net.minecraft.data.loot.BlockLootSubProvider; @@ -13,9 +15,11 @@ import net.minecraft.world.level.storage.loot.functions.CopyNbtFunction; import net.minecraft.world.level.storage.loot.providers.nbt.ContextNbtProvider; -public abstract class OBlockLootProvider extends BlockLootSubProvider { +public abstract class DGBlockLootProvider extends BlockLootSubProvider { - protected OBlockLootProvider() { + private final Collection knownBlocks = new HashSet<>(); + + protected DGBlockLootProvider() { super(Set.of(), FeatureFlags.REGISTRY.allFlags()); } @@ -44,5 +48,14 @@ public void stoneTablet(Supplier block) { ))) ); } + protected void add(Block block, LootTable.Builder builder) { + super.add(block, builder); + this.knownBlocks.add(block); + } + + @Override + protected final Iterable getKnownBlocks() { + return knownBlocks; + } } diff --git a/src/main/java/galena/doom_and_gloom/data/provider/OBlockStateProvider.java b/forge/src/data/java/galena/doom_and_gloom/data/provider/DGBlockStateProvider.java similarity index 98% rename from src/main/java/galena/doom_and_gloom/data/provider/OBlockStateProvider.java rename to forge/src/data/java/galena/doom_and_gloom/data/provider/DGBlockStateProvider.java index a3bb2d65..73879ded 100644 --- a/src/main/java/galena/doom_and_gloom/data/provider/OBlockStateProvider.java +++ b/forge/src/data/java/galena/doom_and_gloom/data/provider/DGBlockStateProvider.java @@ -22,9 +22,9 @@ import net.minecraftforge.registries.ForgeRegistries; import org.jetbrains.annotations.Nullable; -public abstract class OBlockStateProvider extends BlockStateProvider { +public abstract class DGBlockStateProvider extends BlockStateProvider { - public OBlockStateProvider(PackOutput output, ExistingFileHelper help) { + public DGBlockStateProvider(PackOutput output, ExistingFileHelper help) { super(output, MOD_ID, help); } diff --git a/src/main/java/galena/doom_and_gloom/data/provider/OItemModelProvider.java b/forge/src/data/java/galena/doom_and_gloom/data/provider/DGItemModelProvider.java similarity index 79% rename from src/main/java/galena/doom_and_gloom/data/provider/OItemModelProvider.java rename to forge/src/data/java/galena/doom_and_gloom/data/provider/DGItemModelProvider.java index 9c74a199..b0501c48 100644 --- a/src/main/java/galena/doom_and_gloom/data/provider/OItemModelProvider.java +++ b/forge/src/data/java/galena/doom_and_gloom/data/provider/DGItemModelProvider.java @@ -1,6 +1,5 @@ package galena.doom_and_gloom.data.provider; -import com.teamabnormals.blueprint.core.data.client.BlueprintItemModelProvider; import galena.doom_and_gloom.DoomAndGloom; import java.util.Objects; import java.util.function.Supplier; @@ -9,12 +8,13 @@ import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; import net.minecraftforge.client.model.generators.ItemModelBuilder; +import net.minecraftforge.client.model.generators.ItemModelProvider; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.registries.ForgeRegistries; -public abstract class OItemModelProvider extends BlueprintItemModelProvider { +public abstract class DGItemModelProvider extends ItemModelProvider { - public OItemModelProvider(PackOutput output, ExistingFileHelper help) { + public DGItemModelProvider(PackOutput output, ExistingFileHelper help) { super(output, DoomAndGloom.MOD_ID, help); } @@ -41,4 +41,9 @@ public ItemModelBuilder toolItem(Supplier item) { return withExistingParent(ForgeRegistries.ITEMS.getKey(item.get()).getPath(), mcLoc("item/handheld")) .texture("layer0", modLoc("item/" + ForgeRegistries.ITEMS.getKey(item.get()).getPath())); } + + public ItemModelBuilder spawnEggItem(Supplier item) { + return withExistingParent(ForgeRegistries.ITEMS.getKey(item.get()).getPath(), "minecraft:item/template_spawn_egg"); + } + } diff --git a/forge/src/data/java/galena/doom_and_gloom/data/provider/DGLangProvider.java b/forge/src/data/java/galena/doom_and_gloom/data/provider/DGLangProvider.java new file mode 100644 index 00000000..2dc73e2e --- /dev/null +++ b/forge/src/data/java/galena/doom_and_gloom/data/provider/DGLangProvider.java @@ -0,0 +1,43 @@ +package galena.doom_and_gloom.data.provider; + +import java.util.Arrays; +import java.util.Locale; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import net.minecraft.Util; +import net.minecraft.core.Holder; +import net.minecraft.data.PackOutput; +import net.minecraft.world.item.RecordItem; +import net.minecraftforge.common.data.LanguageProvider; + +public abstract class DGLangProvider extends LanguageProvider { + + protected DGLangProvider(PackOutput output, String modid, String locale) { + super(output, modid, locale); + } + + protected void addDisc(Supplier disc, String desc) { + addItem(disc, "Music Disc"); + add(disc.get().getDescriptionId() + ".desc", desc); + } + + protected void addDisc(Supplier disc, String artist, String song) { + addDisc(disc, artist + " - " + song); + } + + protected void addSubtitle(String category, String subtitleName, String name) { + add("subtitles." + category + "." + subtitleName, name); + } + + protected void add(Holder holder) { + var id = holder.unwrapKey().orElseThrow(); + var key = Util.makeDescriptionId(id.registry().getPath(), id.location()); + add(key, translate(id.location().getPath())); + } + + private String translate(String key) { + return Arrays.stream(key.split("_")) + .map(it -> it.substring(0, 1).toUpperCase(Locale.ROOT) + it.substring(1)) + .collect(Collectors.joining(" ")); + } +} diff --git a/src/main/java/galena/doom_and_gloom/data/provider/ORecipeProvider.java b/forge/src/data/java/galena/doom_and_gloom/data/provider/DGRecipeProvider.java similarity index 84% rename from src/main/java/galena/doom_and_gloom/data/provider/ORecipeProvider.java rename to forge/src/data/java/galena/doom_and_gloom/data/provider/DGRecipeProvider.java index 9620e628..30732e52 100644 --- a/src/main/java/galena/doom_and_gloom/data/provider/ORecipeProvider.java +++ b/forge/src/data/java/galena/doom_and_gloom/data/provider/DGRecipeProvider.java @@ -1,6 +1,6 @@ package galena.doom_and_gloom.data.provider; -import galena.doom_and_gloom.index.OTags; +import galena.doom_and_gloom.index.DGTags; import java.util.function.Supplier; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.RecipeCategory; @@ -12,9 +12,9 @@ import net.minecraft.world.level.block.Block; import net.minecraftforge.registries.ForgeRegistries; -public abstract class ORecipeProvider extends RecipeProvider { +public abstract class DGRecipeProvider extends RecipeProvider { - public ORecipeProvider(PackOutput output) { + public DGRecipeProvider(PackOutput output) { super(output); } @@ -35,10 +35,10 @@ public ShapelessRecipeBuilder unCompact(Item itemOut, Item itemIn) { public ShapedRecipeBuilder vigilCandle(Supplier block, ItemLike candle) { return ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, block.get()) - .define('S', OTags.Items.INGOTS_SILVER) + .define('S', DGTags.Items.INGOTS_SILVER) .define('C', candle) .pattern("S") - .unlockedBy("has_silver", has(OTags.Items.INGOTS_SILVER)) + .unlockedBy("has_silver", has(DGTags.Items.INGOTS_SILVER)) .group("vigil_candle") .pattern("C"); } diff --git a/forge/src/data/java/galena/doom_and_gloom/data/provider/ItemListingProvider.java b/forge/src/data/java/galena/doom_and_gloom/data/provider/ItemListingProvider.java new file mode 100644 index 00000000..7d15d3c1 --- /dev/null +++ b/forge/src/data/java/galena/doom_and_gloom/data/provider/ItemListingProvider.java @@ -0,0 +1,113 @@ +package galena.doom_and_gloom.data.provider; + +import com.mojang.serialization.JsonOps; +import galena.doom_and_gloom.content.listing.BuyTagListing; +import galena.doom_and_gloom.content.listing.SellEnchantedListing; +import galena.doom_and_gloom.content.listing.SellTagListing; +import java.util.HashMap; +import java.util.Optional; +import java.util.function.BiConsumer; +import net.mehvahdjukaar.moonlight.api.trades.ModItemListing; +import net.mehvahdjukaar.moonlight.api.trades.SimpleItemListing; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.packs.PackType; +import net.minecraft.tags.TagKey; +import net.minecraft.world.entity.npc.VillagerProfession; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.common.data.JsonCodecProvider; + +public abstract class ItemListingProvider extends JsonCodecProvider { + + public ItemListingProvider(PackOutput output, ExistingFileHelper fileHelper, String modid) { + super(output, fileHelper, modid, JsonOps.INSTANCE, PackType.SERVER_DATA, "moonlight/villager_trades", ModItemListing.CODEC, new HashMap<>()); + } + + @Override + protected final void gather(BiConsumer consumer) { + run(); + super.gather(consumer); + } + + protected final void add(String name, ModItemListing listing) { + add(new ResourceLocation(modid, name), listing); + } + + protected final void add(ResourceLocation id, ModItemListing listing) { + if (entries.put(id, listing) != null) { + throw new RuntimeException("there is already a item listing registered under '%s'".formatted(id)); + } + } + + protected final LevelBuilder builder(ResourceKey profession, int level) { + return new LevelBuilder(profession, level); + } + + protected final ProfessionBuilder builder(ResourceKey profession) { + return level -> builder(profession, level); + } + + protected abstract void run(); + + @FunctionalInterface + public interface ProfessionBuilder { + LevelBuilder level(int level); + } + + public class LevelBuilder { + + private final ResourceKey profession; + private final int level; + + public LevelBuilder(ResourceKey profession, int level) { + this.profession = profession; + this.level = level; + } + + public LevelBuilder add(String name, ModItemListing listing) { + ItemListingProvider.this.add(profession.location().withSuffix("/" + name), listing); + return this; + } + + public LevelBuilder sell(String name, int emeralds, ItemStack offer, int maxTrades, int xp) { + return add("sell_" + name, SimpleItemListing.createDefault( + new ItemStack(Items.EMERALD, emeralds), ItemStack.EMPTY, offer, + maxTrades, Optional.of(xp), 0.2F, level + )); + } + + public LevelBuilder sellEnchanted(String name, int emeralds, ItemStack offer, int maxTrades, int xp) { + return add("sell_enchanted_" + name, new SellEnchantedListing( + new ItemStack(Items.EMERALD, emeralds), offer, + maxTrades, xp, 0.2F, level + )); + } + + public LevelBuilder sell(String name, int emeralds, TagKey tag, int count, int maxTrades, int xp) { + return add("sell_" + name, new SellTagListing( + new ItemStack(Items.EMERALD, emeralds), tag, count, + maxTrades, xp, 0.2F, level + )); + } + + public LevelBuilder buy(String name, int emeralds, ItemStack want, int maxTrades, int xp) { + return add("buy_" + name, SimpleItemListing.createDefault( + want, ItemStack.EMPTY, new ItemStack(Items.EMERALD, emeralds), + maxTrades, Optional.of(xp), 0.2F, level + )); + } + + public LevelBuilder buy(String name, int emeralds, TagKey tag, int count, int maxTrades, int xp) { + return add("buy_" + name, new BuyTagListing( + tag, count, new ItemStack(Items.EMERALD, emeralds), + maxTrades, xp, 0.2F, level + )); + } + + } + +} diff --git a/forge/src/main/java/galena/doom_and_gloom/forge/FogRenderingEvents.java b/forge/src/main/java/galena/doom_and_gloom/forge/FogRenderingEvents.java new file mode 100644 index 00000000..bce2300e --- /dev/null +++ b/forge/src/main/java/galena/doom_and_gloom/forge/FogRenderingEvents.java @@ -0,0 +1,45 @@ +package galena.doom_and_gloom.forge; + +import galena.doom_and_gloom.DoomAndGloom; +import galena.doom_and_gloom.client.fog.FogRendering; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.client.event.ViewportEvent; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod.EventBusSubscriber; + +@EventBusSubscriber(bus = EventBusSubscriber.Bus.FORGE, modid = DoomAndGloom.MOD_ID, value = Dist.CLIENT) +public class FogRenderingEvents { + + @SubscribeEvent + public static void clientTick(TickEvent.ClientTickEvent event) { + if (event.phase == TickEvent.Phase.END) FogRendering.clientTick(); + } + + @SubscribeEvent + public static void fogEffectFog(ViewportEvent.RenderFog event) { + + float[] nearFar = FogRendering.modifyPlanes(event.getNearPlaneDistance(), event.getFarPlaneDistance(), //near far wherever we are + event.getMode(), event.getFogShape(), event.getType(), (float) event.getPartialTick()); + + if (nearFar != null) { + event.setNearPlaneDistance(nearFar[0]); + event.setFarPlaneDistance(nearFar[1]); + event.setCanceled(true); + } + + } + + @SubscribeEvent + public static void fogEffectColor(ViewportEvent.ComputeFogColor event) { + float[] newColor = FogRendering.modifyFogColor( + event.getRed(), event.getGreen(), event.getBlue(), + (float) event.getPartialTick()); + if (newColor != null) { + event.setRed(newColor[0]); + event.setGreen(newColor[1]); + event.setBlue(newColor[2]); + } + } + +} diff --git a/forge/src/main/java/galena/doom_and_gloom/forge/ForgeEntrypoint.java b/forge/src/main/java/galena/doom_and_gloom/forge/ForgeEntrypoint.java new file mode 100644 index 00000000..33845646 --- /dev/null +++ b/forge/src/main/java/galena/doom_and_gloom/forge/ForgeEntrypoint.java @@ -0,0 +1,64 @@ +package galena.doom_and_gloom.forge; + +import galena.doom_and_gloom.DoomAndGloom; +import galena.doom_and_gloom.client.DoomAndGloomClient; +import galena.doom_and_gloom.compat.AmendmentsCompat; +import galena.doom_and_gloom.compat.CompatMods; +import galena.doom_and_gloom.content.entity.ISepulcherable; +import galena.doom_and_gloom.forge.compat.OreganizedCompat; +import net.mehvahdjukaar.moonlight.api.platform.PlatHelper; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.server.ServerAboutToStartEvent; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.fml.common.Mod; + +@Mod(DoomAndGloom.MOD_ID) +public class ForgeEntrypoint { + + public ForgeEntrypoint() { + DoomAndGloom.init(); + + if (PlatHelper.getPhysicalSide().isClient()) { + DoomAndGloomClient.init(); + } + + IEventBus forgeBus = MinecraftForge.EVENT_BUS; + + if (CompatMods.AMENDMENTS) { + forgeBus.addListener(this::onBlockInteract); + } + + if (CompatMods.OREGANIZED) { + OreganizedCompat.init(); + } + + forgeBus.addListener(this::onServerStart); + forgeBus.addListener(this::onLivingDrops); + } + + + private void onBlockInteract(PlayerInteractEvent.RightClickBlock event) { + if (AmendmentsCompat.onBlockInteract(event.getLevel(), event.getPos(), + event.getEntity(), + event.getHand(), + event.getItemStack())) { + event.setCancellationResult(InteractionResult.sidedSuccess(event.getLevel().isClientSide)); + event.setCanceled(true); + } + } + + public void onServerStart(ServerAboutToStartEvent event) { + DoomAndGloom.onServerAboutToStart(event.getServer()); + } + + private void onLivingDrops(LivingDropsEvent event) { + if (event.getEntity() instanceof Player) return; + if (ISepulcherable.cast(event.getEntity()).DG$wasSepulchered()) { + event.setCanceled(true); + } + } +} diff --git a/forge/src/main/java/galena/doom_and_gloom/forge/client/BonePileClientProperties.java b/forge/src/main/java/galena/doom_and_gloom/forge/client/BonePileClientProperties.java new file mode 100644 index 00000000..906c7ff6 --- /dev/null +++ b/forge/src/main/java/galena/doom_and_gloom/forge/client/BonePileClientProperties.java @@ -0,0 +1,19 @@ +package galena.doom_and_gloom.forge.client; + +import galena.doom_and_gloom.content.block.BonePileBlock; +import net.minecraft.client.particle.ParticleEngine; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.client.extensions.common.IClientBlockExtensions; + +public record BonePileClientProperties(BonePileBlock block) implements IClientBlockExtensions { + + @Override + public boolean addDestroyEffects(BlockState state, Level level, BlockPos pos, ParticleEngine manager) { + block.particles(level, Vec3.atCenterOf(pos), 20); + return IClientBlockExtensions.super.addDestroyEffects(state, level, pos, manager); + } + +} \ No newline at end of file diff --git a/forge/src/main/java/galena/doom_and_gloom/forge/compat/OreganizedCompat.java b/forge/src/main/java/galena/doom_and_gloom/forge/compat/OreganizedCompat.java new file mode 100644 index 00000000..3737e415 --- /dev/null +++ b/forge/src/main/java/galena/doom_and_gloom/forge/compat/OreganizedCompat.java @@ -0,0 +1,12 @@ +package galena.doom_and_gloom.forge.compat; + +import galena.doom_and_gloom.index.DGItemTiers; +import galena.oreganized.index.OItemTiers; + +public class OreganizedCompat { + + public static void init() { + DGItemTiers.replaceHammerTier(OItemTiers.LEAD); + } + +} diff --git a/forge/src/main/java/galena/doom_and_gloom/forge/mixin/LivingEntityMixin.java b/forge/src/main/java/galena/doom_and_gloom/forge/mixin/LivingEntityMixin.java new file mode 100644 index 00000000..44b73170 --- /dev/null +++ b/forge/src/main/java/galena/doom_and_gloom/forge/mixin/LivingEntityMixin.java @@ -0,0 +1,27 @@ +package galena.doom_and_gloom.forge.mixin; + +import galena.doom_and_gloom.content.entity.ISepulcherable; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.level.Level; +import org.spongepowered.asm.mixin.Mixin; + +//TODO:avoid mixin, use services or dep injection instead. even through a generic helper method like isSepulchered, or setSepulchered. only advantage to this is that on 1.21 porting will be trivial +@Mixin(LivingEntity.class) +public abstract class LivingEntityMixin extends Entity implements ISepulcherable { + + public LivingEntityMixin(EntityType pEntityType, Level pLevel) { + super(pEntityType, pLevel); + } + + @Override + public void DG$setSepulchered(boolean sepulchered) { + this.getPersistentData().putBoolean(ISepulcherable.DG_TAG_KEY, sepulchered); + } + + @Override + public boolean DG$wasSepulchered() { + return this.getPersistentData().getBoolean(ISepulcherable.DG_TAG_KEY); + } +} diff --git a/forge/src/main/java/galena/doom_and_gloom/forge/mixin/SelfBonePileBlockMixin.java b/forge/src/main/java/galena/doom_and_gloom/forge/mixin/SelfBonePileBlockMixin.java new file mode 100644 index 00000000..cb7d0dc5 --- /dev/null +++ b/forge/src/main/java/galena/doom_and_gloom/forge/mixin/SelfBonePileBlockMixin.java @@ -0,0 +1,46 @@ +package galena.doom_and_gloom.forge.mixin; + +import galena.doom_and_gloom.content.block.BonePileBlock; +import galena.doom_and_gloom.forge.client.BonePileClientProperties; +import galena.doom_and_gloom.index.DGParticleTypes; +import java.util.function.Consumer; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.FallingBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.client.extensions.common.IClientBlockExtensions; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(value = BonePileBlock.class, remap = false) +public abstract class SelfBonePileBlockMixin extends FallingBlock { + + public SelfBonePileBlockMixin(Properties properties) { + super(properties); + } + + @Override + public boolean addLandingEffects(BlockState state, ServerLevel level, BlockPos pos, BlockState other, LivingEntity entity, int numberOfParticles) { + var self = (BonePileBlock) (Object) this; + self.particles(level, entity.position().add(0, 0.2, 0.0), numberOfParticles / 2); + return true; + } + + @Override + public boolean addRunningEffects(BlockState state, Level level, BlockPos pos, Entity entity) { + var vec = entity.position().add(0, 0.2, 0.0); + var speed = entity.isSprinting() ? 0.5F : 0.2F; + var halfSpeed = speed / 2; + level.addParticle(DGParticleTypes.BONE_FRAGMENT.get(), vec.x, vec.y, vec.z, level.random.nextDouble() * speed - halfSpeed, level.random.nextDouble() * speed - halfSpeed, level.random.nextDouble() * speed - halfSpeed); + return true; + } + + @Override + public void initializeClient(Consumer consumer) { + var self = (BonePileBlock) (Object) this; + consumer.accept(new BonePileClientProperties(self)); + } + +} diff --git a/forge/src/main/java/galena/doom_and_gloom/forge/mixin/SelfSepulcherBlockEntityMixin.java b/forge/src/main/java/galena/doom_and_gloom/forge/mixin/SelfSepulcherBlockEntityMixin.java new file mode 100644 index 00000000..69c9db58 --- /dev/null +++ b/forge/src/main/java/galena/doom_and_gloom/forge/mixin/SelfSepulcherBlockEntityMixin.java @@ -0,0 +1,54 @@ +package galena.doom_and_gloom.forge.mixin; + +import galena.doom_and_gloom.content.entity.SepulcherBlockEntity; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.Container; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ForgeCapabilities; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.items.wrapper.InvWrapper; +import org.jetbrains.annotations.NotNull; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; + +@Mixin(value = SepulcherBlockEntity.class, remap = false) +public abstract class SelfSepulcherBlockEntityMixin extends BlockEntity { + + public SelfSepulcherBlockEntityMixin(BlockEntityType pType, BlockPos pPos, BlockState pBlockState) { + super(pType, pPos, pBlockState); + } + + @Unique + private LazyOptional itemHandler = createItemHandler(); + + @Unique + private LazyOptional createItemHandler() { + return LazyOptional.of(() -> new InvWrapper((Container) this)); + } + + @Override + public void invalidateCaps() { + super.invalidateCaps(); + itemHandler.invalidate(); + } + + @Override + public void reviveCaps() { + super.reviveCaps(); + itemHandler = createItemHandler(); + } + + @Override + public @NotNull LazyOptional getCapability(@NotNull Capability capability, Direction facing) { + if (capability == ForgeCapabilities.ITEM_HANDLER && facing != null && !this.remove) { + return itemHandler.cast(); + } else { + return super.getCapability(capability, facing); + } + } + +} diff --git a/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml similarity index 95% rename from src/main/resources/META-INF/mods.toml rename to forge/src/main/resources/META-INF/mods.toml index 51bf45af..05c2e268 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -34,9 +34,9 @@ An addon-mod for Oreganized adding Halloween-themed content side="BOTH" [[dependencies.${mod_id}]] - modId="blueprint" + modId="moonlight" mandatory=true - versionRange="[7.1.0,)" + versionRange="*" ordering="AFTER" side="BOTH" diff --git a/src/main/resources/data/doom_and_gloom/forge/biome_modifier/spawn_holler.json b/forge/src/main/resources/data/doom_and_gloom/forge/biome_modifier/spawn_holler.json similarity index 100% rename from src/main/resources/data/doom_and_gloom/forge/biome_modifier/spawn_holler.json rename to forge/src/main/resources/data/doom_and_gloom/forge/biome_modifier/spawn_holler.json diff --git a/forge/src/main/resources/doom_and_gloom.forge.mixins.json b/forge/src/main/resources/doom_and_gloom.forge.mixins.json new file mode 100644 index 00000000..0dd05de3 --- /dev/null +++ b/forge/src/main/resources/doom_and_gloom.forge.mixins.json @@ -0,0 +1,15 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "galena.doom_and_gloom.forge.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "SelfBonePileBlockMixin", + "LivingEntityMixin", + "SelfSepulcherBlockEntityMixin" + ], + "server": [], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/gradle.properties b/gradle.properties index 78686323..985d2040 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,8 +2,8 @@ mod_name=Doom & Gloom mod_author=Team Galena mod_id=doom_and_gloom -mod_version=1.0.3 -release_type=release +mod_version=0.0.0-dev +release_type=beta # Gradle org.gradle.jvmargs=-Xmx4G @@ -11,9 +11,15 @@ org.gradle.daemon=false # Minecraft minecraft_version=1.20.1 +java_version=17 # Forge forge_version=47.3.0 +kotlin_forge_version=4.3.0 + +# Fabric +fabric_api_version=0.92.6+1.20.1 +fabric_loader_version=0.17.3 # Mixin mixin_version=0.8.5 @@ -23,13 +29,6 @@ mixin_extras_version=0.4.1 blueprint_version=7.1.0 jei_version=15.0.0.12 -oreganized_version=4.1.0 -galena_hats_version=1.1.2 -dye_depot_version=cdGlC270 -supplementaries_version=eMF95dNK -amendments_version=qE7sokDv -moonlight_lib_version=sfzdPwZX - repository=teamgalena/doomandgloom maven_group=dev.galena modrinth_project=NdwUq6vV diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..776d8227 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,32 @@ +[versions] +multikulti = "1.20.1-45-SNAPSHOT" +jei = "15.20.0.106" +moonlight = "1.20-2.16.16" +pathfinding-debug = "1.20.1-1.1.0" + +[libraries] +multikulti-core = { group = "com.possible-triangle", name = "multikulti-core-forge", version.ref = "multikulti" } +multikulti-datagen = { group = "com.possible-triangle", name = "multikulti-datagen-forge", version.ref = "multikulti" } +multikulti-datagen-fix = { group = "com.possible-triangle", name = "multikulti-datagen-forge-fix", version.ref = "multikulti" } + +galena-hats = { "group" = "dev.galena", name = "hats-forge", version = "1.20.1-1.2.2" } +oreganized = { "group" = "dev.galena", name = "oreganized", version = "4.3.1" } +blueprint = { group = "com.teamabnormals", name = "blueprint", version = "1.20.1-7.1.0" } + +dye-depot-forge = { group = "com.ninni.dye_depot", name = "dye_depot", version = "1.20.1-1.2.3-forge" } +dye-depot-fabric = { group = "com.ninni.dye_depot", name = "dye_depot", version = "1.20.1-1.2.2-fabric" } + +jei-forge = { group = "mezz.jei", name = "jei-1.20.1-forge", version.ref = "jei" } +jei-fabric = { group = "mezz.jei", name = "jei-1.20.1-fabric", version.ref = "jei" } + +moonlight-lib-common = { group = "net.mehvahdjukaar", name = "moonlight", version.ref = "moonlight" } +moonlight-lib-forge = { group = "net.mehvahdjukaar", name = "moonlight-forge", version.ref = "moonlight" } +moonlight-lib-fabric = { group = "net.mehvahdjukaar", name = "moonlight-fabric", version.ref = "moonlight" } + +farmers-delight-fabric = { group = "vectorwing", name = "FarmersDelight", version = "1.20.1-2.4.0+refabricated" } + +pathfinding-debug-forge = { group = "com.possible-triangle", name = "pathfinding_renderer-forge", version.ref = "pathfinding-debug" } +pathfinding-debug-fabric = { group = "com.possible-triangle", name = "pathfinding_renderer-fabric", version.ref = "pathfinding-debug" } + +[plugins] +parchment = { id = "org.parchmentmc.librarian.forgegradle", version = "1.+" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b95..1b33c55b 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a793..ca025c83 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f3b75f3b..23d15a93 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -205,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a218..db3a6ac2 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle.kts b/settings.gradle.kts index f95bbb67..d2adc09c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,8 +1,24 @@ pluginManagement { repositories { - maven { url = uri("https://maven.minecraftforge.net/") } - maven { url = uri("https://repo.spongepowered.org/repository/maven-public/") } - maven { url = uri("https://maven.parchmentmc.org") } gradlePluginPortal() + mavenLocal() + } +} + +plugins { + id("com.possible-triangle.helper") version ("1.2") + id("com.possible-triangle.packwiz") version ("1.1.60") +} + +include("common") +loader("forge") +loader("fabric") + +fun loader(name: String) { + include(name) + packwiz { + packs.create(name) { + from = file("$name/pack") + } } } diff --git a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 deleted file mode 100644 index 6acaa835..00000000 --- a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 +++ /dev/null @@ -1,8 +0,0 @@ -// 1.20.1 2024-11-02T14:18:49.5565406 Oreganized Block Tags -25423f94c07158f094e4e9733efc1d1814551369 data/doom_and_gloom/tags/blocks/burial_dirt_convertible.json -589cbf5d60b97fd78f711d832bfddf03263777f2 data/doom_and_gloom/tags/blocks/gravetender_lightables.json -09179ee35f10c7ec1195c36e87d885a1e70fe485 data/doom_and_gloom/tags/blocks/vigil_candles.json -01bff27953e934409d6d1175c4932c12a6f535c7 data/minecraft/tags/blocks/candles.json -6e91c0be5e5b3d50cf0d1a8dec3e23c0ee042c05 data/minecraft/tags/blocks/dirt.json -734c9c36a0d0f32caf72e941b2f0d14e9f0b5b6d data/minecraft/tags/blocks/mineable/pickaxe.json -6b73bb0ce38222c428d54ee64e82ffa1d96c64d7 data/oreganized/tags/blocks/fire_source.json diff --git a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e b/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e deleted file mode 100644 index 406dc57c..00000000 --- a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e +++ /dev/null @@ -1,2 +0,0 @@ -// 1.20.1 2024-10-29T21:39:51.7898507 Sound Definitions -79907f67d8cce142b6917a0af719d0b0679e6c50 assets/doom_and_gloom/sounds.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e deleted file mode 100644 index f7749c84..00000000 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ /dev/null @@ -1,139 +0,0 @@ -// 1.20.1 2025-06-11T10:49:12.2969107 Recipes -6152463b36c764652952c7b3eb81527fb14cdd29 data/doom_and_gloom/advancements/recipes/building_blocks/amber_vigil_candle.json -6f63beee40272d429452ab2d3a6e618391c02eeb data/doom_and_gloom/advancements/recipes/building_blocks/amber_vigil_candle_dyeing.json -fea7a4550566387f3aff0f7126c5af6d4bb663d3 data/doom_and_gloom/advancements/recipes/building_blocks/aqua_vigil_candle.json -ea25da4c1930bb997455448c29c212d1ecdd9333 data/doom_and_gloom/advancements/recipes/building_blocks/aqua_vigil_candle_dyeing.json -278b10ece35d19c6db32ec4c1078d7d900e63abd data/doom_and_gloom/advancements/recipes/building_blocks/beige_vigil_candle.json -5ca38c9dca5dee32056953ddd09084ac31d7cf7c data/doom_and_gloom/advancements/recipes/building_blocks/beige_vigil_candle_dyeing.json -1149c1715489a243c287dca19130c02ce67822fa data/doom_and_gloom/advancements/recipes/building_blocks/black_vigil_candle.json -c9d34eddce54e41f509742a51710b46d663f7db2 data/doom_and_gloom/advancements/recipes/building_blocks/black_vigil_candle_dyeing.json -6fa03210633e686f2af90d76f36f13a638015441 data/doom_and_gloom/advancements/recipes/building_blocks/blue_vigil_candle.json -a043f5b02795f1ba85a8cbedbaa8b6943a9ec6fc data/doom_and_gloom/advancements/recipes/building_blocks/blue_vigil_candle_dyeing.json -350ab18a1dab657956263c90a57206a090a82021 data/doom_and_gloom/advancements/recipes/building_blocks/bone_pile.json -133fa7d485aec46da6c958550641b62eb37ed4dc data/doom_and_gloom/advancements/recipes/building_blocks/brown_vigil_candle.json -a7db0a90137c9237b14121d4a857c5d7ca412856 data/doom_and_gloom/advancements/recipes/building_blocks/brown_vigil_candle_dyeing.json -f0de4b5fe790abfc83e35e965b2886e79674d820 data/doom_and_gloom/advancements/recipes/building_blocks/coral_vigil_candle.json -e4844bb98e3bc4aa57d20bccc7023497e577a685 data/doom_and_gloom/advancements/recipes/building_blocks/coral_vigil_candle_dyeing.json -9aef67417b8240692db3be1be2b05c6414015b8f data/doom_and_gloom/advancements/recipes/building_blocks/cyan_vigil_candle.json -978810ab78db47bb99d29f3d99a6f563464b3647 data/doom_and_gloom/advancements/recipes/building_blocks/cyan_vigil_candle_dyeing.json -6ab4def44043d20f5b58957a246df43c69e8bdd6 data/doom_and_gloom/advancements/recipes/building_blocks/forest_vigil_candle.json -bf1788aaf4670ab07e6da15499d9868cc7dcb0d4 data/doom_and_gloom/advancements/recipes/building_blocks/forest_vigil_candle_dyeing.json -9e29690afe71b46022bbed4d217dd2d21916d473 data/doom_and_gloom/advancements/recipes/building_blocks/ginger_vigil_candle.json -e207a173bdebba5bf16d9f1cc5f17e5675816068 data/doom_and_gloom/advancements/recipes/building_blocks/ginger_vigil_candle_dyeing.json -78ae30ee2910fb351b5f54c741ad08fa9279cdc1 data/doom_and_gloom/advancements/recipes/building_blocks/gray_vigil_candle.json -79fd91ec18cc97e8b29c42e42720f35a3df1c64e data/doom_and_gloom/advancements/recipes/building_blocks/gray_vigil_candle_dyeing.json -3886fae3aa74ece71400e3fbfff1ae40b627b430 data/doom_and_gloom/advancements/recipes/building_blocks/green_vigil_candle.json -56da70cbea54e02bf07dc27c25c4d4a4a7c547d6 data/doom_and_gloom/advancements/recipes/building_blocks/green_vigil_candle_dyeing.json -7407370944827bcddcf50fd938574219ea09c361 data/doom_and_gloom/advancements/recipes/building_blocks/indigo_vigil_candle.json -f0ed11ac93c16269d013f61bdeddaab98eafb570 data/doom_and_gloom/advancements/recipes/building_blocks/indigo_vigil_candle_dyeing.json -1e2d09f88d97b4363b872b77313e1da4a8a27e91 data/doom_and_gloom/advancements/recipes/building_blocks/light_blue_vigil_candle.json -be308f849ecf0a53fa6f20c1c0753f6d3aba0221 data/doom_and_gloom/advancements/recipes/building_blocks/light_blue_vigil_candle_dyeing.json -eef190cb8d8c93128e5d7703ad9d2b64bbd2d433 data/doom_and_gloom/advancements/recipes/building_blocks/light_gray_vigil_candle.json -26c16c1cc76d3424d21f2c94230224ffc2fffbad data/doom_and_gloom/advancements/recipes/building_blocks/light_gray_vigil_candle_dyeing.json -00c2bfa62e289747c70830f0313f8f4967dd6bbf data/doom_and_gloom/advancements/recipes/building_blocks/lime_vigil_candle.json -bc0161a7cde3d4dc49a28fdf1908e67a89865ed7 data/doom_and_gloom/advancements/recipes/building_blocks/lime_vigil_candle_dyeing.json -9edf885eb261fa99191e0b996add681910c4b6a4 data/doom_and_gloom/advancements/recipes/building_blocks/magenta_vigil_candle.json -ae05f894b8e73b327eb4cfb8a49e6730ac72c746 data/doom_and_gloom/advancements/recipes/building_blocks/magenta_vigil_candle_dyeing.json -ec3f6677c2b8c693ba3367bca33e0127a5423c04 data/doom_and_gloom/advancements/recipes/building_blocks/maroon_vigil_candle.json -cccb3ec59abaf4fcdaa1773962d587f6b36dbaba data/doom_and_gloom/advancements/recipes/building_blocks/maroon_vigil_candle_dyeing.json -b6193b3fdf5ed581e5169e39609194a8ef07da34 data/doom_and_gloom/advancements/recipes/building_blocks/mint_vigil_candle.json -c684903deba74ab074cee282d0d91a31694f290e data/doom_and_gloom/advancements/recipes/building_blocks/mint_vigil_candle_dyeing.json -150cf8f199d549807678da76d718f1f69e6a82bd data/doom_and_gloom/advancements/recipes/building_blocks/navy_vigil_candle.json -8a1a0c5acafa69f7582aa25516febd2f65c411f0 data/doom_and_gloom/advancements/recipes/building_blocks/navy_vigil_candle_dyeing.json -8492141cae1480e3096dcce2fbf45cddc1925677 data/doom_and_gloom/advancements/recipes/building_blocks/olive_vigil_candle.json -dfb31a084b95ed7fd52953ccd0772821da881860 data/doom_and_gloom/advancements/recipes/building_blocks/olive_vigil_candle_dyeing.json -4b428a77efdb5e37d1a8dbc6c51b8f7f8507d4fa data/doom_and_gloom/advancements/recipes/building_blocks/orange_vigil_candle.json -5f029c32d5f054b2b8376fefee47755ec3628d2e data/doom_and_gloom/advancements/recipes/building_blocks/orange_vigil_candle_dyeing.json -e1dae506be68edf1e8da340bd1900c2abf188589 data/doom_and_gloom/advancements/recipes/building_blocks/pink_vigil_candle.json -84cff80286a9fd5a968c811daab6bc0edd319b3a data/doom_and_gloom/advancements/recipes/building_blocks/pink_vigil_candle_dyeing.json -742d045b3b60c92c7051202104e48c9f5548fab2 data/doom_and_gloom/advancements/recipes/building_blocks/purple_vigil_candle.json -aaca6331ec75f666228389c6828c0f25481e3500 data/doom_and_gloom/advancements/recipes/building_blocks/purple_vigil_candle_dyeing.json -f1e0eb0938d793f88e30e865668ac0488907f8fc data/doom_and_gloom/advancements/recipes/building_blocks/red_vigil_candle.json -b94bbe7c3e17d5248c6bfa538bb79076d50fd1a0 data/doom_and_gloom/advancements/recipes/building_blocks/red_vigil_candle_dyeing.json -aa605b75c3f6c335031bb476768c71be3482fe0f data/doom_and_gloom/advancements/recipes/building_blocks/rose_vigil_candle.json -2f601d8074b9922c622523d14d9cef2083f00813 data/doom_and_gloom/advancements/recipes/building_blocks/rose_vigil_candle_dyeing.json -452b0bfb68b52ac370ae64a6cd353dcbb66b1f3c data/doom_and_gloom/advancements/recipes/building_blocks/slate_vigil_candle.json -ae0292d4f76935fd4bd2e4f003f55663fcccc6cb data/doom_and_gloom/advancements/recipes/building_blocks/slate_vigil_candle_dyeing.json -9d2332677836822a28aca01e7b4258d2d67d21dc data/doom_and_gloom/advancements/recipes/building_blocks/tan_vigil_candle.json -aea855b80433648fae686f39762ae355a3f9fabe data/doom_and_gloom/advancements/recipes/building_blocks/tan_vigil_candle_dyeing.json -88e984718c1e18d80641a882ad478835975d747d data/doom_and_gloom/advancements/recipes/building_blocks/teal_vigil_candle.json -3a179797728c8502366ab46442c01caea334c5aa data/doom_and_gloom/advancements/recipes/building_blocks/teal_vigil_candle_dyeing.json -a78066a08c04317092fd7c9209d44c3e079c0088 data/doom_and_gloom/advancements/recipes/building_blocks/verdant_vigil_candle.json -a5f63eff0240e59d7bf00758adcd3255a5afc578 data/doom_and_gloom/advancements/recipes/building_blocks/verdant_vigil_candle_dyeing.json -54edd6276632391a26dd7f7fa9b3aef700ef9dcf data/doom_and_gloom/advancements/recipes/building_blocks/vigil_candle.json -fe4702a717351548680cbad0fbf695405a10d0b6 data/doom_and_gloom/advancements/recipes/building_blocks/white_vigil_candle.json -38746a888dc2cd0eb412a60cdd5955779c033379 data/doom_and_gloom/advancements/recipes/building_blocks/white_vigil_candle_dyeing.json -3000f672c43ec4fe47d9a7bee5498cc378b0698c data/doom_and_gloom/advancements/recipes/building_blocks/yellow_vigil_candle.json -40af9262287deec7e5ad0b5552d0e322be8d0b47 data/doom_and_gloom/advancements/recipes/building_blocks/yellow_vigil_candle_dyeing.json -82102b76f5b48956b2bdd3c5d3ad4a9c5e22ceb7 data/doom_and_gloom/advancements/recipes/sepulcher.json -abedf4bdefa03beddc3d53320a905e6c5706e6c7 data/doom_and_gloom/advancements/recipes/sepulcher_fallback.json -6e4f1a8dfd472910266fb5a9a478ea37ac4a08f8 data/doom_and_gloom/recipes/amber_vigil_candle.json -787adaacccbb8e579ac193ef9b48bd63ec352f08 data/doom_and_gloom/recipes/amber_vigil_candle_dyeing.json -b220dc46d76692a063a7fddbe155335e0b1fe6ea data/doom_and_gloom/recipes/aqua_vigil_candle.json -c6763151feba9b926a77ffb6cca7b9d6ff8e3d74 data/doom_and_gloom/recipes/aqua_vigil_candle_dyeing.json -38634dd7467584bd3c18359dd58674ec5026fb60 data/doom_and_gloom/recipes/beige_vigil_candle.json -b78b400dcbcfaedb20a99a4c72586791bdb714bc data/doom_and_gloom/recipes/beige_vigil_candle_dyeing.json -c107eb4aa140502ba5eed1c6ebf42b7060069429 data/doom_and_gloom/recipes/black_vigil_candle.json -23da88ddb02a428f7071662a6e7b1c0433395349 data/doom_and_gloom/recipes/black_vigil_candle_dyeing.json -0cd56547b3a201c7e2bd6751f87136b895749fcc data/doom_and_gloom/recipes/blue_vigil_candle.json -f066a2a81aec7ce8a0cc33a2dc91ce7c5378a228 data/doom_and_gloom/recipes/blue_vigil_candle_dyeing.json -b75f59c147632e5290acf2357a1d2c6c3aaff2dc data/doom_and_gloom/recipes/bone_pile.json -1fde73a919f0d95213c311a473bf30392dca5c07 data/doom_and_gloom/recipes/brown_vigil_candle.json -36799519195f62475920fadafebfa9e9711aad31 data/doom_and_gloom/recipes/brown_vigil_candle_dyeing.json -f4c4248650843e22e482ac91a1421dda76c580b1 data/doom_and_gloom/recipes/coral_vigil_candle.json -ccb823bc8d28afca26a27fabce94da3510a93501 data/doom_and_gloom/recipes/coral_vigil_candle_dyeing.json -21a53b6e63bd9d564e7676efad62adaee1baf103 data/doom_and_gloom/recipes/cyan_vigil_candle.json -7876eb915d0289f0b12fd90064369e4e474a2662 data/doom_and_gloom/recipes/cyan_vigil_candle_dyeing.json -d36daafdad243753d433332e1a42f8c36540a043 data/doom_and_gloom/recipes/forest_vigil_candle.json -b87c7706cb02a30f947fac13a4362d244ac7bd34 data/doom_and_gloom/recipes/forest_vigil_candle_dyeing.json -5fec83ed30b08a4f252713c2c91046145825f961 data/doom_and_gloom/recipes/ginger_vigil_candle.json -6609ccf8f779058af4ebb3f6a6bd2dd602af782d data/doom_and_gloom/recipes/ginger_vigil_candle_dyeing.json -571396da69a9de559d486ecfba68b75242d54e56 data/doom_and_gloom/recipes/gray_vigil_candle.json -e3dc9fe8dc984733e9d43060912fd67cfc71a032 data/doom_and_gloom/recipes/gray_vigil_candle_dyeing.json -7fdf2f467fea88c4f95349d4ecb083de673c3649 data/doom_and_gloom/recipes/green_vigil_candle.json -28761149055f9f3818a1ddee281532a5831f379b data/doom_and_gloom/recipes/green_vigil_candle_dyeing.json -b6a7b3443e9e85c7a80a35d2796c23d1761ac2aa data/doom_and_gloom/recipes/indigo_vigil_candle.json -bd88629fee0ed26721c3ee781e99ca7033682e32 data/doom_and_gloom/recipes/indigo_vigil_candle_dyeing.json -4b9ac354ff38a172729f6d55731a40e47c94a1ff data/doom_and_gloom/recipes/light_blue_vigil_candle.json -e73f22e1340f75e38d7543d14d92926647ebbb04 data/doom_and_gloom/recipes/light_blue_vigil_candle_dyeing.json -a5ffa89936090dafa8193262115f9793aa83fca9 data/doom_and_gloom/recipes/light_gray_vigil_candle.json -9bd446cae7a9d50282230e6be3c62a56cf2da2cb data/doom_and_gloom/recipes/light_gray_vigil_candle_dyeing.json -b478cfade21df9e38354beaeba8bd025c3a3ed64 data/doom_and_gloom/recipes/lime_vigil_candle.json -c6fa35092e0aa7750743ab7e9afe09f004e7a987 data/doom_and_gloom/recipes/lime_vigil_candle_dyeing.json -98ce3ca661bdb3aa8b992c2291c62512c74182e2 data/doom_and_gloom/recipes/magenta_vigil_candle.json -8700626aa2e21296786b0616887ede66f4b36bc1 data/doom_and_gloom/recipes/magenta_vigil_candle_dyeing.json -bc7e063874bc929d57f0eae06d3516d1f6b29b4e data/doom_and_gloom/recipes/maroon_vigil_candle.json -6b2174d0a34dfd630e83d1365858929b4ec4aa80 data/doom_and_gloom/recipes/maroon_vigil_candle_dyeing.json -5ae89cd5ce8dec29edf49b75f1840420c925b633 data/doom_and_gloom/recipes/mint_vigil_candle.json -84cfee9273ea36843e894e743d2494509c6c62ec data/doom_and_gloom/recipes/mint_vigil_candle_dyeing.json -9281c1d6696eb3a5e52f9281de3a8f08435da9a6 data/doom_and_gloom/recipes/navy_vigil_candle.json -6965fc1bba75a5106b25f9e7b5a6eb735e79d76e data/doom_and_gloom/recipes/navy_vigil_candle_dyeing.json -1072f6f5b304116dd367aa485682d30bfe7447f1 data/doom_and_gloom/recipes/olive_vigil_candle.json -9cac36ccd723b7c34e594512e2fd86c0785681ce data/doom_and_gloom/recipes/olive_vigil_candle_dyeing.json -6882e65f1bf8b85f3afaf5ce4a5e25639e62bb66 data/doom_and_gloom/recipes/orange_vigil_candle.json -95c15cb0d4d85e52c6d1cb4eb835ae97870f6718 data/doom_and_gloom/recipes/orange_vigil_candle_dyeing.json -409bf0656fc94471992fd24072e6a29c5506e7f9 data/doom_and_gloom/recipes/pink_vigil_candle.json -8d977aba5c30dc400b9063e2c3f2aa06856b97ff data/doom_and_gloom/recipes/pink_vigil_candle_dyeing.json -09a9c9b9ba79369556705047844dba8cb123b71c data/doom_and_gloom/recipes/purple_vigil_candle.json -5ec40c024b02e718e497d8bca75ae180e42ba480 data/doom_and_gloom/recipes/purple_vigil_candle_dyeing.json -c3d610ef50282cbe32d1a22fb2ce125163925166 data/doom_and_gloom/recipes/red_vigil_candle.json -0452f5321c14a2431fb79f19cbf2f4ebf7ecf5fe data/doom_and_gloom/recipes/red_vigil_candle_dyeing.json -5260bc9b40c171b8c817453e333269e32f43d263 data/doom_and_gloom/recipes/rose_vigil_candle.json -d77a8952cf9ceda6563c0ff67aafed7f2c2e1bfd data/doom_and_gloom/recipes/rose_vigil_candle_dyeing.json -d0af1f0ccef81065a6495f47c3481c34734aabfd data/doom_and_gloom/recipes/sepulcher.json -ee92c6a7836b75f779610a91e9f829715ce779f4 data/doom_and_gloom/recipes/sepulcher_fallback.json -3370f2c0af2a70eda9477db3b54da2788df12308 data/doom_and_gloom/recipes/slate_vigil_candle.json -770d5f9bf5c6a03e2dade1c8011c5bbcf1cf0447 data/doom_and_gloom/recipes/slate_vigil_candle_dyeing.json -6aab354dbfadfa8acd6c46173740c02106aa7ce9 data/doom_and_gloom/recipes/tan_vigil_candle.json -a7561f3c5a70502b5af69185d4d317fa32f99554 data/doom_and_gloom/recipes/tan_vigil_candle_dyeing.json -ac43fdb1f0307e2c5e57362284f3d8c3df570668 data/doom_and_gloom/recipes/teal_vigil_candle.json -2d4bb4d1990104f0305593b845eda95801a32be5 data/doom_and_gloom/recipes/teal_vigil_candle_dyeing.json -4b88f688ad0b4d8cad88e395c4d9ac179ee5b767 data/doom_and_gloom/recipes/verdant_vigil_candle.json -a9d663a9f7a307deee6a3c9fb2e5fb196d6fbff5 data/doom_and_gloom/recipes/verdant_vigil_candle_dyeing.json -b50363a65a736aebe5da3b8ea983ca251ba6991d data/doom_and_gloom/recipes/vigil_candle.json -3c14265935db6f7398f64f2fcd6555511e94d0e2 data/doom_and_gloom/recipes/white_vigil_candle.json -bc33389a23321c987b6d94bd23aa36b2f3aa3522 data/doom_and_gloom/recipes/white_vigil_candle_dyeing.json -8eeef32618037d14be97a7e3794fe7d3b06aba28 data/doom_and_gloom/recipes/yellow_vigil_candle.json -532b592172d76d2a02a9ae8cf1bd3818eb50d072 data/doom_and_gloom/recipes/yellow_vigil_candle_dyeing.json -e05716ff8a829cf201dc2cd71320c0e2ddf3fe74 data/minecraft/advancements/recipes/building_blocks/bone.json -239dca446de9f20776a6fce1ac400a7e23066c84 data/minecraft/recipes/bone.json diff --git a/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e b/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e deleted file mode 100644 index 3c93ad64..00000000 --- a/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e +++ /dev/null @@ -1,2 +0,0 @@ -// 1.20.1 2024-10-29T21:39:51.777139 Oreganized Entity Type Tags -a35af8d4e9c9c8d45cb7e2335ce6bacc00d45a8d data/doom_and_gloom/tags/entity_types/fills_sepulcher.json diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/sepulcher.json b/src/generated/resources/data/doom_and_gloom/advancements/recipes/sepulcher.json deleted file mode 100644 index 7e1ab147..00000000 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/sepulcher.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "advancements": [ - { - "advancement": { - "parent": "minecraft:recipes/root", - "criteria": { - "has_ingredient": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/silver" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "doom_and_gloom:sepulcher" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_ingredient", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "doom_and_gloom:sepulcher" - ] - }, - "sends_telemetry_event": false - }, - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:tag_empty", - "tag": "forge:ingots/silver" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/doom_and_gloom/advancements/recipes/sepulcher_fallback.json b/src/generated/resources/data/doom_and_gloom/advancements/recipes/sepulcher_fallback.json deleted file mode 100644 index cdb31a3e..00000000 --- a/src/generated/resources/data/doom_and_gloom/advancements/recipes/sepulcher_fallback.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "advancements": [ - { - "advancement": { - "parent": "minecraft:recipes/root", - "criteria": { - "has_ingredient": { - "conditions": { - "items": [ - { - "tag": "forge:ingots/iron" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "doom_and_gloom:sepulcher" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_ingredient", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "doom_and_gloom:sepulcher" - ] - }, - "sends_telemetry_event": false - }, - "conditions": [ - { - "type": "forge:tag_empty", - "tag": "forge:ingots/silver" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/doom_and_gloom/recipes/sepulcher.json b/src/generated/resources/data/doom_and_gloom/recipes/sepulcher.json deleted file mode 100644 index 165a7b4a..00000000 --- a/src/generated/resources/data/doom_and_gloom/recipes/sepulcher.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:not", - "value": { - "type": "forge:tag_empty", - "tag": "forge:ingots/silver" - } - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "#": { - "tag": "forge:ingots/silver" - } - }, - "pattern": [ - "# #", - "# #", - "###" - ], - "result": { - "item": "doom_and_gloom:sepulcher" - }, - "show_notification": true - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/doom_and_gloom/recipes/sepulcher_fallback.json b/src/generated/resources/data/doom_and_gloom/recipes/sepulcher_fallback.json deleted file mode 100644 index 765dbfe7..00000000 --- a/src/generated/resources/data/doom_and_gloom/recipes/sepulcher_fallback.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "forge:tag_empty", - "tag": "forge:ingots/silver" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "#": { - "tag": "forge:ingots/iron" - } - }, - "pattern": [ - "# #", - "# #", - "###" - ], - "result": { - "item": "doom_and_gloom:sepulcher" - }, - "show_notification": true - } - } - ] -} \ No newline at end of file diff --git a/src/main/java/galena/doom_and_gloom/DGConfig.java b/src/main/java/galena/doom_and_gloom/DGConfig.java deleted file mode 100644 index ab7b8319..00000000 --- a/src/main/java/galena/doom_and_gloom/DGConfig.java +++ /dev/null @@ -1,62 +0,0 @@ -package galena.doom_and_gloom; - -import net.minecraftforge.common.ForgeConfigSpec; -import net.minecraftforge.common.ForgeConfigSpec.ConfigValue; -import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.config.ModConfig; -import org.apache.commons.lang3.tuple.Pair; - -@EventBusSubscriber(modid = DoomAndGloom.MOD_ID) -public class DGConfig { - public static final Common COMMON; - private static final ForgeConfigSpec COMMON_SPEC; - - public static final Client CLIENT; - private static final ForgeConfigSpec CLIENT_SPEC; - - public static class Common { - public final ConfigValue sepulcherDuration; - - private Common(ForgeConfigSpec.Builder builder) { - builder.comment("Common"); - builder.push("common"); - - sepulcherDuration = builder.comment("Time in ticks the sepulcher takes to turn meat into bones").defineInRange("sepulcherDuration", 20 * 30, 0, Integer.MAX_VALUE); - - builder.pop(); - } - } - - public static class Client { - public final ConfigValue fancyRenderType; - - private Client(ForgeConfigSpec.Builder builder) { - builder.comment("Client"); - builder.push("client"); - - fancyRenderType = builder.comment("Use fancy render type for hollers") - .define("glowy_render_type", false); - - builder.pop(); - } - } - - static { - final Pair commonSpecPair = new ForgeConfigSpec.Builder().configure(Common::new); - - COMMON = commonSpecPair.getLeft(); - COMMON_SPEC = commonSpecPair.getRight(); - - final Pair clientSpecPair = new ForgeConfigSpec.Builder().configure(Client::new); - CLIENT = clientSpecPair.getLeft(); - CLIENT_SPEC = clientSpecPair.getRight(); - } - - public static void register() { - var context = ModLoadingContext.get(); - context.registerConfig(ModConfig.Type.COMMON, COMMON_SPEC); - context.registerConfig(ModConfig.Type.CLIENT, CLIENT_SPEC); - } - -} diff --git a/src/main/java/galena/doom_and_gloom/DoomAndGloom.java b/src/main/java/galena/doom_and_gloom/DoomAndGloom.java deleted file mode 100644 index faa62bac..00000000 --- a/src/main/java/galena/doom_and_gloom/DoomAndGloom.java +++ /dev/null @@ -1,199 +0,0 @@ -package galena.doom_and_gloom; - -import com.mojang.serialization.Codec; -import com.teamabnormals.blueprint.core.util.registry.RegistryHelper; -import galena.doom_and_gloom.compat.CompatHandler; -import galena.doom_and_gloom.compat.amendments.AmendmentsCompat; -import galena.doom_and_gloom.compat.moonlight.MoonlightCompat; -import galena.doom_and_gloom.content.entity.holler.Holler; -import galena.doom_and_gloom.data.OBlockStates; -import galena.doom_and_gloom.data.OBlockTags; -import galena.doom_and_gloom.data.ODamageTags; -import galena.doom_and_gloom.data.OEntityTags; -import galena.doom_and_gloom.data.OItemModels; -import galena.doom_and_gloom.data.OItemTags; -import galena.doom_and_gloom.data.OLang; -import galena.doom_and_gloom.data.OLootTables; -import galena.doom_and_gloom.data.OMobEffectTags; -import galena.doom_and_gloom.data.ORecipes; -import galena.doom_and_gloom.data.OSoundDefinitions; -import galena.doom_and_gloom.index.OBlocks; -import galena.doom_and_gloom.index.OEffects; -import galena.doom_and_gloom.index.OEntityTypes; -import galena.doom_and_gloom.index.OItems; -import galena.doom_and_gloom.index.OParticleTypes; -import galena.doom_and_gloom.index.OPoi; -import galena.doom_and_gloom.index.OVillagerTypes; -import galena.doom_and_gloom.network.DGNetwork; -import galena.doom_and_gloom.world.AddItemLootModifier; -import galena.doom_and_gloom.world.gen.VillageStructureModifier; -import java.util.Arrays; -import java.util.concurrent.CompletableFuture; -import java.util.function.Function; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import net.minecraft.DetectedVersion; -import net.minecraft.core.HolderLookup; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.PackOutput; -import net.minecraft.data.metadata.PackMetadataGenerator; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.packs.PackType; -import net.minecraft.server.packs.metadata.pack.PackMetadataSection; -import net.minecraft.world.entity.SpawnPlacements; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.CreativeModeTabs; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.ItemLike; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.common.loot.IGlobalLootModifier; -import net.minecraftforge.common.util.MutableHashedLinkedMap; -import net.minecraftforge.data.event.GatherDataEvent; -import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; -import net.minecraftforge.event.entity.EntityAttributeCreationEvent; -import net.minecraftforge.event.entity.SpawnPlacementRegisterEvent; -import net.minecraftforge.event.server.ServerAboutToStartEvent; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -@Mod(DoomAndGloom.MOD_ID) -public class DoomAndGloom { - public static final Logger LOGGER = LogManager.getLogger(); - public static final String MOD_ID = "doom_and_gloom"; - - public static ResourceLocation modLoc(String location) { - return new ResourceLocation(MOD_ID, location); - } - - public static final RegistryHelper REGISTRY_HELPER = new RegistryHelper(MOD_ID); - - private static final DeferredRegister> LOOT_MODIFIERS = DeferredRegister.create(ForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS, DoomAndGloom.MOD_ID); - - public DoomAndGloom() { - final IEventBus modBus = Bus.MOD.bus().get(); - final IEventBus forgeBus = MinecraftForge.EVENT_BUS; - - DGConfig.register(); - - modBus.addListener(this::gatherData); - modBus.addListener(this::buildCreativeModeTabContents); - modBus.addListener(this::registerAttributes); - modBus.addListener(this::registerSpawnPlacements); - forgeBus.addListener(this::onServerStart); - - LOOT_MODIFIERS.register("add_item", () -> AddItemLootModifier.CODEC); - - DeferredRegister[] registers = { - OEffects.EFFECTS, - OEntityTypes.ENTITIES, - OParticleTypes.PARTICLES, - OPoi.POI_TYPES, - OVillagerTypes.VILLAGER_PROFESSIONS, - LOOT_MODIFIERS, - }; - - for (DeferredRegister register : registers) { - register.register(modBus); - } - - REGISTRY_HELPER.register(modBus); - - DGNetwork.register(); - - if (CompatHandler.AMENDMENTS) { - AmendmentsCompat.register(); - } - if (CompatHandler.MOONLIGHT) { - MoonlightCompat.init(); - } - } - - private void registerAttributes(EntityAttributeCreationEvent event) { - event.put(OEntityTypes.HOLLER.get(), Holler.createAttributes().build()); - } - - private void registerSpawnPlacements(SpawnPlacementRegisterEvent event) { - event.register(OEntityTypes.HOLLER.get(), SpawnPlacements.Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, Holler::checkHollerSpawnRules, SpawnPlacementRegisterEvent.Operation.REPLACE); - } - - public void gatherData(GatherDataEvent event) { - DataGenerator generator = event.getGenerator(); - PackOutput output = generator.getPackOutput(); - CompletableFuture future = event.getLookupProvider(); - ExistingFileHelper helper = event.getExistingFileHelper(); - boolean client = event.includeClient(); - boolean server = event.includeServer(); - - var lang = new OLang(output); - - generator.addProvider(client, new OBlockStates(output, helper)); - generator.addProvider(client, new OItemModels(output, helper)); - generator.addProvider(client, lang); - generator.addProvider(client, new OSoundDefinitions(output, helper)); - - generator.addProvider(server, new ORecipes(output)); - generator.addProvider(server, new OLootTables(output)); - OBlockTags blockTags = new OBlockTags(output, future, helper); - generator.addProvider(server, blockTags); - generator.addProvider(server, new OItemTags(output, future, blockTags.contentsGetter(), helper)); - generator.addProvider(server, new OEntityTags(output, future, helper)); - CompletableFuture lookupProvider = event.getLookupProvider(); - generator.addProvider(server, new ODamageTags(output, lookupProvider, helper)); - generator.addProvider(server, new OMobEffectTags(output, lookupProvider, helper)); - - generator.addProvider(server, new PackMetadataGenerator(output).add(PackMetadataSection.TYPE, new PackMetadataSection( - Component.literal("Doom & Gloom resources"), - DetectedVersion.BUILT_IN.getPackVersion(PackType.CLIENT_RESOURCES), - Arrays.stream(PackType.values()).collect(Collectors.toMap(Function.identity(), DetectedVersion.BUILT_IN::getPackVersion)) - ))); - } - - - public void onServerStart(ServerAboutToStartEvent event) { - VillageStructureModifier.setup(event.getServer().registryAccess()); - } - - public void buildCreativeModeTabContents(BuildCreativeModeTabContentsEvent event) { - ResourceKey tab = event.getTabKey(); - MutableHashedLinkedMap entries = event.getEntries(); - - putAfter(entries, Blocks.LANTERN, OBlocks.VIGIL_CANDLE); - OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> putAfter(entries, OBlocks.VIGIL_CANDLE.get(), block)); - putAfter(entries, Blocks.COMPOSTER, OBlocks.SEPULCHER); - - putAfter(entries, Blocks.BONE_BLOCK, OBlocks.BONE_PILE); - - putAfter(entries, Blocks.INFESTED_DEEPSLATE, OBlocks.BURIAL_DIRT); - - if (tab == CreativeModeTabs.SPAWN_EGGS) { - event.accept(new ItemStack(OItems.HOLLER_SPAWN_EGG.get())); - } - - //if (tab == CreativeModeTabs.TOOLS_AND_UTILITIES) { - // event.accept(new ItemStack(OItems.BUSH_HAMMER.get())); - // event.accept(new ItemStack(OItems.HAMMER_AND_CHISEL.get())); - //} - - //if (tab == CreativeModeTabs.FUNCTIONAL_BLOCKS) { - // event.accept(new ItemStack(OBlocks.STONE_TABLET.get())); - // event.accept(new ItemStack(OBlocks.CRACKED_STONE_TABLET.get())); - //} - } - - private static void putAfter(MutableHashedLinkedMap entries, ItemLike after, Supplier supplier) { - ItemLike key = supplier.get(); - if (!entries.contains(new ItemStack(after))) return; - entries.putAfter(new ItemStack(after), new ItemStack(key), CreativeModeTab.TabVisibility.PARENT_AND_SEARCH_TABS); - } - -} diff --git a/src/main/java/galena/doom_and_gloom/DyeColors.java b/src/main/java/galena/doom_and_gloom/DyeColors.java deleted file mode 100644 index 2652afea..00000000 --- a/src/main/java/galena/doom_and_gloom/DyeColors.java +++ /dev/null @@ -1,21 +0,0 @@ -package galena.doom_and_gloom; - -import java.util.Objects; -import java.util.function.Function; -import java.util.stream.Stream; -import net.minecraft.world.item.DyeColor; -import net.minecraftforge.fml.ModList; - -public class DyeColors { - private static Stream vanillaColors() { - return Stream.of(DyeColor.WHITE, DyeColor.LIGHT_GRAY, DyeColor.GRAY, DyeColor.BLACK, DyeColor.BROWN, DyeColor.RED, DyeColor.ORANGE, DyeColor.YELLOW, DyeColor.LIME, DyeColor.GREEN, DyeColor.CYAN, DyeColor.LIGHT_BLUE, DyeColor.BLUE, DyeColor.PURPLE, DyeColor.MAGENTA, DyeColor.PINK); - } - - private static Stream depotColors() { - return !ModList.get().isLoaded("dye_depot") ? Stream.empty() : Stream.of("amber", "aqua", "beige", "coral", "forest", "ginger", "indigo", "maroon", "mint", "navy", "olive", "rose", "slate", "tan", "teal", "verdant").map((it) -> DyeColor.byName(it, (DyeColor)null)).filter(Objects::nonNull); - } - - public static Stream supported() { - return Stream.of(vanillaColors(), depotColors()).flatMap(Function.identity()); - } -} diff --git a/src/main/java/galena/doom_and_gloom/client/DoomAndGloomClient.java b/src/main/java/galena/doom_and_gloom/client/DoomAndGloomClient.java deleted file mode 100644 index 0fc02e76..00000000 --- a/src/main/java/galena/doom_and_gloom/client/DoomAndGloomClient.java +++ /dev/null @@ -1,141 +0,0 @@ -package galena.doom_and_gloom.client; - -import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.client.model.DirtMoundModel; -import galena.doom_and_gloom.client.model.HollerModel; -import galena.doom_and_gloom.client.render.entity.DirtMoundRenderer; -import galena.doom_and_gloom.client.render.entity.HollerRender; -import galena.doom_and_gloom.index.OBlocks; -import galena.doom_and_gloom.index.OEffects; -import galena.doom_and_gloom.index.OEntityTypes; -import galena.doom_and_gloom.index.OParticleTypes; -import java.awt.*; -import java.util.function.Supplier; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.FogRenderer; -import net.minecraft.client.renderer.ItemBlockRenderTypes; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.core.BlockPos; -import net.minecraft.core.particles.ParticleOptions; -import net.minecraft.tags.FluidTags; -import net.minecraft.util.Mth; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.EntityRenderersEvent; -import net.minecraftforge.client.event.RegisterClientReloadListenersEvent; -import net.minecraftforge.client.event.ViewportEvent; -import net.minecraftforge.event.TickEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; - -@Mod.EventBusSubscriber(modid = DoomAndGloom.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) -public class DoomAndGloomClient { - - private static void render(Supplier block, RenderType render) { - ItemBlockRenderTypes.setRenderLayer(block.get(), render); - } - - @SubscribeEvent - public static void setup(FMLClientSetupEvent event) { - event.enqueueWork(()->{ - DoomAndGloomClient.registerBlockRenderers(); - }); - } - - private static void registerBlockRenderers() { - render(OBlocks.SEPULCHER, RenderType.cutout()); - OBlocks.vigilCandles().forEach(block -> render(block, RenderType.cutout())); - } - - @SubscribeEvent - public static void registerReloadListener(RegisterClientReloadListenersEvent event) { - event.registerReloadListener(new OReloadListener()); - } - - @SubscribeEvent - public static void registerEntityRenderers(EntityRenderersEvent.RegisterRenderers event) { - event.registerEntityRenderer(OEntityTypes.HOLLER.get(), HollerRender::new); - event.registerEntityRenderer(OEntityTypes.DIRT_MOUND.get(), DirtMoundRenderer::new); - } - - @SubscribeEvent - public static void registerModelLayers(EntityRenderersEvent.RegisterLayerDefinitions event) { - event.registerLayerDefinition(OModelLayers.HOLLER, HollerModel::createBodyLayer); - event.registerLayerDefinition(OModelLayers.DIRT_MOUND, DirtMoundModel::createBodyLayer); - } - - @Mod.EventBusSubscriber(modid = DoomAndGloom.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.FORGE) - public static class ForgeBusEvents { - - private static MobEffectInstance fogEffect; - - @SubscribeEvent - public static void clientTick(TickEvent.ClientTickEvent event) { - if (!(Minecraft.getInstance().gameRenderer.getMainCamera().getEntity() instanceof Player player)) return; - fogEffect = player.getEffect(OEffects.FOG.get()); - - if (fogEffect == null) return; - if (Minecraft.getInstance().isPaused()) return; - var level = Minecraft.getInstance().level; - if (level == null) return; - - var range = 24; - var at = player.position().add((level.random.nextDouble() - 0.5) * range, level.random.nextDouble() * 4 - 2, (level.random.nextDouble() - 0.5) * range); - var blockAt = BlockPos.containing(at.x, at.y, at.z); - var stateAt = level.getBlockState(blockAt); - - if (!stateAt.canBeReplaced() || !stateAt.getFluidState().isEmpty()) return; - - var below = level.getBlockState(blockAt.below()); - - if (below.getFluidState().is(FluidTags.WATER)) { - addFogGroup(level, OParticleTypes.FOG_WATER.get(), blockAt, 3, 0); - } else if (!below.canBeReplaced()) { - addFogGroup(level, OParticleTypes.FOG.get(), blockAt, 5, 1); - } - } - - private static void addFogGroup(Level level, ParticleOptions type, BlockPos at, int amount, double yRange) { - if(level.random.nextInt(amount * 2) != 0) return; - - var realAmount = amount - level.random.nextInt(2); - - for (int i = 0; i < realAmount; i++) { - level.addParticle(type, - at.getX() + level.random.nextDouble() * 2 - 1, at.getY() + 0.5 + level.random.nextDouble() * yRange, at.getZ() + level.random.nextDouble() * 2 - 1, - level.random.nextFloat() + 0.5F, 0.0, 0.0 - ); - } - } - - @SubscribeEvent - public static void fogEffectFog(ViewportEvent.RenderFog event) { - if (fogEffect != null && fogEffect.getFactorData().isPresent()) { - LivingEntity entity = (LivingEntity) Minecraft.getInstance().gameRenderer.getMainCamera().getEntity(); - float f = Mth.lerp(fogEffect.getFactorData().get().getFactor(entity, (float) event.getPartialTick()), event.getFarPlaneDistance(), 15F); - event.setNearPlaneDistance(event.getMode() == FogRenderer.FogMode.FOG_SKY ? -2F : f * -0.5F); - event.setFarPlaneDistance(f); - event.setCanceled(true); - } - } - - @SubscribeEvent - public static void fogEffectColor(ViewportEvent.ComputeFogColor event) { - if (fogEffect != null && fogEffect.getFactorData().isPresent()) { - var color = new Color(0x697180); - LivingEntity entity = (LivingEntity) Minecraft.getInstance().gameRenderer.getMainCamera().getEntity(); - float factor = (fogEffect.getFactorData().get()).getFactor(entity, (float) event.getPartialTick()); - float inverseFactor = 1 - factor; - event.setRed(color.getRed() / 255F * factor + event.getRed() * inverseFactor); - event.setGreen(color.getGreen() / 255F * factor + event.getGreen() * inverseFactor); - event.setBlue(color.getBlue() / 255F * factor + event.getBlue() * inverseFactor); - } - } - - } -} diff --git a/src/main/java/galena/doom_and_gloom/client/OModelLayers.java b/src/main/java/galena/doom_and_gloom/client/OModelLayers.java deleted file mode 100644 index 25d25811..00000000 --- a/src/main/java/galena/doom_and_gloom/client/OModelLayers.java +++ /dev/null @@ -1,14 +0,0 @@ -package galena.doom_and_gloom.client; - -import galena.doom_and_gloom.DoomAndGloom; -import net.minecraft.client.model.geom.ModelLayerLocation; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -@OnlyIn(Dist.CLIENT) -public class OModelLayers { - - public static final ModelLayerLocation HOLLER = new ModelLayerLocation(new ResourceLocation(DoomAndGloom.MOD_ID, "holler"), "main"); - public static final ModelLayerLocation DIRT_MOUND = new ModelLayerLocation(new ResourceLocation(DoomAndGloom.MOD_ID, "dirt_mound"), "main"); -} diff --git a/src/main/java/galena/doom_and_gloom/compat/CompatHandler.java b/src/main/java/galena/doom_and_gloom/compat/CompatHandler.java deleted file mode 100644 index b8d949d5..00000000 --- a/src/main/java/galena/doom_and_gloom/compat/CompatHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package galena.doom_and_gloom.compat; - -import net.minecraftforge.fml.ModList; - -public class CompatHandler { - - public static final boolean MOONLIGHT = ModList.get().isLoaded("moonlight"); - public static final boolean SUPPLEMENTARIES = ModList.get().isLoaded("supplementaries"); - public static final boolean AMENDMENTS = ModList.get().isLoaded("amendments"); -} diff --git a/src/main/java/galena/doom_and_gloom/data/OBlockStates.java b/src/main/java/galena/doom_and_gloom/data/OBlockStates.java deleted file mode 100644 index 1a44b5e6..00000000 --- a/src/main/java/galena/doom_and_gloom/data/OBlockStates.java +++ /dev/null @@ -1,34 +0,0 @@ -package galena.doom_and_gloom.data; - -import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.data.provider.OBlockStateProvider; -import galena.doom_and_gloom.index.OBlocks; -import net.minecraft.data.PackOutput; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.common.data.ExistingFileHelper; - -public class OBlockStates extends OBlockStateProvider { - - public OBlockStates(PackOutput output, ExistingFileHelper helper) { - super(output, helper); - } - - @Override - public String getName() { - return DoomAndGloom.MOD_ID + " Block States"; - } - - @Override - protected void registerStatesAndModels() { - sepulcherBlock(OBlocks.SEPULCHER); - simpleBlock(OBlocks.BONE_PILE.get(), models().cubeColumn(blockTexture(OBlocks.BONE_PILE.get()).getPath(), DoomAndGloom.modLoc("block/bone_pile_side"), DoomAndGloom.modLoc("block/sepulcher_rot_5"))); - simpleBlock(OBlocks.ROTTING_FLESH.get(), models().cubeAll(blockTexture(OBlocks.ROTTING_FLESH.get()).getPath(), DoomAndGloom.modLoc("block/sepulcher_rot_1"))); - vigilCandle(OBlocks.VIGIL_CANDLE, null); - simpleBlock(OBlocks.BURIAL_DIRT.get(), models().cubeTop("burial_dirt", new ResourceLocation("block/dirt"), DoomAndGloom.modLoc("block/burial_dirt"))); - OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> vigilCandle(block, color.getSerializedName())); - stoneTablet(OBlocks.STONE_TABLET, null); - stoneTablet(OBlocks.ENGRAVED_STONE_TABLET, "engraved"); - stoneTablet(OBlocks.CRACKED_STONE_TABLET, "cracked"); - } - -} diff --git a/src/main/java/galena/doom_and_gloom/data/OItemModels.java b/src/main/java/galena/doom_and_gloom/data/OItemModels.java deleted file mode 100644 index 53a5517c..00000000 --- a/src/main/java/galena/doom_and_gloom/data/OItemModels.java +++ /dev/null @@ -1,36 +0,0 @@ -package galena.doom_and_gloom.data; - -import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.data.provider.OItemModelProvider; -import galena.doom_and_gloom.index.OBlocks; -import galena.doom_and_gloom.index.OItems; -import net.minecraft.data.PackOutput; -import net.minecraftforge.common.data.ExistingFileHelper; - -public class OItemModels extends OItemModelProvider { - - public OItemModels(PackOutput output, ExistingFileHelper helper) { - super(output, helper); - } - - @Override - public String getName() { - return DoomAndGloom.MOD_ID + " Item Models"; - } - - @Override - protected void registerModels() { - toolItem(OItems.BUSH_HAMMER); - block(OBlocks.SEPULCHER); - block(OBlocks.BONE_PILE); - block(OBlocks.BURIAL_DIRT); - OBlocks.vigilCandles().forEach(this::normalItem); - spawnEggItem(OItems.HOLLER_SPAWN_EGG); - normalItem(OItems.MUSIC_DISC_AFTERLIFE); - normalItem(OBlocks.STONE_TABLET); - normalItem(OBlocks.ENGRAVED_STONE_TABLET); - normalItem(OBlocks.CRACKED_STONE_TABLET); - normalItem(OItems.HAMMER_AND_CHISEL); - } - -} diff --git a/src/main/java/galena/doom_and_gloom/data/OItemTags.java b/src/main/java/galena/doom_and_gloom/data/OItemTags.java deleted file mode 100644 index b1144b32..00000000 --- a/src/main/java/galena/doom_and_gloom/data/OItemTags.java +++ /dev/null @@ -1,36 +0,0 @@ -package galena.doom_and_gloom.data; - -import static galena.doom_and_gloom.index.OTags.Items.TOOLS_BUSH_HAMMER; - -import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.index.OItems; -import galena.doom_and_gloom.index.OTags; -import java.util.concurrent.CompletableFuture; -import javax.annotation.Nullable; -import net.minecraft.core.HolderLookup; -import net.minecraft.data.PackOutput; -import net.minecraft.data.tags.ItemTagsProvider; -import net.minecraft.tags.ItemTags; -import net.minecraft.world.level.block.Block; -import net.minecraftforge.common.data.ExistingFileHelper; - -public class OItemTags extends ItemTagsProvider { - - public OItemTags(PackOutput output, CompletableFuture future, CompletableFuture> provider, @Nullable ExistingFileHelper helper) { - super(output, future, provider, DoomAndGloom.MOD_ID, helper); - } - - @Override - public String getName() { - return "Oreganized Item Tags"; - } - - @Override - protected void addTags(HolderLookup.Provider provider) { - tag(TOOLS_BUSH_HAMMER).add(OItems.BUSH_HAMMER.get()); - - tag(ItemTags.MUSIC_DISCS).add(OItems.MUSIC_DISC_AFTERLIFE.get()); - - copy(OTags.Blocks.VIGIL_CANDLES, OTags.Items.VIGIL_CANDLES); - } -} diff --git a/src/main/java/galena/doom_and_gloom/data/OLang.java b/src/main/java/galena/doom_and_gloom/data/OLang.java deleted file mode 100644 index c9209a90..00000000 --- a/src/main/java/galena/doom_and_gloom/data/OLang.java +++ /dev/null @@ -1,67 +0,0 @@ -package galena.doom_and_gloom.data; - -import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.data.provider.OLangProvider; -import galena.doom_and_gloom.index.OBlocks; -import galena.doom_and_gloom.index.OEffects; -import galena.doom_and_gloom.index.OEntityTypes; -import galena.doom_and_gloom.index.OItems; -import java.util.function.Supplier; -import net.minecraft.data.PackOutput; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; - -public class OLang extends OLangProvider { - - public OLang(PackOutput output) { - super(output, DoomAndGloom.MOD_ID, "en_us"); - } - - @Override - protected void addTranslations() { - addDisc(OItems.MUSIC_DISC_AFTERLIFE, "Firch", "afterlife"); - - addBlock(OBlocks.BONE_PILE, "Pile of Bones"); - - addEffect(OEffects.FOG, "Fog"); - addEffect(OEffects.WARDING, "Warding"); - - // JEED compat - add("effect.doom_and_gloom.fog.description", "An eerie fog that accompanies the holler"); - add("effect.doom_and_gloom.warding.description", "Wards against evil spirits"); - - addSubtitle("block", "sepulcher.unsealing", "Sepulcher opened"); - addSubtitle("block", "sepulcher.sealing", "Sepulcher sealed"); - addSubtitle("block", "sepulcher.rotting", "Sepulcher rotting"); - addSubtitle("block", "sepulcher.harvest", "Sepulcher emptied"); - addSubtitle("block", "sepulcher.filled", "Sepulcher filled"); - addSubtitle("block", "sepulcher.corpse_stuffed", "Sepulcher consumes corpse"); - - addSubtitle("entity", "holler_death", "Holler dies"); - addSubtitle("entity", "holler_hurt", "Holler hurts"); - addSubtitle("entity", "holler_shrieks", "Holler shrieks"); - addSubtitle("entity", "holler_hollers", "Holler wails"); //howls? howls? whispers? - - add("entity.minecraft.villager." + DoomAndGloom.MOD_ID + ".gravetender", "Gravetender"); - - add("gui.doom_and_gloom.stone_tablet.engrave", "Engrave"); - add("gui.doom_and_gloom.stone_tablet.cancel", "Cancel"); - - /* - Automatically create translations for blocks and items based on their registry name. - - This must be at the very bottom to avoid overwriting errors. These functions ignore objects - that have already been translated above. - */ - for (Supplier blocks : DoomAndGloom.REGISTRY_HELPER.getBlockSubHelper().getDeferredRegister().getEntries()) { - tryBlock(blocks); - } - for (Supplier items : DoomAndGloom.REGISTRY_HELPER.getItemSubHelper().getDeferredRegister().getEntries()) { - tryItem(items); - } - for (Supplier> entities : OEntityTypes.ENTITIES.getEntries()) { - tryEntity(entities); - } - } -} diff --git a/src/main/java/galena/doom_and_gloom/data/ORecipes.java b/src/main/java/galena/doom_and_gloom/data/ORecipes.java deleted file mode 100644 index fa2eea22..00000000 --- a/src/main/java/galena/doom_and_gloom/data/ORecipes.java +++ /dev/null @@ -1,115 +0,0 @@ -package galena.doom_and_gloom.data; - -import galena.doom_and_gloom.data.provider.ORecipeProvider; -import galena.doom_and_gloom.index.OBlocks; -import galena.doom_and_gloom.index.OTags; -import java.util.function.Consumer; -import java.util.function.Function; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.FinishedRecipe; -import net.minecraft.data.recipes.RecipeBuilder; -import net.minecraft.data.recipes.RecipeCategory; -import net.minecraft.data.recipes.ShapedRecipeBuilder; -import net.minecraft.data.recipes.ShapelessRecipeBuilder; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.TagKey; -import net.minecraft.world.item.DyeItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.block.Blocks; -import net.minecraftforge.common.Tags; -import net.minecraftforge.common.crafting.ConditionalRecipe; -import net.minecraftforge.common.crafting.conditions.NotCondition; -import net.minecraftforge.common.crafting.conditions.TagEmptyCondition; - -public class ORecipes extends ORecipeProvider { - - public ORecipes(PackOutput output) { - super(output); - } - - @Override - protected void buildRecipes(Consumer consumer) { - vigilCandle(OBlocks.VIGIL_CANDLE, Blocks.CANDLE).save(consumer); - - OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> { - var namespace = color.getId() > 15 ? "dye_depot" : "minecraft"; - var candle = BuiltInRegistries.BLOCK.get(new ResourceLocation(namespace, color.getSerializedName() + "_candle")); - vigilCandle(block, candle).save(consumer); - - ShapelessRecipeBuilder.shapeless(RecipeCategory.BUILDING_BLOCKS, block.get()) - .requires(OBlocks.VIGIL_CANDLE.get()) - .requires(DyeItem.byColor(color)) - .unlockedBy("has_vigil_candle", has(OBlocks.VIGIL_CANDLE.get())) - .group("vigil_candle") - .save(consumer, RecipeBuilder.getDefaultRecipeId(block.get()).withSuffix("_dyeing")); - }); - - withFallback(OTags.Items.INGOTS_SILVER, Tags.Items.INGOTS_IRON, ingot -> - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, OBlocks.SEPULCHER.get()) - .pattern("# #") - .pattern("# #") - .pattern("###") - .define('#', ingot) - ).accept(consumer); - - compact(OBlocks.BONE_PILE.get().asItem(), Items.BONE).save(consumer); - unCompact(Items.BONE, OBlocks.BONE_PILE.get().asItem()).save(consumer); - - /* - withFallback(OTags.Items.INGOTS_LEAD, Tags.Items.INGOTS_COPPER, ingot -> - ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, OItems.BUSH_HAMMER.get()) - .pattern("AA") - .pattern("B ") - .define('A', ingot) - .define('B', Tags.Items.RODS_WOODEN) - .unlockedBy("has_stick", has(Tags.Items.RODS_WOODEN)) - ).accept(consumer); - - ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, OBlocks.STONE_TABLET.get()) - .pattern("##") - .pattern("##") - .define('#', Blocks.STONE_PRESSURE_PLATE) - .unlockedBy("has_stone", has(Blocks.STONE_PRESSURE_PLATE)) - .save(consumer); - - ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, OItems.HAMMER_AND_CHISEL.get()) - .pattern("## ") - .pattern("##H") - .define('#', Blocks.STONE_PRESSURE_PLATE) - .define('H', OItems.BUSH_HAMMER.get()) - .unlockedBy("has_hammer", has(OItems.BUSH_HAMMER.get())) - .save(consumer); - - ShapelessRecipeBuilder.shapeless(RecipeCategory.TOOLS, OItems.HAMMER_AND_CHISEL.get()) - .requires(OItems.BUSH_HAMMER.get()) - .requires(OBlocks.STONE_TABLET.get()) - .unlockedBy("has_hammer", has(OItems.BUSH_HAMMER.get())) - .save(consumer, new ResourceLocation(DoomAndGloom.MOD_ID, "hammer_and_chisel_from_tablet")); - - smeltingResultFromBase(consumer, OBlocks.CRACKED_STONE_TABLET.get(), OBlocks.STONE_TABLET.get()); - */ - } - - private Consumer> withFallback(TagKey prefer, TagKey fallback, Function, RecipeBuilder> builder) { - return consumer -> { - var preferredRecipe = builder.apply(prefer).unlockedBy("has_ingredient", has(prefer)); - var id = RecipeBuilder.getDefaultRecipeId(preferredRecipe.getResult()); - - ConditionalRecipe.builder() - .addCondition(new NotCondition(new TagEmptyCondition(prefer.location()))) - .addRecipe(preferredRecipe::save) - .generateAdvancement() - .build(consumer, id); - - ConditionalRecipe.builder() - .addCondition(new TagEmptyCondition(prefer.location())) - .addRecipe(builder.apply(fallback).unlockedBy("has_ingredient", has(fallback))::save) - .generateAdvancement() - .build(consumer, id.withSuffix("_fallback")); - - }; - } - -} diff --git a/src/main/java/galena/doom_and_gloom/data/provider/OLangProvider.java b/src/main/java/galena/doom_and_gloom/data/provider/OLangProvider.java deleted file mode 100644 index 17a35a45..00000000 --- a/src/main/java/galena/doom_and_gloom/data/provider/OLangProvider.java +++ /dev/null @@ -1,157 +0,0 @@ -package galena.doom_and_gloom.data.provider; - -import com.google.common.collect.Lists; -import com.google.gson.JsonObject; -import java.nio.file.Path; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.concurrent.CompletableFuture; -import java.util.function.Supplier; -import net.minecraft.data.CachedOutput; -import net.minecraft.data.DataProvider; -import net.minecraft.data.PackOutput; -import net.minecraft.world.effect.MobEffect; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.RecordItem; -import net.minecraft.world.item.enchantment.Enchantment; -import net.minecraft.world.level.block.Block; -import net.minecraftforge.registries.ForgeRegistries; - -public abstract class OLangProvider implements DataProvider { - private final Map data = new TreeMap<>(); - private final PackOutput output; - private final String modid; - private final String locale; - - private final List subProviders = Lists.newArrayList(); - - public OLangProvider(PackOutput output, String modid, String locale) { - this.output = output; - this.modid = modid; - this.locale = locale; - } - - public void addSubProvider(Runnable runnable) { - this.subProviders.add(runnable); - } - - protected abstract void addTranslations(); - - @Override - public CompletableFuture run(CachedOutput cache) { - this.subProviders.forEach(Runnable::run); - addTranslations(); - if (!data.isEmpty()) - return save(cache, this.output.getOutputFolder(PackOutput.Target.RESOURCE_PACK).resolve(this.modid).resolve("lang").resolve(this.locale + ".json")); - - return CompletableFuture.allOf(); - } - - @Override - public String getName() { - return modid + " Languages: " + locale; - } - - private CompletableFuture save(CachedOutput cache, Path target) { - JsonObject json = new JsonObject(); - this.data.forEach(json::addProperty); - - return DataProvider.saveStable(cache, json, target); - } - - public void addBlock(Supplier key, String name) { - add(key.get(), name); - } - - public void add(Block key, String name) { - add(key.getDescriptionId(), name); - } - - public void addItem(Supplier key, String name) { - add(key.get(), name); - } - - public void add(Item key, String name) { - add(key.getDescriptionId(), name); - } - - public void addDisc(Supplier disc, String desc) { - addItem(disc, "Music Disc"); - add(disc.get().getDescriptionId() + ".desc", desc); - } - - public void addDisc(Supplier disc, String artist, String song) { - addDisc(disc, artist + " - " + song); - } - - public void addAdvTitle(String advancementTitle, String name) { - data.putIfAbsent("advancements." + advancementTitle + ".title", name); - } - - public void addAdvDesc(String advancementTitle, String name) { - data.putIfAbsent("advancements." + advancementTitle + ".description", name); - } - - public void addSubtitle(String category, String subtitleName, String name) { - add("subtitles." + category + "." + subtitleName, name); - } - - public void add(ItemStack key, String name) { - add(key.getDescriptionId(), name); - } - - public void add(Enchantment key, String name) { - add(key.getDescriptionId(), name); - } - - public void addEffect(Supplier key, String name) { - add(key.get(), name); - } - - public void add(MobEffect key, String name) { - add(key.getDescriptionId(), name); - } - - public void add(EntityType key, String name) { - add(key.getDescriptionId(), name); - } - - public void add(String key, String value) { - if (data.put(key, value) != null) - throw new IllegalStateException("Duplicate translation key " + key); - } - - public void tryBlock(Supplier block) { - String key = block.get().getDescriptionId(); - String value = formatString(ForgeRegistries.BLOCKS.getKey(block.get()).getPath()); - data.putIfAbsent(key, value); - } - - public void tryItem(Supplier item) { - String key = item.get().getDescriptionId(); - String value = formatString(ForgeRegistries.ITEMS.getKey(item.get()).getPath()); - data.putIfAbsent(key, value); - } - - public void tryEntity(Supplier> entity) { - String key = entity.get().getDescriptionId(); - String value = formatString(ForgeRegistries.ENTITY_TYPES.getKey(entity.get()).getPath()); - data.putIfAbsent(key, value); - } - - private String formatString(String key) { - String[] strArr = key.split("_"); - StringBuffer res = new StringBuffer(); - for (String str : strArr) { - char[] stringArray = str.trim().toCharArray(); - stringArray[0] = Character.toUpperCase(stringArray[0]); - str = new String(stringArray); - - res.append(str).append(" "); - } - return res.toString().trim(); - } -} diff --git a/src/main/java/galena/doom_and_gloom/index/OBlockEntities.java b/src/main/java/galena/doom_and_gloom/index/OBlockEntities.java deleted file mode 100644 index cff3e825..00000000 --- a/src/main/java/galena/doom_and_gloom/index/OBlockEntities.java +++ /dev/null @@ -1,22 +0,0 @@ -package galena.doom_and_gloom.index; - -import com.teamabnormals.blueprint.core.util.registry.BlockEntitySubRegistryHelper; -import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.content.block.StoneTabletBlockEntity; -import galena.doom_and_gloom.content.entity.SepulcherBlockEntity; -import galena.doom_and_gloom.content.entity.VigilCandleBlockEntity; -import java.util.Set; -import java.util.stream.Collectors; -import net.minecraft.world.level.block.entity.BlockEntityType; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.registries.RegistryObject; - -@Mod.EventBusSubscriber(modid = DoomAndGloom.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) -public class OBlockEntities { - public static final BlockEntitySubRegistryHelper HELPER = DoomAndGloom.REGISTRY_HELPER.getBlockEntitySubHelper(); - - public static final RegistryObject> VIGIL_CANDLE = HELPER.createBlockEntity("vigil_candle", VigilCandleBlockEntity::new, () -> OBlocks.vigilCandles().map(RegistryObject::get).collect(Collectors.toSet())); - public static final RegistryObject> SEPULCHER = HELPER.createBlockEntity("sepulcher", SepulcherBlockEntity::new, () -> Set.of(OBlocks.SEPULCHER.get())); - public static final RegistryObject> STONE_TABLET = HELPER.createBlockEntity("stone_tablet", StoneTabletBlockEntity::new, () -> Set.of(OBlocks.STONE_TABLET.get())); - -} diff --git a/src/main/java/galena/doom_and_gloom/index/OBlocks.java b/src/main/java/galena/doom_and_gloom/index/OBlocks.java deleted file mode 100644 index 418b1a39..00000000 --- a/src/main/java/galena/doom_and_gloom/index/OBlocks.java +++ /dev/null @@ -1,74 +0,0 @@ -package galena.doom_and_gloom.index; - -import com.teamabnormals.blueprint.core.util.registry.BlockSubRegistryHelper; -import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.DyeColors; -import galena.doom_and_gloom.content.block.BonePileBlock; -import galena.doom_and_gloom.content.block.BurialDirtBlock; -import galena.doom_and_gloom.content.block.SepulcherBlock; -import galena.doom_and_gloom.content.block.StoneTabletBlock; -import galena.doom_and_gloom.content.block.VigilCandleBlock; -import java.util.Map; -import java.util.Objects; -import java.util.function.Function; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.material.PushReaction; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.registries.RegistryObject; - -@Mod.EventBusSubscriber(modid = DoomAndGloom.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) -public class OBlocks { - public static final BlockSubRegistryHelper HELPER = DoomAndGloom.REGISTRY_HELPER.getBlockSubHelper(); - - public static final RegistryObject SEPULCHER = register("sepulcher", () -> new SepulcherBlock(BlockBehaviour.Properties.copy(Blocks.CAULDRON).sound(OSoundTypes.SEPULCHER))); - public static final RegistryObject BONE_PILE = register("bone_pile", () -> new BonePileBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK).sound(OSoundTypes.BONE_PILE).strength(1F))); - public static final RegistryObject ROTTING_FLESH = HELPER.createBlock("rotting_flesh", () -> new Block(BlockBehaviour.Properties.copy(Blocks.DIRT))); - public static final RegistryObject STONE_TABLET = register("stone_tablet", () -> new StoneTabletBlock(BlockBehaviour.Properties.copy(Blocks.STONE), StoneTabletBlock.Type.DEFAULT)); - public static final RegistryObject ENGRAVED_STONE_TABLET = register("engraved_stone_tablet", () -> new StoneTabletBlock(BlockBehaviour.Properties.copy(Blocks.STONE), StoneTabletBlock.Type.ENGRAVED)); - public static final RegistryObject CRACKED_STONE_TABLET = register("cracked_stone_tablet", () -> new StoneTabletBlock(BlockBehaviour.Properties.copy(Blocks.STONE), StoneTabletBlock.Type.ENGRAVED)); - - private static final Supplier VIGIL_CANDLE_PROPERTIES = () -> BlockBehaviour.Properties.of().noOcclusion().lightLevel(VigilCandleBlock.LIGHT_EMISSION).sound(SoundType.METAL).pushReaction(PushReaction.DESTROY); - public static final RegistryObject VIGIL_CANDLE = register("vigil_candle", () -> new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get())); - public static final Map> COLORED_VIGIL_CANDLES = registerColored("vigil_candle", color -> new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get().mapColor(color))); - - public static final RegistryObject BURIAL_DIRT = register("burial_dirt", () -> new BurialDirtBlock(BlockBehaviour.Properties.copy(Blocks.DIRT))); - - public static Stream> vigilCandles() { - return Stream.of( - Stream.of(VIGIL_CANDLE), - COLORED_VIGIL_CANDLES.entrySet().stream() - .sorted(Map.Entry.comparingByKey()) - .map(Map.Entry::getValue) - ).flatMap(Function.identity()); - } - - public static Map> registerColored(String baseName, Function factory) { - return DyeColors.supported().collect(Collectors.toMap( - it -> it, - color -> register(color.getSerializedName() + "_" + baseName, () -> factory.apply(color)) - )); - } - - public static RegistryObject register(String name, Supplier block, Function item) { - RegistryObject register = HELPER.createBlockNoItem(name, block); - OItems.HELPER.createItem(name, () -> item.apply(register.get())); - return register; - } - - public static RegistryObject register(String name, Supplier block) { - return register(name, block, OBlocks::createBlockItem); - } - - private static BlockItem createBlockItem(final Block block) { - return new BlockItem(Objects.requireNonNull(block), new Item.Properties()); - } -} diff --git a/src/main/java/galena/doom_and_gloom/index/OEffects.java b/src/main/java/galena/doom_and_gloom/index/OEffects.java deleted file mode 100644 index 705cf192..00000000 --- a/src/main/java/galena/doom_and_gloom/index/OEffects.java +++ /dev/null @@ -1,18 +0,0 @@ -package galena.doom_and_gloom.index; - -import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.content.effect.FogEffect; -import galena.doom_and_gloom.content.effect.WardingEffect; -import net.minecraft.world.effect.MobEffect; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; - -public class OEffects { - - public static final DeferredRegister EFFECTS = DeferredRegister.create(ForgeRegistries.MOB_EFFECTS, DoomAndGloom.MOD_ID); - - public static final RegistryObject FOG = EFFECTS.register("fog", FogEffect::new); - public static final RegistryObject WARDING = EFFECTS.register("warding", WardingEffect::new); - -} diff --git a/src/main/java/galena/doom_and_gloom/index/OEntityTypes.java b/src/main/java/galena/doom_and_gloom/index/OEntityTypes.java deleted file mode 100644 index 44b1c48b..00000000 --- a/src/main/java/galena/doom_and_gloom/index/OEntityTypes.java +++ /dev/null @@ -1,19 +0,0 @@ -package galena.doom_and_gloom.index; - -import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.content.entity.DirtMound; -import galena.doom_and_gloom.content.entity.holler.Holler; -import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobCategory; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; - -public class OEntityTypes { - - public static final DeferredRegister> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, DoomAndGloom.MOD_ID); - - public static final RegistryObject> HOLLER = ENTITIES.register("holler", () -> EntityType.Builder.of(Holler::new, MobCategory.MONSTER).sized(0.4F, 0.8F).clientTrackingRange(8).updateInterval(2).build("holler")); - public static final RegistryObject> DIRT_MOUND = ENTITIES.register("dirt_mound", () -> EntityType.Builder.of(DirtMound::new, MobCategory.MISC).sized(0.8F, 0.25F).build("dirt_mound")); - -} diff --git a/src/main/java/galena/doom_and_gloom/index/OItemTiers.java b/src/main/java/galena/doom_and_gloom/index/OItemTiers.java deleted file mode 100644 index 21244ae2..00000000 --- a/src/main/java/galena/doom_and_gloom/index/OItemTiers.java +++ /dev/null @@ -1,50 +0,0 @@ -package galena.doom_and_gloom.index; - -import java.util.function.Supplier; -import net.minecraft.world.item.Tier; -import net.minecraft.world.item.crafting.Ingredient; -import org.jetbrains.annotations.NotNull; - -public enum OItemTiers implements Tier { - LEAD(0, 150, 7.0F, 1.5F, 8, () -> Ingredient.of(OTags.Items.INGOTS_LEAD)); - - private final int level; - private final int durability; - private final float speed; - private final float damage; - private final int enchantmentValue; - private final Supplier repairIngredient; - - OItemTiers(int level, int durability, float speed, float damage, int enchantmentValue, Supplier repairIngredient) { - this.level = level; - this.durability = durability; - this.speed = speed; - this.damage = damage; - this.enchantmentValue = enchantmentValue; - this.repairIngredient = repairIngredient; - } - - public int getUses() { - return this.durability; - } - - public float getSpeed() { - return this.speed; - } - - public float getAttackDamageBonus() { - return this.damage; - } - - public int getLevel() { - return this.level; - } - - public int getEnchantmentValue() { - return this.enchantmentValue; - } - - public @NotNull Ingredient getRepairIngredient() { - return this.repairIngredient.get(); - } -} diff --git a/src/main/java/galena/doom_and_gloom/index/OItems.java b/src/main/java/galena/doom_and_gloom/index/OItems.java deleted file mode 100644 index 72a32711..00000000 --- a/src/main/java/galena/doom_and_gloom/index/OItems.java +++ /dev/null @@ -1,26 +0,0 @@ -package galena.doom_and_gloom.index; - -import com.teamabnormals.blueprint.common.item.BlueprintRecordItem; -import com.teamabnormals.blueprint.core.util.registry.ItemSubRegistryHelper; -import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.content.item.BushHammerItem; -import galena.doom_and_gloom.content.item.HammerAndChiselItem; -import net.minecraft.world.item.*; -import net.minecraftforge.common.ForgeSpawnEggItem; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.registries.RegistryObject; - -@Mod.EventBusSubscriber(modid = DoomAndGloom.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) -public class OItems { - public static final ItemSubRegistryHelper HELPER = DoomAndGloom.REGISTRY_HELPER.getItemSubHelper(); - - // Discs - public static final RegistryObject MUSIC_DISC_AFTERLIFE = HELPER.createItem("music_disc_afterlife", () -> new BlueprintRecordItem(13, OSoundEvents.MUSIC_DISC_AFTERLIFE, (new Item.Properties().stacksTo(1).rarity(Rarity.RARE)), 155)); - - // Crafting Materials - public static final RegistryObject BUSH_HAMMER = HELPER.createItem("bush_hammer", () -> new BushHammerItem(OItemTiers.LEAD, 2.5F, -2.8F, (new Item.Properties()).stacksTo(1))); - public static final RegistryObject HAMMER_AND_CHISEL = HELPER.createItem("hammer_and_chisel", () -> new HammerAndChiselItem(OBlocks.STONE_TABLET.get())); - - // Misc - public static final RegistryObject HOLLER_SPAWN_EGG = HELPER.createItem("holler_spawn_egg", () -> new ForgeSpawnEggItem(OEntityTypes.HOLLER, 0x84EED2, 0x24352F, new Item.Properties())); -} \ No newline at end of file diff --git a/src/main/java/galena/doom_and_gloom/index/OParticleTypes.java b/src/main/java/galena/doom_and_gloom/index/OParticleTypes.java deleted file mode 100644 index 448b74cf..00000000 --- a/src/main/java/galena/doom_and_gloom/index/OParticleTypes.java +++ /dev/null @@ -1,39 +0,0 @@ -package galena.doom_and_gloom.index; - -import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.client.particle.BoneFragmentParticle; -import galena.doom_and_gloom.client.particle.FogParticle; -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.ParticleEngine; -import net.minecraft.client.particle.SoulParticle; -import net.minecraft.core.particles.ParticleType; -import net.minecraft.core.particles.SimpleParticleType; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.RegisterParticleProvidersEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; - -@Mod.EventBusSubscriber(modid = DoomAndGloom.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) -public class OParticleTypes { - - public static final DeferredRegister> PARTICLES = DeferredRegister.create(ForgeRegistries.PARTICLE_TYPES, DoomAndGloom.MOD_ID); - - public static final RegistryObject BONE_FRAGMENT = PARTICLES.register( "bone_fragment", () -> new SimpleParticleType(true)); - public static final RegistryObject FOG = PARTICLES.register( "fog", () -> new SimpleParticleType(true)); - public static final RegistryObject FOG_WATER = PARTICLES.register( "fog_water", () -> new SimpleParticleType(true)); - public static final RegistryObject HOLLERING_SOUL = PARTICLES.register( "hollering_soul", () -> new SimpleParticleType(true)); - - - @SubscribeEvent - public static void registerParticleFactories(RegisterParticleProvidersEvent event) { - ParticleEngine engine = Minecraft.getInstance().particleEngine; - - engine.register(BONE_FRAGMENT.get(), BoneFragmentParticle.Provider::new); - engine.register(FOG.get(), FogParticle.provider(200)); - engine.register(FOG_WATER.get(), FogParticle.provider(100)); - engine.register(HOLLERING_SOUL.get(), SoulParticle.Provider::new); - } -} diff --git a/src/main/java/galena/doom_and_gloom/index/OPoi.java b/src/main/java/galena/doom_and_gloom/index/OPoi.java deleted file mode 100644 index edfe30a8..00000000 --- a/src/main/java/galena/doom_and_gloom/index/OPoi.java +++ /dev/null @@ -1,21 +0,0 @@ -package galena.doom_and_gloom.index; - -import galena.doom_and_gloom.DoomAndGloom; -import java.util.HashSet; -import java.util.function.Supplier; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.world.entity.ai.village.poi.PoiType; -import net.minecraftforge.registries.DeferredRegister; - -public class OPoi { - public static final DeferredRegister POI_TYPES = DeferredRegister.create(Registries.POINT_OF_INTEREST_TYPE, DoomAndGloom.MOD_ID); - - public static final ResourceKey GRAVETENDER_POI_KEY = ResourceKey.create(Registries.POINT_OF_INTEREST_TYPE, - DoomAndGloom.modLoc("gravetender")); - - public static final Supplier GRAVETENDER_POI = POI_TYPES.register("gravetender", - () -> new PoiType(new HashSet<>(OBlocks.SEPULCHER.get().getStateDefinition().getPossibleStates()), - 1, 1)); - -} diff --git a/src/main/java/galena/doom_and_gloom/index/OSoundEvents.java b/src/main/java/galena/doom_and_gloom/index/OSoundEvents.java deleted file mode 100644 index db14c32b..00000000 --- a/src/main/java/galena/doom_and_gloom/index/OSoundEvents.java +++ /dev/null @@ -1,44 +0,0 @@ -package galena.doom_and_gloom.index; - -import com.teamabnormals.blueprint.core.util.registry.SoundSubRegistryHelper; -import galena.doom_and_gloom.DoomAndGloom; -import net.minecraft.sounds.SoundEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.registries.RegistryObject; - -@Mod.EventBusSubscriber(modid = DoomAndGloom.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) -public class OSoundEvents { - public static SoundSubRegistryHelper HELPER = DoomAndGloom.REGISTRY_HELPER.getSoundSubHelper(); - - public static final RegistryObject MUSIC_DISC_AFTERLIFE = HELPER.createSoundEvent("music.disc.afterlife"); - - public static final RegistryObject BONE_PILE_BREAK = HELPER.createSoundEvent("block.bone_pile.break"); - public static final RegistryObject BONE_PILE_STEP = HELPER.createSoundEvent("block.bone_pile.step"); - public static final RegistryObject BONE_PILE_FALL = HELPER.createSoundEvent("block.bone_pile.fall"); - public static final RegistryObject BONE_PILE_HIT = HELPER.createSoundEvent("block.bone_pile.hit"); - public static final RegistryObject BONE_PILE_PLACE = HELPER.createSoundEvent("block.bone_pile.place"); - - public static final RegistryObject SEPULCHER_BREAK = HELPER.createSoundEvent("block.sepulcher.break"); - public static final RegistryObject SEPULCHER_STEP = HELPER.createSoundEvent("block.sepulcher.step"); - public static final RegistryObject SEPULCHER_FALL = HELPER.createSoundEvent("block.sepulcher.fall"); - public static final RegistryObject SEPULCHER_HIT = HELPER.createSoundEvent("block.sepulcher.hit"); - public static final RegistryObject SEPULCHER_PLACE = HELPER.createSoundEvent("block.sepulcher.place"); - public static final RegistryObject SEPULCHER_CORPSE_STUFFED = HELPER.createSoundEvent("block.sepulcher.corpse_stuffed"); - public static final RegistryObject SEPULCHER_FILLED = HELPER.createSoundEvent("block.sepulcher.filled"); - public static final RegistryObject SEPULCHER_ROTTING = HELPER.createSoundEvent("block.sepulcher.rotting"); - public static final RegistryObject SEPULCHER_SEALING = HELPER.createSoundEvent("block.sepulcher.sealing"); - public static final RegistryObject SEPULCHER_UNSEALING = HELPER.createSoundEvent("block.sepulcher.unsealing"); - public static final RegistryObject SEPULCHER_HARVEST = HELPER.createSoundEvent("block.sepulcher.harvest"); - - //TODO: add these 2 - public static final RegistryObject GRAVETENDER_WORK = HELPER.createSoundEvent("entity.villager.work_gravetender"); - - public static final RegistryObject STONE_TABLET_ENGRAVE = HELPER.createSoundEvent("block.stone_tablet.engrave"); - - public static final RegistryObject HOLLER_DEATH = HELPER.createSoundEvent("entity.holler_death"); - public static final RegistryObject HOLLER_HURTS = HELPER.createSoundEvent("entity.holler_hurts"); - public static final RegistryObject HOLLER_HOLLERS = HELPER.createSoundEvent("entity.holler_hollers"); - public static final RegistryObject HOLLER_SHRIEKS = HELPER.createSoundEvent("entity.holler_shrieks"); - - public static final RegistryObject FOG_AMBIENCE = HELPER.createSoundEvent("ambient.fog"); -} diff --git a/src/main/java/galena/doom_and_gloom/index/OSoundTypes.java b/src/main/java/galena/doom_and_gloom/index/OSoundTypes.java deleted file mode 100644 index 72280eb7..00000000 --- a/src/main/java/galena/doom_and_gloom/index/OSoundTypes.java +++ /dev/null @@ -1,9 +0,0 @@ -package galena.doom_and_gloom.index; - -import net.minecraft.world.level.block.SoundType; -import net.minecraftforge.common.util.ForgeSoundType; - -public class OSoundTypes { - public static final SoundType BONE_PILE = new ForgeSoundType(1.5F, 1.0F, OSoundEvents.BONE_PILE_BREAK, OSoundEvents.BONE_PILE_STEP, OSoundEvents.BONE_PILE_PLACE, OSoundEvents.BONE_PILE_HIT, OSoundEvents.BONE_PILE_FALL); - public static final SoundType SEPULCHER = new ForgeSoundType(1.0F, 1.0F, OSoundEvents.SEPULCHER_BREAK, OSoundEvents.SEPULCHER_STEP, OSoundEvents.SEPULCHER_PLACE, OSoundEvents.SEPULCHER_HIT, OSoundEvents.SEPULCHER_FALL); -} diff --git a/src/main/java/galena/doom_and_gloom/index/OVillagerTrades.java b/src/main/java/galena/doom_and_gloom/index/OVillagerTrades.java deleted file mode 100644 index ef764485..00000000 --- a/src/main/java/galena/doom_and_gloom/index/OVillagerTrades.java +++ /dev/null @@ -1,94 +0,0 @@ -package galena.doom_and_gloom.index; - -import galena.doom_and_gloom.DoomAndGloom; -import java.util.List; -import net.minecraft.core.registries.Registries; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.tags.ItemTags; -import net.minecraft.tags.TagKey; -import net.minecraft.util.RandomSource; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.npc.VillagerProfession; -import net.minecraft.world.entity.npc.VillagerTrades; -import net.minecraft.world.entity.npc.VillagerTrades.EmeraldForItems; -import net.minecraft.world.entity.npc.VillagerTrades.EnchantedItemForEmeralds; -import net.minecraft.world.entity.npc.VillagerTrades.ItemsForEmeralds; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.trading.MerchantOffer; -import net.minecraftforge.common.BasicItemListing; -import net.minecraftforge.event.village.VillagerTradesEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import org.jetbrains.annotations.Nullable; - - -@Mod.EventBusSubscriber(modid = DoomAndGloom.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) -public class OVillagerTrades { - - - @SubscribeEvent - public static void tadeEvent(VillagerTradesEvent event) { - VillagerProfession type = event.getType(); - if (type == OVillagerTypes.GRAVETENDER.get()) { - addGravetenderTrades(event); - } - } - - public record TagForEmeralds(TagKey tag, int cost, int emeralds, int maxUses, int xp, float priceMultiplier) implements VillagerTrades.ItemListing { - - @Override - public @Nullable MerchantOffer getOffer(Entity entity, RandomSource random) { - if(!(entity.level() instanceof ServerLevel level)) return null; - var tagHolder = level.registryAccess().registryOrThrow(Registries.ITEM).getOrCreateTag(tag); - return tagHolder.getRandomElement(random).map(item -> - new MerchantOffer(new ItemStack(Items.EMERALD, cost), new ItemStack(item), maxUses, xp, priceMultiplier) - ).orElse(null); - } - } - - public record EmeraldForTag(TagKey tag, int emeralds, int count, int maxUses, int xp, float priceMultiplier) implements VillagerTrades.ItemListing { - - @Override - public @Nullable MerchantOffer getOffer(Entity entity, RandomSource random) { - if(!(entity.level() instanceof ServerLevel level)) return null; - var tagHolder = level.registryAccess().registryOrThrow(Registries.ITEM).getOrCreateTag(tag); - return tagHolder.getRandomElement(random).map(item -> - new MerchantOffer(new ItemStack(item), new ItemStack(Items.EMERALD, emeralds), maxUses, xp, priceMultiplier) - ).orElse(null); - } - } - - private static void addGravetenderTrades(VillagerTradesEvent event) { - var trades = event.getTrades(); - - trades.put(1, List.of( - new ItemsForEmeralds(new ItemStack(Items.STONE_SHOVEL), 1, 1, 12, 1, 0.2F), - new ItemsForEmeralds(Items.ROSE_BUSH, 1, 1, 8, 2), - new BasicItemListing(new ItemStack(Items.POPPY, 8), new ItemStack(Items.EMERALD), 1, 12, 0.2F), - new BasicItemListing(new ItemStack(Items.CORNFLOWER, 8), new ItemStack(Items.EMERALD), 1, 12, 0.2F) - )); - - trades.put(2, List.of( - new ItemsForEmeralds(Items.GOLD_NUGGET, 1, 5, 8, 5), - new TagForEmeralds(OTags.Items.VIGIL_CANDLES, 2, 1, 12, 10, 2F), - new ItemsForEmeralds(Items.FLOWER_POT, 2, 1, 12, 5) - )); - - trades.put(3, List.of( - new EnchantedItemForEmeralds(Items.IRON_SHOVEL, 2, 3, 10, 0.2F), - new EmeraldForTag(ItemTags.CANDLES, 2, 6, 12, 2, 0.1F) - )); - - trades.put(4, List.of( - new EmeraldForItems(Items.LANTERN, 2, 8, 15), - new ItemsForEmeralds(new ItemStack(Items.WITHER_ROSE), 10, 2, 8, 20, 2F) - )); - - trades.put(5, List.of( - new EnchantedItemForEmeralds(Items.DIAMOND_SHOVEL, 13, 3, 30, 0.2F) - )); - } - -} diff --git a/src/main/java/galena/doom_and_gloom/index/OVillagerTypes.java b/src/main/java/galena/doom_and_gloom/index/OVillagerTypes.java deleted file mode 100644 index 546906dd..00000000 --- a/src/main/java/galena/doom_and_gloom/index/OVillagerTypes.java +++ /dev/null @@ -1,30 +0,0 @@ -package galena.doom_and_gloom.index; - -import com.google.common.collect.ImmutableSet; -import galena.doom_and_gloom.DoomAndGloom; -import java.util.function.Supplier; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.world.entity.ai.village.poi.PoiType; -import net.minecraft.world.entity.npc.VillagerProfession; -import net.minecraftforge.registries.DeferredRegister; - -public class OVillagerTypes { - - public static final DeferredRegister VILLAGER_PROFESSIONS = - DeferredRegister.create(Registries.VILLAGER_PROFESSION, DoomAndGloom.MOD_ID); - - public static final Supplier GRAVETENDER = - VILLAGER_PROFESSIONS.register("gravetender", - registerVillager("gravetender", OPoi.GRAVETENDER_POI_KEY, - OSoundEvents.GRAVETENDER_WORK)); - - private static Supplier registerVillager(String name, ResourceKey jobSite, - Supplier workSound) { - return () -> new VillagerProfession(name, - (holder) -> holder.is(jobSite), - (holder) -> holder.is(jobSite), - ImmutableSet.of(), ImmutableSet.of(), workSound.get()); - } -} diff --git a/src/main/java/galena/doom_and_gloom/network/DGNetwork.java b/src/main/java/galena/doom_and_gloom/network/DGNetwork.java deleted file mode 100644 index dafb2ab7..00000000 --- a/src/main/java/galena/doom_and_gloom/network/DGNetwork.java +++ /dev/null @@ -1,28 +0,0 @@ -package galena.doom_and_gloom.network; - -import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.network.packet.EngraveStoneTabletPacket; -import galena.doom_and_gloom.network.packet.SepulcherConsumesDeathPacket; -import galena.doom_and_gloom.network.packet.SepulcherRotsPacket; -import galena.doom_and_gloom.network.packet.StoneTabletUpdatePacket; -import net.minecraftforge.network.NetworkRegistry; -import net.minecraftforge.network.simple.SimpleChannel; - -public class DGNetwork { - private static final String PROTOCOL_VERSION = "1"; - public static final SimpleChannel CHANNEL = NetworkRegistry.newSimpleChannel( - DoomAndGloom.modLoc("main"), - () -> PROTOCOL_VERSION, - PROTOCOL_VERSION::equals, - PROTOCOL_VERSION::equals - ); - - public static void register() { - int id = 0; - - CHANNEL.registerMessage(id++, SepulcherConsumesDeathPacket.class, SepulcherConsumesDeathPacket::write, SepulcherConsumesDeathPacket::from, SepulcherConsumesDeathPacket::handle); - CHANNEL.registerMessage(id++, SepulcherRotsPacket.class, SepulcherRotsPacket::write, SepulcherRotsPacket::from, SepulcherRotsPacket::handle); - CHANNEL.registerMessage(id++, StoneTabletUpdatePacket.class, StoneTabletUpdatePacket::write, StoneTabletUpdatePacket::from, StoneTabletUpdatePacket::handle); - CHANNEL.registerMessage(id++, EngraveStoneTabletPacket.class, EngraveStoneTabletPacket::write, EngraveStoneTabletPacket::from, EngraveStoneTabletPacket::handle); - } -} \ No newline at end of file diff --git a/src/main/java/galena/doom_and_gloom/network/packet/EngraveStoneTabletPacket.java b/src/main/java/galena/doom_and_gloom/network/packet/EngraveStoneTabletPacket.java deleted file mode 100644 index 79313189..00000000 --- a/src/main/java/galena/doom_and_gloom/network/packet/EngraveStoneTabletPacket.java +++ /dev/null @@ -1,29 +0,0 @@ -package galena.doom_and_gloom.network.packet; - -import galena.doom_and_gloom.content.block.StoneTabletBlock; -import java.util.function.Supplier; -import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraftforge.network.NetworkEvent; - -public record EngraveStoneTabletPacket(BlockPos pos) { - - public void write(FriendlyByteBuf buffer) { - buffer.writeBlockPos(pos); - } - - public void handle(Supplier contextSupplier) { - var context = contextSupplier.get(); - context.enqueueWork(() -> { - StoneTabletBlock.openScreen(pos); - }); - - context.setPacketHandled(true); - } - - public static EngraveStoneTabletPacket from(FriendlyByteBuf buffer) { - var pos = buffer.readBlockPos(); - return new EngraveStoneTabletPacket(pos); - } - -} diff --git a/src/main/java/galena/doom_and_gloom/network/packet/SepulcherConsumesDeathPacket.java b/src/main/java/galena/doom_and_gloom/network/packet/SepulcherConsumesDeathPacket.java deleted file mode 100644 index 138b5b4c..00000000 --- a/src/main/java/galena/doom_and_gloom/network/packet/SepulcherConsumesDeathPacket.java +++ /dev/null @@ -1,29 +0,0 @@ -package galena.doom_and_gloom.network.packet; - -import galena.doom_and_gloom.content.block.SepulcherBlock; -import java.util.function.Supplier; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.world.phys.Vec3; -import net.minecraftforge.network.NetworkEvent; - -public record SepulcherConsumesDeathPacket(Vec3 at) { - - public void write(FriendlyByteBuf buffer) { - buffer.writeVector3f(at.toVector3f()); - } - - public void handle(Supplier contextSupplier) { - var context = contextSupplier.get(); - context.enqueueWork(() -> { - SepulcherBlock.spawnConsumeParticles(at); - }); - - context.setPacketHandled(true); - } - - public static SepulcherConsumesDeathPacket from(FriendlyByteBuf buffer) { - var at = new Vec3(buffer.readVector3f()); - return new SepulcherConsumesDeathPacket(at); - } - -} diff --git a/src/main/java/galena/doom_and_gloom/network/packet/SepulcherRotsPacket.java b/src/main/java/galena/doom_and_gloom/network/packet/SepulcherRotsPacket.java deleted file mode 100644 index c2d432b9..00000000 --- a/src/main/java/galena/doom_and_gloom/network/packet/SepulcherRotsPacket.java +++ /dev/null @@ -1,30 +0,0 @@ -package galena.doom_and_gloom.network.packet; - -import galena.doom_and_gloom.content.block.SepulcherBlock; -import java.awt.*; -import java.util.function.Supplier; -import net.minecraft.core.BlockPos; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraftforge.network.NetworkEvent; - -public record SepulcherRotsPacket(BlockPos at) { - - public void write(FriendlyByteBuf buffer) { - buffer.writeBlockPos(at); - } - - public void handle(Supplier contextSupplier) { - var context = contextSupplier.get(); - context.enqueueWork(() -> { - SepulcherBlock.spawnRottingParticles(at); - }); - - context.setPacketHandled(true); - } - - public static SepulcherRotsPacket from(FriendlyByteBuf buffer) { - var at = buffer.readBlockPos(); - return new SepulcherRotsPacket(at); - } - -} diff --git a/src/main/java/galena/doom_and_gloom/world/AddItemLootModifier.java b/src/main/java/galena/doom_and_gloom/world/AddItemLootModifier.java deleted file mode 100644 index 7ad99a6f..00000000 --- a/src/main/java/galena/doom_and_gloom/world/AddItemLootModifier.java +++ /dev/null @@ -1,40 +0,0 @@ -package galena.doom_and_gloom.world; - -import com.mojang.serialization.Codec; -import com.mojang.serialization.codecs.RecordCodecBuilder; -import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.storage.loot.LootContext; -import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; -import net.minecraftforge.common.loot.IGlobalLootModifier; -import net.minecraftforge.common.loot.LootModifier; -import org.jetbrains.annotations.NotNull; - -// TODO convert to bone pile only modifier? -// in 1.21 forge has a builtin add item one -public class AddItemLootModifier extends LootModifier { - - public static final Codec CODEC = RecordCodecBuilder.create(builder -> - codecStart(builder).and( - ItemStack.CODEC.fieldOf("item").forGetter((AddItemLootModifier it) -> it.stack) - ).apply(builder, AddItemLootModifier::new) - ); - - private final ItemStack stack; - - protected AddItemLootModifier(LootItemCondition[] conditions, ItemStack stack) { - super(conditions); - this.stack = stack; - } - - @Override - protected @NotNull ObjectArrayList doApply(ObjectArrayList generatedLoot, LootContext context) { - generatedLoot.add(stack); - return generatedLoot; - } - - @Override - public Codec codec() { - return CODEC; - } -} diff --git a/src/main/java/galena/doom_and_gloom/world/event/PlayerEvents.java b/src/main/java/galena/doom_and_gloom/world/event/PlayerEvents.java deleted file mode 100644 index 79d84e92..00000000 --- a/src/main/java/galena/doom_and_gloom/world/event/PlayerEvents.java +++ /dev/null @@ -1,21 +0,0 @@ -package galena.doom_and_gloom.world.event; - -import galena.doom_and_gloom.DoomAndGloom; -import galena.doom_and_gloom.content.entity.SepulcherBlockEntity; -import net.minecraft.world.entity.player.Player; -import net.minecraftforge.event.entity.living.LivingDropsEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -@Mod.EventBusSubscriber(modid = DoomAndGloom.MOD_ID) -public class PlayerEvents { - - @SubscribeEvent - public static void onLivingDrops(LivingDropsEvent event) { - if (event.getEntity() instanceof Player) return; - if (SepulcherBlockEntity.wasConsumerBySepulcher(event.getEntity())) { - event.setCanceled(true); - } - } - -} diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg deleted file mode 100644 index 42011d8a..00000000 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ /dev/null @@ -1,6 +0,0 @@ -public net.minecraft.server.network.ServerGamePacketListenerImpl m_243132_(Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; # filterTextPacket -public net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool f_210560_ # templates -public-f net.minecraft.world.level.levelgen.structure.pools.StructureTemplatePool f_210559_ # rawTemplates -public net.minecraft.world.entity.npc.VillagerTrades$EnchantedItemForEmeralds -public net.minecraft.world.entity.npc.VillagerTrades$ItemsForEmeralds -public net.minecraft.world.entity.npc.VillagerTrades$EmeraldForItems \ No newline at end of file diff --git a/src/main/resources/data/doom_and_gloom/loot_modifiers/bone_piles_in_desert_temples.json b/src/main/resources/data/doom_and_gloom/loot_modifiers/bone_piles_in_desert_temples.json deleted file mode 100644 index eee60646..00000000 --- a/src/main/resources/data/doom_and_gloom/loot_modifiers/bone_piles_in_desert_temples.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "doom_and_gloom:add_item", - "conditions": [ - { - "condition": "forge:loot_table_id", - "loot_table_id": "minecraft:chests/desert_pyramid" - }, - { - "condition": "minecraft:random_chance", - "chance": 0.4 - } - ], - "item": { - "id": "doom_and_gloom:bone_pile", - "Count": 2 - } -} diff --git a/src/main/resources/data/doom_and_gloom/loot_tables/stone_tablet.json b/src/main/resources/data/doom_and_gloom/loot_tables/stone_tablet.json deleted file mode 100644 index 779cd17f..00000000 --- a/src/main/resources/data/doom_and_gloom/loot_tables/stone_tablet.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:copy_nbt", - "source": "block_entity", - "ops": [ - { - "source": "Pixels", - "target": "BlockEntityTag.text", - "op": "replace" - } - ] - }, - { - "block": "doom_and_gloom:stone_tablet", - "function": "minecraft:copy_state", - "properties": [ - "type" - ] - } - ], - "name": "doom_and_gloom:stone_tablet" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} diff --git a/src/main/resources/data/doom_and_gloom/recipes/farmersdelight/cutting/cracked_stone_tablet.json b/src/main/resources/data/doom_and_gloom/recipes/farmersdelight/cutting/cracked_stone_tablet.json deleted file mode 100644 index 16b7cee7..00000000 --- a/src/main/resources/data/doom_and_gloom/recipes/farmersdelight/cutting/cracked_stone_tablet.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "farmersdelight:cutting", - "ingredients": [ - { - "item": "doom_and_gloom:stone_tablet" - } - ], - "result": [ - { - "item": "doom_and_gloom:cracked_stone_tablet" - } - ], - "tool": { - "type": "farmersdelight:tool_action", - "action": "pickaxe_dig" - } -} diff --git a/src/main/resources/data/doom_and_gloom/recipes/jeed/fog.json b/src/main/resources/data/doom_and_gloom/recipes/jeed/fog.json deleted file mode 100644 index c8fc5543..00000000 --- a/src/main/resources/data/doom_and_gloom/recipes/jeed/fog.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "jeed:effect_provider", - "effect": { - "id": "doom_and_gloom:fog" - }, - "providers": [ - { - "item": "doom_and_gloom:holler_spawn_egg" - } - ] -} diff --git a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json deleted file mode 100644 index a96445db..00000000 --- a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "entries": [ - "doom_and_gloom:bone_piles_in_desert_temples" - ] -} diff --git a/src/main/resources/resourcepacks/oreganized_compat/assets/create/textures/item/crushed_raw_lead.png b/src/main/resources/resourcepacks/oreganized_compat/assets/create/textures/item/crushed_raw_lead.png deleted file mode 100644 index 5fda8287..00000000 Binary files a/src/main/resources/resourcepacks/oreganized_compat/assets/create/textures/item/crushed_raw_lead.png and /dev/null differ diff --git a/src/main/resources/resourcepacks/oreganized_compat/assets/create/textures/item/crushed_raw_silver.png b/src/main/resources/resourcepacks/oreganized_compat/assets/create/textures/item/crushed_raw_silver.png deleted file mode 100644 index 51c8f09d..00000000 Binary files a/src/main/resources/resourcepacks/oreganized_compat/assets/create/textures/item/crushed_raw_silver.png and /dev/null differ diff --git a/src/main/resources/resourcepacks/oreganized_compat/pack.mcmeta b/src/main/resources/resourcepacks/oreganized_compat/pack.mcmeta deleted file mode 100644 index eeb39dc6..00000000 --- a/src/main/resources/resourcepacks/oreganized_compat/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 9, - "description": "Textures for other mods to fit Oreganized's color palletes for its materials" - } -} \ No newline at end of file diff --git a/src/main/resources/resourcepacks/oreganized_compat/pack.png b/src/main/resources/resourcepacks/oreganized_compat/pack.png deleted file mode 100644 index 316480fb..00000000 Binary files a/src/main/resources/resourcepacks/oreganized_compat/pack.png and /dev/null differ