diff --git a/build.gradle b/build.gradle index 1774e3a6b..df447f69c 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,6 @@ import io.github.fabricators_of_create.porting_lib_build.PortingLibBuildPlugin //file:noinspection GroovyAccessibility plugins { id "fabric-loom" version "1.5.+" - id "io.github.p03w.machete" version "1.+" // automatic jar compressing on build id "org.ajoberstar.grgit" version "4.1.1" id "maven-publish" } @@ -12,9 +11,8 @@ plugins { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 -archivesBaseName = project.archives_base_name +archivesBaseName = "porting_lib" version = project.mod_version -group = project.maven_group String buildNumber = System.getenv("GITHUB_RUN_NUMBER") String patch = buildNumber != null ? buildNumber : "99999" @@ -27,110 +25,22 @@ if (grgit != null) { version += "+custom_unknown" } -@SuppressWarnings("unused") // for subprojects -def fabricAsm(DependencyHandler deps) { - deps.modImplementation(deps.include("me.shedaniel:mm:2.4.1")) -} - -@SuppressWarnings("unused") // for subprojects -def testMod(Project project) { - project.sourceSets { - testmod { - compileClasspath += main.compileClasspath - compileClasspath += main.output - runtimeClasspath += main.runtimeClasspath - runtimeClasspath += main.output - } - } - - project.loom.runs { - testmodClient { - client() - name "Testmod Client" - source project.sourceSets.testmod - runDir "run/test" - } - testmodServer { - server() - name "Testmod Server" - source project.sourceSets.testmod - runDir "run/test_server" - } - } -} - -def moduleDependencies(Project project, List depNames) { - def deps = depNames.iterator().collect { project.dependencies.project(path: ":$it", configuration: "namedElements") } - - depNames.iterator().forEachRemaining { - Project dependProject = findProject(":$it") - project.loom { - interfaceInjection { - interfaceInjectionSourceSets.add(dependProject.sourceSets.main) - } - } - } - project.dependencies { - deps.each { - annotationProcessor(api(include(it))) - } - } - - project.publishing { - publications { - mavenJava(MavenPublication) { -// pom.withXml { -// def depsNode = asNode().appendNode("dependencies") -// deps.each { -// def depNode = depsNode.appendNode("dependency") -// depNode.appendNode("groupId", it.group) -// depNode.appendNode("artifactId", it.name) -// depNode.appendNode("version", it.version) -// depNode.appendNode("scope", "compile") -// } -// } - } - } +dependencies { + subprojects.forEach { + api(include(project(path: ":$it.name", configuration: "namedElements"))) } } -@SuppressWarnings("unused") // for subprojects -def setupDatagen(Project module) { - setupDatagen(module, "porting_lib_" + module.name) -} - -@SuppressWarnings("unused") // for subprojects -def setupDatagen(Project module, String modId) { - module.loom { - runs { - datagen { - client() - name = "Data Generation" - source module.sourceSets.main - vmArg "-Dfabric-api.datagen" - vmArg "-Dfabric-api.datagen.output-dir=${module.file("src/generated/resources")}" - vmArg "-Dfabric-api.datagen.modid=$modId" - runDir "build/datagen" - ideConfigGenerated true // loom will only make run configs for the root project by default - } - } - } - module.sourceSets.main.resources { - srcDir("src/generated/resources") - exclude("src/generated/resources/.cache") - } - module.sourcesJar { - // don't know why stuff is copied twice but it's harmless and way too much work to debug - duplicatesStrategy = DuplicatesStrategy.EXCLUDE // exclude - ignore duplicates - } +processResources { + exclude("template.fabric.mod.json") } allprojects { if (name == "buildSrc") return apply plugin: "fabric-loom" - apply plugin: "maven-publish" apply plugin: PortingLibBuildPlugin + group = "io.github.fabricators_of_create.Porting-Lib" repositories { @@ -161,21 +71,6 @@ allprojects { } } - java { - withSourcesJar() - } - - loom { - runs.configureEach { - vmArg("-Dmixin.debug.export=true") - ideConfigGenerated = true - } - File aw = file("src/main/resources/porting_lib_${name}.accesswidener") - if (aw.exists()) - accessWidenerPath.set(aw) - } - - dependencies { // dev environment minecraft("com.mojang:minecraft:$minecraft_version") @@ -197,21 +92,16 @@ allprojects { implementation("com.google.code.findbugs:jsr305:3.0.2") } - allprojects.each { p -> - loom.mods.register(p.name) { - sourceSet p.sourceSets.main - } - } - - [jar, sourcesJar].each { - it.from(rootProject.file("LICENSE")) { - rename { "${it}-${project.archivesBaseName}"} + loom { + runs.configureEach { + vmArg("-Dmixin.debug.export=true") + ideConfigGenerated = true } } - tasks.withType(ProcessResources).configureEach { + processResources { Map properties = [ - version: version, + version: version, loader_version: loader_version, fabric_version: fabric_version, minecraft_version: minecraft_semantic_version, @@ -222,9 +112,9 @@ allprojects { class_56: "\$class_56" ] - properties.forEach((k, v) -> inputs.property(k, v)) + properties.forEach(inputs::property) - filesMatching("*fabric.mod.json") { + filesMatching("fabric.mod.json") { expand properties } } @@ -241,22 +131,43 @@ allprojects { } } - machete { - if (buildNumber == null) { - enabled = false - } - } - tasks.withType(AbstractArchiveTask).configureEach { reproducibleFileOrder = true } +} + +subprojects { + apply plugin: "maven-publish" + + version = rootProject.version + archivesBaseName = "porting_lib_" + name + + dependencies { + if (name != "gametest" && name != "core") { + moduleDependencies(project, ["core"]) + } + } - jar { - from("LICENSE") { - rename { "${it}_${project.archivesBaseName}" } + loom { + runs.configureEach { + File output = file("src/main/resources/data/porting_lib_$name/structures/gametest") + property("porting_lib.gametest.quickexport.output", output.absolutePath) + } + mods.register("porting_lib_" + name) { + sourceSet sourceSets.main } + File aw = file("src/main/resources/porting_lib_${name}.accesswidener") + if (aw.exists()) + accessWidenerPath.set(aw) + } + + processResources { + // make it always run, because if it doesn't, extreme weirdness with caching occurs with every other build. + outputs.upToDateWhen { false } } + java.withSourcesJar() + publishing { repositories { maven { @@ -270,114 +181,117 @@ allprojects { } } } - } -} -dependencies { - afterEvaluate { - // fat jar depends on and includes all modules - for (Project module : subprojects) { - api(include(module)) + publications { + mavenJava(MavenPublication) { + artifact(remapJar) { + builtBy(remapJar) + } + + artifact(remapSourcesJar) { + builtBy remapSourcesJar + } + } } } } -subprojects.forEach { Project proj -> - // everything has the same version - proj.version = version - proj.tasks.named("processResources").configure { - // make subprojects depend on root processResources, needed for values to be properly filled - dependsOn(processResources) - // make them always run, because if they don't, extreme weirdness with caching occurs with every other task - outputs.upToDateWhen { false } - } - // archive base name is porting_lib_ - proj.extensions.findByType(BasePluginExtension.class).archivesName = "${archivesBaseName}_${proj.name}" - // set the gametest quickexport to go directly to the right place - proj.loom.runs.configureEach { - File output = proj.file("src/main/resources/data/porting_lib_${proj.name}/structures/gametest") - property("porting_lib.gametest.quickexport.output", output.absolutePath) - } - // give every module core, which includes gametest - if (proj.name != "gametest" && proj.name != "core") - moduleDependencies(proj, List.of("core")) +portingLib { + expandFmj = false +} + +// utilities for modules + +def fabricAsm(DependencyHandler deps) { + deps.modImplementation(deps.include("me.shedaniel:mm:2.4.1")) } -sourceSets { - allModules { - for (Project p : subprojects) { - def main = p.sourceSets.main - compileClasspath += main.compileClasspath + main.output - runtimeClasspath += main.runtimeClasspath + main.output +def testMod(Project project) { + project.sourceSets { + testmod { + compileClasspath += main.compileClasspath + compileClasspath += main.output + runtimeClasspath += main.runtimeClasspath + runtimeClasspath += main.output } } -} -loom { - runs { - // make default run configs run all modules - client { + project.loom.runs { + testmodClient { client() - name "Minecraft Client (all modules)" - source sourceSets.allModules + name "Testmod Client" + source project.sourceSets.testmod + runDir "run/test" } - server { + testmodServer { server() - name "Minecraft Server (all modules)" - source sourceSets.allModules + name "Testmod Server" + source project.sourceSets.testmod + runDir "run/test_server" } } } -subprojects.each { - remapJar.dependsOn("${it.path}:remapJar") -} +def moduleDependencies(Project project, List depNames) { + def deps = depNames.iterator().collect { project.dependencies.project(path: ":$it", configuration: "namedElements") } -remapJar { - afterEvaluate { - subprojects.each { - nestedJars.from project("${it.path}").tasks.named("remapJar") + depNames.iterator().forEachRemaining { + Project dependProject = findProject(":$it") + project.loom { + interfaceInjection { + interfaceInjectionSourceSets.add(dependProject.sourceSets.main) + } + } + } + project.dependencies { + deps.each { + annotationProcessor(api(include(it))) } } -} -subprojects { - publishing { + project.publishing { publications { mavenJava(MavenPublication) { - artifact(remapJar) { - builtBy(remapJar) - } - - artifact(remapSourcesJar) { - builtBy remapSourcesJar - } +// pom.withXml { +// def depsNode = asNode().appendNode("dependencies") +// deps.each { +// def depNode = depsNode.appendNode("dependency") +// depNode.appendNode("groupId", it.group) +// depNode.appendNode("artifactId", it.name) +// depNode.appendNode("version", it.version) +// depNode.appendNode("scope", "compile") +// } +// } } } } } -publishing { - publications { - mavenJava(MavenPublication) { - artifact(remapJar) { - builtBy(remapJar) - } - - artifact(sourcesJar) { - builtBy remapSourcesJar - } +def setupDatagen(Project module) { + setupDatagen(module, "porting_lib_" + module.name) +} - pom.withXml { - def depsNode = asNode().appendNode("dependencies") - subprojects.each { - def depNode = depsNode.appendNode("dependency") - depNode.appendNode("groupId", it.group) - depNode.appendNode("artifactId", it.name) - depNode.appendNode("version", it.version) - depNode.appendNode("scope", "compile") - } +def setupDatagen(Project module, String modId) { + module.loom { + runs { + datagen { + client() + name = "Data Generation" + source module.sourceSets.main + vmArg "-Dfabric-api.datagen" + vmArg "-Dfabric-api.datagen.output-dir=${module.file("src/generated/resources")}" + vmArg "-Dfabric-api.datagen.modid=$modId" + runDir "build/datagen" + ideConfigGenerated true // loom will only make run configs for the root project by default } } } + module.sourceSets.main.resources { + srcDir("src/generated/resources") + exclude("src/generated/resources/.cache") + } + module.sourcesJar { + // don't know why stuff is copied twice but it's harmless and way too much work to debug + duplicatesStrategy = DuplicatesStrategy.EXCLUDE // exclude - ignore duplicates + } } diff --git a/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/AddMissingIconsTask.java b/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/AddMissingIconsTask.java index a81144697..f89bfe333 100644 --- a/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/AddMissingIconsTask.java +++ b/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/AddMissingIconsTask.java @@ -12,8 +12,7 @@ public class AddMissingIconsTask extends DefaultTask { public static final String PATH = "assets/porting_lib/icon.png"; - // at src/main/resources/assets/porting_lib/icon.png, this is where it goes after processResources - public static final String DEFAULT_ICON = "build/resources/main/" + PATH; + public static final String DEFAULT_ICON = "src/main/resources/assets/porting_lib/icon.png"; @TaskAction public void addMissingIcons() throws IOException { diff --git a/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/Config.java b/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/Config.java new file mode 100644 index 000000000..e1950c772 --- /dev/null +++ b/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/Config.java @@ -0,0 +1,13 @@ +package io.github.fabricators_of_create.porting_lib_build; + +public class Config { + private boolean expandFmj = true; + + public boolean getExpandFmj() { + return this.expandFmj; + } + + public void setExpandFmj(boolean value) { + this.expandFmj = value; + } +} diff --git a/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/DeduplicateInclusionsTask.java b/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/DeduplicateInclusionsTask.java index 00ce846b1..fcbc21d96 100644 --- a/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/DeduplicateInclusionsTask.java +++ b/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/DeduplicateInclusionsTask.java @@ -9,6 +9,7 @@ import org.gradle.api.tasks.TaskAction; import org.gradle.internal.impldep.bsh.commands.dir; +import java.io.BufferedReader; import java.io.IOException; import java.nio.file.FileSystem; import java.nio.file.FileSystems; @@ -62,7 +63,7 @@ public void moveInclusions(Path jar, Path target) throws IOException { if (!hasJijs || !hasFmj) return; - JsonObject json = JsonParser.parseString(Files.readString(fmj)).getAsJsonObject(); + JsonObject json = PortingLibBuildPlugin.jsonFromPath(fmj).getAsJsonObject(); json.remove("jars"); Files.writeString(fmj, PortingLibBuildPlugin.GSON.toJson(json)); @@ -98,7 +99,7 @@ public void reAddInclusions(Path jar, Path dir) throws IOException { Path jars = root.resolve("META-INF").resolve("jars"); Files.createDirectories(jars); - JsonObject json = JsonParser.parseString(Files.readString(fmj)).getAsJsonObject(); + JsonObject json = PortingLibBuildPlugin.jsonFromPath(fmj).getAsJsonObject(); JsonArray jarsJson = new JsonArray(); try (Stream files = Files.list(dir)) { diff --git a/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/ExpandFmjTask.java b/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/ExpandFmjTask.java deleted file mode 100644 index 74f028dbb..000000000 --- a/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/ExpandFmjTask.java +++ /dev/null @@ -1,133 +0,0 @@ -package io.github.fabricators_of_create.porting_lib_build; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - -import com.google.gson.JsonParser; - -import org.gradle.api.DefaultTask; -import org.gradle.api.tasks.TaskAction; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Map.Entry; - -public class ExpandFmjTask extends DefaultTask { - public static final String FMJ = "fabric.mod.json"; - // at src/main/resources/template.fabric.mod.json, this is where it goes after processResources - public static final String TEMPLATE_FMJ = "build/resources/main/template.fabric.mod.json"; - - @TaskAction - public void expandFmj() { - File resources = getInputs().getFiles().getSingleFile(); - - File fmj = null; - for (File file : resources.listFiles()) { - if (FMJ.equals(file.getName())) { - fmj = file; - break; - } - } - if (fmj != null) { - expandFmj(fmj); - } - } - - public void expandFmj(File fmjFile) { - // load from template, add additional from project - JsonObject template = makeDefaults(); - JsonObject moduleFmj = readModuleFmj(fmjFile); - for (Entry entry : moduleFmj.entrySet()) { - String key = entry.getKey(); - JsonElement value = entry.getValue(); - tryMerge(template, key, value); - } - - String name = "porting_lib_" + getProject().getName(); - Path parent = fmjFile.toPath().getParent(); - - // fill in mixins - String mixinsFileName = name + ".mixins.json"; - Path mixins = parent.resolve(mixinsFileName); - if (Files.exists(mixins)) { - JsonArray array = new JsonArray(); - array.add(mixinsFileName); - template.add("mixins", array); - } - // and AW - String awFileName = name + ".accesswidener"; - Path aw = parent.resolve(awFileName); - if (Files.exists(aw)) { - template.addProperty("accessWidener", awFileName); - } - - // output - try (FileOutputStream out = new FileOutputStream(fmjFile)) { - out.write(PortingLibBuildPlugin.GSON.toJson(template).getBytes()); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - public void tryMerge(JsonObject root, String key, JsonElement value) { - JsonElement existing = root.get(key); - if (existing == null) { - root.add(key, value); - return; - } - if (value.getClass() != existing.getClass()) { - // no way to merge, just overwrite - root.add(key, value); - return; - } - if (value instanceof JsonObject obj) { - mergeObj(root, key, (JsonObject) existing, obj); - } else if (value instanceof JsonArray array) { - mergeArray(root, key, (JsonArray) existing, array); - } else { - // overwrite existing - root.add(key, value); - } - } - - public void mergeObj(JsonObject json, String key, JsonObject existing, JsonObject toAdd) { - for (Entry entry : toAdd.entrySet()) { - String entryKey = entry.getKey(); - JsonElement value = entry.getValue(); - tryMerge(existing, entryKey, value); - } - json.add(key, existing); - } - - public void mergeArray(JsonObject json, String key, JsonArray existing, JsonArray toAdd) { - for (JsonElement element : toAdd) { - existing.add(element); - } - json.add(key, existing); - } - - public JsonObject makeDefaults() { - File templateFmj = getProject().getRootProject().file(TEMPLATE_FMJ); - return jsonFromFile(templateFmj); - } - - public JsonObject readModuleFmj(File fmj) { - return jsonFromFile(fmj); - } - - public static JsonObject jsonFromFile(File file) { - try (BufferedReader reader = new BufferedReader(new FileReader(file))) { - return JsonParser.parseReader(reader).getAsJsonObject(); - } catch (IOException e) { - throw new RuntimeException(e); - } - } -} diff --git a/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/FmjExpander.java b/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/FmjExpander.java new file mode 100644 index 000000000..99597543d --- /dev/null +++ b/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/FmjExpander.java @@ -0,0 +1,187 @@ +package io.github.fabricators_of_create.porting_lib_build; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + +import groovy.lang.Closure; + +import org.gradle.api.Action; +import org.gradle.api.Project; +import org.gradle.api.file.FileCopyDetails; +import org.gradle.language.jvm.tasks.ProcessResources; + +import java.io.FilterReader; +import java.io.IOException; +import java.io.Reader; +import java.io.StringReader; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Map; + +public class FmjExpander extends FilterReader { + public static final String RESOURCES = "src/main/resources"; + public static final String FMJ = "fabric.mod.json"; + public static final String TEMPLATE_FMJ = RESOURCES + "/template." + FMJ; + + + public static final String PROJECT_NAME_PARAM = "projectName"; + public static final String PROJECT_DIR_PARAM = "projectDir"; + public static final String ROOT_PROJECT_DIR_PARAM = "rootProjectDir"; + + private boolean hasExpanded = false; + + private String projectName; + private String projectDir; + private String rootProjectDir; + + private Path projectDirPath; + private Path rootProjectDirPath; + + public FmjExpander(Reader in) { + super(in); + } + + @Override + public int read(char[] cbuf, int off, int len) throws IOException { + if (!hasExpanded) { + expand(); + } + return super.read(cbuf, off, len); + } + + private void expand() throws IOException { + try { + validateParams(); + JsonObject json = JsonParser.parseReader(this.in).getAsJsonObject(); + JsonObject expanded = this.expandFmj(json); + String asString = PortingLibBuildPlugin.GSON.toJson(expanded); + this.in = new StringReader(asString); + this.hasExpanded = true; + } catch (Throwable t) { + throw new IOException("Error expanding FMJ", t); + } + } + + private void validateParams() { + if (this.projectName == null) { + throw new IllegalStateException("projectName is null"); + } else if (this.projectDir == null) { + throw new IllegalStateException("projectDir is null"); + } else if (this.rootProjectDir == null) { + throw new IllegalStateException("rootProjectDir is null"); + } + + this.projectDirPath = Paths.get(this.projectDir); + this.rootProjectDirPath = Paths.get(this.rootProjectDir); + } + + public JsonObject expandFmj(JsonObject moduleFmj) { + // load from template, add additional from project + JsonObject template = makeDefaults(); + for (Map.Entry entry : moduleFmj.entrySet()) { + String key = entry.getKey(); + JsonElement value = entry.getValue(); + tryMerge(template, key, value); + } + + String name = "porting_lib_" + this.projectName; + Path resources = this.projectDirPath.resolve(RESOURCES); + + // fill in mixins + String mixinsFileName = name + ".mixins.json"; + Path mixins = resources.resolve(mixinsFileName); + if (Files.exists(mixins)) { + JsonArray array = new JsonArray(); + array.add(mixinsFileName); + template.add("mixins", array); + } + // and AW + String awFileName = name + ".accesswidener"; + Path aw = resources.resolve(awFileName); + if (Files.exists(aw)) { + template.addProperty("accessWidener", awFileName); + } + + return template; + } + + public void tryMerge(JsonObject root, String key, JsonElement value) { + JsonElement existing = root.get(key); + if (existing == null) { + root.add(key, value); + return; + } + if (value.getClass() != existing.getClass()) { + // no way to merge, just overwrite + root.add(key, value); + return; + } + if (value instanceof JsonObject obj) { + mergeObj(root, key, (JsonObject) existing, obj); + } else if (value instanceof JsonArray array) { + mergeArray(root, key, (JsonArray) existing, array); + } else { + // overwrite existing + root.add(key, value); + } + } + + public void mergeObj(JsonObject json, String key, JsonObject existing, JsonObject toAdd) { + for (Map.Entry entry : toAdd.entrySet()) { + String entryKey = entry.getKey(); + JsonElement value = entry.getValue(); + tryMerge(existing, entryKey, value); + } + json.add(key, existing); + } + + public void mergeArray(JsonObject json, String key, JsonArray existing, JsonArray toAdd) { + for (JsonElement element : toAdd) { + existing.add(element); + } + json.add(key, existing); + } + + public JsonObject makeDefaults() { + Path templateFmj = this.rootProjectDirPath.resolve(TEMPLATE_FMJ); + return PortingLibBuildPlugin.jsonFromPath(templateFmj); + } + + public static class Configurator extends Closure { + private final Project project; + + public Configurator(Project project) { + super(project); + this.project = project; + } + + public Object doCall(Object task) { + if (task instanceof ProcessResources processResources) { + processResources.eachFile(new Applicator(this.project)); + } + return task; + } + } + + public record Applicator(Project project) implements Action { + @Override + public void execute(FileCopyDetails details) { + if (details.getName().equals(FMJ)) { + Map params = Map.of( + PROJECT_NAME_PARAM, this.project.getName(), + PROJECT_DIR_PARAM, getDir(this.project), + ROOT_PROJECT_DIR_PARAM, getDir(this.project.getRootProject()) + ); + + details.filter(params, FmjExpander.class); + } + } + + private static String getDir(Project project) { + return project.getLayout().getProjectDirectory().getAsFile().toPath().toString(); + } + } +} diff --git a/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/PortingLibBuildPlugin.java b/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/PortingLibBuildPlugin.java index 96173a95c..4046198cc 100644 --- a/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/PortingLibBuildPlugin.java +++ b/buildSrc/src/main/java/io/github/fabricators_of_create/porting_lib_build/PortingLibBuildPlugin.java @@ -3,21 +3,30 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; + import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.Task; import org.gradle.api.file.FileCollection; import org.gradle.api.tasks.TaskContainer; +import java.io.BufferedReader; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; + public class PortingLibBuildPlugin implements Plugin { public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); @Override public void apply(Project project) { + Config config = project.getExtensions().create("portingLib", Config.class); Task validateModule = project.getTasks().create("validateModule", ValidateModuleTask.class); project.afterEvaluate(p -> { setupDeduplication(p); - setupResourceProcessing(p); + setupResourceProcessing(p, config); setupValidation(p, validateModule); }); } @@ -41,10 +50,7 @@ public void setupDeduplication(Project project) { deduplicateInclusions.getInputs().files(remapJar.getOutputs().getFiles()); } - public void setupResourceProcessing(Project project) { - if (project.getRootProject() == project) { - return; // do not modify the root resources - } + public void setupResourceProcessing(Project project, Config config) { TaskContainer tasks = project.getTasks(); tasks.create("sortAccessWidener", SortAccessWidenerTask.class); @@ -53,11 +59,22 @@ public void setupResourceProcessing(Project project) { throw new IllegalStateException("No processResources task?"); } - Task expandFmj = tasks.create("expandFmj", ExpandFmjTask.class); + if (config.getExpandFmj()) { + processResources.configure(new FmjExpander.Configurator(project)); + } + Task addIcons = tasks.create("addMissingIcons", AddMissingIconsTask.class); - processResources.finalizedBy(expandFmj, addIcons); + processResources.finalizedBy(addIcons); + FileCollection processedResources = processResources.getOutputs().getFiles(); - expandFmj.getInputs().files(processedResources); addIcons.getInputs().files(processedResources); } + + public static JsonObject jsonFromPath(Path path) { + try (BufferedReader reader = Files.newBufferedReader(path)) { + return JsonParser.parseReader(reader).getAsJsonObject(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } } diff --git a/gradle.properties b/gradle.properties index a1f21a663..160ff673e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,6 @@ org.gradle.jvmargs=-Xmx6G org.gradle.parallel=false fabric.loom.multiProjectOptimisation = true -maven_group = io.github.fabricators_of_create -archives_base_name = porting_lib # is filled in at build mod_version = 3.0. diff --git a/accessors/build.gradle b/modules/accessors/build.gradle similarity index 100% rename from accessors/build.gradle rename to modules/accessors/build.gradle diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/AbstractContainerScreenAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/AbstractContainerScreenAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/AbstractContainerScreenAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/AbstractContainerScreenAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/AbstractSelectionList$EntryAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/AbstractSelectionList$EntryAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/AbstractSelectionList$EntryAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/AbstractSelectionList$EntryAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/AbstractWidgetAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/AbstractWidgetAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/AbstractWidgetAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/AbstractWidgetAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/AgeableListModelAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/AgeableListModelAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/AgeableListModelAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/AgeableListModelAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/BlockModel$DeserializerAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/BlockModel$DeserializerAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/BlockModel$DeserializerAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/BlockModel$DeserializerAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/BlockRenderDispatcherAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/BlockRenderDispatcherAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/BlockRenderDispatcherAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/BlockRenderDispatcherAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ClientPacketListenerAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ClientPacketListenerAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ClientPacketListenerAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ClientPacketListenerAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/CommandSuggestions$SuggestionsListAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/CommandSuggestions$SuggestionsListAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/CommandSuggestions$SuggestionsListAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/CommandSuggestions$SuggestionsListAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/FontAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/FontAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/FontAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/FontAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/GameRendererAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/GameRendererAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/GameRendererAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/GameRendererAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/GuiAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/GuiAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/GuiAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/GuiAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/HumanoidModelAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/HumanoidModelAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/HumanoidModelAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/HumanoidModelAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ItemInHandRendererAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ItemInHandRendererAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ItemInHandRendererAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ItemInHandRendererAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ItemRendererAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ItemRendererAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ItemRendererAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ItemRendererAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/KeyMappingAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/KeyMappingAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/KeyMappingAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/KeyMappingAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ModelBakeryAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ModelBakeryAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ModelBakeryAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ModelBakeryAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ModelPartAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ModelPartAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ModelPartAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ModelPartAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ParticleAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ParticleAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ParticleAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ParticleAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ParticleEngineAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ParticleEngineAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ParticleEngineAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ParticleEngineAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/RenderStateShardAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/RenderStateShardAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/RenderStateShardAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/RenderStateShardAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/RenderTypeAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/RenderTypeAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/RenderTypeAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/RenderTypeAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ScreenAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ScreenAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ScreenAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/ScreenAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/SheetsAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/SheetsAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/SheetsAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/SheetsAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/SimpleBakedModel$BuilderAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/SimpleBakedModel$BuilderAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/SimpleBakedModel$BuilderAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/SimpleBakedModel$BuilderAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/TextureAtlasSprite$AnimatedTextureAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/TextureAtlasSprite$AnimatedTextureAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/TextureAtlasSprite$AnimatedTextureAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/TextureAtlasSprite$AnimatedTextureAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/TextureSheetParticleAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/TextureSheetParticleAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/TextureSheetParticleAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/TextureSheetParticleAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/TextureStateShardAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/TextureStateShardAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/TextureStateShardAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/TextureStateShardAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/TitleScreenAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/TitleScreenAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/TitleScreenAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/client/accessor/TitleScreenAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/AbstractMinecartAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/AbstractMinecartAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/AbstractMinecartAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/AbstractMinecartAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/AbstractProjectileDispenseBehaviorAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/AbstractProjectileDispenseBehaviorAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/AbstractProjectileDispenseBehaviorAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/AbstractProjectileDispenseBehaviorAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/AdvancementProviderAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/AdvancementProviderAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/AdvancementProviderAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/AdvancementProviderAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ArrayVoxelShapeAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ArrayVoxelShapeAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ArrayVoxelShapeAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ArrayVoxelShapeAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/AxeItemAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/AxeItemAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/AxeItemAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/AxeItemAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BaseSpawnerAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BaseSpawnerAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BaseSpawnerAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BaseSpawnerAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BeaconBlockEntityAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BeaconBlockEntityAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BeaconBlockEntityAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BeaconBlockEntityAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BiomeManagerAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BiomeManagerAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BiomeManagerAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BiomeManagerAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BlockAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BlockAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BlockAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BlockAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BlockEntityAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BlockEntityAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BlockEntityAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BlockEntityAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BlockLootSubProviderAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BlockLootSubProviderAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BlockLootSubProviderAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BlockLootSubProviderAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BucketItemAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BucketItemAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BucketItemAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BucketItemAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BundleItemAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BundleItemAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BundleItemAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/BundleItemAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ClientboundPlayerAbilitiesPacketAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ClientboundPlayerAbilitiesPacketAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ClientboundPlayerAbilitiesPacketAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ClientboundPlayerAbilitiesPacketAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/CubeVoxelShapeAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/CubeVoxelShapeAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/CubeVoxelShapeAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/CubeVoxelShapeAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/EntityAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/EntityAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/EntityAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/EntityAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/HashMapPaletteAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/HashMapPaletteAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/HashMapPaletteAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/HashMapPaletteAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ItemAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ItemAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ItemAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ItemAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ItemValueAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ItemValueAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ItemValueAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ItemValueAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/LiquidBlockAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/LiquidBlockAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/LiquidBlockAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/LiquidBlockAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/LivingEntityAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/LivingEntityAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/LivingEntityAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/LivingEntityAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/MinecraftServerAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/MinecraftServerAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/MinecraftServerAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/MinecraftServerAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/MobAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/MobAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/MobAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/MobAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PackRepositoryAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PackRepositoryAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PackRepositoryAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PackRepositoryAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PaintingAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PaintingAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PaintingAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PaintingAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PlayerAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PlayerAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PlayerAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PlayerAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PotionBrewing$MixAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PotionBrewing$MixAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PotionBrewing$MixAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PotionBrewing$MixAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PotionBrewingAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PotionBrewingAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PotionBrewingAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/PotionBrewingAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/RailStateAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/RailStateAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/RailStateAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/RailStateAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/RecipeManagerAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/RecipeManagerAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/RecipeManagerAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/RecipeManagerAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ServerGamePacketListenerImplAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ServerGamePacketListenerImplAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ServerGamePacketListenerImplAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ServerGamePacketListenerImplAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ServerPlayerAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ServerPlayerAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ServerPlayerAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/ServerPlayerAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/SlotAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/SlotAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/SlotAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/SlotAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/StructureTemplateAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/StructureTemplateAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/StructureTemplateAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/StructureTemplateAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/TagValueAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/TagValueAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/TagValueAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/TagValueAccessor.java diff --git a/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/UseOnContextAccessor.java b/modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/UseOnContextAccessor.java similarity index 100% rename from accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/UseOnContextAccessor.java rename to modules/accessors/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/accessors/common/accessor/UseOnContextAccessor.java diff --git a/accessors/src/main/resources/fabric.mod.json b/modules/accessors/src/main/resources/fabric.mod.json similarity index 100% rename from accessors/src/main/resources/fabric.mod.json rename to modules/accessors/src/main/resources/fabric.mod.json diff --git a/accessors/src/main/resources/porting_lib_accessors.accesswidener b/modules/accessors/src/main/resources/porting_lib_accessors.accesswidener similarity index 100% rename from accessors/src/main/resources/porting_lib_accessors.accesswidener rename to modules/accessors/src/main/resources/porting_lib_accessors.accesswidener diff --git a/accessors/src/main/resources/porting_lib_accessors.mixins.json b/modules/accessors/src/main/resources/porting_lib_accessors.mixins.json similarity index 100% rename from accessors/src/main/resources/porting_lib_accessors.mixins.json rename to modules/accessors/src/main/resources/porting_lib_accessors.mixins.json diff --git a/asm/build.gradle b/modules/asm/build.gradle similarity index 100% rename from asm/build.gradle rename to modules/asm/build.gradle diff --git a/asm/src/main/java/io/github/fabricators_of_create/porting_lib/asm/ASMUtils.java b/modules/asm/src/main/java/io/github/fabricators_of_create/porting_lib/asm/ASMUtils.java similarity index 100% rename from asm/src/main/java/io/github/fabricators_of_create/porting_lib/asm/ASMUtils.java rename to modules/asm/src/main/java/io/github/fabricators_of_create/porting_lib/asm/ASMUtils.java diff --git a/asm/src/main/resources/fabric.mod.json b/modules/asm/src/main/resources/fabric.mod.json similarity index 100% rename from asm/src/main/resources/fabric.mod.json rename to modules/asm/src/main/resources/fabric.mod.json diff --git a/attributes/build.gradle b/modules/attributes/build.gradle similarity index 100% rename from attributes/build.gradle rename to modules/attributes/build.gradle diff --git a/attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/PortingLibAttributes.java b/modules/attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/PortingLibAttributes.java similarity index 100% rename from attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/PortingLibAttributes.java rename to modules/attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/PortingLibAttributes.java diff --git a/attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/extensions/PlayerAttributesExtensions.java b/modules/attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/extensions/PlayerAttributesExtensions.java similarity index 100% rename from attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/extensions/PlayerAttributesExtensions.java rename to modules/attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/extensions/PlayerAttributesExtensions.java diff --git a/attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/mixin/AttributeMapMixin.java b/modules/attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/mixin/AttributeMapMixin.java similarity index 100% rename from attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/mixin/AttributeMapMixin.java rename to modules/attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/mixin/AttributeMapMixin.java diff --git a/attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/mixin/LivingEntityMixin.java b/modules/attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/mixin/LivingEntityMixin.java similarity index 100% rename from attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/mixin/LivingEntityMixin.java rename to modules/attributes/src/main/java/io/github/fabricators_of_create/porting_lib/attributes/mixin/LivingEntityMixin.java diff --git a/attributes/src/main/resources/assets/porting_lib/lang/en_us.json b/modules/attributes/src/main/resources/assets/porting_lib/lang/en_us.json similarity index 100% rename from attributes/src/main/resources/assets/porting_lib/lang/en_us.json rename to modules/attributes/src/main/resources/assets/porting_lib/lang/en_us.json diff --git a/attributes/src/main/resources/fabric.mod.json b/modules/attributes/src/main/resources/fabric.mod.json similarity index 100% rename from attributes/src/main/resources/fabric.mod.json rename to modules/attributes/src/main/resources/fabric.mod.json diff --git a/attributes/src/main/resources/porting_lib_attributes.mixins.json b/modules/attributes/src/main/resources/porting_lib_attributes.mixins.json similarity index 100% rename from attributes/src/main/resources/porting_lib_attributes.mixins.json rename to modules/attributes/src/main/resources/porting_lib_attributes.mixins.json diff --git a/base/build.gradle b/modules/base/build.gradle similarity index 100% rename from base/build.gradle rename to modules/base/build.gradle diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibBase.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibBase.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibBase.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibBase.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibClient.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibClient.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibClient.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibClient.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/BeaconColorMultiplierBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/BeaconColorMultiplierBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/BeaconColorMultiplierBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/BeaconColorMultiplierBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CaughtFireBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CaughtFireBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CaughtFireBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CaughtFireBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/ChunkUnloadListeningBlockEntity.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/ChunkUnloadListeningBlockEntity.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/ChunkUnloadListeningBlockEntity.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/ChunkUnloadListeningBlockEntity.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/ConnectableRedstoneBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/ConnectableRedstoneBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/ConnectableRedstoneBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/ConnectableRedstoneBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CullingBlockEntityIterator.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CullingBlockEntityIterator.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CullingBlockEntityIterator.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CullingBlockEntityIterator.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomBurnabilityBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomBurnabilityBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomBurnabilityBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomBurnabilityBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomDataPacketHandlingBlockEntity.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomDataPacketHandlingBlockEntity.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomDataPacketHandlingBlockEntity.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomDataPacketHandlingBlockEntity.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomDestroyEffectsBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomDestroyEffectsBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomDestroyEffectsBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomDestroyEffectsBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomExpBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomExpBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomExpBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomExpBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomFrictionBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomFrictionBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomFrictionBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomFrictionBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomHitEffectsBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomHitEffectsBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomHitEffectsBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomHitEffectsBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomLandingEffectsBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomLandingEffectsBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomLandingEffectsBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomLandingEffectsBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomRenderBoundingBoxBlockEntity.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomRenderBoundingBoxBlockEntity.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomRenderBoundingBoxBlockEntity.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomRenderBoundingBoxBlockEntity.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomRunningEffectsBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomRunningEffectsBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomRunningEffectsBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomRunningEffectsBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomScaffoldingBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomScaffoldingBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomScaffoldingBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomScaffoldingBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomSoundTypeBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomSoundTypeBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomSoundTypeBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomSoundTypeBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomUpdateTagHandlingBlockEntity.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomUpdateTagHandlingBlockEntity.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomUpdateTagHandlingBlockEntity.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/CustomUpdateTagHandlingBlockEntity.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/EntityDestroyBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/EntityDestroyBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/EntityDestroyBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/EntityDestroyBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/ExplosionResistanceBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/ExplosionResistanceBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/ExplosionResistanceBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/ExplosionResistanceBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/FireSourceBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/FireSourceBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/FireSourceBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/FireSourceBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/HarvestableBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/HarvestableBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/HarvestableBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/HarvestableBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/LightEmissiveBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/LightEmissiveBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/LightEmissiveBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/LightEmissiveBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/MinecartPassHandlerBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/MinecartPassHandlerBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/MinecartPassHandlerBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/MinecartPassHandlerBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/NeighborChangeListeningBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/NeighborChangeListeningBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/NeighborChangeListeningBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/NeighborChangeListeningBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/PlayerDestroyBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/PlayerDestroyBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/PlayerDestroyBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/PlayerDestroyBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/SlopeCreationCheckingRailBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/SlopeCreationCheckingRailBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/SlopeCreationCheckingRailBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/SlopeCreationCheckingRailBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/StickyBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/StickyBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/StickyBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/StickyBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/ValidSpawnBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/ValidSpawnBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/ValidSpawnBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/ValidSpawnBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/WeakPowerCheckingBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/WeakPowerCheckingBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/block/WeakPowerCheckingBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/block/WeakPowerCheckingBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/client/armor/ArmorRenderer.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/client/armor/ArmorRenderer.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/client/armor/ArmorRenderer.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/client/armor/ArmorRenderer.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/client/armor/ArmorRendererRegistry.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/client/armor/ArmorRendererRegistry.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/client/armor/ArmorRendererRegistry.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/client/armor/ArmorRendererRegistry.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/command/ModIdArgument.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/command/ModIdArgument.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/command/ModIdArgument.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/command/ModIdArgument.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/enchant/CustomEnchantingBehaviorItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/enchant/CustomEnchantingBehaviorItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/enchant/CustomEnchantingBehaviorItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/enchant/CustomEnchantingBehaviorItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/enchant/CustomEnchantingTableBehaviorEnchantment.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/enchant/CustomEnchantingTableBehaviorEnchantment.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/enchant/CustomEnchantingTableBehaviorEnchantment.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/enchant/CustomEnchantingTableBehaviorEnchantment.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/enchant/EnchantmentBonusBlock.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/enchant/EnchantmentBonusBlock.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/enchant/EnchantmentBonusBlock.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/enchant/EnchantmentBonusBlock.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/CameraSetupCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/CameraSetupCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/CameraSetupCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/CameraSetupCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ClientWorldEvents.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ClientWorldEvents.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ClientWorldEvents.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ClientWorldEvents.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ColorHandlersCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ColorHandlersCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ColorHandlersCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ColorHandlersCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/CreateSkullModelsCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/CreateSkullModelsCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/CreateSkullModelsCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/CreateSkullModelsCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/DrawSelectionEvents.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/DrawSelectionEvents.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/DrawSelectionEvents.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/DrawSelectionEvents.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/EntityAddedLayerCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/EntityAddedLayerCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/EntityAddedLayerCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/EntityAddedLayerCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/FieldOfViewEvents.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/FieldOfViewEvents.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/FieldOfViewEvents.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/FieldOfViewEvents.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/FogEvents.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/FogEvents.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/FogEvents.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/FogEvents.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/InstanceRegistrationCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/InstanceRegistrationCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/InstanceRegistrationCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/InstanceRegistrationCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/InteractEvents.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/InteractEvents.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/InteractEvents.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/InteractEvents.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/KeyInputCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/KeyInputCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/KeyInputCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/KeyInputCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/LivingEntityRenderEvents.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/LivingEntityRenderEvents.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/LivingEntityRenderEvents.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/LivingEntityRenderEvents.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/MinecraftTailCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/MinecraftTailCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/MinecraftTailCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/MinecraftTailCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ModelLoadCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ModelLoadCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ModelLoadCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ModelLoadCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/MouseInputEvents.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/MouseInputEvents.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/MouseInputEvents.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/MouseInputEvents.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/OverlayRenderCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/OverlayRenderCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/OverlayRenderCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/OverlayRenderCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ParticleManagerRegistrationCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ParticleManagerRegistrationCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ParticleManagerRegistrationCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/ParticleManagerRegistrationCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/PreRenderTooltipCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/PreRenderTooltipCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/PreRenderTooltipCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/PreRenderTooltipCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/RenderHandCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/RenderHandCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/RenderHandCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/RenderHandCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/RenderPlayerEvents.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/RenderPlayerEvents.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/RenderPlayerEvents.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/RenderPlayerEvents.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/RenderTickStartCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/RenderTickStartCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/RenderTickStartCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/RenderTickStartCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/RenderTooltipBorderColorCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/RenderTooltipBorderColorCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/RenderTooltipBorderColorCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/RenderTooltipBorderColorCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/TextureStitchCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/TextureStitchCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/TextureStitchCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/client/TextureStitchCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/AddPackFindersCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/AddPackFindersCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/AddPackFindersCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/AddPackFindersCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/AdvancementCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/AdvancementCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/AdvancementCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/AdvancementCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/AttackAirCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/AttackAirCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/AttackAirCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/AttackAirCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/BlockEvents.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/BlockEvents.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/BlockEvents.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/BlockEvents.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/ChunkTrackingCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/ChunkTrackingCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/ChunkTrackingCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/ChunkTrackingCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/ExplosionEvents.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/ExplosionEvents.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/ExplosionEvents.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/ExplosionEvents.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/FluidPlaceBlockCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/FluidPlaceBlockCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/FluidPlaceBlockCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/FluidPlaceBlockCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/GrindstoneEvents.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/GrindstoneEvents.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/GrindstoneEvents.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/GrindstoneEvents.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/ItemCraftedCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/ItemCraftedCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/ItemCraftedCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/ItemCraftedCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/ModsLoadedCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/ModsLoadedCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/ModsLoadedCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/ModsLoadedCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/PotionEvents.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/PotionEvents.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/PotionEvents.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/PotionEvents.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/RecipesUpdatedCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/RecipesUpdatedCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/RecipesUpdatedCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/RecipesUpdatedCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/TagsUpdatedCallback.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/TagsUpdatedCallback.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/TagsUpdatedCallback.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/event/common/TagsUpdatedCallback.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/BaseBlockStateExtension.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/BaseBlockStateExtension.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/BaseBlockStateExtension.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/BaseBlockStateExtension.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ArmorTextureItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ArmorTextureItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ArmorTextureItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ArmorTextureItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ArmorTickListeningItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ArmorTickListeningItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ArmorTickListeningItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ArmorTickListeningItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/BlockUseBypassingItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/BlockUseBypassingItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/BlockUseBypassingItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/BlockUseBypassingItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ContinueUsingItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ContinueUsingItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ContinueUsingItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ContinueUsingItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomArrowItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomArrowItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomArrowItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomArrowItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomEnchantmentLevelItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomEnchantmentLevelItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomEnchantmentLevelItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomEnchantmentLevelItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomEnchantmentsItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomEnchantmentsItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomEnchantmentsItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomEnchantmentsItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomMapItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomMapItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomMapItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomMapItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomMaxCountItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomMaxCountItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomMaxCountItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/CustomMaxCountItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/DamageableItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/DamageableItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/DamageableItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/DamageableItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/EntitySwingListenerItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/EntitySwingListenerItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/EntitySwingListenerItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/EntitySwingListenerItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/EntityTickListenerItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/EntityTickListenerItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/EntityTickListenerItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/EntityTickListenerItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/EquipmentItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/EquipmentItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/EquipmentItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/EquipmentItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/PiglinsNeutralItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/PiglinsNeutralItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/PiglinsNeutralItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/PiglinsNeutralItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ReequipAnimationItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ReequipAnimationItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ReequipAnimationItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ReequipAnimationItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ShieldBlockItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ShieldBlockItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ShieldBlockItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/ShieldBlockItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/UseFirstBehaviorItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/UseFirstBehaviorItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/UseFirstBehaviorItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/UseFirstBehaviorItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/UsingTickItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/UsingTickItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/UsingTickItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/UsingTickItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/WalkOnSnowItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/WalkOnSnowItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/WalkOnSnowItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/WalkOnSnowItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/XpRepairItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/XpRepairItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/item/XpRepairItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/item/XpRepairItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/PortingLibMixinPlugin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/PortingLibMixinPlugin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/PortingLibMixinPlugin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/PortingLibMixinPlugin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/AbstractClientPlayerMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/AbstractClientPlayerMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/AbstractClientPlayerMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/AbstractClientPlayerMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/AbstractTextureMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/AbstractTextureMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/AbstractTextureMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/AbstractTextureMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/BlockColorsMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/BlockColorsMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/BlockColorsMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/BlockColorsMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/BlockRenderDispatcherMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/BlockRenderDispatcherMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/BlockRenderDispatcherMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/BlockRenderDispatcherMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/CameraMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/CameraMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/CameraMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/CameraMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ChestRendererMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ChestRendererMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ChestRendererMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ChestRendererMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ClientLanguageAccessor.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ClientLanguageAccessor.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ClientLanguageAccessor.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ClientLanguageAccessor.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ClientLevelMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ClientLevelMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ClientLevelMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ClientLevelMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ClientPacketListenerMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ClientPacketListenerMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ClientPacketListenerMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ClientPacketListenerMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/EntityRenderDispatcherMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/EntityRenderDispatcherMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/EntityRenderDispatcherMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/EntityRenderDispatcherMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/FogRendererMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/FogRendererMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/FogRendererMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/FogRendererMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/GameRendererMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/GameRendererMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/GameRendererMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/GameRendererMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/GuiGraphicsMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/GuiGraphicsMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/GuiGraphicsMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/GuiGraphicsMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/GuiMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/GuiMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/GuiMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/GuiMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/HumanoidArmorLayerMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/HumanoidArmorLayerMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/HumanoidArmorLayerMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/HumanoidArmorLayerMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/I18nMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/I18nMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/I18nMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/I18nMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ItemColorsMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ItemColorsMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ItemColorsMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ItemColorsMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ItemFrameRendererMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ItemFrameRendererMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ItemFrameRendererMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ItemFrameRendererMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ItemInHandRendererMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ItemInHandRendererMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ItemInHandRendererMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ItemInHandRendererMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/KeyboardHandlerMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/KeyboardHandlerMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/KeyboardHandlerMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/KeyboardHandlerMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/LevelRendererMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/LevelRendererMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/LevelRendererMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/LevelRendererMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/LivingEntityRendererMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/LivingEntityRendererMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/LivingEntityRendererMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/LivingEntityRendererMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MapRendererMapInstanceMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MapRendererMapInstanceMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MapRendererMapInstanceMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MapRendererMapInstanceMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MinecraftMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MinecraftMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MinecraftMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MinecraftMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ModelBakeryMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ModelBakeryMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ModelBakeryMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ModelBakeryMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ModelBlockRendererMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ModelBlockRendererMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ModelBlockRendererMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ModelBlockRendererMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ModelStateMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ModelStateMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ModelStateMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ModelStateMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MouseHandlerMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MouseHandlerMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MouseHandlerMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MouseHandlerMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MultiPlayerGameModeMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MultiPlayerGameModeMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MultiPlayerGameModeMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/MultiPlayerGameModeMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ParticleEngineMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ParticleEngineMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ParticleEngineMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ParticleEngineMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ParticleMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ParticleMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ParticleMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/ParticleMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/PlayerRendererMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/PlayerRendererMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/PlayerRendererMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/PlayerRendererMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/PostChainMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/PostChainMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/PostChainMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/PostChainMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/RenderTargetMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/RenderTargetMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/RenderTargetMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/RenderTargetMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/SkullBlockRendererMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/SkullBlockRendererMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/SkullBlockRendererMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/SkullBlockRendererMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/TextureAtlasMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/TextureAtlasMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/TextureAtlasMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/TextureAtlasMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/frex/EntityBlockRenderContextMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/frex/EntityBlockRenderContextMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/frex/EntityBlockRenderContextMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/client/frex/EntityBlockRenderContextMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/AbstractMinecartMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/AbstractMinecartMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/AbstractMinecartMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/AbstractMinecartMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/AnvilMenuMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/AnvilMenuMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/AnvilMenuMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/AnvilMenuMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BambooStalkBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BambooStalkBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BambooStalkBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BambooStalkBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BaseRailBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BaseRailBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BaseRailBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BaseRailBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BeaconBlockEntityMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BeaconBlockEntityMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BeaconBlockEntityMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BeaconBlockEntityMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockBehavior$PropertiesMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockBehavior$PropertiesMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockBehavior$PropertiesMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockBehavior$PropertiesMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockBehaviour$BlockStateBaseMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockBehaviour$BlockStateBaseMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockBehaviour$BlockStateBaseMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockBehaviour$BlockStateBaseMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockEntityMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockEntityMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockEntityMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockEntityMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockGetterMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockGetterMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockGetterMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockGetterMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockItemMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockItemMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockItemMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockItemMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockLightEngineMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockLightEngineMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockLightEngineMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockLightEngineMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockStateMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockStateMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockStateMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BlockStateMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BoatMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BoatMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BoatMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BoatMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BowItemMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BowItemMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BowItemMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BowItemMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BushBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BushBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BushBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/BushBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/CactusBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/CactusBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/CactusBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/CactusBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ChunkMapMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ChunkMapMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ChunkMapMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ChunkMapMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ChunkStatusMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ChunkStatusMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ChunkStatusMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ChunkStatusMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ClipContextMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ClipContextMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ClipContextMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ClipContextMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ConnectionMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ConnectionMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ConnectionMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ConnectionMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/DeadBushBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/DeadBushBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/DeadBushBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/DeadBushBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/DropExperienceBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/DropExperienceBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/DropExperienceBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/DropExperienceBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EnchantmentHelperMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EnchantmentHelperMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EnchantmentHelperMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EnchantmentHelperMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EnchantmentMenuMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EnchantmentMenuMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EnchantmentMenuMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EnchantmentMenuMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EnchantmentMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EnchantmentMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EnchantmentMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EnchantmentMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EnchantmentTableBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EnchantmentTableBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EnchantmentTableBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EnchantmentTableBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EntityCollisionContextMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EntityCollisionContextMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EntityCollisionContextMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EntityCollisionContextMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EntityMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EntityMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EntityMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/EntityMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ExperienceOrbMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ExperienceOrbMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ExperienceOrbMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ExperienceOrbMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ExplosionDamageCalculatorMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ExplosionDamageCalculatorMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ExplosionDamageCalculatorMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ExplosionDamageCalculatorMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ExplosionMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ExplosionMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ExplosionMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ExplosionMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/FireBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/FireBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/FireBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/FireBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/FlyingMobMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/FlyingMobMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/FlyingMobMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/FlyingMobMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/GrindstoneMenuMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/GrindstoneMenuMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/GrindstoneMenuMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/GrindstoneMenuMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/InventoryMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/InventoryMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/InventoryMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/InventoryMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ItemEntityMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ItemEntityMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ItemEntityMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ItemEntityMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ItemStackMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ItemStackMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ItemStackMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ItemStackMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LavaFluidMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LavaFluidMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LavaFluidMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LavaFluidMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LeavesBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LeavesBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LeavesBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LeavesBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LevelChunkMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LevelChunkMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LevelChunkMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LevelChunkMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LevelMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LevelMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LevelMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LevelMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LevelReaderMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LevelReaderMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LevelReaderMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LevelReaderMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LightEngineMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LightEngineMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LightEngineMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LightEngineMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LiquidBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LiquidBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LiquidBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LiquidBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LivingEntityMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LivingEntityMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LivingEntityMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/LivingEntityMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MainMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MainMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MainMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MainMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MapDecorationMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MapDecorationMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MapDecorationMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MapDecorationMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MapItemMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MapItemMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MapItemMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MapItemMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MobEffectInstanceMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MobEffectInstanceMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MobEffectInstanceMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MobEffectInstanceMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MushroomCowMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MushroomCowMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MushroomCowMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/MushroomCowMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/NaturalSpawnerMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/NaturalSpawnerMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/NaturalSpawnerMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/NaturalSpawnerMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PackRepositoryMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PackRepositoryMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PackRepositoryMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PackRepositoryMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PiglinAiMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PiglinAiMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PiglinAiMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PiglinAiMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PlayerAdvancementsMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PlayerAdvancementsMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PlayerAdvancementsMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PlayerAdvancementsMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PlayerListMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PlayerListMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PlayerListMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PlayerListMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PlayerMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PlayerMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PlayerMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PlayerMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PowderSnowBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PowderSnowBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PowderSnowBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/PowderSnowBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/RailStateMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/RailStateMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/RailStateMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/RailStateMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/RecipeManagerMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/RecipeManagerMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/RecipeManagerMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/RecipeManagerMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/RedStoneOreBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/RedStoneOreBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/RedStoneOreBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/RedStoneOreBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/RedStoneWireBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/RedStoneWireBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/RedStoneWireBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/RedStoneWireBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ReloadableServerResourcesMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ReloadableServerResourcesMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ReloadableServerResourcesMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ReloadableServerResourcesMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ResourceLocationMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ResourceLocationMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ResourceLocationMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ResourceLocationMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ResultSlotMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ResultSlotMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ResultSlotMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ResultSlotMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SculkCatalystBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SculkCatalystBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SculkCatalystBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SculkCatalystBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SculkSensorBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SculkSensorBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SculkSensorBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SculkSensorBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SculkShriekerBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SculkShriekerBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SculkShriekerBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SculkShriekerBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SeagrassBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SeagrassBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SeagrassBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SeagrassBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ServerPlayerGameModeMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ServerPlayerGameModeMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ServerPlayerGameModeMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ServerPlayerGameModeMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ShapedRecipePattern$DataMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ShapedRecipePattern$DataMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ShapedRecipePattern$DataMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ShapedRecipePattern$DataMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ShapelessRecipe$SerializerMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ShapelessRecipe$SerializerMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ShapelessRecipe$SerializerMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ShapelessRecipe$SerializerMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ShapelessRecipeMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ShapelessRecipeMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ShapelessRecipeMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/ShapelessRecipeMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SignalGetterMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SignalGetterMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SignalGetterMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SignalGetterMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SnowGolemMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SnowGolemMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SnowGolemMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SnowGolemMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SpawnerBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SpawnerBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SpawnerBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SpawnerBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/StemBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/StemBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/StemBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/StemBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/StructureProcessorMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/StructureProcessorMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/StructureProcessorMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/StructureProcessorMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/StructureTemplateMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/StructureTemplateMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/StructureTemplateMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/StructureTemplateMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SugarCaneBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SugarCaneBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SugarCaneBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/SugarCaneBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/TagAppenderMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/TagAppenderMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/TagAppenderMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/TagAppenderMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/TallGrassBlockMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/TallGrassBlockMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/TallGrassBlockMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/TallGrassBlockMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/TierMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/TierMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/TierMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/TierMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/TiersMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/TiersMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/TiersMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/TiersMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/WitherBossMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/WitherBossMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/WitherBossMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/WitherBossMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/WitherSkullMixin.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/WitherSkullMixin.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/WitherSkullMixin.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/mixin/common/WitherSkullMixin.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/render/MapDecorationIterator.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/render/MapDecorationIterator.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/render/MapDecorationIterator.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/render/MapDecorationIterator.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/resource/DelegatingPackResources.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/resource/DelegatingPackResources.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/resource/DelegatingPackResources.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/resource/DelegatingPackResources.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/AbstractSpawnerHelper.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/AbstractSpawnerHelper.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/AbstractSpawnerHelper.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/AbstractSpawnerHelper.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ArmorTextureRegistry.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ArmorTextureRegistry.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ArmorTextureRegistry.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ArmorTextureRegistry.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/BiomeManagerHelper.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/BiomeManagerHelper.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/BiomeManagerHelper.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/BiomeManagerHelper.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/BlockEntityHelper.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/BlockEntityHelper.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/BlockEntityHelper.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/BlockEntityHelper.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/BlockSnapshot.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/BlockSnapshot.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/BlockSnapshot.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/BlockSnapshot.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/Constants.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/Constants.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/Constants.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/Constants.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/CyclePresentException.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/CyclePresentException.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/CyclePresentException.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/CyclePresentException.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/EntityHelper.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/EntityHelper.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/EntityHelper.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/EntityHelper.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/FirstPersonRendererHelper.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/FirstPersonRendererHelper.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/FirstPersonRendererHelper.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/FirstPersonRendererHelper.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/FontRenderUtil.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/FontRenderUtil.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/FontRenderUtil.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/FontRenderUtil.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ForgeI18n.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ForgeI18n.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ForgeI18n.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ForgeI18n.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/GameRendererHelper.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/GameRendererHelper.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/GameRendererHelper.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/GameRendererHelper.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/IdentifiableSimplePreparableReloadListener.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/IdentifiableSimplePreparableReloadListener.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/IdentifiableSimplePreparableReloadListener.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/IdentifiableSimplePreparableReloadListener.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ItemRendererHelper.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ItemRendererHelper.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ItemRendererHelper.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ItemRendererHelper.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/KeyBindingHelper.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/KeyBindingHelper.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/KeyBindingHelper.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/KeyBindingHelper.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazyOptional.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazyOptional.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazyOptional.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazyOptional.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazySoundType.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazySoundType.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazySoundType.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazySoundType.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazySpawnEggItem.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazySpawnEggItem.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazySpawnEggItem.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazySpawnEggItem.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/MaterialChest.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/MaterialChest.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/MaterialChest.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/MaterialChest.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/MinecartAndRailUtil.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/MinecartAndRailUtil.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/MinecartAndRailUtil.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/MinecartAndRailUtil.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/MinecraftServerUtil.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/MinecraftServerUtil.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/MinecraftServerUtil.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/MinecraftServerUtil.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/NBTSerializer.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/NBTSerializer.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/NBTSerializer.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/NBTSerializer.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/NetworkDirection.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/NetworkDirection.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/NetworkDirection.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/NetworkDirection.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/NetworkHooks.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/NetworkHooks.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/NetworkHooks.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/NetworkHooks.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ParticleHelper.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ParticleHelper.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ParticleHelper.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ParticleHelper.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/PlayerEntityHelper.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/PlayerEntityHelper.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/PlayerEntityHelper.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/PlayerEntityHelper.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/PortingHooks.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/PortingHooks.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/PortingHooks.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/PortingHooks.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/PotionHelper.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/PotionHelper.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/PotionHelper.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/PotionHelper.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ScreenHelper.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ScreenHelper.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ScreenHelper.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/ScreenHelper.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/SimpleFlowableFluid.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/SimpleFlowableFluid.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/SimpleFlowableFluid.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/SimpleFlowableFluid.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/StickinessUtil.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/StickinessUtil.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/StickinessUtil.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/StickinessUtil.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/StronglyConnectedComponentDetector.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/StronglyConnectedComponentDetector.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/StronglyConnectedComponentDetector.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/StronglyConnectedComponentDetector.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/TablePrinter.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/TablePrinter.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/TablePrinter.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/TablePrinter.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/TagUtil.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/TagUtil.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/TagUtil.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/TagUtil.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/TierSortingRegistry.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/TierSortingRegistry.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/TierSortingRegistry.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/TierSortingRegistry.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/TopologicalSort.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/TopologicalSort.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/TopologicalSort.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/TopologicalSort.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/UsernameCache.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/UsernameCache.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/UsernameCache.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/UsernameCache.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/client/ClientHooks.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/client/ClientHooks.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/client/ClientHooks.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/client/ClientHooks.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/client/ForgeSlider.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/client/ForgeSlider.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/client/ForgeSlider.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/client/ForgeSlider.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/client/ScreenUtils.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/client/ScreenUtils.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/client/ScreenUtils.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/client/ScreenUtils.java diff --git a/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/client/ScrollPanel.java b/modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/client/ScrollPanel.java similarity index 100% rename from base/src/main/java/io/github/fabricators_of_create/porting_lib/util/client/ScrollPanel.java rename to modules/base/src/main/java/io/github/fabricators_of_create/porting_lib/util/client/ScrollPanel.java diff --git a/base/src/main/resources/assets/forge/icon.png b/modules/base/src/main/resources/assets/forge/icon.png similarity index 100% rename from base/src/main/resources/assets/forge/icon.png rename to modules/base/src/main/resources/assets/forge/icon.png diff --git a/base/src/main/resources/assets/forge/models/item/bucket.json b/modules/base/src/main/resources/assets/forge/models/item/bucket.json similarity index 100% rename from base/src/main/resources/assets/forge/models/item/bucket.json rename to modules/base/src/main/resources/assets/forge/models/item/bucket.json diff --git a/base/src/main/resources/assets/forge/models/item/bucket_drip.json b/modules/base/src/main/resources/assets/forge/models/item/bucket_drip.json similarity index 100% rename from base/src/main/resources/assets/forge/models/item/bucket_drip.json rename to modules/base/src/main/resources/assets/forge/models/item/bucket_drip.json diff --git a/base/src/main/resources/assets/forge/models/item/default-tool.json b/modules/base/src/main/resources/assets/forge/models/item/default-tool.json similarity index 100% rename from base/src/main/resources/assets/forge/models/item/default-tool.json rename to modules/base/src/main/resources/assets/forge/models/item/default-tool.json diff --git a/base/src/main/resources/assets/forge/models/item/default.json b/modules/base/src/main/resources/assets/forge/models/item/default.json similarity index 100% rename from base/src/main/resources/assets/forge/models/item/default.json rename to modules/base/src/main/resources/assets/forge/models/item/default.json diff --git a/base/src/main/resources/assets/forge/textures/item/mask/bucket_fluid.png b/modules/base/src/main/resources/assets/forge/textures/item/mask/bucket_fluid.png similarity index 100% rename from base/src/main/resources/assets/forge/textures/item/mask/bucket_fluid.png rename to modules/base/src/main/resources/assets/forge/textures/item/mask/bucket_fluid.png diff --git a/base/src/main/resources/assets/forge/textures/item/mask/bucket_fluid_cover.png b/modules/base/src/main/resources/assets/forge/textures/item/mask/bucket_fluid_cover.png similarity index 100% rename from base/src/main/resources/assets/forge/textures/item/mask/bucket_fluid_cover.png rename to modules/base/src/main/resources/assets/forge/textures/item/mask/bucket_fluid_cover.png diff --git a/base/src/main/resources/assets/forge/textures/item/mask/bucket_fluid_cover_drip.png b/modules/base/src/main/resources/assets/forge/textures/item/mask/bucket_fluid_cover_drip.png similarity index 100% rename from base/src/main/resources/assets/forge/textures/item/mask/bucket_fluid_cover_drip.png rename to modules/base/src/main/resources/assets/forge/textures/item/mask/bucket_fluid_cover_drip.png diff --git a/base/src/main/resources/assets/forge/textures/item/mask/bucket_fluid_drip.png b/modules/base/src/main/resources/assets/forge/textures/item/mask/bucket_fluid_drip.png similarity index 100% rename from base/src/main/resources/assets/forge/textures/item/mask/bucket_fluid_drip.png rename to modules/base/src/main/resources/assets/forge/textures/item/mask/bucket_fluid_drip.png diff --git a/base/src/main/resources/assets/porting_lib/white.png b/modules/base/src/main/resources/assets/porting_lib/white.png similarity index 100% rename from base/src/main/resources/assets/porting_lib/white.png rename to modules/base/src/main/resources/assets/porting_lib/white.png diff --git a/base/src/main/resources/data/c/tags/blocks/rails/activator.json b/modules/base/src/main/resources/data/c/tags/blocks/rails/activator.json similarity index 100% rename from base/src/main/resources/data/c/tags/blocks/rails/activator.json rename to modules/base/src/main/resources/data/c/tags/blocks/rails/activator.json diff --git a/base/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/modules/base/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json similarity index 100% rename from base/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json rename to modules/base/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json diff --git a/base/src/main/resources/fabric.mod.json b/modules/base/src/main/resources/fabric.mod.json similarity index 100% rename from base/src/main/resources/fabric.mod.json rename to modules/base/src/main/resources/fabric.mod.json diff --git a/base/src/main/resources/porting_lib_base.accesswidener b/modules/base/src/main/resources/porting_lib_base.accesswidener similarity index 93% rename from base/src/main/resources/porting_lib_base.accesswidener rename to modules/base/src/main/resources/porting_lib_base.accesswidener index c93fcf499..eeacb63e8 100644 --- a/base/src/main/resources/porting_lib_base.accesswidener +++ b/modules/base/src/main/resources/porting_lib_base.accesswidener @@ -8,7 +8,6 @@ transitive-accessible class net/minecraft/world/level/entity/PersistentEntitySec transitive-accessible class net/minecraft/world/level/entity/TransientEntitySectionManager$Callback transitive-accessible class net/minecraft/world/level/lighting/BlockLightSectionStorage$BlockDataLayerStorageMap -transitive-accessible method net/minecraft/client/gui/components/AbstractButton getTextureY ()I transitive-accessible method net/minecraft/client/gui/screens/MenuScreens getConstructor (Lnet/minecraft/world/inventory/MenuType;)Lnet/minecraft/client/gui/screens/MenuScreens$ScreenConstructor; transitive-accessible method net/minecraft/commands/synchronization/ArgumentTypeInfos register (Lnet/minecraft/core/Registry;Ljava/lang/String;Ljava/lang/Class;Lnet/minecraft/commands/synchronization/ArgumentTypeInfo;)Lnet/minecraft/commands/synchronization/ArgumentTypeInfo; diff --git a/base/src/main/resources/porting_lib_base.mixins.json b/modules/base/src/main/resources/porting_lib_base.mixins.json similarity index 98% rename from base/src/main/resources/porting_lib_base.mixins.json rename to modules/base/src/main/resources/porting_lib_base.mixins.json index 039b36e8f..c740e9057 100644 --- a/base/src/main/resources/porting_lib_base.mixins.json +++ b/modules/base/src/main/resources/porting_lib_base.mixins.json @@ -6,6 +6,7 @@ "plugin": "io.github.fabricators_of_create.porting_lib.mixin.PortingLibMixinPlugin", "compatibilityLevel": "JAVA_17", "mixins": [ + "client.frex.EntityBlockRenderContextMixin", "common.AbstractMinecartMixin", "common.AnvilMenuMixin", "common.BambooStalkBlockMixin", diff --git a/brewing/build.gradle b/modules/brewing/build.gradle similarity index 100% rename from brewing/build.gradle rename to modules/brewing/build.gradle diff --git a/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/BrewingHandler.java b/modules/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/BrewingHandler.java similarity index 100% rename from brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/BrewingHandler.java rename to modules/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/BrewingHandler.java diff --git a/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/BrewingRecipe.java b/modules/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/BrewingRecipe.java similarity index 100% rename from brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/BrewingRecipe.java rename to modules/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/BrewingRecipe.java diff --git a/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/BrewingRecipeRegistry.java b/modules/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/BrewingRecipeRegistry.java similarity index 100% rename from brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/BrewingRecipeRegistry.java rename to modules/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/BrewingRecipeRegistry.java diff --git a/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/IBrewingRecipe.java b/modules/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/IBrewingRecipe.java similarity index 100% rename from brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/IBrewingRecipe.java rename to modules/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/IBrewingRecipe.java diff --git a/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/VanillaBrewingRecipe.java b/modules/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/VanillaBrewingRecipe.java similarity index 100% rename from brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/VanillaBrewingRecipe.java rename to modules/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/VanillaBrewingRecipe.java diff --git a/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/mixin/BrewingStandBlockEntityMixin.java b/modules/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/mixin/BrewingStandBlockEntityMixin.java similarity index 100% rename from brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/mixin/BrewingStandBlockEntityMixin.java rename to modules/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/mixin/BrewingStandBlockEntityMixin.java diff --git a/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/mixin/BrewingStandMenu$IngredientsSlotMixin.java b/modules/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/mixin/BrewingStandMenu$IngredientsSlotMixin.java similarity index 100% rename from brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/mixin/BrewingStandMenu$IngredientsSlotMixin.java rename to modules/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/mixin/BrewingStandMenu$IngredientsSlotMixin.java diff --git a/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/mixin/BrewingStandMenu$PotionSlotMixin.java b/modules/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/mixin/BrewingStandMenu$PotionSlotMixin.java similarity index 100% rename from brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/mixin/BrewingStandMenu$PotionSlotMixin.java rename to modules/brewing/src/main/java/io/github/fabricators_of_create/porting_lib/brewing/mixin/BrewingStandMenu$PotionSlotMixin.java diff --git a/brewing/src/main/resources/fabric.mod.json b/modules/brewing/src/main/resources/fabric.mod.json similarity index 100% rename from brewing/src/main/resources/fabric.mod.json rename to modules/brewing/src/main/resources/fabric.mod.json diff --git a/brewing/src/main/resources/porting_lib_brewing.mixins.json b/modules/brewing/src/main/resources/porting_lib_brewing.mixins.json similarity index 100% rename from brewing/src/main/resources/porting_lib_brewing.mixins.json rename to modules/brewing/src/main/resources/porting_lib_brewing.mixins.json diff --git a/chunk_loading/build.gradle b/modules/chunk_loading/build.gradle similarity index 100% rename from chunk_loading/build.gradle rename to modules/chunk_loading/build.gradle diff --git a/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/PortingLibChunkManager.java b/modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/PortingLibChunkManager.java similarity index 100% rename from chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/PortingLibChunkManager.java rename to modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/PortingLibChunkManager.java diff --git a/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/extensions/DistanceManagerExtension.java b/modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/extensions/DistanceManagerExtension.java similarity index 100% rename from chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/extensions/DistanceManagerExtension.java rename to modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/extensions/DistanceManagerExtension.java diff --git a/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/extensions/ForcedChunksSavedDataExtension.java b/modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/extensions/ForcedChunksSavedDataExtension.java similarity index 100% rename from chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/extensions/ForcedChunksSavedDataExtension.java rename to modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/extensions/ForcedChunksSavedDataExtension.java diff --git a/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/extensions/ServerChunkCacheExtension.java b/modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/extensions/ServerChunkCacheExtension.java similarity index 100% rename from chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/extensions/ServerChunkCacheExtension.java rename to modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/extensions/ServerChunkCacheExtension.java diff --git a/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/extensions/TicketExtension.java b/modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/extensions/TicketExtension.java similarity index 100% rename from chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/extensions/TicketExtension.java rename to modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/extensions/TicketExtension.java diff --git a/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/DistanceManagerMixin.java b/modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/DistanceManagerMixin.java similarity index 100% rename from chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/DistanceManagerMixin.java rename to modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/DistanceManagerMixin.java diff --git a/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/ForcedChunksSavedDataMixin.java b/modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/ForcedChunksSavedDataMixin.java similarity index 100% rename from chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/ForcedChunksSavedDataMixin.java rename to modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/ForcedChunksSavedDataMixin.java diff --git a/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/MinecraftServerMixin.java b/modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/MinecraftServerMixin.java similarity index 100% rename from chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/MinecraftServerMixin.java rename to modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/MinecraftServerMixin.java diff --git a/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/ServerChunkCacheMixin.java b/modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/ServerChunkCacheMixin.java similarity index 100% rename from chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/ServerChunkCacheMixin.java rename to modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/ServerChunkCacheMixin.java diff --git a/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/ServerLevelMixin.java b/modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/ServerLevelMixin.java similarity index 100% rename from chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/ServerLevelMixin.java rename to modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/ServerLevelMixin.java diff --git a/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/TicketMixin.java b/modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/TicketMixin.java similarity index 100% rename from chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/TicketMixin.java rename to modules/chunk_loading/src/main/java/io/github/fabricators_of_create/porting_lib/chunk/loading/mixin/TicketMixin.java diff --git a/chunk_loading/src/main/resources/fabric.mod.json b/modules/chunk_loading/src/main/resources/fabric.mod.json similarity index 100% rename from chunk_loading/src/main/resources/fabric.mod.json rename to modules/chunk_loading/src/main/resources/fabric.mod.json diff --git a/chunk_loading/src/main/resources/porting_lib_chunk_loading.mixins.json b/modules/chunk_loading/src/main/resources/porting_lib_chunk_loading.mixins.json similarity index 100% rename from chunk_loading/src/main/resources/porting_lib_chunk_loading.mixins.json rename to modules/chunk_loading/src/main/resources/porting_lib_chunk_loading.mixins.json diff --git a/client_events/build.gradle b/modules/client_events/build.gradle similarity index 100% rename from client_events/build.gradle rename to modules/client_events/build.gradle diff --git a/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/EntityShaderManager.java b/modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/EntityShaderManager.java similarity index 100% rename from client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/EntityShaderManager.java rename to modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/EntityShaderManager.java diff --git a/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/ClientPlayerNetworkCloneCallback.java b/modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/ClientPlayerNetworkCloneCallback.java similarity index 100% rename from client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/ClientPlayerNetworkCloneCallback.java rename to modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/ClientPlayerNetworkCloneCallback.java diff --git a/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/MovementInputUpdateCallback.java b/modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/MovementInputUpdateCallback.java similarity index 100% rename from client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/MovementInputUpdateCallback.java rename to modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/MovementInputUpdateCallback.java diff --git a/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/PlaySoundCallback.java b/modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/PlaySoundCallback.java similarity index 100% rename from client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/PlaySoundCallback.java rename to modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/PlaySoundCallback.java diff --git a/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/PlaySoundSourceCallback.java b/modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/PlaySoundSourceCallback.java similarity index 100% rename from client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/PlaySoundSourceCallback.java rename to modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/PlaySoundSourceCallback.java diff --git a/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/RegisterColorResolversCallback.java b/modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/RegisterColorResolversCallback.java similarity index 100% rename from client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/RegisterColorResolversCallback.java rename to modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/RegisterColorResolversCallback.java diff --git a/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/RegisterEntitySpectatorShadersCallback.java b/modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/RegisterEntitySpectatorShadersCallback.java similarity index 100% rename from client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/RegisterEntitySpectatorShadersCallback.java rename to modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/RegisterEntitySpectatorShadersCallback.java diff --git a/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/RenderArmCallback.java b/modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/RenderArmCallback.java similarity index 100% rename from client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/RenderArmCallback.java rename to modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/event/client/RenderArmCallback.java diff --git a/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/ClientLevelMixin.java b/modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/ClientLevelMixin.java similarity index 100% rename from client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/ClientLevelMixin.java rename to modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/ClientLevelMixin.java diff --git a/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/ClientPacketListenerMixin.java b/modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/ClientPacketListenerMixin.java similarity index 100% rename from client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/ClientPacketListenerMixin.java rename to modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/ClientPacketListenerMixin.java diff --git a/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/GameRendererMixin.java b/modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/GameRendererMixin.java similarity index 100% rename from client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/GameRendererMixin.java rename to modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/GameRendererMixin.java diff --git a/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/LocalPlayerMixin.java b/modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/LocalPlayerMixin.java similarity index 100% rename from client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/LocalPlayerMixin.java rename to modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/LocalPlayerMixin.java diff --git a/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/PlayerRendererMixin.java b/modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/PlayerRendererMixin.java similarity index 100% rename from client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/PlayerRendererMixin.java rename to modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/PlayerRendererMixin.java diff --git a/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/SoundEngineMixin.java b/modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/SoundEngineMixin.java similarity index 100% rename from client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/SoundEngineMixin.java rename to modules/client_events/src/main/java/io/github/fabricators_of_create/porting_lib/client_events/mixin/client/SoundEngineMixin.java diff --git a/client_events/src/main/resources/fabric.mod.json b/modules/client_events/src/main/resources/fabric.mod.json similarity index 100% rename from client_events/src/main/resources/fabric.mod.json rename to modules/client_events/src/main/resources/fabric.mod.json diff --git a/client_events/src/main/resources/porting_lib_client_events.mixins.json b/modules/client_events/src/main/resources/porting_lib_client_events.mixins.json similarity index 100% rename from client_events/src/main/resources/porting_lib_client_events.mixins.json rename to modules/client_events/src/main/resources/porting_lib_client_events.mixins.json diff --git a/common/build.gradle b/modules/common/build.gradle similarity index 100% rename from common/build.gradle rename to modules/common/build.gradle diff --git a/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/extensions/LanguageManagerExtensions.java b/modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/extensions/LanguageManagerExtensions.java similarity index 100% rename from common/src/main/java/io/github/fabricators_of_create/porting_lib/common/extensions/LanguageManagerExtensions.java rename to modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/extensions/LanguageManagerExtensions.java diff --git a/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/mixin/client/LanguageManagerMixin.java b/modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/mixin/client/LanguageManagerMixin.java similarity index 100% rename from common/src/main/java/io/github/fabricators_of_create/porting_lib/common/mixin/client/LanguageManagerMixin.java rename to modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/mixin/client/LanguageManagerMixin.java diff --git a/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/mixin/client/accessor/MinecraftAccessor.java b/modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/mixin/client/accessor/MinecraftAccessor.java similarity index 100% rename from common/src/main/java/io/github/fabricators_of_create/porting_lib/common/mixin/client/accessor/MinecraftAccessor.java rename to modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/mixin/client/accessor/MinecraftAccessor.java diff --git a/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/IPlantable.java b/modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/IPlantable.java similarity index 100% rename from common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/IPlantable.java rename to modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/IPlantable.java diff --git a/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/Lazy.java b/modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/Lazy.java similarity index 100% rename from common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/Lazy.java rename to modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/Lazy.java diff --git a/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/MinecraftClientUtil.java b/modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/MinecraftClientUtil.java similarity index 100% rename from common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/MinecraftClientUtil.java rename to modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/MinecraftClientUtil.java diff --git a/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/MixinHelper.java b/modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/MixinHelper.java similarity index 100% rename from common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/MixinHelper.java rename to modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/MixinHelper.java diff --git a/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/NonNullConsumer.java b/modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/NonNullConsumer.java similarity index 100% rename from common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/NonNullConsumer.java rename to modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/NonNullConsumer.java diff --git a/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/NonNullFunction.java b/modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/NonNullFunction.java similarity index 100% rename from common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/NonNullFunction.java rename to modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/NonNullFunction.java diff --git a/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/NonNullSupplier.java b/modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/NonNullSupplier.java similarity index 100% rename from common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/NonNullSupplier.java rename to modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/NonNullSupplier.java diff --git a/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/PlantType.java b/modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/PlantType.java similarity index 100% rename from common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/PlantType.java rename to modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/PlantType.java diff --git a/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/PlantUtil.java b/modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/PlantUtil.java similarity index 100% rename from common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/PlantUtil.java rename to modules/common/src/main/java/io/github/fabricators_of_create/porting_lib/common/util/PlantUtil.java diff --git a/common/src/main/resources/fabric.mod.json b/modules/common/src/main/resources/fabric.mod.json similarity index 100% rename from common/src/main/resources/fabric.mod.json rename to modules/common/src/main/resources/fabric.mod.json diff --git a/common/src/main/resources/porting_lib_common.mixins.json b/modules/common/src/main/resources/porting_lib_common.mixins.json similarity index 100% rename from common/src/main/resources/porting_lib_common.mixins.json rename to modules/common/src/main/resources/porting_lib_common.mixins.json diff --git a/config/build.gradle b/modules/config/build.gradle similarity index 100% rename from config/build.gradle rename to modules/config/build.gradle diff --git a/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ConfigEvents.java b/modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ConfigEvents.java similarity index 100% rename from config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ConfigEvents.java rename to modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ConfigEvents.java diff --git a/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ConfigRegistry.java b/modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ConfigRegistry.java similarity index 100% rename from config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ConfigRegistry.java rename to modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ConfigRegistry.java diff --git a/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ConfigTracker.java b/modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ConfigTracker.java similarity index 100% rename from config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ConfigTracker.java rename to modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ConfigTracker.java diff --git a/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ConfigType.java b/modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ConfigType.java similarity index 100% rename from config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ConfigType.java rename to modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ConfigType.java diff --git a/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ModConfig.java b/modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ModConfig.java similarity index 100% rename from config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ModConfig.java rename to modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ModConfig.java diff --git a/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ModConfigSpec.java b/modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ModConfigSpec.java similarity index 100% rename from config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ModConfigSpec.java rename to modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/ModConfigSpec.java diff --git a/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/PortingLibConfig.java b/modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/PortingLibConfig.java similarity index 100% rename from config/src/main/java/io/github/fabricators_of_create/porting_lib/config/PortingLibConfig.java rename to modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/PortingLibConfig.java diff --git a/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/client/PortingLibConfigClient.java b/modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/client/PortingLibConfigClient.java similarity index 100% rename from config/src/main/java/io/github/fabricators_of_create/porting_lib/config/client/PortingLibConfigClient.java rename to modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/client/PortingLibConfigClient.java diff --git a/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/mixin/client/MinecraftMixin.java b/modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/mixin/client/MinecraftMixin.java similarity index 100% rename from config/src/main/java/io/github/fabricators_of_create/porting_lib/config/mixin/client/MinecraftMixin.java rename to modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/mixin/client/MinecraftMixin.java diff --git a/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/mixin/server/MainMixin.java b/modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/mixin/server/MainMixin.java similarity index 100% rename from config/src/main/java/io/github/fabricators_of_create/porting_lib/config/mixin/server/MainMixin.java rename to modules/config/src/main/java/io/github/fabricators_of_create/porting_lib/config/mixin/server/MainMixin.java diff --git a/config/src/main/resources/fabric.mod.json b/modules/config/src/main/resources/fabric.mod.json similarity index 100% rename from config/src/main/resources/fabric.mod.json rename to modules/config/src/main/resources/fabric.mod.json diff --git a/config/src/main/resources/porting_lib_config.accesswidener b/modules/config/src/main/resources/porting_lib_config.accesswidener similarity index 100% rename from config/src/main/resources/porting_lib_config.accesswidener rename to modules/config/src/main/resources/porting_lib_config.accesswidener diff --git a/config/src/main/resources/porting_lib_config.mixins.json b/modules/config/src/main/resources/porting_lib_config.mixins.json similarity index 100% rename from config/src/main/resources/porting_lib_config.mixins.json rename to modules/config/src/main/resources/porting_lib_config.mixins.json diff --git a/core/build.gradle b/modules/core/build.gradle similarity index 100% rename from core/build.gradle rename to modules/core/build.gradle diff --git a/core/src/main/java/io/github/fabricators_of_create/porting_lib/core/PortingLib.java b/modules/core/src/main/java/io/github/fabricators_of_create/porting_lib/core/PortingLib.java similarity index 100% rename from core/src/main/java/io/github/fabricators_of_create/porting_lib/core/PortingLib.java rename to modules/core/src/main/java/io/github/fabricators_of_create/porting_lib/core/PortingLib.java diff --git a/core/src/main/java/io/github/fabricators_of_create/porting_lib/core/event/BaseEvent.java b/modules/core/src/main/java/io/github/fabricators_of_create/porting_lib/core/event/BaseEvent.java similarity index 100% rename from core/src/main/java/io/github/fabricators_of_create/porting_lib/core/event/BaseEvent.java rename to modules/core/src/main/java/io/github/fabricators_of_create/porting_lib/core/event/BaseEvent.java diff --git a/core/src/main/java/io/github/fabricators_of_create/porting_lib/core/util/INBTSerializable.java b/modules/core/src/main/java/io/github/fabricators_of_create/porting_lib/core/util/INBTSerializable.java similarity index 100% rename from core/src/main/java/io/github/fabricators_of_create/porting_lib/core/util/INBTSerializable.java rename to modules/core/src/main/java/io/github/fabricators_of_create/porting_lib/core/util/INBTSerializable.java diff --git a/core/src/main/java/io/github/fabricators_of_create/porting_lib/core/util/LamdbaExceptionUtils.java b/modules/core/src/main/java/io/github/fabricators_of_create/porting_lib/core/util/LamdbaExceptionUtils.java similarity index 100% rename from core/src/main/java/io/github/fabricators_of_create/porting_lib/core/util/LamdbaExceptionUtils.java rename to modules/core/src/main/java/io/github/fabricators_of_create/porting_lib/core/util/LamdbaExceptionUtils.java diff --git a/core/src/main/resources/fabric.mod.json b/modules/core/src/main/resources/fabric.mod.json similarity index 100% rename from core/src/main/resources/fabric.mod.json rename to modules/core/src/main/resources/fabric.mod.json diff --git a/data/build.gradle b/modules/data/build.gradle similarity index 100% rename from data/build.gradle rename to modules/data/build.gradle diff --git a/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/ExistingFileHelper.java b/modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/ExistingFileHelper.java similarity index 100% rename from data/src/main/java/io/github/fabricators_of_create/porting_lib/data/ExistingFileHelper.java rename to modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/ExistingFileHelper.java diff --git a/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/JsonCodecProvider.java b/modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/JsonCodecProvider.java similarity index 100% rename from data/src/main/java/io/github/fabricators_of_create/porting_lib/data/JsonCodecProvider.java rename to modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/JsonCodecProvider.java diff --git a/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/LanguageProvider.java b/modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/LanguageProvider.java similarity index 100% rename from data/src/main/java/io/github/fabricators_of_create/porting_lib/data/LanguageProvider.java rename to modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/LanguageProvider.java diff --git a/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/ModdedBlockLootSubProvider.java b/modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/ModdedBlockLootSubProvider.java similarity index 100% rename from data/src/main/java/io/github/fabricators_of_create/porting_lib/data/ModdedBlockLootSubProvider.java rename to modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/ModdedBlockLootSubProvider.java diff --git a/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/ModdedEntityLootSubProvider.java b/modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/ModdedEntityLootSubProvider.java similarity index 100% rename from data/src/main/java/io/github/fabricators_of_create/porting_lib/data/ModdedEntityLootSubProvider.java rename to modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/ModdedEntityLootSubProvider.java diff --git a/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/ModdedLootTableProvider.java b/modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/ModdedLootTableProvider.java similarity index 100% rename from data/src/main/java/io/github/fabricators_of_create/porting_lib/data/ModdedLootTableProvider.java rename to modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/ModdedLootTableProvider.java diff --git a/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/PortingLibItemTagsProvider.java b/modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/PortingLibItemTagsProvider.java similarity index 100% rename from data/src/main/java/io/github/fabricators_of_create/porting_lib/data/PortingLibItemTagsProvider.java rename to modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/PortingLibItemTagsProvider.java diff --git a/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/PortingLibTagsProvider.java b/modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/PortingLibTagsProvider.java similarity index 100% rename from data/src/main/java/io/github/fabricators_of_create/porting_lib/data/PortingLibTagsProvider.java rename to modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/PortingLibTagsProvider.java diff --git a/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/SoundDefinition.java b/modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/SoundDefinition.java similarity index 100% rename from data/src/main/java/io/github/fabricators_of_create/porting_lib/data/SoundDefinition.java rename to modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/SoundDefinition.java diff --git a/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/SoundDefinitionsProvider.java b/modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/SoundDefinitionsProvider.java similarity index 100% rename from data/src/main/java/io/github/fabricators_of_create/porting_lib/data/SoundDefinitionsProvider.java rename to modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/SoundDefinitionsProvider.java diff --git a/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/SpriteSourceProvider.java b/modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/SpriteSourceProvider.java similarity index 100% rename from data/src/main/java/io/github/fabricators_of_create/porting_lib/data/SpriteSourceProvider.java rename to modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/SpriteSourceProvider.java diff --git a/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/extensions/MinecraftExtension.java b/modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/extensions/MinecraftExtension.java similarity index 100% rename from data/src/main/java/io/github/fabricators_of_create/porting_lib/data/extensions/MinecraftExtension.java rename to modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/extensions/MinecraftExtension.java diff --git a/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/mixin/MinecraftMixin.java b/modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/mixin/MinecraftMixin.java similarity index 100% rename from data/src/main/java/io/github/fabricators_of_create/porting_lib/data/mixin/MinecraftMixin.java rename to modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/mixin/MinecraftMixin.java diff --git a/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/mixin/accessor/FilePackResources$SharedZipFileAccessAccessor.java b/modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/mixin/accessor/FilePackResources$SharedZipFileAccessAccessor.java similarity index 100% rename from data/src/main/java/io/github/fabricators_of_create/porting_lib/data/mixin/accessor/FilePackResources$SharedZipFileAccessAccessor.java rename to modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/mixin/accessor/FilePackResources$SharedZipFileAccessAccessor.java diff --git a/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/mixin/accessor/FilePackResourcesAccessor.java b/modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/mixin/accessor/FilePackResourcesAccessor.java similarity index 100% rename from data/src/main/java/io/github/fabricators_of_create/porting_lib/data/mixin/accessor/FilePackResourcesAccessor.java rename to modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/data/mixin/accessor/FilePackResourcesAccessor.java diff --git a/data/src/main/java/io/github/fabricators_of_create/porting_lib/resources/PathPackResources.java b/modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/resources/PathPackResources.java similarity index 100% rename from data/src/main/java/io/github/fabricators_of_create/porting_lib/resources/PathPackResources.java rename to modules/data/src/main/java/io/github/fabricators_of_create/porting_lib/resources/PathPackResources.java diff --git a/data/src/main/resources/fabric.mod.json b/modules/data/src/main/resources/fabric.mod.json similarity index 100% rename from data/src/main/resources/fabric.mod.json rename to modules/data/src/main/resources/fabric.mod.json diff --git a/data/src/main/resources/porting_lib_data.accesswidener b/modules/data/src/main/resources/porting_lib_data.accesswidener similarity index 100% rename from data/src/main/resources/porting_lib_data.accesswidener rename to modules/data/src/main/resources/porting_lib_data.accesswidener diff --git a/data/src/main/resources/porting_lib_data.mixins.json b/modules/data/src/main/resources/porting_lib_data.mixins.json similarity index 100% rename from data/src/main/resources/porting_lib_data.mixins.json rename to modules/data/src/main/resources/porting_lib_data.mixins.json diff --git a/entity/build.gradle b/modules/entity/build.gradle similarity index 100% rename from entity/build.gradle rename to modules/entity/build.gradle diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/IEntityAdditionalSpawnData.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/IEntityAdditionalSpawnData.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/IEntityAdditionalSpawnData.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/IEntityAdditionalSpawnData.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/ITeleporter.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/ITeleporter.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/ITeleporter.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/ITeleporter.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/MultiPartEntity.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/MultiPartEntity.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/MultiPartEntity.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/MultiPartEntity.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/PartEntity.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/PartEntity.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/PartEntity.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/PartEntity.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/PortingLibEntity.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/PortingLibEntity.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/PortingLibEntity.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/PortingLibEntity.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/RemovalFromWorldListener.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/RemovalFromWorldListener.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/RemovalFromWorldListener.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/RemovalFromWorldListener.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/client/MobEffectRenderer.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/client/MobEffectRenderer.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/client/MobEffectRenderer.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/client/MobEffectRenderer.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/client/PortingLibEntityClient.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/client/PortingLibEntityClient.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/client/PortingLibEntityClient.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/client/PortingLibEntityClient.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityDataEvents.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityDataEvents.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityDataEvents.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityDataEvents.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityEvents.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityEvents.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityEvents.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityEvents.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityInteractCallback.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityInteractCallback.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityInteractCallback.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityInteractCallback.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityMountEvents.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityMountEvents.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityMountEvents.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityMountEvents.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityReadExtraDataCallback.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityReadExtraDataCallback.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityReadExtraDataCallback.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityReadExtraDataCallback.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityStruckByLightningEvent.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityStruckByLightningEvent.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityStruckByLightningEvent.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/EntityStruckByLightningEvent.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/LivingEntityEvents.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/LivingEntityEvents.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/LivingEntityEvents.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/LivingEntityEvents.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/LivingEntityUseItemEvents.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/LivingEntityUseItemEvents.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/LivingEntityUseItemEvents.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/LivingEntityUseItemEvents.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/MinecartEvents.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/MinecartEvents.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/MinecartEvents.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/MinecartEvents.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/MobEntitySetTargetCallback.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/MobEntitySetTargetCallback.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/MobEntitySetTargetCallback.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/MobEntitySetTargetCallback.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/OnDatapackSyncCallback.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/OnDatapackSyncCallback.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/OnDatapackSyncCallback.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/OnDatapackSyncCallback.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/PlayerEvents.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/PlayerEvents.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/PlayerEvents.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/PlayerEvents.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/PlayerInteractionEvents.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/PlayerInteractionEvents.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/PlayerInteractionEvents.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/PlayerInteractionEvents.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/PlayerTickEvents.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/PlayerTickEvents.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/PlayerTickEvents.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/PlayerTickEvents.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/ProjectileImpactCallback.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/ProjectileImpactCallback.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/ProjectileImpactCallback.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/ProjectileImpactCallback.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/ProjectileImpactEvent.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/ProjectileImpactEvent.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/ProjectileImpactEvent.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/ProjectileImpactEvent.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/ServerPlayerCreationCallback.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/ServerPlayerCreationCallback.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/ServerPlayerCreationCallback.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/ServerPlayerCreationCallback.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/ShieldBlockEvent.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/ShieldBlockEvent.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/ShieldBlockEvent.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/events/ShieldBlockEvent.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/AbstractMinecartExtensions.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/AbstractMinecartExtensions.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/AbstractMinecartExtensions.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/AbstractMinecartExtensions.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/EntityExtensions.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/EntityExtensions.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/EntityExtensions.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/EntityExtensions.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/ItemExtensions.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/ItemExtensions.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/ItemExtensions.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/ItemExtensions.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/LevelExtensions.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/LevelExtensions.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/LevelExtensions.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/LevelExtensions.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/MobEffectExtensions.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/MobEffectExtensions.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/MobEffectExtensions.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/MobEffectExtensions.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/SlimeExtension.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/SlimeExtension.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/SlimeExtension.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/extensions/SlimeExtension.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/ClientLevel$EntityCallbacksMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/ClientLevel$EntityCallbacksMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/ClientLevel$EntityCallbacksMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/ClientLevel$EntityCallbacksMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/ClientLevelMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/ClientLevelMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/ClientLevelMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/ClientLevelMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/EffectRenderingInventoryScreenMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/EffectRenderingInventoryScreenMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/EffectRenderingInventoryScreenMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/EffectRenderingInventoryScreenMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/EntityRenderDispatcherMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/EntityRenderDispatcherMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/EntityRenderDispatcherMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/EntityRenderDispatcherMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/GuiMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/GuiMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/GuiMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/GuiMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/LocalPlayerMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/LocalPlayerMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/LocalPlayerMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/LocalPlayerMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/MinecraftMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/MinecraftMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/MinecraftMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/MinecraftMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/MultiPlayerGameModeMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/MultiPlayerGameModeMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/MultiPlayerGameModeMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/MultiPlayerGameModeMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/RemotePlayerMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/RemotePlayerMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/RemotePlayerMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/client/RemotePlayerMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/AbstractArrowMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/AbstractArrowMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/AbstractArrowMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/AbstractArrowMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/AbstractHurtingProjectileMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/AbstractHurtingProjectileMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/AbstractHurtingProjectileMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/AbstractHurtingProjectileMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/AbstractMinecartMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/AbstractMinecartMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/AbstractMinecartMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/AbstractMinecartMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/BlockBehaviourMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/BlockBehaviourMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/BlockBehaviourMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/BlockBehaviourMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/BundlePacketMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/BundlePacketMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/BundlePacketMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/BundlePacketMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/CatSpawnerMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/CatSpawnerMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/CatSpawnerMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/CatSpawnerMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ChorusFruitItemMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ChorusFruitItemMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ChorusFruitItemMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ChorusFruitItemMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EnderManMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EnderManMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EnderManMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EnderManMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EntityAccessor.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EntityAccessor.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EntityAccessor.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EntityAccessor.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EntityMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EntityMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EntityMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/EntityMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ExperienceOrbMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ExperienceOrbMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ExperienceOrbMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ExperienceOrbMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/FireworkRocketEntityMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/FireworkRocketEntityMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/FireworkRocketEntityMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/FireworkRocketEntityMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/FishingHookMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/FishingHookMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/FishingHookMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/FishingHookMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ItemMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ItemMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ItemMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ItemMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/LevelMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/LevelMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/LevelMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/LevelMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/LightningBoltMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/LightningBoltMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/LightningBoltMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/LightningBoltMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/LivingEntityMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/LivingEntityMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/LivingEntityMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/LivingEntityMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/LlamaSpitMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/LlamaSpitMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/LlamaSpitMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/LlamaSpitMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/MobEffectMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/MobEffectMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/MobEffectMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/MobEffectMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/MobMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/MobMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/MobMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/MobMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/NaturalSpawnerMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/NaturalSpawnerMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/NaturalSpawnerMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/NaturalSpawnerMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PatrolSpawnerMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PatrolSpawnerMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PatrolSpawnerMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PatrolSpawnerMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PersistentEntitySectionManager$CallbackMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PersistentEntitySectionManager$CallbackMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PersistentEntitySectionManager$CallbackMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PersistentEntitySectionManager$CallbackMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PersistentEntitySectionManagerMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PersistentEntitySectionManagerMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PersistentEntitySectionManagerMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PersistentEntitySectionManagerMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PhantomSpawnerMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PhantomSpawnerMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PhantomSpawnerMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PhantomSpawnerMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PlayerListMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PlayerListMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PlayerListMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PlayerListMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PlayerMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PlayerMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PlayerMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/PlayerMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ProjectileMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ProjectileMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ProjectileMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ProjectileMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ProjectileUtilMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ProjectileUtilMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ProjectileUtilMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ProjectileUtilMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ServerEntityMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ServerEntityMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ServerEntityMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ServerEntityMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ServerLevelMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ServerLevelMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ServerLevelMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ServerLevelMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ServerPlayerGameModeMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ServerPlayerGameModeMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ServerPlayerGameModeMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ServerPlayerGameModeMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ServerPlayerMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ServerPlayerMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ServerPlayerMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ServerPlayerMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ShulkerBulletMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ShulkerBulletMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ShulkerBulletMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ShulkerBulletMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/SlimeMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/SlimeMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/SlimeMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/SlimeMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/SpreadPlayersCommandMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/SpreadPlayersCommandMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/SpreadPlayersCommandMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/SpreadPlayersCommandMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/TeleportCommandMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/TeleportCommandMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/TeleportCommandMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/TeleportCommandMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ThrowableProjectileMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ThrowableProjectileMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ThrowableProjectileMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ThrowableProjectileMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ThrownEnderpearlMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ThrownEnderpearlMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ThrownEnderpearlMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/ThrownEnderpearlMixin.java diff --git a/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/TransientEntitySectionManager$CallbackMixin.java b/modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/TransientEntitySectionManager$CallbackMixin.java similarity index 100% rename from entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/TransientEntitySectionManager$CallbackMixin.java rename to modules/entity/src/main/java/io/github/fabricators_of_create/porting_lib/entity/mixin/common/TransientEntitySectionManager$CallbackMixin.java diff --git a/entity/src/main/resources/fabric.mod.json b/modules/entity/src/main/resources/fabric.mod.json similarity index 100% rename from entity/src/main/resources/fabric.mod.json rename to modules/entity/src/main/resources/fabric.mod.json diff --git a/entity/src/main/resources/porting_lib_entity.accesswidener b/modules/entity/src/main/resources/porting_lib_entity.accesswidener similarity index 100% rename from entity/src/main/resources/porting_lib_entity.accesswidener rename to modules/entity/src/main/resources/porting_lib_entity.accesswidener diff --git a/entity/src/main/resources/porting_lib_entity.mixins.json b/modules/entity/src/main/resources/porting_lib_entity.mixins.json similarity index 100% rename from entity/src/main/resources/porting_lib_entity.mixins.json rename to modules/entity/src/main/resources/porting_lib_entity.mixins.json diff --git a/entity/src/testmod/java/io/github/fabricators_of_create/porting_lib/entity/testmod/CustomSlime.java b/modules/entity/src/testmod/java/io/github/fabricators_of_create/porting_lib/entity/testmod/CustomSlime.java similarity index 100% rename from entity/src/testmod/java/io/github/fabricators_of_create/porting_lib/entity/testmod/CustomSlime.java rename to modules/entity/src/testmod/java/io/github/fabricators_of_create/porting_lib/entity/testmod/CustomSlime.java diff --git a/entity/src/testmod/java/io/github/fabricators_of_create/porting_lib/entity/testmod/CustomSlimeRenderer.java b/modules/entity/src/testmod/java/io/github/fabricators_of_create/porting_lib/entity/testmod/CustomSlimeRenderer.java similarity index 100% rename from entity/src/testmod/java/io/github/fabricators_of_create/porting_lib/entity/testmod/CustomSlimeRenderer.java rename to modules/entity/src/testmod/java/io/github/fabricators_of_create/porting_lib/entity/testmod/CustomSlimeRenderer.java diff --git a/entity/src/testmod/java/io/github/fabricators_of_create/porting_lib/entity/testmod/PortingLibEntityTestmod.java b/modules/entity/src/testmod/java/io/github/fabricators_of_create/porting_lib/entity/testmod/PortingLibEntityTestmod.java similarity index 100% rename from entity/src/testmod/java/io/github/fabricators_of_create/porting_lib/entity/testmod/PortingLibEntityTestmod.java rename to modules/entity/src/testmod/java/io/github/fabricators_of_create/porting_lib/entity/testmod/PortingLibEntityTestmod.java diff --git a/entity/src/testmod/java/io/github/fabricators_of_create/porting_lib/entity/testmod/PortingLibEntityTestmodClient.java b/modules/entity/src/testmod/java/io/github/fabricators_of_create/porting_lib/entity/testmod/PortingLibEntityTestmodClient.java similarity index 100% rename from entity/src/testmod/java/io/github/fabricators_of_create/porting_lib/entity/testmod/PortingLibEntityTestmodClient.java rename to modules/entity/src/testmod/java/io/github/fabricators_of_create/porting_lib/entity/testmod/PortingLibEntityTestmodClient.java diff --git a/entity/src/testmod/resources/fabric.mod.json b/modules/entity/src/testmod/resources/fabric.mod.json similarity index 100% rename from entity/src/testmod/resources/fabric.mod.json rename to modules/entity/src/testmod/resources/fabric.mod.json diff --git a/extensions/build.gradle b/modules/extensions/build.gradle similarity index 100% rename from extensions/build.gradle rename to modules/extensions/build.gradle diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/ClientExtensionHooks.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/ClientExtensionHooks.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/ClientExtensionHooks.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/ClientExtensionHooks.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/AbstractTextureExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/AbstractTextureExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/AbstractTextureExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/AbstractTextureExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BaseRailBlockExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BaseRailBlockExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BaseRailBlockExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BaseRailBlockExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BlockEntityExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BlockEntityExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BlockEntityExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BlockEntityExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BlockExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BlockExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BlockExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BlockExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BlockItemExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BlockItemExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BlockItemExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BlockItemExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BlockStateExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BlockStateExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BlockStateExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/BlockStateExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/CameraExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/CameraExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/CameraExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/CameraExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/DimensionSpecialEffectsExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/DimensionSpecialEffectsExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/DimensionSpecialEffectsExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/DimensionSpecialEffectsExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/EntityCollisionContextExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/EntityCollisionContextExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/EntityCollisionContextExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/EntityCollisionContextExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/GrindstoneMenuExtension.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/GrindstoneMenuExtension.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/GrindstoneMenuExtension.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/GrindstoneMenuExtension.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/INBTSerializableCompound.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/INBTSerializableCompound.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/INBTSerializableCompound.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/INBTSerializableCompound.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/IShearable.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/IShearable.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/IShearable.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/IShearable.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ItemExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ItemExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ItemExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ItemExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ItemStackExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ItemStackExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ItemStackExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ItemStackExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ItemTransformExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ItemTransformExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ItemTransformExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ItemTransformExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/LevelExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/LevelExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/LevelExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/LevelExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/LevelReaderExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/LevelReaderExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/LevelReaderExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/LevelReaderExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/MapDecorationExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/MapDecorationExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/MapDecorationExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/MapDecorationExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/MobEffectExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/MobEffectExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/MobEffectExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/MobEffectExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/MobEffectInstanceExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/MobEffectInstanceExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/MobEffectInstanceExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/MobEffectInstanceExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ModelStateExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ModelStateExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ModelStateExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ModelStateExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ParticleExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ParticleExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ParticleExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ParticleExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/PoseStackExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/PoseStackExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/PoseStackExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/PoseStackExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/RenderTargetExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/RenderTargetExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/RenderTargetExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/RenderTargetExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ResourceLocationExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ResourceLocationExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ResourceLocationExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/ResourceLocationExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/SlotExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/SlotExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/SlotExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/SlotExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/SpriteContentsExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/SpriteContentsExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/SpriteContentsExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/SpriteContentsExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/StructureProcessorExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/StructureProcessorExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/StructureProcessorExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/StructureProcessorExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/StructureTemplateExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/StructureTemplateExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/StructureTemplateExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/StructureTemplateExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/TagAppenderExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/TagAppenderExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/TagAppenderExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/TagAppenderExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/TierExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/TierExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/TierExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/TierExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/VertexFormatExtensions.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/VertexFormatExtensions.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/VertexFormatExtensions.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/extensions/VertexFormatExtensions.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/DimensionSpecialEffectsMixin.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/DimensionSpecialEffectsMixin.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/DimensionSpecialEffectsMixin.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/DimensionSpecialEffectsMixin.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/ItemTransformDeserializerMixin.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/ItemTransformDeserializerMixin.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/ItemTransformDeserializerMixin.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/ItemTransformDeserializerMixin.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/ItemTransformMixin.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/ItemTransformMixin.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/ItemTransformMixin.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/ItemTransformMixin.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/LevelRendererMixin.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/LevelRendererMixin.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/LevelRendererMixin.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/LevelRendererMixin.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/LightTextureMixin.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/LightTextureMixin.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/LightTextureMixin.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/LightTextureMixin.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/PoseStackMixin.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/PoseStackMixin.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/PoseStackMixin.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/PoseStackMixin.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/SpriteContentsMixin.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/SpriteContentsMixin.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/SpriteContentsMixin.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/SpriteContentsMixin.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/VertexFormatMixin.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/VertexFormatMixin.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/VertexFormatMixin.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/client/VertexFormatMixin.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/BlockMixin.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/BlockMixin.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/BlockMixin.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/BlockMixin.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/ItemMixin.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/ItemMixin.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/ItemMixin.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/ItemMixin.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/MobEffectMixin.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/MobEffectMixin.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/MobEffectMixin.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/MobEffectMixin.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/SheepMixin.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/SheepMixin.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/SheepMixin.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/SheepMixin.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/SlotMixin.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/SlotMixin.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/SlotMixin.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/SlotMixin.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/TrunkPlacerMixin.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/TrunkPlacerMixin.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/TrunkPlacerMixin.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/TrunkPlacerMixin.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/VineBlockMixin.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/VineBlockMixin.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/VineBlockMixin.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/VineBlockMixin.java diff --git a/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/WebBlockMixin.java b/modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/WebBlockMixin.java similarity index 100% rename from extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/WebBlockMixin.java rename to modules/extensions/src/main/java/io/github/fabricators_of_create/porting_lib/extensions/mixin/common/WebBlockMixin.java diff --git a/extensions/src/main/resources/fabric.mod.json b/modules/extensions/src/main/resources/fabric.mod.json similarity index 100% rename from extensions/src/main/resources/fabric.mod.json rename to modules/extensions/src/main/resources/fabric.mod.json diff --git a/extensions/src/main/resources/porting_lib_extensions.accesswidener b/modules/extensions/src/main/resources/porting_lib_extensions.accesswidener similarity index 100% rename from extensions/src/main/resources/porting_lib_extensions.accesswidener rename to modules/extensions/src/main/resources/porting_lib_extensions.accesswidener diff --git a/extensions/src/main/resources/porting_lib_extensions.mixins.json b/modules/extensions/src/main/resources/porting_lib_extensions.mixins.json similarity index 100% rename from extensions/src/main/resources/porting_lib_extensions.mixins.json rename to modules/extensions/src/main/resources/porting_lib_extensions.mixins.json diff --git a/fluids/build.gradle b/modules/fluids/build.gradle similarity index 100% rename from fluids/build.gradle rename to modules/fluids/build.gradle diff --git a/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/FluidStack.java b/modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/FluidStack.java similarity index 100% rename from fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/FluidStack.java rename to modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/FluidStack.java diff --git a/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/FluidType.java b/modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/FluidType.java similarity index 100% rename from fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/FluidType.java rename to modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/FluidType.java diff --git a/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/PortingLibFluids.java b/modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/PortingLibFluids.java similarity index 100% rename from fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/PortingLibFluids.java rename to modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/PortingLibFluids.java diff --git a/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/extensions/FluidExtension.java b/modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/extensions/FluidExtension.java similarity index 100% rename from fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/extensions/FluidExtension.java rename to modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/extensions/FluidExtension.java diff --git a/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/extensions/FluidStateExtension.java b/modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/extensions/FluidStateExtension.java similarity index 100% rename from fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/extensions/FluidStateExtension.java rename to modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/extensions/FluidStateExtension.java diff --git a/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/mixin/FluidMixin.java b/modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/mixin/FluidMixin.java similarity index 100% rename from fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/mixin/FluidMixin.java rename to modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/mixin/FluidMixin.java diff --git a/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/mixin/FluidStateMixin.java b/modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/mixin/FluidStateMixin.java similarity index 100% rename from fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/mixin/FluidStateMixin.java rename to modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/mixin/FluidStateMixin.java diff --git a/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/sound/SoundAction.java b/modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/sound/SoundAction.java similarity index 100% rename from fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/sound/SoundAction.java rename to modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/sound/SoundAction.java diff --git a/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/sound/SoundActions.java b/modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/sound/SoundActions.java similarity index 100% rename from fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/sound/SoundActions.java rename to modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/sound/SoundActions.java diff --git a/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/wrapper/FabricFluidTypeWrapper.java b/modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/wrapper/FabricFluidTypeWrapper.java similarity index 100% rename from fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/wrapper/FabricFluidTypeWrapper.java rename to modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/wrapper/FabricFluidTypeWrapper.java diff --git a/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/wrapper/FluidAttributeFluidType.java b/modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/wrapper/FluidAttributeFluidType.java similarity index 100% rename from fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/wrapper/FluidAttributeFluidType.java rename to modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/wrapper/FluidAttributeFluidType.java diff --git a/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/wrapper/MergingFluidAttributeFluidType.java b/modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/wrapper/MergingFluidAttributeFluidType.java similarity index 100% rename from fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/wrapper/MergingFluidAttributeFluidType.java rename to modules/fluids/src/main/java/io/github/fabricators_of_create/porting_lib/fluids/wrapper/MergingFluidAttributeFluidType.java diff --git a/fluids/src/main/resources/fabric.mod.json b/modules/fluids/src/main/resources/fabric.mod.json similarity index 100% rename from fluids/src/main/resources/fabric.mod.json rename to modules/fluids/src/main/resources/fabric.mod.json diff --git a/fluids/src/main/resources/porting_lib_fluids.mixins.json b/modules/fluids/src/main/resources/porting_lib_fluids.mixins.json similarity index 100% rename from fluids/src/main/resources/porting_lib_fluids.mixins.json rename to modules/fluids/src/main/resources/porting_lib_fluids.mixins.json diff --git a/gametest/build.gradle b/modules/gametest/build.gradle similarity index 100% rename from gametest/build.gradle rename to modules/gametest/build.gradle diff --git a/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/PortingLibGameTest.java b/modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/PortingLibGameTest.java similarity index 100% rename from gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/PortingLibGameTest.java rename to modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/PortingLibGameTest.java diff --git a/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/PortingLibGameTestClient.java b/modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/PortingLibGameTestClient.java similarity index 100% rename from gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/PortingLibGameTestClient.java rename to modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/PortingLibGameTestClient.java diff --git a/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/extensions/StructureBlockEntityExtensions.java b/modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/extensions/StructureBlockEntityExtensions.java similarity index 100% rename from gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/extensions/StructureBlockEntityExtensions.java rename to modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/extensions/StructureBlockEntityExtensions.java diff --git a/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/CustomGameTestHelper.java b/modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/CustomGameTestHelper.java similarity index 100% rename from gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/CustomGameTestHelper.java rename to modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/CustomGameTestHelper.java diff --git a/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/ExtendedTestFunction.java b/modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/ExtendedTestFunction.java similarity index 100% rename from gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/ExtendedTestFunction.java rename to modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/ExtendedTestFunction.java diff --git a/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/GameTestGroup.java b/modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/GameTestGroup.java similarity index 100% rename from gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/GameTestGroup.java rename to modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/GameTestGroup.java diff --git a/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/PortingLibGameTestHelper.java b/modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/PortingLibGameTestHelper.java similarity index 100% rename from gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/PortingLibGameTestHelper.java rename to modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/PortingLibGameTestHelper.java diff --git a/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/PortingLibStructures.java b/modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/PortingLibStructures.java similarity index 100% rename from gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/PortingLibStructures.java rename to modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/infrastructure/PortingLibStructures.java diff --git a/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/mixin/StructureBlockEntityMixin.java b/modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/mixin/StructureBlockEntityMixin.java similarity index 100% rename from gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/mixin/StructureBlockEntityMixin.java rename to modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/mixin/StructureBlockEntityMixin.java diff --git a/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/mixin/TestCommandMixin.java b/modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/mixin/TestCommandMixin.java similarity index 100% rename from gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/mixin/TestCommandMixin.java rename to modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/mixin/TestCommandMixin.java diff --git a/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/AreaSelection.java b/modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/AreaSelection.java similarity index 100% rename from gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/AreaSelection.java rename to modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/AreaSelection.java diff --git a/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/AreaSelectionRenderer.java b/modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/AreaSelectionRenderer.java similarity index 100% rename from gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/AreaSelectionRenderer.java rename to modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/AreaSelectionRenderer.java diff --git a/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/AreaSelectorItem.java b/modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/AreaSelectorItem.java similarity index 100% rename from gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/AreaSelectorItem.java rename to modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/AreaSelectorItem.java diff --git a/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/AreaSelectorTooltipProvider.java b/modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/AreaSelectorTooltipProvider.java similarity index 100% rename from gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/AreaSelectorTooltipProvider.java rename to modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/AreaSelectorTooltipProvider.java diff --git a/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/QuickExportCommand.java b/modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/QuickExportCommand.java similarity index 100% rename from gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/QuickExportCommand.java rename to modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/quickexport/QuickExportCommand.java diff --git a/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/tests/PortingLibGameTestTests.java b/modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/tests/PortingLibGameTestTests.java similarity index 100% rename from gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/tests/PortingLibGameTestTests.java rename to modules/gametest/src/main/java/io/github/fabricators_of_create/porting_lib/gametest/tests/PortingLibGameTestTests.java diff --git a/gametest/src/main/resources/assets/porting_lib/models/item/area_selector.json b/modules/gametest/src/main/resources/assets/porting_lib/models/item/area_selector.json similarity index 100% rename from gametest/src/main/resources/assets/porting_lib/models/item/area_selector.json rename to modules/gametest/src/main/resources/assets/porting_lib/models/item/area_selector.json diff --git a/gametest/src/main/resources/assets/porting_lib_gametest/lang/en_us.json b/modules/gametest/src/main/resources/assets/porting_lib_gametest/lang/en_us.json similarity index 100% rename from gametest/src/main/resources/assets/porting_lib_gametest/lang/en_us.json rename to modules/gametest/src/main/resources/assets/porting_lib_gametest/lang/en_us.json diff --git a/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/18x3.nbt b/modules/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/18x3.nbt similarity index 100% rename from gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/18x3.nbt rename to modules/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/18x3.nbt diff --git a/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/3x3.nbt b/modules/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/3x3.nbt similarity index 100% rename from gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/3x3.nbt rename to modules/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/3x3.nbt diff --git a/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/5x5.nbt b/modules/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/5x5.nbt similarity index 100% rename from gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/5x5.nbt rename to modules/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/5x5.nbt diff --git a/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/7x7.nbt b/modules/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/7x7.nbt similarity index 100% rename from gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/7x7.nbt rename to modules/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/7x7.nbt diff --git a/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/9x9.nbt b/modules/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/9x9.nbt similarity index 100% rename from gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/9x9.nbt rename to modules/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/platform/9x9.nbt diff --git a/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/test_testing/test.nbt b/modules/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/test_testing/test.nbt similarity index 100% rename from gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/test_testing/test.nbt rename to modules/gametest/src/main/resources/data/porting_lib_gametest/structures/gametest/test_testing/test.nbt diff --git a/gametest/src/main/resources/fabric.mod.json b/modules/gametest/src/main/resources/fabric.mod.json similarity index 100% rename from gametest/src/main/resources/fabric.mod.json rename to modules/gametest/src/main/resources/fabric.mod.json diff --git a/gametest/src/main/resources/porting_lib_gametest.accesswidener b/modules/gametest/src/main/resources/porting_lib_gametest.accesswidener similarity index 100% rename from gametest/src/main/resources/porting_lib_gametest.accesswidener rename to modules/gametest/src/main/resources/porting_lib_gametest.accesswidener diff --git a/gametest/src/main/resources/porting_lib_gametest.mixins.json b/modules/gametest/src/main/resources/porting_lib_gametest.mixins.json similarity index 100% rename from gametest/src/main/resources/porting_lib_gametest.mixins.json rename to modules/gametest/src/main/resources/porting_lib_gametest.mixins.json diff --git a/items/build.gradle b/modules/items/build.gradle similarity index 100% rename from items/build.gradle rename to modules/items/build.gradle diff --git a/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/api/client/IItemDecorator.java b/modules/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/api/client/IItemDecorator.java similarity index 100% rename from items/src/main/java/io/github/fabricators_of_create/porting_lib/item/api/client/IItemDecorator.java rename to modules/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/api/client/IItemDecorator.java diff --git a/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/api/client/callbacks/ItemDecorationsCallback.java b/modules/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/api/client/callbacks/ItemDecorationsCallback.java similarity index 100% rename from items/src/main/java/io/github/fabricators_of_create/porting_lib/item/api/client/callbacks/ItemDecorationsCallback.java rename to modules/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/api/client/callbacks/ItemDecorationsCallback.java diff --git a/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/api/extensions/RepairableItem.java b/modules/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/api/extensions/RepairableItem.java similarity index 100% rename from items/src/main/java/io/github/fabricators_of_create/porting_lib/item/api/extensions/RepairableItem.java rename to modules/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/api/extensions/RepairableItem.java diff --git a/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/impl/client/GlStateBackup.java b/modules/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/impl/client/GlStateBackup.java similarity index 100% rename from items/src/main/java/io/github/fabricators_of_create/porting_lib/item/impl/client/GlStateBackup.java rename to modules/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/impl/client/GlStateBackup.java diff --git a/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/impl/client/ItemDecoratorHandler.java b/modules/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/impl/client/ItemDecoratorHandler.java similarity index 100% rename from items/src/main/java/io/github/fabricators_of_create/porting_lib/item/impl/client/ItemDecoratorHandler.java rename to modules/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/impl/client/ItemDecoratorHandler.java diff --git a/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/impl/mixin/client/GuiGraphicsMixin.java b/modules/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/impl/mixin/client/GuiGraphicsMixin.java similarity index 100% rename from items/src/main/java/io/github/fabricators_of_create/porting_lib/item/impl/mixin/client/GuiGraphicsMixin.java rename to modules/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/impl/mixin/client/GuiGraphicsMixin.java diff --git a/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/impl/mixin/common/RepairItemRecipeMixin.java b/modules/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/impl/mixin/common/RepairItemRecipeMixin.java similarity index 100% rename from items/src/main/java/io/github/fabricators_of_create/porting_lib/item/impl/mixin/common/RepairItemRecipeMixin.java rename to modules/items/src/main/java/io/github/fabricators_of_create/porting_lib/item/impl/mixin/common/RepairItemRecipeMixin.java diff --git a/items/src/main/resources/fabric.mod.json b/modules/items/src/main/resources/fabric.mod.json similarity index 100% rename from items/src/main/resources/fabric.mod.json rename to modules/items/src/main/resources/fabric.mod.json diff --git a/items/src/main/resources/porting_lib_items.accesswidener b/modules/items/src/main/resources/porting_lib_items.accesswidener similarity index 100% rename from items/src/main/resources/porting_lib_items.accesswidener rename to modules/items/src/main/resources/porting_lib_items.accesswidener diff --git a/items/src/main/resources/porting_lib_items.mixins.json b/modules/items/src/main/resources/porting_lib_items.mixins.json similarity index 100% rename from items/src/main/resources/porting_lib_items.mixins.json rename to modules/items/src/main/resources/porting_lib_items.mixins.json diff --git a/lazy_registration/build.gradle b/modules/lazy_registration/build.gradle similarity index 100% rename from lazy_registration/build.gradle rename to modules/lazy_registration/build.gradle diff --git a/lazy_registration/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazyRegistrar.java b/modules/lazy_registration/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazyRegistrar.java similarity index 100% rename from lazy_registration/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazyRegistrar.java rename to modules/lazy_registration/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazyRegistrar.java diff --git a/lazy_registration/src/main/java/io/github/fabricators_of_create/porting_lib/util/RegistryObject.java b/modules/lazy_registration/src/main/java/io/github/fabricators_of_create/porting_lib/util/RegistryObject.java similarity index 100% rename from lazy_registration/src/main/java/io/github/fabricators_of_create/porting_lib/util/RegistryObject.java rename to modules/lazy_registration/src/main/java/io/github/fabricators_of_create/porting_lib/util/RegistryObject.java diff --git a/lazy_registration/src/main/resources/fabric.mod.json b/modules/lazy_registration/src/main/resources/fabric.mod.json similarity index 100% rename from lazy_registration/src/main/resources/fabric.mod.json rename to modules/lazy_registration/src/main/resources/fabric.mod.json diff --git a/lazy_registration/src/main/resources/porting_lib_lazy_registration.accesswidener b/modules/lazy_registration/src/main/resources/porting_lib_lazy_registration.accesswidener similarity index 100% rename from lazy_registration/src/main/resources/porting_lib_lazy_registration.accesswidener rename to modules/lazy_registration/src/main/resources/porting_lib_lazy_registration.accesswidener diff --git a/loot/build.gradle b/modules/loot/build.gradle similarity index 100% rename from loot/build.gradle rename to modules/loot/build.gradle diff --git a/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/GlobalLootModifierProvider.java b/modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/GlobalLootModifierProvider.java similarity index 100% rename from loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/GlobalLootModifierProvider.java rename to modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/GlobalLootModifierProvider.java diff --git a/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/IGlobalLootModifier.java b/modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/IGlobalLootModifier.java similarity index 100% rename from loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/IGlobalLootModifier.java rename to modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/IGlobalLootModifier.java diff --git a/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/LootCollector.java b/modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/LootCollector.java similarity index 100% rename from loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/LootCollector.java rename to modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/LootCollector.java diff --git a/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/LootModifier.java b/modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/LootModifier.java similarity index 100% rename from loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/LootModifier.java rename to modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/LootModifier.java diff --git a/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/LootModifierManager.java b/modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/LootModifierManager.java similarity index 100% rename from loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/LootModifierManager.java rename to modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/LootModifierManager.java diff --git a/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/LootTableIdCondition.java b/modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/LootTableIdCondition.java similarity index 100% rename from loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/LootTableIdCondition.java rename to modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/LootTableIdCondition.java diff --git a/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/PortingLibLoot.java b/modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/PortingLibLoot.java similarity index 100% rename from loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/PortingLibLoot.java rename to modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/PortingLibLoot.java diff --git a/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootContextExtensions.java b/modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootContextExtensions.java similarity index 100% rename from loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootContextExtensions.java rename to modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootContextExtensions.java diff --git a/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootPoolBuilderExtension.java b/modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootPoolBuilderExtension.java similarity index 100% rename from loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootPoolBuilderExtension.java rename to modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootPoolBuilderExtension.java diff --git a/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootPoolExtensions.java b/modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootPoolExtensions.java similarity index 100% rename from loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootPoolExtensions.java rename to modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootPoolExtensions.java diff --git a/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootTableBuilderExtensions.java b/modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootTableBuilderExtensions.java similarity index 100% rename from loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootTableBuilderExtensions.java rename to modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootTableBuilderExtensions.java diff --git a/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootTableExtensions.java b/modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootTableExtensions.java similarity index 100% rename from loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootTableExtensions.java rename to modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/extensions/LootTableExtensions.java diff --git a/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/mixin/LootContextMixin.java b/modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/mixin/LootContextMixin.java similarity index 100% rename from loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/mixin/LootContextMixin.java rename to modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/mixin/LootContextMixin.java diff --git a/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/mixin/LootDataTypeMixin.java b/modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/mixin/LootDataTypeMixin.java similarity index 100% rename from loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/mixin/LootDataTypeMixin.java rename to modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/mixin/LootDataTypeMixin.java diff --git a/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/mixin/LootPoolMixin.java b/modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/mixin/LootPoolMixin.java similarity index 100% rename from loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/mixin/LootPoolMixin.java rename to modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/mixin/LootPoolMixin.java diff --git a/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/mixin/LootTableMixin.java b/modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/mixin/LootTableMixin.java similarity index 100% rename from loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/mixin/LootTableMixin.java rename to modules/loot/src/main/java/io/github/fabricators_of_create/porting_lib/loot/mixin/LootTableMixin.java diff --git a/loot/src/main/resources/fabric.mod.json b/modules/loot/src/main/resources/fabric.mod.json similarity index 100% rename from loot/src/main/resources/fabric.mod.json rename to modules/loot/src/main/resources/fabric.mod.json diff --git a/loot/src/main/resources/porting_lib_loot.mixins.json b/modules/loot/src/main/resources/porting_lib_loot.mixins.json similarity index 100% rename from loot/src/main/resources/porting_lib_loot.mixins.json rename to modules/loot/src/main/resources/porting_lib_loot.mixins.json diff --git a/mixin_extensions/build.gradle b/modules/mixin_extensions/build.gradle similarity index 100% rename from mixin_extensions/build.gradle rename to modules/mixin_extensions/build.gradle diff --git a/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/init/PortingLibMixinExtensions.java b/modules/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/init/PortingLibMixinExtensions.java similarity index 100% rename from mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/init/PortingLibMixinExtensions.java rename to modules/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/init/PortingLibMixinExtensions.java diff --git a/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/init/PortingLibMixinExtensionsAP.java b/modules/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/init/PortingLibMixinExtensionsAP.java similarity index 100% rename from mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/init/PortingLibMixinExtensionsAP.java rename to modules/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/init/PortingLibMixinExtensionsAP.java diff --git a/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/init/PortingLibMixinExtensionsPlugin.java b/modules/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/init/PortingLibMixinExtensionsPlugin.java similarity index 100% rename from mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/init/PortingLibMixinExtensionsPlugin.java rename to modules/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/init/PortingLibMixinExtensionsPlugin.java diff --git a/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/injectors/wrap_variable/WrapVariable.java b/modules/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/injectors/wrap_variable/WrapVariable.java similarity index 100% rename from mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/injectors/wrap_variable/WrapVariable.java rename to modules/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/injectors/wrap_variable/WrapVariable.java diff --git a/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/injectors/wrap_variable/WrapVariableInjectionInfo.java b/modules/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/injectors/wrap_variable/WrapVariableInjectionInfo.java similarity index 100% rename from mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/injectors/wrap_variable/WrapVariableInjectionInfo.java rename to modules/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/injectors/wrap_variable/WrapVariableInjectionInfo.java diff --git a/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/injectors/wrap_variable/WrapVariableInjector.java b/modules/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/injectors/wrap_variable/WrapVariableInjector.java similarity index 100% rename from mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/injectors/wrap_variable/WrapVariableInjector.java rename to modules/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/injectors/wrap_variable/WrapVariableInjector.java diff --git a/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/points/WrappableInjectionPoint.java b/modules/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/points/WrappableInjectionPoint.java similarity index 100% rename from mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/points/WrappableInjectionPoint.java rename to modules/mixin_extensions/src/main/java/io/github/fabricators_of_create/porting_lib/mixin_extensions/points/WrappableInjectionPoint.java diff --git a/mixin_extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/modules/mixin_extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor similarity index 100% rename from mixin_extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor rename to modules/mixin_extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor diff --git a/mixin_extensions/src/main/resources/fabric.mod.json b/modules/mixin_extensions/src/main/resources/fabric.mod.json similarity index 100% rename from mixin_extensions/src/main/resources/fabric.mod.json rename to modules/mixin_extensions/src/main/resources/fabric.mod.json diff --git a/mixin_extensions/src/main/resources/porting_lib_mixin_extensions.mixins.json b/modules/mixin_extensions/src/main/resources/porting_lib_mixin_extensions.mixins.json similarity index 100% rename from mixin_extensions/src/main/resources/porting_lib_mixin_extensions.mixins.json rename to modules/mixin_extensions/src/main/resources/porting_lib_mixin_extensions.mixins.json diff --git a/model_builders/build.gradle b/modules/model_builders/build.gradle similarity index 100% rename from model_builders/build.gradle rename to modules/model_builders/build.gradle diff --git a/model_builders/src/main/java/io/github/fabricators_of_create/porting_lib/models/builders/CompositeModelBuilder.java b/modules/model_builders/src/main/java/io/github/fabricators_of_create/porting_lib/models/builders/CompositeModelBuilder.java similarity index 100% rename from model_builders/src/main/java/io/github/fabricators_of_create/porting_lib/models/builders/CompositeModelBuilder.java rename to modules/model_builders/src/main/java/io/github/fabricators_of_create/porting_lib/models/builders/CompositeModelBuilder.java diff --git a/model_builders/src/main/java/io/github/fabricators_of_create/porting_lib/models/builders/ItemLayerModelBuilder.java b/modules/model_builders/src/main/java/io/github/fabricators_of_create/porting_lib/models/builders/ItemLayerModelBuilder.java similarity index 100% rename from model_builders/src/main/java/io/github/fabricators_of_create/porting_lib/models/builders/ItemLayerModelBuilder.java rename to modules/model_builders/src/main/java/io/github/fabricators_of_create/porting_lib/models/builders/ItemLayerModelBuilder.java diff --git a/model_builders/src/main/resources/fabric.mod.json b/modules/model_builders/src/main/resources/fabric.mod.json similarity index 100% rename from model_builders/src/main/resources/fabric.mod.json rename to modules/model_builders/src/main/resources/fabric.mod.json diff --git a/model_generators/build.gradle b/modules/model_generators/build.gradle similarity index 100% rename from model_generators/build.gradle rename to modules/model_generators/build.gradle diff --git a/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/ConfiguredModel.java b/modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/ConfiguredModel.java similarity index 100% rename from model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/ConfiguredModel.java rename to modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/ConfiguredModel.java diff --git a/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/CustomLoaderBuilder.java b/modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/CustomLoaderBuilder.java similarity index 100% rename from model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/CustomLoaderBuilder.java rename to modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/CustomLoaderBuilder.java diff --git a/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/IGeneratedBlockState.java b/modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/IGeneratedBlockState.java similarity index 100% rename from model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/IGeneratedBlockState.java rename to modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/IGeneratedBlockState.java diff --git a/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/ModelBuilder.java b/modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/ModelBuilder.java similarity index 100% rename from model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/ModelBuilder.java rename to modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/ModelBuilder.java diff --git a/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/ModelFile.java b/modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/ModelFile.java similarity index 100% rename from model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/ModelFile.java rename to modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/ModelFile.java diff --git a/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/ModelProvider.java b/modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/ModelProvider.java similarity index 100% rename from model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/ModelProvider.java rename to modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/ModelProvider.java diff --git a/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/BlockModelBuilder.java b/modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/BlockModelBuilder.java similarity index 100% rename from model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/BlockModelBuilder.java rename to modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/BlockModelBuilder.java diff --git a/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/BlockModelProvider.java b/modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/BlockModelProvider.java similarity index 100% rename from model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/BlockModelProvider.java rename to modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/BlockModelProvider.java diff --git a/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/BlockStateProvider.java b/modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/BlockStateProvider.java similarity index 100% rename from model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/BlockStateProvider.java rename to modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/BlockStateProvider.java diff --git a/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/MultiPartBlockStateBuilder.java b/modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/MultiPartBlockStateBuilder.java similarity index 100% rename from model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/MultiPartBlockStateBuilder.java rename to modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/MultiPartBlockStateBuilder.java diff --git a/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/VariantBlockStateBuilder.java b/modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/VariantBlockStateBuilder.java similarity index 100% rename from model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/VariantBlockStateBuilder.java rename to modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/block/VariantBlockStateBuilder.java diff --git a/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/extensions/BlockElementFaceExtensions.java b/modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/extensions/BlockElementFaceExtensions.java similarity index 100% rename from model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/extensions/BlockElementFaceExtensions.java rename to modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/extensions/BlockElementFaceExtensions.java diff --git a/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/item/ItemModelBuilder.java b/modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/item/ItemModelBuilder.java similarity index 100% rename from model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/item/ItemModelBuilder.java rename to modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/item/ItemModelBuilder.java diff --git a/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/item/ItemModelProvider.java b/modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/item/ItemModelProvider.java similarity index 100% rename from model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/item/ItemModelProvider.java rename to modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/item/ItemModelProvider.java diff --git a/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/mixin/BlockElementFaceDeserializerMixin.java b/modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/mixin/BlockElementFaceDeserializerMixin.java similarity index 100% rename from model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/mixin/BlockElementFaceDeserializerMixin.java rename to modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/mixin/BlockElementFaceDeserializerMixin.java diff --git a/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/mixin/BlockElementFaceMixin.java b/modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/mixin/BlockElementFaceMixin.java similarity index 100% rename from model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/mixin/BlockElementFaceMixin.java rename to modules/model_generators/src/main/java/io/github/fabricators_of_create/porting_lib/models/generators/mixin/BlockElementFaceMixin.java diff --git a/model_generators/src/main/resources/fabric.mod.json b/modules/model_generators/src/main/resources/fabric.mod.json similarity index 100% rename from model_generators/src/main/resources/fabric.mod.json rename to modules/model_generators/src/main/resources/fabric.mod.json diff --git a/model_generators/src/main/resources/porting_lib_model_generators.accesswidener b/modules/model_generators/src/main/resources/porting_lib_model_generators.accesswidener similarity index 100% rename from model_generators/src/main/resources/porting_lib_model_generators.accesswidener rename to modules/model_generators/src/main/resources/porting_lib_model_generators.accesswidener diff --git a/model_generators/src/main/resources/porting_lib_model_generators.mixins.json b/modules/model_generators/src/main/resources/porting_lib_model_generators.mixins.json similarity index 100% rename from model_generators/src/main/resources/porting_lib_model_generators.mixins.json rename to modules/model_generators/src/main/resources/porting_lib_model_generators.mixins.json diff --git a/model_loader/build.gradle b/modules/model_loader/build.gradle similarity index 100% rename from model_loader/build.gradle rename to modules/model_loader/build.gradle diff --git a/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/QuadTransformers.java b/modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/QuadTransformers.java similarity index 100% rename from model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/QuadTransformers.java rename to modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/QuadTransformers.java diff --git a/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/UnbakedGeometryHelper.java b/modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/UnbakedGeometryHelper.java similarity index 100% rename from model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/UnbakedGeometryHelper.java rename to modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/UnbakedGeometryHelper.java diff --git a/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/EmptyModel.java b/modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/EmptyModel.java similarity index 100% rename from model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/EmptyModel.java rename to modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/EmptyModel.java diff --git a/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/GeometryLoaderManager.java b/modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/GeometryLoaderManager.java similarity index 100% rename from model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/GeometryLoaderManager.java rename to modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/GeometryLoaderManager.java diff --git a/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/IGeometryLoader.java b/modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/IGeometryLoader.java similarity index 100% rename from model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/IGeometryLoader.java rename to modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/IGeometryLoader.java diff --git a/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/IUnbakedGeometry.java b/modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/IUnbakedGeometry.java similarity index 100% rename from model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/IUnbakedGeometry.java rename to modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/IUnbakedGeometry.java diff --git a/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/NullGeometryLoader.java b/modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/NullGeometryLoader.java similarity index 100% rename from model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/NullGeometryLoader.java rename to modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/NullGeometryLoader.java diff --git a/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/RegisterGeometryLoadersCallback.java b/modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/RegisterGeometryLoadersCallback.java similarity index 100% rename from model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/RegisterGeometryLoadersCallback.java rename to modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/RegisterGeometryLoadersCallback.java diff --git a/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/SimpleModelState.java b/modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/SimpleModelState.java similarity index 100% rename from model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/SimpleModelState.java rename to modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/SimpleModelState.java diff --git a/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/VisibilityData.java b/modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/VisibilityData.java similarity index 100% rename from model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/VisibilityData.java rename to modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/VisibilityData.java diff --git a/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/extensions/BlockModelExtensions.java b/modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/extensions/BlockModelExtensions.java similarity index 100% rename from model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/extensions/BlockModelExtensions.java rename to modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/extensions/BlockModelExtensions.java diff --git a/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/extensions/TransformationExtensions.java b/modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/extensions/TransformationExtensions.java similarity index 100% rename from model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/extensions/TransformationExtensions.java rename to modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/extensions/TransformationExtensions.java diff --git a/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/mixin/client/BlockModelDeserializerMixin.java b/modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/mixin/client/BlockModelDeserializerMixin.java similarity index 100% rename from model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/mixin/client/BlockModelDeserializerMixin.java rename to modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/mixin/client/BlockModelDeserializerMixin.java diff --git a/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/mixin/client/BlockModelMixin.java b/modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/mixin/client/BlockModelMixin.java similarity index 100% rename from model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/mixin/client/BlockModelMixin.java rename to modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/mixin/client/BlockModelMixin.java diff --git a/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/mixin/common/TransformationMixin.java b/modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/mixin/common/TransformationMixin.java similarity index 100% rename from model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/mixin/common/TransformationMixin.java rename to modules/model_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/geometry/mixin/common/TransformationMixin.java diff --git a/model_loader/src/main/resources/fabric.mod.json b/modules/model_loader/src/main/resources/fabric.mod.json similarity index 100% rename from model_loader/src/main/resources/fabric.mod.json rename to modules/model_loader/src/main/resources/fabric.mod.json diff --git a/model_loader/src/main/resources/porting_lib_model_loader.accesswidener b/modules/model_loader/src/main/resources/porting_lib_model_loader.accesswidener similarity index 100% rename from model_loader/src/main/resources/porting_lib_model_loader.accesswidener rename to modules/model_loader/src/main/resources/porting_lib_model_loader.accesswidener diff --git a/model_loader/src/main/resources/porting_lib_model_loader.mixins.json b/modules/model_loader/src/main/resources/porting_lib_model_loader.mixins.json similarity index 100% rename from model_loader/src/main/resources/porting_lib_model_loader.mixins.json rename to modules/model_loader/src/main/resources/porting_lib_model_loader.mixins.json diff --git a/model_materials/build.gradle b/modules/model_materials/build.gradle similarity index 100% rename from model_materials/build.gradle rename to modules/model_materials/build.gradle diff --git a/model_materials/src/main/java/io/github/fabricators_of_create/porting_lib/models/materials/MaterialData.java b/modules/model_materials/src/main/java/io/github/fabricators_of_create/porting_lib/models/materials/MaterialData.java similarity index 100% rename from model_materials/src/main/java/io/github/fabricators_of_create/porting_lib/models/materials/MaterialData.java rename to modules/model_materials/src/main/java/io/github/fabricators_of_create/porting_lib/models/materials/MaterialData.java diff --git a/model_materials/src/main/java/io/github/fabricators_of_create/porting_lib/models/materials/extensions/BakedQuadExtensions.java b/modules/model_materials/src/main/java/io/github/fabricators_of_create/porting_lib/models/materials/extensions/BakedQuadExtensions.java similarity index 100% rename from model_materials/src/main/java/io/github/fabricators_of_create/porting_lib/models/materials/extensions/BakedQuadExtensions.java rename to modules/model_materials/src/main/java/io/github/fabricators_of_create/porting_lib/models/materials/extensions/BakedQuadExtensions.java diff --git a/model_materials/src/main/java/io/github/fabricators_of_create/porting_lib/models/materials/mixin/BakedQuadMixin.java b/modules/model_materials/src/main/java/io/github/fabricators_of_create/porting_lib/models/materials/mixin/BakedQuadMixin.java similarity index 100% rename from model_materials/src/main/java/io/github/fabricators_of_create/porting_lib/models/materials/mixin/BakedQuadMixin.java rename to modules/model_materials/src/main/java/io/github/fabricators_of_create/porting_lib/models/materials/mixin/BakedQuadMixin.java diff --git a/model_materials/src/main/resources/fabric.mod.json b/modules/model_materials/src/main/resources/fabric.mod.json similarity index 100% rename from model_materials/src/main/resources/fabric.mod.json rename to modules/model_materials/src/main/resources/fabric.mod.json diff --git a/model_materials/src/main/resources/porting_lib_model_materials.accesswidener b/modules/model_materials/src/main/resources/porting_lib_model_materials.accesswidener similarity index 100% rename from model_materials/src/main/resources/porting_lib_model_materials.accesswidener rename to modules/model_materials/src/main/resources/porting_lib_model_materials.accesswidener diff --git a/model_materials/src/main/resources/porting_lib_model_materials.mixins.json b/modules/model_materials/src/main/resources/porting_lib_model_materials.mixins.json similarity index 100% rename from model_materials/src/main/resources/porting_lib_model_materials.mixins.json rename to modules/model_materials/src/main/resources/porting_lib_model_materials.mixins.json diff --git a/models/build.gradle b/modules/models/build.gradle similarity index 100% rename from models/build.gradle rename to modules/models/build.gradle diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/BakedMeshModel.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/BakedMeshModel.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/BakedMeshModel.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/BakedMeshModel.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/CompositeModel.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/CompositeModel.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/CompositeModel.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/CompositeModel.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/CompositeModelLoader.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/CompositeModelLoader.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/CompositeModelLoader.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/CompositeModelLoader.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/ConcatenatedListView.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/ConcatenatedListView.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/ConcatenatedListView.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/ConcatenatedListView.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/CustomParticleIconModel.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/CustomParticleIconModel.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/CustomParticleIconModel.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/CustomParticleIconModel.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/DynamicFluidContainerModel.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/DynamicFluidContainerModel.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/DynamicFluidContainerModel.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/DynamicFluidContainerModel.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/ElementsModel.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/ElementsModel.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/ElementsModel.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/ElementsModel.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/ItemLayerModel.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/ItemLayerModel.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/ItemLayerModel.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/ItemLayerModel.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/ModelLoader.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/ModelLoader.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/ModelLoader.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/ModelLoader.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/PortingLibModelLoadingRegistry.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/PortingLibModelLoadingRegistry.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/PortingLibModelLoadingRegistry.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/PortingLibModelLoadingRegistry.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/PortingLibModels.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/PortingLibModels.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/PortingLibModels.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/PortingLibModels.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/RenderMaterialDeserializer.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/RenderMaterialDeserializer.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/RenderMaterialDeserializer.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/RenderMaterialDeserializer.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/RenderMaterialModel.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/RenderMaterialModel.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/RenderMaterialModel.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/RenderMaterialModel.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/TransformTypeDependentItemBakedModel.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/TransformTypeDependentItemBakedModel.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/TransformTypeDependentItemBakedModel.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/TransformTypeDependentItemBakedModel.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/extensions/BlockModelExtensions.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/extensions/BlockModelExtensions.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/extensions/BlockModelExtensions.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/extensions/BlockModelExtensions.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/extensions/BlockParticleOptionExtensions.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/extensions/BlockParticleOptionExtensions.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/extensions/BlockParticleOptionExtensions.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/extensions/BlockParticleOptionExtensions.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/extensions/TerrainParticleExtensions.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/extensions/TerrainParticleExtensions.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/extensions/TerrainParticleExtensions.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/extensions/TerrainParticleExtensions.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/internal/TransformTypeDependentModelHelper.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/internal/TransformTypeDependentModelHelper.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/internal/TransformTypeDependentModelHelper.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/internal/TransformTypeDependentModelHelper.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/BlockParticleOptionMixin.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/BlockParticleOptionMixin.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/BlockParticleOptionMixin.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/BlockParticleOptionMixin.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/EntityMixin.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/EntityMixin.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/EntityMixin.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/EntityMixin.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/LivingEntityMixin.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/LivingEntityMixin.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/LivingEntityMixin.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/LivingEntityMixin.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/PortingLibModelsPlugin.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/PortingLibModelsPlugin.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/PortingLibModelsPlugin.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/PortingLibModelsPlugin.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/BlockModelDeserializerMixin.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/BlockModelDeserializerMixin.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/BlockModelDeserializerMixin.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/BlockModelDeserializerMixin.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/BlockModelMixin.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/BlockModelMixin.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/BlockModelMixin.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/BlockModelMixin.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/ItemRendererMixin.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/ItemRendererMixin.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/ItemRendererMixin.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/ItemRendererMixin.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/ParticleEngineMixin.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/ParticleEngineMixin.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/ParticleEngineMixin.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/ParticleEngineMixin.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/ScreenEffectRendererMixin.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/ScreenEffectRendererMixin.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/ScreenEffectRendererMixin.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/ScreenEffectRendererMixin.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/TerrainParticle$ProviderMixin.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/TerrainParticle$ProviderMixin.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/TerrainParticle$ProviderMixin.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/TerrainParticle$ProviderMixin.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/TerrainParticleMixin.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/TerrainParticleMixin.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/TerrainParticleMixin.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/TerrainParticleMixin.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/TextureSheetParticleAccessor.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/TextureSheetParticleAccessor.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/TextureSheetParticleAccessor.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/TextureSheetParticleAccessor.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/frex/ItemRenderContextMixin.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/frex/ItemRenderContextMixin.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/frex/ItemRenderContextMixin.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/mixin/client/frex/ItemRenderContextMixin.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/util/RenderTypeUtil.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/util/RenderTypeUtil.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/util/RenderTypeUtil.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/util/RenderTypeUtil.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/util/TransformationHelper.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/util/TransformationHelper.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/util/TransformationHelper.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/util/TransformationHelper.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/virtual/FixedColorTintingBakedModel.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/virtual/FixedColorTintingBakedModel.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/virtual/FixedColorTintingBakedModel.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/virtual/FixedColorTintingBakedModel.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/virtual/FixedLightBakedModel.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/virtual/FixedLightBakedModel.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/virtual/FixedLightBakedModel.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/virtual/FixedLightBakedModel.java diff --git a/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/virtual/TranslucentBakedModel.java b/modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/virtual/TranslucentBakedModel.java similarity index 100% rename from models/src/main/java/io/github/fabricators_of_create/porting_lib/models/virtual/TranslucentBakedModel.java rename to modules/models/src/main/java/io/github/fabricators_of_create/porting_lib/models/virtual/TranslucentBakedModel.java diff --git a/models/src/main/resources/fabric.mod.json b/modules/models/src/main/resources/fabric.mod.json similarity index 100% rename from models/src/main/resources/fabric.mod.json rename to modules/models/src/main/resources/fabric.mod.json diff --git a/models/src/main/resources/porting_lib_models.accesswidener b/modules/models/src/main/resources/porting_lib_models.accesswidener similarity index 100% rename from models/src/main/resources/porting_lib_models.accesswidener rename to modules/models/src/main/resources/porting_lib_models.accesswidener diff --git a/models/src/main/resources/porting_lib_models.mixins.json b/modules/models/src/main/resources/porting_lib_models.mixins.json similarity index 100% rename from models/src/main/resources/porting_lib_models.mixins.json rename to modules/models/src/main/resources/porting_lib_models.mixins.json diff --git a/models/src/testmod/java/io/github/fabricators_of_create/porting_lib/models/testmod/PortingLibModelsTestmod.java b/modules/models/src/testmod/java/io/github/fabricators_of_create/porting_lib/models/testmod/PortingLibModelsTestmod.java similarity index 100% rename from models/src/testmod/java/io/github/fabricators_of_create/porting_lib/models/testmod/PortingLibModelsTestmod.java rename to modules/models/src/testmod/java/io/github/fabricators_of_create/porting_lib/models/testmod/PortingLibModelsTestmod.java diff --git a/models/src/testmod/java/io/github/fabricators_of_create/porting_lib/models/testmod/client/DerpyItemModel.java b/modules/models/src/testmod/java/io/github/fabricators_of_create/porting_lib/models/testmod/client/DerpyItemModel.java similarity index 100% rename from models/src/testmod/java/io/github/fabricators_of_create/porting_lib/models/testmod/client/DerpyItemModel.java rename to modules/models/src/testmod/java/io/github/fabricators_of_create/porting_lib/models/testmod/client/DerpyItemModel.java diff --git a/models/src/testmod/java/io/github/fabricators_of_create/porting_lib/models/testmod/client/PortingLibModelsTestmodClient.java b/modules/models/src/testmod/java/io/github/fabricators_of_create/porting_lib/models/testmod/client/PortingLibModelsTestmodClient.java similarity index 100% rename from models/src/testmod/java/io/github/fabricators_of_create/porting_lib/models/testmod/client/PortingLibModelsTestmodClient.java rename to modules/models/src/testmod/java/io/github/fabricators_of_create/porting_lib/models/testmod/client/PortingLibModelsTestmodClient.java diff --git a/models/src/testmod/resources/assets/porting_lib/lang/en_us.json b/modules/models/src/testmod/resources/assets/porting_lib/lang/en_us.json similarity index 100% rename from models/src/testmod/resources/assets/porting_lib/lang/en_us.json rename to modules/models/src/testmod/resources/assets/porting_lib/lang/en_us.json diff --git a/models/src/testmod/resources/assets/porting_lib/models/item/derp_helmet.json b/modules/models/src/testmod/resources/assets/porting_lib/models/item/derp_helmet.json similarity index 100% rename from models/src/testmod/resources/assets/porting_lib/models/item/derp_helmet.json rename to modules/models/src/testmod/resources/assets/porting_lib/models/item/derp_helmet.json diff --git a/models/src/testmod/resources/assets/porting_lib/models/item/stone_2.json b/modules/models/src/testmod/resources/assets/porting_lib/models/item/stone_2.json similarity index 100% rename from models/src/testmod/resources/assets/porting_lib/models/item/stone_2.json rename to modules/models/src/testmod/resources/assets/porting_lib/models/item/stone_2.json diff --git a/models/src/testmod/resources/fabric.mod.json b/modules/models/src/testmod/resources/fabric.mod.json similarity index 100% rename from models/src/testmod/resources/fabric.mod.json rename to modules/models/src/testmod/resources/fabric.mod.json diff --git a/networking/build.gradle b/modules/networking/build.gradle similarity index 100% rename from networking/build.gradle rename to modules/networking/build.gradle diff --git a/networking/src/main/java/me/pepperbell/simplenetworking/C2SPacket.java b/modules/networking/src/main/java/me/pepperbell/simplenetworking/C2SPacket.java similarity index 100% rename from networking/src/main/java/me/pepperbell/simplenetworking/C2SPacket.java rename to modules/networking/src/main/java/me/pepperbell/simplenetworking/C2SPacket.java diff --git a/networking/src/main/java/me/pepperbell/simplenetworking/Packet.java b/modules/networking/src/main/java/me/pepperbell/simplenetworking/Packet.java similarity index 100% rename from networking/src/main/java/me/pepperbell/simplenetworking/Packet.java rename to modules/networking/src/main/java/me/pepperbell/simplenetworking/Packet.java diff --git a/networking/src/main/java/me/pepperbell/simplenetworking/S2CPacket.java b/modules/networking/src/main/java/me/pepperbell/simplenetworking/S2CPacket.java similarity index 100% rename from networking/src/main/java/me/pepperbell/simplenetworking/S2CPacket.java rename to modules/networking/src/main/java/me/pepperbell/simplenetworking/S2CPacket.java diff --git a/networking/src/main/java/me/pepperbell/simplenetworking/SimpleChannel.java b/modules/networking/src/main/java/me/pepperbell/simplenetworking/SimpleChannel.java similarity index 100% rename from networking/src/main/java/me/pepperbell/simplenetworking/SimpleChannel.java rename to modules/networking/src/main/java/me/pepperbell/simplenetworking/SimpleChannel.java diff --git a/networking/src/main/java/me/pepperbell/simplenetworking/SimpleNetworking.java b/modules/networking/src/main/java/me/pepperbell/simplenetworking/SimpleNetworking.java similarity index 100% rename from networking/src/main/java/me/pepperbell/simplenetworking/SimpleNetworking.java rename to modules/networking/src/main/java/me/pepperbell/simplenetworking/SimpleNetworking.java diff --git a/networking/src/main/resources/fabric.mod.json b/modules/networking/src/main/resources/fabric.mod.json similarity index 100% rename from networking/src/main/resources/fabric.mod.json rename to modules/networking/src/main/resources/fabric.mod.json diff --git a/obj_loader/build.gradle b/modules/obj_loader/build.gradle similarity index 100% rename from obj_loader/build.gradle rename to modules/obj_loader/build.gradle diff --git a/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibObjLoader.java b/modules/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibObjLoader.java similarity index 100% rename from obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibObjLoader.java rename to modules/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibObjLoader.java diff --git a/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjBakedModel.java b/modules/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjBakedModel.java similarity index 100% rename from obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjBakedModel.java rename to modules/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjBakedModel.java diff --git a/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjLoader.java b/modules/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjLoader.java similarity index 100% rename from obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjLoader.java rename to modules/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjLoader.java diff --git a/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjMaterialLibrary.java b/modules/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjMaterialLibrary.java similarity index 100% rename from obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjMaterialLibrary.java rename to modules/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjMaterialLibrary.java diff --git a/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjModel.java b/modules/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjModel.java similarity index 100% rename from obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjModel.java rename to modules/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjModel.java diff --git a/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjParser.java b/modules/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjParser.java similarity index 100% rename from obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjParser.java rename to modules/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjParser.java diff --git a/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjTokenizer.java b/modules/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjTokenizer.java similarity index 100% rename from obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjTokenizer.java rename to modules/obj_loader/src/main/java/io/github/fabricators_of_create/porting_lib/models/obj/ObjTokenizer.java diff --git a/obj_loader/src/main/resources/fabric.mod.json b/modules/obj_loader/src/main/resources/fabric.mod.json similarity index 100% rename from obj_loader/src/main/resources/fabric.mod.json rename to modules/obj_loader/src/main/resources/fabric.mod.json diff --git a/obj_loader/src/testmod/java/io/github/fabricators_of_create/porting_lib/obj_loader/testmod/PortingLibObjLoaderTestmod.java b/modules/obj_loader/src/testmod/java/io/github/fabricators_of_create/porting_lib/obj_loader/testmod/PortingLibObjLoaderTestmod.java similarity index 100% rename from obj_loader/src/testmod/java/io/github/fabricators_of_create/porting_lib/obj_loader/testmod/PortingLibObjLoaderTestmod.java rename to modules/obj_loader/src/testmod/java/io/github/fabricators_of_create/porting_lib/obj_loader/testmod/PortingLibObjLoaderTestmod.java diff --git a/obj_loader/src/testmod/java/io/github/fabricators_of_create/porting_lib/obj_loader/testmod/RingItem.java b/modules/obj_loader/src/testmod/java/io/github/fabricators_of_create/porting_lib/obj_loader/testmod/RingItem.java similarity index 100% rename from obj_loader/src/testmod/java/io/github/fabricators_of_create/porting_lib/obj_loader/testmod/RingItem.java rename to modules/obj_loader/src/testmod/java/io/github/fabricators_of_create/porting_lib/obj_loader/testmod/RingItem.java diff --git a/obj_loader/src/testmod/resources/assets/porting_lib/models/item/ring.json b/modules/obj_loader/src/testmod/resources/assets/porting_lib/models/item/ring.json similarity index 100% rename from obj_loader/src/testmod/resources/assets/porting_lib/models/item/ring.json rename to modules/obj_loader/src/testmod/resources/assets/porting_lib/models/item/ring.json diff --git a/obj_loader/src/testmod/resources/assets/porting_lib/models/item/ring.mtl b/modules/obj_loader/src/testmod/resources/assets/porting_lib/models/item/ring.mtl similarity index 100% rename from obj_loader/src/testmod/resources/assets/porting_lib/models/item/ring.mtl rename to modules/obj_loader/src/testmod/resources/assets/porting_lib/models/item/ring.mtl diff --git a/obj_loader/src/testmod/resources/assets/porting_lib/models/item/ring.obj b/modules/obj_loader/src/testmod/resources/assets/porting_lib/models/item/ring.obj similarity index 100% rename from obj_loader/src/testmod/resources/assets/porting_lib/models/item/ring.obj rename to modules/obj_loader/src/testmod/resources/assets/porting_lib/models/item/ring.obj diff --git a/obj_loader/src/testmod/resources/fabric.mod.json b/modules/obj_loader/src/testmod/resources/fabric.mod.json similarity index 100% rename from obj_loader/src/testmod/resources/fabric.mod.json rename to modules/obj_loader/src/testmod/resources/fabric.mod.json diff --git a/recipe_book_categories/build.gradle b/modules/recipe_book_categories/build.gradle similarity index 100% rename from recipe_book_categories/build.gradle rename to modules/recipe_book_categories/build.gradle diff --git a/recipe_book_categories/src/main/java/io/github/fabricators_of_create/porting_lib/recipe_book_categories/RecipeBookRegistry.java b/modules/recipe_book_categories/src/main/java/io/github/fabricators_of_create/porting_lib/recipe_book_categories/RecipeBookRegistry.java similarity index 100% rename from recipe_book_categories/src/main/java/io/github/fabricators_of_create/porting_lib/recipe_book_categories/RecipeBookRegistry.java rename to modules/recipe_book_categories/src/main/java/io/github/fabricators_of_create/porting_lib/recipe_book_categories/RecipeBookRegistry.java diff --git a/recipe_book_categories/src/main/java/io/github/fabricators_of_create/porting_lib/recipe_book_categories/mixin/ClientRecipeBookMixin.java b/modules/recipe_book_categories/src/main/java/io/github/fabricators_of_create/porting_lib/recipe_book_categories/mixin/ClientRecipeBookMixin.java similarity index 100% rename from recipe_book_categories/src/main/java/io/github/fabricators_of_create/porting_lib/recipe_book_categories/mixin/ClientRecipeBookMixin.java rename to modules/recipe_book_categories/src/main/java/io/github/fabricators_of_create/porting_lib/recipe_book_categories/mixin/ClientRecipeBookMixin.java diff --git a/recipe_book_categories/src/main/java/io/github/fabricators_of_create/porting_lib/recipe_book_categories/mixin/RecipeBookCategoriesMixin.java b/modules/recipe_book_categories/src/main/java/io/github/fabricators_of_create/porting_lib/recipe_book_categories/mixin/RecipeBookCategoriesMixin.java similarity index 100% rename from recipe_book_categories/src/main/java/io/github/fabricators_of_create/porting_lib/recipe_book_categories/mixin/RecipeBookCategoriesMixin.java rename to modules/recipe_book_categories/src/main/java/io/github/fabricators_of_create/porting_lib/recipe_book_categories/mixin/RecipeBookCategoriesMixin.java diff --git a/recipe_book_categories/src/main/resources/fabric.mod.json b/modules/recipe_book_categories/src/main/resources/fabric.mod.json similarity index 100% rename from recipe_book_categories/src/main/resources/fabric.mod.json rename to modules/recipe_book_categories/src/main/resources/fabric.mod.json diff --git a/recipe_book_categories/src/main/resources/porting_lib_recipe_book_categories.mixins.json b/modules/recipe_book_categories/src/main/resources/porting_lib_recipe_book_categories.mixins.json similarity index 100% rename from recipe_book_categories/src/main/resources/porting_lib_recipe_book_categories.mixins.json rename to modules/recipe_book_categories/src/main/resources/porting_lib_recipe_book_categories.mixins.json diff --git a/registries/build.gradle b/modules/registries/build.gradle similarity index 100% rename from registries/build.gradle rename to modules/registries/build.gradle diff --git a/registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/DynamicRegistryHandler.java b/modules/registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/DynamicRegistryHandler.java similarity index 100% rename from registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/DynamicRegistryHandler.java rename to modules/registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/DynamicRegistryHandler.java diff --git a/registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/RegistryEvents.java b/modules/registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/RegistryEvents.java similarity index 100% rename from registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/RegistryEvents.java rename to modules/registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/RegistryEvents.java diff --git a/registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/mixin/NetworkedRegistryDataAccessor.java b/modules/registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/mixin/NetworkedRegistryDataAccessor.java similarity index 100% rename from registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/mixin/NetworkedRegistryDataAccessor.java rename to modules/registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/mixin/NetworkedRegistryDataAccessor.java diff --git a/registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/mixin/RegistryDataLoaderMixin.java b/modules/registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/mixin/RegistryDataLoaderMixin.java similarity index 100% rename from registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/mixin/RegistryDataLoaderMixin.java rename to modules/registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/mixin/RegistryDataLoaderMixin.java diff --git a/registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/mixin/RegistrySynchronizationMixin.java b/modules/registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/mixin/RegistrySynchronizationMixin.java similarity index 100% rename from registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/mixin/RegistrySynchronizationMixin.java rename to modules/registries/src/main/java/io/github/fabricators_of_create/porting_lib/registries/mixin/RegistrySynchronizationMixin.java diff --git a/registries/src/main/resources/fabric.mod.json b/modules/registries/src/main/resources/fabric.mod.json similarity index 100% rename from registries/src/main/resources/fabric.mod.json rename to modules/registries/src/main/resources/fabric.mod.json diff --git a/registries/src/main/resources/porting_lib_registries.accesswidener b/modules/registries/src/main/resources/porting_lib_registries.accesswidener similarity index 100% rename from registries/src/main/resources/porting_lib_registries.accesswidener rename to modules/registries/src/main/resources/porting_lib_registries.accesswidener diff --git a/registries/src/main/resources/porting_lib_registries.mixins.json b/modules/registries/src/main/resources/porting_lib_registries.mixins.json similarity index 100% rename from registries/src/main/resources/porting_lib_registries.mixins.json rename to modules/registries/src/main/resources/porting_lib_registries.mixins.json diff --git a/tags/build.gradle b/modules/tags/build.gradle similarity index 100% rename from tags/build.gradle rename to modules/tags/build.gradle diff --git a/tags/src/generated/resources/.cache/0db07b083d8ec4867dc8d8bdff9548858228ce08 b/modules/tags/src/generated/resources/.cache/0db07b083d8ec4867dc8d8bdff9548858228ce08 similarity index 100% rename from tags/src/generated/resources/.cache/0db07b083d8ec4867dc8d8bdff9548858228ce08 rename to modules/tags/src/generated/resources/.cache/0db07b083d8ec4867dc8d8bdff9548858228ce08 diff --git a/tags/src/generated/resources/.cache/6962ca521ed0f04c0af588ee702ea5e92dd92bbf b/modules/tags/src/generated/resources/.cache/6962ca521ed0f04c0af588ee702ea5e92dd92bbf similarity index 100% rename from tags/src/generated/resources/.cache/6962ca521ed0f04c0af588ee702ea5e92dd92bbf rename to modules/tags/src/generated/resources/.cache/6962ca521ed0f04c0af588ee702ea5e92dd92bbf diff --git a/tags/src/generated/resources/.cache/878c0710f526c0b7873f5817de08efcf0d1534b7 b/modules/tags/src/generated/resources/.cache/878c0710f526c0b7873f5817de08efcf0d1534b7 similarity index 100% rename from tags/src/generated/resources/.cache/878c0710f526c0b7873f5817de08efcf0d1534b7 rename to modules/tags/src/generated/resources/.cache/878c0710f526c0b7873f5817de08efcf0d1534b7 diff --git a/tags/src/generated/resources/.cache/9897d8c3e92150bbf2fefe657c4abae25457fe85 b/modules/tags/src/generated/resources/.cache/9897d8c3e92150bbf2fefe657c4abae25457fe85 similarity index 100% rename from tags/src/generated/resources/.cache/9897d8c3e92150bbf2fefe657c4abae25457fe85 rename to modules/tags/src/generated/resources/.cache/9897d8c3e92150bbf2fefe657c4abae25457fe85 diff --git a/tags/src/generated/resources/.cache/adaca8b06aaaf3f4d67b9cca4cb2c5464edbdcad b/modules/tags/src/generated/resources/.cache/adaca8b06aaaf3f4d67b9cca4cb2c5464edbdcad similarity index 100% rename from tags/src/generated/resources/.cache/adaca8b06aaaf3f4d67b9cca4cb2c5464edbdcad rename to modules/tags/src/generated/resources/.cache/adaca8b06aaaf3f4d67b9cca4cb2c5464edbdcad diff --git a/tags/src/generated/resources/.cache/eea7abfa3446d2a4e6ddd444e2bc333157ec6267 b/modules/tags/src/generated/resources/.cache/eea7abfa3446d2a4e6ddd444e2bc333157ec6267 similarity index 100% rename from tags/src/generated/resources/.cache/eea7abfa3446d2a4e6ddd444e2bc333157ec6267 rename to modules/tags/src/generated/resources/.cache/eea7abfa3446d2a4e6ddd444e2bc333157ec6267 diff --git a/tags/src/generated/resources/assets/porting_lib_tags/lang/en_us.json b/modules/tags/src/generated/resources/assets/porting_lib_tags/lang/en_us.json similarity index 100% rename from tags/src/generated/resources/assets/porting_lib_tags/lang/en_us.json rename to modules/tags/src/generated/resources/assets/porting_lib_tags/lang/en_us.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/amethyst_blocks.json b/modules/tags/src/generated/resources/data/c/tags/blocks/amethyst_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/amethyst_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/amethyst_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/barrels.json b/modules/tags/src/generated/resources/data/c/tags/blocks/barrels.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/barrels.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/barrels.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/black_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/black_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/black_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/black_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/black_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/black_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/black_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/black_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/blue_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/blue_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/blue_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/blue_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/blue_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/blue_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/blue_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/blue_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/brown_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/brown_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/brown_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/brown_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/brown_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/brown_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/brown_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/brown_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/chests.json b/modules/tags/src/generated/resources/data/c/tags/blocks/chests.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/chests.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/chests.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/coal_blocks.json b/modules/tags/src/generated/resources/data/c/tags/blocks/coal_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/coal_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/coal_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/coal_ores.json b/modules/tags/src/generated/resources/data/c/tags/blocks/coal_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/coal_ores.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/coal_ores.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/cobblestone.json b/modules/tags/src/generated/resources/data/c/tags/blocks/cobblestone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/cobblestone.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/cobblestone.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/colorless_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/colorless_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/colorless_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/colorless_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/colorless_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/colorless_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/colorless_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/colorless_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/colorless_sand.json b/modules/tags/src/generated/resources/data/c/tags/blocks/colorless_sand.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/colorless_sand.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/colorless_sand.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/copper_blocks.json b/modules/tags/src/generated/resources/data/c/tags/blocks/copper_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/copper_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/copper_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/copper_ores.json b/modules/tags/src/generated/resources/data/c/tags/blocks/copper_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/copper_ores.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/copper_ores.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/cyan_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/cyan_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/cyan_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/cyan_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/cyan_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/cyan_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/cyan_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/cyan_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/deepslate_cobblestone.json b/modules/tags/src/generated/resources/data/c/tags/blocks/deepslate_cobblestone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/deepslate_cobblestone.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/deepslate_cobblestone.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/diamond_blocks.json b/modules/tags/src/generated/resources/data/c/tags/blocks/diamond_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/diamond_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/diamond_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/diamond_ores.json b/modules/tags/src/generated/resources/data/c/tags/blocks/diamond_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/diamond_ores.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/diamond_ores.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/emerald_blocks.json b/modules/tags/src/generated/resources/data/c/tags/blocks/emerald_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/emerald_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/emerald_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/emerald_ores.json b/modules/tags/src/generated/resources/data/c/tags/blocks/emerald_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/emerald_ores.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/emerald_ores.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/end_stones.json b/modules/tags/src/generated/resources/data/c/tags/blocks/end_stones.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/end_stones.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/end_stones.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/ender_chests.json b/modules/tags/src/generated/resources/data/c/tags/blocks/ender_chests.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/ender_chests.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/ender_chests.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/enderman_place_on_blacklist.json b/modules/tags/src/generated/resources/data/c/tags/blocks/enderman_place_on_blacklist.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/enderman_place_on_blacklist.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/enderman_place_on_blacklist.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/fence_gates.json b/modules/tags/src/generated/resources/data/c/tags/blocks/fence_gates.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/fence_gates.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/fence_gates.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/fences.json b/modules/tags/src/generated/resources/data/c/tags/blocks/fences.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/fences.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/fences.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/glass_blocks.json b/modules/tags/src/generated/resources/data/c/tags/blocks/glass_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/glass_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/glass_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/gold_blocks.json b/modules/tags/src/generated/resources/data/c/tags/blocks/gold_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/gold_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/gold_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/gold_ores.json b/modules/tags/src/generated/resources/data/c/tags/blocks/gold_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/gold_ores.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/gold_ores.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/gravel.json b/modules/tags/src/generated/resources/data/c/tags/blocks/gravel.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/gravel.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/gravel.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/gray_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/gray_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/gray_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/gray_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/gray_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/gray_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/gray_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/gray_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/green_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/green_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/green_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/green_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/green_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/green_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/green_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/green_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/infested_cobblestone.json b/modules/tags/src/generated/resources/data/c/tags/blocks/infested_cobblestone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/infested_cobblestone.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/infested_cobblestone.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/iron_blocks.json b/modules/tags/src/generated/resources/data/c/tags/blocks/iron_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/iron_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/iron_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/iron_ores.json b/modules/tags/src/generated/resources/data/c/tags/blocks/iron_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/iron_ores.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/iron_ores.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/lapis_blocks.json b/modules/tags/src/generated/resources/data/c/tags/blocks/lapis_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/lapis_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/lapis_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/lapis_ores.json b/modules/tags/src/generated/resources/data/c/tags/blocks/lapis_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/lapis_ores.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/lapis_ores.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/light_blue_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/light_blue_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/light_blue_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/light_blue_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/light_blue_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/light_blue_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/light_blue_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/light_blue_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/light_gray_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/light_gray_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/light_gray_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/light_gray_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/light_gray_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/light_gray_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/light_gray_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/light_gray_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/lime_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/lime_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/lime_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/lime_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/lime_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/lime_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/lime_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/lime_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/magenta_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/magenta_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/magenta_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/magenta_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/magenta_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/magenta_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/magenta_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/magenta_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/mossy_cobblestone.json b/modules/tags/src/generated/resources/data/c/tags/blocks/mossy_cobblestone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/mossy_cobblestone.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/mossy_cobblestone.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/nether_brick_fences.json b/modules/tags/src/generated/resources/data/c/tags/blocks/nether_brick_fences.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/nether_brick_fences.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/nether_brick_fences.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/netherite_blocks.json b/modules/tags/src/generated/resources/data/c/tags/blocks/netherite_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/netherite_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/netherite_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/netherite_scrap_ores.json b/modules/tags/src/generated/resources/data/c/tags/blocks/netherite_scrap_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/netherite_scrap_ores.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/netherite_scrap_ores.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/netherrack.json b/modules/tags/src/generated/resources/data/c/tags/blocks/netherrack.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/netherrack.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/netherrack.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/normal_cobblestone.json b/modules/tags/src/generated/resources/data/c/tags/blocks/normal_cobblestone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/normal_cobblestone.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/normal_cobblestone.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/obsidian.json b/modules/tags/src/generated/resources/data/c/tags/blocks/obsidian.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/obsidian.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/obsidian.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/orange_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/orange_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/orange_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/orange_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/orange_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/orange_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/orange_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/orange_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/ore_bearing_ground/deepslate.json b/modules/tags/src/generated/resources/data/c/tags/blocks/ore_bearing_ground/deepslate.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/ore_bearing_ground/deepslate.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/ore_bearing_ground/deepslate.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/ore_bearing_ground/netherrack.json b/modules/tags/src/generated/resources/data/c/tags/blocks/ore_bearing_ground/netherrack.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/ore_bearing_ground/netherrack.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/ore_bearing_ground/netherrack.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/ore_bearing_ground/stone.json b/modules/tags/src/generated/resources/data/c/tags/blocks/ore_bearing_ground/stone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/ore_bearing_ground/stone.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/ore_bearing_ground/stone.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/ore_rates/dense.json b/modules/tags/src/generated/resources/data/c/tags/blocks/ore_rates/dense.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/ore_rates/dense.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/ore_rates/dense.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/ore_rates/singular.json b/modules/tags/src/generated/resources/data/c/tags/blocks/ore_rates/singular.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/ore_rates/singular.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/ore_rates/singular.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/ore_rates/sparse.json b/modules/tags/src/generated/resources/data/c/tags/blocks/ore_rates/sparse.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/ore_rates/sparse.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/ore_rates/sparse.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/ores.json b/modules/tags/src/generated/resources/data/c/tags/blocks/ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/ores.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/ores.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/ores_in_ground/deepslate.json b/modules/tags/src/generated/resources/data/c/tags/blocks/ores_in_ground/deepslate.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/ores_in_ground/deepslate.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/ores_in_ground/deepslate.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/ores_in_ground/netherrack.json b/modules/tags/src/generated/resources/data/c/tags/blocks/ores_in_ground/netherrack.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/ores_in_ground/netherrack.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/ores_in_ground/netherrack.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/ores_in_ground/stone.json b/modules/tags/src/generated/resources/data/c/tags/blocks/ores_in_ground/stone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/ores_in_ground/stone.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/ores_in_ground/stone.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/pink_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/pink_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/pink_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/pink_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/pink_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/pink_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/pink_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/pink_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/purple_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/purple_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/purple_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/purple_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/purple_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/purple_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/purple_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/purple_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/quartz_blocks.json b/modules/tags/src/generated/resources/data/c/tags/blocks/quartz_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/quartz_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/quartz_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/quartz_ores.json b/modules/tags/src/generated/resources/data/c/tags/blocks/quartz_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/quartz_ores.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/quartz_ores.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/raw_copper_blocks.json b/modules/tags/src/generated/resources/data/c/tags/blocks/raw_copper_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/raw_copper_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/raw_copper_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/raw_gold_blocks.json b/modules/tags/src/generated/resources/data/c/tags/blocks/raw_gold_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/raw_gold_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/raw_gold_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/raw_iron_blocks.json b/modules/tags/src/generated/resources/data/c/tags/blocks/raw_iron_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/raw_iron_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/raw_iron_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/red_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/red_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/red_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/red_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/red_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/red_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/red_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/red_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/red_sand.json b/modules/tags/src/generated/resources/data/c/tags/blocks/red_sand.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/red_sand.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/red_sand.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/redstone_blocks.json b/modules/tags/src/generated/resources/data/c/tags/blocks/redstone_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/redstone_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/redstone_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/redstone_ores.json b/modules/tags/src/generated/resources/data/c/tags/blocks/redstone_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/redstone_ores.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/redstone_ores.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/sand.json b/modules/tags/src/generated/resources/data/c/tags/blocks/sand.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/sand.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/sand.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/sandstone.json b/modules/tags/src/generated/resources/data/c/tags/blocks/sandstone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/sandstone.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/sandstone.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/silica_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/silica_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/silica_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/silica_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/stained_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/stained_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/stained_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/stained_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/stained_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/stained_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/stained_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/stained_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/stone.json b/modules/tags/src/generated/resources/data/c/tags/blocks/stone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/stone.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/stone.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/storage_blocks.json b/modules/tags/src/generated/resources/data/c/tags/blocks/storage_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/storage_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/storage_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/tinted_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/tinted_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/tinted_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/tinted_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/trapped_chests.json b/modules/tags/src/generated/resources/data/c/tags/blocks/trapped_chests.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/trapped_chests.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/trapped_chests.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/white_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/white_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/white_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/white_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/white_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/white_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/white_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/white_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/wooden_barrels.json b/modules/tags/src/generated/resources/data/c/tags/blocks/wooden_barrels.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/wooden_barrels.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/wooden_barrels.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/wooden_chests.json b/modules/tags/src/generated/resources/data/c/tags/blocks/wooden_chests.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/wooden_chests.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/wooden_chests.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/wooden_fence_gates.json b/modules/tags/src/generated/resources/data/c/tags/blocks/wooden_fence_gates.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/wooden_fence_gates.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/wooden_fence_gates.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/wooden_fences.json b/modules/tags/src/generated/resources/data/c/tags/blocks/wooden_fences.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/wooden_fences.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/wooden_fences.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/yellow_glass.json b/modules/tags/src/generated/resources/data/c/tags/blocks/yellow_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/yellow_glass.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/yellow_glass.json diff --git a/tags/src/generated/resources/data/c/tags/blocks/yellow_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/blocks/yellow_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/blocks/yellow_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/blocks/yellow_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/entity_types/bosses.json b/modules/tags/src/generated/resources/data/c/tags/entity_types/bosses.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/entity_types/bosses.json rename to modules/tags/src/generated/resources/data/c/tags/entity_types/bosses.json diff --git a/tags/src/generated/resources/data/c/tags/items/amethyst.json b/modules/tags/src/generated/resources/data/c/tags/items/amethyst.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/amethyst.json rename to modules/tags/src/generated/resources/data/c/tags/items/amethyst.json diff --git a/tags/src/generated/resources/data/c/tags/items/amethyst_blocks.json b/modules/tags/src/generated/resources/data/c/tags/items/amethyst_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/amethyst_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/items/amethyst_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/items/armors.json b/modules/tags/src/generated/resources/data/c/tags/items/armors.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/armors.json rename to modules/tags/src/generated/resources/data/c/tags/items/armors.json diff --git a/tags/src/generated/resources/data/c/tags/items/axes.json b/modules/tags/src/generated/resources/data/c/tags/items/axes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/axes.json rename to modules/tags/src/generated/resources/data/c/tags/items/axes.json diff --git a/tags/src/generated/resources/data/c/tags/items/barrels.json b/modules/tags/src/generated/resources/data/c/tags/items/barrels.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/barrels.json rename to modules/tags/src/generated/resources/data/c/tags/items/barrels.json diff --git a/tags/src/generated/resources/data/c/tags/items/beetroot_seeds.json b/modules/tags/src/generated/resources/data/c/tags/items/beetroot_seeds.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/beetroot_seeds.json rename to modules/tags/src/generated/resources/data/c/tags/items/beetroot_seeds.json diff --git a/tags/src/generated/resources/data/c/tags/items/black_dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/black_dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/black_dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/black_dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/black_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/black_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/black_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/black_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/black_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/black_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/black_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/black_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/blaze_rods.json b/modules/tags/src/generated/resources/data/c/tags/items/blaze_rods.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/blaze_rods.json rename to modules/tags/src/generated/resources/data/c/tags/items/blaze_rods.json diff --git a/tags/src/generated/resources/data/c/tags/items/blue_dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/blue_dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/blue_dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/blue_dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/blue_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/blue_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/blue_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/blue_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/blue_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/blue_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/blue_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/blue_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/bones.json b/modules/tags/src/generated/resources/data/c/tags/items/bones.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/bones.json rename to modules/tags/src/generated/resources/data/c/tags/items/bones.json diff --git a/tags/src/generated/resources/data/c/tags/items/bookshelves.json b/modules/tags/src/generated/resources/data/c/tags/items/bookshelves.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/bookshelves.json rename to modules/tags/src/generated/resources/data/c/tags/items/bookshelves.json diff --git a/tags/src/generated/resources/data/c/tags/items/boots.json b/modules/tags/src/generated/resources/data/c/tags/items/boots.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/boots.json rename to modules/tags/src/generated/resources/data/c/tags/items/boots.json diff --git a/tags/src/generated/resources/data/c/tags/items/bows.json b/modules/tags/src/generated/resources/data/c/tags/items/bows.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/bows.json rename to modules/tags/src/generated/resources/data/c/tags/items/bows.json diff --git a/tags/src/generated/resources/data/c/tags/items/brick_ingots.json b/modules/tags/src/generated/resources/data/c/tags/items/brick_ingots.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/brick_ingots.json rename to modules/tags/src/generated/resources/data/c/tags/items/brick_ingots.json diff --git a/tags/src/generated/resources/data/c/tags/items/brown_dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/brown_dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/brown_dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/brown_dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/brown_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/brown_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/brown_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/brown_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/brown_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/brown_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/brown_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/brown_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/chestplates.json b/modules/tags/src/generated/resources/data/c/tags/items/chestplates.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/chestplates.json rename to modules/tags/src/generated/resources/data/c/tags/items/chestplates.json diff --git a/tags/src/generated/resources/data/c/tags/items/chests.json b/modules/tags/src/generated/resources/data/c/tags/items/chests.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/chests.json rename to modules/tags/src/generated/resources/data/c/tags/items/chests.json diff --git a/tags/src/generated/resources/data/c/tags/items/coal_blocks.json b/modules/tags/src/generated/resources/data/c/tags/items/coal_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/coal_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/items/coal_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/items/coal_ores.json b/modules/tags/src/generated/resources/data/c/tags/items/coal_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/coal_ores.json rename to modules/tags/src/generated/resources/data/c/tags/items/coal_ores.json diff --git a/tags/src/generated/resources/data/c/tags/items/cobblestone.json b/modules/tags/src/generated/resources/data/c/tags/items/cobblestone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/cobblestone.json rename to modules/tags/src/generated/resources/data/c/tags/items/cobblestone.json diff --git a/tags/src/generated/resources/data/c/tags/items/colorless_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/colorless_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/colorless_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/colorless_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/colorless_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/colorless_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/colorless_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/colorless_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/colorless_sand.json b/modules/tags/src/generated/resources/data/c/tags/items/colorless_sand.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/colorless_sand.json rename to modules/tags/src/generated/resources/data/c/tags/items/colorless_sand.json diff --git a/tags/src/generated/resources/data/c/tags/items/copper_blocks.json b/modules/tags/src/generated/resources/data/c/tags/items/copper_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/copper_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/items/copper_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/items/copper_ingots.json b/modules/tags/src/generated/resources/data/c/tags/items/copper_ingots.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/copper_ingots.json rename to modules/tags/src/generated/resources/data/c/tags/items/copper_ingots.json diff --git a/tags/src/generated/resources/data/c/tags/items/copper_ores.json b/modules/tags/src/generated/resources/data/c/tags/items/copper_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/copper_ores.json rename to modules/tags/src/generated/resources/data/c/tags/items/copper_ores.json diff --git a/tags/src/generated/resources/data/c/tags/items/copper_raw_materials.json b/modules/tags/src/generated/resources/data/c/tags/items/copper_raw_materials.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/copper_raw_materials.json rename to modules/tags/src/generated/resources/data/c/tags/items/copper_raw_materials.json diff --git a/tags/src/generated/resources/data/c/tags/items/crops.json b/modules/tags/src/generated/resources/data/c/tags/items/crops.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/crops.json rename to modules/tags/src/generated/resources/data/c/tags/items/crops.json diff --git a/tags/src/generated/resources/data/c/tags/items/crops/beetroot.json b/modules/tags/src/generated/resources/data/c/tags/items/crops/beetroot.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/crops/beetroot.json rename to modules/tags/src/generated/resources/data/c/tags/items/crops/beetroot.json diff --git a/tags/src/generated/resources/data/c/tags/items/crops/carrot.json b/modules/tags/src/generated/resources/data/c/tags/items/crops/carrot.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/crops/carrot.json rename to modules/tags/src/generated/resources/data/c/tags/items/crops/carrot.json diff --git a/tags/src/generated/resources/data/c/tags/items/crops/nether_wart.json b/modules/tags/src/generated/resources/data/c/tags/items/crops/nether_wart.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/crops/nether_wart.json rename to modules/tags/src/generated/resources/data/c/tags/items/crops/nether_wart.json diff --git a/tags/src/generated/resources/data/c/tags/items/crops/potato.json b/modules/tags/src/generated/resources/data/c/tags/items/crops/potato.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/crops/potato.json rename to modules/tags/src/generated/resources/data/c/tags/items/crops/potato.json diff --git a/tags/src/generated/resources/data/c/tags/items/crops/wheat.json b/modules/tags/src/generated/resources/data/c/tags/items/crops/wheat.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/crops/wheat.json rename to modules/tags/src/generated/resources/data/c/tags/items/crops/wheat.json diff --git a/tags/src/generated/resources/data/c/tags/items/crossbows.json b/modules/tags/src/generated/resources/data/c/tags/items/crossbows.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/crossbows.json rename to modules/tags/src/generated/resources/data/c/tags/items/crossbows.json diff --git a/tags/src/generated/resources/data/c/tags/items/cyan_dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/cyan_dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/cyan_dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/cyan_dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/cyan_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/cyan_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/cyan_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/cyan_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/cyan_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/cyan_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/cyan_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/cyan_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/deepslate_cobblestone.json b/modules/tags/src/generated/resources/data/c/tags/items/deepslate_cobblestone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/deepslate_cobblestone.json rename to modules/tags/src/generated/resources/data/c/tags/items/deepslate_cobblestone.json diff --git a/tags/src/generated/resources/data/c/tags/items/diamond_blocks.json b/modules/tags/src/generated/resources/data/c/tags/items/diamond_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/diamond_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/items/diamond_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/items/diamond_ores.json b/modules/tags/src/generated/resources/data/c/tags/items/diamond_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/diamond_ores.json rename to modules/tags/src/generated/resources/data/c/tags/items/diamond_ores.json diff --git a/tags/src/generated/resources/data/c/tags/items/diamonds.json b/modules/tags/src/generated/resources/data/c/tags/items/diamonds.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/diamonds.json rename to modules/tags/src/generated/resources/data/c/tags/items/diamonds.json diff --git a/tags/src/generated/resources/data/c/tags/items/dusts.json b/modules/tags/src/generated/resources/data/c/tags/items/dusts.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/dusts.json rename to modules/tags/src/generated/resources/data/c/tags/items/dusts.json diff --git a/tags/src/generated/resources/data/c/tags/items/dusts/glowstone.json b/modules/tags/src/generated/resources/data/c/tags/items/dusts/glowstone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/dusts/glowstone.json rename to modules/tags/src/generated/resources/data/c/tags/items/dusts/glowstone.json diff --git a/tags/src/generated/resources/data/c/tags/items/dusts/prismarine.json b/modules/tags/src/generated/resources/data/c/tags/items/dusts/prismarine.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/dusts/prismarine.json rename to modules/tags/src/generated/resources/data/c/tags/items/dusts/prismarine.json diff --git a/tags/src/generated/resources/data/c/tags/items/dusts/redstone.json b/modules/tags/src/generated/resources/data/c/tags/items/dusts/redstone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/dusts/redstone.json rename to modules/tags/src/generated/resources/data/c/tags/items/dusts/redstone.json diff --git a/tags/src/generated/resources/data/c/tags/items/dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/eggs.json b/modules/tags/src/generated/resources/data/c/tags/items/eggs.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/eggs.json rename to modules/tags/src/generated/resources/data/c/tags/items/eggs.json diff --git a/tags/src/generated/resources/data/c/tags/items/emerald_blocks.json b/modules/tags/src/generated/resources/data/c/tags/items/emerald_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/emerald_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/items/emerald_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/items/emerald_ores.json b/modules/tags/src/generated/resources/data/c/tags/items/emerald_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/emerald_ores.json rename to modules/tags/src/generated/resources/data/c/tags/items/emerald_ores.json diff --git a/tags/src/generated/resources/data/c/tags/items/emeralds.json b/modules/tags/src/generated/resources/data/c/tags/items/emeralds.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/emeralds.json rename to modules/tags/src/generated/resources/data/c/tags/items/emeralds.json diff --git a/tags/src/generated/resources/data/c/tags/items/enchanting_fuels.json b/modules/tags/src/generated/resources/data/c/tags/items/enchanting_fuels.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/enchanting_fuels.json rename to modules/tags/src/generated/resources/data/c/tags/items/enchanting_fuels.json diff --git a/tags/src/generated/resources/data/c/tags/items/end_stones.json b/modules/tags/src/generated/resources/data/c/tags/items/end_stones.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/end_stones.json rename to modules/tags/src/generated/resources/data/c/tags/items/end_stones.json diff --git a/tags/src/generated/resources/data/c/tags/items/ender_chests.json b/modules/tags/src/generated/resources/data/c/tags/items/ender_chests.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/ender_chests.json rename to modules/tags/src/generated/resources/data/c/tags/items/ender_chests.json diff --git a/tags/src/generated/resources/data/c/tags/items/ender_pearls.json b/modules/tags/src/generated/resources/data/c/tags/items/ender_pearls.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/ender_pearls.json rename to modules/tags/src/generated/resources/data/c/tags/items/ender_pearls.json diff --git a/tags/src/generated/resources/data/c/tags/items/feathers.json b/modules/tags/src/generated/resources/data/c/tags/items/feathers.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/feathers.json rename to modules/tags/src/generated/resources/data/c/tags/items/feathers.json diff --git a/tags/src/generated/resources/data/c/tags/items/fence_gates.json b/modules/tags/src/generated/resources/data/c/tags/items/fence_gates.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/fence_gates.json rename to modules/tags/src/generated/resources/data/c/tags/items/fence_gates.json diff --git a/tags/src/generated/resources/data/c/tags/items/fences.json b/modules/tags/src/generated/resources/data/c/tags/items/fences.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/fences.json rename to modules/tags/src/generated/resources/data/c/tags/items/fences.json diff --git a/tags/src/generated/resources/data/c/tags/items/fishing_rods.json b/modules/tags/src/generated/resources/data/c/tags/items/fishing_rods.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/fishing_rods.json rename to modules/tags/src/generated/resources/data/c/tags/items/fishing_rods.json diff --git a/tags/src/generated/resources/data/c/tags/items/gems.json b/modules/tags/src/generated/resources/data/c/tags/items/gems.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/gems.json rename to modules/tags/src/generated/resources/data/c/tags/items/gems.json diff --git a/tags/src/generated/resources/data/c/tags/items/glass_blocks.json b/modules/tags/src/generated/resources/data/c/tags/items/glass_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/glass_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/items/glass_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/items/glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/gold_blocks.json b/modules/tags/src/generated/resources/data/c/tags/items/gold_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/gold_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/items/gold_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/items/gold_ingots.json b/modules/tags/src/generated/resources/data/c/tags/items/gold_ingots.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/gold_ingots.json rename to modules/tags/src/generated/resources/data/c/tags/items/gold_ingots.json diff --git a/tags/src/generated/resources/data/c/tags/items/gold_nuggets.json b/modules/tags/src/generated/resources/data/c/tags/items/gold_nuggets.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/gold_nuggets.json rename to modules/tags/src/generated/resources/data/c/tags/items/gold_nuggets.json diff --git a/tags/src/generated/resources/data/c/tags/items/gold_ores.json b/modules/tags/src/generated/resources/data/c/tags/items/gold_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/gold_ores.json rename to modules/tags/src/generated/resources/data/c/tags/items/gold_ores.json diff --git a/tags/src/generated/resources/data/c/tags/items/gold_raw_materials.json b/modules/tags/src/generated/resources/data/c/tags/items/gold_raw_materials.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/gold_raw_materials.json rename to modules/tags/src/generated/resources/data/c/tags/items/gold_raw_materials.json diff --git a/tags/src/generated/resources/data/c/tags/items/gravel.json b/modules/tags/src/generated/resources/data/c/tags/items/gravel.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/gravel.json rename to modules/tags/src/generated/resources/data/c/tags/items/gravel.json diff --git a/tags/src/generated/resources/data/c/tags/items/gray_dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/gray_dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/gray_dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/gray_dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/gray_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/gray_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/gray_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/gray_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/gray_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/gray_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/gray_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/gray_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/green_dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/green_dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/green_dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/green_dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/green_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/green_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/green_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/green_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/green_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/green_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/green_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/green_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/gunpowder.json b/modules/tags/src/generated/resources/data/c/tags/items/gunpowder.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/gunpowder.json rename to modules/tags/src/generated/resources/data/c/tags/items/gunpowder.json diff --git a/tags/src/generated/resources/data/c/tags/items/heads.json b/modules/tags/src/generated/resources/data/c/tags/items/heads.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/heads.json rename to modules/tags/src/generated/resources/data/c/tags/items/heads.json diff --git a/tags/src/generated/resources/data/c/tags/items/helmets.json b/modules/tags/src/generated/resources/data/c/tags/items/helmets.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/helmets.json rename to modules/tags/src/generated/resources/data/c/tags/items/helmets.json diff --git a/tags/src/generated/resources/data/c/tags/items/hoes.json b/modules/tags/src/generated/resources/data/c/tags/items/hoes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/hoes.json rename to modules/tags/src/generated/resources/data/c/tags/items/hoes.json diff --git a/tags/src/generated/resources/data/c/tags/items/infested_cobblestone.json b/modules/tags/src/generated/resources/data/c/tags/items/infested_cobblestone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/infested_cobblestone.json rename to modules/tags/src/generated/resources/data/c/tags/items/infested_cobblestone.json diff --git a/tags/src/generated/resources/data/c/tags/items/ingots.json b/modules/tags/src/generated/resources/data/c/tags/items/ingots.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/ingots.json rename to modules/tags/src/generated/resources/data/c/tags/items/ingots.json diff --git a/tags/src/generated/resources/data/c/tags/items/iron_blocks.json b/modules/tags/src/generated/resources/data/c/tags/items/iron_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/iron_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/items/iron_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/items/iron_ingots.json b/modules/tags/src/generated/resources/data/c/tags/items/iron_ingots.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/iron_ingots.json rename to modules/tags/src/generated/resources/data/c/tags/items/iron_ingots.json diff --git a/tags/src/generated/resources/data/c/tags/items/iron_nuggets.json b/modules/tags/src/generated/resources/data/c/tags/items/iron_nuggets.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/iron_nuggets.json rename to modules/tags/src/generated/resources/data/c/tags/items/iron_nuggets.json diff --git a/tags/src/generated/resources/data/c/tags/items/iron_ores.json b/modules/tags/src/generated/resources/data/c/tags/items/iron_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/iron_ores.json rename to modules/tags/src/generated/resources/data/c/tags/items/iron_ores.json diff --git a/tags/src/generated/resources/data/c/tags/items/iron_raw_materials.json b/modules/tags/src/generated/resources/data/c/tags/items/iron_raw_materials.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/iron_raw_materials.json rename to modules/tags/src/generated/resources/data/c/tags/items/iron_raw_materials.json diff --git a/tags/src/generated/resources/data/c/tags/items/lapis.json b/modules/tags/src/generated/resources/data/c/tags/items/lapis.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/lapis.json rename to modules/tags/src/generated/resources/data/c/tags/items/lapis.json diff --git a/tags/src/generated/resources/data/c/tags/items/lapis_blocks.json b/modules/tags/src/generated/resources/data/c/tags/items/lapis_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/lapis_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/items/lapis_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/items/lapis_ores.json b/modules/tags/src/generated/resources/data/c/tags/items/lapis_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/lapis_ores.json rename to modules/tags/src/generated/resources/data/c/tags/items/lapis_ores.json diff --git a/tags/src/generated/resources/data/c/tags/items/leather.json b/modules/tags/src/generated/resources/data/c/tags/items/leather.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/leather.json rename to modules/tags/src/generated/resources/data/c/tags/items/leather.json diff --git a/tags/src/generated/resources/data/c/tags/items/leggings.json b/modules/tags/src/generated/resources/data/c/tags/items/leggings.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/leggings.json rename to modules/tags/src/generated/resources/data/c/tags/items/leggings.json diff --git a/tags/src/generated/resources/data/c/tags/items/light_blue_dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/light_blue_dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/light_blue_dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/light_blue_dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/light_blue_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/light_blue_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/light_blue_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/light_blue_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/light_blue_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/light_blue_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/light_blue_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/light_blue_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/light_gray_dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/light_gray_dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/light_gray_dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/light_gray_dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/light_gray_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/light_gray_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/light_gray_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/light_gray_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/light_gray_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/light_gray_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/light_gray_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/light_gray_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/lime_dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/lime_dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/lime_dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/lime_dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/lime_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/lime_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/lime_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/lime_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/lime_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/lime_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/lime_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/lime_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/magenta_dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/magenta_dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/magenta_dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/magenta_dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/magenta_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/magenta_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/magenta_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/magenta_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/magenta_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/magenta_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/magenta_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/magenta_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/melon_seeds.json b/modules/tags/src/generated/resources/data/c/tags/items/melon_seeds.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/melon_seeds.json rename to modules/tags/src/generated/resources/data/c/tags/items/melon_seeds.json diff --git a/tags/src/generated/resources/data/c/tags/items/mossy_cobblestone.json b/modules/tags/src/generated/resources/data/c/tags/items/mossy_cobblestone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/mossy_cobblestone.json rename to modules/tags/src/generated/resources/data/c/tags/items/mossy_cobblestone.json diff --git a/tags/src/generated/resources/data/c/tags/items/mushrooms.json b/modules/tags/src/generated/resources/data/c/tags/items/mushrooms.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/mushrooms.json rename to modules/tags/src/generated/resources/data/c/tags/items/mushrooms.json diff --git a/tags/src/generated/resources/data/c/tags/items/nether_brick_fences.json b/modules/tags/src/generated/resources/data/c/tags/items/nether_brick_fences.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/nether_brick_fences.json rename to modules/tags/src/generated/resources/data/c/tags/items/nether_brick_fences.json diff --git a/tags/src/generated/resources/data/c/tags/items/nether_brick_ingots.json b/modules/tags/src/generated/resources/data/c/tags/items/nether_brick_ingots.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/nether_brick_ingots.json rename to modules/tags/src/generated/resources/data/c/tags/items/nether_brick_ingots.json diff --git a/tags/src/generated/resources/data/c/tags/items/nether_stars.json b/modules/tags/src/generated/resources/data/c/tags/items/nether_stars.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/nether_stars.json rename to modules/tags/src/generated/resources/data/c/tags/items/nether_stars.json diff --git a/tags/src/generated/resources/data/c/tags/items/netherite_blocks.json b/modules/tags/src/generated/resources/data/c/tags/items/netherite_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/netherite_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/items/netherite_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/items/netherite_ingots.json b/modules/tags/src/generated/resources/data/c/tags/items/netherite_ingots.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/netherite_ingots.json rename to modules/tags/src/generated/resources/data/c/tags/items/netherite_ingots.json diff --git a/tags/src/generated/resources/data/c/tags/items/netherite_scrap_ores.json b/modules/tags/src/generated/resources/data/c/tags/items/netherite_scrap_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/netherite_scrap_ores.json rename to modules/tags/src/generated/resources/data/c/tags/items/netherite_scrap_ores.json diff --git a/tags/src/generated/resources/data/c/tags/items/netherrack.json b/modules/tags/src/generated/resources/data/c/tags/items/netherrack.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/netherrack.json rename to modules/tags/src/generated/resources/data/c/tags/items/netherrack.json diff --git a/tags/src/generated/resources/data/c/tags/items/normal_cobblestone.json b/modules/tags/src/generated/resources/data/c/tags/items/normal_cobblestone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/normal_cobblestone.json rename to modules/tags/src/generated/resources/data/c/tags/items/normal_cobblestone.json diff --git a/tags/src/generated/resources/data/c/tags/items/nuggets.json b/modules/tags/src/generated/resources/data/c/tags/items/nuggets.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/nuggets.json rename to modules/tags/src/generated/resources/data/c/tags/items/nuggets.json diff --git a/tags/src/generated/resources/data/c/tags/items/obsidian.json b/modules/tags/src/generated/resources/data/c/tags/items/obsidian.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/obsidian.json rename to modules/tags/src/generated/resources/data/c/tags/items/obsidian.json diff --git a/tags/src/generated/resources/data/c/tags/items/orange_dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/orange_dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/orange_dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/orange_dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/orange_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/orange_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/orange_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/orange_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/orange_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/orange_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/orange_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/orange_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/ore_bearing_ground/deepslate.json b/modules/tags/src/generated/resources/data/c/tags/items/ore_bearing_ground/deepslate.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/ore_bearing_ground/deepslate.json rename to modules/tags/src/generated/resources/data/c/tags/items/ore_bearing_ground/deepslate.json diff --git a/tags/src/generated/resources/data/c/tags/items/ore_bearing_ground/netherrack.json b/modules/tags/src/generated/resources/data/c/tags/items/ore_bearing_ground/netherrack.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/ore_bearing_ground/netherrack.json rename to modules/tags/src/generated/resources/data/c/tags/items/ore_bearing_ground/netherrack.json diff --git a/tags/src/generated/resources/data/c/tags/items/ore_bearing_ground/stone.json b/modules/tags/src/generated/resources/data/c/tags/items/ore_bearing_ground/stone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/ore_bearing_ground/stone.json rename to modules/tags/src/generated/resources/data/c/tags/items/ore_bearing_ground/stone.json diff --git a/tags/src/generated/resources/data/c/tags/items/ore_rates/dense.json b/modules/tags/src/generated/resources/data/c/tags/items/ore_rates/dense.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/ore_rates/dense.json rename to modules/tags/src/generated/resources/data/c/tags/items/ore_rates/dense.json diff --git a/tags/src/generated/resources/data/c/tags/items/ore_rates/singular.json b/modules/tags/src/generated/resources/data/c/tags/items/ore_rates/singular.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/ore_rates/singular.json rename to modules/tags/src/generated/resources/data/c/tags/items/ore_rates/singular.json diff --git a/tags/src/generated/resources/data/c/tags/items/ore_rates/sparse.json b/modules/tags/src/generated/resources/data/c/tags/items/ore_rates/sparse.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/ore_rates/sparse.json rename to modules/tags/src/generated/resources/data/c/tags/items/ore_rates/sparse.json diff --git a/tags/src/generated/resources/data/c/tags/items/ores.json b/modules/tags/src/generated/resources/data/c/tags/items/ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/ores.json rename to modules/tags/src/generated/resources/data/c/tags/items/ores.json diff --git a/tags/src/generated/resources/data/c/tags/items/ores_in_ground/deepslate.json b/modules/tags/src/generated/resources/data/c/tags/items/ores_in_ground/deepslate.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/ores_in_ground/deepslate.json rename to modules/tags/src/generated/resources/data/c/tags/items/ores_in_ground/deepslate.json diff --git a/tags/src/generated/resources/data/c/tags/items/ores_in_ground/netherrack.json b/modules/tags/src/generated/resources/data/c/tags/items/ores_in_ground/netherrack.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/ores_in_ground/netherrack.json rename to modules/tags/src/generated/resources/data/c/tags/items/ores_in_ground/netherrack.json diff --git a/tags/src/generated/resources/data/c/tags/items/ores_in_ground/stone.json b/modules/tags/src/generated/resources/data/c/tags/items/ores_in_ground/stone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/ores_in_ground/stone.json rename to modules/tags/src/generated/resources/data/c/tags/items/ores_in_ground/stone.json diff --git a/tags/src/generated/resources/data/c/tags/items/pickaxes.json b/modules/tags/src/generated/resources/data/c/tags/items/pickaxes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/pickaxes.json rename to modules/tags/src/generated/resources/data/c/tags/items/pickaxes.json diff --git a/tags/src/generated/resources/data/c/tags/items/pink_dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/pink_dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/pink_dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/pink_dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/pink_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/pink_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/pink_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/pink_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/pink_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/pink_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/pink_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/pink_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/prismarine.json b/modules/tags/src/generated/resources/data/c/tags/items/prismarine.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/prismarine.json rename to modules/tags/src/generated/resources/data/c/tags/items/prismarine.json diff --git a/tags/src/generated/resources/data/c/tags/items/pumpkin_seeds.json b/modules/tags/src/generated/resources/data/c/tags/items/pumpkin_seeds.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/pumpkin_seeds.json rename to modules/tags/src/generated/resources/data/c/tags/items/pumpkin_seeds.json diff --git a/tags/src/generated/resources/data/c/tags/items/purple_dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/purple_dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/purple_dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/purple_dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/purple_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/purple_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/purple_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/purple_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/purple_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/purple_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/purple_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/purple_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/quartz.json b/modules/tags/src/generated/resources/data/c/tags/items/quartz.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/quartz.json rename to modules/tags/src/generated/resources/data/c/tags/items/quartz.json diff --git a/tags/src/generated/resources/data/c/tags/items/quartz_blocks.json b/modules/tags/src/generated/resources/data/c/tags/items/quartz_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/quartz_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/items/quartz_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/items/quartz_ores.json b/modules/tags/src/generated/resources/data/c/tags/items/quartz_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/quartz_ores.json rename to modules/tags/src/generated/resources/data/c/tags/items/quartz_ores.json diff --git a/tags/src/generated/resources/data/c/tags/items/raw_copper_blocks.json b/modules/tags/src/generated/resources/data/c/tags/items/raw_copper_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/raw_copper_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/items/raw_copper_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/items/raw_gold_blocks.json b/modules/tags/src/generated/resources/data/c/tags/items/raw_gold_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/raw_gold_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/items/raw_gold_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/items/raw_iron_blocks.json b/modules/tags/src/generated/resources/data/c/tags/items/raw_iron_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/raw_iron_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/items/raw_iron_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/items/raw_materials.json b/modules/tags/src/generated/resources/data/c/tags/items/raw_materials.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/raw_materials.json rename to modules/tags/src/generated/resources/data/c/tags/items/raw_materials.json diff --git a/tags/src/generated/resources/data/c/tags/items/red_dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/red_dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/red_dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/red_dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/red_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/red_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/red_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/red_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/red_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/red_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/red_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/red_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/red_sand.json b/modules/tags/src/generated/resources/data/c/tags/items/red_sand.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/red_sand.json rename to modules/tags/src/generated/resources/data/c/tags/items/red_sand.json diff --git a/tags/src/generated/resources/data/c/tags/items/redstone_blocks.json b/modules/tags/src/generated/resources/data/c/tags/items/redstone_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/redstone_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/items/redstone_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/items/redstone_ores.json b/modules/tags/src/generated/resources/data/c/tags/items/redstone_ores.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/redstone_ores.json rename to modules/tags/src/generated/resources/data/c/tags/items/redstone_ores.json diff --git a/tags/src/generated/resources/data/c/tags/items/rods.json b/modules/tags/src/generated/resources/data/c/tags/items/rods.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/rods.json rename to modules/tags/src/generated/resources/data/c/tags/items/rods.json diff --git a/tags/src/generated/resources/data/c/tags/items/sand.json b/modules/tags/src/generated/resources/data/c/tags/items/sand.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/sand.json rename to modules/tags/src/generated/resources/data/c/tags/items/sand.json diff --git a/tags/src/generated/resources/data/c/tags/items/sandstone.json b/modules/tags/src/generated/resources/data/c/tags/items/sandstone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/sandstone.json rename to modules/tags/src/generated/resources/data/c/tags/items/sandstone.json diff --git a/tags/src/generated/resources/data/c/tags/items/seeds.json b/modules/tags/src/generated/resources/data/c/tags/items/seeds.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/seeds.json rename to modules/tags/src/generated/resources/data/c/tags/items/seeds.json diff --git a/tags/src/generated/resources/data/c/tags/items/shears.json b/modules/tags/src/generated/resources/data/c/tags/items/shears.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/shears.json rename to modules/tags/src/generated/resources/data/c/tags/items/shears.json diff --git a/tags/src/generated/resources/data/c/tags/items/shields.json b/modules/tags/src/generated/resources/data/c/tags/items/shields.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/shields.json rename to modules/tags/src/generated/resources/data/c/tags/items/shields.json diff --git a/tags/src/generated/resources/data/c/tags/items/shovels.json b/modules/tags/src/generated/resources/data/c/tags/items/shovels.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/shovels.json rename to modules/tags/src/generated/resources/data/c/tags/items/shovels.json diff --git a/tags/src/generated/resources/data/c/tags/items/silica_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/silica_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/silica_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/silica_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/slimeballs.json b/modules/tags/src/generated/resources/data/c/tags/items/slimeballs.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/slimeballs.json rename to modules/tags/src/generated/resources/data/c/tags/items/slimeballs.json diff --git a/tags/src/generated/resources/data/c/tags/items/stained_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/stained_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/stained_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/stained_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/stained_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/stained_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/stained_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/stained_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/stone.json b/modules/tags/src/generated/resources/data/c/tags/items/stone.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/stone.json rename to modules/tags/src/generated/resources/data/c/tags/items/stone.json diff --git a/tags/src/generated/resources/data/c/tags/items/storage_blocks.json b/modules/tags/src/generated/resources/data/c/tags/items/storage_blocks.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/storage_blocks.json rename to modules/tags/src/generated/resources/data/c/tags/items/storage_blocks.json diff --git a/tags/src/generated/resources/data/c/tags/items/string.json b/modules/tags/src/generated/resources/data/c/tags/items/string.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/string.json rename to modules/tags/src/generated/resources/data/c/tags/items/string.json diff --git a/tags/src/generated/resources/data/c/tags/items/swords.json b/modules/tags/src/generated/resources/data/c/tags/items/swords.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/swords.json rename to modules/tags/src/generated/resources/data/c/tags/items/swords.json diff --git a/tags/src/generated/resources/data/c/tags/items/tinted_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/tinted_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/tinted_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/tinted_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/tools.json b/modules/tags/src/generated/resources/data/c/tags/items/tools.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/tools.json rename to modules/tags/src/generated/resources/data/c/tags/items/tools.json diff --git a/tags/src/generated/resources/data/c/tags/items/trapped_chests.json b/modules/tags/src/generated/resources/data/c/tags/items/trapped_chests.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/trapped_chests.json rename to modules/tags/src/generated/resources/data/c/tags/items/trapped_chests.json diff --git a/tags/src/generated/resources/data/c/tags/items/tridents.json b/modules/tags/src/generated/resources/data/c/tags/items/tridents.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/tridents.json rename to modules/tags/src/generated/resources/data/c/tags/items/tridents.json diff --git a/tags/src/generated/resources/data/c/tags/items/wheat_seeds.json b/modules/tags/src/generated/resources/data/c/tags/items/wheat_seeds.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/wheat_seeds.json rename to modules/tags/src/generated/resources/data/c/tags/items/wheat_seeds.json diff --git a/tags/src/generated/resources/data/c/tags/items/white_dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/white_dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/white_dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/white_dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/white_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/white_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/white_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/white_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/white_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/white_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/white_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/white_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/items/wooden_barrels.json b/modules/tags/src/generated/resources/data/c/tags/items/wooden_barrels.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/wooden_barrels.json rename to modules/tags/src/generated/resources/data/c/tags/items/wooden_barrels.json diff --git a/tags/src/generated/resources/data/c/tags/items/wooden_chests.json b/modules/tags/src/generated/resources/data/c/tags/items/wooden_chests.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/wooden_chests.json rename to modules/tags/src/generated/resources/data/c/tags/items/wooden_chests.json diff --git a/tags/src/generated/resources/data/c/tags/items/wooden_fence_gates.json b/modules/tags/src/generated/resources/data/c/tags/items/wooden_fence_gates.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/wooden_fence_gates.json rename to modules/tags/src/generated/resources/data/c/tags/items/wooden_fence_gates.json diff --git a/tags/src/generated/resources/data/c/tags/items/wooden_fences.json b/modules/tags/src/generated/resources/data/c/tags/items/wooden_fences.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/wooden_fences.json rename to modules/tags/src/generated/resources/data/c/tags/items/wooden_fences.json diff --git a/tags/src/generated/resources/data/c/tags/items/wooden_rods.json b/modules/tags/src/generated/resources/data/c/tags/items/wooden_rods.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/wooden_rods.json rename to modules/tags/src/generated/resources/data/c/tags/items/wooden_rods.json diff --git a/tags/src/generated/resources/data/c/tags/items/yellow_dyes.json b/modules/tags/src/generated/resources/data/c/tags/items/yellow_dyes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/yellow_dyes.json rename to modules/tags/src/generated/resources/data/c/tags/items/yellow_dyes.json diff --git a/tags/src/generated/resources/data/c/tags/items/yellow_glass.json b/modules/tags/src/generated/resources/data/c/tags/items/yellow_glass.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/yellow_glass.json rename to modules/tags/src/generated/resources/data/c/tags/items/yellow_glass.json diff --git a/tags/src/generated/resources/data/c/tags/items/yellow_glass_panes.json b/modules/tags/src/generated/resources/data/c/tags/items/yellow_glass_panes.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/items/yellow_glass_panes.json rename to modules/tags/src/generated/resources/data/c/tags/items/yellow_glass_panes.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_cave.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_cave.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_cave.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_cave.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_cold.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_cold/end.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_cold/end.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_cold/end.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_cold/end.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_cold/overworld.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_cold/overworld.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_cold/overworld.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_cold/overworld.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_coniferous.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_coniferous.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_coniferous.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_coniferous.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dense.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dense.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_dense.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dense.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dense/overworld.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dense/overworld.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_dense/overworld.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dense/overworld.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_desert.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_desert.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_desert.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_desert.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dry.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dry/end.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dry/end.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_dry/end.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dry/end.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dry/nether.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dry/nether.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_dry/nether.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dry/nether.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_dry/overworld.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_hot.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_hot/nether.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_hot/nether.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_hot/nether.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_hot/nether.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_hot/overworld.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_lush.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_lush.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_lush.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_lush.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_mountain.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_mountain.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_mountain.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_mountain.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_mushroom.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_mushroom.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_mushroom.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_mushroom.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_peak.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_peak.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_peak.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_peak.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_plains.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_plains.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_plains.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_plains.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_plateau.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_plateau.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_plateau.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_plateau.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_rare.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_rare.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_rare.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_rare.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_sandy.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_sandy.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_sandy.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_sandy.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_slope.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_slope.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_slope.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_slope.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_snowy.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_sparse.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_sparse.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_sparse.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_sparse.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_sparse/overworld.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_sparse/overworld.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_sparse/overworld.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_sparse/overworld.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_spooky.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_spooky.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_spooky.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_spooky.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_swamp.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_swamp.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_swamp.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_swamp.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_underground.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_underground.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_underground.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_underground.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_void.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_void.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_void.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_void.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_wasteland.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_wasteland.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_wasteland.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_wasteland.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_water.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_water.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_water.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_water.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_wet.json diff --git a/tags/src/generated/resources/data/c/tags/worldgen/biome/is_wet/overworld.json b/modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_wet/overworld.json similarity index 100% rename from tags/src/generated/resources/data/c/tags/worldgen/biome/is_wet/overworld.json rename to modules/tags/src/generated/resources/data/c/tags/worldgen/biome/is_wet/overworld.json diff --git a/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/TagHelper.java b/modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/TagHelper.java similarity index 100% rename from tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/TagHelper.java rename to modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/TagHelper.java diff --git a/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/Tags.java b/modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/Tags.java similarity index 100% rename from tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/Tags.java rename to modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/Tags.java diff --git a/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/BiomeTagsProvider.java b/modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/BiomeTagsProvider.java similarity index 100% rename from tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/BiomeTagsProvider.java rename to modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/BiomeTagsProvider.java diff --git a/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/BlockTagProvider.java b/modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/BlockTagProvider.java similarity index 100% rename from tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/BlockTagProvider.java rename to modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/BlockTagProvider.java diff --git a/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/DataGenerators.java b/modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/DataGenerators.java similarity index 100% rename from tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/DataGenerators.java rename to modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/DataGenerators.java diff --git a/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/EntityTagProvider.java b/modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/EntityTagProvider.java similarity index 100% rename from tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/EntityTagProvider.java rename to modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/EntityTagProvider.java diff --git a/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/FluidTagProvider.java b/modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/FluidTagProvider.java similarity index 100% rename from tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/FluidTagProvider.java rename to modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/FluidTagProvider.java diff --git a/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/ItemTagLangProvider.java b/modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/ItemTagLangProvider.java similarity index 100% rename from tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/ItemTagLangProvider.java rename to modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/ItemTagLangProvider.java diff --git a/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/ItemTagProvider.java b/modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/ItemTagProvider.java similarity index 100% rename from tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/ItemTagProvider.java rename to modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/data/ItemTagProvider.java diff --git a/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/extensions/DyeExtension.java b/modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/extensions/DyeExtension.java similarity index 100% rename from tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/extensions/DyeExtension.java rename to modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/extensions/DyeExtension.java diff --git a/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/mixin/DyeColorMixin.java b/modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/mixin/DyeColorMixin.java similarity index 100% rename from tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/mixin/DyeColorMixin.java rename to modules/tags/src/main/java/io/github/fabricators_of_create/porting_lib/tags/mixin/DyeColorMixin.java diff --git a/tags/src/main/resources/fabric.mod.json b/modules/tags/src/main/resources/fabric.mod.json similarity index 100% rename from tags/src/main/resources/fabric.mod.json rename to modules/tags/src/main/resources/fabric.mod.json diff --git a/tags/src/main/resources/porting_lib_tags.mixins.json b/modules/tags/src/main/resources/porting_lib_tags.mixins.json similarity index 100% rename from tags/src/main/resources/porting_lib_tags.mixins.json rename to modules/tags/src/main/resources/porting_lib_tags.mixins.json diff --git a/tool_actions/build.gradle b/modules/tool_actions/build.gradle similarity index 100% rename from tool_actions/build.gradle rename to modules/tool_actions/build.gradle diff --git a/tool_actions/src/generated/resources/.cache/e363a18310a24f02bdb404f7180170842373bd76 b/modules/tool_actions/src/generated/resources/.cache/e363a18310a24f02bdb404f7180170842373bd76 similarity index 100% rename from tool_actions/src/generated/resources/.cache/e363a18310a24f02bdb404f7180170842373bd76 rename to modules/tool_actions/src/generated/resources/.cache/e363a18310a24f02bdb404f7180170842373bd76 diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/acacia_leaves.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/acacia_leaves.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/acacia_leaves.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/acacia_leaves.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/azalea_leaves.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/azalea_leaves.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/azalea_leaves.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/azalea_leaves.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/birch_leaves.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/birch_leaves.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/birch_leaves.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/birch_leaves.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/cherry_leaves.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/cherry_leaves.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/cherry_leaves.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/cherry_leaves.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/cobweb.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/cobweb.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/cobweb.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/cobweb.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/dark_oak_leaves.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/dark_oak_leaves.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/dark_oak_leaves.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/dark_oak_leaves.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/dead_bush.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/dead_bush.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/dead_bush.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/dead_bush.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/fern.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/fern.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/fern.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/fern.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/flowering_azalea_leaves.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/flowering_azalea_leaves.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/flowering_azalea_leaves.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/flowering_azalea_leaves.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/glow_lichen.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/glow_lichen.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/glow_lichen.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/glow_lichen.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/grass.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/grass.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/grass.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/grass.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/hanging_roots.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/hanging_roots.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/hanging_roots.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/hanging_roots.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/jungle_leaves.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/jungle_leaves.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/jungle_leaves.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/jungle_leaves.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/large_fern.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/large_fern.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/large_fern.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/large_fern.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/mangrove_leaves.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/mangrove_leaves.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/mangrove_leaves.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/mangrove_leaves.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/nether_sprouts.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/nether_sprouts.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/nether_sprouts.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/nether_sprouts.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/oak_leaves.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/oak_leaves.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/oak_leaves.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/oak_leaves.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/seagrass.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/seagrass.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/seagrass.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/seagrass.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/small_dripleaf.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/small_dripleaf.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/small_dripleaf.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/small_dripleaf.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/spruce_leaves.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/spruce_leaves.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/spruce_leaves.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/spruce_leaves.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/tall_grass.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/tall_grass.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/tall_grass.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/tall_grass.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/tall_seagrass.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/tall_seagrass.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/tall_seagrass.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/tall_seagrass.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/twisting_vines.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/twisting_vines.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/twisting_vines.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/twisting_vines.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/vine.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/vine.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/vine.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/vine.json diff --git a/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/weeping_vines.json b/modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/weeping_vines.json similarity index 100% rename from tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/weeping_vines.json rename to modules/tool_actions/src/generated/resources/data/minecraft/loot_tables/blocks/weeping_vines.json diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/ToolAction.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/ToolAction.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/ToolAction.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/ToolAction.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/ToolActions.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/ToolActions.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/ToolActions.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/ToolActions.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/addons/ToolActionItem.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/addons/ToolActionItem.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/addons/ToolActionItem.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/addons/ToolActionItem.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/data/ToolActionsData.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/data/ToolActionsData.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/data/ToolActionsData.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/data/ToolActionsData.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/data/ToolActionsLootTableProvider.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/data/ToolActionsLootTableProvider.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/data/ToolActionsLootTableProvider.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/data/ToolActionsLootTableProvider.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/extensions/BlockExtensions.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/extensions/BlockExtensions.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/extensions/BlockExtensions.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/extensions/BlockExtensions.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/extensions/BlockStateExtensions.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/extensions/BlockStateExtensions.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/extensions/BlockStateExtensions.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/extensions/BlockStateExtensions.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/extensions/ItemStackExtensions.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/extensions/ItemStackExtensions.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/extensions/ItemStackExtensions.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/extensions/ItemStackExtensions.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/extensions/VanillaToolActionItem.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/extensions/VanillaToolActionItem.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/extensions/VanillaToolActionItem.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/extensions/VanillaToolActionItem.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/loot/CanToolPerformAction.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/loot/CanToolPerformAction.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/loot/CanToolPerformAction.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/loot/CanToolPerformAction.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/AxeItemMixin.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/AxeItemMixin.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/AxeItemMixin.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/AxeItemMixin.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/BeehiveBlockMixin.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/BeehiveBlockMixin.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/BeehiveBlockMixin.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/BeehiveBlockMixin.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/BlockMixin.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/BlockMixin.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/BlockMixin.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/BlockMixin.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/BlockStateMixin.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/BlockStateMixin.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/BlockStateMixin.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/BlockStateMixin.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/BuilderAccessor.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/BuilderAccessor.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/BuilderAccessor.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/BuilderAccessor.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/CompositeEntryBaseAccessor.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/CompositeEntryBaseAccessor.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/CompositeEntryBaseAccessor.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/CompositeEntryBaseAccessor.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/CompositeLootItemConditionAccessor.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/CompositeLootItemConditionAccessor.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/CompositeLootItemConditionAccessor.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/CompositeLootItemConditionAccessor.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/FishingRodItemMixin.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/FishingRodItemMixin.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/FishingRodItemMixin.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/FishingRodItemMixin.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/HoeItemMixin.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/HoeItemMixin.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/HoeItemMixin.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/HoeItemMixin.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/InvertedLootItemConditionAccessor.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/InvertedLootItemConditionAccessor.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/InvertedLootItemConditionAccessor.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/InvertedLootItemConditionAccessor.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/ItemStackMixin.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/ItemStackMixin.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/ItemStackMixin.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/ItemStackMixin.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/LootPoolEntryContainerAccessor.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/LootPoolEntryContainerAccessor.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/LootPoolEntryContainerAccessor.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/LootPoolEntryContainerAccessor.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/PickaxeItemMixin.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/PickaxeItemMixin.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/PickaxeItemMixin.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/PickaxeItemMixin.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/PumpkinBlockMixin.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/PumpkinBlockMixin.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/PumpkinBlockMixin.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/PumpkinBlockMixin.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/ShearsItemMixin.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/ShearsItemMixin.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/ShearsItemMixin.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/ShearsItemMixin.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/ShieldItemMixin.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/ShieldItemMixin.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/ShieldItemMixin.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/ShieldItemMixin.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/ShovelItemMixin.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/ShovelItemMixin.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/ShovelItemMixin.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/ShovelItemMixin.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/SwordItemMixin.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/SwordItemMixin.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/SwordItemMixin.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/SwordItemMixin.java diff --git a/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/TripWireBlockMixin.java b/modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/TripWireBlockMixin.java similarity index 100% rename from tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/TripWireBlockMixin.java rename to modules/tool_actions/src/main/java/io/github/fabricators_of_create/porting_lib/tool/mixin/TripWireBlockMixin.java diff --git a/tool_actions/src/main/resources/fabric.mod.json b/modules/tool_actions/src/main/resources/fabric.mod.json similarity index 100% rename from tool_actions/src/main/resources/fabric.mod.json rename to modules/tool_actions/src/main/resources/fabric.mod.json diff --git a/modules/tool_actions/src/main/resources/porting_lib_tool_actions.accesswidener b/modules/tool_actions/src/main/resources/porting_lib_tool_actions.accesswidener new file mode 100644 index 000000000..d9b05f902 --- /dev/null +++ b/modules/tool_actions/src/main/resources/porting_lib_tool_actions.accesswidener @@ -0,0 +1,10 @@ +accessWidener v2 named + +transitive-accessible field net/minecraft/world/item/AxeItem STRIPPABLES Ljava/util/Map; +transitive-accessible field net/minecraft/world/item/ShovelItem FLATTENABLES Ljava/util/Map; + +transitive-accessible field net/minecraft/data/loot/LootTableProvider LOGGER Lorg/slf4j/Logger; + +accessible field net/minecraft/data/loot/LootTableProvider pathProvider Lnet/minecraft/data/PackOutput$PathProvider; +accessible field net/minecraft/data/loot/LootTableProvider requiredTables Ljava/util/Set; +accessible field net/minecraft/data/loot/LootTableProvider subProviders Ljava/util/List; diff --git a/tool_actions/src/main/resources/porting_lib_tool_actions.mixins.json b/modules/tool_actions/src/main/resources/porting_lib_tool_actions.mixins.json similarity index 100% rename from tool_actions/src/main/resources/porting_lib_tool_actions.mixins.json rename to modules/tool_actions/src/main/resources/porting_lib_tool_actions.mixins.json diff --git a/transfer/build.gradle b/modules/transfer/build.gradle similarity index 100% rename from transfer/build.gradle rename to modules/transfer/build.gradle diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibTransfer.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibTransfer.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibTransfer.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibTransfer.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/MutableContainerItemContext.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/MutableContainerItemContext.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/MutableContainerItemContext.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/MutableContainerItemContext.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/StorageViewArrayIterator.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/StorageViewArrayIterator.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/StorageViewArrayIterator.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/StorageViewArrayIterator.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/TransferUtil.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/TransferUtil.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/TransferUtil.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/TransferUtil.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/ViewOnlyWrappedIterator.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/ViewOnlyWrappedIterator.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/ViewOnlyWrappedIterator.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/ViewOnlyWrappedIterator.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/ViewOnlyWrappedStorageView.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/ViewOnlyWrappedStorageView.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/ViewOnlyWrappedStorageView.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/ViewOnlyWrappedStorageView.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/WrappedStorage.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/WrappedStorage.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/WrappedStorage.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/WrappedStorage.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/callbacks/TransactionCallback.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/callbacks/TransactionCallback.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/callbacks/TransactionCallback.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/callbacks/TransactionCallback.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/callbacks/TransactionFailCallback.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/callbacks/TransactionFailCallback.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/callbacks/TransactionFailCallback.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/callbacks/TransactionFailCallback.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/callbacks/TransactionSuccessCallback.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/callbacks/TransactionSuccessCallback.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/callbacks/TransactionSuccessCallback.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/callbacks/TransactionSuccessCallback.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/fluid/FluidTank.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/fluid/FluidTank.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/fluid/FluidTank.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/fluid/FluidTank.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/fluid/block/BucketPickupHandlerWrapper.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/fluid/block/BucketPickupHandlerWrapper.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/fluid/block/BucketPickupHandlerWrapper.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/fluid/block/BucketPickupHandlerWrapper.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/fluid/item/FluidBucketWrapper.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/fluid/item/FluidBucketWrapper.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/fluid/item/FluidBucketWrapper.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/fluid/item/FluidBucketWrapper.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/fluid/item/FluidHandlerItemStack.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/fluid/item/FluidHandlerItemStack.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/fluid/item/FluidHandlerItemStack.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/fluid/item/FluidHandlerItemStack.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/ClientBlockApiCache.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/ClientBlockApiCache.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/ClientBlockApiCache.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/ClientBlockApiCache.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/ClientFluidLookupCache.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/ClientFluidLookupCache.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/ClientFluidLookupCache.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/ClientFluidLookupCache.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/ClientItemLookupCache.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/ClientItemLookupCache.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/ClientItemLookupCache.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/ClientItemLookupCache.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/EmptyFluidLookupCache.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/EmptyFluidLookupCache.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/EmptyFluidLookupCache.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/EmptyFluidLookupCache.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/EmptyItemLookupCache.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/EmptyItemLookupCache.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/EmptyItemLookupCache.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/cache/EmptyItemLookupCache.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/extensions/ClientLevelExtensions.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/extensions/ClientLevelExtensions.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/extensions/ClientLevelExtensions.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/extensions/ClientLevelExtensions.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/extensions/LevelExtensions.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/extensions/LevelExtensions.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/extensions/LevelExtensions.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/internal/extensions/LevelExtensions.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/BundleStorage.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/BundleStorage.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/BundleStorage.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/BundleStorage.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemHandlerHelper.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemHandlerHelper.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemHandlerHelper.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemHandlerHelper.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemItemStorages.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemItemStorages.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemItemStorages.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemItemStorages.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemStackHandler.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemStackHandler.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemStackHandler.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemStackHandler.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemStackHandlerContainer.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemStackHandlerContainer.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemStackHandlerContainer.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemStackHandlerContainer.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemStackHandlerContainerItemContext.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemStackHandlerContainerItemContext.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemStackHandlerContainerItemContext.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemStackHandlerContainerItemContext.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemStackHandlerSlot.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemStackHandlerSlot.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemStackHandlerSlot.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ItemStackHandlerSlot.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/RecipeWrapper.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/RecipeWrapper.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/RecipeWrapper.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/RecipeWrapper.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ShulkerBoxStorage.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ShulkerBoxStorage.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ShulkerBoxStorage.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/ShulkerBoxStorage.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/SlotItemHandler.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/SlotItemHandler.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/SlotItemHandler.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/SlotItemHandler.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/SlottedStackStorage.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/SlottedStackStorage.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/SlottedStackStorage.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/item/SlottedStackStorage.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/mixin/client/ClientLevelMixin.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/mixin/client/ClientLevelMixin.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/mixin/client/ClientLevelMixin.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/mixin/client/ClientLevelMixin.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/mixin/common/LevelMixin.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/mixin/common/LevelMixin.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/mixin/common/LevelMixin.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/mixin/common/LevelMixin.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/mixin/common/ServerLevelMixin.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/mixin/common/ServerLevelMixin.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/mixin/common/ServerLevelMixin.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/transfer/mixin/common/ServerLevelMixin.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/DualSortedSetIterator.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/DualSortedSetIterator.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/DualSortedSetIterator.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/DualSortedSetIterator.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/EmptySortedSet.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/EmptySortedSet.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/EmptySortedSet.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/EmptySortedSet.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/FluidTextUtil.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/FluidTextUtil.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/FluidTextUtil.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/FluidTextUtil.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/FluidUnit.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/FluidUnit.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/FluidUnit.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/FluidUnit.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/FluidUtil.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/FluidUtil.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/FluidUtil.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/FluidUtil.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/ItemStackUtil.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/ItemStackUtil.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/ItemStackUtil.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/ItemStackUtil.java diff --git a/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/StorageProvider.java b/modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/StorageProvider.java similarity index 100% rename from transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/StorageProvider.java rename to modules/transfer/src/main/java/io/github/fabricators_of_create/porting_lib/util/StorageProvider.java diff --git a/transfer/src/main/resources/fabric.mod.json b/modules/transfer/src/main/resources/fabric.mod.json similarity index 100% rename from transfer/src/main/resources/fabric.mod.json rename to modules/transfer/src/main/resources/fabric.mod.json diff --git a/transfer/src/main/resources/porting_lib_transfer.accesswidener b/modules/transfer/src/main/resources/porting_lib_transfer.accesswidener similarity index 100% rename from transfer/src/main/resources/porting_lib_transfer.accesswidener rename to modules/transfer/src/main/resources/porting_lib_transfer.accesswidener diff --git a/transfer/src/main/resources/porting_lib_transfer.mixins.json b/modules/transfer/src/main/resources/porting_lib_transfer.mixins.json similarity index 100% rename from transfer/src/main/resources/porting_lib_transfer.mixins.json rename to modules/transfer/src/main/resources/porting_lib_transfer.mixins.json diff --git a/utility/build.gradle b/modules/utility/build.gradle similarity index 100% rename from utility/build.gradle rename to modules/utility/build.gradle diff --git a/utility/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibUtility.java b/modules/utility/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibUtility.java similarity index 100% rename from utility/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibUtility.java rename to modules/utility/src/main/java/io/github/fabricators_of_create/porting_lib/PortingLibUtility.java diff --git a/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/CraftingHelper.java b/modules/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/CraftingHelper.java similarity index 100% rename from utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/CraftingHelper.java rename to modules/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/CraftingHelper.java diff --git a/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/EnvExecutor.java b/modules/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/EnvExecutor.java similarity index 100% rename from utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/EnvExecutor.java rename to modules/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/EnvExecutor.java diff --git a/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazyTier.java b/modules/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazyTier.java similarity index 100% rename from utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazyTier.java rename to modules/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/LazyTier.java diff --git a/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/LogicalSidedProvider.java b/modules/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/LogicalSidedProvider.java similarity index 100% rename from utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/LogicalSidedProvider.java rename to modules/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/LogicalSidedProvider.java diff --git a/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/ServerLifecycleHooks.java b/modules/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/ServerLifecycleHooks.java similarity index 100% rename from utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/ServerLifecycleHooks.java rename to modules/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/ServerLifecycleHooks.java diff --git a/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/SimpleRecipeType.java b/modules/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/SimpleRecipeType.java similarity index 100% rename from utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/SimpleRecipeType.java rename to modules/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/SimpleRecipeType.java diff --git a/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/TrueCondition.java b/modules/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/TrueCondition.java similarity index 100% rename from utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/TrueCondition.java rename to modules/utility/src/main/java/io/github/fabricators_of_create/porting_lib/util/TrueCondition.java diff --git a/utility/src/main/resources/fabric.mod.json b/modules/utility/src/main/resources/fabric.mod.json similarity index 100% rename from utility/src/main/resources/fabric.mod.json rename to modules/utility/src/main/resources/fabric.mod.json diff --git a/utility/src/main/resources/porting_lib_utility.accesswidener b/modules/utility/src/main/resources/porting_lib_utility.accesswidener similarity index 100% rename from utility/src/main/resources/porting_lib_utility.accesswidener rename to modules/utility/src/main/resources/porting_lib_utility.accesswidener diff --git a/settings.gradle b/settings.gradle index 7a0ed6492..12aa72fb6 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,42 +1,37 @@ pluginManagement { repositories { - maven { url = "https://maven.fabricmc.net/" } - maven { url = "https://maven.quiltmc.org/repository/release" } mavenCentral() gradlePluginPortal() + maven { url = "https://maven.fabricmc.net/" } + maven { url = "https://maven.quiltmc.org/repository/release" } } } rootProject.name = "Porting-Lib" -include("accessors") -include("attributes") -include("asm") -include("base") -include("brewing") -include("chunk_loading") -include("config") -include("common") -include("core") -include("data") -include("entity") -include("extensions") -include("networking") -include("tags") -include("transfer") -include("tool_actions") -include("gametest") -include("items") -include("lazy_registration") -include("loot") -include("model_loader") -include("models") -include("obj_loader") -include("mixin_extensions") -include("model_builders") -include("model_generators") -include("model_materials") -include("client_events") -include("utility") -include("fluids") -include("registries") -include("recipe_book_categories") +for (File file in getFile("modules").listFiles()) { + if (isModuleDir(file)) { + String name = file.name + include(name) + ProjectDescriptor project = project(":" + name) + project.projectDir = getFile("modules/" + name) + } +} + +// jank! why is this needed?? +def getFile(String name) { + return file(name) +} + +static def isModuleDir(File file) { + if (file.isDirectory()) { + File[] files = file.listFiles() + if (files != null) { + for (File subFile in files) { + if (subFile.name == "build.gradle") { + return true + } + } + } + } + return false +} diff --git a/tool_actions/src/main/resources/porting_lib_tool_actions.accesswidener b/tool_actions/src/main/resources/porting_lib_tool_actions.accesswidener deleted file mode 100644 index 8fd50b33c..000000000 --- a/tool_actions/src/main/resources/porting_lib_tool_actions.accesswidener +++ /dev/null @@ -1,18 +0,0 @@ -accessWidener v2 named - -transitive-accessible field net/minecraft/world/item/AxeItem STRIPPABLES Ljava/util/Map; -transitive-accessible field net/minecraft/world/item/ShovelItem FLATTENABLES Ljava/util/Map; - -transitive-accessible field net/minecraft/data/loot/LootTableProvider LOGGER Lorg/slf4j/Logger; - -accessible field net/minecraft/data/loot/LootTableProvider pathProvider Lnet/minecraft/data/PackOutput$PathProvider; -accessible field net/minecraft/data/loot/LootTableProvider requiredTables Ljava/util/Set; -accessible field net/minecraft/data/loot/LootTableProvider subProviders Ljava/util/List; - -accessible field net/minecraft/world/level/storage/loot/entries/CompositeEntryBase children [Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer; -accessible field net/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer conditions [Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition; - -accessible field net/minecraft/world/level/storage/loot/predicates/CompositeLootItemCondition terms [Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition; -accessible field net/minecraft/world/level/storage/loot/predicates/MatchTool predicate Lnet/minecraft/advancements/critereon/ItemPredicate; - -accessible field net/minecraft/advancements/critereon/ItemPredicate items Ljava/util/Set;