diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 6b70d949..00000000 --- a/build.gradle +++ /dev/null @@ -1,209 +0,0 @@ -import groovy.json.JsonOutput -import org.gradle.api.publish.maven.MavenPublication -import org.gradle.api.tasks.compile.JavaCompile - -plugins { - id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "1.1-SNAPSHOT" apply false - - id "com.modrinth.minotaur" version "2.+" - id "com.matthewprenger.cursegradle" version "1.4.0" // literally never gonna update -} - -architectury { - minecraft = rootProject.minecraft_version -} - -tasks.register("generateDiscordEmbed") { - doFirst { - var env = System.getenv() - var changelogFile = rootProject.file("changelog.txt") - - var fields = [] - - if (changelogFile.exists()) { - fields.add([ - name : "Changelog", - value: changelogFile.text - ]) - } - - fields.addAll([ - [ - name : "Minecraft Version", - value : minecraft_version, - inline: true - ], - [ - name : "Mod Version", - value : mod_version, - inline: true - ], - [ - name : "Download", - value : "<:modrinth:978684543034871878> [Modrinth](" + - env.MODRINTH_PROJECT_URL + - ")\n<:curseforge:978684543026462790> [Curseforge](" + - env.CURSE_PROJECT_URL + ")", - inline: true - ] - ]) - - var json = JsonOutput.toJson([ - content : null, - embeds : [[ - title : archives_base_name, - color : Integer.parseInt(env.EMBED_COLOR, 16), - fields : fields, - thumbnail: [url: env.WEBHOOK_THUMBNAIL] - ]], - username : env.WEBHOOK_USERNAME, - avatar_url : env.WEBHOOK_AVATAR, - attatchments: [] - ]) - - new File(projectDir, "embed.json").write(json) - } -} - -allprojects { - apply plugin: "java" - apply plugin: "architectury-plugin" - - archivesBaseName = rootProject.archives_base_name - version = rootProject.mod_version - group = rootProject.maven_group - - repositories { - maven { - url "https://cursemaven.com" - content { - includeGroup "curse.maven" - } - } - maven { url = "https://maven.resourcefulbees.com/repository/maven-public/" } - } - - tasks.withType(JavaCompile).tap { - configureEach { - options.encoding = "UTF-8" - options.release = 17 - } - } - - java { - withSourcesJar() - } -} - -subprojects { - apply plugin: "dev.architectury.loom" - apply plugin: "com.modrinth.minotaur" - apply plugin: "com.matthewprenger.cursegradle" - apply plugin: "maven-publish" - - loom { - silentMojangMappingsLicense() - } - - dependencies { - minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" - mappings loom.layered() { - officialMojangMappings() -// parchment("org.parchmentmc.data:parchment-$rootProject.minecraft_version:$rootProject.parchment_version@zip") - } - } - - var env = System.getenv() - var modLoader = name - - var changelogFile = rootProject.file("changelog.txt") - var changelogText = changelogFile.exists() ? changelogFile.text : "" - - if (env.MODRINTH_TOKEN) { - modrinth { - projectId = modrinth_id - uploadFile = tasks.remapJar - gameVersions = [minecraft_version] - loaders = [modLoader] - changelog = changelogText - - if (modLoader == "fabric") { - dependencies { - required.project "fabric-api" - required.project "resourceful-lib" - } - } else { - dependencies { - required.project "resourceful-lib" - } - } - } - } - - if (env.CURSE_TOKEN) { - curseforge { - apiKey = env.CURSE_TOKEN - project { - id = curse_id - changelog = changelogText - releaseType = 'release' - addGameVersion minecraft_version - addGameVersion modLoader.capitalize() - - mainArtifact(tasks.remapJar) - - if (modLoader == "fabric") { - relations { - requiredDependency "fabric-api" - requiredDependency "resourceful-lib" - } - } else { - relations { - requiredDependency "resourceful-lib" - } - } - } - } - } - - publishing { - publications { - mavenJava(MavenPublication) { - artifact remapJar - artifact(sourcesJar) { - builtBy remapSourcesJar - } - - artifactId = "$rootProject.mod_id-$modLoader-$rootProject.minecraft_version" - - pom { - name = github_name - description = '' - url = "https://github.com/terrarium-earth/$github_name" - - scm { - connection = "git:https://github.com/terrarium-earth/${github_name}.git" - developerConnection = "git:https://github.com/terrarium-earth/${github_name}.git" - url = "https://github.com/terrarium-earth/$github_name" - } - - licenses { - license { - name = 'https://gist.github.com/CodexAdrian/4bb2a1868bb2d2a91ca74ea40424e69d' - } - } - } - } - } - repositories { - maven { - url = "https://maven.resourcefulbees.com/repository/terrarium/" - credentials { - username env.MAVEN_USER - password env.MAVEN_PASS - } - } - } - } -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..5cadca93 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,152 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import dev.architectury.plugin.ArchitectPluginExtension +import groovy.json.StringEscapeUtils +import net.fabricmc.loom.api.LoomGradleExtensionAPI +import net.fabricmc.loom.task.RemapJarTask + +plugins { + java + id("maven-publish") + id("com.teamresourceful.resourcefulgradle") version "0.0.+" + id("dev.architectury.loom") version "1.2-SNAPSHOT" apply false + id("architectury-plugin") version "3.4-SNAPSHOT" + id("com.github.johnrengelman.shadow") version "7.1.2" apply false +} + +architectury { + val minecraftVersion: String by project + minecraft = minecraftVersion +} + +subprojects { + apply(plugin = "maven-publish") + apply(plugin = "dev.architectury.loom") + apply(plugin = "architectury-plugin") + apply(plugin = "com.github.johnrengelman.shadow") + + val minecraftVersion: String by project + val modLoader = project.name + val modId = rootProject.name + val isCommon = modLoader == rootProject.projects.common.name + + base { + archivesName.set("$modId-$modLoader-$minecraftVersion") + } + + configure { + silentMojangMappingsLicense() + } + + repositories { + maven(url = "https://maven.architectury.dev/") + maven(url = "https://maven.minecraftforge.net/") + maven(url = "https://maven.resourcefulbees.com/repository/maven-public/") + } + + dependencies { + val resourcefulLibVersion: String by project + + "minecraft"("::$minecraftVersion") + + @Suppress("UnstableApiUsage") + "mappings"(project.the().layered { + val parchmentVersion: String by project + + officialMojangMappings() + + parchment(create(group = "org.parchmentmc.data", name = "parchment-$minecraftVersion", version = parchmentVersion)) + }) + + compileOnly(group = "com.teamresourceful", name = "yabn", version = "1.0.3") + "modApi"(group = "com.teamresourceful.resourcefullib", name = "resourcefullib-$modLoader-$minecraftVersion", version = resourcefulLibVersion) + } + + java { + withSourcesJar() + } + + tasks.jar { + archiveClassifier.set("dev") + } + + tasks.named("remapJar") { + archiveClassifier.set(null as String?) + } + + if (!isCommon) { + configure { + platformSetupLoomIde() + } + + val shadowCommon by configurations.creating { + isCanBeConsumed = false + isCanBeResolved = true + } + + tasks { + "shadowJar"(ShadowJar::class) { + archiveClassifier.set("dev-shadow") + configurations = listOf(shadowCommon) + } + + "remapJar"(RemapJarTask::class) { + dependsOn("shadowJar") + inputFile.set(named("shadowJar").flatMap { it.archiveFile }) + } + } + } else { + sourceSets.main.get().resources.srcDir("src/main/generated/resources") + } + + publishing { + publications { + create("maven") { + artifactId = "$modId-$modLoader-$minecraftVersion" + from(components["java"]) + + pom { + name.set("Handcrafted $modLoader") + url.set("https://github.com/terrarium-earth/$modId") + + scm { + connection.set("git:https://github.com/terrarium-earth/$modId.git") + developerConnection.set("git:https://github.com/terrarium-earth/$modId.git") + url.set("https://github.com/terrarium-earth/$modId") + } + + licenses { + license { + name.set("MIT") + } + } + } + } + } + repositories { + maven { + setUrl("https://maven.resourcefulbees.com/repository/terrarium/") + credentials { + username = System.getenv("MAVEN_USER") + password = System.getenv("MAVEN_PASS") + } + } + } + } +} + +resourcefulGradle { + templates { + register("embed") { + val minecraftVersion: String by project + val version: String by project + val changelog: String = file("changelog.md").readText(Charsets.UTF_8) + + source.set(file("templates/embed.json.template")) + injectedValues.set(mapOf( + "minecraft" to minecraftVersion, + "version" to version, + "changelog" to StringEscapeUtils.escapeJava(changelog), + )) + } + } +} \ No newline at end of file diff --git a/changelog.md b/changelog.md new file mode 100644 index 00000000..e69de29b diff --git a/changelog.txt b/changelog.txt deleted file mode 100644 index d291411e..00000000 --- a/changelog.txt +++ /dev/null @@ -1,2 +0,0 @@ -- Fix Cherry and Bamboo boards not being obtainable -- Add Recipes for the chery and bamboo stuff \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle deleted file mode 100644 index 06bd31e0..00000000 --- a/common/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -architectury { - common(rootProject.enabled_platforms.split(",")) -} - -dependencies { - modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version" - -// modCompileOnly "mezz.jei:jei-$rootProject.minecraft_version-common-api:$rootProject.jei_version" -// modRuntimeOnly "mezz.jei:jei-$rootProject.minecraft_version-common:$rootProject.jei_version" - modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:$rootProject.rei_version" - modCompileOnly "me.shedaniel:RoughlyEnoughItems-default-plugin:$rootProject.rei_version" - - modApi "com.teamresourceful.resourcefullib:resourcefullib-common-$rootProject.minecraft_version:$rootProject.resourcefullib_version" -} - -processResources { - inputs.property "version", rootProject.version - inputs.property "github_name", rootProject.github_name - inputs.property "resourcefullib_version", rootProject.resourcefullib_version -} \ No newline at end of file diff --git a/common/build.gradle.kts b/common/build.gradle.kts new file mode 100644 index 00000000..30b130b3 --- /dev/null +++ b/common/build.gradle.kts @@ -0,0 +1,8 @@ +architectury { + val enabledPlatforms: String by rootProject + common(enabledPlatforms.split(",")) +} + +dependencies { + modCompileOnly(group = "tech.thatgravyboat", name = "commonats", version = "1.0") +} diff --git a/forge/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/common/src/main/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d similarity index 99% rename from forge/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d rename to common/src/main/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index a2dca680..4894dcb4 100644 --- a/forge/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/common/src/main/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.20 2023-06-10T14:49:23.02372 Loot Tables +// 1.20.1 2023-07-09T22:49:31.44482 Loot Tables 7157ae2c0301789bf203e3e3977b19532045fcb5 data/handcrafted/loot_tables/blocks/acacia_bench.json 85930fd231a79fede542ea32416b227dfd007fbc data/handcrafted/loot_tables/blocks/acacia_chair.json 064777c5162406e4c752a94aae29bde36b1c2e2b data/handcrafted/loot_tables/blocks/acacia_corner_trim.json diff --git a/forge/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/common/src/main/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e similarity index 99% rename from forge/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e rename to common/src/main/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 0fcf782c..59c82f94 100644 --- a/forge/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/common/src/main/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20 2023-06-12T04:12:28.129552 Recipes +// 1.20.1 2023-07-09T22:49:31.447869 Recipes f0a7276f444535cc6a04376af54fa538eb57d3df data/handcrafted/advancements/recipes/misc/acacia_bench.json 1c34ec3dd79c8a6aa5fee2b489de016c5184ed36 data/handcrafted/advancements/recipes/misc/acacia_chair.json ac2659dbb5cf1398e586780d9be99afe724cb215 data/handcrafted/advancements/recipes/misc/acacia_corner_trim.json diff --git a/forge/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/common/src/main/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 similarity index 58% rename from forge/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 rename to common/src/main/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index 5afd7361..ff081f64 100644 --- a/forge/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/common/src/main/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.20 2023-06-10T14:49:23.028009 Languages: en_us +// 1.20.1 2023-07-09T22:49:31.44949 Languages: en_us 211aa58b63da5db3fdab7ca72c5a439efd8e5fdb assets/handcrafted/lang/en_us.json diff --git a/forge/src/generated/resources/assets/handcrafted/lang/en_us.json b/common/src/main/generated/resources/assets/handcrafted/lang/en_us.json similarity index 100% rename from forge/src/generated/resources/assets/handcrafted/lang/en_us.json rename to common/src/main/generated/resources/assets/handcrafted/lang/en_us.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_chair.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_chair.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_couch.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_couch.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_counter.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_counter.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_cupboard.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_desk.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_desk.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_drawer.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_drawer.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_nightstand.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_shelf.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_shelf.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_side_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_side_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/andesite_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/andesite_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/andesite_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/andesite_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/andesite_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/andesite_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/andesite_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/andesite_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_chair.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_chair.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_couch.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_couch.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_counter.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_counter.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_cupboard.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_desk.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_desk.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_drawer.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_drawer.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_nightstand.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_shelf.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_shelf.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_side_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_side_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bear_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bear_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bear_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bear_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/berry_jam_jar.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/berry_jam_jar.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/berry_jam_jar.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/berry_jam_jar.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_chair.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_chair.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_couch.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_couch.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_counter.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_counter.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_cupboard.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_desk.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_desk.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_drawer.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_drawer.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_nightstand.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_shelf.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_shelf.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_side_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_side_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/birch_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/birch_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/black_cushion.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/black_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/black_cushion.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/black_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/black_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/black_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/black_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/black_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/black_sheet.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/black_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/black_sheet.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/black_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/black_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/black_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/black_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/black_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blackstone_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blackstone_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blackstone_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blackstone_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blackstone_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blackstone_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blackstone_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blackstone_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blaze_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blaze_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blaze_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blaze_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_bowl.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_bowl.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_bowl.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_bowl.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_crockery_combo.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_crockery_combo.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_crockery_combo.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_crockery_combo.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_cup.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_cup.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_cup.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_cup.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_cushion.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_cushion.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_glazed_medium_pot.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_glazed_medium_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_glazed_medium_pot.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_glazed_medium_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_glazed_thick_pot.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_glazed_thick_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_glazed_thick_pot.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_glazed_thick_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_glazed_thin_pot.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_glazed_thin_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_glazed_thin_pot.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_glazed_thin_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_glazed_wide_pot.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_glazed_wide_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_glazed_wide_pot.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_glazed_wide_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_plate.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_plate.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_plate.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_plate.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_sheet.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_sheet.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/blue_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/blue_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bricks_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bricks_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bricks_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bricks_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bricks_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bricks_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/bricks_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bricks_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/brown_cushion.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/brown_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/brown_cushion.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/brown_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/brown_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/brown_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/brown_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/brown_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/brown_sheet.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/brown_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/brown_sheet.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/brown_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/brown_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/brown_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/brown_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/brown_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/calcite_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/calcite_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/calcite_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/calcite_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/calcite_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/calcite_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/calcite_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/calcite_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_chair.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_chair.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_couch.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_couch.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_counter.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_counter.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_cupboard.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_desk.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_desk.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_drawer.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_drawer.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_nightstand.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_shelf.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_shelf.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_side_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_side_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cherry_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/creeper_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/creeper_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/creeper_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/creeper_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_chair.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_chair.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_couch.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_couch.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_counter.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_counter.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_cupboard.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_desk.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_desk.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_drawer.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_drawer.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_nightstand.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_shelf.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_shelf.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_side_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_side_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/crimson_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cyan_cushion.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cyan_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cyan_cushion.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cyan_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cyan_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cyan_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cyan_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cyan_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cyan_sheet.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cyan_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cyan_sheet.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cyan_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cyan_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cyan_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/cyan_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/cyan_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_chair.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_chair.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_couch.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_couch.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_counter.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_counter.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_cupboard.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_desk.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_desk.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_drawer.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_drawer.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_nightstand.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_shelf.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_shelf.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_side_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_side_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dark_oak_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/deepslate_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/deepslate_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/deepslate_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/deepslate_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/deepslate_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/deepslate_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/deepslate_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/deepslate_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/diorite_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/diorite_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/diorite_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/diorite_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/diorite_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/diorite_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/diorite_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/diorite_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dripstone_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dripstone_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dripstone_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dripstone_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dripstone_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dripstone_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/dripstone_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/dripstone_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/evoker_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/evoker_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/evoker_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/evoker_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/fancy_painting.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/fancy_painting.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/fancy_painting.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/fancy_painting.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/fox_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/fox_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/fox_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/fox_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/frozen_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/frozen_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/frozen_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/frozen_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/goat_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/goat_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/goat_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/goat_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/golden_medium_pot.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/golden_medium_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/golden_medium_pot.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/golden_medium_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/golden_thick_pot.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/golden_thick_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/golden_thick_pot.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/golden_thick_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/golden_thin_pot.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/golden_thin_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/golden_thin_pot.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/golden_thin_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/golden_wide_pot.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/golden_wide_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/golden_wide_pot.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/golden_wide_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/granite_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/granite_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/granite_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/granite_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/granite_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/granite_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/granite_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/granite_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/gray_cushion.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/gray_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/gray_cushion.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/gray_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/gray_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/gray_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/gray_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/gray_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/gray_sheet.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/gray_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/gray_sheet.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/gray_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/gray_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/gray_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/gray_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/gray_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/green_cushion.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/green_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/green_cushion.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/green_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/green_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/green_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/green_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/green_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/green_sheet.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/green_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/green_sheet.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/green_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/green_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/green_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/green_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/green_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/hammer.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/hammer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/hammer.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/hammer.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_chair.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_chair.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_couch.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_couch.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_counter.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_counter.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_cupboard.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_desk.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_desk.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_drawer.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_drawer.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_nightstand.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_shelf.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_shelf.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_side_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_side_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/jungle_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/kitchen_hood.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/kitchen_hood.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/kitchen_hood.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/kitchen_hood.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/kitchen_hood_pipe.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/kitchen_hood_pipe.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/kitchen_hood_pipe.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/kitchen_hood_pipe.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/light_blue_cushion.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/light_blue_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/light_blue_cushion.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/light_blue_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/light_blue_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/light_blue_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/light_blue_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/light_blue_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/light_blue_sheet.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/light_blue_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/light_blue_sheet.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/light_blue_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/light_blue_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/light_blue_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/light_blue_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/light_blue_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/light_gray_cushion.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/light_gray_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/light_gray_cushion.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/light_gray_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/light_gray_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/light_gray_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/light_gray_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/light_gray_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/light_gray_sheet.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/light_gray_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/light_gray_sheet.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/light_gray_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/light_gray_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/light_gray_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/light_gray_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/light_gray_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/lime_cushion.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/lime_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/lime_cushion.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/lime_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/lime_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/lime_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/lime_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/lime_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/lime_sheet.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/lime_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/lime_sheet.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/lime_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/lime_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/lime_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/lime_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/lime_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/magenta_cushion.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/magenta_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/magenta_cushion.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/magenta_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/magenta_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/magenta_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/magenta_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/magenta_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/magenta_sheet.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/magenta_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/magenta_sheet.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/magenta_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/magenta_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/magenta_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/magenta_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/magenta_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_chair.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_chair.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_couch.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_couch.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_counter.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_counter.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_cupboard.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_desk.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_desk.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_drawer.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_drawer.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_nightstand.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_shelf.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_shelf.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_side_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_side_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/mangrove_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_chair.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_chair.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_couch.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_couch.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_counter.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_counter.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_cupboard.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_desk.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_desk.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_drawer.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_drawer.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_nightstand.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_shelf.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_shelf.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_side_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_side_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oak_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oak_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/orange_cushion.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/orange_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/orange_cushion.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/orange_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/orange_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/orange_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/orange_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/orange_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/orange_sheet.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/orange_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/orange_sheet.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/orange_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/orange_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/orange_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/orange_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/orange_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oven.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oven.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/oven.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/oven.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/phantom_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/phantom_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/phantom_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/phantom_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/pillager_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/pillager_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/pillager_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/pillager_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/pink_cushion.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/pink_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/pink_cushion.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/pink_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/pink_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/pink_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/pink_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/pink_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/pink_sheet.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/pink_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/pink_sheet.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/pink_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/pink_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/pink_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/pink_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/pink_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/pufferfish_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/pufferfish_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/pufferfish_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/pufferfish_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/purple_cushion.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/purple_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/purple_cushion.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/purple_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/purple_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/purple_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/purple_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/purple_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/purple_sheet.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/purple_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/purple_sheet.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/purple_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/purple_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/purple_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/purple_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/purple_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/quartz_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/quartz_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/quartz_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/quartz_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/quartz_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/quartz_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/quartz_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/quartz_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/red_cushion.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/red_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/red_cushion.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/red_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/red_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/red_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/red_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/red_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/red_sheet.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/red_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/red_sheet.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/red_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/red_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/red_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/red_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/red_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/salmon_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/salmon_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/salmon_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/salmon_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/silverfish_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/silverfish_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/silverfish_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/silverfish_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/skeleton_horse_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/skeleton_horse_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/skeleton_horse_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/skeleton_horse_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/skeleton_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/skeleton_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/skeleton_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/skeleton_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spider_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spider_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spider_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spider_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_chair.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_chair.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_couch.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_couch.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_counter.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_counter.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_cupboard.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_desk.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_desk.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_drawer.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_drawer.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_nightstand.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_shelf.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_shelf.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_side_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_side_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/spruce_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/stackable_book.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/stackable_book.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/stackable_book.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/stackable_book.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/stone_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/stone_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/stone_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/stone_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/stone_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/stone_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/stone_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/stone_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_bowl.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_bowl.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_bowl.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_bowl.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_crockery_combo.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_crockery_combo.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_crockery_combo.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_crockery_combo.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_cup.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_cup.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_cup.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_cup.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_medium_pot.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_medium_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_medium_pot.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_medium_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_plate.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_plate.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_plate.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_plate.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_thick_pot.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_thick_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_thick_pot.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_thick_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_thin_pot.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_thin_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_thin_pot.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_thin_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_wide_pot.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_wide_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_wide_pot.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/terracotta_wide_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/tropical_fish_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/tropical_fish_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/tropical_fish_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/tropical_fish_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/vindicator_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/vindicator_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/vindicator_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/vindicator_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_chair.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_chair.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_couch.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_couch.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_counter.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_counter.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_cupboard.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_desk.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_desk.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_drawer.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_drawer.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_nightstand.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_shelf.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_shelf.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_side_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_side_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_table.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/warped_table.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/warped_table.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_bowl.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_bowl.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_bowl.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_bowl.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_crockery_combo.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_crockery_combo.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_crockery_combo.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_crockery_combo.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_cup.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_cup.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_cup.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_cup.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_cushion.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_cushion.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_glazed_medium_pot.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_glazed_medium_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_glazed_medium_pot.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_glazed_medium_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_glazed_thick_pot.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_glazed_thick_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_glazed_thick_pot.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_glazed_thick_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_glazed_thin_pot.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_glazed_thin_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_glazed_thin_pot.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_glazed_thin_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_glazed_wide_pot.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_glazed_wide_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_glazed_wide_pot.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_glazed_wide_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_plate.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_plate.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_plate.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_plate.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_sheet.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_sheet.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/white_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/white_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/witch_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/witch_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/witch_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/witch_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/wither_skeleton_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/wither_skeleton_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/wither_skeleton_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/wither_skeleton_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/wolf_trophy.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/wolf_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/wolf_trophy.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/wolf_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/wood_bowl.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/wood_bowl.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/wood_bowl.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/wood_bowl.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/wood_crockery_combo.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/wood_crockery_combo.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/wood_crockery_combo.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/wood_crockery_combo.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/wood_cup.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/wood_cup.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/wood_cup.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/wood_cup.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/wood_plate.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/wood_plate.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/wood_plate.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/wood_plate.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_bowl.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_bowl.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_bowl.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_bowl.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_crockery_combo.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_crockery_combo.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_crockery_combo.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_crockery_combo.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_cup.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_cup.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_cup.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_cup.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_cushion.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_cushion.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_plate.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_plate.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_plate.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_plate.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_sheet.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_sheet.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/advancements/recipes/misc/yellow_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_chair.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_chair.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_couch.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_couch.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_counter_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_counter_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_counter_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_counter_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_counter_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_counter_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_counter_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_counter_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_counter_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_counter_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_counter_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_counter_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_cupboard_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_cupboard_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_cupboard_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_cupboard_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_cupboard_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_cupboard_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_cupboard_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_cupboard_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_desk.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_desk.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_drawer_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_drawer_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_drawer_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_drawer_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_drawer_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_drawer_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_drawer_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_drawer_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_drawer_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_drawer_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_drawer_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_drawer_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_drawer_4.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_drawer_4.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_drawer_4.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_drawer_4.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_nightstand.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_shelf_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_shelf_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_shelf_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_shelf_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_side_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_side_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/acacia_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/acacia_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/andesite_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/andesite_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/andesite_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/andesite_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/andesite_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/andesite_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/andesite_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/andesite_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_chair.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_chair.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_couch.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_couch.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_counter_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_counter_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_counter_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_counter_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_counter_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_counter_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_counter_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_counter_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_counter_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_counter_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_counter_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_counter_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_cupboard_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_cupboard_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_cupboard_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_cupboard_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_cupboard_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_cupboard_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_cupboard_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_cupboard_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_desk.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_desk.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_drawer_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_drawer_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_drawer_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_drawer_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_drawer_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_drawer_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_drawer_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_drawer_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_drawer_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_drawer_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_drawer_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_drawer_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_drawer_4.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_drawer_4.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_drawer_4.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_drawer_4.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_nightstand.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_shelf_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_shelf_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_shelf_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_shelf_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_side_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_side_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bamboo_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bear_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bear_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bear_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bear_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/berry_jam_jar.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/berry_jam_jar.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/berry_jam_jar.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/berry_jam_jar.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_chair.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_chair.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_couch.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_couch.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_counter_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_counter_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_counter_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_counter_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_counter_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_counter_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_counter_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_counter_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_counter_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_counter_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_counter_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_counter_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_cupboard_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_cupboard_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_cupboard_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_cupboard_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_cupboard_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_cupboard_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_cupboard_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_cupboard_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_desk.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_desk.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_drawer_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_drawer_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_drawer_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_drawer_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_drawer_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_drawer_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_drawer_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_drawer_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_drawer_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_drawer_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_drawer_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_drawer_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_drawer_4.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_drawer_4.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_drawer_4.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_drawer_4.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_nightstand.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_shelf_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_shelf_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_shelf_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_shelf_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_side_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_side_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/birch_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/birch_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/black_cushion.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/black_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/black_cushion.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/black_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blackstone_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blackstone_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blackstone_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blackstone_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blackstone_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blackstone_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blackstone_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blackstone_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blaze_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blaze_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blaze_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blaze_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_bowl.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_bowl.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_bowl.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_bowl.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_crockery_combo.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_crockery_combo.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_crockery_combo.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_crockery_combo.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_cup.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_cup.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_cup.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_cup.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_cushion.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_cushion.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_glazed_medium_pot.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_glazed_medium_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_glazed_medium_pot.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_glazed_medium_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_glazed_thick_pot.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_glazed_thick_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_glazed_thick_pot.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_glazed_thick_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_glazed_thin_pot.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_glazed_thin_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_glazed_thin_pot.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_glazed_thin_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_glazed_wide_pot.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_glazed_wide_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_glazed_wide_pot.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_glazed_wide_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_plate.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_plate.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/blue_plate.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/blue_plate.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bricks_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bricks_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bricks_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bricks_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bricks_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bricks_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/bricks_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/bricks_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/brown_cushion.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/brown_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/brown_cushion.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/brown_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/calcite_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/calcite_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/calcite_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/calcite_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/calcite_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/calcite_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/calcite_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/calcite_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_chair.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_chair.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_couch.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_couch.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_counter_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_counter_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_counter_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_counter_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_counter_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_counter_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_counter_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_counter_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_counter_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_counter_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_counter_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_counter_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_cupboard_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_cupboard_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_cupboard_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_cupboard_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_cupboard_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_cupboard_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_cupboard_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_cupboard_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_desk.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_desk.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_drawer_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_drawer_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_drawer_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_drawer_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_drawer_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_drawer_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_drawer_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_drawer_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_drawer_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_drawer_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_drawer_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_drawer_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_drawer_4.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_drawer_4.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_drawer_4.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_drawer_4.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_nightstand.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_shelf_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_shelf_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_shelf_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_shelf_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_side_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_side_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cherry_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cherry_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/creeper_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/creeper_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/creeper_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/creeper_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_chair.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_chair.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_couch.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_couch.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_counter_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_counter_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_counter_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_counter_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_counter_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_counter_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_counter_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_counter_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_counter_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_counter_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_counter_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_counter_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_cupboard_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_cupboard_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_cupboard_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_cupboard_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_cupboard_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_cupboard_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_cupboard_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_cupboard_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_desk.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_desk.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_drawer_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_drawer_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_drawer_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_drawer_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_drawer_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_drawer_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_drawer_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_drawer_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_drawer_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_drawer_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_drawer_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_drawer_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_drawer_4.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_drawer_4.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_drawer_4.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_drawer_4.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_nightstand.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_shelf_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_shelf_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_shelf_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_shelf_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_side_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_side_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/crimson_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/crimson_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cyan_cushion.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cyan_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/cyan_cushion.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/cyan_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_chair.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_chair.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_couch.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_couch.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_counter_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_counter_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_counter_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_counter_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_counter_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_counter_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_counter_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_counter_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_counter_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_counter_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_counter_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_counter_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_cupboard_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_cupboard_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_cupboard_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_cupboard_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_cupboard_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_cupboard_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_cupboard_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_cupboard_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_desk.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_desk.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_drawer_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_drawer_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_drawer_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_drawer_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_drawer_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_drawer_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_drawer_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_drawer_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_drawer_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_drawer_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_drawer_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_drawer_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_drawer_4.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_drawer_4.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_drawer_4.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_drawer_4.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_nightstand.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_shelf_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_shelf_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_shelf_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_shelf_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_side_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_side_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dark_oak_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/deepslate_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/deepslate_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/deepslate_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/deepslate_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/deepslate_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/deepslate_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/deepslate_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/deepslate_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/diorite_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/diorite_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/diorite_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/diorite_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/diorite_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/diorite_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/diorite_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/diorite_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dripstone_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dripstone_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dripstone_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dripstone_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dripstone_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dripstone_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/dripstone_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/dripstone_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/evoker_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/evoker_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/evoker_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/evoker_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/fox_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/fox_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/fox_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/fox_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/frozen_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/frozen_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/frozen_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/frozen_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/goat_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/goat_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/goat_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/goat_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/golden_medium_pot.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/golden_medium_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/golden_medium_pot.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/golden_medium_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/golden_thick_pot.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/golden_thick_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/golden_thick_pot.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/golden_thick_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/golden_thin_pot.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/golden_thin_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/golden_thin_pot.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/golden_thin_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/golden_wide_pot.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/golden_wide_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/golden_wide_pot.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/golden_wide_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/granite_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/granite_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/granite_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/granite_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/granite_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/granite_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/granite_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/granite_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/gray_cushion.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/gray_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/gray_cushion.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/gray_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/green_cushion.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/green_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/green_cushion.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/green_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_chair.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_chair.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_couch.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_couch.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_counter_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_counter_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_counter_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_counter_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_counter_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_counter_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_counter_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_counter_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_counter_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_counter_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_counter_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_counter_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_cupboard_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_cupboard_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_cupboard_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_cupboard_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_cupboard_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_cupboard_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_cupboard_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_cupboard_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_desk.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_desk.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_drawer_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_drawer_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_drawer_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_drawer_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_drawer_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_drawer_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_drawer_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_drawer_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_drawer_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_drawer_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_drawer_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_drawer_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_drawer_4.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_drawer_4.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_drawer_4.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_drawer_4.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_nightstand.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_shelf_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_shelf_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_shelf_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_shelf_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_side_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_side_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/jungle_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/jungle_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/kitchen_hood.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/kitchen_hood.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/kitchen_hood.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/kitchen_hood.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/kitchen_hood_pipe.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/kitchen_hood_pipe.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/kitchen_hood_pipe.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/kitchen_hood_pipe.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/light_blue_cushion.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/light_blue_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/light_blue_cushion.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/light_blue_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/light_gray_cushion.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/light_gray_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/light_gray_cushion.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/light_gray_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/lime_cushion.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/lime_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/lime_cushion.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/lime_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/magenta_cushion.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/magenta_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/magenta_cushion.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/magenta_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_chair.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_chair.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_couch.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_couch.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_counter_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_counter_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_counter_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_counter_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_counter_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_counter_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_counter_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_counter_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_counter_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_counter_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_counter_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_counter_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_cupboard_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_cupboard_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_cupboard_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_cupboard_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_cupboard_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_cupboard_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_cupboard_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_cupboard_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_desk.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_desk.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_drawer_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_drawer_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_drawer_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_drawer_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_drawer_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_drawer_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_drawer_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_drawer_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_drawer_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_drawer_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_drawer_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_drawer_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_drawer_4.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_drawer_4.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_drawer_4.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_drawer_4.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_nightstand.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_shelf_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_shelf_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_shelf_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_shelf_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_side_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_side_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/mangrove_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_chair.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_chair.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_couch.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_couch.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_counter_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_counter_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_counter_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_counter_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_counter_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_counter_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_counter_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_counter_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_counter_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_counter_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_counter_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_counter_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_cupboard_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_cupboard_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_cupboard_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_cupboard_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_cupboard_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_cupboard_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_cupboard_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_cupboard_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_desk.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_desk.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_drawer_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_drawer_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_drawer_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_drawer_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_drawer_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_drawer_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_drawer_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_drawer_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_drawer_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_drawer_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_drawer_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_drawer_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_drawer_4.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_drawer_4.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_drawer_4.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_drawer_4.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_nightstand.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_shelf_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_shelf_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_shelf_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_shelf_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_side_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_side_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oak_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oak_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/orange_cushion.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/orange_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/orange_cushion.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/orange_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oven.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oven.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/oven.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/oven.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/phantom_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/phantom_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/phantom_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/phantom_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/pillager_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/pillager_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/pillager_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/pillager_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/pink_cushion.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/pink_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/pink_cushion.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/pink_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/pufferfish_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/pufferfish_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/pufferfish_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/pufferfish_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/purple_cushion.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/purple_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/purple_cushion.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/purple_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/quartz_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/quartz_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/quartz_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/quartz_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/quartz_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/quartz_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/quartz_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/quartz_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/red_cushion.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/red_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/red_cushion.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/red_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/salmon_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/salmon_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/salmon_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/salmon_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/silverfish_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/silverfish_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/silverfish_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/silverfish_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/skeleton_horse_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/skeleton_horse_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/skeleton_horse_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/skeleton_horse_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/skeleton_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/skeleton_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/skeleton_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/skeleton_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spider_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spider_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spider_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spider_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_chair.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_chair.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_couch.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_couch.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_counter_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_counter_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_counter_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_counter_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_counter_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_counter_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_counter_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_counter_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_counter_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_counter_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_counter_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_counter_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_cupboard_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_cupboard_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_cupboard_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_cupboard_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_cupboard_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_cupboard_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_cupboard_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_cupboard_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_desk.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_desk.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_drawer_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_drawer_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_drawer_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_drawer_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_drawer_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_drawer_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_drawer_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_drawer_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_drawer_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_drawer_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_drawer_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_drawer_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_drawer_4.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_drawer_4.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_drawer_4.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_drawer_4.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_nightstand.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_shelf_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_shelf_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_shelf_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_shelf_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_side_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_side_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/spruce_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/spruce_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/stackable_book.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/stackable_book.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/stackable_book.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/stackable_book.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/stone_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/stone_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/stone_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/stone_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/stone_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/stone_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/stone_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/stone_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_bowl.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_bowl.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_bowl.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_bowl.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_crockery_combo.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_crockery_combo.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_crockery_combo.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_crockery_combo.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_cup.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_cup.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_cup.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_cup.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_medium_pot.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_medium_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_medium_pot.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_medium_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_plate.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_plate.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_plate.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_plate.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_thick_pot.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_thick_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_thick_pot.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_thick_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_thin_pot.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_thin_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_thin_pot.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_thin_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_wide_pot.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_wide_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_wide_pot.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/terracotta_wide_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/tropical_fish_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/tropical_fish_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/tropical_fish_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/tropical_fish_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/vindicator_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/vindicator_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/vindicator_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/vindicator_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_chair.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_chair.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_couch.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_couch.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_counter_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_counter_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_counter_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_counter_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_counter_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_counter_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_counter_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_counter_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_counter_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_counter_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_counter_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_counter_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_cupboard_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_cupboard_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_cupboard_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_cupboard_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_cupboard_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_cupboard_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_cupboard_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_cupboard_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_desk.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_desk.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_drawer_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_drawer_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_drawer_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_drawer_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_drawer_2.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_drawer_2.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_drawer_2.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_drawer_2.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_drawer_3.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_drawer_3.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_drawer_3.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_drawer_3.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_drawer_4.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_drawer_4.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_drawer_4.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_drawer_4.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_nightstand.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_shelf_1.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_shelf_1.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_shelf_1.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_shelf_1.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_side_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_side_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_table.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/warped_table.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/warped_table.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_bowl.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_bowl.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_bowl.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_bowl.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_crockery_combo.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_crockery_combo.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_crockery_combo.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_crockery_combo.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_cup.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_cup.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_cup.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_cup.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_cushion.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_cushion.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_glazed_medium_pot.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_glazed_medium_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_glazed_medium_pot.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_glazed_medium_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_glazed_thick_pot.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_glazed_thick_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_glazed_thick_pot.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_glazed_thick_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_glazed_thin_pot.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_glazed_thin_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_glazed_thin_pot.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_glazed_thin_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_glazed_wide_pot.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_glazed_wide_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_glazed_wide_pot.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_glazed_wide_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_plate.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_plate.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/white_plate.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/white_plate.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/witch_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/witch_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/witch_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/witch_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/wither_skeleton_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/wither_skeleton_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/wither_skeleton_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/wither_skeleton_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/wolf_trophy.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/wolf_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/wolf_trophy.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/wolf_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/wood_bowl.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/wood_bowl.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/wood_bowl.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/wood_bowl.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/wood_crockery_combo.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/wood_crockery_combo.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/wood_crockery_combo.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/wood_crockery_combo.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/wood_cup.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/wood_cup.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/wood_cup.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/wood_cup.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/wood_plate.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/wood_plate.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/wood_plate.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/wood_plate.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/yellow_bowl.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/yellow_bowl.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/yellow_bowl.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/yellow_bowl.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/yellow_crockery_combo.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/yellow_crockery_combo.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/yellow_crockery_combo.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/yellow_crockery_combo.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/yellow_cup.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/yellow_cup.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/yellow_cup.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/yellow_cup.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/yellow_cushion.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/yellow_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/yellow_cushion.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/yellow_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/loot_tables/blocks/yellow_plate.json b/common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/yellow_plate.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/loot_tables/blocks/yellow_plate.json rename to common/src/main/generated/resources/data/handcrafted/loot_tables/blocks/yellow_plate.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/acacia_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/acacia_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/acacia_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/acacia_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/acacia_chair.json b/common/src/main/generated/resources/data/handcrafted/recipes/acacia_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/acacia_chair.json rename to common/src/main/generated/resources/data/handcrafted/recipes/acacia_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/acacia_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/acacia_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/acacia_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/acacia_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/acacia_couch.json b/common/src/main/generated/resources/data/handcrafted/recipes/acacia_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/acacia_couch.json rename to common/src/main/generated/resources/data/handcrafted/recipes/acacia_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/acacia_counter.json b/common/src/main/generated/resources/data/handcrafted/recipes/acacia_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/acacia_counter.json rename to common/src/main/generated/resources/data/handcrafted/recipes/acacia_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/acacia_cupboard.json b/common/src/main/generated/resources/data/handcrafted/recipes/acacia_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/acacia_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/recipes/acacia_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/acacia_desk.json b/common/src/main/generated/resources/data/handcrafted/recipes/acacia_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/acacia_desk.json rename to common/src/main/generated/resources/data/handcrafted/recipes/acacia_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/acacia_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/acacia_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/acacia_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/acacia_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/acacia_drawer.json b/common/src/main/generated/resources/data/handcrafted/recipes/acacia_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/acacia_drawer.json rename to common/src/main/generated/resources/data/handcrafted/recipes/acacia_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/acacia_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/recipes/acacia_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/acacia_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/recipes/acacia_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/acacia_nightstand.json b/common/src/main/generated/resources/data/handcrafted/recipes/acacia_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/acacia_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/recipes/acacia_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/acacia_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/acacia_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/acacia_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/acacia_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/acacia_shelf.json b/common/src/main/generated/resources/data/handcrafted/recipes/acacia_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/acacia_shelf.json rename to common/src/main/generated/resources/data/handcrafted/recipes/acacia_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/acacia_side_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/acacia_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/acacia_side_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/acacia_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/acacia_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/acacia_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/acacia_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/acacia_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/andesite_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/andesite_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/andesite_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/andesite_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/andesite_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/andesite_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/andesite_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/andesite_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bamboo_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/bamboo_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bamboo_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bamboo_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bamboo_chair.json b/common/src/main/generated/resources/data/handcrafted/recipes/bamboo_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bamboo_chair.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bamboo_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bamboo_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/bamboo_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bamboo_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bamboo_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bamboo_couch.json b/common/src/main/generated/resources/data/handcrafted/recipes/bamboo_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bamboo_couch.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bamboo_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bamboo_counter.json b/common/src/main/generated/resources/data/handcrafted/recipes/bamboo_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bamboo_counter.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bamboo_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bamboo_cupboard.json b/common/src/main/generated/resources/data/handcrafted/recipes/bamboo_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bamboo_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bamboo_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bamboo_desk.json b/common/src/main/generated/resources/data/handcrafted/recipes/bamboo_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bamboo_desk.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bamboo_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bamboo_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/bamboo_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bamboo_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bamboo_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bamboo_drawer.json b/common/src/main/generated/resources/data/handcrafted/recipes/bamboo_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bamboo_drawer.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bamboo_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bamboo_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/recipes/bamboo_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bamboo_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bamboo_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bamboo_nightstand.json b/common/src/main/generated/resources/data/handcrafted/recipes/bamboo_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bamboo_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bamboo_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bamboo_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/bamboo_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bamboo_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bamboo_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bamboo_shelf.json b/common/src/main/generated/resources/data/handcrafted/recipes/bamboo_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bamboo_shelf.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bamboo_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bamboo_side_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/bamboo_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bamboo_side_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bamboo_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bamboo_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/bamboo_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bamboo_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bamboo_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bear_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/bear_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bear_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bear_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/berry_jam_jar.json b/common/src/main/generated/resources/data/handcrafted/recipes/berry_jam_jar.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/berry_jam_jar.json rename to common/src/main/generated/resources/data/handcrafted/recipes/berry_jam_jar.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/birch_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/birch_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/birch_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/birch_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/birch_chair.json b/common/src/main/generated/resources/data/handcrafted/recipes/birch_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/birch_chair.json rename to common/src/main/generated/resources/data/handcrafted/recipes/birch_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/birch_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/birch_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/birch_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/birch_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/birch_couch.json b/common/src/main/generated/resources/data/handcrafted/recipes/birch_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/birch_couch.json rename to common/src/main/generated/resources/data/handcrafted/recipes/birch_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/birch_counter.json b/common/src/main/generated/resources/data/handcrafted/recipes/birch_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/birch_counter.json rename to common/src/main/generated/resources/data/handcrafted/recipes/birch_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/birch_cupboard.json b/common/src/main/generated/resources/data/handcrafted/recipes/birch_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/birch_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/recipes/birch_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/birch_desk.json b/common/src/main/generated/resources/data/handcrafted/recipes/birch_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/birch_desk.json rename to common/src/main/generated/resources/data/handcrafted/recipes/birch_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/birch_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/birch_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/birch_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/birch_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/birch_drawer.json b/common/src/main/generated/resources/data/handcrafted/recipes/birch_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/birch_drawer.json rename to common/src/main/generated/resources/data/handcrafted/recipes/birch_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/birch_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/recipes/birch_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/birch_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/recipes/birch_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/birch_nightstand.json b/common/src/main/generated/resources/data/handcrafted/recipes/birch_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/birch_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/recipes/birch_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/birch_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/birch_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/birch_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/birch_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/birch_shelf.json b/common/src/main/generated/resources/data/handcrafted/recipes/birch_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/birch_shelf.json rename to common/src/main/generated/resources/data/handcrafted/recipes/birch_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/birch_side_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/birch_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/birch_side_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/birch_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/birch_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/birch_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/birch_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/birch_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/black_cushion.json b/common/src/main/generated/resources/data/handcrafted/recipes/black_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/black_cushion.json rename to common/src/main/generated/resources/data/handcrafted/recipes/black_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/black_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/black_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/black_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/black_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/black_sheet.json b/common/src/main/generated/resources/data/handcrafted/recipes/black_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/black_sheet.json rename to common/src/main/generated/resources/data/handcrafted/recipes/black_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/black_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/black_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/black_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/black_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/blackstone_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/blackstone_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/blackstone_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/blackstone_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/blackstone_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/blackstone_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/blackstone_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/blackstone_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/blaze_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/blaze_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/blaze_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/blaze_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/blue_bowl.json b/common/src/main/generated/resources/data/handcrafted/recipes/blue_bowl.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/blue_bowl.json rename to common/src/main/generated/resources/data/handcrafted/recipes/blue_bowl.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/blue_crockery_combo.json b/common/src/main/generated/resources/data/handcrafted/recipes/blue_crockery_combo.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/blue_crockery_combo.json rename to common/src/main/generated/resources/data/handcrafted/recipes/blue_crockery_combo.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/blue_cup.json b/common/src/main/generated/resources/data/handcrafted/recipes/blue_cup.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/blue_cup.json rename to common/src/main/generated/resources/data/handcrafted/recipes/blue_cup.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/blue_cushion.json b/common/src/main/generated/resources/data/handcrafted/recipes/blue_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/blue_cushion.json rename to common/src/main/generated/resources/data/handcrafted/recipes/blue_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/blue_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/blue_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/blue_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/blue_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/blue_glazed_medium_pot.json b/common/src/main/generated/resources/data/handcrafted/recipes/blue_glazed_medium_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/blue_glazed_medium_pot.json rename to common/src/main/generated/resources/data/handcrafted/recipes/blue_glazed_medium_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/blue_glazed_thick_pot.json b/common/src/main/generated/resources/data/handcrafted/recipes/blue_glazed_thick_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/blue_glazed_thick_pot.json rename to common/src/main/generated/resources/data/handcrafted/recipes/blue_glazed_thick_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/blue_glazed_thin_pot.json b/common/src/main/generated/resources/data/handcrafted/recipes/blue_glazed_thin_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/blue_glazed_thin_pot.json rename to common/src/main/generated/resources/data/handcrafted/recipes/blue_glazed_thin_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/blue_glazed_wide_pot.json b/common/src/main/generated/resources/data/handcrafted/recipes/blue_glazed_wide_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/blue_glazed_wide_pot.json rename to common/src/main/generated/resources/data/handcrafted/recipes/blue_glazed_wide_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/blue_plate.json b/common/src/main/generated/resources/data/handcrafted/recipes/blue_plate.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/blue_plate.json rename to common/src/main/generated/resources/data/handcrafted/recipes/blue_plate.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/blue_sheet.json b/common/src/main/generated/resources/data/handcrafted/recipes/blue_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/blue_sheet.json rename to common/src/main/generated/resources/data/handcrafted/recipes/blue_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/blue_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/blue_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/blue_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/blue_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bricks_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/bricks_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bricks_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bricks_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/bricks_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/bricks_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/bricks_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/bricks_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/brown_cushion.json b/common/src/main/generated/resources/data/handcrafted/recipes/brown_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/brown_cushion.json rename to common/src/main/generated/resources/data/handcrafted/recipes/brown_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/brown_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/brown_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/brown_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/brown_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/brown_sheet.json b/common/src/main/generated/resources/data/handcrafted/recipes/brown_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/brown_sheet.json rename to common/src/main/generated/resources/data/handcrafted/recipes/brown_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/brown_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/brown_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/brown_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/brown_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/calcite_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/calcite_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/calcite_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/calcite_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/calcite_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/calcite_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/calcite_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/calcite_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cherry_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/cherry_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cherry_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cherry_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cherry_chair.json b/common/src/main/generated/resources/data/handcrafted/recipes/cherry_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cherry_chair.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cherry_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cherry_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/cherry_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cherry_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cherry_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cherry_couch.json b/common/src/main/generated/resources/data/handcrafted/recipes/cherry_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cherry_couch.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cherry_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cherry_counter.json b/common/src/main/generated/resources/data/handcrafted/recipes/cherry_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cherry_counter.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cherry_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cherry_cupboard.json b/common/src/main/generated/resources/data/handcrafted/recipes/cherry_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cherry_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cherry_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cherry_desk.json b/common/src/main/generated/resources/data/handcrafted/recipes/cherry_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cherry_desk.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cherry_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cherry_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/cherry_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cherry_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cherry_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cherry_drawer.json b/common/src/main/generated/resources/data/handcrafted/recipes/cherry_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cherry_drawer.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cherry_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cherry_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/recipes/cherry_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cherry_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cherry_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cherry_nightstand.json b/common/src/main/generated/resources/data/handcrafted/recipes/cherry_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cherry_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cherry_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cherry_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/cherry_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cherry_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cherry_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cherry_shelf.json b/common/src/main/generated/resources/data/handcrafted/recipes/cherry_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cherry_shelf.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cherry_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cherry_side_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/cherry_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cherry_side_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cherry_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cherry_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/cherry_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cherry_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cherry_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/creeper_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/creeper_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/creeper_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/creeper_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/crimson_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/crimson_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/crimson_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/crimson_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/crimson_chair.json b/common/src/main/generated/resources/data/handcrafted/recipes/crimson_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/crimson_chair.json rename to common/src/main/generated/resources/data/handcrafted/recipes/crimson_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/crimson_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/crimson_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/crimson_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/crimson_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/crimson_couch.json b/common/src/main/generated/resources/data/handcrafted/recipes/crimson_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/crimson_couch.json rename to common/src/main/generated/resources/data/handcrafted/recipes/crimson_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/crimson_counter.json b/common/src/main/generated/resources/data/handcrafted/recipes/crimson_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/crimson_counter.json rename to common/src/main/generated/resources/data/handcrafted/recipes/crimson_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/crimson_cupboard.json b/common/src/main/generated/resources/data/handcrafted/recipes/crimson_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/crimson_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/recipes/crimson_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/crimson_desk.json b/common/src/main/generated/resources/data/handcrafted/recipes/crimson_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/crimson_desk.json rename to common/src/main/generated/resources/data/handcrafted/recipes/crimson_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/crimson_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/crimson_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/crimson_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/crimson_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/crimson_drawer.json b/common/src/main/generated/resources/data/handcrafted/recipes/crimson_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/crimson_drawer.json rename to common/src/main/generated/resources/data/handcrafted/recipes/crimson_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/crimson_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/recipes/crimson_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/crimson_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/recipes/crimson_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/crimson_nightstand.json b/common/src/main/generated/resources/data/handcrafted/recipes/crimson_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/crimson_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/recipes/crimson_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/crimson_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/crimson_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/crimson_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/crimson_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/crimson_shelf.json b/common/src/main/generated/resources/data/handcrafted/recipes/crimson_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/crimson_shelf.json rename to common/src/main/generated/resources/data/handcrafted/recipes/crimson_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/crimson_side_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/crimson_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/crimson_side_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/crimson_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/crimson_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/crimson_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/crimson_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/crimson_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cyan_cushion.json b/common/src/main/generated/resources/data/handcrafted/recipes/cyan_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cyan_cushion.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cyan_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cyan_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/cyan_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cyan_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cyan_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cyan_sheet.json b/common/src/main/generated/resources/data/handcrafted/recipes/cyan_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cyan_sheet.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cyan_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/cyan_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/cyan_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/cyan_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/cyan_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dark_oak_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dark_oak_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dark_oak_chair.json b/common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dark_oak_chair.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dark_oak_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dark_oak_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dark_oak_couch.json b/common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dark_oak_couch.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dark_oak_counter.json b/common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dark_oak_counter.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dark_oak_cupboard.json b/common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dark_oak_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dark_oak_desk.json b/common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dark_oak_desk.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dark_oak_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dark_oak_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dark_oak_drawer.json b/common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dark_oak_drawer.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dark_oak_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dark_oak_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dark_oak_nightstand.json b/common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dark_oak_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dark_oak_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dark_oak_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dark_oak_shelf.json b/common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dark_oak_shelf.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dark_oak_side_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dark_oak_side_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dark_oak_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dark_oak_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dark_oak_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/deepslate_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/deepslate_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/deepslate_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/deepslate_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/deepslate_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/deepslate_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/deepslate_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/deepslate_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/diorite_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/diorite_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/diorite_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/diorite_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/diorite_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/diorite_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/diorite_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/diorite_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dripstone_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/dripstone_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dripstone_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dripstone_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/dripstone_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/dripstone_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/dripstone_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/dripstone_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/evoker_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/evoker_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/evoker_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/evoker_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/fancy_painting.json b/common/src/main/generated/resources/data/handcrafted/recipes/fancy_painting.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/fancy_painting.json rename to common/src/main/generated/resources/data/handcrafted/recipes/fancy_painting.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/fox_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/fox_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/fox_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/fox_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/frozen_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/frozen_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/frozen_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/frozen_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/goat_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/goat_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/goat_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/goat_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/golden_medium_pot.json b/common/src/main/generated/resources/data/handcrafted/recipes/golden_medium_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/golden_medium_pot.json rename to common/src/main/generated/resources/data/handcrafted/recipes/golden_medium_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/golden_thick_pot.json b/common/src/main/generated/resources/data/handcrafted/recipes/golden_thick_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/golden_thick_pot.json rename to common/src/main/generated/resources/data/handcrafted/recipes/golden_thick_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/golden_thin_pot.json b/common/src/main/generated/resources/data/handcrafted/recipes/golden_thin_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/golden_thin_pot.json rename to common/src/main/generated/resources/data/handcrafted/recipes/golden_thin_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/golden_wide_pot.json b/common/src/main/generated/resources/data/handcrafted/recipes/golden_wide_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/golden_wide_pot.json rename to common/src/main/generated/resources/data/handcrafted/recipes/golden_wide_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/granite_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/granite_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/granite_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/granite_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/granite_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/granite_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/granite_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/granite_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/gray_cushion.json b/common/src/main/generated/resources/data/handcrafted/recipes/gray_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/gray_cushion.json rename to common/src/main/generated/resources/data/handcrafted/recipes/gray_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/gray_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/gray_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/gray_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/gray_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/gray_sheet.json b/common/src/main/generated/resources/data/handcrafted/recipes/gray_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/gray_sheet.json rename to common/src/main/generated/resources/data/handcrafted/recipes/gray_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/gray_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/gray_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/gray_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/gray_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/green_cushion.json b/common/src/main/generated/resources/data/handcrafted/recipes/green_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/green_cushion.json rename to common/src/main/generated/resources/data/handcrafted/recipes/green_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/green_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/green_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/green_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/green_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/green_sheet.json b/common/src/main/generated/resources/data/handcrafted/recipes/green_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/green_sheet.json rename to common/src/main/generated/resources/data/handcrafted/recipes/green_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/green_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/green_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/green_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/green_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/hammer.json b/common/src/main/generated/resources/data/handcrafted/recipes/hammer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/hammer.json rename to common/src/main/generated/resources/data/handcrafted/recipes/hammer.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/jungle_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/jungle_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/jungle_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/jungle_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/jungle_chair.json b/common/src/main/generated/resources/data/handcrafted/recipes/jungle_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/jungle_chair.json rename to common/src/main/generated/resources/data/handcrafted/recipes/jungle_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/jungle_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/jungle_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/jungle_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/jungle_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/jungle_couch.json b/common/src/main/generated/resources/data/handcrafted/recipes/jungle_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/jungle_couch.json rename to common/src/main/generated/resources/data/handcrafted/recipes/jungle_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/jungle_counter.json b/common/src/main/generated/resources/data/handcrafted/recipes/jungle_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/jungle_counter.json rename to common/src/main/generated/resources/data/handcrafted/recipes/jungle_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/jungle_cupboard.json b/common/src/main/generated/resources/data/handcrafted/recipes/jungle_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/jungle_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/recipes/jungle_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/jungle_desk.json b/common/src/main/generated/resources/data/handcrafted/recipes/jungle_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/jungle_desk.json rename to common/src/main/generated/resources/data/handcrafted/recipes/jungle_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/jungle_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/jungle_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/jungle_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/jungle_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/jungle_drawer.json b/common/src/main/generated/resources/data/handcrafted/recipes/jungle_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/jungle_drawer.json rename to common/src/main/generated/resources/data/handcrafted/recipes/jungle_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/jungle_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/recipes/jungle_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/jungle_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/recipes/jungle_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/jungle_nightstand.json b/common/src/main/generated/resources/data/handcrafted/recipes/jungle_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/jungle_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/recipes/jungle_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/jungle_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/jungle_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/jungle_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/jungle_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/jungle_shelf.json b/common/src/main/generated/resources/data/handcrafted/recipes/jungle_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/jungle_shelf.json rename to common/src/main/generated/resources/data/handcrafted/recipes/jungle_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/jungle_side_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/jungle_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/jungle_side_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/jungle_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/jungle_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/jungle_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/jungle_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/jungle_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/kitchen_hood.json b/common/src/main/generated/resources/data/handcrafted/recipes/kitchen_hood.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/kitchen_hood.json rename to common/src/main/generated/resources/data/handcrafted/recipes/kitchen_hood.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/kitchen_hood_pipe.json b/common/src/main/generated/resources/data/handcrafted/recipes/kitchen_hood_pipe.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/kitchen_hood_pipe.json rename to common/src/main/generated/resources/data/handcrafted/recipes/kitchen_hood_pipe.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/light_blue_cushion.json b/common/src/main/generated/resources/data/handcrafted/recipes/light_blue_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/light_blue_cushion.json rename to common/src/main/generated/resources/data/handcrafted/recipes/light_blue_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/light_blue_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/light_blue_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/light_blue_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/light_blue_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/light_blue_sheet.json b/common/src/main/generated/resources/data/handcrafted/recipes/light_blue_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/light_blue_sheet.json rename to common/src/main/generated/resources/data/handcrafted/recipes/light_blue_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/light_blue_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/light_blue_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/light_blue_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/light_blue_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/light_gray_cushion.json b/common/src/main/generated/resources/data/handcrafted/recipes/light_gray_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/light_gray_cushion.json rename to common/src/main/generated/resources/data/handcrafted/recipes/light_gray_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/light_gray_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/light_gray_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/light_gray_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/light_gray_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/light_gray_sheet.json b/common/src/main/generated/resources/data/handcrafted/recipes/light_gray_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/light_gray_sheet.json rename to common/src/main/generated/resources/data/handcrafted/recipes/light_gray_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/light_gray_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/light_gray_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/light_gray_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/light_gray_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/lime_cushion.json b/common/src/main/generated/resources/data/handcrafted/recipes/lime_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/lime_cushion.json rename to common/src/main/generated/resources/data/handcrafted/recipes/lime_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/lime_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/lime_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/lime_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/lime_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/lime_sheet.json b/common/src/main/generated/resources/data/handcrafted/recipes/lime_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/lime_sheet.json rename to common/src/main/generated/resources/data/handcrafted/recipes/lime_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/lime_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/lime_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/lime_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/lime_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/magenta_cushion.json b/common/src/main/generated/resources/data/handcrafted/recipes/magenta_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/magenta_cushion.json rename to common/src/main/generated/resources/data/handcrafted/recipes/magenta_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/magenta_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/magenta_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/magenta_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/magenta_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/magenta_sheet.json b/common/src/main/generated/resources/data/handcrafted/recipes/magenta_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/magenta_sheet.json rename to common/src/main/generated/resources/data/handcrafted/recipes/magenta_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/magenta_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/magenta_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/magenta_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/magenta_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/mangrove_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/mangrove_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/mangrove_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/mangrove_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/mangrove_chair.json b/common/src/main/generated/resources/data/handcrafted/recipes/mangrove_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/mangrove_chair.json rename to common/src/main/generated/resources/data/handcrafted/recipes/mangrove_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/mangrove_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/mangrove_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/mangrove_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/mangrove_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/mangrove_couch.json b/common/src/main/generated/resources/data/handcrafted/recipes/mangrove_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/mangrove_couch.json rename to common/src/main/generated/resources/data/handcrafted/recipes/mangrove_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/mangrove_counter.json b/common/src/main/generated/resources/data/handcrafted/recipes/mangrove_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/mangrove_counter.json rename to common/src/main/generated/resources/data/handcrafted/recipes/mangrove_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/mangrove_cupboard.json b/common/src/main/generated/resources/data/handcrafted/recipes/mangrove_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/mangrove_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/recipes/mangrove_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/mangrove_desk.json b/common/src/main/generated/resources/data/handcrafted/recipes/mangrove_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/mangrove_desk.json rename to common/src/main/generated/resources/data/handcrafted/recipes/mangrove_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/mangrove_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/mangrove_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/mangrove_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/mangrove_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/mangrove_drawer.json b/common/src/main/generated/resources/data/handcrafted/recipes/mangrove_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/mangrove_drawer.json rename to common/src/main/generated/resources/data/handcrafted/recipes/mangrove_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/mangrove_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/recipes/mangrove_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/mangrove_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/recipes/mangrove_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/mangrove_nightstand.json b/common/src/main/generated/resources/data/handcrafted/recipes/mangrove_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/mangrove_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/recipes/mangrove_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/mangrove_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/mangrove_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/mangrove_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/mangrove_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/mangrove_shelf.json b/common/src/main/generated/resources/data/handcrafted/recipes/mangrove_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/mangrove_shelf.json rename to common/src/main/generated/resources/data/handcrafted/recipes/mangrove_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/mangrove_side_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/mangrove_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/mangrove_side_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/mangrove_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/mangrove_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/mangrove_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/mangrove_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/mangrove_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/oak_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/oak_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/oak_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/oak_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/oak_chair.json b/common/src/main/generated/resources/data/handcrafted/recipes/oak_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/oak_chair.json rename to common/src/main/generated/resources/data/handcrafted/recipes/oak_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/oak_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/oak_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/oak_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/oak_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/oak_couch.json b/common/src/main/generated/resources/data/handcrafted/recipes/oak_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/oak_couch.json rename to common/src/main/generated/resources/data/handcrafted/recipes/oak_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/oak_counter.json b/common/src/main/generated/resources/data/handcrafted/recipes/oak_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/oak_counter.json rename to common/src/main/generated/resources/data/handcrafted/recipes/oak_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/oak_cupboard.json b/common/src/main/generated/resources/data/handcrafted/recipes/oak_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/oak_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/recipes/oak_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/oak_desk.json b/common/src/main/generated/resources/data/handcrafted/recipes/oak_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/oak_desk.json rename to common/src/main/generated/resources/data/handcrafted/recipes/oak_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/oak_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/oak_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/oak_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/oak_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/oak_drawer.json b/common/src/main/generated/resources/data/handcrafted/recipes/oak_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/oak_drawer.json rename to common/src/main/generated/resources/data/handcrafted/recipes/oak_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/oak_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/recipes/oak_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/oak_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/recipes/oak_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/oak_nightstand.json b/common/src/main/generated/resources/data/handcrafted/recipes/oak_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/oak_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/recipes/oak_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/oak_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/oak_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/oak_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/oak_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/oak_shelf.json b/common/src/main/generated/resources/data/handcrafted/recipes/oak_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/oak_shelf.json rename to common/src/main/generated/resources/data/handcrafted/recipes/oak_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/oak_side_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/oak_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/oak_side_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/oak_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/oak_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/oak_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/oak_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/oak_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/orange_cushion.json b/common/src/main/generated/resources/data/handcrafted/recipes/orange_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/orange_cushion.json rename to common/src/main/generated/resources/data/handcrafted/recipes/orange_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/orange_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/orange_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/orange_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/orange_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/orange_sheet.json b/common/src/main/generated/resources/data/handcrafted/recipes/orange_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/orange_sheet.json rename to common/src/main/generated/resources/data/handcrafted/recipes/orange_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/orange_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/orange_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/orange_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/orange_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/oven.json b/common/src/main/generated/resources/data/handcrafted/recipes/oven.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/oven.json rename to common/src/main/generated/resources/data/handcrafted/recipes/oven.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/phantom_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/phantom_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/phantom_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/phantom_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/pillager_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/pillager_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/pillager_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/pillager_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/pink_cushion.json b/common/src/main/generated/resources/data/handcrafted/recipes/pink_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/pink_cushion.json rename to common/src/main/generated/resources/data/handcrafted/recipes/pink_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/pink_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/pink_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/pink_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/pink_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/pink_sheet.json b/common/src/main/generated/resources/data/handcrafted/recipes/pink_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/pink_sheet.json rename to common/src/main/generated/resources/data/handcrafted/recipes/pink_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/pink_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/pink_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/pink_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/pink_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/pufferfish_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/pufferfish_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/pufferfish_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/pufferfish_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/purple_cushion.json b/common/src/main/generated/resources/data/handcrafted/recipes/purple_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/purple_cushion.json rename to common/src/main/generated/resources/data/handcrafted/recipes/purple_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/purple_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/purple_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/purple_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/purple_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/purple_sheet.json b/common/src/main/generated/resources/data/handcrafted/recipes/purple_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/purple_sheet.json rename to common/src/main/generated/resources/data/handcrafted/recipes/purple_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/purple_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/purple_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/purple_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/purple_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/quartz_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/quartz_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/quartz_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/quartz_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/quartz_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/quartz_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/quartz_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/quartz_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/red_cushion.json b/common/src/main/generated/resources/data/handcrafted/recipes/red_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/red_cushion.json rename to common/src/main/generated/resources/data/handcrafted/recipes/red_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/red_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/red_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/red_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/red_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/red_sheet.json b/common/src/main/generated/resources/data/handcrafted/recipes/red_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/red_sheet.json rename to common/src/main/generated/resources/data/handcrafted/recipes/red_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/red_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/red_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/red_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/red_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/salmon_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/salmon_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/salmon_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/salmon_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/silverfish_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/silverfish_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/silverfish_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/silverfish_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/skeleton_horse_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/skeleton_horse_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/skeleton_horse_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/skeleton_horse_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/skeleton_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/skeleton_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/skeleton_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/skeleton_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/spider_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/spider_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/spider_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/spider_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/spruce_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/spruce_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/spruce_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/spruce_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/spruce_chair.json b/common/src/main/generated/resources/data/handcrafted/recipes/spruce_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/spruce_chair.json rename to common/src/main/generated/resources/data/handcrafted/recipes/spruce_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/spruce_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/spruce_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/spruce_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/spruce_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/spruce_couch.json b/common/src/main/generated/resources/data/handcrafted/recipes/spruce_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/spruce_couch.json rename to common/src/main/generated/resources/data/handcrafted/recipes/spruce_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/spruce_counter.json b/common/src/main/generated/resources/data/handcrafted/recipes/spruce_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/spruce_counter.json rename to common/src/main/generated/resources/data/handcrafted/recipes/spruce_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/spruce_cupboard.json b/common/src/main/generated/resources/data/handcrafted/recipes/spruce_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/spruce_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/recipes/spruce_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/spruce_desk.json b/common/src/main/generated/resources/data/handcrafted/recipes/spruce_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/spruce_desk.json rename to common/src/main/generated/resources/data/handcrafted/recipes/spruce_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/spruce_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/spruce_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/spruce_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/spruce_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/spruce_drawer.json b/common/src/main/generated/resources/data/handcrafted/recipes/spruce_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/spruce_drawer.json rename to common/src/main/generated/resources/data/handcrafted/recipes/spruce_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/spruce_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/recipes/spruce_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/spruce_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/recipes/spruce_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/spruce_nightstand.json b/common/src/main/generated/resources/data/handcrafted/recipes/spruce_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/spruce_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/recipes/spruce_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/spruce_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/spruce_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/spruce_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/spruce_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/spruce_shelf.json b/common/src/main/generated/resources/data/handcrafted/recipes/spruce_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/spruce_shelf.json rename to common/src/main/generated/resources/data/handcrafted/recipes/spruce_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/spruce_side_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/spruce_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/spruce_side_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/spruce_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/spruce_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/spruce_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/spruce_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/spruce_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/stackable_book.json b/common/src/main/generated/resources/data/handcrafted/recipes/stackable_book.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/stackable_book.json rename to common/src/main/generated/resources/data/handcrafted/recipes/stackable_book.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/stone_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/stone_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/stone_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/stone_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/stone_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/stone_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/stone_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/stone_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/terracotta_bowl.json b/common/src/main/generated/resources/data/handcrafted/recipes/terracotta_bowl.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/terracotta_bowl.json rename to common/src/main/generated/resources/data/handcrafted/recipes/terracotta_bowl.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/terracotta_crockery_combo.json b/common/src/main/generated/resources/data/handcrafted/recipes/terracotta_crockery_combo.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/terracotta_crockery_combo.json rename to common/src/main/generated/resources/data/handcrafted/recipes/terracotta_crockery_combo.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/terracotta_cup.json b/common/src/main/generated/resources/data/handcrafted/recipes/terracotta_cup.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/terracotta_cup.json rename to common/src/main/generated/resources/data/handcrafted/recipes/terracotta_cup.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/terracotta_medium_pot.json b/common/src/main/generated/resources/data/handcrafted/recipes/terracotta_medium_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/terracotta_medium_pot.json rename to common/src/main/generated/resources/data/handcrafted/recipes/terracotta_medium_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/terracotta_plate.json b/common/src/main/generated/resources/data/handcrafted/recipes/terracotta_plate.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/terracotta_plate.json rename to common/src/main/generated/resources/data/handcrafted/recipes/terracotta_plate.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/terracotta_thick_pot.json b/common/src/main/generated/resources/data/handcrafted/recipes/terracotta_thick_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/terracotta_thick_pot.json rename to common/src/main/generated/resources/data/handcrafted/recipes/terracotta_thick_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/terracotta_thin_pot.json b/common/src/main/generated/resources/data/handcrafted/recipes/terracotta_thin_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/terracotta_thin_pot.json rename to common/src/main/generated/resources/data/handcrafted/recipes/terracotta_thin_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/terracotta_wide_pot.json b/common/src/main/generated/resources/data/handcrafted/recipes/terracotta_wide_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/terracotta_wide_pot.json rename to common/src/main/generated/resources/data/handcrafted/recipes/terracotta_wide_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/tropical_fish_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/tropical_fish_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/tropical_fish_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/tropical_fish_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/vindicator_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/vindicator_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/vindicator_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/vindicator_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/warped_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/warped_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/warped_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/warped_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/warped_chair.json b/common/src/main/generated/resources/data/handcrafted/recipes/warped_chair.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/warped_chair.json rename to common/src/main/generated/resources/data/handcrafted/recipes/warped_chair.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/warped_corner_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/warped_corner_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/warped_corner_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/warped_corner_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/warped_couch.json b/common/src/main/generated/resources/data/handcrafted/recipes/warped_couch.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/warped_couch.json rename to common/src/main/generated/resources/data/handcrafted/recipes/warped_couch.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/warped_counter.json b/common/src/main/generated/resources/data/handcrafted/recipes/warped_counter.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/warped_counter.json rename to common/src/main/generated/resources/data/handcrafted/recipes/warped_counter.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/warped_cupboard.json b/common/src/main/generated/resources/data/handcrafted/recipes/warped_cupboard.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/warped_cupboard.json rename to common/src/main/generated/resources/data/handcrafted/recipes/warped_cupboard.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/warped_desk.json b/common/src/main/generated/resources/data/handcrafted/recipes/warped_desk.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/warped_desk.json rename to common/src/main/generated/resources/data/handcrafted/recipes/warped_desk.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/warped_dining_bench.json b/common/src/main/generated/resources/data/handcrafted/recipes/warped_dining_bench.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/warped_dining_bench.json rename to common/src/main/generated/resources/data/handcrafted/recipes/warped_dining_bench.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/warped_drawer.json b/common/src/main/generated/resources/data/handcrafted/recipes/warped_drawer.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/warped_drawer.json rename to common/src/main/generated/resources/data/handcrafted/recipes/warped_drawer.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/warped_fancy_bed.json b/common/src/main/generated/resources/data/handcrafted/recipes/warped_fancy_bed.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/warped_fancy_bed.json rename to common/src/main/generated/resources/data/handcrafted/recipes/warped_fancy_bed.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/warped_nightstand.json b/common/src/main/generated/resources/data/handcrafted/recipes/warped_nightstand.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/warped_nightstand.json rename to common/src/main/generated/resources/data/handcrafted/recipes/warped_nightstand.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/warped_pillar_trim.json b/common/src/main/generated/resources/data/handcrafted/recipes/warped_pillar_trim.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/warped_pillar_trim.json rename to common/src/main/generated/resources/data/handcrafted/recipes/warped_pillar_trim.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/warped_shelf.json b/common/src/main/generated/resources/data/handcrafted/recipes/warped_shelf.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/warped_shelf.json rename to common/src/main/generated/resources/data/handcrafted/recipes/warped_shelf.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/warped_side_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/warped_side_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/warped_side_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/warped_side_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/warped_table.json b/common/src/main/generated/resources/data/handcrafted/recipes/warped_table.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/warped_table.json rename to common/src/main/generated/resources/data/handcrafted/recipes/warped_table.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/white_bowl.json b/common/src/main/generated/resources/data/handcrafted/recipes/white_bowl.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/white_bowl.json rename to common/src/main/generated/resources/data/handcrafted/recipes/white_bowl.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/white_crockery_combo.json b/common/src/main/generated/resources/data/handcrafted/recipes/white_crockery_combo.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/white_crockery_combo.json rename to common/src/main/generated/resources/data/handcrafted/recipes/white_crockery_combo.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/white_cup.json b/common/src/main/generated/resources/data/handcrafted/recipes/white_cup.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/white_cup.json rename to common/src/main/generated/resources/data/handcrafted/recipes/white_cup.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/white_cushion.json b/common/src/main/generated/resources/data/handcrafted/recipes/white_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/white_cushion.json rename to common/src/main/generated/resources/data/handcrafted/recipes/white_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/white_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/white_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/white_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/white_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/white_glazed_medium_pot.json b/common/src/main/generated/resources/data/handcrafted/recipes/white_glazed_medium_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/white_glazed_medium_pot.json rename to common/src/main/generated/resources/data/handcrafted/recipes/white_glazed_medium_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/white_glazed_thick_pot.json b/common/src/main/generated/resources/data/handcrafted/recipes/white_glazed_thick_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/white_glazed_thick_pot.json rename to common/src/main/generated/resources/data/handcrafted/recipes/white_glazed_thick_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/white_glazed_thin_pot.json b/common/src/main/generated/resources/data/handcrafted/recipes/white_glazed_thin_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/white_glazed_thin_pot.json rename to common/src/main/generated/resources/data/handcrafted/recipes/white_glazed_thin_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/white_glazed_wide_pot.json b/common/src/main/generated/resources/data/handcrafted/recipes/white_glazed_wide_pot.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/white_glazed_wide_pot.json rename to common/src/main/generated/resources/data/handcrafted/recipes/white_glazed_wide_pot.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/white_plate.json b/common/src/main/generated/resources/data/handcrafted/recipes/white_plate.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/white_plate.json rename to common/src/main/generated/resources/data/handcrafted/recipes/white_plate.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/white_sheet.json b/common/src/main/generated/resources/data/handcrafted/recipes/white_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/white_sheet.json rename to common/src/main/generated/resources/data/handcrafted/recipes/white_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/white_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/white_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/white_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/white_sheet_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/witch_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/witch_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/witch_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/witch_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/wither_skeleton_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/wither_skeleton_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/wither_skeleton_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/wither_skeleton_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/wolf_trophy.json b/common/src/main/generated/resources/data/handcrafted/recipes/wolf_trophy.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/wolf_trophy.json rename to common/src/main/generated/resources/data/handcrafted/recipes/wolf_trophy.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/wood_bowl.json b/common/src/main/generated/resources/data/handcrafted/recipes/wood_bowl.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/wood_bowl.json rename to common/src/main/generated/resources/data/handcrafted/recipes/wood_bowl.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/wood_crockery_combo.json b/common/src/main/generated/resources/data/handcrafted/recipes/wood_crockery_combo.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/wood_crockery_combo.json rename to common/src/main/generated/resources/data/handcrafted/recipes/wood_crockery_combo.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/wood_cup.json b/common/src/main/generated/resources/data/handcrafted/recipes/wood_cup.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/wood_cup.json rename to common/src/main/generated/resources/data/handcrafted/recipes/wood_cup.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/wood_plate.json b/common/src/main/generated/resources/data/handcrafted/recipes/wood_plate.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/wood_plate.json rename to common/src/main/generated/resources/data/handcrafted/recipes/wood_plate.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/yellow_bowl.json b/common/src/main/generated/resources/data/handcrafted/recipes/yellow_bowl.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/yellow_bowl.json rename to common/src/main/generated/resources/data/handcrafted/recipes/yellow_bowl.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/yellow_crockery_combo.json b/common/src/main/generated/resources/data/handcrafted/recipes/yellow_crockery_combo.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/yellow_crockery_combo.json rename to common/src/main/generated/resources/data/handcrafted/recipes/yellow_crockery_combo.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/yellow_cup.json b/common/src/main/generated/resources/data/handcrafted/recipes/yellow_cup.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/yellow_cup.json rename to common/src/main/generated/resources/data/handcrafted/recipes/yellow_cup.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/yellow_cushion.json b/common/src/main/generated/resources/data/handcrafted/recipes/yellow_cushion.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/yellow_cushion.json rename to common/src/main/generated/resources/data/handcrafted/recipes/yellow_cushion.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/yellow_cushion_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/yellow_cushion_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/yellow_cushion_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/yellow_cushion_single.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/yellow_plate.json b/common/src/main/generated/resources/data/handcrafted/recipes/yellow_plate.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/yellow_plate.json rename to common/src/main/generated/resources/data/handcrafted/recipes/yellow_plate.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/yellow_sheet.json b/common/src/main/generated/resources/data/handcrafted/recipes/yellow_sheet.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/yellow_sheet.json rename to common/src/main/generated/resources/data/handcrafted/recipes/yellow_sheet.json diff --git a/forge/src/generated/resources/data/handcrafted/recipes/yellow_sheet_single.json b/common/src/main/generated/resources/data/handcrafted/recipes/yellow_sheet_single.json similarity index 100% rename from forge/src/generated/resources/data/handcrafted/recipes/yellow_sheet_single.json rename to common/src/main/generated/resources/data/handcrafted/recipes/yellow_sheet_single.json diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/ClientUtils.java b/common/src/main/java/earth/terrarium/handcrafted/client/ClientUtils.java index 184d70c7..e89fa269 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/ClientUtils.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/ClientUtils.java @@ -1,14 +1,11 @@ package earth.terrarium.handcrafted.client; import dev.architectury.injectables.annotations.ExpectPlatform; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.resources.model.ModelManager; import net.minecraft.resources.ResourceLocation; import org.apache.commons.lang3.NotImplementedException; -@Environment(EnvType.CLIENT) public class ClientUtils { @ExpectPlatform diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/bench/BenchModel.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/bench/BenchModel.java index 51b6c38c..cb660d55 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/bench/BenchModel.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/bench/BenchModel.java @@ -3,8 +3,6 @@ import earth.terrarium.handcrafted.Handcrafted; import earth.terrarium.handcrafted.client.BaseModel; import earth.terrarium.handcrafted.client.HandcraftedClient; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -12,7 +10,6 @@ import net.minecraft.resources.ResourceLocation; @SuppressWarnings("unused") -@Environment(EnvType.CLIENT) public class BenchModel extends BaseModel { public static final ModelLayerLocation LAYER_LOCATION_SINGLE = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "bench_single"), "main"); public static final ModelLayerLocation LAYER_LOCATION_CORNER = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "bench_corner"), "main"); @@ -30,19 +27,19 @@ public static LayerDefinition benchSingleLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(16, 0).addBox(5.0F, -14.0F, -8.0F, 3.0F, 14.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(5.0F, -16.0F, 7.0F, 3.0F, 16.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(16, 0).mirror().addBox(-8.0F, -14.0F, -8.0F, 3.0F, 14.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(0, 0).mirror().addBox(-8.0F, -16.0F, 7.0F, 3.0F, 16.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(0.0F, 24.0F, 0.0F, 0.0F, 3.1416F, 0.0F)); + .texOffs(0, 0).addBox(5.0F, -16.0F, 7.0F, 3.0F, 16.0F, 1.0F, new CubeDeformation(0.0F)) + .texOffs(16, 0).mirror().addBox(-8.0F, -14.0F, -8.0F, 3.0F, 14.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(0, 0).mirror().addBox(-8.0F, -16.0F, 7.0F, 3.0F, 16.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(0.0F, 24.0F, 0.0F, 0.0F, 3.1416F, 0.0F)); PartDefinition cube_r1 = main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(52, 0).addBox(-7.0F, -13.5F, -0.5F, 14.0F, 14.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -9.5F, 6.5F, 1.5708F, 0.0F, 0.0F)); PartDefinition cube_r2 = main.addOrReplaceChild("cube_r2", CubeListBuilder.create().texOffs(8, 0).mirror().addBox(-1.5F, -14.5F, -0.5F, 3.0F, 15.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(8, 0).addBox(11.5F, -14.5F, -0.5F, 3.0F, 15.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-6.5F, -15.5F, 6.5F, 1.5708F, 0.0F, 0.0F)); + .texOffs(8, 0).addBox(11.5F, -14.5F, -0.5F, 3.0F, 15.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-6.5F, -15.5F, 6.5F, 1.5708F, 0.0F, 0.0F)); PartDefinition cube_r3 = main.addOrReplaceChild("cube_r3", CubeListBuilder.create().texOffs(82, 0).addBox(0.0F, -2.5F, 0.0F, 15.0F, 5.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-6.5F, -12.5F, -8.0F, 0.0F, -1.5708F, 0.0F)); PartDefinition cube_r4 = main.addOrReplaceChild("cube_r4", CubeListBuilder.create().texOffs(24, 0).mirror().addBox(-1.5F, -14.0F, -1.0F, 3.0F, 14.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(24, 0).addBox(11.5F, -14.0F, -1.0F, 3.0F, 14.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-6.5F, -14.0F, -7.0F, 0.1309F, 0.0F, 0.0F)); + .texOffs(24, 0).addBox(11.5F, -14.0F, -1.0F, 3.0F, 14.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-6.5F, -14.0F, -7.0F, 0.1309F, 0.0F, 0.0F)); PartDefinition cube_r5 = main.addOrReplaceChild("cube_r5", CubeListBuilder.create().texOffs(82, 0).addBox(0.0F, -2.5F, 0.0F, 15.0F, 5.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(6.5F, -12.5F, -8.0F, 0.0F, -1.5708F, 0.0F)); @@ -56,7 +53,7 @@ public static LayerDefinition benchCornerLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(16, 0).mirror().addBox(-8.0F, -14.0F, -8.0F, 3.0F, 14.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(65, 52).addBox(-7.0F, -10.0F, 7.0F, 14.0F, 1.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); + .texOffs(65, 52).addBox(-7.0F, -10.0F, 7.0F, 14.0F, 1.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); PartDefinition cube_r1 = main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(24, 0).mirror().addBox(-3.0F, -14.0F, -1.0F, 3.0F, 14.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(-5.0F, -14.0F, -7.0F, 0.1298F, 0.017F, -0.1298F)); @@ -78,7 +75,7 @@ public static LayerDefinition benchInvertedCornerLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(8, 16).addBox(-9.0F, -14.0F, -9.0F, 2.0F, 14.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(16, 15).addBox(5.0F, -9.0F, 5.0F, 2.0F, 9.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 24.0F, 0.0F, 0.0F, -1.5708F, 0.0F)); + .texOffs(16, 15).addBox(5.0F, -9.0F, 5.0F, 2.0F, 9.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 24.0F, 0.0F, 0.0F, -1.5708F, 0.0F)); PartDefinition cube_r1 = main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(94, 35).addBox(-0.5F, -14.5F, -0.5F, 15.0F, 15.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(6.5F, -9.5F, 6.5F, 0.0F, 1.5708F, -1.5708F)); @@ -92,7 +89,7 @@ public static LayerDefinition benchLeftLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(16, 0).addBox(5.0F, -14.0F, -8.0F, 3.0F, 14.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(5.0F, -16.0F, 7.0F, 3.0F, 16.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 24.0F, 0.0F, 0.0F, 3.1416F, 0.0F)); + .texOffs(0, 0).addBox(5.0F, -16.0F, 7.0F, 3.0F, 16.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 24.0F, 0.0F, 0.0F, 3.1416F, 0.0F)); PartDefinition cube_r1 = main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(82, 5).addBox(-8.0F, -7.5F, 0.5F, 15.0F, 14.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-1.0F, -10.5F, 0.5F, 1.5708F, 0.0F, 3.1416F)); @@ -123,7 +120,7 @@ public static LayerDefinition benchRightLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(16, 0).mirror().addBox(-8.0F, -14.0F, -8.0F, 3.0F, 14.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(0, 0).mirror().addBox(-8.0F, -16.0F, 7.0F, 3.0F, 16.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(0.0F, 24.0F, 0.0F, 0.0F, 3.1416F, 0.0F)); + .texOffs(0, 0).mirror().addBox(-8.0F, -16.0F, 7.0F, 3.0F, 16.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(0.0F, 24.0F, 0.0F, 0.0F, 3.1416F, 0.0F)); PartDefinition cube_r1 = main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(82, 5).mirror().addBox(-9.0F, 24.5F, 0.5F, 15.0F, 14.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(-1.0F, -10.5F, -31.5F, 1.5708F, 0.0F, 3.1416F)); diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/bench/MetalBenchRenderer.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/bench/MetalBenchRenderer.java index 943324f1..93ba7669 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/bench/MetalBenchRenderer.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/bench/MetalBenchRenderer.java @@ -6,8 +6,6 @@ import earth.terrarium.handcrafted.common.block.chair.bench.BenchBlockEntity; import earth.terrarium.handcrafted.common.block.chair.couch.ExpandableCouchBlock; import earth.terrarium.handcrafted.common.block.property.CouchShape; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; @@ -21,7 +19,6 @@ import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -@Environment(EnvType.CLIENT) public class MetalBenchRenderer implements BlockEntityRenderer { public MetalBenchRenderer(BlockEntityRendererProvider.Context ctx) { } @@ -72,7 +69,7 @@ public void render(BenchBlockEntity entity, float partialTick, PoseStack poseSta case RIGHT -> new BenchModel(modelSet.bakeLayer(BenchModel.LAYER_LOCATION_RIGHT)); case INNER_LEFT, INNER_RIGHT -> new BenchModel(modelSet.bakeLayer(BenchModel.LAYER_LOCATION_CORNER)); case OUTER_LEFT, OUTER_RIGHT -> - new BenchModel(modelSet.bakeLayer(BenchModel.LAYER_LOCATION_INVERTED_CORNER)); + new BenchModel(modelSet.bakeLayer(BenchModel.LAYER_LOCATION_INVERTED_CORNER)); }; render(BuiltInRegistries.BLOCK.getKey(entity.getBlockState().getBlock()), model, entity.getBlockState().getValue(ExpandableCouchBlock.FACING), shape, poseStack, bufferSource, packedLight, packedOverlay); } diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/chair/ChairModel.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/chair/ChairModel.java index 51381b45..3169d165 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/chair/ChairModel.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/chair/ChairModel.java @@ -3,8 +3,6 @@ import earth.terrarium.handcrafted.Handcrafted; import earth.terrarium.handcrafted.client.BaseModel; import earth.terrarium.handcrafted.client.HandcraftedClient; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -12,7 +10,6 @@ import net.minecraft.resources.ResourceLocation; @SuppressWarnings("unused") -@Environment(EnvType.CLIENT) public class ChairModel extends BaseModel { public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "chair"), "main"); @@ -27,10 +24,10 @@ public static LayerDefinition singleLayer() { PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create(), PartPose.offset(0.0F, 24.0F, 0.0F)); PartDefinition chair = main.addOrReplaceChild("chair", CubeListBuilder.create().texOffs(0, 0).addBox(-7.0F, -9.0F, -7.0F, 3.0F, 9.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(4.0F, -9.0F, -7.0F, 3.0F, 9.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 14).addBox(4.0F, -14.0F, 5.0F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(28, 15).addBox(-5.0F, -13.9052F, 6.1705F, 10.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)) - .texOffs(0, 14).addBox(-7.0F, -14.0F, 5.0F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + .texOffs(0, 0).addBox(4.0F, -9.0F, -7.0F, 3.0F, 9.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(0, 14).addBox(4.0F, -14.0F, 5.0F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(28, 15).addBox(-5.0F, -13.9052F, 6.1705F, 10.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)) + .texOffs(0, 14).addBox(-7.0F, -14.0F, 5.0F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); PartDefinition cube_r1 = chair.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(28, 16).addBox(-5.0F, -9.0F, 1.0F, 10.0F, 13.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -17.9772F, 5.5229F, -0.0873F, 0.0F, 0.0F)); @@ -41,8 +38,8 @@ public static LayerDefinition singleLayer() { PartDefinition seat = main.addOrReplaceChild("seat", CubeListBuilder.create().texOffs(2, 0).addBox(-6.0F, -9.0F, -5.99F, 12.0F, 2.0F, 13.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, -1.0F)); PartDefinition base = main.addOrReplaceChild("base", CubeListBuilder.create().texOffs(27, 7).addBox(-6.0F, -9.0F, -4.0F, 0.0F, 3.0F, 9.0F, new CubeDeformation(0.0F)) - .texOffs(27, 7).addBox(6.0F, -9.0F, -4.0F, 0.0F, 3.0F, 9.0F, new CubeDeformation(0.0F)) - .texOffs(28, 16).addBox(-4.0F, -9.0F, -7.0F, 8.0F, 3.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + .texOffs(27, 7).addBox(6.0F, -9.0F, -4.0F, 0.0F, 3.0F, 9.0F, new CubeDeformation(0.0F)) + .texOffs(28, 16).addBox(-4.0F, -9.0F, -7.0F, 8.0F, 3.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); PartDefinition with_cushion = main.addOrReplaceChild("with_cushion", CubeListBuilder.create().texOffs(20, 50).addBox(-5.0F, -11.0F, -5.0F, 10.0F, 2.0F, 12.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, -1.0F)); diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/chair/ChairRenderer.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/chair/ChairRenderer.java index 4cc46617..0a87364a 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/chair/ChairRenderer.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/chair/ChairRenderer.java @@ -7,8 +7,6 @@ import earth.terrarium.handcrafted.common.block.chair.chair.ChairBlockEntity; import earth.terrarium.handcrafted.common.block.chair.couch.ExpandableCouchBlock; import earth.terrarium.handcrafted.common.block.property.CouchShape; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; import net.minecraft.client.renderer.MultiBufferSource; @@ -21,7 +19,6 @@ import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -@Environment(EnvType.CLIENT) public class ChairRenderer implements BlockEntityRenderer { public ChairRenderer(BlockEntityRendererProvider.Context ctx) { } diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/couch/CouchModel.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/couch/CouchModel.java index d7d73fb7..fbebf20d 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/couch/CouchModel.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/couch/CouchModel.java @@ -3,8 +3,6 @@ import earth.terrarium.handcrafted.Handcrafted; import earth.terrarium.handcrafted.client.BaseModel; import earth.terrarium.handcrafted.client.HandcraftedClient; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -12,7 +10,6 @@ import net.minecraft.resources.ResourceLocation; @SuppressWarnings("unused") -@Environment(EnvType.CLIENT) public class CouchModel extends BaseModel { public static final ModelLayerLocation LAYER_LOCATION_SINGLE = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "couch_single"), "main"); public static final ModelLayerLocation LAYER_LOCATION_CORNER = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "couch_corner"), "main"); @@ -58,7 +55,7 @@ public static LayerDefinition couchInvertedCornerLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(16, 101).addBox(-8.0F, -5.0F, -6.0F, 16.0F, 5.0F, 14.0F, new CubeDeformation(0.0F)) - .texOffs(16, 120).addBox(-8.0F, -5.0F, -8.0F, 14.0F, 5.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 24.0F, 0.0F, 0.0F, 3.1416F, 0.0F)); + .texOffs(16, 120).addBox(-8.0F, -5.0F, -8.0F, 14.0F, 5.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 24.0F, 0.0F, 0.0F, 3.1416F, 0.0F)); PartDefinition cube_r1 = main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(76, 101).addBox(-4.0F, -15.0F, -1.999F, 4.0F, 15.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(6.0F, -1.0F, -6.0F, 0.0F, 0.0F, 0.2182F)); diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/couch/CouchRenderer.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/couch/CouchRenderer.java index 27114d66..084aab67 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/couch/CouchRenderer.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/couch/CouchRenderer.java @@ -7,8 +7,6 @@ import earth.terrarium.handcrafted.common.block.chair.couch.CouchBlockEntity; import earth.terrarium.handcrafted.common.block.chair.couch.ExpandableCouchBlock; import earth.terrarium.handcrafted.common.block.property.CouchShape; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; @@ -22,7 +20,6 @@ import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -@Environment(EnvType.CLIENT) public class CouchRenderer implements BlockEntityRenderer { public CouchRenderer(BlockEntityRendererProvider.Context ctx) { } @@ -67,7 +64,7 @@ public void render(CouchBlockEntity entity, float partialTick, PoseStack poseSta case RIGHT -> new CouchModel(modelSet.bakeLayer(CouchModel.LAYER_LOCATION_RIGHT)); case INNER_LEFT, INNER_RIGHT -> new CouchModel(modelSet.bakeLayer(CouchModel.LAYER_LOCATION_CORNER)); case OUTER_LEFT, OUTER_RIGHT -> - new CouchModel(modelSet.bakeLayer(CouchModel.LAYER_LOCATION_INVERTED_CORNER)); + new CouchModel(modelSet.bakeLayer(CouchModel.LAYER_LOCATION_INVERTED_CORNER)); }; render(BuiltInRegistries.ITEM.getKey(entity.getStack().getItem()), BuiltInRegistries.BLOCK.getKey(entity.getBlockState().getBlock()), model, entity.getBlockState().getValue(ExpandableCouchBlock.FACING), shape, poseStack, bufferSource, packedLight, packedOverlay); } diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/diningbench/DiningBenchModel.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/diningbench/DiningBenchModel.java index 53776ec0..b621a00c 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/diningbench/DiningBenchModel.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/diningbench/DiningBenchModel.java @@ -3,8 +3,6 @@ import earth.terrarium.handcrafted.Handcrafted; import earth.terrarium.handcrafted.client.BaseModel; import earth.terrarium.handcrafted.client.HandcraftedClient; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -12,7 +10,6 @@ import net.minecraft.resources.ResourceLocation; @SuppressWarnings("unused") -@Environment(EnvType.CLIENT) public class DiningBenchModel extends BaseModel { public static final ModelLayerLocation LAYER_LOCATION_SINGLE = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "dining_bench_single"), "main"); public static final ModelLayerLocation LAYER_LOCATION_LEFT = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "dining_bench_left"), "main"); @@ -28,7 +25,7 @@ public static LayerDefinition benchSingleLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition bench_single = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(0, 13).addBox(-6.0F, -3.0F, -3.0F, 12.0F, 1.0F, 6.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(-8.0F, -9.0F, -5.0F, 16.0F, 3.0F, 10.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); + .texOffs(0, 0).addBox(-8.0F, -9.0F, -5.0F, 16.0F, 3.0F, 10.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); PartDefinition cube_r1 = bench_single.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(0, 20).addBox(-7.0F, -6.0F, -4.0F, 3.0F, 6.0F, 8.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.4618F, 0.3258F, 0.0F, 0.0F, 0.0F, 0.0873F)); @@ -42,7 +39,7 @@ public static LayerDefinition benchLeftLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition bench_left = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(0, 34).addBox(-8.0F, -3.0F, -3.0F, 14.0F, 1.0F, 6.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(-8.0F, -9.0F, -5.0F, 16.0F, 3.0F, 10.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); + .texOffs(0, 0).addBox(-8.0F, -9.0F, -5.0F, 16.0F, 3.0F, 10.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); PartDefinition cube_r1 = bench_left.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(0, 20).addBox(-1.0F, -3.0F, -4.0F, 3.0F, 6.0F, 8.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(4.2577F, -3.0986F, 0.0F, 0.0F, 0.0F, -0.0873F)); @@ -54,7 +51,7 @@ public static LayerDefinition benchMiddleLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition bench_middle = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(20, 21).addBox(-8.0F, -3.0F, -3.0F, 16.0F, 1.0F, 6.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(-8.0F, -9.0F, -5.0F, 16.0F, 3.0F, 10.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); + .texOffs(0, 0).addBox(-8.0F, -9.0F, -5.0F, 16.0F, 3.0F, 10.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); return LayerDefinition.create(meshdefinition, 64, 64); } @@ -64,7 +61,7 @@ public static LayerDefinition benchRightLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition bench_right = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(0, 34).addBox(-6.0F, -3.0F, -3.0F, 14.0F, 1.0F, 6.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(-8.0F, -9.0F, -5.0F, 16.0F, 3.0F, 10.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); + .texOffs(0, 0).addBox(-8.0F, -9.0F, -5.0F, 16.0F, 3.0F, 10.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); PartDefinition cube_r1 = bench_right.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(0, 20).addBox(-7.0F, -6.0F, -4.0F, 3.0F, 6.0F, 8.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.4618F, 0.3258F, 0.0F, 0.0F, 0.0F, 0.0873F)); diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/diningbench/DiningBenchRenderer.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/diningbench/DiningBenchRenderer.java index 49484cf8..dffc650c 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/diningbench/DiningBenchRenderer.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/diningbench/DiningBenchRenderer.java @@ -5,8 +5,6 @@ import com.teamresourceful.resourcefullib.client.CloseablePoseStack; import earth.terrarium.handcrafted.common.block.chair.diningbench.DiningBenchBlock; import earth.terrarium.handcrafted.common.block.chair.diningbench.DiningBenchBlockEntity; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; @@ -20,7 +18,6 @@ import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -@Environment(EnvType.CLIENT) public class DiningBenchRenderer implements BlockEntityRenderer { public DiningBenchRenderer(BlockEntityRendererProvider.Context ctx) { } diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/woodenbench/BenchRenderer.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/woodenbench/BenchRenderer.java index 966530bd..fb214ec0 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/woodenbench/BenchRenderer.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/woodenbench/BenchRenderer.java @@ -6,8 +6,6 @@ import earth.terrarium.handcrafted.common.block.chair.couch.ExpandableCouchBlock; import earth.terrarium.handcrafted.common.block.chair.woodenbench.WoodenBenchBlockEntity; import earth.terrarium.handcrafted.common.block.property.CouchShape; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; @@ -21,7 +19,6 @@ import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -@Environment(EnvType.CLIENT) public class BenchRenderer implements BlockEntityRenderer { public BenchRenderer(BlockEntityRendererProvider.Context ctx) { } @@ -71,9 +68,9 @@ public void render(WoodenBenchBlockEntity entity, float partialTick, PoseStack p case MIDDLE -> new WoodenBenchModel(modelSet.bakeLayer(WoodenBenchModel.LAYER_LOCATION_MIDDLE)); case RIGHT -> new WoodenBenchModel(modelSet.bakeLayer(WoodenBenchModel.LAYER_LOCATION_RIGHT)); case INNER_LEFT, INNER_RIGHT -> - new WoodenBenchModel(modelSet.bakeLayer(WoodenBenchModel.LAYER_LOCATION_CORNER)); + new WoodenBenchModel(modelSet.bakeLayer(WoodenBenchModel.LAYER_LOCATION_CORNER)); case OUTER_LEFT, OUTER_RIGHT -> - new WoodenBenchModel(modelSet.bakeLayer(WoodenBenchModel.LAYER_LOCATION_INVERTED_CORNER)); + new WoodenBenchModel(modelSet.bakeLayer(WoodenBenchModel.LAYER_LOCATION_INVERTED_CORNER)); }; render(BuiltInRegistries.ITEM.getKey(entity.getStack().getItem()), BuiltInRegistries.BLOCK.getKey(entity.getBlockState().getBlock()), model, entity.getBlockState().getValue(ExpandableCouchBlock.FACING), shape, poseStack, bufferSource, packedLight, packedOverlay); } diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/woodenbench/WoodenBenchModel.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/woodenbench/WoodenBenchModel.java index ed4d6500..1190697a 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/woodenbench/WoodenBenchModel.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/chair/woodenbench/WoodenBenchModel.java @@ -3,8 +3,6 @@ import earth.terrarium.handcrafted.Handcrafted; import earth.terrarium.handcrafted.client.BaseModel; import earth.terrarium.handcrafted.client.HandcraftedClient; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -12,7 +10,6 @@ import net.minecraft.resources.ResourceLocation; @SuppressWarnings("unused") -@Environment(EnvType.CLIENT) public class WoodenBenchModel extends BaseModel { public static final ModelLayerLocation LAYER_LOCATION_SINGLE = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "wooden_bench_single"), "main"); public static final ModelLayerLocation LAYER_LOCATION_CORNER = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "wooden_bench_corner"), "main"); @@ -30,17 +27,17 @@ public static LayerDefinition benchSingleLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(57, 96).addBox(-67.0F, -11.0F, -8.0F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(57, 96).mirror().addBox(-80.0F, -11.0F, -8.0F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(92, 82).addBox(-67.0F, -13.0F, 5.0F, 3.0F, 16.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(92, 82).mirror().addBox(-80.0F, -13.0F, 5.0F, 3.0F, 16.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(0, 84).addBox(-78.5F, -13.0F, -6.0F, 0.0F, 12.0F, 11.0F, new CubeDeformation(0.0F)) - .texOffs(0, 84).addBox(-65.5F, -13.0F, -6.0F, 0.0F, 12.0F, 11.0F, new CubeDeformation(0.0F)) - .texOffs(0, 49).addBox(-78.0F, -7.0F, -7.0F, 12.0F, 2.0F, 14.0F, new CubeDeformation(0.0F)) - .texOffs(38, 52).addBox(-80.0F, -11.0F, -7.0F, 13.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offset(72.0F, 21.0F, 0.0F)); + .texOffs(57, 96).mirror().addBox(-80.0F, -11.0F, -8.0F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(92, 82).addBox(-67.0F, -13.0F, 5.0F, 3.0F, 16.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(92, 82).mirror().addBox(-80.0F, -13.0F, 5.0F, 3.0F, 16.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(0, 84).addBox(-78.5F, -13.0F, -6.0F, 0.0F, 12.0F, 11.0F, new CubeDeformation(0.0F)) + .texOffs(0, 84).addBox(-65.5F, -13.0F, -6.0F, 0.0F, 12.0F, 11.0F, new CubeDeformation(0.0F)) + .texOffs(0, 49).addBox(-78.0F, -7.0F, -7.0F, 12.0F, 2.0F, 14.0F, new CubeDeformation(0.0F)) + .texOffs(38, 52).addBox(-80.0F, -11.0F, -7.0F, 13.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offset(72.0F, 21.0F, 0.0F)); PartDefinition cube_r1 = main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(90, 35).addBox(-5.0F, -14.119F, -6.0861F, 10.0F, 14.0F, 0.0F, new CubeDeformation(0.0F)) - .texOffs(69, 96).mirror().addBox(-8.0F, -14.7189F, -7.4812F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(69, 96).addBox(5.0F, -14.7189F, -7.4812F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-72.0F, -10.8722F, -0.4633F, 0.1309F, 0.0F, 0.0F)); + .texOffs(69, 96).mirror().addBox(-8.0F, -14.7189F, -7.4812F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(69, 96).addBox(5.0F, -14.7189F, -7.4812F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-72.0F, -10.8722F, -0.4633F, 0.1309F, 0.0F, 0.0F)); PartDefinition with_cushion = main.addOrReplaceChild("with_cushion", CubeListBuilder.create().texOffs(0, 80).addBox(-77.0F, 8.5F, -6.0F, 10.0F, 3.0F, 12.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, -17.5F, 0.0F)); @@ -54,9 +51,9 @@ public static LayerDefinition benchCornerLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(57, 96).addBox(-48.0F, -11.0F, -8.0F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(38, 52).addBox(-45.0F, -11.0F, -7.0F, 13.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)) - .texOffs(0, 33).addBox(-47.0F, -7.0F, -7.0F, 15.0F, 2.0F, 14.0F, new CubeDeformation(0.0F)) - .texOffs(78, 0).addBox(-47.0F, -7.0F, 7.0F, 14.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offset(40.0F, 21.0F, 0.0F)); + .texOffs(38, 52).addBox(-45.0F, -11.0F, -7.0F, 13.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)) + .texOffs(0, 33).addBox(-47.0F, -7.0F, -7.0F, 15.0F, 2.0F, 14.0F, new CubeDeformation(0.0F)) + .texOffs(78, 0).addBox(-47.0F, -7.0F, 7.0F, 14.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offset(40.0F, 21.0F, 0.0F)); PartDefinition cube_r1 = main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(38, 52).addBox(-6.5F, -3.0F, 0.0F, 13.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-47.0F, -8.0F, 1.5F, 0.0F, 1.5708F, 0.0F)); @@ -67,7 +64,7 @@ public static LayerDefinition benchCornerLayer() { PartDefinition cube_r4 = main.addOrReplaceChild("cube_r4", CubeListBuilder.create().texOffs(69, 96).addBox(-3.0F, -14.0F, -3.0F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-45.0F, -11.0F, -5.0F, 0.1309F, 0.0F, -0.1309F)); PartDefinition with_cushion = main.addOrReplaceChild("with_cushion", CubeListBuilder.create().texOffs(52, 52).addBox(-46.0F, 8.5F, -6.0F, 14.0F, 3.0F, 12.0F, new CubeDeformation(0.0F)) - .texOffs(88, 67).addBox(-46.0F, 8.5F, 6.0F, 12.0F, 3.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, -17.5F, 0.0F)); + .texOffs(88, 67).addBox(-46.0F, 8.5F, 6.0F, 12.0F, 3.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, -17.5F, 0.0F)); PartDefinition cube_r5 = with_cushion.addOrReplaceChild("cube_r5", CubeListBuilder.create().texOffs(50, 67).addBox(-6.5F, -1.5F, -7.0F, 13.0F, 3.0F, 12.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-45.296F, 3.7471F, 1.5257F, 0.0F, 1.5708F, 1.4399F)); @@ -81,16 +78,16 @@ public static LayerDefinition benchInvertedCornerLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(57, 96).addBox(-8.0F, -11.0F, -40.0F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(4.0F, -5.0F, -28.0F, 3.0F, 8.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 16).addBox(-7.0F, -7.0F, -40.0F, 14.0F, 2.0F, 15.0F, new CubeDeformation(0.0F)) - .texOffs(30, 81).addBox(-8.0F, -7.0F, -39.0F, 1.0F, 2.0F, 14.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-32.0F, 21.0F, 0.0F, 0.0F, -1.5708F, 0.0F)); + .texOffs(0, 0).addBox(4.0F, -5.0F, -28.0F, 3.0F, 8.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(0, 16).addBox(-7.0F, -7.0F, -40.0F, 14.0F, 2.0F, 15.0F, new CubeDeformation(0.0F)) + .texOffs(30, 81).addBox(-8.0F, -7.0F, -39.0F, 1.0F, 2.0F, 14.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-32.0F, 21.0F, 0.0F, 0.0F, -1.5708F, 0.0F)); PartDefinition cube_r1 = main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(69, 96).addBox(-3.0F, -14.0F, -3.0F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-5.0F, -11.0F, -37.0F, 0.1309F, 0.0F, -0.1309F)); PartDefinition with_cushion = main.addOrReplaceChild("with_cushion", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, -48.0F)); PartDefinition cube_r2 = with_cushion.addOrReplaceChild("cube_r2", CubeListBuilder.create().texOffs(88, 67).addBox(11.5F, -2.5F, 10.5F, 12.0F, 3.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(52, 52).addBox(11.5F, -2.5F, -1.5F, 14.0F, 3.0F, 12.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(17.5F, -6.5F, 20.5F, 0.0F, 3.1416F, 0.0F)); + .texOffs(52, 52).addBox(11.5F, -2.5F, -1.5F, 14.0F, 3.0F, 12.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(17.5F, -6.5F, 20.5F, 0.0F, 3.1416F, 0.0F)); return LayerDefinition.create(meshdefinition, 128, 128); } @@ -100,10 +97,10 @@ public static LayerDefinition benchLeftLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(38, 52).addBox(24.0F, -11.0F, -7.0F, 13.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)) - .texOffs(44, 19).mirror().addBox(24.0F, -7.0F, -7.0F, 14.0F, 2.0F, 14.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(92, 82).addBox(37.0F, -13.0F, 5.0F, 3.0F, 16.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(57, 96).addBox(37.0F, -11.0F, -8.0F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 84).addBox(38.5F, -13.0F, -6.0F, 0.0F, 12.0F, 11.0F, new CubeDeformation(0.0F)), PartPose.offset(-32.0F, 21.0F, 0.0F)); + .texOffs(44, 19).mirror().addBox(24.0F, -7.0F, -7.0F, 14.0F, 2.0F, 14.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(92, 82).addBox(37.0F, -13.0F, 5.0F, 3.0F, 16.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(57, 96).addBox(37.0F, -11.0F, -8.0F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(0, 84).addBox(38.5F, -13.0F, -6.0F, 0.0F, 12.0F, 11.0F, new CubeDeformation(0.0F)), PartPose.offset(-32.0F, 21.0F, 0.0F)); PartDefinition cube_r1 = main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(69, 96).addBox(-1.0F, -14.0F, -3.0F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(38.0F, -11.0F, -5.0F, 0.1309F, 0.0F, 0.0F)); @@ -121,7 +118,7 @@ public static LayerDefinition benchMiddleLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(0, 0).addBox(8.0F, -7.0F, -7.0F, 16.0F, 2.0F, 14.0F, new CubeDeformation(0.0F)) - .texOffs(46, 0).addBox(8.0F, -11.0F, -7.0F, 16.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offset(-16.0F, 21.0F, 0.0F)); + .texOffs(46, 0).addBox(8.0F, -11.0F, -7.0F, 16.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offset(-16.0F, 21.0F, 0.0F)); PartDefinition cube_r1 = main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(60, 82).addBox(-8.0F, -13.0F, 1.5F, 16.0F, 14.0F, 0.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(16.0F, -11.0F, -8.0F, 0.1309F, 0.0F, 0.0F)); @@ -137,10 +134,10 @@ public static LayerDefinition benchRightLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(57, 96).mirror().addBox(-8.0F, -11.0F, -8.0F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(92, 82).mirror().addBox(-8.0F, -13.0F, 5.0F, 3.0F, 16.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(0, 84).addBox(-6.5F, -13.0F, -6.0F, 0.0F, 12.0F, 11.0F, new CubeDeformation(0.0F)) - .texOffs(38, 52).addBox(-5.0F, -11.0F, -7.0F, 13.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)) - .texOffs(44, 19).addBox(-6.0F, -7.0F, -7.0F, 14.0F, 2.0F, 14.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 21.0F, 0.0F)); + .texOffs(92, 82).mirror().addBox(-8.0F, -13.0F, 5.0F, 3.0F, 16.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(0, 84).addBox(-6.5F, -13.0F, -6.0F, 0.0F, 12.0F, 11.0F, new CubeDeformation(0.0F)) + .texOffs(38, 52).addBox(-5.0F, -11.0F, -7.0F, 13.0F, 4.0F, 0.0F, new CubeDeformation(0.0F)) + .texOffs(44, 19).addBox(-6.0F, -7.0F, -7.0F, 14.0F, 2.0F, 14.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 21.0F, 0.0F)); PartDefinition cube_r1 = main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(69, 96).mirror().addBox(-2.0F, -14.0F, -3.0F, 3.0F, 14.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offsetAndRotation(-6.0F, -11.0F, -5.0F, 0.1309F, 0.0F, 0.0F)); diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/counter/CounterModel.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/counter/CounterModel.java index c79d04a9..c02c5340 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/counter/CounterModel.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/counter/CounterModel.java @@ -3,15 +3,12 @@ import earth.terrarium.handcrafted.Handcrafted; import earth.terrarium.handcrafted.client.BaseModel; import earth.terrarium.handcrafted.client.HandcraftedClient; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; import net.minecraft.client.model.geom.builders.*; import net.minecraft.resources.ResourceLocation; -@Environment(EnvType.CLIENT) public class CounterModel extends BaseModel { public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "counter"), "main"); diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/counter/CounterRenderer.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/counter/CounterRenderer.java index 7672e621..a7b92af5 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/counter/CounterRenderer.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/counter/CounterRenderer.java @@ -6,8 +6,6 @@ import earth.terrarium.handcrafted.Handcrafted; import earth.terrarium.handcrafted.common.block.chair.couch.ExpandableCouchBlock; import earth.terrarium.handcrafted.common.block.counter.CounterBlockEntity; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; @@ -21,7 +19,6 @@ import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -@Environment(EnvType.CLIENT) public class CounterRenderer implements BlockEntityRenderer { public CounterRenderer(BlockEntityRendererProvider.Context ctx) { } diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/crockery/CrockeryRenderer.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/crockery/CrockeryRenderer.java index c8f299df..a2e6420f 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/crockery/CrockeryRenderer.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/crockery/CrockeryRenderer.java @@ -5,18 +5,14 @@ import com.teamresourceful.resourcefullib.client.CloseablePoseStack; import earth.terrarium.handcrafted.common.block.crockery.CrockeryBlockEntity; import earth.terrarium.handcrafted.common.block.crockery.CrockeryComboBlock; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.world.item.ItemDisplayContext; -@Environment(EnvType.CLIENT) public class CrockeryRenderer implements BlockEntityRenderer { public CrockeryRenderer(BlockEntityRendererProvider.Context ctx) { } diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/fancybed/FancyBedModel.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/fancybed/FancyBedModel.java index 7e297fc1..2e962a3f 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/fancybed/FancyBedModel.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/fancybed/FancyBedModel.java @@ -3,8 +3,6 @@ import earth.terrarium.handcrafted.Handcrafted; import earth.terrarium.handcrafted.client.BaseModel; import earth.terrarium.handcrafted.client.HandcraftedClient; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -12,7 +10,6 @@ import net.minecraft.resources.ResourceLocation; @SuppressWarnings("unused") -@Environment(EnvType.CLIENT) public class FancyBedModel extends BaseModel { public static final ModelLayerLocation LAYER_LOCATION_SINGLE = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "bed_single"), "main"); public static final ModelLayerLocation LAYER_LOCATION_DOUBLE_LEFT = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "bed_double_left"), "main"); @@ -32,25 +29,25 @@ public static LayerDefinition bedSingle() { PartDefinition sheets = main.addOrReplaceChild("sheets", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); PartDefinition without_player = sheets.addOrReplaceChild("without_player", CubeListBuilder.create().texOffs(55, 30).addBox(-8.0F, -0.1161F, -7.8839F, 16.0F, 6.0F, 7.0F, new CubeDeformation(0.0F)) - .texOffs(0, 30).addBox(-7.0F, 0.8839F, -23.8839F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, -8.8839F, 17.8839F)); + .texOffs(0, 30).addBox(-7.0F, 0.8839F, -23.8839F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, -8.8839F, 17.8839F)); PartDefinition with_player = sheets.addOrReplaceChild("with_player", CubeListBuilder.create().texOffs(55, 0).addBox(-7.0F, -11.0F, -6.0F, 14.0F, 3.0F, 16.0F, new CubeDeformation(0.0F)) - .texOffs(0, 30).addBox(-7.0F, -8.0F, -6.0F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + .texOffs(0, 30).addBox(-7.0F, -8.0F, -6.0F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); PartDefinition cube_r1 = with_player.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(55, 43).addBox(-8.0F, 4.25F, -4.5F, 16.0F, 3.0F, 7.0F, new CubeDeformation(0.0F)) - .texOffs(55, 30).addBox(-8.0F, -1.75F, -4.5F, 16.0F, 6.0F, 7.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -11.5F, 8.5F, 0.3054F, 0.0F, 0.0F)); + .texOffs(55, 30).addBox(-8.0F, -1.75F, -4.5F, 16.0F, 6.0F, 7.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -11.5F, 8.5F, 0.3054F, 0.0F, 0.0F)); PartDefinition cube_r2 = with_player.addOrReplaceChild("cube_r2", CubeListBuilder.create().texOffs(0, 60).addBox(-9.0F, 0.0F, 0.25F, 12.0F, 8.0F, 6.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(3.0F, -13.0F, 11.0F, -0.7854F, 0.0F, 0.0F)); PartDefinition frame = main.addOrReplaceChild("frame", CubeListBuilder.create().texOffs(10, 30).addBox(8.5F, -3.5F, -3.5F, 3.0F, 7.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(0, 30).addBox(8.5F, -10.5F, 25.5F, 3.0F, 14.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(-2.5F, -1.5F, -1.5F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)) - .texOffs(0, 14).addBox(0.5F, -3.5F, -2.5F, 8.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(0.5F, -10.5F, 25.5F, 8.0F, 12.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(30, 60).addBox(-3.5F, -5.5F, -4.5F, 16.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(55, 19).addBox(-3.5F, -12.5F, 24.5F, 16.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 30).addBox(-2.5F, -10.5F, 25.5F, 3.0F, 14.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(16, 18).addBox(-2.5F, -3.5F, -3.5F, 3.0F, 7.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(-4.5F, -3.5F, -4.5F)); + .texOffs(0, 30).addBox(8.5F, -10.5F, 25.5F, 3.0F, 14.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(0, 0).addBox(-2.5F, -1.5F, -1.5F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)) + .texOffs(0, 14).addBox(0.5F, -3.5F, -2.5F, 8.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)) + .texOffs(0, 0).addBox(0.5F, -10.5F, 25.5F, 8.0F, 12.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(30, 60).addBox(-3.5F, -5.5F, -4.5F, 16.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(55, 19).addBox(-3.5F, -12.5F, 24.5F, 16.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(0, 30).addBox(-2.5F, -10.5F, 25.5F, 3.0F, 14.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(16, 18).addBox(-2.5F, -3.5F, -3.5F, 3.0F, 7.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(-4.5F, -3.5F, -4.5F)); PartDefinition cushion = main.addOrReplaceChild("cushion", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); @@ -74,26 +71,26 @@ public static LayerDefinition bedDoubleLeft() { PartDefinition sheets = main.addOrReplaceChild("sheets", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); PartDefinition with_player = sheets.addOrReplaceChild("with_player", CubeListBuilder.create().texOffs(55, 0).addBox(-7.0F, -11.0F, -6.0F, 14.0F, 3.0F, 16.0F, new CubeDeformation(0.0F)) - .texOffs(60, 0).addBox(7.0F, -11.0F, -6.0F, 1.0F, 3.0F, 16.0F, new CubeDeformation(0.0F)) - .texOffs(0, 30).addBox(-7.0F, -8.0F, -6.0F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)) - .texOffs(5, 30).addBox(7.0F, -8.0F, -6.0F, 1.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 1.0F)); + .texOffs(60, 0).addBox(7.0F, -11.0F, -6.0F, 1.0F, 3.0F, 16.0F, new CubeDeformation(0.0F)) + .texOffs(0, 30).addBox(-7.0F, -8.0F, -6.0F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)) + .texOffs(5, 30).addBox(7.0F, -8.0F, -6.0F, 1.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 1.0F)); PartDefinition cube_r1 = with_player.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(55, 43).addBox(-7.999F, 4.25F, -4.5F, 16.0F, 3.0F, 7.0F, new CubeDeformation(0.0F)) - .texOffs(55, 30).addBox(-7.999F, -1.75F, -4.5F, 16.0F, 6.0F, 7.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -11.5F, 8.5F, 0.3054F, 0.0F, 0.0F)); + .texOffs(55, 30).addBox(-7.999F, -1.75F, -4.5F, 16.0F, 6.0F, 7.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -11.5F, 8.5F, 0.3054F, 0.0F, 0.0F)); PartDefinition cube_r2 = with_player.addOrReplaceChild("cube_r2", CubeListBuilder.create().texOffs(0, 60).addBox(-9.0F, 0.0F, 0.25F, 12.0F, 8.0F, 6.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(3.0F, -13.0F, 11.0F, -0.7854F, 0.0F, 0.0F)); PartDefinition without_player = sheets.addOrReplaceChild("without_player", CubeListBuilder.create().texOffs(55, 30).addBox(-7.999F, -0.1161F, -6.8839F, 16.0F, 6.0F, 7.0F, new CubeDeformation(0.0F)) - .texOffs(0, 30).addBox(-7.0F, 0.8839F, -22.8839F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)) - .texOffs(5, 30).addBox(7.0F, 0.8839F, -22.8839F, 1.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, -8.8839F, 17.8839F)); + .texOffs(0, 30).addBox(-7.0F, 0.8839F, -22.8839F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)) + .texOffs(5, 30).addBox(7.0F, 0.8839F, -22.8839F, 1.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, -8.8839F, 17.8839F)); PartDefinition frame = main.addOrReplaceChild("frame", CubeListBuilder.create().texOffs(0, 0).addBox(-2.5F, -1.5F, -0.5F, 15.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(0.5F, -3.5F, -1.5F, 12.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(38, 30).addBox(0.5F, -10.5F, 26.5F, 12.0F, 12.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(0, 35).addBox(-3.5F, -5.5F, -3.5F, 16.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 30).addBox(-3.5F, -12.5F, 25.5F, 16.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 6).addBox(-2.5F, -10.5F, 26.5F, 3.0F, 14.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(10, 6).addBox(-2.5F, -3.5F, -2.5F, 3.0F, 7.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(-4.5F, -3.5F, -4.5F)); + .texOffs(0, 0).addBox(0.5F, -3.5F, -1.5F, 12.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)) + .texOffs(38, 30).addBox(0.5F, -10.5F, 26.5F, 12.0F, 12.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(0, 35).addBox(-3.5F, -5.5F, -3.5F, 16.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(0, 30).addBox(-3.5F, -12.5F, 25.5F, 16.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(0, 6).addBox(-2.5F, -10.5F, 26.5F, 3.0F, 14.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(10, 6).addBox(-2.5F, -3.5F, -2.5F, 3.0F, 7.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(-4.5F, -3.5F, -4.5F)); PartDefinition cushion = main.addOrReplaceChild("cushion", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); @@ -111,27 +108,27 @@ public static LayerDefinition bedDoubleMiddle() { PartDefinition sheets = main.addOrReplaceChild("sheets", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); PartDefinition without_player = sheets.addOrReplaceChild("without_player", CubeListBuilder.create().texOffs(55, 30).addBox(-7.999F, -0.1161F, -6.8839F, 16.0F, 6.0F, 7.0F, new CubeDeformation(0.0F)) - .texOffs(0, 30).mirror().addBox(-7.0F, 0.8839F, -22.8839F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(7, 30).addBox(-8.0F, 0.8839F, -22.8839F, 1.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)) - .texOffs(5, 30).addBox(7.0F, 0.8839F, -22.8839F, 1.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, -8.8839F, 17.8839F)); + .texOffs(0, 30).mirror().addBox(-7.0F, 0.8839F, -22.8839F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(7, 30).addBox(-8.0F, 0.8839F, -22.8839F, 1.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)) + .texOffs(5, 30).addBox(7.0F, 0.8839F, -22.8839F, 1.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, -8.8839F, 17.8839F)); PartDefinition with_player = sheets.addOrReplaceChild("with_player", CubeListBuilder.create().texOffs(55, 0).addBox(-7.0F, -11.0F, -6.0F, 14.0F, 3.0F, 16.0F, new CubeDeformation(0.0F)) - .texOffs(63, 0).addBox(7.0F, -11.0F, -6.0F, 1.0F, 3.0F, 16.0F, new CubeDeformation(0.0F)) - .texOffs(61, 0).addBox(-8.0F, -11.0F, -6.0F, 1.0F, 3.0F, 16.0F, new CubeDeformation(0.0F)) - .texOffs(0, 30).addBox(-7.0F, -8.0F, -6.0F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)) - .texOffs(5, 30).addBox(-8.0F, -8.0F, -6.0F, 1.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)) - .texOffs(5, 30).addBox(7.0F, -8.0F, -6.0F, 1.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 1.0F)); + .texOffs(63, 0).addBox(7.0F, -11.0F, -6.0F, 1.0F, 3.0F, 16.0F, new CubeDeformation(0.0F)) + .texOffs(61, 0).addBox(-8.0F, -11.0F, -6.0F, 1.0F, 3.0F, 16.0F, new CubeDeformation(0.0F)) + .texOffs(0, 30).addBox(-7.0F, -8.0F, -6.0F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)) + .texOffs(5, 30).addBox(-8.0F, -8.0F, -6.0F, 1.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)) + .texOffs(5, 30).addBox(7.0F, -8.0F, -6.0F, 1.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 1.0F)); PartDefinition cube_r1 = with_player.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(55, 43).addBox(-7.999F, 4.25F, -4.5F, 16.0F, 3.0F, 7.0F, new CubeDeformation(0.0F)) - .texOffs(55, 30).addBox(-7.999F, -1.75F, -4.5F, 16.0F, 6.0F, 7.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -11.5F, 8.5F, 0.3054F, 0.0F, 0.0F)); + .texOffs(55, 30).addBox(-7.999F, -1.75F, -4.5F, 16.0F, 6.0F, 7.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -11.5F, 8.5F, 0.3054F, 0.0F, 0.0F)); PartDefinition cube_r2 = with_player.addOrReplaceChild("cube_r2", CubeListBuilder.create().texOffs(0, 60).addBox(-9.0F, 0.0F, 0.25F, 12.0F, 8.0F, 6.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(3.0F, -13.0F, 11.0F, -0.7854F, 0.0F, 0.0F)); PartDefinition frame = main.addOrReplaceChild("frame", CubeListBuilder.create().texOffs(0, 0).mirror().addBox(-3.5F, -1.5F, -0.5F, 16.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(0, 0).mirror().addBox(-3.5F, -3.5F, -1.5F, 16.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(38, 30).mirror().addBox(-3.5F, -10.5F, 26.5F, 16.0F, 12.0F, 2.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(0, 35).mirror().addBox(-3.5F, -5.5F, -3.5F, 16.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(0, 30).mirror().addBox(-3.5F, -12.5F, 25.5F, 16.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offset(-4.5F, -3.5F, -4.5F)); + .texOffs(0, 0).mirror().addBox(-3.5F, -3.5F, -1.5F, 16.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(38, 30).mirror().addBox(-3.5F, -10.5F, 26.5F, 16.0F, 12.0F, 2.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(0, 35).mirror().addBox(-3.5F, -5.5F, -3.5F, 16.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(0, 30).mirror().addBox(-3.5F, -12.5F, 25.5F, 16.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offset(-4.5F, -3.5F, -4.5F)); PartDefinition cushion = main.addOrReplaceChild("cushion", CubeListBuilder.create(), PartPose.offset(-1.0F, 0.0F, 0.0F)); @@ -149,26 +146,26 @@ public static LayerDefinition bedDoubleRight() { PartDefinition sheets = main.addOrReplaceChild("sheets", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); PartDefinition with_player = sheets.addOrReplaceChild("with_player", CubeListBuilder.create().texOffs(55, 0).addBox(-7.0F, -11.0F, -6.0F, 14.0F, 3.0F, 16.0F, new CubeDeformation(0.0F)) - .texOffs(60, 0).addBox(-8.0F, -11.0F, -6.0F, 1.0F, 3.0F, 16.0F, new CubeDeformation(0.0F)) - .texOffs(0, 30).addBox(-7.0F, -8.0F, -6.0F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)) - .texOffs(5, 30).addBox(-8.0F, -8.0F, -6.0F, 1.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 1.0F)); + .texOffs(60, 0).addBox(-8.0F, -11.0F, -6.0F, 1.0F, 3.0F, 16.0F, new CubeDeformation(0.0F)) + .texOffs(0, 30).addBox(-7.0F, -8.0F, -6.0F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)) + .texOffs(5, 30).addBox(-8.0F, -8.0F, -6.0F, 1.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 1.0F)); PartDefinition cube_r1 = with_player.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(55, 43).addBox(-7.999F, 4.25F, -4.5F, 16.0F, 3.0F, 7.0F, new CubeDeformation(0.0F)) - .texOffs(55, 30).addBox(-7.999F, -1.75F, -4.5F, 16.0F, 6.0F, 7.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -11.5F, 8.5F, 0.3054F, 0.0F, 0.0F)); + .texOffs(55, 30).addBox(-7.999F, -1.75F, -4.5F, 16.0F, 6.0F, 7.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, -11.5F, 8.5F, 0.3054F, 0.0F, 0.0F)); PartDefinition cube_r2 = with_player.addOrReplaceChild("cube_r2", CubeListBuilder.create().texOffs(0, 60).addBox(-9.0F, 0.0F, 0.25F, 12.0F, 8.0F, 6.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(3.0F, -13.0F, 11.0F, -0.7854F, 0.0F, 0.0F)); PartDefinition without_player = sheets.addOrReplaceChild("without_player", CubeListBuilder.create().texOffs(55, 30).addBox(-7.999F, -0.1161F, -6.8839F, 16.0F, 6.0F, 7.0F, new CubeDeformation(0.0F)) - .texOffs(0, 30).mirror().addBox(-7.0F, 0.8839F, -22.8839F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(7, 30).addBox(-8.0F, 0.8839F, -22.8839F, 1.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, -8.8839F, 17.8839F)); + .texOffs(0, 30).mirror().addBox(-7.0F, 0.8839F, -22.8839F, 14.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(7, 30).addBox(-8.0F, 0.8839F, -22.8839F, 1.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, -8.8839F, 17.8839F)); PartDefinition frame = main.addOrReplaceChild("frame", CubeListBuilder.create().texOffs(0, 0).mirror().addBox(-3.5F, -1.5F, -0.5F, 15.0F, 3.0F, 27.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(0, 0).mirror().addBox(-3.5F, -3.5F, -1.5F, 12.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(38, 30).mirror().addBox(-3.5F, -10.5F, 26.5F, 12.0F, 12.0F, 2.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(0, 35).mirror().addBox(-3.5F, -5.5F, -3.5F, 16.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(0, 30).mirror().addBox(-3.5F, -12.5F, 25.5F, 16.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(0, 6).mirror().addBox(8.5F, -10.5F, 26.5F, 3.0F, 14.0F, 2.0F, new CubeDeformation(0.0F)).mirror(false) - .texOffs(10, 6).mirror().addBox(8.5F, -3.5F, -2.5F, 3.0F, 7.0F, 2.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offset(-4.5F, -3.5F, -4.5F)); + .texOffs(0, 0).mirror().addBox(-3.5F, -3.5F, -1.5F, 12.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(38, 30).mirror().addBox(-3.5F, -10.5F, 26.5F, 12.0F, 12.0F, 2.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(0, 35).mirror().addBox(-3.5F, -5.5F, -3.5F, 16.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(0, 30).mirror().addBox(-3.5F, -12.5F, 25.5F, 16.0F, 2.0F, 3.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(0, 6).mirror().addBox(8.5F, -10.5F, 26.5F, 3.0F, 14.0F, 2.0F, new CubeDeformation(0.0F)).mirror(false) + .texOffs(10, 6).mirror().addBox(8.5F, -3.5F, -2.5F, 3.0F, 7.0F, 2.0F, new CubeDeformation(0.0F)).mirror(false), PartPose.offset(-4.5F, -3.5F, -4.5F)); PartDefinition cushion = main.addOrReplaceChild("cushion", CubeListBuilder.create(), PartPose.offset(-1.0F, 0.0F, 0.0F)); diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/fancybed/FancyBedRenderer.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/fancybed/FancyBedRenderer.java index 2c3ff062..02f80da3 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/fancybed/FancyBedRenderer.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/fancybed/FancyBedRenderer.java @@ -9,8 +9,6 @@ import earth.terrarium.handcrafted.common.block.fancybed.FancyBedBlock; import earth.terrarium.handcrafted.common.block.fancybed.FancyBedBlockEntity; import earth.terrarium.handcrafted.common.block.property.DirectionalBlockSide; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; @@ -26,7 +24,6 @@ import net.minecraft.world.level.block.BedBlock; import net.minecraft.world.level.block.state.properties.BedPart; -@Environment(EnvType.CLIENT) public class FancyBedRenderer implements BlockEntityRenderer { public FancyBedRenderer(BlockEntityRendererProvider.Context ctx) { } diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/stackablebook/StackableBookModel.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/stackablebook/StackableBookModel.java index 35df2413..415697c1 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/stackablebook/StackableBookModel.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/stackablebook/StackableBookModel.java @@ -3,15 +3,12 @@ import earth.terrarium.handcrafted.Handcrafted; import earth.terrarium.handcrafted.client.BaseModel; import earth.terrarium.handcrafted.client.HandcraftedClient; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; import net.minecraft.client.model.geom.builders.*; import net.minecraft.resources.ResourceLocation; -@Environment(EnvType.CLIENT) public class StackableBookModel extends BaseModel { public static final ModelLayerLocation LAYER_LOCATION_BOOK_1 = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "book_1"), "main"); public static final ModelLayerLocation LAYER_LOCATION_BOOK_2 = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "book_2"), "main"); @@ -30,7 +27,7 @@ public static LayerDefinition book1() { PartDefinition book = main.addOrReplaceChild("book", CubeListBuilder.create(), PartPose.offset(0.0F, -2.0F, 0.0F)); book.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(0, 14).addBox(-6.0F, 4.0F, -1.0F, 12.0F, 1.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(-6.0F, -5.0F, -2.0F, 12.0F, 10.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 1.5708F, 0.1745F, 0.0F)); + .texOffs(0, 0).addBox(-6.0F, -5.0F, -2.0F, 12.0F, 10.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 1.5708F, 0.1745F, 0.0F)); return LayerDefinition.create(meshdefinition, 32, 32); } @@ -44,8 +41,8 @@ public static LayerDefinition book2() { PartDefinition book2 = main.addOrReplaceChild("book2", CubeListBuilder.create(), PartPose.offset(0.0F, -2.0F, 0.0F)); book2.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(0, 14).addBox(-6.0F, 4.0F, -1.0F, 12.0F, 1.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(0, 18).addBox(-1.0F, -5.0F, -2.0F, 2.0F, 10.0F, 4.0F, new CubeDeformation(0.1F)) - .texOffs(0, 0).addBox(-6.0F, -5.0F, -2.0F, 12.0F, 10.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 1.5708F, 0.1745F, 0.0F)); + .texOffs(0, 18).addBox(-1.0F, -5.0F, -2.0F, 2.0F, 10.0F, 4.0F, new CubeDeformation(0.1F)) + .texOffs(0, 0).addBox(-6.0F, -5.0F, -2.0F, 12.0F, 10.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 1.5708F, 0.1745F, 0.0F)); return LayerDefinition.create(meshdefinition, 32, 32); } @@ -59,9 +56,9 @@ public static LayerDefinition book3() { PartDefinition book4 = main.addOrReplaceChild("book4", CubeListBuilder.create(), PartPose.offset(0.0F, -2.0F, 0.0F)); PartDefinition cube_r1 = book4.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(0, 14).addBox(-6.0F, 4.0F, -1.0F, 12.0F, 1.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(0, 18).addBox(2.0F, -5.0F, -2.0F, 2.0F, 10.0F, 4.0F, new CubeDeformation(0.1F)) - .texOffs(0, 18).addBox(-4.0F, -5.0F, -2.0F, 2.0F, 10.0F, 4.0F, new CubeDeformation(0.1F)) - .texOffs(0, 0).addBox(-6.0F, -5.0F, -2.0F, 12.0F, 10.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 1.5708F, 0.1745F, 0.0F)); + .texOffs(0, 18).addBox(2.0F, -5.0F, -2.0F, 2.0F, 10.0F, 4.0F, new CubeDeformation(0.1F)) + .texOffs(0, 18).addBox(-4.0F, -5.0F, -2.0F, 2.0F, 10.0F, 4.0F, new CubeDeformation(0.1F)) + .texOffs(0, 0).addBox(-6.0F, -5.0F, -2.0F, 12.0F, 10.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 0.0F, 0.0F, 1.5708F, 0.1745F, 0.0F)); return LayerDefinition.create(meshdefinition, 32, 32); } diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/stackablebook/StackableBookRenderer.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/stackablebook/StackableBookRenderer.java index 32451567..9b1fb1fd 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/stackablebook/StackableBookRenderer.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/stackablebook/StackableBookRenderer.java @@ -6,8 +6,6 @@ import earth.terrarium.handcrafted.common.block.chair.couch.ExpandableCouchBlock; import earth.terrarium.handcrafted.common.block.stackablebook.StackableBookBlock; import earth.terrarium.handcrafted.common.block.stackablebook.StackableBookBlockEntity; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.MultiBufferSource; @@ -20,7 +18,6 @@ import net.minecraft.util.RandomSource; import net.minecraft.world.item.DyeColor; -@Environment(EnvType.CLIENT) public class StackableBookRenderer implements BlockEntityRenderer { public StackableBookRenderer(BlockEntityRendererProvider.Context ctx) { } diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/statue/StatueBlockRenderer.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/statue/StatueBlockRenderer.java index 33f03e40..2aad891a 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/statue/StatueBlockRenderer.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/statue/StatueBlockRenderer.java @@ -4,8 +4,6 @@ import com.teamresourceful.resourcefullib.client.CloseablePoseStack; import earth.terrarium.handcrafted.common.block.trophy.StatueBlock; import earth.terrarium.handcrafted.common.block.trophy.StatueBlockEntity; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.Sheets; import net.minecraft.client.renderer.block.BlockRenderDispatcher; @@ -14,7 +12,6 @@ import net.minecraft.client.resources.model.BakedModel; import net.minecraft.world.level.block.state.properties.DoubleBlockHalf; -@Environment(EnvType.CLIENT) public class StatueBlockRenderer implements BlockEntityRenderer { private final BlockRenderDispatcher blockRenderDispatcher; diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/statue/StatueEntityRenderer.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/statue/StatueEntityRenderer.java index 7c9beaec..15f362be 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/statue/StatueEntityRenderer.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/statue/StatueEntityRenderer.java @@ -6,8 +6,6 @@ import earth.terrarium.handcrafted.common.block.chair.couch.ExpandableCouchBlock; import earth.terrarium.handcrafted.common.block.trophy.StatueBlock; import earth.terrarium.handcrafted.common.block.trophy.StatueBlockEntity; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; @@ -22,7 +20,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.properties.DoubleBlockHalf; -@Environment(EnvType.CLIENT) public class StatueEntityRenderer implements BlockEntityRenderer { public StatueEntityRenderer(BlockEntityRendererProvider.Context ctx) { } diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/statue/StatueModel.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/statue/StatueModel.java index 09d9d76b..57d19947 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/statue/StatueModel.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/statue/StatueModel.java @@ -3,15 +3,12 @@ import earth.terrarium.handcrafted.Handcrafted; import earth.terrarium.handcrafted.client.BaseModel; import earth.terrarium.handcrafted.client.HandcraftedClient; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; import net.minecraft.client.model.geom.builders.*; import net.minecraft.resources.ResourceLocation; -@Environment(EnvType.CLIENT) public class StatueModel extends BaseModel { public static final ModelLayerLocation LAYER_LOCATION_WITCH = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "statue_trophy_witch"), "main"); @@ -24,15 +21,15 @@ public static LayerDefinition witch() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(0, 79).addBox(-7.0F, -2.0F, -7.0F, 14.0F, 2.0F, 14.0F, new CubeDeformation(0.0F)) - .texOffs(28, 28).addBox(-4.0F, -6.0F, -1.0F, 4.0F, 4.0F, 4.0F, new CubeDeformation(0.0F)) - .texOffs(28, 28).addBox(0.0F, -6.0F, -1.0F, 4.0F, 4.0F, 4.0F, new CubeDeformation(0.0F)) - .texOffs(0, 18).addBox(-4.0F, -22.0F, -2.0F, 8.0F, 18.0F, 6.0F, new CubeDeformation(0.5F)) - .texOffs(0, 0).addBox(-4.0F, -32.0F, -3.0F, 8.0F, 10.0F, 8.0F, new CubeDeformation(0.0F)) - .texOffs(0, 48).addBox(-5.0F, -34.0F, -4.0F, 10.0F, 2.0F, 10.0F, new CubeDeformation(0.0F)) - .texOffs(24, 0).addBox(-1.0F, -25.0F, -5.0F, 2.0F, 4.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(0.0F, -24.0F, -5.75F, 1.0F, 1.0F, 1.0F, new CubeDeformation(-0.25F)) - .texOffs(28, 18).addBox(-8.5F, -22.0F, -1.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.0F)) - .texOffs(0, 80).addBox(-6.0F, -24.0F, -14.0F, 0.0F, 16.0F, 16.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); + .texOffs(28, 28).addBox(-4.0F, -6.0F, -1.0F, 4.0F, 4.0F, 4.0F, new CubeDeformation(0.0F)) + .texOffs(28, 28).addBox(0.0F, -6.0F, -1.0F, 4.0F, 4.0F, 4.0F, new CubeDeformation(0.0F)) + .texOffs(0, 18).addBox(-4.0F, -22.0F, -2.0F, 8.0F, 18.0F, 6.0F, new CubeDeformation(0.5F)) + .texOffs(0, 0).addBox(-4.0F, -32.0F, -3.0F, 8.0F, 10.0F, 8.0F, new CubeDeformation(0.0F)) + .texOffs(0, 48).addBox(-5.0F, -34.0F, -4.0F, 10.0F, 2.0F, 10.0F, new CubeDeformation(0.0F)) + .texOffs(24, 0).addBox(-1.0F, -25.0F, -5.0F, 2.0F, 4.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(0, 0).addBox(0.0F, -24.0F, -5.75F, 1.0F, 1.0F, 1.0F, new CubeDeformation(-0.25F)) + .texOffs(28, 18).addBox(-8.5F, -22.0F, -1.0F, 4.0F, 8.0F, 4.0F, new CubeDeformation(0.0F)) + .texOffs(0, 80).addBox(-6.0F, -24.0F, -14.0F, 0.0F, 16.0F, 16.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(44, 67).addBox(7.0F, -0.5F, -7.5F, 8.0F, 5.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(-11.0F, -2.5F, 0.5F, -0.3927F, 0.0F, 0.0F)); @@ -45,7 +42,7 @@ public static LayerDefinition witch() { main.addOrReplaceChild("cube_r5", CubeListBuilder.create().texOffs(28, 18).addBox(18.0F, 8.0F, -1.0F, 4.0F, 7.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 2.0F, 0.0F, 0.0F, 0.0F, -1.789F)); main.addOrReplaceChild("cube_r6", CubeListBuilder.create().texOffs(0, 79).addBox(-1.25F, -44.5F, -6.5F, 1.0F, 2.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(0, 71).addBox(-3.25F, -42.5F, -8.5F, 4.0F, 4.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 2.0F, 0.0F, -0.2181F, 0.0038F, 0.0435F)); + .texOffs(0, 71).addBox(-3.25F, -42.5F, -8.5F, 4.0F, 4.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 2.0F, 0.0F, -0.2181F, 0.0038F, 0.0435F)); main.addOrReplaceChild("cube_r7", CubeListBuilder.create().texOffs(0, 60).addBox(-3.25F, -39.5F, -5.0F, 7.0F, 4.0F, 7.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(0.0F, 2.0F, 0.0F, -0.0873F, 0.0F, 0.0F)); diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/table/desk/DeskModel.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/table/desk/DeskModel.java index 8b7f5332..2524cc7c 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/table/desk/DeskModel.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/table/desk/DeskModel.java @@ -3,8 +3,6 @@ import earth.terrarium.handcrafted.Handcrafted; import earth.terrarium.handcrafted.client.BaseModel; import earth.terrarium.handcrafted.client.HandcraftedClient; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -12,7 +10,6 @@ import net.minecraft.resources.ResourceLocation; @SuppressWarnings("unused") -@Environment(EnvType.CLIENT) public class DeskModel extends BaseModel { public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "desk"), "main"); @@ -27,11 +24,11 @@ public static LayerDefinition tableLayer() { PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create(), PartPose.offset(0.0F, 24.0F, 0.0F)); PartDefinition table = main.addOrReplaceChild("table", CubeListBuilder.create().texOffs(0, 0).addBox(4.0F, -12.0F, 4.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(-8.0F, -16.0F, -8.0F, 16.0F, 4.0F, 16.0F, new CubeDeformation(0.0F)) - .texOffs(0, 32).addBox(-6.0F, -12.0F, -6.0F, 12.0F, 9.0F, 12.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(-7.0F, -12.0F, 4.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(-7.0F, -12.0F, -7.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(4.0F, -12.0F, -7.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + .texOffs(0, 0).addBox(-8.0F, -16.0F, -8.0F, 16.0F, 4.0F, 16.0F, new CubeDeformation(0.0F)) + .texOffs(0, 32).addBox(-6.0F, -12.0F, -6.0F, 12.0F, 9.0F, 12.0F, new CubeDeformation(0.0F)) + .texOffs(0, 0).addBox(-7.0F, -12.0F, 4.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(0, 0).addBox(-7.0F, -12.0F, -7.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(0, 0).addBox(4.0F, -12.0F, -7.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); PartDefinition overlay = main.addOrReplaceChild("overlay", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/table/desk/DeskRenderer.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/table/desk/DeskRenderer.java index 4bc5f828..bffcec77 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/table/desk/DeskRenderer.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/table/desk/DeskRenderer.java @@ -5,8 +5,6 @@ import com.teamresourceful.resourcefullib.client.CloseablePoseStack; import earth.terrarium.handcrafted.common.block.table.desk.DeskBlockEntity; import earth.terrarium.handcrafted.common.block.table.nightstand.NightstandBlock; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; @@ -20,7 +18,6 @@ import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -@Environment(EnvType.CLIENT) public class DeskRenderer implements BlockEntityRenderer { public DeskRenderer(BlockEntityRendererProvider.Context ctx) { } diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/table/nightstand/NightstandModel.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/table/nightstand/NightstandModel.java index 9e4c137f..3947b23c 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/table/nightstand/NightstandModel.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/table/nightstand/NightstandModel.java @@ -3,8 +3,6 @@ import earth.terrarium.handcrafted.Handcrafted; import earth.terrarium.handcrafted.client.BaseModel; import earth.terrarium.handcrafted.client.HandcraftedClient; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -12,7 +10,6 @@ import net.minecraft.resources.ResourceLocation; @SuppressWarnings("unused") -@Environment(EnvType.CLIENT) public class NightstandModel extends BaseModel { public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "nightstand"), "main"); @@ -27,11 +24,11 @@ public static LayerDefinition tableLayer() { PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create(), PartPose.offset(0.0F, 24.0F, 0.0F)); PartDefinition table = main.addOrReplaceChild("table", CubeListBuilder.create().texOffs(0, 0).addBox(-8.0F, -16.0F, -8.0F, 16.0F, 4.0F, 16.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(-7.0F, -12.0F, 4.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(-7.0F, -12.0F, -7.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(4.0F, -12.0F, -7.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(4.0F, -12.0F, 4.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 32).addBox(-6.0F, -12.0F, -6.0F, 12.0F, 12.0F, 12.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + .texOffs(0, 0).addBox(-7.0F, -12.0F, 4.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(0, 0).addBox(-7.0F, -12.0F, -7.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(0, 0).addBox(4.0F, -12.0F, -7.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(0, 0).addBox(4.0F, -12.0F, 4.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(0, 32).addBox(-6.0F, -12.0F, -6.0F, 12.0F, 12.0F, 12.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); PartDefinition overlay = main.addOrReplaceChild("overlay", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/table/nightstand/NightstandRenderer.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/table/nightstand/NightstandRenderer.java index 282c6780..8a6a82f2 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/table/nightstand/NightstandRenderer.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/table/nightstand/NightstandRenderer.java @@ -5,8 +5,6 @@ import com.teamresourceful.resourcefullib.client.CloseablePoseStack; import earth.terrarium.handcrafted.common.block.table.nightstand.NightstandBlock; import earth.terrarium.handcrafted.common.block.table.nightstand.NightstandBlockEntity; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; @@ -20,7 +18,6 @@ import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -@Environment(EnvType.CLIENT) public class NightstandRenderer implements BlockEntityRenderer { public NightstandRenderer(BlockEntityRendererProvider.Context ctx) { } diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/table/side_table/SideTableModel.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/table/side_table/SideTableModel.java index f789ea01..b08d3b5f 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/table/side_table/SideTableModel.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/table/side_table/SideTableModel.java @@ -3,8 +3,6 @@ import earth.terrarium.handcrafted.Handcrafted; import earth.terrarium.handcrafted.client.BaseModel; import earth.terrarium.handcrafted.client.HandcraftedClient; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -12,7 +10,6 @@ import net.minecraft.resources.ResourceLocation; @SuppressWarnings("unused") -@Environment(EnvType.CLIENT) public class SideTableModel extends BaseModel { public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "side_table"), "main"); @@ -39,11 +36,11 @@ public static LayerDefinition tableLayer() { PartDefinition overlay_side_east = overlay.addOrReplaceChild("overlay_side_east", CubeListBuilder.create().texOffs(32, 20).addBox(-14.001F, -16.0F, 1.99F, 0.0F, 8.0F, 12.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); PartDefinition table = main.addOrReplaceChild("table", CubeListBuilder.create().texOffs(12, 4).addBox(-6.0F, -16.0F, -6.0F, 12.0F, 4.0F, 12.0F, new CubeDeformation(0.0F)) - .texOffs(16, 20).addBox(-4.0F, -12.0F, -4.0F, 8.0F, 4.0F, 8.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(2.0F, -12.0F, 2.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(-5.0F, -12.0F, -5.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(2.0F, -12.0F, -5.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) - .texOffs(0, 0).addBox(-5.0F, -12.0F, 2.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + .texOffs(16, 20).addBox(-4.0F, -12.0F, -4.0F, 8.0F, 4.0F, 8.0F, new CubeDeformation(0.0F)) + .texOffs(0, 0).addBox(2.0F, -12.0F, 2.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(0, 0).addBox(-5.0F, -12.0F, -5.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(0, 0).addBox(2.0F, -12.0F, -5.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(0, 0).addBox(-5.0F, -12.0F, 2.0F, 3.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); return LayerDefinition.create(meshdefinition, 64, 64); } diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/table/side_table/SideTableRenderer.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/table/side_table/SideTableRenderer.java index 607a0a79..ba573f9b 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/table/side_table/SideTableRenderer.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/table/side_table/SideTableRenderer.java @@ -6,8 +6,6 @@ import earth.terrarium.handcrafted.client.block.table.nightstand.NightstandModel; import earth.terrarium.handcrafted.common.block.table.nightstand.NightstandBlock; import earth.terrarium.handcrafted.common.block.table.sidetable.SideTableBlockEntity; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; @@ -21,7 +19,6 @@ import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -@Environment(EnvType.CLIENT) public class SideTableRenderer implements BlockEntityRenderer { public SideTableRenderer(BlockEntityRendererProvider.Context ctx) { } diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/table/table/TableModel.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/table/table/TableModel.java index db602e4f..907ee342 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/table/table/TableModel.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/table/table/TableModel.java @@ -3,8 +3,6 @@ import earth.terrarium.handcrafted.Handcrafted; import earth.terrarium.handcrafted.client.BaseModel; import earth.terrarium.handcrafted.client.HandcraftedClient; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -12,7 +10,6 @@ import net.minecraft.resources.ResourceLocation; @SuppressWarnings("unused") -@Environment(EnvType.CLIENT) public class TableModel extends BaseModel { public static final ModelLayerLocation LAYER_LOCATION = new ModelLayerLocation(new ResourceLocation(Handcrafted.MOD_ID, "table"), "main"); diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/block/table/table/TableRenderer.java b/common/src/main/java/earth/terrarium/handcrafted/client/block/table/table/TableRenderer.java index fd9df82d..15b4ef40 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/block/table/table/TableRenderer.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/block/table/table/TableRenderer.java @@ -7,8 +7,6 @@ import earth.terrarium.handcrafted.common.block.property.TableState; import earth.terrarium.handcrafted.common.block.table.table.TableBlock; import earth.terrarium.handcrafted.common.block.table.table.TableBlockEntity; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.model.geom.ModelPart; @@ -22,7 +20,6 @@ import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; -@Environment(EnvType.CLIENT) public class TableRenderer implements BlockEntityRenderer { public TableRenderer(BlockEntityRendererProvider.Context ctx) { } diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/entity/fancypainting/FancyPaintingModel.java b/common/src/main/java/earth/terrarium/handcrafted/client/entity/fancypainting/FancyPaintingModel.java index f2b1f187..573881d0 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/entity/fancypainting/FancyPaintingModel.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/entity/fancypainting/FancyPaintingModel.java @@ -25,10 +25,10 @@ public static LayerDefinition paintingLargeLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(0, 42).addBox(-24.0F, -34.0F, -1.0F, 48.0F, 32.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(0, 38).addBox(-24.0F, -2.0F, -1.0F, 48.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(0, 38).addBox(-24.0F, -36.0F, -1.0F, 48.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(8, 0).addBox(-26.0F, -36.0F, -1.0F, 2.0F, 36.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(4, 0).addBox(24.0F, -36.0F, -1.0F, 2.0F, 36.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); + .texOffs(0, 38).addBox(-24.0F, -2.0F, -1.0F, 48.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(0, 38).addBox(-24.0F, -36.0F, -1.0F, 48.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(8, 0).addBox(-26.0F, -36.0F, -1.0F, 2.0F, 36.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(4, 0).addBox(24.0F, -36.0F, -1.0F, 2.0F, 36.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(16, 0).addBox(-25.0F, -2.0F, -0.5F, 6.0F, 3.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(22.0F, -1.1152F, 1.0793F, 0.3927F, 0.0F, 0.0F)); @@ -40,10 +40,10 @@ public static LayerDefinition paintingMediumLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(0, 42).addBox(-8.0F, -34.0F, -1.0F, 32.0F, 32.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(0, 38).addBox(-8.0F, -2.0F, -1.0F, 32.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(0, 38).addBox(-8.0F, -36.0F, -1.0F, 32.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(8, 0).addBox(-10.0F, -36.0F, -1.0F, 2.0F, 36.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(4, 0).addBox(24.0F, -36.0F, -1.0F, 2.0F, 36.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); + .texOffs(0, 38).addBox(-8.0F, -2.0F, -1.0F, 32.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(0, 38).addBox(-8.0F, -36.0F, -1.0F, 32.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(8, 0).addBox(-10.0F, -36.0F, -1.0F, 2.0F, 36.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(4, 0).addBox(24.0F, -36.0F, -1.0F, 2.0F, 36.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(16, 0).addBox(-17.0F, -2.0F, -0.5F, 6.0F, 3.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(22.0F, -1.1152F, 1.0793F, 0.3927F, 0.0F, 0.0F)); @@ -55,10 +55,10 @@ public static LayerDefinition paintingSmallLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(0, 42).addBox(-8.0F, -18.0F, -1.0F, 16.0F, 16.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(0, 38).addBox(-8.0F, -2.0F, -1.0F, 16.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(0, 38).addBox(-8.0F, -20.0F, -1.0F, 16.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(8, 0).addBox(-10.0F, -20.0F, -1.0F, 2.0F, 20.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(4, 0).addBox(8.0F, -20.0F, -1.0F, 2.0F, 20.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); + .texOffs(0, 38).addBox(-8.0F, -2.0F, -1.0F, 16.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(0, 38).addBox(-8.0F, -20.0F, -1.0F, 16.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(8, 0).addBox(-10.0F, -20.0F, -1.0F, 2.0F, 20.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(4, 0).addBox(8.0F, -20.0F, -1.0F, 2.0F, 20.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(16, 0).addBox(-25.0F, -2.0F, -0.5F, 6.0F, 3.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(22.0F, -1.1152F, 1.0793F, 0.3927F, 0.0F, 0.0F)); @@ -70,10 +70,10 @@ public static LayerDefinition paintingTallLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(0, 42).addBox(-8.0F, -34.0F, -1.0F, 16.0F, 32.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(0, 38).addBox(-8.0F, -2.0F, -1.0F, 16.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(0, 38).addBox(-8.0F, -36.0F, -1.0F, 16.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(8, 0).addBox(-10.0F, -36.0F, -1.0F, 2.0F, 36.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(4, 0).addBox(8.0F, -36.0F, -1.0F, 2.0F, 36.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); + .texOffs(0, 38).addBox(-8.0F, -2.0F, -1.0F, 16.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(0, 38).addBox(-8.0F, -36.0F, -1.0F, 16.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(8, 0).addBox(-10.0F, -36.0F, -1.0F, 2.0F, 36.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(4, 0).addBox(8.0F, -36.0F, -1.0F, 2.0F, 36.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F)); main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(16, 0).addBox(-25.0F, -2.0F, -0.5F, 6.0F, 3.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(22.0F, -1.1152F, 1.0793F, 0.3927F, 0.0F, 0.0F)); @@ -85,10 +85,10 @@ public static LayerDefinition paintingWideLayer() { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition main = partdefinition.addOrReplaceChild("main", CubeListBuilder.create().texOffs(0, 42).addBox(-16.0F, -9.6846F, -1.1776F, 32.0F, 16.0F, 1.0F, new CubeDeformation(0.0F)) - .texOffs(0, 38).addBox(-16.0F, 6.3154F, -1.1776F, 32.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(0, 38).addBox(-16.0F, -11.6846F, -1.1776F, 32.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(8, 0).addBox(-18.0F, -11.6846F, -1.1776F, 2.0F, 20.0F, 2.0F, new CubeDeformation(0.0F)) - .texOffs(4, 0).addBox(16.0F, -11.6846F, -1.1776F, 2.0F, 20.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(8.0F, 15.6846F, 0.1776F)); + .texOffs(0, 38).addBox(-16.0F, 6.3154F, -1.1776F, 32.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(0, 38).addBox(-16.0F, -11.6846F, -1.1776F, 32.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(8, 0).addBox(-18.0F, -11.6846F, -1.1776F, 2.0F, 20.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(4, 0).addBox(16.0F, -11.6846F, -1.1776F, 2.0F, 20.0F, 2.0F, new CubeDeformation(0.0F)), PartPose.offset(8.0F, 15.6846F, 0.1776F)); main.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(16, 0).addBox(-17.0F, -2.0F, -0.5F, 6.0F, 3.0F, 1.0F, new CubeDeformation(0.0F)), PartPose.offsetAndRotation(14.0F, 7.2002F, 0.9017F, 0.3927F, 0.0F, 0.0F)); diff --git a/common/src/main/java/earth/terrarium/handcrafted/client/entity/fancypainting/FancyPaintingRenderer.java b/common/src/main/java/earth/terrarium/handcrafted/client/entity/fancypainting/FancyPaintingRenderer.java index adf492d3..446a8f1e 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/client/entity/fancypainting/FancyPaintingRenderer.java +++ b/common/src/main/java/earth/terrarium/handcrafted/client/entity/fancypainting/FancyPaintingRenderer.java @@ -6,8 +6,6 @@ import com.teamresourceful.resourcefullib.client.CloseablePoseStack; import earth.terrarium.handcrafted.Handcrafted; import earth.terrarium.handcrafted.common.entity.FancyPainting; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; import net.minecraft.client.model.geom.EntityModelSet; import net.minecraft.client.renderer.MultiBufferSource; @@ -22,7 +20,6 @@ import net.minecraft.world.entity.decoration.PaintingVariant; import org.jetbrains.annotations.NotNull; -@Environment(EnvType.CLIENT) public class FancyPaintingRenderer extends EntityRenderer { public static final ResourceLocation SMALL_FRAME_TEXTURE = new ResourceLocation(Handcrafted.MOD_ID, "textures/painting/small_painting_frame.png"); diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/block/SimpleBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/block/SimpleBlock.java index 26728012..f29294ba 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/block/SimpleBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/block/SimpleBlock.java @@ -19,9 +19,10 @@ public class SimpleBlock extends Block implements SimpleWaterloggedBlock { public static final DirectionProperty FACING = HorizontalDirectionalBlock.FACING; public static final BooleanProperty WATERLOGGED = BlockStateProperties.WATERLOGGED; + public SimpleBlock(Properties properties) { super(properties); - this.registerDefaultState(this.defaultBlockState() .setValue(FACING, Direction.NORTH).setValue(WATERLOGGED, false)); + this.registerDefaultState(this.defaultBlockState().setValue(FACING, Direction.NORTH).setValue(WATERLOGGED, false)); } @Override diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/block/counter/StorageBlockEntity.java b/common/src/main/java/earth/terrarium/handcrafted/common/block/counter/StorageBlockEntity.java index 3129f243..8008c57f 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/block/counter/StorageBlockEntity.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/block/counter/StorageBlockEntity.java @@ -43,7 +43,7 @@ protected void openerCountChanged(Level level, BlockPos pos, BlockState state, i protected boolean isOwnContainer(Player player) { if (player.containerMenu instanceof ChestMenu) { - Container container = ((ChestMenu)player.containerMenu).getContainer(); + Container container = ((ChestMenu) player.containerMenu).getContainer(); return container == StorageBlockEntity.this; } else { return false; @@ -111,6 +111,7 @@ public void stopOpen(Player player) { } } + void playSound(SoundEvent sound) { BlockPos pos = this.getBlockPos(); this.level.playSound(null, pos.getX(), pos.getY(), pos.getZ(), sound, SoundSource.BLOCKS, 0.5F, this.level.random.nextFloat() * 0.1F + 0.9F); diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/block/kitchenhood/KitchenHoodBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/block/kitchenhood/KitchenHoodBlock.java index 5dc8f07b..b78e2b3e 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/block/kitchenhood/KitchenHoodBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/block/kitchenhood/KitchenHoodBlock.java @@ -17,11 +17,12 @@ @MethodsReturnNonnullByDefault public class KitchenHoodBlock extends SimpleBlock { public static final VoxelShape SHAPE = Stream.of( - Block.box(3, 13, 3, 13, 16, 13), - Block.box(0, 0, 0, 16, 6, 16), - Block.box(3, 6, 3, 13, 9, 13), - Block.box(4, 5, 4, 12, 15, 12) + Block.box(3, 13, 3, 13, 16, 13), + Block.box(0, 0, 0, 16, 6, 16), + Block.box(3, 6, 3, 13, 9, 13), + Block.box(4, 5, 4, 12, 15, 12) ).reduce(Shapes::or).get(); + public KitchenHoodBlock(Properties properties) { super(properties); } diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/block/kitchenhood/KitchenHoodPipeBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/block/kitchenhood/KitchenHoodPipeBlock.java index 1da1c1aa..d01dcb37 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/block/kitchenhood/KitchenHoodPipeBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/block/kitchenhood/KitchenHoodPipeBlock.java @@ -60,33 +60,33 @@ public void onHammer(Level level, BlockPos pos, BlockState state, Direction side static { SHAPE = Stream.of( - Block.box(3, 0, 3, 13, 3, 13), - Block.box(3, 13, 3, 13, 16, 13), - Block.box(4, 3, 4, 12, 13, 12) + Block.box(3, 0, 3, 13, 3, 13), + Block.box(3, 13, 3, 13, 16, 13), + Block.box(4, 3, 4, 12, 13, 12) ).reduce(Shapes::or).get(); NORTH_SHAPE = Stream.of( - Block.box(3, 0, 3, 13, 3, 13), - Block.box(3, 3, 13, 13, 13, 16), - Block.box(4, 3, 4, 12, 12, 12), - Block.box(4, 4, 12, 12, 12, 13) + Block.box(3, 0, 3, 13, 3, 13), + Block.box(3, 3, 13, 13, 13, 16), + Block.box(4, 3, 4, 12, 12, 12), + Block.box(4, 4, 12, 12, 12, 13) ).reduce(Shapes::or).get(); EAST_SHAPE = Stream.of( - Block.box(3, 0, 3, 13, 3, 13), - Block.box(0, 3, 3, 3, 13, 13), - Block.box(4, 3, 4, 12, 12, 12), - Block.box(3, 4, 4, 4, 12, 12) + Block.box(3, 0, 3, 13, 3, 13), + Block.box(0, 3, 3, 3, 13, 13), + Block.box(4, 3, 4, 12, 12, 12), + Block.box(3, 4, 4, 4, 12, 12) ).reduce(Shapes::or).get(); SOUTH_SHAPE = Stream.of( - Block.box(3, 0, 3, 13, 3, 13), - Block.box(3, 3, 0, 13, 13, 3), - Block.box(4, 3, 4, 12, 12, 12), - Block.box(4, 4, 3, 12, 12, 4) + Block.box(3, 0, 3, 13, 3, 13), + Block.box(3, 3, 0, 13, 13, 3), + Block.box(4, 3, 4, 12, 12, 12), + Block.box(4, 4, 3, 12, 12, 4) ).reduce(Shapes::or).get(); WEST_SHAPE = Stream.of( - Block.box(3, 0, 3, 13, 3, 13), - Block.box(13, 3, 3, 16, 13, 13), - Block.box(4, 3, 4, 12, 12, 12), - Block.box(12, 4, 4, 13, 12, 12) + Block.box(3, 0, 3, 13, 3, 13), + Block.box(13, 3, 3, 16, 13, 13), + Block.box(4, 3, 4, 12, 12, 12), + Block.box(12, 4, 4, 13, 12, 12) ).reduce(Shapes::or).get(); } } diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/block/pot/PotBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/block/pot/PotBlock.java index c1d3dd21..ebe9ae1d 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/block/pot/PotBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/block/pot/PotBlock.java @@ -14,24 +14,24 @@ @SuppressWarnings("deprecation") public class PotBlock extends Block { public static final VoxelShape THIN_SHAPE = Stream.of( - Block.box(5, 12, 5, 11, 14, 11), - Block.box(4, 0, 4, 12, 11, 12), - Block.box(6, 11, 6, 10, 12, 10) + Block.box(5, 12, 5, 11, 14, 11), + Block.box(4, 0, 4, 12, 11, 12), + Block.box(6, 11, 6, 10, 12, 10) ).reduce(Shapes::or).get(); public static final VoxelShape MEDIUM_SHAPE = Stream.of( - Block.box(3, 10, 3, 13, 12, 13), - Block.box(2, 0, 2, 14, 9, 14), - Block.box(4, 9, 4, 12, 10, 12) + Block.box(3, 10, 3, 13, 12, 13), + Block.box(2, 0, 2, 14, 9, 14), + Block.box(4, 9, 4, 12, 10, 12) ).reduce(Shapes::or).get(); public static final VoxelShape WIDE_SHAPE = Stream.of( - Block.box(2, 6, 2, 14, 8, 14), - Block.box(1, 0, 1, 15, 5, 15), - Block.box(3, 5, 3, 13, 6, 13) + Block.box(2, 6, 2, 14, 8, 14), + Block.box(1, 0, 1, 15, 5, 15), + Block.box(3, 5, 3, 13, 6, 13) ).reduce(Shapes::or).get(); public static final VoxelShape THICK_SHAPE = Stream.of( - Block.box(3, 12, 3, 13, 14, 13), - Block.box(2, 0, 2, 14, 11, 14), - Block.box(4, 11, 4, 12, 12, 12) + Block.box(3, 12, 3, 13, 14, 13), + Block.box(2, 0, 2, 14, 11, 14), + Block.box(4, 11, 4, 12, 12, 12) ).reduce(Shapes::or).get(); private final PotSize size; diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/block/table/desk/DeskBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/block/table/desk/DeskBlock.java index 37512c88..d707d7fa 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/block/table/desk/DeskBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/block/table/desk/DeskBlock.java @@ -27,12 +27,12 @@ @MethodsReturnNonnullByDefault public class DeskBlock extends SimpleEntityBlock { public static final VoxelShape SHAPE = Stream.of( - Block.box(0, 12, 0, 16, 16, 16), - Block.box(2, 3, 2, 14, 12, 14), - Block.box(12, 0, 12, 15, 12, 15), - Block.box(12, 0, 1, 15, 12, 4), - Block.box(1, 0, 1, 4, 12, 4), - Block.box(1, 0, 12, 4, 12, 15) + Block.box(0, 12, 0, 16, 16, 16), + Block.box(2, 3, 2, 14, 12, 14), + Block.box(12, 0, 12, 15, 12, 15), + Block.box(12, 0, 1, 15, 12, 4), + Block.box(1, 0, 1, 4, 12, 4), + Block.box(1, 0, 12, 4, 12, 15) ).reduce(Shapes::or).get(); public DeskBlock(Properties properties) { diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/block/table/nightstand/NightstandBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/block/table/nightstand/NightstandBlock.java index aa65922f..e12bade8 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/block/table/nightstand/NightstandBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/block/table/nightstand/NightstandBlock.java @@ -27,12 +27,12 @@ @MethodsReturnNonnullByDefault public class NightstandBlock extends SimpleEntityBlock { public static final VoxelShape SHAPE = Stream.of( - Block.box(0, 12, 0, 16, 16, 16), - Block.box(12, 0, 12, 15, 12, 15), - Block.box(12, 0, 1, 15, 12, 4), - Block.box(1, 0, 1, 4, 12, 4), - Block.box(1, 0, 12, 4, 12, 15), - Block.box(2, 0, 2, 14, 12, 14) + Block.box(0, 12, 0, 16, 16, 16), + Block.box(12, 0, 12, 15, 12, 15), + Block.box(12, 0, 1, 15, 12, 4), + Block.box(1, 0, 1, 4, 12, 4), + Block.box(1, 0, 12, 4, 12, 15), + Block.box(2, 0, 2, 14, 12, 14) ).reduce(Shapes::or).get(); public NightstandBlock(Properties properties) { diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/block/table/sidetable/SideTableBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/block/table/sidetable/SideTableBlock.java index 670983fd..a355455d 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/block/table/sidetable/SideTableBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/block/table/sidetable/SideTableBlock.java @@ -27,12 +27,12 @@ @MethodsReturnNonnullByDefault public class SideTableBlock extends SimpleEntityBlock { public static final VoxelShape SHAPE = Stream.of( - Block.box(2, 12, 2, 14, 16, 14), - Block.box(4, 8, 4, 12, 12, 12), - Block.box(3, 0, 10, 6, 12, 13), - Block.box(10, 0, 3, 13, 12, 6), - Block.box(3, 0, 3, 6, 12, 6), - Block.box(10, 0, 10, 13, 12, 13) + Block.box(2, 12, 2, 14, 16, 14), + Block.box(4, 8, 4, 12, 12, 12), + Block.box(3, 0, 10, 6, 12, 13), + Block.box(10, 0, 3, 13, 12, 6), + Block.box(3, 0, 3, 6, 12, 6), + Block.box(10, 0, 10, 13, 12, 13) ).reduce(Shapes::or).get(); public SideTableBlock(Properties properties) { diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/block/table/table/TableBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/block/table/table/TableBlock.java index 433b55fd..bce8538a 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/block/table/table/TableBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/block/table/table/TableBlock.java @@ -162,11 +162,11 @@ public SheetState getSheetShape(BlockGetter level, BlockPos pos) { static { SINGLE_SHAPE = Stream.of( - Block.box(0, 12, 0, 16, 16, 16), - Block.box(12, 0, 12, 15, 12, 15), - Block.box(12, 0, 1, 15, 12, 4), - Block.box(1, 0, 1, 4, 12, 4), - Block.box(1, 0, 12, 4, 12, 15) + Block.box(0, 12, 0, 16, 16, 16), + Block.box(12, 0, 12, 15, 12, 15), + Block.box(12, 0, 1, 15, 12, 4), + Block.box(1, 0, 1, 4, 12, 4), + Block.box(1, 0, 12, 4, 12, 15) ).reduce(Shapes::or).get(); CENTER_SHAPE = Block.box(0, 12, 0, 16, 16, 16); NORTH_EAST_CORNER_SHAPE = Shapes.or(Block.box(0, 12, 0, 16, 16, 16), Block.box(12, 0, 1, 15, 12, 4)); @@ -174,24 +174,24 @@ public SheetState getSheetShape(BlockGetter level, BlockPos pos) { SOUTH_EAST_CORNER_SHAPE = Shapes.or(Block.box(0, 12, 0, 16, 16, 16), Block.box(12, 0, 12, 15, 12, 15)); SOUTH_WEST_CORNER_SHAPE = Shapes.or(Block.box(0, 12, 0, 16, 16, 16), Block.box(1, 0, 12, 4, 12, 15)); NORTH_SIDE_SHAPE = Stream.of( - Block.box(0, 12, 0, 16, 16, 16), - Block.box(12, 0, 1, 15, 12, 4), - Block.box(1, 0, 1, 4, 12, 4) + Block.box(0, 12, 0, 16, 16, 16), + Block.box(12, 0, 1, 15, 12, 4), + Block.box(1, 0, 1, 4, 12, 4) ).reduce(Shapes::or).get(); EAST_SIDE_SHAPE = Stream.of( - Block.box(0, 12, 0, 16, 16, 16), - Block.box(12, 0, 12, 15, 12, 15), - Block.box(12, 0, 1, 15, 12, 4) + Block.box(0, 12, 0, 16, 16, 16), + Block.box(12, 0, 12, 15, 12, 15), + Block.box(12, 0, 1, 15, 12, 4) ).reduce(Shapes::or).get(); SOUTH_SIDE_SHAPE = Stream.of( - Block.box(0, 12, 0, 16, 16, 16), - Block.box(12, 0, 12, 15, 12, 15), - Block.box(1, 0, 12, 4, 12, 15) + Block.box(0, 12, 0, 16, 16, 16), + Block.box(12, 0, 12, 15, 12, 15), + Block.box(1, 0, 12, 4, 12, 15) ).reduce(Shapes::or).get(); WEST_SIDE_SHAPE = Stream.of( - Block.box(0, 12, 0, 16, 16, 16), - Block.box(1, 0, 1, 4, 12, 4), - Block.box(1, 0, 12, 4, 12, 15) + Block.box(0, 12, 0, 16, 16, 16), + Block.box(1, 0, 1, 4, 12, 4), + Block.box(1, 0, 12, 4, 12, 15) ).reduce(Shapes::or).get(); } } \ No newline at end of file diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/block/trim/CornerTrimBlock.java b/common/src/main/java/earth/terrarium/handcrafted/common/block/trim/CornerTrimBlock.java index 1ceb3132..75ff24c6 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/block/trim/CornerTrimBlock.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/block/trim/CornerTrimBlock.java @@ -44,6 +44,7 @@ public class CornerTrimBlock extends SimpleBlock implements Hammerable { public static final VoxelShape[] TOP_SHAPES = makeShapes(TOP_AABB, OCTET_NNN, OCTET_PNN, OCTET_NNP, OCTET_PNP); public static final VoxelShape[] BOTTOM_SHAPES = makeShapes(BOTTOM_AABB, OCTET_NPN, OCTET_PPN, OCTET_NPP, OCTET_PPP); public static final int[] SHAPE_BY_STATE = new int[]{12, 5, 3, 10, 14, 13, 7, 11, 13, 7, 11, 14, 8, 4, 1, 2, 4, 1, 2, 8}; + public CornerTrimBlock(Properties properties) { super(properties); this.registerDefaultState(this.defaultBlockState().setValue(SHAPE, TrimState.NORMAL).setValue(HALF, Half.BOTTOM).setValue(FACING, Direction.NORTH).setValue(WATERLOGGED, false)); @@ -64,7 +65,7 @@ public BlockState getStateForPlacement(BlockPlaceContext context) { Direction direction = context.getClickedFace(); BlockPos blockPos = context.getClickedPos(); FluidState fluidState = context.getLevel().getFluidState(blockPos); - return this.defaultBlockState().setValue(FACING, context.getHorizontalDirection()).setValue(HALF, direction != Direction.DOWN && (direction == Direction.UP || !(context.getClickLocation().y - (double)blockPos.getY() > 0.5)) ? Half.BOTTOM : Half.TOP).setValue(WATERLOGGED, fluidState.getType() == Fluids.WATER); + return this.defaultBlockState().setValue(FACING, context.getHorizontalDirection()).setValue(HALF, direction != Direction.DOWN && (direction == Direction.UP || !(context.getClickLocation().y - (double) blockPos.getY() > 0.5)) ? Half.BOTTOM : Half.TOP).setValue(WATERLOGGED, fluidState.getType() == Fluids.WATER); } @Override diff --git a/common/src/main/java/earth/terrarium/handcrafted/common/entity/SittingEntity.java b/common/src/main/java/earth/terrarium/handcrafted/common/entity/SittingEntity.java index fea13c68..676c294e 100644 --- a/common/src/main/java/earth/terrarium/handcrafted/common/entity/SittingEntity.java +++ b/common/src/main/java/earth/terrarium/handcrafted/common/entity/SittingEntity.java @@ -91,7 +91,7 @@ public boolean shouldRender(double x, double y, double z) { @Override public Vec3 getDismountLocationForPassenger(LivingEntity passenger) { return RespawnAnchorBlock.findStandUpPosition(passenger.getType(), this.level(), this.blockPosition()) - .orElse(super.getDismountLocationForPassenger(passenger)); + .orElse(super.getDismountLocationForPassenger(passenger)); } @Override diff --git a/fabric/build.gradle b/fabric/build.gradle deleted file mode 100644 index a3ee3782..00000000 --- a/fabric/build.gradle +++ /dev/null @@ -1,81 +0,0 @@ -plugins { - id "com.github.johnrengelman.shadow" version "7.1.2" -} - -architectury { - platformSetupLoomIde() - fabric() -} - -sourceSets { - main { - resources { - srcDirs += project(":forge").file("src/generated/resources").absolutePath - exclude '.cache' - } - } -} - -configurations { - common - shadowCommon - compileClasspath.extendsFrom common - runtimeClasspath.extendsFrom common - developmentFabric.extendsFrom common -} - -dependencies { - modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version" - modApi "net.fabricmc.fabric-api:fabric-api:$rootProject.fabric_api_version+$rootProject.minecraft_version" - - common(project(path: ":common", configuration: "namedElements")) { transitive false } - shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } - - modApi "com.terraformersmc:modmenu:$rootProject.modmenu_version" - - modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:$rootProject.rei_version" - modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:$rootProject.rei_version" - modCompileOnly "me.shedaniel:RoughlyEnoughItems-default-plugin-fabric:$rootProject.rei_version" - modLocalRuntime "dev.architectury:architectury-fabric:8.1.75" - - modApi "com.teamresourceful.resourcefullib:resourcefullib-fabric-$rootProject.minecraft_version:$rootProject.resourcefullib_version" -} - -processResources { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - filesMatching("fabric.mod.json") { - expand "version": rootProject.version, - "fabric_loader_version": rootProject.fabric_loader_version, - "github_name": rootProject.github_name, - "resourcefullib_version": rootProject.resourcefullib_version - } -} - -shadowJar { - configurations = [project.configurations.shadowCommon] - archiveClassifier.set "dev-shadow" -} - -remapJar { - input.set shadowJar.archiveFile - dependsOn shadowJar - archiveClassifier.set null -} - -jar { - archiveClassifier.set "dev" - archivesBaseName = "$mod_id-fabric-$minecraft_version" -} - -sourcesJar { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - def commonSources = project(":common").sourcesJar - dependsOn commonSources - from commonSources.archiveFile.map { zipTree(it) } -} - -components.java { - withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) { - skip() - } -} \ No newline at end of file diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts new file mode 100644 index 00000000..cd4eeabc --- /dev/null +++ b/fabric/build.gradle.kts @@ -0,0 +1,33 @@ +architectury { + fabric() +} + +val common: Configuration by configurations.creating { + configurations.compileClasspath.get().extendsFrom(this) + configurations.runtimeClasspath.get().extendsFrom(this) + configurations["developmentFabric"].extendsFrom(this) +} + +dependencies { + val minecraftVersion: String by project + val fabricLoaderVersion: String by project + val fabricApiVersion: String by project + + modImplementation(group = "net.fabricmc", name = "fabric-loader", version = fabricLoaderVersion) + modApi(group = "net.fabricmc.fabric-api", name = "fabric-api", version = "$fabricApiVersion+$minecraftVersion") + + common(project(":common", configuration = "namedElements")) { + isTransitive = false + } + shadowCommon(project(path = ":common", configuration = "transformProductionFabric")) { + isTransitive = false + } +} + +tasks.processResources { + inputs.property("version", version) + + filesMatching("fabric.mod.json") { + expand("version" to version) + } +} \ No newline at end of file diff --git a/fabric/gradle.properties b/fabric/gradle.properties new file mode 100644 index 00000000..6e884186 --- /dev/null +++ b/fabric/gradle.properties @@ -0,0 +1,2 @@ +fabricLoaderVersion=0.14.21 +fabricApiVersion=0.84.0 diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 383d44a7..9cd68253 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -17,8 +17,8 @@ ], "contact": { "website": "https://www.curseforge.com/minecraft/mc-mods/handcrafted", - "repo": "https://github.com/terrarium-earth/${github_name}", - "issues": "https://github.com/terrarium-earth/${github_name}/issues" + "repo": "https://github.com/terrarium-earth/handcrafted", + "issues": "https://github.com/terrarium-earth/handcrafted/issues" }, "license": "Terrarium Licence", "icon": "icon.png", @@ -38,6 +38,6 @@ "depends": { "fabric": "*", "minecraft": ">=1.20", - "resourcefullib": ">=${resourcefullib_version}" + "resourcefullib": ">=2.1.1" } } diff --git a/forge/build.gradle b/forge/build.gradle deleted file mode 100644 index 765a1cd3..00000000 --- a/forge/build.gradle +++ /dev/null @@ -1,92 +0,0 @@ -plugins { - id "com.github.johnrengelman.shadow" version "7.1.2" -} - -architectury { - platformSetupLoomIde() - forge() -} - -sourceSets { - main { - resources { - srcDirs += project(":forge").file("src/generated/resources").absolutePath - exclude '.cache' - } - } -} - -loom { - forge { - mixinConfig "$project.mod_id-common.mixins.json" - mixinConfig "${project.mod_id}.mixins.json" - dataGen { - mod project.mod_id - } - } - runs { - data { - programArgs "--existing", project(":common").file("src/main/resources").absolutePath - } - } -} - -configurations { - common - shadowCommon - compileClasspath.extendsFrom common - runtimeClasspath.extendsFrom common - developmentForge.extendsFrom common -} - -dependencies { - forge "net.minecraftforge:forge:$rootProject.minecraft_version-$rootProject.forge_version" - - common(project(path: ":common", configuration: "namedElements")) { transitive false } - shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } - -// modCompileOnly "mezz.jei:jei-$rootProject.minecraft_version-forge-api:$rootProject.jei_version" -// modLocalRuntime("mezz.jei:jei-$rootProject.minecraft_version-forge:$rootProject.jei_version") { transitive = false } - - modApi "com.teamresourceful.resourcefullib:resourcefullib-forge-$rootProject.minecraft_version:$rootProject.resourcefullib_version" -} - -processResources { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - filesMatching("META-INF/mods.toml") { - expand "version": rootProject.version, - "github_name": rootProject.github_name, - "resourcefullib_version": rootProject.resourcefullib_version - } -} - -shadowJar { - exclude "fabric.mod.json" - - configurations = [project.configurations.shadowCommon] - archiveClassifier.set "dev-shadow" -} - -remapJar { - input.set shadowJar.archiveFile - dependsOn shadowJar - archiveClassifier.set null -} - -jar { - archiveClassifier.set "dev" - archivesBaseName = "$mod_id-forge-$minecraft_version" -} - -sourcesJar { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - def commonSources = project(":common").sourcesJar - dependsOn commonSources - from commonSources.archiveFile.map { zipTree(it) } -} - -components.java { - withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) { - skip() - } -} \ No newline at end of file diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts new file mode 100644 index 00000000..6f16ef63 --- /dev/null +++ b/forge/build.gradle.kts @@ -0,0 +1,46 @@ +architectury { + forge() +} + +loom { + forge { + mixinConfig("handcrafted-common.mixins.json") + mixinConfig("handcrafted.mixins.json") + } + runs { + create("data") { + data() + programArgs("--all", "--mod", "handcrafted") + programArgs("--output", project(":common").file("src/main/generated/resources").absolutePath) + programArgs("--existing", project(":common").file("src/main/resources").absolutePath) + } + } +} + +val common: Configuration by configurations.creating { + configurations.compileClasspath.get().extendsFrom(this) + configurations.runtimeClasspath.get().extendsFrom(this) + configurations["developmentForge"].extendsFrom(this) +} + +dependencies { + val minecraftVersion: String by project + val forgeVersion: String by project + + forge(group = "net.minecraftforge", name = "forge", version = "$minecraftVersion-$forgeVersion") + + common(project(":common", configuration = "namedElements")) { + isTransitive = false + } + shadowCommon(project(path = ":common", configuration = "transformProductionForge")) { + isTransitive = false + } +} + +tasks.processResources { + inputs.property("version", version) + + filesMatching("META-INF/mods.toml") { + expand("version" to version) + } +} diff --git a/forge/gradle.properties b/forge/gradle.properties index 32f842a6..0a7c6b19 100644 --- a/forge/gradle.properties +++ b/forge/gradle.properties @@ -1 +1,2 @@ -loom.platform=forge \ No newline at end of file +loom.platform=forge +forgeVersion=47.0.19 diff --git a/forge/src/main/java/earth/terrarium/handcrafted/datagen/provider/client/ModLangProvider.java b/forge/src/main/java/earth/terrarium/handcrafted/datagen/provider/client/ModLangProvider.java index 442064e7..2cea373d 100644 --- a/forge/src/main/java/earth/terrarium/handcrafted/datagen/provider/client/ModLangProvider.java +++ b/forge/src/main/java/earth/terrarium/handcrafted/datagen/provider/client/ModLangProvider.java @@ -33,11 +33,11 @@ protected void addTranslations() { ModBlocks.BLOCKS.stream().forEach(entry -> { addBlock(entry, StringUtils.capitaliseAllWords(Objects.requireNonNull(entry.getId()).getPath() - .replace("_1", "") - .replace("_2", "") - .replace("_3", "") - .replace("_4", "") - .replace("_", " ") + .replace("_1", "") + .replace("_2", "") + .replace("_3", "") + .replace("_4", "") + .replace("_", " ") )); }); diff --git a/forge/src/main/java/earth/terrarium/handcrafted/datagen/provider/server/ModLootTableProvider.java b/forge/src/main/java/earth/terrarium/handcrafted/datagen/provider/server/ModLootTableProvider.java index a7fc82d6..5d6d15bd 100644 --- a/forge/src/main/java/earth/terrarium/handcrafted/datagen/provider/server/ModLootTableProvider.java +++ b/forge/src/main/java/earth/terrarium/handcrafted/datagen/provider/server/ModLootTableProvider.java @@ -16,15 +16,12 @@ import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.level.block.BedBlock; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.SeaPickleBlock; import net.minecraft.world.level.block.state.properties.BedPart; import net.minecraft.world.level.block.state.properties.DoubleBlockHalf; 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.entries.LootPoolEntryContainer; 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; diff --git a/forge/src/main/java/earth/terrarium/handcrafted/datagen/provider/server/ModRecipeProvider.java b/forge/src/main/java/earth/terrarium/handcrafted/datagen/provider/server/ModRecipeProvider.java index f14d1b50..759968a6 100644 --- a/forge/src/main/java/earth/terrarium/handcrafted/datagen/provider/server/ModRecipeProvider.java +++ b/forge/src/main/java/earth/terrarium/handcrafted/datagen/provider/server/ModRecipeProvider.java @@ -9,7 +9,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; -import net.minecraftforge.common.Tags; import net.minecraftforge.registries.ForgeRegistries; import java.util.Objects; @@ -25,15 +24,15 @@ public ModRecipeProvider(PackOutput output) { @Override protected void buildRecipes(Consumer consumer) { createColouredSetRecipe(consumer, "cushion", 8, r -> r - .define('/', Items.FEATHER) - .pattern("###") - .pattern("///") - .pattern("###")); + .define('/', Items.FEATHER) + .pattern("###") + .pattern("///") + .pattern("###")); createColouredSetRecipe(consumer, "sheet", 8, r -> r - .pattern(" ") - .pattern("###") - .pattern(" ")); + .pattern(" ") + .pattern("###") + .pattern(" ")); createSingleDyeShapeless(consumer, ModItems.BLACK_CUSHION.get(), 1, r -> r.unlockedBy("has_cushion", has(ModTags.CUSHIONS)).requires(ModTags.CUSHIONS).requires(Items.BLACK_DYE)); createSingleDyeShapeless(consumer, ModItems.BLUE_CUSHION.get(), 1, r -> r.unlockedBy("has_cushion", has(ModTags.CUSHIONS)).requires(ModTags.CUSHIONS).requires(Items.BLUE_DYE)); @@ -71,370 +70,370 @@ protected void buildRecipes(Consumer consumer) { createSimple(consumer, ModItems.HAMMER.get(), 1, r -> r - .unlockedBy("has_board", has(ModTags.BOARDS)) - .define('#', ModTags.BOARDS) - .define('/', Items.IRON_INGOT) - .pattern(" / ") - .pattern(" #/") - .pattern("# ")); + .unlockedBy("has_board", has(ModTags.BOARDS)) + .define('#', ModTags.BOARDS) + .define('/', Items.IRON_INGOT) + .pattern(" / ") + .pattern(" #/") + .pattern("# ")); createSimple(consumer, ModItems.STACKABLE_BOOK.get(), 3, r -> r - .unlockedBy("has_book", has(Items.BOOK)) - .define('#', Items.BOOK) - .pattern(" # ") - .pattern(" # ") - .pattern(" # ")); + .unlockedBy("has_book", has(Items.BOOK)) + .define('#', Items.BOOK) + .pattern(" # ") + .pattern(" # ") + .pattern(" # ")); createSimpleShapeless(consumer, ModItems.FANCY_PAINTING.get(), 1, r -> r - .unlockedBy("has_painting", has(Items.PAINTING)) - .requires(Items.PAINTING) - .requires(Items.GOLD_INGOT)); + .unlockedBy("has_painting", has(Items.PAINTING)) + .requires(Items.PAINTING) + .requires(Items.GOLD_INGOT)); createWoodSetRecipe(consumer, "chair", 2, r -> r - .pattern("# ") - .pattern("###") - .pattern("# #")); + .pattern("# ") + .pattern("###") + .pattern("# #")); createWoodSetRecipe(consumer, "table", 2, r -> r - .pattern("###") - .pattern("# #") - .pattern("# #")); + .pattern("###") + .pattern("# #") + .pattern("# #")); createWoodSetRecipe(consumer, "bench", 3, r -> r - .pattern("###") - .pattern("###") - .pattern("# #")); + .pattern("###") + .pattern("###") + .pattern("# #")); createSimple(consumer, ModItems.BENCH.get(), 1, r -> r - .unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)) - .define('#', Items.IRON_INGOT) - .define('/', Items.IRON_BARS) - .pattern("/#/") - .pattern("/#/") - .pattern("/ /")); + .unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)) + .define('#', Items.IRON_INGOT) + .define('/', Items.IRON_BARS) + .pattern("/#/") + .pattern("/#/") + .pattern("/ /")); createSimple(consumer, ModItems.FROZEN_BENCH.get(), 1, r -> r - .unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)) - .define('#', ModItems.BENCH.get()) - .define('/', Items.SNOWBALL) - .pattern("///") - .pattern(" # ") - .pattern(" ")); + .unlockedBy("has_iron_ingot", has(Items.IRON_INGOT)) + .define('#', ModItems.BENCH.get()) + .define('/', Items.SNOWBALL) + .pattern("///") + .pattern(" # ") + .pattern(" ")); createWoodSetRecipe(consumer, "couch", 3, r -> r - .define('@', ModItems.WHITE_CUSHION.get()) - .define('/', Items.WHITE_WOOL) - .pattern(" @ ") - .pattern("#/#") - .pattern("###")); + .define('@', ModItems.WHITE_CUSHION.get()) + .define('/', Items.WHITE_WOOL) + .pattern(" @ ") + .pattern("#/#") + .pattern("###")); createWoodSetRecipe(consumer, "fancy_bed", 1, r -> r - .define('@', ModItems.WHITE_CUSHION.get()) - .define('$', ModItems.WHITE_SHEET.get()) - .define('/', Items.WHITE_WOOL) - .pattern("@$ ") - .pattern("///") - .pattern("###")); + .define('@', ModItems.WHITE_CUSHION.get()) + .define('$', ModItems.WHITE_SHEET.get()) + .define('/', Items.WHITE_WOOL) + .pattern("@$ ") + .pattern("///") + .pattern("###")); createWoodSetRecipe(consumer, "dining_bench", 3, r -> r - .pattern(" ") - .pattern("###") - .pattern("# #")); + .pattern(" ") + .pattern("###") + .pattern("# #")); createWoodSetRecipeWithPlanks(consumer, "nightstand", 2, r -> r - .define('@', Items.CHEST) - .pattern("///") - .pattern("#@#") - .pattern("###")); + .define('@', Items.CHEST) + .pattern("///") + .pattern("#@#") + .pattern("###")); createWoodSetRecipeWithPlanks(consumer, "desk", 2, r -> r - .define('@', Items.CHEST) - .pattern("///") - .pattern("#@#") - .pattern("# #")); + .define('@', Items.CHEST) + .pattern("///") + .pattern("#@#") + .pattern("# #")); createWoodSetRecipeWithPlanks(consumer, "side_table", 2, r -> r - .pattern(" ") - .pattern("#/#") - .pattern("# #")); + .pattern(" ") + .pattern("#/#") + .pattern("# #")); createWoodSetRecipe(consumer, "counter", 2, r -> r - .define('@', Items.CHEST) - .define('/', Items.CALCITE) - .pattern("///") - .pattern("#@#") - .pattern("###")); + .define('@', Items.CHEST) + .define('/', Items.CALCITE) + .pattern("///") + .pattern("#@#") + .pattern("###")); createWoodSetRecipe(consumer, "drawer", 2, r -> r - .define('/', Items.CHEST) - .pattern("###") - .pattern("#/#") - .pattern("###")); + .define('/', Items.CHEST) + .pattern("###") + .pattern("#/#") + .pattern("###")); createWoodSetRecipeWithPlanks(consumer, "cupboard", 2, r -> r - .define('@', Items.CHEST) - .pattern("###") - .pattern("/@/") - .pattern("###")); + .define('@', Items.CHEST) + .pattern("###") + .pattern("/@/") + .pattern("###")); createWoodSetRecipe(consumer, "shelf", 2, r -> r - .pattern("###") - .pattern(" ") - .pattern("###")); + .pattern("###") + .pattern(" ") + .pattern("###")); createSimple(consumer, ModItems.OVEN.get(), 1, r -> r - .unlockedBy("has_smoker", has(Items.SMOKER)) - .define('#', Items.BRICK) - .define('/', Items.IRON_BARS) - .define('@', Items.SMOKER) - .pattern("#/#") - .pattern("#@#") - .pattern("###")); + .unlockedBy("has_smoker", has(Items.SMOKER)) + .define('#', Items.BRICK) + .define('/', Items.IRON_BARS) + .define('@', Items.SMOKER) + .pattern("#/#") + .pattern("#@#") + .pattern("###")); createSimple(consumer, ModItems.KITCHEN_HOOD.get(), 1, r -> r - .unlockedBy("has_oven", has(ModItems.OVEN.get())) - .define('#', Items.IRON_BARS) - .define('/', ModItems.KITCHEN_HOOD_PIPE.get()) - .pattern(" / ") - .pattern("###") - .pattern(" ")); + .unlockedBy("has_oven", has(ModItems.OVEN.get())) + .define('#', Items.IRON_BARS) + .define('/', ModItems.KITCHEN_HOOD_PIPE.get()) + .pattern(" / ") + .pattern("###") + .pattern(" ")); createSimple(consumer, ModItems.KITCHEN_HOOD_PIPE.get(), 1, r -> r - .unlockedBy("has_oven", has(ModItems.OVEN.get())) - .define('#', Items.IRON_BARS) - .pattern("# #") - .pattern("# #") - .pattern("# #")); + .unlockedBy("has_oven", has(ModItems.OVEN.get())) + .define('#', Items.IRON_BARS) + .pattern("# #") + .pattern("# #") + .pattern("# #")); createWoodSetRecipe(consumer, "pillar_trim", 4, r -> r - .pattern(" # ") - .pattern(" # ") - .pattern(" # ")); + .pattern(" # ") + .pattern(" # ") + .pattern(" # ")); createWoodSetRecipe(consumer, "corner_trim", 4, r -> r - .pattern("###") - .pattern(" #") - .pattern(" #")); + .pattern("###") + .pattern(" #") + .pattern(" #")); createTrim(consumer, "pillar_trim", 4, r -> r - .pattern(" # ") - .pattern(" # ") - .pattern(" # ")); + .pattern(" # ") + .pattern(" # ") + .pattern(" # ")); createTrim(consumer, "corner_trim", 4, r -> r - .pattern("###") - .pattern(" #") - .pattern(" #")); + .pattern("###") + .pattern(" #") + .pattern(" #")); createSimpleShapeless(consumer, ModItems.BERRY_JAM_JAR.get(), 1, r -> r - .unlockedBy("has_sweet_berries", has(Items.SWEET_BERRIES)) - .requires(Items.SWEET_BERRIES) - .requires(Items.GLASS_BOTTLE)); + .unlockedBy("has_sweet_berries", has(Items.SWEET_BERRIES)) + .requires(Items.SWEET_BERRIES) + .requires(Items.GLASS_BOTTLE)); createSimpleShapeless(consumer, ModItems.WHITE_CUP.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_CUP.get()) - .requires(Items.WHITE_DYE)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_CUP.get()) + .requires(Items.WHITE_DYE)); createSimpleShapeless(consumer, ModItems.YELLOW_CUP.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_CUP.get()) - .requires(Items.YELLOW_DYE)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_CUP.get()) + .requires(Items.YELLOW_DYE)); createSimpleShapeless(consumer, ModItems.BLUE_CUP.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_CUP.get()) - .requires(Items.BLUE_DYE)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_CUP.get()) + .requires(Items.BLUE_DYE)); createSimple(consumer, ModItems.WOOD_CUP.get(), 3, r -> r - .unlockedBy("has_board", has(ModTags.BOARDS)) - .define('#', ModTags.BOARDS) - .pattern(" ") - .pattern(" # ") - .pattern(" # ")); + .unlockedBy("has_board", has(ModTags.BOARDS)) + .define('#', ModTags.BOARDS) + .pattern(" ") + .pattern(" # ") + .pattern(" # ")); createSimple(consumer, ModItems.TERRACOTTA_CUP.get(), 3, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .define('#', Items.TERRACOTTA) - .pattern(" ") - .pattern(" # ") - .pattern(" # ")); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .define('#', Items.TERRACOTTA) + .pattern(" ") + .pattern(" # ") + .pattern(" # ")); createSimpleShapeless(consumer, ModItems.WHITE_PLATE.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_PLATE.get()) - .requires(Items.WHITE_DYE)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_PLATE.get()) + .requires(Items.WHITE_DYE)); createSimpleShapeless(consumer, ModItems.YELLOW_PLATE.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_PLATE.get()) - .requires(Items.YELLOW_DYE)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_PLATE.get()) + .requires(Items.YELLOW_DYE)); createSimpleShapeless(consumer, ModItems.BLUE_PLATE.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_PLATE.get()) - .requires(Items.BLUE_DYE)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_PLATE.get()) + .requires(Items.BLUE_DYE)); createSimple(consumer, ModItems.WOOD_PLATE.get(), 3, r -> r - .unlockedBy("has_board", has(ModTags.BOARDS)) - .define('#', ModTags.BOARDS) - .pattern(" ") - .pattern("###") - .pattern(" ")); + .unlockedBy("has_board", has(ModTags.BOARDS)) + .define('#', ModTags.BOARDS) + .pattern(" ") + .pattern("###") + .pattern(" ")); createSimple(consumer, ModItems.TERRACOTTA_PLATE.get(), 3, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .define('#', Items.TERRACOTTA) - .pattern(" ") - .pattern("###") - .pattern(" ")); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .define('#', Items.TERRACOTTA) + .pattern(" ") + .pattern("###") + .pattern(" ")); createSimpleShapeless(consumer, ModItems.WHITE_BOWL.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_BOWL.get()) - .requires(Items.WHITE_DYE)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_BOWL.get()) + .requires(Items.WHITE_DYE)); createSimpleShapeless(consumer, ModItems.YELLOW_BOWL.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_BOWL.get()) - .requires(Items.YELLOW_DYE)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_BOWL.get()) + .requires(Items.YELLOW_DYE)); createSimpleShapeless(consumer, ModItems.BLUE_BOWL.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_BOWL.get()) - .requires(Items.BLUE_DYE)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_BOWL.get()) + .requires(Items.BLUE_DYE)); createSimple(consumer, ModItems.WOOD_BOWL.get(), 3, r -> r - .unlockedBy("has_board", has(ModTags.BOARDS)) - .define('#', ModTags.BOARDS) - .pattern("# #") - .pattern(" # ") - .pattern(" ")); + .unlockedBy("has_board", has(ModTags.BOARDS)) + .define('#', ModTags.BOARDS) + .pattern("# #") + .pattern(" # ") + .pattern(" ")); createSimple(consumer, ModItems.TERRACOTTA_BOWL.get(), 3, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .define('#', Items.TERRACOTTA) - .pattern("# #") - .pattern(" # ") - .pattern(" ")); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .define('#', Items.TERRACOTTA) + .pattern("# #") + .pattern(" # ") + .pattern(" ")); createSimpleShapeless(consumer, ModItems.WHITE_CROCKERY_COMBO.get(), 1, r -> r - .unlockedBy("has_terracotta=_plate", has(ModItems.TERRACOTTA_PLATE.get())) - .unlockedBy("has_terracotta_bowl", has(ModItems.TERRACOTTA_BOWL.get())) - .requires(ModItems.WHITE_CUP.get()) - .requires(ModItems.WHITE_PLATE.get())); + .unlockedBy("has_terracotta=_plate", has(ModItems.TERRACOTTA_PLATE.get())) + .unlockedBy("has_terracotta_bowl", has(ModItems.TERRACOTTA_BOWL.get())) + .requires(ModItems.WHITE_CUP.get()) + .requires(ModItems.WHITE_PLATE.get())); createSimpleShapeless(consumer, ModItems.YELLOW_CROCKERY_COMBO.get(), 1, r -> r - .unlockedBy("has_terracotta=_plate", has(ModItems.TERRACOTTA_PLATE.get())) - .unlockedBy("has_terracotta_bowl", has(ModItems.TERRACOTTA_BOWL.get())) - .requires(ModItems.YELLOW_CUP.get()) - .requires(ModItems.YELLOW_PLATE.get())); + .unlockedBy("has_terracotta=_plate", has(ModItems.TERRACOTTA_PLATE.get())) + .unlockedBy("has_terracotta_bowl", has(ModItems.TERRACOTTA_BOWL.get())) + .requires(ModItems.YELLOW_CUP.get()) + .requires(ModItems.YELLOW_PLATE.get())); createSimpleShapeless(consumer, ModItems.BLUE_CROCKERY_COMBO.get(), 1, r -> r - .unlockedBy("has_terracotta=_plate", has(ModItems.TERRACOTTA_PLATE.get())) - .unlockedBy("has_terracotta_bowl", has(ModItems.TERRACOTTA_BOWL.get())) - .requires(ModItems.BLUE_CUP.get()) - .requires(ModItems.BLUE_PLATE.get())); + .unlockedBy("has_terracotta=_plate", has(ModItems.TERRACOTTA_PLATE.get())) + .unlockedBy("has_terracotta_bowl", has(ModItems.TERRACOTTA_BOWL.get())) + .requires(ModItems.BLUE_CUP.get()) + .requires(ModItems.BLUE_PLATE.get())); createSimpleShapeless(consumer, ModItems.WOOD_CROCKERY_COMBO.get(), 1, r -> r - .unlockedBy("has_terracotta=_plate", has(ModItems.TERRACOTTA_PLATE.get())) - .unlockedBy("has_terracotta_bowl", has(ModItems.TERRACOTTA_BOWL.get())) - .requires(ModItems.WOOD_CUP.get()) - .requires(ModItems.WOOD_PLATE.get())); + .unlockedBy("has_terracotta=_plate", has(ModItems.TERRACOTTA_PLATE.get())) + .unlockedBy("has_terracotta_bowl", has(ModItems.TERRACOTTA_BOWL.get())) + .requires(ModItems.WOOD_CUP.get()) + .requires(ModItems.WOOD_PLATE.get())); createSimpleShapeless(consumer, ModItems.TERRACOTTA_CROCKERY_COMBO.get(), 1, r -> r - .unlockedBy("has_terracotta=_plate", has(ModItems.TERRACOTTA_PLATE.get())) - .unlockedBy("has_terracotta_bowl", has(ModItems.TERRACOTTA_BOWL.get())) - .requires(ModItems.TERRACOTTA_CUP.get()) - .requires(ModItems.TERRACOTTA_PLATE.get())); + .unlockedBy("has_terracotta=_plate", has(ModItems.TERRACOTTA_PLATE.get())) + .unlockedBy("has_terracotta_bowl", has(ModItems.TERRACOTTA_BOWL.get())) + .requires(ModItems.TERRACOTTA_CUP.get()) + .requires(ModItems.TERRACOTTA_PLATE.get())); createSimple(consumer, ModItems.TERRACOTTA_THIN_POT.get(), 3, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .define('#', Items.TERRACOTTA) - .pattern("## ") - .pattern("## ") - .pattern(" ")); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .define('#', Items.TERRACOTTA) + .pattern("## ") + .pattern("## ") + .pattern(" ")); createSimple(consumer, ModItems.TERRACOTTA_MEDIUM_POT.get(), 3, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .define('#', Items.TERRACOTTA) - .pattern("## ") - .pattern("## ") - .pattern("## ")); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .define('#', Items.TERRACOTTA) + .pattern("## ") + .pattern("## ") + .pattern("## ")); createSimple(consumer, ModItems.TERRACOTTA_WIDE_POT.get(), 3, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .define('#', Items.TERRACOTTA) - .pattern("# #") - .pattern("# #") - .pattern(" # ")); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .define('#', Items.TERRACOTTA) + .pattern("# #") + .pattern("# #") + .pattern(" # ")); createSimple(consumer, ModItems.TERRACOTTA_THICK_POT.get(), 3, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .define('#', Items.TERRACOTTA) - .pattern("# #") - .pattern("# #") - .pattern("###")); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .define('#', Items.TERRACOTTA) + .pattern("# #") + .pattern("# #") + .pattern("###")); createSimpleShapeless(consumer, ModItems.WHITE_GLAZED_THIN_POT.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_THIN_POT.get()) - .requires(Items.WHITE_GLAZED_TERRACOTTA)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_THIN_POT.get()) + .requires(Items.WHITE_GLAZED_TERRACOTTA)); createSimpleShapeless(consumer, ModItems.WHITE_GLAZED_MEDIUM_POT.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_MEDIUM_POT.get()) - .requires(Items.WHITE_GLAZED_TERRACOTTA)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_MEDIUM_POT.get()) + .requires(Items.WHITE_GLAZED_TERRACOTTA)); createSimpleShapeless(consumer, ModItems.WHITE_GLAZED_WIDE_POT.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_WIDE_POT.get()) - .requires(Items.WHITE_GLAZED_TERRACOTTA)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_WIDE_POT.get()) + .requires(Items.WHITE_GLAZED_TERRACOTTA)); createSimpleShapeless(consumer, ModItems.WHITE_GLAZED_THICK_POT.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_THICK_POT.get()) - .requires(Items.WHITE_GLAZED_TERRACOTTA)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_THICK_POT.get()) + .requires(Items.WHITE_GLAZED_TERRACOTTA)); createSimpleShapeless(consumer, ModItems.BLUE_GLAZED_THIN_POT.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_THIN_POT.get()) - .requires(Items.BLUE_GLAZED_TERRACOTTA)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_THIN_POT.get()) + .requires(Items.BLUE_GLAZED_TERRACOTTA)); createSimpleShapeless(consumer, ModItems.BLUE_GLAZED_MEDIUM_POT.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_MEDIUM_POT.get()) - .requires(Items.BLUE_GLAZED_TERRACOTTA)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_MEDIUM_POT.get()) + .requires(Items.BLUE_GLAZED_TERRACOTTA)); createSimpleShapeless(consumer, ModItems.BLUE_GLAZED_WIDE_POT.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_WIDE_POT.get()) - .requires(Items.BLUE_GLAZED_TERRACOTTA)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_WIDE_POT.get()) + .requires(Items.BLUE_GLAZED_TERRACOTTA)); createSimpleShapeless(consumer, ModItems.BLUE_GLAZED_THICK_POT.get(), 1, r -> r - .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) - .requires(ModItems.TERRACOTTA_THICK_POT.get()) - .requires(Items.BLUE_GLAZED_TERRACOTTA)); + .unlockedBy("has_terracotta", has(Items.TERRACOTTA)) + .requires(ModItems.TERRACOTTA_THICK_POT.get()) + .requires(Items.BLUE_GLAZED_TERRACOTTA)); createSimpleShapeless(consumer, ModItems.GOLDEN_THIN_POT.get(), 1, r -> r - .unlockedBy("has_gold_block", has(Items.GOLD_BLOCK)) - .requires(ModItems.TERRACOTTA_THIN_POT.get()) - .requires(Items.GOLD_BLOCK)); + .unlockedBy("has_gold_block", has(Items.GOLD_BLOCK)) + .requires(ModItems.TERRACOTTA_THIN_POT.get()) + .requires(Items.GOLD_BLOCK)); createSimpleShapeless(consumer, ModItems.GOLDEN_MEDIUM_POT.get(), 1, r -> r - .unlockedBy("has_gold_block", has(Items.GOLD_BLOCK)) - .requires(ModItems.TERRACOTTA_MEDIUM_POT.get()) - .requires(Items.GOLD_BLOCK)); + .unlockedBy("has_gold_block", has(Items.GOLD_BLOCK)) + .requires(ModItems.TERRACOTTA_MEDIUM_POT.get()) + .requires(Items.GOLD_BLOCK)); createSimpleShapeless(consumer, ModItems.GOLDEN_WIDE_POT.get(), 1, r -> r - .unlockedBy("has_gold_block", has(Items.GOLD_BLOCK)) - .requires(ModItems.TERRACOTTA_WIDE_POT.get()) - .requires(Items.GOLD_BLOCK)); + .unlockedBy("has_gold_block", has(Items.GOLD_BLOCK)) + .requires(ModItems.TERRACOTTA_WIDE_POT.get()) + .requires(Items.GOLD_BLOCK)); createSimpleShapeless(consumer, ModItems.GOLDEN_THICK_POT.get(), 1, r -> r - .unlockedBy("has_gold_block", has(Items.GOLD_BLOCK)) - .requires(ModItems.TERRACOTTA_THICK_POT.get()) - .requires(Items.GOLD_BLOCK)); + .unlockedBy("has_gold_block", has(Items.GOLD_BLOCK)) + .requires(ModItems.TERRACOTTA_THICK_POT.get()) + .requires(Items.GOLD_BLOCK)); createWallTrophy(consumer, ModItems.BEAR_TROPHY.get(), 1, Items.COD); createWallTrophy(consumer, ModItems.BLAZE_TROPHY.get(), 1, Items.BLAZE_ROD); @@ -450,13 +449,13 @@ protected void buildRecipes(Consumer consumer) { createWallTrophy(consumer, ModItems.WOLF_TROPHY.get(), 1, Items.BONE); createSimple(consumer, ModItems.PHANTOM_TROPHY.get(), 1, r -> r - .unlockedBy("has_phantom_membrane", has(Items.PHANTOM_MEMBRANE)) - .define('#', Items.PHANTOM_MEMBRANE) - .define('/', ModTags.BOARDS) - .define('@', Items.CHAIN) - .pattern("@@@") - .pattern("/#/") - .pattern(" ")); + .unlockedBy("has_phantom_membrane", has(Items.PHANTOM_MEMBRANE)) + .define('#', Items.PHANTOM_MEMBRANE) + .define('/', ModTags.BOARDS) + .define('@', Items.CHAIN) + .pattern("@@@") + .pattern("/#/") + .pattern(" ")); createStatueTrophy(consumer, ModItems.CREEPER_TROPHY.get(), 1, Items.CREEPER_HEAD); createStatueTrophy(consumer, ModItems.SKELETON_TROPHY.get(), 1, Items.SKELETON_SKULL); @@ -469,22 +468,22 @@ protected void buildRecipes(Consumer consumer) { public static void createSimple(Consumer consumer, Item output, int count, Function func) { String name = Objects.requireNonNull(ForgeRegistries.ITEMS.getKey(output)).getPath(); func.apply(ShapedRecipeBuilder.shaped(RecipeCategory.MISC, output, count)) - .group(name) - .save(consumer); + .group(name) + .save(consumer); } public static void createSimpleShapeless(Consumer consumer, Item output, int count, Function func) { String name = Objects.requireNonNull(ForgeRegistries.ITEMS.getKey(output)).getPath(); func.apply(ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, output, count)) - .group(name) - .save(consumer); + .group(name) + .save(consumer); } public static void createSingleDyeShapeless(Consumer consumer, Item output, int count, Function func) { String name = Objects.requireNonNull(ForgeRegistries.ITEMS.getKey(output)).getPath(); func.apply(ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, output, count)) - .group(name) - .save(consumer, new ResourceLocation(Handcrafted.MOD_ID, name + "_single")); + .group(name) + .save(consumer, new ResourceLocation(Handcrafted.MOD_ID, name + "_single")); } public static void createWoodSetRecipe(Consumer consumer, String suffix, int count, Function func) { @@ -494,9 +493,9 @@ public static void createWoodSetRecipe(Consumer consumer, String assert output != null; ShapedRecipeBuilder recipe = func.apply(ShapedRecipeBuilder.shaped(RecipeCategory.MISC, output, count) - .define('#', wood) - .group(suffix) - .unlockedBy("has_" + suffix, has(wood))); + .define('#', wood) + .group(suffix) + .unlockedBy("has_" + suffix, has(wood))); recipe.save(consumer); } @@ -511,10 +510,10 @@ public static void createWoodSetRecipeWithPlanks(Consumer consum assert output != null; assert planks != null; ShapedRecipeBuilder recipe = func.apply(ShapedRecipeBuilder.shaped(RecipeCategory.MISC, output, count) - .define('#', wood) - .define('/', planks) - .group(suffix) - .unlockedBy("has_" + suffix, has(wood))); + .define('#', wood) + .define('/', planks) + .group(suffix) + .unlockedBy("has_" + suffix, has(wood))); recipe.save(consumer); } @@ -527,9 +526,9 @@ public static void createColouredSetRecipe(Consumer consumer, St assert output != null; ShapedRecipeBuilder recipe = func.apply(ShapedRecipeBuilder.shaped(RecipeCategory.MISC, output, count) - .define('#', wood) - .group(suffix) - .unlockedBy("has_" + suffix, has(wood))); + .define('#', wood) + .group(suffix) + .unlockedBy("has_" + suffix, has(wood))); recipe.save(consumer); } @@ -542,9 +541,9 @@ public static void createTrim(Consumer consumer, String suffix, assert output != null; ShapedRecipeBuilder recipe = func.apply(ShapedRecipeBuilder.shaped(RecipeCategory.MISC, output, count) - .define('#', wood) - .group(suffix) - .unlockedBy("has_" + suffix, has(wood))); + .define('#', wood) + .group(suffix) + .unlockedBy("has_" + suffix, has(wood))); recipe.save(consumer); } @@ -552,27 +551,27 @@ public static void createTrim(Consumer consumer, String suffix, public static void createWallTrophy(Consumer consumer, Item output, int count, Item input) { ShapedRecipeBuilder.shaped(RecipeCategory.MISC, output, count) - .define('#', ModTags.BOARDS) - .define('/', input) - .group("trophy") - .unlockedBy("has_trophy", has(ModTags.BOARDS)) - .pattern("###") - .pattern("#/#") - .pattern("###") - .save(consumer); + .define('#', ModTags.BOARDS) + .define('/', input) + .group("trophy") + .unlockedBy("has_trophy", has(ModTags.BOARDS)) + .pattern("###") + .pattern("#/#") + .pattern("###") + .save(consumer); } public static void createStatueTrophy(Consumer consumer, Item output, int count, Item input) { ShapedRecipeBuilder.shaped(RecipeCategory.MISC, output, count) - .define('#', Items.STONE) - .define('/', input) - .group("trophy") - .unlockedBy("has_trophy", has(Items.STONE)) - .pattern(" # ") - .pattern("#/#") - .pattern("# #") - .save(consumer); + .define('#', Items.STONE) + .define('/', input) + .group("trophy") + .unlockedBy("has_trophy", has(Items.STONE)) + .pattern(" # ") + .pattern("#/#") + .pattern("# #") + .save(consumer); } } diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 97a8c31c..4da2279d 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -1,7 +1,7 @@ modLoader = "javafml" -loaderVersion = "[46,)" +loaderVersion = "[47,)" license = "Terrarium Licence" -issueTrackerURL = "https://github.com/terrarium-earth/${github_name}/issues" +issueTrackerURL = "https://github.com/terrarium-earth/handcrafted/issues" [[mods]] modId = "handcrafted" @@ -16,7 +16,7 @@ description = "Epic Furniture mod!" [[dependencies.handcrafted]] modId = "forge" mandatory = true -versionRange = "[46,)" +versionRange = "[47,)" ordering = "NONE" side = "BOTH" @@ -30,6 +30,6 @@ side = "BOTH" [[dependencies.handcrafted]] modId = "resourcefullib" mandatory = true -versionRange = "[${resourcefullib_version},)" +versionRange = "[2.1.1,)" ordering = "NONE" side = "BOTH" \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 4097dcb5..07251c3b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,23 +1,11 @@ -org.gradle.jvmargs=-Xmx3G +org.gradle.jvmargs=-Xmx2G -minecraft_version=1.20 -enabled_platforms=fabric,forge +enabledPlatforms=fabric,forge -archives_base_name=handcrafted -mod_id=handcrafted -github_name=Handcrafted -mod_version=2.3.2 -maven_group=earth.terrarium.handcrafted -modrinth_id=pJmCFF0p -curse_id=538214 +version=3.0.0 +group=earth.terrarium.handcrafted -fabric_loader_version=0.14.21 -fabric_api_version=0.83.0 -forge_version=46.0.12 -parchment_version=2023.03.12 +minecraftVersion=1.20.1 +parchmentVersion=2023.07.02 -modmenu_version=7.0.1 -jei_version=14.0.0.4 -rei_version=12.0.622 - -resourcefullib_version=2.0.6 \ No newline at end of file +resourcefulLibVersion=2.1.1 diff --git a/gradlew b/gradlew index 06b41077..1b6c7873 100755 --- a/gradlew +++ b/gradlew @@ -34,7 +34,7 @@ # * functions; # * expansions «$var», «${var}», «${var:-default}», «${var+SET}», # «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, efancyly «case»; +# * compound commands having a testable exit status, especially «case»; # * various built-in commands including «command», «set», and «ulimit». # # Important for patching: @@ -231,4 +231,4 @@ eval "set -- $( tr '\n' ' ' )" '"$@"' -exec "$JAVACMD" "$@" \ No newline at end of file +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index ac1b06f9..00000000 --- a/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index df4a5b51..00000000 --- a/settings.gradle +++ /dev/null @@ -1,12 +0,0 @@ -pluginManagement { - repositories { - maven { url "https://maven.architectury.dev/" } - maven { url "https://maven.minecraftforge.net/" } - maven { url "https://maven.resourcefulbees.com/repository/maven-public/" } - gradlePluginPortal() - } -} - -include("common") -include("fabric") -include("forge") \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..3c993590 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,16 @@ +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") + +rootProject.name = "handcrafted" + +pluginManagement { + repositories { + maven(url = "https://maven.architectury.dev/") + maven(url = "https://maven.minecraftforge.net/") + maven(url = "https://maven.resourcefulbees.com/repository/maven-public/") + gradlePluginPortal() + } +} + +include("common") +include("fabric") +include("forge")