diff --git a/bclib.gradle b/bclib.gradle index 8d4d8c13..034ee6b6 100644 --- a/bclib.gradle +++ b/bclib.gradle @@ -7,12 +7,13 @@ buildscript { gradlePluginPortal() } } -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 -archivesBaseName = project.archives_base_name -version = project.mod_version -group = project.maven_group + +//archivesBaseName = project.archives_base_name +//version = project.mod_version +//group = project.maven_group + +apply from: "gradle/bclib-common.gradle" repositories { maven { url "https://maven.dblsaiko.net/" } @@ -23,20 +24,102 @@ repositories { maven { url 'https://maven.terraformersmc.com/releases' } } -loom { - accessWidenerPath = file("src/main/resources/bclib.accesswidener") +allprojects { + group = project.maven_group + apply plugin: "java-library" + apply plugin: "fabric-loom" + + tasks.withType(GenerateModuleMetadata) { + enabled = false + } + + tasks.withType(JavaCompile).configureEach { + it.options.release = 17 + } + + java { + // Must be added before the split source sets are setup. + withSourcesJar() + } + + allprojects.each { p -> + loom.mods.register(p.name) { + sourceSet p.sourceSets.main + } + } + + dependencies { + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings loom.officialMojangMappings() + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + } + + loom { + // shareRemapCaches = true + } + + tasks.withType(ProcessResources).configureEach { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } + } + + tasks.withType(AbstractArchiveTask) { + preserveFileTimestamps = false + reproducibleFileOrder = true + } + + jar { + from "../LICENSE" + } } -dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings loom.officialMojangMappings() - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}" +subprojects { + javadoc.enabled = false - //useApi "vazkii.patchouli:Patchouli:1.16.4-${project.patchouli_version}" + afterEvaluate { + // Disable the gen sources task on sub projects +// genCommonSourcesWithCfr.enabled = false +// genCommonSourcesWithFernFlower.enabled = false +// unpickCommonJar.enabled = false + } } +javadoc { + options { + source = "17" + encoding = "UTF-8" + charSet = "UTF-8" + memberLevel = JavadocMemberLevel.PACKAGE + // Disable the crazy super-strict doclint tool in Java 8 + addStringOption("Xdoclint:none", "-quiet") + } + + allprojects.each { + if (it.name == "deprecated") return + + source(it.sourceSets.main.allJava.srcDirs) + } + + classpath = files(sourceSets.main.compileClasspath) + include("**") + failOnError false +} + +task javadocJar(type: Jar) { + dependsOn javadoc + from javadoc.destinationDir + //Set as `fatjavadoc` to prevent an ide form trying to use this javadoc, over using the modules javadoc + archiveClassifier = "fatjavadoc" +} + +build.dependsOn javadocJar + +loom {} + processResources { println "Version: ${project.mod_version}" inputs.property "version", project.mod_version @@ -46,6 +129,27 @@ processResources { } } +subprojects.each { + remapJar.dependsOn("${it.path}:remapJar") +} + + +dependencies { + afterEvaluate { + subprojects.each { + api project(path: "${it.path}", configuration: "namedElements") + } + } +} + +remapJar { + afterEvaluate { + subprojects.each { + nestedJars.from project("${it.path}").tasks.getByName("remapJar") + } + } +} + // ensure that the encoding is set to UTF-8, no matter what the system default is // this fixes some edge cases with special characters not displaying correctly // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html @@ -59,19 +163,6 @@ javadoc { options.stylesheetFile = new File(projectDir, "javadoc.css"); } -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task -// if it is present. -// If you remove this task, sources will not be generated. -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - jar { from "LICENSE" } diff --git a/build.gradle b/build.gradle index e1d0a7ff..67652397 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { - id 'idea' - id 'eclipse' - id 'fabric-loom' version "${loom_version}" - id 'maven-publish' + id 'idea' + id 'eclipse' + id 'fabric-loom' version "${loom_version}" apply false + id 'maven-publish' } apply from: "bclib.gradle" \ No newline at end of file diff --git a/core-v1/build.gradle b/core-v1/build.gradle new file mode 100644 index 00000000..b759726c --- /dev/null +++ b/core-v1/build.gradle @@ -0,0 +1,23 @@ +archivesBaseName = "core-v1" +version = getSubprojectVersion(project) + +loom { + accessWidenerPath = file("src/main/resources/bclib.accesswidener") +} + +moduleDependencies(project, ["together-v1"]) +//compileOnlyDependencies(project, [ +// "com.terraformersmc:modmenu:${project.modmenu_version}" +//]) + +repositories { + maven { url 'https://maven.terraformersmc.com/releases' } +} + +dependencies { + modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}" +} + +jar { + from "../LICENSE" +} \ No newline at end of file diff --git a/core-v1/gradle.properties b/core-v1/gradle.properties new file mode 100644 index 00000000..9fa83611 --- /dev/null +++ b/core-v1/gradle.properties @@ -0,0 +1,2 @@ +# Dependencies +modmenu_version=4.0.0 \ No newline at end of file diff --git a/src/main/java/org/anti_ad/mc/ipn/api/IPNIgnore.java b/core-v1/src/main/java/org/anti_ad/mc/ipn/api/IPNIgnore.java similarity index 100% rename from src/main/java/org/anti_ad/mc/ipn/api/IPNIgnore.java rename to core-v1/src/main/java/org/anti_ad/mc/ipn/api/IPNIgnore.java diff --git a/src/main/java/org/betterx/bclib/BCLib.java b/core-v1/src/main/java/org/betterx/bclib/BCLib.java similarity index 98% rename from src/main/java/org/betterx/bclib/BCLib.java rename to core-v1/src/main/java/org/betterx/bclib/BCLib.java index 7cabae04..602da7e2 100644 --- a/src/main/java/org/betterx/bclib/BCLib.java +++ b/core-v1/src/main/java/org/betterx/bclib/BCLib.java @@ -19,9 +19,9 @@ import org.betterx.bclib.recipes.AnvilRecipe; import org.betterx.bclib.recipes.CraftingRecipes; import org.betterx.bclib.registry.BaseBlockEntities; import org.betterx.bclib.registry.BaseRegistry; -import org.betterx.bclib.util.Logger; import org.betterx.worlds.together.WorldsTogether; import org.betterx.worlds.together.tag.v3.TagManager; +import org.betterx.worlds.together.util.Logger; import org.betterx.worlds.together.world.WorldConfig; import net.minecraft.resources.ResourceLocation; @@ -41,7 +41,6 @@ public class BCLib implements ModInitializer { @Override public void onInitialize() { LevelGenEvents.register(); - WorldsTogether.onInitialize(); BlockPredicates.ensureStaticInitialization(); BaseRegistry.register(); GeneratorOptions.init(); diff --git a/src/main/java/org/betterx/bclib/BCLibPatch.java b/core-v1/src/main/java/org/betterx/bclib/BCLibPatch.java similarity index 100% rename from src/main/java/org/betterx/bclib/BCLibPatch.java rename to core-v1/src/main/java/org/betterx/bclib/BCLibPatch.java diff --git a/src/main/java/org/betterx/bclib/api/v2/BonemealAPI.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/BonemealAPI.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/BonemealAPI.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/BonemealAPI.java diff --git a/src/main/java/org/betterx/bclib/api/v2/ComposterAPI.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/ComposterAPI.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/ComposterAPI.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/ComposterAPI.java diff --git a/src/main/java/org/betterx/bclib/api/v2/DiggerItemSpeed.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/DiggerItemSpeed.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/DiggerItemSpeed.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/DiggerItemSpeed.java diff --git a/src/main/java/org/betterx/bclib/api/v2/LifeCycleAPI.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/LifeCycleAPI.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/LifeCycleAPI.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/LifeCycleAPI.java diff --git a/src/main/java/org/betterx/bclib/api/v2/ModIntegrationAPI.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/ModIntegrationAPI.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/ModIntegrationAPI.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/ModIntegrationAPI.java diff --git a/src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java diff --git a/src/main/java/org/betterx/bclib/api/v2/ShovelAPI.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/ShovelAPI.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/ShovelAPI.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/ShovelAPI.java diff --git a/src/main/java/org/betterx/bclib/api/v2/WorldDataAPI.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/WorldDataAPI.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/WorldDataAPI.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/WorldDataAPI.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/BaseDataHandler.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/BaseDataHandler.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/BaseDataHandler.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/BaseDataHandler.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/Connector.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/Connector.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/Connector.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/Connector.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorClientside.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorClientside.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorClientside.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorClientside.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorServerside.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorServerside.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorServerside.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorServerside.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataExchangeAPI.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataExchangeAPI.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/DataExchangeAPI.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataExchangeAPI.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandler.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandler.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandler.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandler.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandlerDescriptor.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandlerDescriptor.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandlerDescriptor.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandlerDescriptor.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/FileHash.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/FileHash.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/FileHash.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/FileHash.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/SyncFileHash.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/SyncFileHash.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/SyncFileHash.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/SyncFileHash.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/DataExchange.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/DataExchange.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/DataExchange.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/DataExchange.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoFileSyncEntry.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoFileSyncEntry.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoFileSyncEntry.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoFileSyncEntry.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSync.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSync.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSync.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSync.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSyncID.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSyncID.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSyncID.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSyncID.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/Chunker.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/Chunker.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/Chunker.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/Chunker.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/ChunkerProgress.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/ChunkerProgress.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/ChunkerProgress.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/ChunkerProgress.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/FileContentWrapper.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/FileContentWrapper.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/FileContentWrapper.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/FileContentWrapper.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloClient.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloClient.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloClient.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloClient.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloServer.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloServer.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloServer.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloServer.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/RequestFiles.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/RequestFiles.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/RequestFiles.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/RequestFiles.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SendFiles.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SendFiles.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SendFiles.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SendFiles.java diff --git a/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SyncFolderDescriptor.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SyncFolderDescriptor.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SyncFolderDescriptor.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SyncFolderDescriptor.java diff --git a/src/main/java/org/betterx/bclib/api/v2/datafixer/DataFixerAPI.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/DataFixerAPI.java similarity index 99% rename from src/main/java/org/betterx/bclib/api/v2/datafixer/DataFixerAPI.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/DataFixerAPI.java index 54277511..07a9cf20 100644 --- a/src/main/java/org/betterx/bclib/api/v2/datafixer/DataFixerAPI.java +++ b/core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/DataFixerAPI.java @@ -7,7 +7,7 @@ import org.betterx.bclib.client.gui.screens.LevelFixErrorScreen; import org.betterx.bclib.client.gui.screens.LevelFixErrorScreen.Listener; import org.betterx.bclib.client.gui.screens.ProgressScreen; import org.betterx.bclib.config.Configs; -import org.betterx.bclib.util.Logger; +import org.betterx.worlds.together.util.Logger; import org.betterx.worlds.together.world.WorldConfig; import net.minecraft.Util; diff --git a/src/main/java/org/betterx/bclib/api/v2/datafixer/ForcedLevelPatch.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/ForcedLevelPatch.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/datafixer/ForcedLevelPatch.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/ForcedLevelPatch.java diff --git a/src/main/java/org/betterx/bclib/api/v2/datafixer/MigrationProfile.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/MigrationProfile.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/datafixer/MigrationProfile.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/MigrationProfile.java diff --git a/src/main/java/org/betterx/bclib/api/v2/datafixer/Patch.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/Patch.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/datafixer/Patch.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/Patch.java diff --git a/src/main/java/org/betterx/bclib/api/v2/datafixer/PatchDidiFailException.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/PatchDidiFailException.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/datafixer/PatchDidiFailException.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/datafixer/PatchDidiFailException.java diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/BCLBiomeSource.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BCLBiomeSource.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/generator/BCLBiomeSource.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BCLBiomeSource.java diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/BCLChunkGenerator.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BCLChunkGenerator.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/generator/BCLChunkGenerator.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BCLChunkGenerator.java diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/BCLibEndBiomeSource.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BCLibEndBiomeSource.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/generator/BCLibEndBiomeSource.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BCLibEndBiomeSource.java diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/BCLibNetherBiomeSource.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BCLibNetherBiomeSource.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/generator/BCLibNetherBiomeSource.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BCLibNetherBiomeSource.java diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/BiomePicker.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BiomePicker.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/generator/BiomePicker.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BiomePicker.java diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/BiomeType.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BiomeType.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/generator/BiomeType.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/generator/BiomeType.java diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/GeneratorOptions.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/GeneratorOptions.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/generator/GeneratorOptions.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/generator/GeneratorOptions.java diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/TheEndBiomesHelper.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/TheEndBiomesHelper.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/generator/TheEndBiomesHelper.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/generator/TheEndBiomesHelper.java diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/config/BCLEndBiomeSourceConfig.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/config/BCLEndBiomeSourceConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/generator/config/BCLEndBiomeSourceConfig.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/generator/config/BCLEndBiomeSourceConfig.java diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/config/BCLNetherBiomeSourceConfig.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/config/BCLNetherBiomeSourceConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/generator/config/BCLNetherBiomeSourceConfig.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/generator/config/BCLNetherBiomeSourceConfig.java diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/map/MapStack.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/MapStack.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/generator/map/MapStack.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/MapStack.java diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeChunk.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeChunk.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeChunk.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeChunk.java diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeMap.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeMap.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeMap.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeMap.java diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeChunk.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeChunk.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeChunk.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeChunk.java diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeMap.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeMap.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeMap.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeMap.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenEvents.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenEvents.java similarity index 87% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenEvents.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenEvents.java index 9a2142ad..79393780 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenEvents.java +++ b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenEvents.java @@ -7,19 +7,25 @@ import org.betterx.bclib.api.v2.datafixer.DataFixerAPI; import org.betterx.bclib.api.v2.generator.BCLibEndBiomeSource; import org.betterx.bclib.api.v2.generator.config.BCLEndBiomeSourceConfig; import org.betterx.bclib.api.v2.levelgen.biomes.InternalBiomeAPI; +import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.registry.PresetsRegistry; +import org.betterx.worlds.together.tag.v3.TagManager; +import org.betterx.worlds.together.world.WorldConfig; import org.betterx.worlds.together.world.event.WorldEvents; import org.betterx.worlds.together.worldPreset.TogetherWorldPreset; import net.minecraft.core.Holder; import net.minecraft.core.RegistryAccess; import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagLoader; import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.dimension.LevelStem; import net.minecraft.world.level.levelgen.WorldGenSettings; import net.minecraft.world.level.levelgen.presets.WorldPreset; import net.minecraft.world.level.storage.LevelStorageSource; +import java.util.List; import java.util.Map; import java.util.Optional; import java.util.function.Consumer; @@ -40,6 +46,21 @@ public class LevelGenEvents { WorldEvents.PATCH_WORLD.on(LevelGenEvents::patchExistingWorld); WorldEvents.ADAPT_WORLD_PRESET.on(LevelGenEvents::adaptWorldPresetSettings); + + WorldEvents.BEFORE_ADDING_TAGS.on(LevelGenEvents::appplyTags); + } + + private static void appplyTags( + String directory, + Map> tagsMap + ) { + //make sure we include Tags registered by the deprecated API + TagAPI.apply(directory, tagsMap); + + + if (directory.equals(TagManager.BIOMES.directory)) { + InternalBiomeAPI._runBiomeTagAdders(); + } } @@ -103,6 +124,7 @@ public class LevelGenEvents { ) { setupWorld(); if (isNewWorld) { + WorldConfig.saveFile(BCLib.MOD_ID); DataFixerAPI.initializePatchData(); } else { LevelGenUtil.migrateGeneratorSettings(); @@ -117,6 +139,7 @@ public class LevelGenEvents { setupWorld(); if (isNewWorld) { + WorldConfig.saveFile(BCLib.MOD_ID); DataFixerAPI.initializePatchData(); } else { LevelGenUtil.migrateGeneratorSettings(); diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenUtil.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenUtil.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenUtil.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenUtil.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeBuilder.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeBuilder.java similarity index 99% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeBuilder.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeBuilder.java index ba395cfb..bd11dab7 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeBuilder.java +++ b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeBuilder.java @@ -844,7 +844,7 @@ public class BCLBiomeBuilder { final Biome biome = builder.build(); final T res = biomeConstructor.apply(biomeID, biome, settings); - tags.forEach(tagKey -> TagManager.BIOMES.add(tagKey, res)); + tags.forEach(tagKey -> TagManager.BIOMES.add(tagKey, res.getBiomeKey())); //res.addBiomeTags(tags); //res.setSurface(surfaceRule); diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeSettings.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeSettings.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeSettings.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeSettings.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java similarity index 99% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java index 342a7faa..a7169b94 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java +++ b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java @@ -195,11 +195,11 @@ public class BiomeAPI { BiomeType.BIOME_TYPE_MAP.put(bclbiome.getID(), dim); if (dim != null && dim.is(BiomeType.NETHER)) { - TagManager.BIOMES.add(BiomeTags.IS_NETHER, bclbiome); - TagManager.BIOMES.add(CommonBiomeTags.IN_NETHER, bclbiome); + TagManager.BIOMES.add(BiomeTags.IS_NETHER, bclbiome.getBiomeKey()); + TagManager.BIOMES.add(CommonBiomeTags.IN_NETHER, bclbiome.getBiomeKey()); } else if (dim != null && dim.is(BiomeType.END)) { - TagManager.BIOMES.add(BiomeTags.IS_END, bclbiome); - TagManager.BIOMES.add(CommonBiomeTags.IN_END, bclbiome); + TagManager.BIOMES.add(BiomeTags.IS_END, bclbiome.getBiomeKey()); + TagManager.BIOMES.add(CommonBiomeTags.IN_END, bclbiome.getBiomeKey()); } bclbiome.afterRegistration(); diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/VanillaBiomeSettings.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/VanillaBiomeSettings.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/VanillaBiomeSettings.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/VanillaBiomeSettings.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLCommonFeatures.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLCommonFeatures.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLCommonFeatures.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLCommonFeatures.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeatureBuilder.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeatureBuilder.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeatureBuilder.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeatureBuilder.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/FastFeatures.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/FastFeatures.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/FastFeatures.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/FastFeatures.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/UserGrowableFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/UserGrowableFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/UserGrowableFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/UserGrowableFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/blockpredicates/Types.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/blockpredicates/Types.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/blockpredicates/Types.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/blockpredicates/Types.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ConditionFeatureConfig.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ConditionFeatureConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ConditionFeatureConfig.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ConditionFeatureConfig.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceBlockFeatureConfig.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceBlockFeatureConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceBlockFeatureConfig.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceBlockFeatureConfig.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceFacingBlockConfig.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceFacingBlockConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceFacingBlockConfig.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceFacingBlockConfig.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ScatterFeatureConfig.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ScatterFeatureConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ScatterFeatureConfig.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ScatterFeatureConfig.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/SequenceFeatureConfig.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/SequenceFeatureConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/SequenceFeatureConfig.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/SequenceFeatureConfig.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/TemplateFeatureConfig.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/TemplateFeatureConfig.java similarity index 96% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/TemplateFeatureConfig.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/TemplateFeatureConfig.java index 2a434388..e414a37c 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/TemplateFeatureConfig.java +++ b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/TemplateFeatureConfig.java @@ -10,6 +10,7 @@ import java.util.List; /** * @deprecated Please use {@link org.betterx.bclib.api.v3.levelgen.features.config.TemplateFeatureConfig} instead */ +@Deprecated(forRemoval = true) public class TemplateFeatureConfig extends org.betterx.bclib.api.v3.levelgen.features.config.TemplateFeatureConfig { public TemplateFeatureConfig(ResourceLocation location, int offsetY, StructurePlacementType type) { diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ConditionFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ConditionFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ConditionFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ConditionFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/DefaultFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/DefaultFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/DefaultFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/DefaultFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/MarkPostProcessingFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/MarkPostProcessingFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/MarkPostProcessingFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/MarkPostProcessingFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/PlaceBlockFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/PlaceBlockFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/PlaceBlockFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/PlaceBlockFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ScatterFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ScatterFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ScatterFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ScatterFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SequenceFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SequenceFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SequenceFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SequenceFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SurfaceFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SurfaceFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SurfaceFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SurfaceFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/TemplateFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/TemplateFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/TemplateFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/TemplateFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/WeightedRandomSelectorFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/WeightedRandomSelectorFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/WeightedRandomSelectorFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/WeightedRandomSelectorFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/All.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/All.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/All.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/All.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Debug.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Debug.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Debug.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Debug.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Extend.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Extend.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Extend.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Extend.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/FindSolidInDirection.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/FindSolidInDirection.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/FindSolidInDirection.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/FindSolidInDirection.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/ForAll.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/ForAll.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/ForAll.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/ForAll.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Is.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Is.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Is.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Is.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsBasin.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsBasin.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsBasin.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsBasin.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsEmptyAboveSampledFilter.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsEmptyAboveSampledFilter.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsEmptyAboveSampledFilter.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsEmptyAboveSampledFilter.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/MinEmptyFilter.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/MinEmptyFilter.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/MinEmptyFilter.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/MinEmptyFilter.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Offset.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Offset.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Offset.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Offset.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/OnEveryLayer.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/OnEveryLayer.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/OnEveryLayer.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/OnEveryLayer.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/PlacementModifiers.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/PlacementModifiers.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/PlacementModifiers.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/PlacementModifiers.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Stencil.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Stencil.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Stencil.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Stencil.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/UnderEveryLayer.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/UnderEveryLayer.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/UnderEveryLayer.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/UnderEveryLayer.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructure.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructure.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructure.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructure.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructureBuilder.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructureBuilder.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructureBuilder.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructureBuilder.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureNBT.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureNBT.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureNBT.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureNBT.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructurePlacementType.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructurePlacementType.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructurePlacementType.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructurePlacementType.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorld.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorld.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorld.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorld.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorldNBT.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorldNBT.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorldNBT.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorldNBT.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplatePiece.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplatePiece.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplatePiece.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplatePiece.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplateStructure.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplateStructure.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplateStructure.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplateStructure.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/DestructionStructureProcessor.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/DestructionStructureProcessor.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/DestructionStructureProcessor.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/DestructionStructureProcessor.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/TerrainStructureProcessor.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/TerrainStructureProcessor.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/TerrainStructureProcessor.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/TerrainStructureProcessor.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleBuilder.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleBuilder.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleBuilder.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleBuilder.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleEntry.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleEntry.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleEntry.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleEntry.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/Conditions.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/Conditions.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/Conditions.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/Conditions.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/DoubleBlockSurfaceNoiseCondition.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/DoubleBlockSurfaceNoiseCondition.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/DoubleBlockSurfaceNoiseCondition.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/DoubleBlockSurfaceNoiseCondition.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NetherNoiseCondition.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NetherNoiseCondition.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NetherNoiseCondition.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NetherNoiseCondition.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NoiseCondition.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NoiseCondition.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NoiseCondition.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NoiseCondition.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RandomIntProvider.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RandomIntProvider.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RandomIntProvider.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RandomIntProvider.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RoughNoiseCondition.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RoughNoiseCondition.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RoughNoiseCondition.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RoughNoiseCondition.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SurfaceNoiseCondition.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SurfaceNoiseCondition.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SurfaceNoiseCondition.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SurfaceNoiseCondition.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SwitchRuleSource.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SwitchRuleSource.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SwitchRuleSource.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SwitchRuleSource.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/ThresholdCondition.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/ThresholdCondition.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/ThresholdCondition.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/ThresholdCondition.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeNoiseCondition.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeNoiseCondition.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeNoiseCondition.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeNoiseCondition.java diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeThresholdCondition.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeThresholdCondition.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeThresholdCondition.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeThresholdCondition.java diff --git a/src/main/java/org/betterx/bclib/api/v2/poi/BCLPoiType.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/poi/BCLPoiType.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/poi/BCLPoiType.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/poi/BCLPoiType.java diff --git a/src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleBuilder.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleBuilder.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleBuilder.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleBuilder.java diff --git a/src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleEntry.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleEntry.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleEntry.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleEntry.java diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/CommonBiomeTags.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/CommonBiomeTags.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/tag/CommonBiomeTags.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/tag/CommonBiomeTags.java diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/CommonItemTags.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/CommonItemTags.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/tag/CommonItemTags.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/tag/CommonItemTags.java diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/NamedBlockTags.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/NamedBlockTags.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/tag/NamedBlockTags.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/tag/NamedBlockTags.java diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/NamedItemTags.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/NamedItemTags.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/tag/NamedItemTags.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/tag/NamedItemTags.java diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/NamedMineableTags.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/NamedMineableTags.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/tag/NamedMineableTags.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/tag/NamedMineableTags.java diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/NamedToolTags.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/NamedToolTags.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/tag/NamedToolTags.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/tag/NamedToolTags.java diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/TagAPI.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/TagAPI.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/tag/TagAPI.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/tag/TagAPI.java diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/TagType.java b/core-v1/src/main/java/org/betterx/bclib/api/v2/tag/TagType.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v2/tag/TagType.java rename to core-v1/src/main/java/org/betterx/bclib/api/v2/tag/TagType.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLConfigureFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLConfigureFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLConfigureFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLConfigureFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeatureBuilder.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeatureBuilder.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeatureBuilder.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLFeatureBuilder.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLInlinePlacedBuilder.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLInlinePlacedBuilder.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLInlinePlacedBuilder.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLInlinePlacedBuilder.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLPlacedFeatureBuilder.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLPlacedFeatureBuilder.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLPlacedFeatureBuilder.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/BCLPlacedFeatureBuilder.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/CommonPlacedFeatureBuilder.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/CommonPlacedFeatureBuilder.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/CommonPlacedFeatureBuilder.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/CommonPlacedFeatureBuilder.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/UserGrowableFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/UserGrowableFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/UserGrowableFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/UserGrowableFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/BlockPredicates.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/BlockPredicates.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/BlockPredicates.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/BlockPredicates.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/IsFullShape.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/IsFullShape.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/IsFullShape.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/blockpredicates/IsFullShape.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/ConditionFeatureConfig.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/ConditionFeatureConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/ConditionFeatureConfig.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/ConditionFeatureConfig.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PillarFeatureConfig.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PillarFeatureConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PillarFeatureConfig.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PillarFeatureConfig.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PlaceBlockFeatureConfig.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PlaceBlockFeatureConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PlaceBlockFeatureConfig.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PlaceBlockFeatureConfig.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PlaceFacingBlockConfig.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PlaceFacingBlockConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PlaceFacingBlockConfig.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/PlaceFacingBlockConfig.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/SequenceFeatureConfig.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/SequenceFeatureConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/SequenceFeatureConfig.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/SequenceFeatureConfig.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/TemplateFeatureConfig.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/TemplateFeatureConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/TemplateFeatureConfig.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/config/TemplateFeatureConfig.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/ConditionFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/ConditionFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/ConditionFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/ConditionFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/MarkPostProcessingFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/MarkPostProcessingFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/MarkPostProcessingFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/MarkPostProcessingFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/PillarFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/PillarFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/PillarFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/PillarFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/PlaceBlockFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/PlaceBlockFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/PlaceBlockFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/PlaceBlockFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/SequenceFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/SequenceFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/SequenceFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/SequenceFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/TemplateFeature.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/TemplateFeature.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/TemplateFeature.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/features/TemplateFeature.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/All.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/All.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/All.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/All.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Debug.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Debug.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Debug.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Debug.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Extend.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Extend.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Extend.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Extend.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/FindSolidInDirection.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/FindSolidInDirection.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/FindSolidInDirection.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/FindSolidInDirection.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/ForAll.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/ForAll.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/ForAll.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/ForAll.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Is.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Is.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Is.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Is.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/IsBasin.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/IsBasin.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/IsBasin.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/IsBasin.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/IsNextTo.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/IsNextTo.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/IsNextTo.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/IsNextTo.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/NoiseFilter.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/NoiseFilter.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/NoiseFilter.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/NoiseFilter.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Offset.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Offset.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Offset.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Offset.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/OnEveryLayer.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/OnEveryLayer.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/OnEveryLayer.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/OnEveryLayer.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/PlacementModifiers.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/PlacementModifiers.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/PlacementModifiers.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/PlacementModifiers.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Stencil.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Stencil.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Stencil.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/Stencil.java diff --git a/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/UnderEveryLayer.java b/core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/UnderEveryLayer.java similarity index 100% rename from src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/UnderEveryLayer.java rename to core-v1/src/main/java/org/betterx/bclib/api/v3/levelgen/features/placement/UnderEveryLayer.java diff --git a/src/main/java/org/betterx/bclib/blockentities/BaseBarrelBlockEntity.java b/core-v1/src/main/java/org/betterx/bclib/blockentities/BaseBarrelBlockEntity.java similarity index 100% rename from src/main/java/org/betterx/bclib/blockentities/BaseBarrelBlockEntity.java rename to core-v1/src/main/java/org/betterx/bclib/blockentities/BaseBarrelBlockEntity.java diff --git a/src/main/java/org/betterx/bclib/blockentities/BaseChestBlockEntity.java b/core-v1/src/main/java/org/betterx/bclib/blockentities/BaseChestBlockEntity.java similarity index 100% rename from src/main/java/org/betterx/bclib/blockentities/BaseChestBlockEntity.java rename to core-v1/src/main/java/org/betterx/bclib/blockentities/BaseChestBlockEntity.java diff --git a/src/main/java/org/betterx/bclib/blockentities/BaseFurnaceBlockEntity.java b/core-v1/src/main/java/org/betterx/bclib/blockentities/BaseFurnaceBlockEntity.java similarity index 100% rename from src/main/java/org/betterx/bclib/blockentities/BaseFurnaceBlockEntity.java rename to core-v1/src/main/java/org/betterx/bclib/blockentities/BaseFurnaceBlockEntity.java diff --git a/src/main/java/org/betterx/bclib/blockentities/BaseSignBlockEntity.java b/core-v1/src/main/java/org/betterx/bclib/blockentities/BaseSignBlockEntity.java similarity index 100% rename from src/main/java/org/betterx/bclib/blockentities/BaseSignBlockEntity.java rename to core-v1/src/main/java/org/betterx/bclib/blockentities/BaseSignBlockEntity.java diff --git a/src/main/java/org/betterx/bclib/blockentities/DynamicBlockEntityType.java b/core-v1/src/main/java/org/betterx/bclib/blockentities/DynamicBlockEntityType.java similarity index 100% rename from src/main/java/org/betterx/bclib/blockentities/DynamicBlockEntityType.java rename to core-v1/src/main/java/org/betterx/bclib/blockentities/DynamicBlockEntityType.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseAnvilBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseAttachedBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseAttachedBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseAttachedBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseAttachedBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBarkBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseBarkBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseBarkBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseBarkBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseBarrelBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBlockNotFull.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseBlockNotFull.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseBlockNotFull.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseBlockNotFull.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBlockWithEntity.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseBlockWithEntity.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseBlockWithEntity.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseBlockWithEntity.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseBookshelfBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseButtonBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseChainBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseChestBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseComposterBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseCraftingTableBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseCropBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseCropBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseCropBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseCropBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseDoublePlantBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseFenceBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseFurnaceBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseGateBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseGlassBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseLadderBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseMetalBarsBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseOreBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BasePathBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BasePathBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BasePlantBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BasePlantWithAgeBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BasePlantWithAgeBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BasePlantWithAgeBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BasePlantWithAgeBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BasePressurePlateBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseRotatedPillarBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseSignBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseSlabBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseStairsBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseStoneButtonBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseStoneButtonBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseStoneButtonBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseStoneButtonBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseTrapdoorBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseUnderwaterWallPlantBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseUnderwaterWallPlantBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseUnderwaterWallPlantBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseUnderwaterWallPlantBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseVineBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseWallBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseWallPlantBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseWallPlantBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseWallPlantBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseWallPlantBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseWeightedPlateBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BaseWoodenButtonBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BaseWoodenButtonBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BaseWoodenButtonBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BaseWoodenButtonBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/BlockProperties.java b/core-v1/src/main/java/org/betterx/bclib/blocks/BlockProperties.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/BlockProperties.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/BlockProperties.java diff --git a/src/main/java/org/betterx/bclib/blocks/FeatureHangingSaplingBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/FeatureHangingSaplingBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/FeatureHangingSaplingBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/FeatureHangingSaplingBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/FeatureSaplingBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/LeveledAnvilBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/LeveledAnvilBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/LeveledAnvilBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/LeveledAnvilBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/StalactiteBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/StonePressurePlateBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/StonePressurePlateBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/StonePressurePlateBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/StonePressurePlateBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/TripleTerrainBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/TripleTerrainBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/TripleTerrainBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/TripleTerrainBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantWithAgeBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantWithAgeBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/UnderwaterPlantWithAgeBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/UnderwaterPlantWithAgeBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/UpDownPlantBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/WallMushroomBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/WallMushroomBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/WallMushroomBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/WallMushroomBlock.java diff --git a/src/main/java/org/betterx/bclib/blocks/WoodenPressurePlateBlock.java b/core-v1/src/main/java/org/betterx/bclib/blocks/WoodenPressurePlateBlock.java similarity index 100% rename from src/main/java/org/betterx/bclib/blocks/WoodenPressurePlateBlock.java rename to core-v1/src/main/java/org/betterx/bclib/blocks/WoodenPressurePlateBlock.java diff --git a/src/main/java/org/betterx/bclib/client/BCLibClient.java b/core-v1/src/main/java/org/betterx/bclib/client/BCLibClient.java similarity index 94% rename from src/main/java/org/betterx/bclib/client/BCLibClient.java rename to core-v1/src/main/java/org/betterx/bclib/client/BCLibClient.java index 02417552..6a6d632b 100644 --- a/src/main/java/org/betterx/bclib/client/BCLibClient.java +++ b/core-v1/src/main/java/org/betterx/bclib/client/BCLibClient.java @@ -6,8 +6,8 @@ import org.betterx.bclib.api.v2.dataexchange.DataExchangeAPI; import org.betterx.bclib.client.models.CustomModelBakery; import org.betterx.bclib.config.Configs; import org.betterx.bclib.registry.BaseBlockEntityRenders; +import org.betterx.bclib.registry.PresetsRegistryClient; import org.betterx.worlds.together.WorldsTogether; -import org.betterx.worlds.together.client.WorldsTogetherClient; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.client.resources.model.UnbakedModel; @@ -31,7 +31,7 @@ public class BCLibClient implements ClientModInitializer, ModelResourceProvider, ModelLoadingRegistry.INSTANCE.registerResourceProvider(rm -> this); ModelLoadingRegistry.INSTANCE.registerVariantProvider(rm -> this); - WorldsTogetherClient.onInitializeClient(); + PresetsRegistryClient.onLoad(); WorldsTogether.SURPRESS_EXPERIMENTAL_DIALOG = Configs.CLIENT_CONFIG.suppressExperimentalDialog(); //dumpDatapack(); } diff --git a/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCell.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCell.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCell.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCell.java diff --git a/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCheckboxCell.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCheckboxCell.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCheckboxCell.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCheckboxCell.java diff --git a/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridColumn.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridColumn.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/gridlayout/GridColumn.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridColumn.java diff --git a/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCustomRenderCell.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCustomRenderCell.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCustomRenderCell.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCustomRenderCell.java diff --git a/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridImageCell.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridImageCell.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/gridlayout/GridImageCell.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridImageCell.java diff --git a/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridLayout.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridLayout.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/gridlayout/GridLayout.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridLayout.java diff --git a/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridMessageCell.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridMessageCell.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/gridlayout/GridMessageCell.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridMessageCell.java diff --git a/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridRow.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridRow.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/gridlayout/GridRow.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridRow.java diff --git a/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridScreen.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridScreen.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/gridlayout/GridScreen.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridScreen.java diff --git a/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridStringCell.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridStringCell.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/gridlayout/GridStringCell.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridStringCell.java diff --git a/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridTransform.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridTransform.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/gridlayout/GridTransform.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridTransform.java diff --git a/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridWidgetWithEnabledState.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridWidgetWithEnabledState.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/gridlayout/GridWidgetWithEnabledState.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridWidgetWithEnabledState.java diff --git a/src/main/java/org/betterx/bclib/client/gui/modmenu/EntryPoint.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/modmenu/EntryPoint.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/modmenu/EntryPoint.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/modmenu/EntryPoint.java diff --git a/src/main/java/org/betterx/bclib/client/gui/modmenu/MainScreen.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/modmenu/MainScreen.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/modmenu/MainScreen.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/modmenu/MainScreen.java diff --git a/src/main/java/org/betterx/bclib/client/gui/screens/AtomicProgressListener.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/AtomicProgressListener.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/screens/AtomicProgressListener.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/screens/AtomicProgressListener.java diff --git a/src/main/java/org/betterx/bclib/client/gui/screens/BCLibScreen.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/BCLibScreen.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/screens/BCLibScreen.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/screens/BCLibScreen.java diff --git a/src/main/java/org/betterx/bclib/client/gui/screens/ConfirmFixScreen.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/ConfirmFixScreen.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/screens/ConfirmFixScreen.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/screens/ConfirmFixScreen.java diff --git a/src/main/java/org/betterx/bclib/client/gui/screens/ConfirmRestartScreen.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/ConfirmRestartScreen.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/screens/ConfirmRestartScreen.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/screens/ConfirmRestartScreen.java diff --git a/src/main/java/org/betterx/bclib/client/gui/screens/LevelFixErrorScreen.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/LevelFixErrorScreen.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/screens/LevelFixErrorScreen.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/screens/LevelFixErrorScreen.java diff --git a/src/main/java/org/betterx/bclib/client/gui/screens/ModListScreen.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/ModListScreen.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/screens/ModListScreen.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/screens/ModListScreen.java diff --git a/src/main/java/org/betterx/bclib/client/gui/screens/ProgressScreen.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/ProgressScreen.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/screens/ProgressScreen.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/screens/ProgressScreen.java diff --git a/src/main/java/org/betterx/bclib/client/gui/screens/SyncFilesScreen.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/SyncFilesScreen.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/screens/SyncFilesScreen.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/screens/SyncFilesScreen.java diff --git a/src/main/java/org/betterx/bclib/client/gui/screens/WarnBCLibVersionMismatch.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/WarnBCLibVersionMismatch.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/screens/WarnBCLibVersionMismatch.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/screens/WarnBCLibVersionMismatch.java diff --git a/src/main/java/org/betterx/bclib/client/gui/screens/WorldSetupScreen.java b/core-v1/src/main/java/org/betterx/bclib/client/gui/screens/WorldSetupScreen.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/gui/screens/WorldSetupScreen.java rename to core-v1/src/main/java/org/betterx/bclib/client/gui/screens/WorldSetupScreen.java diff --git a/src/main/java/org/betterx/bclib/client/models/BaseChestBlockModel.java b/core-v1/src/main/java/org/betterx/bclib/client/models/BaseChestBlockModel.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/models/BaseChestBlockModel.java rename to core-v1/src/main/java/org/betterx/bclib/client/models/BaseChestBlockModel.java diff --git a/src/main/java/org/betterx/bclib/client/models/BasePatterns.java b/core-v1/src/main/java/org/betterx/bclib/client/models/BasePatterns.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/models/BasePatterns.java rename to core-v1/src/main/java/org/betterx/bclib/client/models/BasePatterns.java diff --git a/src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java b/core-v1/src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java rename to core-v1/src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java diff --git a/src/main/java/org/betterx/bclib/client/models/CustomModelData.java b/core-v1/src/main/java/org/betterx/bclib/client/models/CustomModelData.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/models/CustomModelData.java rename to core-v1/src/main/java/org/betterx/bclib/client/models/CustomModelData.java diff --git a/src/main/java/org/betterx/bclib/client/models/ModelsHelper.java b/core-v1/src/main/java/org/betterx/bclib/client/models/ModelsHelper.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/models/ModelsHelper.java rename to core-v1/src/main/java/org/betterx/bclib/client/models/ModelsHelper.java diff --git a/src/main/java/org/betterx/bclib/client/models/OBJBlockModel.java b/core-v1/src/main/java/org/betterx/bclib/client/models/OBJBlockModel.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/models/OBJBlockModel.java rename to core-v1/src/main/java/org/betterx/bclib/client/models/OBJBlockModel.java diff --git a/src/main/java/org/betterx/bclib/client/models/OBJModelBuilder.java b/core-v1/src/main/java/org/betterx/bclib/client/models/OBJModelBuilder.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/models/OBJModelBuilder.java rename to core-v1/src/main/java/org/betterx/bclib/client/models/OBJModelBuilder.java diff --git a/src/main/java/org/betterx/bclib/client/models/PatternsHelper.java b/core-v1/src/main/java/org/betterx/bclib/client/models/PatternsHelper.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/models/PatternsHelper.java rename to core-v1/src/main/java/org/betterx/bclib/client/models/PatternsHelper.java diff --git a/src/main/java/org/betterx/bclib/client/models/UnbakedQuad.java b/core-v1/src/main/java/org/betterx/bclib/client/models/UnbakedQuad.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/models/UnbakedQuad.java rename to core-v1/src/main/java/org/betterx/bclib/client/models/UnbakedQuad.java diff --git a/src/main/java/org/betterx/bclib/client/render/BCLRenderLayer.java b/core-v1/src/main/java/org/betterx/bclib/client/render/BCLRenderLayer.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/render/BCLRenderLayer.java rename to core-v1/src/main/java/org/betterx/bclib/client/render/BCLRenderLayer.java diff --git a/src/main/java/org/betterx/bclib/client/render/BaseChestBlockEntityRenderer.java b/core-v1/src/main/java/org/betterx/bclib/client/render/BaseChestBlockEntityRenderer.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/render/BaseChestBlockEntityRenderer.java rename to core-v1/src/main/java/org/betterx/bclib/client/render/BaseChestBlockEntityRenderer.java diff --git a/src/main/java/org/betterx/bclib/client/render/BaseSignBlockEntityRenderer.java b/core-v1/src/main/java/org/betterx/bclib/client/render/BaseSignBlockEntityRenderer.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/render/BaseSignBlockEntityRenderer.java rename to core-v1/src/main/java/org/betterx/bclib/client/render/BaseSignBlockEntityRenderer.java diff --git a/src/main/java/org/betterx/bclib/client/render/CustomFogRenderer.java b/core-v1/src/main/java/org/betterx/bclib/client/render/CustomFogRenderer.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/render/CustomFogRenderer.java rename to core-v1/src/main/java/org/betterx/bclib/client/render/CustomFogRenderer.java diff --git a/src/main/java/org/betterx/bclib/client/render/EmissiveTextureInfo.java b/core-v1/src/main/java/org/betterx/bclib/client/render/EmissiveTextureInfo.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/render/EmissiveTextureInfo.java rename to core-v1/src/main/java/org/betterx/bclib/client/render/EmissiveTextureInfo.java diff --git a/src/main/java/org/betterx/bclib/client/sound/BlockSounds.java b/core-v1/src/main/java/org/betterx/bclib/client/sound/BlockSounds.java similarity index 100% rename from src/main/java/org/betterx/bclib/client/sound/BlockSounds.java rename to core-v1/src/main/java/org/betterx/bclib/client/sound/BlockSounds.java diff --git a/src/main/java/org/betterx/bclib/commands/CommandRegistry.java b/core-v1/src/main/java/org/betterx/bclib/commands/CommandRegistry.java similarity index 100% rename from src/main/java/org/betterx/bclib/commands/CommandRegistry.java rename to core-v1/src/main/java/org/betterx/bclib/commands/CommandRegistry.java diff --git a/src/main/java/org/betterx/bclib/commands/DumpDatapack.java b/core-v1/src/main/java/org/betterx/bclib/commands/DumpDatapack.java similarity index 100% rename from src/main/java/org/betterx/bclib/commands/DumpDatapack.java rename to core-v1/src/main/java/org/betterx/bclib/commands/DumpDatapack.java diff --git a/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java b/core-v1/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java similarity index 100% rename from src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java rename to core-v1/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java diff --git a/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java b/core-v1/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java similarity index 100% rename from src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java rename to core-v1/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java diff --git a/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java b/core-v1/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java similarity index 100% rename from src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java rename to core-v1/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java diff --git a/src/main/java/org/betterx/bclib/complexmaterials/entry/ComplexMaterialEntry.java b/core-v1/src/main/java/org/betterx/bclib/complexmaterials/entry/ComplexMaterialEntry.java similarity index 100% rename from src/main/java/org/betterx/bclib/complexmaterials/entry/ComplexMaterialEntry.java rename to core-v1/src/main/java/org/betterx/bclib/complexmaterials/entry/ComplexMaterialEntry.java diff --git a/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java b/core-v1/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java similarity index 100% rename from src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java rename to core-v1/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java diff --git a/src/main/java/org/betterx/bclib/complexmaterials/entry/RecipeEntry.java b/core-v1/src/main/java/org/betterx/bclib/complexmaterials/entry/RecipeEntry.java similarity index 100% rename from src/main/java/org/betterx/bclib/complexmaterials/entry/RecipeEntry.java rename to core-v1/src/main/java/org/betterx/bclib/complexmaterials/entry/RecipeEntry.java diff --git a/src/main/java/org/betterx/bclib/config/BiomesConfig.java b/core-v1/src/main/java/org/betterx/bclib/config/BiomesConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/config/BiomesConfig.java rename to core-v1/src/main/java/org/betterx/bclib/config/BiomesConfig.java diff --git a/src/main/java/org/betterx/bclib/config/CategoryConfig.java b/core-v1/src/main/java/org/betterx/bclib/config/CategoryConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/config/CategoryConfig.java rename to core-v1/src/main/java/org/betterx/bclib/config/CategoryConfig.java diff --git a/src/main/java/org/betterx/bclib/config/ClientConfig.java b/core-v1/src/main/java/org/betterx/bclib/config/ClientConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/config/ClientConfig.java rename to core-v1/src/main/java/org/betterx/bclib/config/ClientConfig.java diff --git a/src/main/java/org/betterx/bclib/config/Config.java b/core-v1/src/main/java/org/betterx/bclib/config/Config.java similarity index 100% rename from src/main/java/org/betterx/bclib/config/Config.java rename to core-v1/src/main/java/org/betterx/bclib/config/Config.java diff --git a/src/main/java/org/betterx/bclib/config/ConfigKeeper.java b/core-v1/src/main/java/org/betterx/bclib/config/ConfigKeeper.java similarity index 100% rename from src/main/java/org/betterx/bclib/config/ConfigKeeper.java rename to core-v1/src/main/java/org/betterx/bclib/config/ConfigKeeper.java diff --git a/src/main/java/org/betterx/bclib/config/ConfigKey.java b/core-v1/src/main/java/org/betterx/bclib/config/ConfigKey.java similarity index 100% rename from src/main/java/org/betterx/bclib/config/ConfigKey.java rename to core-v1/src/main/java/org/betterx/bclib/config/ConfigKey.java diff --git a/src/main/java/org/betterx/bclib/config/ConfigUI.java b/core-v1/src/main/java/org/betterx/bclib/config/ConfigUI.java similarity index 100% rename from src/main/java/org/betterx/bclib/config/ConfigUI.java rename to core-v1/src/main/java/org/betterx/bclib/config/ConfigUI.java diff --git a/src/main/java/org/betterx/bclib/config/ConfigWriter.java b/core-v1/src/main/java/org/betterx/bclib/config/ConfigWriter.java similarity index 100% rename from src/main/java/org/betterx/bclib/config/ConfigWriter.java rename to core-v1/src/main/java/org/betterx/bclib/config/ConfigWriter.java diff --git a/src/main/java/org/betterx/bclib/config/Configs.java b/core-v1/src/main/java/org/betterx/bclib/config/Configs.java similarity index 100% rename from src/main/java/org/betterx/bclib/config/Configs.java rename to core-v1/src/main/java/org/betterx/bclib/config/Configs.java diff --git a/src/main/java/org/betterx/bclib/config/EntryConfig.java b/core-v1/src/main/java/org/betterx/bclib/config/EntryConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/config/EntryConfig.java rename to core-v1/src/main/java/org/betterx/bclib/config/EntryConfig.java diff --git a/src/main/java/org/betterx/bclib/config/GeneratorConfig.java b/core-v1/src/main/java/org/betterx/bclib/config/GeneratorConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/config/GeneratorConfig.java rename to core-v1/src/main/java/org/betterx/bclib/config/GeneratorConfig.java diff --git a/src/main/java/org/betterx/bclib/config/IdConfig.java b/core-v1/src/main/java/org/betterx/bclib/config/IdConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/config/IdConfig.java rename to core-v1/src/main/java/org/betterx/bclib/config/IdConfig.java diff --git a/src/main/java/org/betterx/bclib/config/MainConfig.java b/core-v1/src/main/java/org/betterx/bclib/config/MainConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/config/MainConfig.java rename to core-v1/src/main/java/org/betterx/bclib/config/MainConfig.java diff --git a/src/main/java/org/betterx/bclib/config/NamedPathConfig.java b/core-v1/src/main/java/org/betterx/bclib/config/NamedPathConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/config/NamedPathConfig.java rename to core-v1/src/main/java/org/betterx/bclib/config/NamedPathConfig.java diff --git a/src/main/java/org/betterx/bclib/config/PathConfig.java b/core-v1/src/main/java/org/betterx/bclib/config/PathConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/config/PathConfig.java rename to core-v1/src/main/java/org/betterx/bclib/config/PathConfig.java diff --git a/src/main/java/org/betterx/bclib/config/ServerConfig.java b/core-v1/src/main/java/org/betterx/bclib/config/ServerConfig.java similarity index 100% rename from src/main/java/org/betterx/bclib/config/ServerConfig.java rename to core-v1/src/main/java/org/betterx/bclib/config/ServerConfig.java diff --git a/src/main/java/org/betterx/bclib/entity/BCLEntityWrapper.java b/core-v1/src/main/java/org/betterx/bclib/entity/BCLEntityWrapper.java similarity index 100% rename from src/main/java/org/betterx/bclib/entity/BCLEntityWrapper.java rename to core-v1/src/main/java/org/betterx/bclib/entity/BCLEntityWrapper.java diff --git a/src/main/java/org/betterx/bclib/entity/DespawnableAnimal.java b/core-v1/src/main/java/org/betterx/bclib/entity/DespawnableAnimal.java similarity index 100% rename from src/main/java/org/betterx/bclib/entity/DespawnableAnimal.java rename to core-v1/src/main/java/org/betterx/bclib/entity/DespawnableAnimal.java diff --git a/src/main/java/org/betterx/bclib/integration/ModIntegration.java b/core-v1/src/main/java/org/betterx/bclib/integration/ModIntegration.java similarity index 100% rename from src/main/java/org/betterx/bclib/integration/ModIntegration.java rename to core-v1/src/main/java/org/betterx/bclib/integration/ModIntegration.java diff --git a/src/main/java/org/betterx/bclib/integration/modmenu/ModMenu.java b/core-v1/src/main/java/org/betterx/bclib/integration/modmenu/ModMenu.java similarity index 100% rename from src/main/java/org/betterx/bclib/integration/modmenu/ModMenu.java rename to core-v1/src/main/java/org/betterx/bclib/integration/modmenu/ModMenu.java diff --git a/src/main/java/org/betterx/bclib/integration/modmenu/ModMenuEntryPoint.java b/core-v1/src/main/java/org/betterx/bclib/integration/modmenu/ModMenuEntryPoint.java similarity index 100% rename from src/main/java/org/betterx/bclib/integration/modmenu/ModMenuEntryPoint.java rename to core-v1/src/main/java/org/betterx/bclib/integration/modmenu/ModMenuEntryPoint.java diff --git a/src/main/java/org/betterx/bclib/integration/modmenu/ModMenuIntegration.java b/core-v1/src/main/java/org/betterx/bclib/integration/modmenu/ModMenuIntegration.java similarity index 100% rename from src/main/java/org/betterx/bclib/integration/modmenu/ModMenuIntegration.java rename to core-v1/src/main/java/org/betterx/bclib/integration/modmenu/ModMenuIntegration.java diff --git a/src/main/java/org/betterx/bclib/interfaces/AnvilScreenHandlerExtended.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/AnvilScreenHandlerExtended.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/AnvilScreenHandlerExtended.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/AnvilScreenHandlerExtended.java diff --git a/src/main/java/org/betterx/bclib/interfaces/BCLPlacementContext.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/BCLPlacementContext.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/BCLPlacementContext.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/BCLPlacementContext.java diff --git a/src/main/java/org/betterx/bclib/interfaces/BiomeChunk.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/BiomeChunk.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/BiomeChunk.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/BiomeChunk.java diff --git a/src/main/java/org/betterx/bclib/interfaces/BiomeMap.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/BiomeMap.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/BiomeMap.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/BiomeMap.java diff --git a/src/main/java/org/betterx/bclib/interfaces/BiomeSetter.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/BiomeSetter.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/BiomeSetter.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/BiomeSetter.java diff --git a/src/main/java/org/betterx/bclib/interfaces/BiomeSourceAccessor.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/BiomeSourceAccessor.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/BiomeSourceAccessor.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/BiomeSourceAccessor.java diff --git a/src/main/java/org/betterx/bclib/interfaces/BlockModelProvider.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/BlockModelProvider.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/BlockModelProvider.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/BlockModelProvider.java diff --git a/src/main/java/org/betterx/bclib/interfaces/ChunkGeneratorAccessor.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/ChunkGeneratorAccessor.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/ChunkGeneratorAccessor.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/ChunkGeneratorAccessor.java diff --git a/src/main/java/org/betterx/bclib/interfaces/CustomColorProvider.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/CustomColorProvider.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/CustomColorProvider.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/CustomColorProvider.java diff --git a/src/main/java/org/betterx/bclib/interfaces/CustomItemProvider.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/CustomItemProvider.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/CustomItemProvider.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/CustomItemProvider.java diff --git a/src/main/java/org/betterx/bclib/interfaces/ItemModelProvider.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/ItemModelProvider.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/ItemModelProvider.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/ItemModelProvider.java diff --git a/src/main/java/org/betterx/bclib/interfaces/LootPoolAccessor.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/LootPoolAccessor.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/LootPoolAccessor.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/LootPoolAccessor.java diff --git a/src/main/java/org/betterx/bclib/interfaces/NoiseGeneratorSettingsProvider.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/NoiseGeneratorSettingsProvider.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/NoiseGeneratorSettingsProvider.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/NoiseGeneratorSettingsProvider.java diff --git a/src/main/java/org/betterx/bclib/interfaces/NumericProvider.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/NumericProvider.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/NumericProvider.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/NumericProvider.java diff --git a/src/main/java/org/betterx/bclib/interfaces/PatchBiFunction.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/PatchBiFunction.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/PatchBiFunction.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/PatchBiFunction.java diff --git a/src/main/java/org/betterx/bclib/interfaces/PatchFunction.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/PatchFunction.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/PatchFunction.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/PatchFunction.java diff --git a/src/main/java/org/betterx/bclib/interfaces/PostInitable.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/PostInitable.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/PostInitable.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/PostInitable.java diff --git a/src/main/java/org/betterx/bclib/interfaces/RenderLayerProvider.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/RenderLayerProvider.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/RenderLayerProvider.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/RenderLayerProvider.java diff --git a/src/main/java/org/betterx/bclib/interfaces/SettingsExtender.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/SettingsExtender.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/SettingsExtender.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/SettingsExtender.java diff --git a/src/main/java/org/betterx/bclib/interfaces/SpawnRule.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/SpawnRule.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/SpawnRule.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/SpawnRule.java diff --git a/src/main/java/org/betterx/bclib/interfaces/SurfaceMaterialProvider.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/SurfaceMaterialProvider.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/SurfaceMaterialProvider.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/SurfaceMaterialProvider.java diff --git a/src/main/java/org/betterx/bclib/interfaces/SurfaceProvider.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/SurfaceProvider.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/SurfaceProvider.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/SurfaceProvider.java diff --git a/src/main/java/org/betterx/bclib/interfaces/SurvivesOnBlocks.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/SurvivesOnBlocks.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/SurvivesOnBlocks.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/SurvivesOnBlocks.java diff --git a/src/main/java/org/betterx/bclib/interfaces/SurvivesOnSpecialGround.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/SurvivesOnSpecialGround.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/SurvivesOnSpecialGround.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/SurvivesOnSpecialGround.java diff --git a/src/main/java/org/betterx/bclib/interfaces/SurvivesOnTags.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/SurvivesOnTags.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/SurvivesOnTags.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/SurvivesOnTags.java diff --git a/src/main/java/org/betterx/bclib/interfaces/TagProvider.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/TagProvider.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/TagProvider.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/TagProvider.java diff --git a/src/main/java/org/betterx/bclib/interfaces/TheEndBiomesAccessor.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/TheEndBiomesAccessor.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/TheEndBiomesAccessor.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/TheEndBiomesAccessor.java diff --git a/src/main/java/org/betterx/bclib/interfaces/TileEntityRenderProvider.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/TileEntityRenderProvider.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/TileEntityRenderProvider.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/TileEntityRenderProvider.java diff --git a/src/main/java/org/betterx/bclib/interfaces/TriConsumer.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/TriConsumer.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/TriConsumer.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/TriConsumer.java diff --git a/src/main/java/org/betterx/bclib/interfaces/UnknownReceipBookCategory.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/UnknownReceipBookCategory.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/UnknownReceipBookCategory.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/UnknownReceipBookCategory.java diff --git a/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableAxe.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableAxe.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/tools/AddMineableAxe.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableAxe.java diff --git a/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableHammer.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableHammer.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/tools/AddMineableHammer.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableHammer.java diff --git a/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableHoe.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableHoe.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/tools/AddMineableHoe.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableHoe.java diff --git a/src/main/java/org/betterx/bclib/interfaces/tools/AddMineablePickaxe.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineablePickaxe.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/tools/AddMineablePickaxe.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineablePickaxe.java diff --git a/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableShears.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableShears.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/tools/AddMineableShears.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableShears.java diff --git a/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableShovel.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableShovel.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/tools/AddMineableShovel.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableShovel.java diff --git a/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableSword.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableSword.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/tools/AddMineableSword.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/tools/AddMineableSword.java diff --git a/src/main/java/org/betterx/bclib/interfaces/tools/PreventMineableAdd.java b/core-v1/src/main/java/org/betterx/bclib/interfaces/tools/PreventMineableAdd.java similarity index 100% rename from src/main/java/org/betterx/bclib/interfaces/tools/PreventMineableAdd.java rename to core-v1/src/main/java/org/betterx/bclib/interfaces/tools/PreventMineableAdd.java diff --git a/src/main/java/org/betterx/bclib/items/BaseAnvilItem.java b/core-v1/src/main/java/org/betterx/bclib/items/BaseAnvilItem.java similarity index 100% rename from src/main/java/org/betterx/bclib/items/BaseAnvilItem.java rename to core-v1/src/main/java/org/betterx/bclib/items/BaseAnvilItem.java diff --git a/src/main/java/org/betterx/bclib/items/BaseArmorItem.java b/core-v1/src/main/java/org/betterx/bclib/items/BaseArmorItem.java similarity index 100% rename from src/main/java/org/betterx/bclib/items/BaseArmorItem.java rename to core-v1/src/main/java/org/betterx/bclib/items/BaseArmorItem.java diff --git a/src/main/java/org/betterx/bclib/items/BaseAttribute.java b/core-v1/src/main/java/org/betterx/bclib/items/BaseAttribute.java similarity index 100% rename from src/main/java/org/betterx/bclib/items/BaseAttribute.java rename to core-v1/src/main/java/org/betterx/bclib/items/BaseAttribute.java diff --git a/src/main/java/org/betterx/bclib/items/BaseBucketItem.java b/core-v1/src/main/java/org/betterx/bclib/items/BaseBucketItem.java similarity index 100% rename from src/main/java/org/betterx/bclib/items/BaseBucketItem.java rename to core-v1/src/main/java/org/betterx/bclib/items/BaseBucketItem.java diff --git a/src/main/java/org/betterx/bclib/items/BaseDiscItem.java b/core-v1/src/main/java/org/betterx/bclib/items/BaseDiscItem.java similarity index 100% rename from src/main/java/org/betterx/bclib/items/BaseDiscItem.java rename to core-v1/src/main/java/org/betterx/bclib/items/BaseDiscItem.java diff --git a/src/main/java/org/betterx/bclib/items/BaseDrinkItem.java b/core-v1/src/main/java/org/betterx/bclib/items/BaseDrinkItem.java similarity index 100% rename from src/main/java/org/betterx/bclib/items/BaseDrinkItem.java rename to core-v1/src/main/java/org/betterx/bclib/items/BaseDrinkItem.java diff --git a/src/main/java/org/betterx/bclib/items/BaseSpawnEggItem.java b/core-v1/src/main/java/org/betterx/bclib/items/BaseSpawnEggItem.java similarity index 100% rename from src/main/java/org/betterx/bclib/items/BaseSpawnEggItem.java rename to core-v1/src/main/java/org/betterx/bclib/items/BaseSpawnEggItem.java diff --git a/src/main/java/org/betterx/bclib/items/ModelProviderItem.java b/core-v1/src/main/java/org/betterx/bclib/items/ModelProviderItem.java similarity index 100% rename from src/main/java/org/betterx/bclib/items/ModelProviderItem.java rename to core-v1/src/main/java/org/betterx/bclib/items/ModelProviderItem.java diff --git a/src/main/java/org/betterx/bclib/items/elytra/BCLElytraItem.java b/core-v1/src/main/java/org/betterx/bclib/items/elytra/BCLElytraItem.java similarity index 100% rename from src/main/java/org/betterx/bclib/items/elytra/BCLElytraItem.java rename to core-v1/src/main/java/org/betterx/bclib/items/elytra/BCLElytraItem.java diff --git a/src/main/java/org/betterx/bclib/items/elytra/BCLElytraUtils.java b/core-v1/src/main/java/org/betterx/bclib/items/elytra/BCLElytraUtils.java similarity index 100% rename from src/main/java/org/betterx/bclib/items/elytra/BCLElytraUtils.java rename to core-v1/src/main/java/org/betterx/bclib/items/elytra/BCLElytraUtils.java diff --git a/src/main/java/org/betterx/bclib/items/tool/BaseAxeItem.java b/core-v1/src/main/java/org/betterx/bclib/items/tool/BaseAxeItem.java similarity index 100% rename from src/main/java/org/betterx/bclib/items/tool/BaseAxeItem.java rename to core-v1/src/main/java/org/betterx/bclib/items/tool/BaseAxeItem.java diff --git a/src/main/java/org/betterx/bclib/items/tool/BaseHoeItem.java b/core-v1/src/main/java/org/betterx/bclib/items/tool/BaseHoeItem.java similarity index 100% rename from src/main/java/org/betterx/bclib/items/tool/BaseHoeItem.java rename to core-v1/src/main/java/org/betterx/bclib/items/tool/BaseHoeItem.java diff --git a/src/main/java/org/betterx/bclib/items/tool/BasePickaxeItem.java b/core-v1/src/main/java/org/betterx/bclib/items/tool/BasePickaxeItem.java similarity index 100% rename from src/main/java/org/betterx/bclib/items/tool/BasePickaxeItem.java rename to core-v1/src/main/java/org/betterx/bclib/items/tool/BasePickaxeItem.java diff --git a/src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java b/core-v1/src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java similarity index 100% rename from src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java rename to core-v1/src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java diff --git a/src/main/java/org/betterx/bclib/items/tool/BaseShovelItem.java b/core-v1/src/main/java/org/betterx/bclib/items/tool/BaseShovelItem.java similarity index 100% rename from src/main/java/org/betterx/bclib/items/tool/BaseShovelItem.java rename to core-v1/src/main/java/org/betterx/bclib/items/tool/BaseShovelItem.java diff --git a/src/main/java/org/betterx/bclib/items/tool/BaseSwordItem.java b/core-v1/src/main/java/org/betterx/bclib/items/tool/BaseSwordItem.java similarity index 100% rename from src/main/java/org/betterx/bclib/items/tool/BaseSwordItem.java rename to core-v1/src/main/java/org/betterx/bclib/items/tool/BaseSwordItem.java diff --git a/src/main/java/org/betterx/bclib/mixin/client/AnvilScreenMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/client/AnvilScreenMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/client/AnvilScreenMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/client/AnvilScreenMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/client/BlockMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/client/BlockMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/client/BlockMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/client/BlockMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/client/ClientRecipeBookMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/client/ClientRecipeBookMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/client/ClientRecipeBookMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/client/ClientRecipeBookMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/client/FogRendererMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/client/FogRendererMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/client/FogRendererMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/client/FogRendererMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/client/GameMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/client/GameMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/client/GameMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/client/GameMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/client/MinecraftMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/client/MinecraftMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/client/MinecraftMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/client/MinecraftMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/client/ModelBakeryMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/client/ModelBakeryMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/client/ModelBakeryMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/client/ModelBakeryMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/client/ModelManagerMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/client/ModelManagerMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/client/ModelManagerMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/client/ModelManagerMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/client/MultiPackResourceManagerMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/client/MultiPackResourceManagerMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/client/MultiPackResourceManagerMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/client/MultiPackResourceManagerMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/client/PresetEditorMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/client/PresetEditorMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/client/PresetEditorMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/client/PresetEditorMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/client/SignEditScreenMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/client/SignEditScreenMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/client/SignEditScreenMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/client/SignEditScreenMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/client/TextureAtlasMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/client/TextureAtlasMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/client/TextureAtlasMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/client/TextureAtlasMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/AnvilBlockMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/AnvilBlockMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/AnvilBlockMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/AnvilBlockMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/AnvilMenuMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/AnvilMenuMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/AnvilMenuMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/AnvilMenuMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/BiomeGenerationSettingsAccessor.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/BiomeGenerationSettingsAccessor.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/BiomeGenerationSettingsAccessor.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/BiomeGenerationSettingsAccessor.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/BiomeMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/BiomeMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/BiomeMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/BiomeMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/BiomeSourceMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/BiomeSourceMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/BiomeSourceMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/BiomeSourceMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/BoneMealItemMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/BoneMealItemMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/BoneMealItemMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/BoneMealItemMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorAccessor.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorAccessor.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorAccessor.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorAccessor.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorsMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorsMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorsMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorsMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/ComposterBlockAccessor.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/ComposterBlockAccessor.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/ComposterBlockAccessor.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/ComposterBlockAccessor.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/CraftingMenuMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/CraftingMenuMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/CraftingMenuMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/CraftingMenuMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/DiggerItemMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/DiggerItemMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/DiggerItemMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/DiggerItemMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/DimensionTypeMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/DimensionTypeMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/DimensionTypeMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/DimensionTypeMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/EnchantingTableBlockMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/EnchantingTableBlockMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/EnchantingTableBlockMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/EnchantingTableBlockMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/ItemStackMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/ItemStackMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/ItemStackMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/ItemStackMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/LayerLightSectionStorageMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/LayerLightSectionStorageMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/LayerLightSectionStorageMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/LayerLightSectionStorageMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/LootPoolMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/LootPoolMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/LootPoolMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/LootPoolMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/MinecraftServerMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/MinecraftServerMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/MinecraftServerMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/MinecraftServerMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/MobSpawnSettingsAccessor.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/MobSpawnSettingsAccessor.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/MobSpawnSettingsAccessor.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/MobSpawnSettingsAccessor.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/MultiPackResourceManagerMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/MultiPackResourceManagerMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/MultiPackResourceManagerMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/MultiPackResourceManagerMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/NoiseBasedChunkGeneratorMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/NoiseBasedChunkGeneratorMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/NoiseBasedChunkGeneratorMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/NoiseBasedChunkGeneratorMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/PistonBaseBlockMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/PistonBaseBlockMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/PistonBaseBlockMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/PistonBaseBlockMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/PlacementContextMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/PlacementContextMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/PlacementContextMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/PlacementContextMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/PortalShapeMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/PortalShapeMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/PortalShapeMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/PortalShapeMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/PotionBrewingAccessor.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/PotionBrewingAccessor.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/PotionBrewingAccessor.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/PotionBrewingAccessor.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/RecipeManagerAccessor.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/RecipeManagerAccessor.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/RecipeManagerAccessor.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/RecipeManagerAccessor.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/RecipeManagerMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/RecipeManagerMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/RecipeManagerMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/RecipeManagerMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/ServerLevelMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/ServerLevelMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/ServerLevelMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/ServerLevelMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/ShovelItemAccessor.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/ShovelItemAccessor.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/ShovelItemAccessor.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/ShovelItemAccessor.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/StructuresAccessor.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/StructuresAccessor.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/StructuresAccessor.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/StructuresAccessor.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/SurfaceRulesContextAccessor.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/SurfaceRulesContextAccessor.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/SurfaceRulesContextAccessor.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/SurfaceRulesContextAccessor.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/TheEndBiomesMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/TheEndBiomesMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/TheEndBiomesMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/TheEndBiomesMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/WorldGenRegionMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/WorldGenRegionMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/WorldGenRegionMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/WorldGenRegionMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/elytra/LivingEntityMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/elytra/LivingEntityMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/elytra/LivingEntityMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/elytra/LivingEntityMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/shears/BeehiveBlockMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/BeehiveBlockMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/shears/BeehiveBlockMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/BeehiveBlockMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/shears/DiggingEnchantmentMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/DiggingEnchantmentMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/shears/DiggingEnchantmentMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/DiggingEnchantmentMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/shears/MushroomCowMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/MushroomCowMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/shears/MushroomCowMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/MushroomCowMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/shears/PumpkinBlockMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/PumpkinBlockMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/shears/PumpkinBlockMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/PumpkinBlockMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/shears/SheepMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/SheepMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/shears/SheepMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/SheepMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/shears/SnowGolemMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/SnowGolemMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/shears/SnowGolemMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/SnowGolemMixin.java diff --git a/src/main/java/org/betterx/bclib/mixin/common/shears/TripWireBlockMixin.java b/core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/TripWireBlockMixin.java similarity index 100% rename from src/main/java/org/betterx/bclib/mixin/common/shears/TripWireBlockMixin.java rename to core-v1/src/main/java/org/betterx/bclib/mixin/common/shears/TripWireBlockMixin.java diff --git a/src/main/java/org/betterx/bclib/noise/Noises.java b/core-v1/src/main/java/org/betterx/bclib/noise/Noises.java similarity index 100% rename from src/main/java/org/betterx/bclib/noise/Noises.java rename to core-v1/src/main/java/org/betterx/bclib/noise/Noises.java diff --git a/src/main/java/org/betterx/bclib/noise/OpenSimplexNoise.java b/core-v1/src/main/java/org/betterx/bclib/noise/OpenSimplexNoise.java similarity index 100% rename from src/main/java/org/betterx/bclib/noise/OpenSimplexNoise.java rename to core-v1/src/main/java/org/betterx/bclib/noise/OpenSimplexNoise.java diff --git a/src/main/java/org/betterx/bclib/noise/VoronoiNoise.java b/core-v1/src/main/java/org/betterx/bclib/noise/VoronoiNoise.java similarity index 100% rename from src/main/java/org/betterx/bclib/noise/VoronoiNoise.java rename to core-v1/src/main/java/org/betterx/bclib/noise/VoronoiNoise.java diff --git a/src/main/java/org/betterx/bclib/particles/BCLParticleType.java b/core-v1/src/main/java/org/betterx/bclib/particles/BCLParticleType.java similarity index 100% rename from src/main/java/org/betterx/bclib/particles/BCLParticleType.java rename to core-v1/src/main/java/org/betterx/bclib/particles/BCLParticleType.java diff --git a/src/main/java/org/betterx/bclib/presets/FlatLevelPresets.java b/core-v1/src/main/java/org/betterx/bclib/presets/FlatLevelPresets.java similarity index 100% rename from src/main/java/org/betterx/bclib/presets/FlatLevelPresets.java rename to core-v1/src/main/java/org/betterx/bclib/presets/FlatLevelPresets.java diff --git a/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java b/core-v1/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java similarity index 100% rename from src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java rename to core-v1/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java diff --git a/src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java b/core-v1/src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java similarity index 100% rename from src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java rename to core-v1/src/main/java/org/betterx/bclib/recipes/BCLRecipeManager.java diff --git a/src/main/java/org/betterx/bclib/recipes/CraftingRecipes.java b/core-v1/src/main/java/org/betterx/bclib/recipes/CraftingRecipes.java similarity index 100% rename from src/main/java/org/betterx/bclib/recipes/CraftingRecipes.java rename to core-v1/src/main/java/org/betterx/bclib/recipes/CraftingRecipes.java diff --git a/src/main/java/org/betterx/bclib/recipes/FurnaceRecipe.java b/core-v1/src/main/java/org/betterx/bclib/recipes/FurnaceRecipe.java similarity index 100% rename from src/main/java/org/betterx/bclib/recipes/FurnaceRecipe.java rename to core-v1/src/main/java/org/betterx/bclib/recipes/FurnaceRecipe.java diff --git a/src/main/java/org/betterx/bclib/recipes/GridRecipe.java b/core-v1/src/main/java/org/betterx/bclib/recipes/GridRecipe.java similarity index 100% rename from src/main/java/org/betterx/bclib/recipes/GridRecipe.java rename to core-v1/src/main/java/org/betterx/bclib/recipes/GridRecipe.java diff --git a/src/main/java/org/betterx/bclib/recipes/SmithingTableRecipe.java b/core-v1/src/main/java/org/betterx/bclib/recipes/SmithingTableRecipe.java similarity index 100% rename from src/main/java/org/betterx/bclib/recipes/SmithingTableRecipe.java rename to core-v1/src/main/java/org/betterx/bclib/recipes/SmithingTableRecipe.java diff --git a/src/main/java/org/betterx/bclib/registry/BaseBlockEntities.java b/core-v1/src/main/java/org/betterx/bclib/registry/BaseBlockEntities.java similarity index 100% rename from src/main/java/org/betterx/bclib/registry/BaseBlockEntities.java rename to core-v1/src/main/java/org/betterx/bclib/registry/BaseBlockEntities.java diff --git a/src/main/java/org/betterx/bclib/registry/BaseBlockEntityRenders.java b/core-v1/src/main/java/org/betterx/bclib/registry/BaseBlockEntityRenders.java similarity index 100% rename from src/main/java/org/betterx/bclib/registry/BaseBlockEntityRenders.java rename to core-v1/src/main/java/org/betterx/bclib/registry/BaseBlockEntityRenders.java diff --git a/src/main/java/org/betterx/bclib/registry/BaseRegistry.java b/core-v1/src/main/java/org/betterx/bclib/registry/BaseRegistry.java similarity index 100% rename from src/main/java/org/betterx/bclib/registry/BaseRegistry.java rename to core-v1/src/main/java/org/betterx/bclib/registry/BaseRegistry.java diff --git a/src/main/java/org/betterx/bclib/registry/BlockRegistry.java b/core-v1/src/main/java/org/betterx/bclib/registry/BlockRegistry.java similarity index 100% rename from src/main/java/org/betterx/bclib/registry/BlockRegistry.java rename to core-v1/src/main/java/org/betterx/bclib/registry/BlockRegistry.java diff --git a/src/main/java/org/betterx/bclib/registry/ItemRegistry.java b/core-v1/src/main/java/org/betterx/bclib/registry/ItemRegistry.java similarity index 100% rename from src/main/java/org/betterx/bclib/registry/ItemRegistry.java rename to core-v1/src/main/java/org/betterx/bclib/registry/ItemRegistry.java diff --git a/src/main/java/org/betterx/bclib/registry/PresetsRegistry.java b/core-v1/src/main/java/org/betterx/bclib/registry/PresetsRegistry.java similarity index 94% rename from src/main/java/org/betterx/bclib/registry/PresetsRegistry.java rename to core-v1/src/main/java/org/betterx/bclib/registry/PresetsRegistry.java index 5fb40084..bcee77d5 100644 --- a/src/main/java/org/betterx/bclib/registry/PresetsRegistry.java +++ b/core-v1/src/main/java/org/betterx/bclib/registry/PresetsRegistry.java @@ -4,6 +4,7 @@ import org.betterx.bclib.BCLib; import org.betterx.bclib.api.v2.generator.config.BCLEndBiomeSourceConfig; import org.betterx.bclib.api.v2.generator.config.BCLNetherBiomeSourceConfig; import org.betterx.bclib.api.v2.levelgen.LevelGenUtil; +import org.betterx.worlds.together.entrypoints.WorldPresetBootstrap; import org.betterx.worlds.together.levelgen.WorldGenUtil; import org.betterx.worlds.together.worldPreset.TogetherWorldPreset; import org.betterx.worlds.together.worldPreset.WorldPresets; @@ -14,11 +15,11 @@ import net.minecraft.world.level.levelgen.presets.WorldPreset; import java.util.Map; -public class PresetsRegistry { +public class PresetsRegistry implements WorldPresetBootstrap { public static ResourceKey BCL_WORLD; public static ResourceKey BCL_WORLD_17; - public static void onLoad() { + public void bootstrapWorldPresets() { BCL_WORLD = WorldPresets.register( BCLib.makeID("normal"), diff --git a/src/main/java/org/betterx/bclib/registry/PresetsRegistryClient.java b/core-v1/src/main/java/org/betterx/bclib/registry/PresetsRegistryClient.java similarity index 100% rename from src/main/java/org/betterx/bclib/registry/PresetsRegistryClient.java rename to core-v1/src/main/java/org/betterx/bclib/registry/PresetsRegistryClient.java diff --git a/src/main/java/org/betterx/bclib/sdf/PosInfo.java b/core-v1/src/main/java/org/betterx/bclib/sdf/PosInfo.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/PosInfo.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/PosInfo.java diff --git a/src/main/java/org/betterx/bclib/sdf/SDF.java b/core-v1/src/main/java/org/betterx/bclib/sdf/SDF.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/SDF.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/SDF.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFBinary.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFBinary.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFBinary.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFBinary.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFCoordModify.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFCoordModify.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFCoordModify.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFCoordModify.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFCopyRotate.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFCopyRotate.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFCopyRotate.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFCopyRotate.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFDisplacement.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFDisplacement.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFDisplacement.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFDisplacement.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFFlatWave.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFFlatWave.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFFlatWave.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFFlatWave.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFHeightmap.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFHeightmap.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFHeightmap.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFHeightmap.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFIntersection.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFIntersection.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFIntersection.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFIntersection.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFInvert.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFInvert.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFInvert.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFInvert.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFRadialNoiseMap.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFRadialNoiseMap.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFRadialNoiseMap.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFRadialNoiseMap.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFRotation.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFRotation.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFRotation.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFRotation.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFRound.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFRound.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFRound.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFRound.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFScale.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFScale.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFScale.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFScale.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFScale3D.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFScale3D.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFScale3D.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFScale3D.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothIntersection.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothIntersection.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothIntersection.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothIntersection.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothSubtraction.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothSubtraction.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothSubtraction.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothSubtraction.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothUnion.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothUnion.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothUnion.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFSmoothUnion.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFSubtraction.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFSubtraction.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFSubtraction.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFSubtraction.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFTranslate.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFTranslate.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFTranslate.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFTranslate.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFUnary.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFUnary.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFUnary.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFUnary.java diff --git a/src/main/java/org/betterx/bclib/sdf/operator/SDFUnion.java b/core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFUnion.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/operator/SDFUnion.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/operator/SDFUnion.java diff --git a/src/main/java/org/betterx/bclib/sdf/primitive/SDFCappedCone.java b/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFCappedCone.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/primitive/SDFCappedCone.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFCappedCone.java diff --git a/src/main/java/org/betterx/bclib/sdf/primitive/SDFCapsule.java b/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFCapsule.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/primitive/SDFCapsule.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFCapsule.java diff --git a/src/main/java/org/betterx/bclib/sdf/primitive/SDFFlatland.java b/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFFlatland.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/primitive/SDFFlatland.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFFlatland.java diff --git a/src/main/java/org/betterx/bclib/sdf/primitive/SDFHexPrism.java b/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFHexPrism.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/primitive/SDFHexPrism.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFHexPrism.java diff --git a/src/main/java/org/betterx/bclib/sdf/primitive/SDFLine.java b/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFLine.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/primitive/SDFLine.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFLine.java diff --git a/src/main/java/org/betterx/bclib/sdf/primitive/SDFPie.java b/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFPie.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/primitive/SDFPie.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFPie.java diff --git a/src/main/java/org/betterx/bclib/sdf/primitive/SDFPrimitive.java b/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFPrimitive.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/primitive/SDFPrimitive.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFPrimitive.java diff --git a/src/main/java/org/betterx/bclib/sdf/primitive/SDFSphere.java b/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFSphere.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/primitive/SDFSphere.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFSphere.java diff --git a/src/main/java/org/betterx/bclib/sdf/primitive/SDFTorus.java b/core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFTorus.java similarity index 100% rename from src/main/java/org/betterx/bclib/sdf/primitive/SDFTorus.java rename to core-v1/src/main/java/org/betterx/bclib/sdf/primitive/SDFTorus.java diff --git a/src/main/java/org/betterx/bclib/server/BCLibServer.java b/core-v1/src/main/java/org/betterx/bclib/server/BCLibServer.java similarity index 100% rename from src/main/java/org/betterx/bclib/server/BCLibServer.java rename to core-v1/src/main/java/org/betterx/bclib/server/BCLibServer.java diff --git a/src/main/java/org/betterx/bclib/util/BackgroundInfo.java b/core-v1/src/main/java/org/betterx/bclib/util/BackgroundInfo.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/BackgroundInfo.java rename to core-v1/src/main/java/org/betterx/bclib/util/BackgroundInfo.java diff --git a/src/main/java/org/betterx/bclib/util/BlocksHelper.java b/core-v1/src/main/java/org/betterx/bclib/util/BlocksHelper.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/BlocksHelper.java rename to core-v1/src/main/java/org/betterx/bclib/util/BlocksHelper.java diff --git a/src/main/java/org/betterx/bclib/util/CollectionsUtil.java b/core-v1/src/main/java/org/betterx/bclib/util/CollectionsUtil.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/CollectionsUtil.java rename to core-v1/src/main/java/org/betterx/bclib/util/CollectionsUtil.java diff --git a/src/main/java/org/betterx/bclib/util/ColorExtractor.java b/core-v1/src/main/java/org/betterx/bclib/util/ColorExtractor.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/ColorExtractor.java rename to core-v1/src/main/java/org/betterx/bclib/util/ColorExtractor.java diff --git a/src/main/java/org/betterx/bclib/util/ColorUtil.java b/core-v1/src/main/java/org/betterx/bclib/util/ColorUtil.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/ColorUtil.java rename to core-v1/src/main/java/org/betterx/bclib/util/ColorUtil.java diff --git a/src/main/java/org/betterx/bclib/util/ItemUtil.java b/core-v1/src/main/java/org/betterx/bclib/util/ItemUtil.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/ItemUtil.java rename to core-v1/src/main/java/org/betterx/bclib/util/ItemUtil.java diff --git a/src/main/java/org/betterx/bclib/util/JsonFactory.java b/core-v1/src/main/java/org/betterx/bclib/util/JsonFactory.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/JsonFactory.java rename to core-v1/src/main/java/org/betterx/bclib/util/JsonFactory.java diff --git a/core-v1/src/main/java/org/betterx/bclib/util/Logger.java b/core-v1/src/main/java/org/betterx/bclib/util/Logger.java new file mode 100644 index 00000000..d7115089 --- /dev/null +++ b/core-v1/src/main/java/org/betterx/bclib/util/Logger.java @@ -0,0 +1,72 @@ +package org.betterx.bclib.util; + +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; + + +/** + * @deprecated Please use {@link org.betterx.worlds.together.util.Logger} instead + */ +@Deprecated(forRemoval = true) +public final class Logger { + private static final org.apache.logging.log4j.Logger LOGGER = LogManager.getLogger(); + private final String modPref; + + + /** + * @deprecated Please use {@link org.betterx.worlds.together.util.Logger#Logger(String)} instead + */ + @Deprecated(forRemoval = true) + public Logger(String modID) { + this.modPref = "[" + modID + "] "; + } + + public void log(Level level, String message) { + LOGGER.log(level, modPref + message); + } + + public void log(Level level, String message, Object... params) { + LOGGER.log(level, modPref + message, params); + } + + public void debug(Object message) { + this.log(Level.DEBUG, message.toString()); + } + + public void debug(Object message, Object... params) { + this.log(Level.DEBUG, message.toString(), params); + } + + public void catching(Throwable ex) { + this.error(ex.getLocalizedMessage()); + LOGGER.catching(ex); + } + + public void info(String message) { + this.log(Level.INFO, message); + } + + public void info(String message, Object... params) { + this.log(Level.INFO, message, params); + } + + public void warning(String message, Object... params) { + this.log(Level.WARN, message, params); + } + + public void warning(String message, Object obj, Exception ex) { + LOGGER.warn(modPref + message, obj, ex); + } + + public void error(String message) { + this.log(Level.ERROR, message); + } + + public void error(String message, Object obj, Exception ex) { + LOGGER.error(modPref + message, obj, ex); + } + + public void error(String message, Exception ex) { + LOGGER.error(modPref + message, ex); + } +} diff --git a/src/main/java/org/betterx/bclib/util/LootUtil.java b/core-v1/src/main/java/org/betterx/bclib/util/LootUtil.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/LootUtil.java rename to core-v1/src/main/java/org/betterx/bclib/util/LootUtil.java diff --git a/src/main/java/org/betterx/bclib/util/MHelper.java b/core-v1/src/main/java/org/betterx/bclib/util/MHelper.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/MHelper.java rename to core-v1/src/main/java/org/betterx/bclib/util/MHelper.java diff --git a/src/main/java/org/betterx/bclib/util/MethodReplace.java b/core-v1/src/main/java/org/betterx/bclib/util/MethodReplace.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/MethodReplace.java rename to core-v1/src/main/java/org/betterx/bclib/util/MethodReplace.java diff --git a/src/main/java/org/betterx/bclib/util/ModUtil.java b/core-v1/src/main/java/org/betterx/bclib/util/ModUtil.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/ModUtil.java rename to core-v1/src/main/java/org/betterx/bclib/util/ModUtil.java diff --git a/src/main/java/org/betterx/bclib/util/Pair.java b/core-v1/src/main/java/org/betterx/bclib/util/Pair.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/Pair.java rename to core-v1/src/main/java/org/betterx/bclib/util/Pair.java diff --git a/src/main/java/org/betterx/bclib/util/PathUtil.java b/core-v1/src/main/java/org/betterx/bclib/util/PathUtil.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/PathUtil.java rename to core-v1/src/main/java/org/betterx/bclib/util/PathUtil.java diff --git a/src/main/java/org/betterx/bclib/util/RecipeHelper.java b/core-v1/src/main/java/org/betterx/bclib/util/RecipeHelper.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/RecipeHelper.java rename to core-v1/src/main/java/org/betterx/bclib/util/RecipeHelper.java diff --git a/src/main/java/org/betterx/bclib/util/SplineHelper.java b/core-v1/src/main/java/org/betterx/bclib/util/SplineHelper.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/SplineHelper.java rename to core-v1/src/main/java/org/betterx/bclib/util/SplineHelper.java diff --git a/src/main/java/org/betterx/bclib/util/StructureErode.java b/core-v1/src/main/java/org/betterx/bclib/util/StructureErode.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/StructureErode.java rename to core-v1/src/main/java/org/betterx/bclib/util/StructureErode.java diff --git a/src/main/java/org/betterx/bclib/util/StructureHelper.java b/core-v1/src/main/java/org/betterx/bclib/util/StructureHelper.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/StructureHelper.java rename to core-v1/src/main/java/org/betterx/bclib/util/StructureHelper.java diff --git a/src/main/java/org/betterx/bclib/util/TranslationHelper.java b/core-v1/src/main/java/org/betterx/bclib/util/TranslationHelper.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/TranslationHelper.java rename to core-v1/src/main/java/org/betterx/bclib/util/TranslationHelper.java diff --git a/src/main/java/org/betterx/bclib/util/TriFunction.java b/core-v1/src/main/java/org/betterx/bclib/util/TriFunction.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/TriFunction.java rename to core-v1/src/main/java/org/betterx/bclib/util/TriFunction.java diff --git a/src/main/java/org/betterx/bclib/util/Triple.java b/core-v1/src/main/java/org/betterx/bclib/util/Triple.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/Triple.java rename to core-v1/src/main/java/org/betterx/bclib/util/Triple.java diff --git a/src/main/java/org/betterx/bclib/util/WeighTree.java b/core-v1/src/main/java/org/betterx/bclib/util/WeighTree.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/WeighTree.java rename to core-v1/src/main/java/org/betterx/bclib/util/WeighTree.java diff --git a/src/main/java/org/betterx/bclib/util/WeightedList.java b/core-v1/src/main/java/org/betterx/bclib/util/WeightedList.java similarity index 100% rename from src/main/java/org/betterx/bclib/util/WeightedList.java rename to core-v1/src/main/java/org/betterx/bclib/util/WeightedList.java diff --git a/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java b/core-v1/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java similarity index 100% rename from src/main/java/org/betterx/bclib/world/structures/BCLStructure.java rename to core-v1/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java diff --git a/core-v1/src/main/resources/assets/bclib/icon.png b/core-v1/src/main/resources/assets/bclib/icon.png new file mode 100644 index 00000000..368a2a60 Binary files /dev/null and b/core-v1/src/main/resources/assets/bclib/icon.png differ diff --git a/core-v1/src/main/resources/assets/bclib/iconpixelated.png b/core-v1/src/main/resources/assets/bclib/iconpixelated.png new file mode 100644 index 00000000..056ed30a Binary files /dev/null and b/core-v1/src/main/resources/assets/bclib/iconpixelated.png differ diff --git a/src/main/resources/assets/bclib/lang/de_de.json b/core-v1/src/main/resources/assets/bclib/lang/de_de.json similarity index 100% rename from src/main/resources/assets/bclib/lang/de_de.json rename to core-v1/src/main/resources/assets/bclib/lang/de_de.json diff --git a/src/main/resources/assets/bclib/lang/en_us.json b/core-v1/src/main/resources/assets/bclib/lang/en_us.json similarity index 100% rename from src/main/resources/assets/bclib/lang/en_us.json rename to core-v1/src/main/resources/assets/bclib/lang/en_us.json diff --git a/src/main/resources/assets/bclib/lang/ko_kr.json b/core-v1/src/main/resources/assets/bclib/lang/ko_kr.json similarity index 100% rename from src/main/resources/assets/bclib/lang/ko_kr.json rename to core-v1/src/main/resources/assets/bclib/lang/ko_kr.json diff --git a/src/main/resources/assets/bclib/lang/ru_ru.json b/core-v1/src/main/resources/assets/bclib/lang/ru_ru.json similarity index 100% rename from src/main/resources/assets/bclib/lang/ru_ru.json rename to core-v1/src/main/resources/assets/bclib/lang/ru_ru.json diff --git a/src/main/resources/assets/bclib/lang/uk_ua.json b/core-v1/src/main/resources/assets/bclib/lang/uk_ua.json similarity index 100% rename from src/main/resources/assets/bclib/lang/uk_ua.json rename to core-v1/src/main/resources/assets/bclib/lang/uk_ua.json diff --git a/src/main/resources/assets/bclib/lang/zh_cn.json b/core-v1/src/main/resources/assets/bclib/lang/zh_cn.json similarity index 100% rename from src/main/resources/assets/bclib/lang/zh_cn.json rename to core-v1/src/main/resources/assets/bclib/lang/zh_cn.json diff --git a/src/main/resources/assets/bclib/materialmaps/block/alpha_emission.json b/core-v1/src/main/resources/assets/bclib/materialmaps/block/alpha_emission.json similarity index 100% rename from src/main/resources/assets/bclib/materialmaps/block/alpha_emission.json rename to core-v1/src/main/resources/assets/bclib/materialmaps/block/alpha_emission.json diff --git a/src/main/resources/assets/bclib/materials/alpha_emission.json b/core-v1/src/main/resources/assets/bclib/materials/alpha_emission.json similarity index 100% rename from src/main/resources/assets/bclib/materials/alpha_emission.json rename to core-v1/src/main/resources/assets/bclib/materials/alpha_emission.json diff --git a/src/main/resources/assets/bclib/models/block/chest_item.json b/core-v1/src/main/resources/assets/bclib/models/block/chest_item.json similarity index 94% rename from src/main/resources/assets/bclib/models/block/chest_item.json rename to core-v1/src/main/resources/assets/bclib/models/block/chest_item.json index 97ce0cbf..14873f02 100644 --- a/src/main/resources/assets/bclib/models/block/chest_item.json +++ b/core-v1/src/main/resources/assets/bclib/models/block/chest_item.json @@ -1,190 +1,190 @@ -{ - "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", - "parent": "block/block", - "elements": [ - { - "__comment": "Box1", - "faces": { - "down": { - "rotation": 180, - "texture": "#texture", - "uv": [ - 3.5, - 4.75, - 7, - 8.25 - ] - }, - "east": { - "texture": "#texture", - "uv": [ - 3.5, - 10.75, - 7, - 8.25 - ] - }, - "north": { - "texture": "#texture", - "uv": [ - 10.5, - 10.75, - 14, - 8.25 - ] - }, - "south": { - "texture": "#texture", - "uv": [ - 0, - 10.75, - 3.5, - 8.25 - ] - }, - "west": { - "texture": "#texture", - "uv": [ - 7, - 10.75, - 10.5, - 8.25 - ] - } - }, - "from": [ - 1, - 0, - 1 - ], - "to": [ - 15, - 10, - 15 - ] - }, - { - "__comment": "Box1", - "faces": { - "east": { - "texture": "#texture", - "uv": [ - 3.5, - 4.75, - 7, - 3.75 - ] - }, - "north": { - "texture": "#texture", - "uv": [ - 10.5, - 4.75, - 14, - 3.75 - ] - }, - "south": { - "texture": "#texture", - "uv": [ - 0, - 4.75, - 3.5, - 3.75 - ] - }, - "up": { - "rotation": 180, - "texture": "#texture", - "uv": [ - 7, - 0, - 10.5, - 3.5 - ] - }, - "west": { - "texture": "#texture", - "uv": [ - 7, - 4.75, - 10.5, - 3.75 - ] - } - }, - "from": [ - 1, - 10, - 1 - ], - "to": [ - 15, - 14, - 15 - ] - }, - { - "__comment": "Box1", - "faces": { - "down": { - "rotation": 180, - "texture": "#texture", - "uv": [ - 0.25, - 0, - 0.75, - 0.25 - ] - }, - "east": { - "texture": "#texture", - "uv": [ - 0, - 1.25, - 0.25, - 0.25 - ] - }, - "north": { - "texture": "#texture", - "uv": [ - 0.5, - 1.25, - 1, - 0.25 - ] - }, - "up": { - "rotation": 180, - "texture": "#texture", - "uv": [ - 0.75, - 0, - 1.25, - 0.25 - ] - }, - "west": { - "texture": "#texture", - "uv": [ - 0, - 1.25, - 0.25, - 0.25 - ] - } - }, - "from": [ - 7, - 7, - 0 - ], - "to": [ - 9, - 11, - 1 - ] - } - ] -} +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "elements": [ + { + "__comment": "Box1", + "faces": { + "down": { + "rotation": 180, + "texture": "#texture", + "uv": [ + 3.5, + 4.75, + 7, + 8.25 + ] + }, + "east": { + "texture": "#texture", + "uv": [ + 3.5, + 10.75, + 7, + 8.25 + ] + }, + "north": { + "texture": "#texture", + "uv": [ + 10.5, + 10.75, + 14, + 8.25 + ] + }, + "south": { + "texture": "#texture", + "uv": [ + 0, + 10.75, + 3.5, + 8.25 + ] + }, + "west": { + "texture": "#texture", + "uv": [ + 7, + 10.75, + 10.5, + 8.25 + ] + } + }, + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 10, + 15 + ] + }, + { + "__comment": "Box1", + "faces": { + "east": { + "texture": "#texture", + "uv": [ + 3.5, + 4.75, + 7, + 3.75 + ] + }, + "north": { + "texture": "#texture", + "uv": [ + 10.5, + 4.75, + 14, + 3.75 + ] + }, + "south": { + "texture": "#texture", + "uv": [ + 0, + 4.75, + 3.5, + 3.75 + ] + }, + "up": { + "rotation": 180, + "texture": "#texture", + "uv": [ + 7, + 0, + 10.5, + 3.5 + ] + }, + "west": { + "texture": "#texture", + "uv": [ + 7, + 4.75, + 10.5, + 3.75 + ] + } + }, + "from": [ + 1, + 10, + 1 + ], + "to": [ + 15, + 14, + 15 + ] + }, + { + "__comment": "Box1", + "faces": { + "down": { + "rotation": 180, + "texture": "#texture", + "uv": [ + 0.25, + 0, + 0.75, + 0.25 + ] + }, + "east": { + "texture": "#texture", + "uv": [ + 0, + 1.25, + 0.25, + 0.25 + ] + }, + "north": { + "texture": "#texture", + "uv": [ + 0.5, + 1.25, + 1, + 0.25 + ] + }, + "up": { + "rotation": 180, + "texture": "#texture", + "uv": [ + 0.75, + 0, + 1.25, + 0.25 + ] + }, + "west": { + "texture": "#texture", + "uv": [ + 0, + 1.25, + 0.25, + 0.25 + ] + } + }, + "from": [ + 7, + 7, + 0 + ], + "to": [ + 9, + 11, + 1 + ] + } + ] +} diff --git a/src/main/resources/assets/bclib/models/block/ladder.json b/core-v1/src/main/resources/assets/bclib/models/block/ladder.json similarity index 100% rename from src/main/resources/assets/bclib/models/block/ladder.json rename to core-v1/src/main/resources/assets/bclib/models/block/ladder.json diff --git a/src/main/resources/assets/bclib/models/block/path.json b/core-v1/src/main/resources/assets/bclib/models/block/path.json similarity index 100% rename from src/main/resources/assets/bclib/models/block/path.json rename to core-v1/src/main/resources/assets/bclib/models/block/path.json diff --git a/src/main/resources/assets/bclib/models/block/sided_door_bottom.json b/core-v1/src/main/resources/assets/bclib/models/block/sided_door_bottom.json similarity index 100% rename from src/main/resources/assets/bclib/models/block/sided_door_bottom.json rename to core-v1/src/main/resources/assets/bclib/models/block/sided_door_bottom.json diff --git a/src/main/resources/assets/bclib/models/block/sided_door_bottom_rh.json b/core-v1/src/main/resources/assets/bclib/models/block/sided_door_bottom_rh.json similarity index 100% rename from src/main/resources/assets/bclib/models/block/sided_door_bottom_rh.json rename to core-v1/src/main/resources/assets/bclib/models/block/sided_door_bottom_rh.json diff --git a/src/main/resources/assets/bclib/models/block/sided_door_top.json b/core-v1/src/main/resources/assets/bclib/models/block/sided_door_top.json similarity index 100% rename from src/main/resources/assets/bclib/models/block/sided_door_top.json rename to core-v1/src/main/resources/assets/bclib/models/block/sided_door_top.json diff --git a/src/main/resources/assets/bclib/models/block/sided_door_top_rh.json b/core-v1/src/main/resources/assets/bclib/models/block/sided_door_top_rh.json similarity index 100% rename from src/main/resources/assets/bclib/models/block/sided_door_top_rh.json rename to core-v1/src/main/resources/assets/bclib/models/block/sided_door_top_rh.json diff --git a/src/main/resources/assets/bclib/models/block/sided_trapdoor.json b/core-v1/src/main/resources/assets/bclib/models/block/sided_trapdoor.json similarity index 100% rename from src/main/resources/assets/bclib/models/block/sided_trapdoor.json rename to core-v1/src/main/resources/assets/bclib/models/block/sided_trapdoor.json diff --git a/src/main/resources/assets/bclib/models/block/tint_cube.json b/core-v1/src/main/resources/assets/bclib/models/block/tint_cube.json similarity index 100% rename from src/main/resources/assets/bclib/models/block/tint_cube.json rename to core-v1/src/main/resources/assets/bclib/models/block/tint_cube.json diff --git a/src/main/resources/assets/bclib/patterns/block/anvil.json b/core-v1/src/main/resources/assets/bclib/patterns/block/anvil.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/anvil.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/anvil.json diff --git a/src/main/resources/assets/bclib/patterns/block/barrel_open.json b/core-v1/src/main/resources/assets/bclib/patterns/block/barrel_open.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/barrel_open.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/barrel_open.json diff --git a/src/main/resources/assets/bclib/patterns/block/bars_post.json b/core-v1/src/main/resources/assets/bclib/patterns/block/bars_post.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/bars_post.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/bars_post.json diff --git a/src/main/resources/assets/bclib/patterns/block/bars_side.json b/core-v1/src/main/resources/assets/bclib/patterns/block/bars_side.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/bars_side.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/bars_side.json diff --git a/src/main/resources/assets/bclib/patterns/block/block.json b/core-v1/src/main/resources/assets/bclib/patterns/block/block.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/block.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/block.json diff --git a/src/main/resources/assets/bclib/patterns/block/block_bottom_top.json b/core-v1/src/main/resources/assets/bclib/patterns/block/block_bottom_top.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/block_bottom_top.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/block_bottom_top.json diff --git a/src/main/resources/assets/bclib/patterns/block/block_colored.json b/core-v1/src/main/resources/assets/bclib/patterns/block/block_colored.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/block_colored.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/block_colored.json diff --git a/src/main/resources/assets/bclib/patterns/block/block_sided.json b/core-v1/src/main/resources/assets/bclib/patterns/block/block_sided.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/block_sided.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/block_sided.json diff --git a/src/main/resources/assets/bclib/patterns/block/bookshelf.json b/core-v1/src/main/resources/assets/bclib/patterns/block/bookshelf.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/bookshelf.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/bookshelf.json diff --git a/src/main/resources/assets/bclib/patterns/block/button.json b/core-v1/src/main/resources/assets/bclib/patterns/block/button.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/button.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/button.json diff --git a/src/main/resources/assets/bclib/patterns/block/button_pressed.json b/core-v1/src/main/resources/assets/bclib/patterns/block/button_pressed.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/button_pressed.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/button_pressed.json diff --git a/src/main/resources/assets/bclib/patterns/block/chain.json b/core-v1/src/main/resources/assets/bclib/patterns/block/chain.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/chain.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/chain.json diff --git a/src/main/resources/assets/bclib/patterns/block/composter.json b/core-v1/src/main/resources/assets/bclib/patterns/block/composter.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/composter.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/composter.json diff --git a/src/main/resources/assets/bclib/patterns/block/cross.json b/core-v1/src/main/resources/assets/bclib/patterns/block/cross.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/cross.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/cross.json diff --git a/src/main/resources/assets/bclib/patterns/block/cross_shaded.json b/core-v1/src/main/resources/assets/bclib/patterns/block/cross_shaded.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/cross_shaded.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/cross_shaded.json diff --git a/src/main/resources/assets/bclib/patterns/block/door_bottom.json b/core-v1/src/main/resources/assets/bclib/patterns/block/door_bottom.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/door_bottom.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/door_bottom.json diff --git a/src/main/resources/assets/bclib/patterns/block/door_bottom_hinge.json b/core-v1/src/main/resources/assets/bclib/patterns/block/door_bottom_hinge.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/door_bottom_hinge.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/door_bottom_hinge.json diff --git a/src/main/resources/assets/bclib/patterns/block/door_top.json b/core-v1/src/main/resources/assets/bclib/patterns/block/door_top.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/door_top.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/door_top.json diff --git a/src/main/resources/assets/bclib/patterns/block/door_top_hinge.json b/core-v1/src/main/resources/assets/bclib/patterns/block/door_top_hinge.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/door_top_hinge.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/door_top_hinge.json diff --git a/src/main/resources/assets/bclib/patterns/block/empty.json b/core-v1/src/main/resources/assets/bclib/patterns/block/empty.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/empty.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/empty.json diff --git a/src/main/resources/assets/bclib/patterns/block/fence_gate_closed.json b/core-v1/src/main/resources/assets/bclib/patterns/block/fence_gate_closed.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/fence_gate_closed.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/fence_gate_closed.json diff --git a/src/main/resources/assets/bclib/patterns/block/fence_gate_open.json b/core-v1/src/main/resources/assets/bclib/patterns/block/fence_gate_open.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/fence_gate_open.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/fence_gate_open.json diff --git a/src/main/resources/assets/bclib/patterns/block/fence_post.json b/core-v1/src/main/resources/assets/bclib/patterns/block/fence_post.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/fence_post.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/fence_post.json diff --git a/src/main/resources/assets/bclib/patterns/block/fence_side.json b/core-v1/src/main/resources/assets/bclib/patterns/block/fence_side.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/fence_side.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/fence_side.json diff --git a/src/main/resources/assets/bclib/patterns/block/furnace.json b/core-v1/src/main/resources/assets/bclib/patterns/block/furnace.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/furnace.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/furnace.json diff --git a/src/main/resources/assets/bclib/patterns/block/furnace_glow.json b/core-v1/src/main/resources/assets/bclib/patterns/block/furnace_glow.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/furnace_glow.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/furnace_glow.json diff --git a/src/main/resources/assets/bclib/patterns/block/ladder.json b/core-v1/src/main/resources/assets/bclib/patterns/block/ladder.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/ladder.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/ladder.json diff --git a/src/main/resources/assets/bclib/patterns/block/path.json b/core-v1/src/main/resources/assets/bclib/patterns/block/path.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/path.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/path.json diff --git a/src/main/resources/assets/bclib/patterns/block/pillar.json b/core-v1/src/main/resources/assets/bclib/patterns/block/pillar.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/pillar.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/pillar.json diff --git a/src/main/resources/assets/bclib/patterns/block/pressure_plate_down.json b/core-v1/src/main/resources/assets/bclib/patterns/block/pressure_plate_down.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/pressure_plate_down.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/pressure_plate_down.json diff --git a/src/main/resources/assets/bclib/patterns/block/pressure_plate_up.json b/core-v1/src/main/resources/assets/bclib/patterns/block/pressure_plate_up.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/pressure_plate_up.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/pressure_plate_up.json diff --git a/src/main/resources/assets/bclib/patterns/block/slab.json b/core-v1/src/main/resources/assets/bclib/patterns/block/slab.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/slab.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/slab.json diff --git a/src/main/resources/assets/bclib/patterns/block/stairs.json b/core-v1/src/main/resources/assets/bclib/patterns/block/stairs.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/stairs.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/stairs.json diff --git a/src/main/resources/assets/bclib/patterns/block/stairs_inner.json b/core-v1/src/main/resources/assets/bclib/patterns/block/stairs_inner.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/stairs_inner.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/stairs_inner.json diff --git a/src/main/resources/assets/bclib/patterns/block/stairs_outer.json b/core-v1/src/main/resources/assets/bclib/patterns/block/stairs_outer.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/stairs_outer.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/stairs_outer.json diff --git a/src/main/resources/assets/bclib/patterns/block/top_side_bottom.json b/core-v1/src/main/resources/assets/bclib/patterns/block/top_side_bottom.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/top_side_bottom.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/top_side_bottom.json diff --git a/src/main/resources/assets/bclib/patterns/block/trapdoor.json b/core-v1/src/main/resources/assets/bclib/patterns/block/trapdoor.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/trapdoor.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/trapdoor.json diff --git a/src/main/resources/assets/bclib/patterns/block/wall_gate_closed.json b/core-v1/src/main/resources/assets/bclib/patterns/block/wall_gate_closed.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/wall_gate_closed.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/wall_gate_closed.json diff --git a/src/main/resources/assets/bclib/patterns/block/wall_gate_open.json b/core-v1/src/main/resources/assets/bclib/patterns/block/wall_gate_open.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/wall_gate_open.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/wall_gate_open.json diff --git a/src/main/resources/assets/bclib/patterns/block/wall_inventory.json b/core-v1/src/main/resources/assets/bclib/patterns/block/wall_inventory.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/wall_inventory.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/wall_inventory.json diff --git a/src/main/resources/assets/bclib/patterns/block/wall_post.json b/core-v1/src/main/resources/assets/bclib/patterns/block/wall_post.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/wall_post.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/wall_post.json diff --git a/src/main/resources/assets/bclib/patterns/block/wall_side.json b/core-v1/src/main/resources/assets/bclib/patterns/block/wall_side.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/wall_side.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/wall_side.json diff --git a/src/main/resources/assets/bclib/patterns/block/wall_side_tall.json b/core-v1/src/main/resources/assets/bclib/patterns/block/wall_side_tall.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/block/wall_side_tall.json rename to core-v1/src/main/resources/assets/bclib/patterns/block/wall_side_tall.json diff --git a/src/main/resources/assets/bclib/patterns/item/pattern_block_item.json b/core-v1/src/main/resources/assets/bclib/patterns/item/pattern_block_item.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/item/pattern_block_item.json rename to core-v1/src/main/resources/assets/bclib/patterns/item/pattern_block_item.json diff --git a/src/main/resources/assets/bclib/patterns/item/pattern_button.json b/core-v1/src/main/resources/assets/bclib/patterns/item/pattern_button.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/item/pattern_button.json rename to core-v1/src/main/resources/assets/bclib/patterns/item/pattern_button.json diff --git a/src/main/resources/assets/bclib/patterns/item/pattern_chest.json b/core-v1/src/main/resources/assets/bclib/patterns/item/pattern_chest.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/item/pattern_chest.json rename to core-v1/src/main/resources/assets/bclib/patterns/item/pattern_chest.json diff --git a/src/main/resources/assets/bclib/patterns/item/pattern_fence.json b/core-v1/src/main/resources/assets/bclib/patterns/item/pattern_fence.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/item/pattern_fence.json rename to core-v1/src/main/resources/assets/bclib/patterns/item/pattern_fence.json diff --git a/src/main/resources/assets/bclib/patterns/item/pattern_item_generated.json b/core-v1/src/main/resources/assets/bclib/patterns/item/pattern_item_generated.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/item/pattern_item_generated.json rename to core-v1/src/main/resources/assets/bclib/patterns/item/pattern_item_generated.json diff --git a/src/main/resources/assets/bclib/patterns/item/pattern_item_handheld.json b/core-v1/src/main/resources/assets/bclib/patterns/item/pattern_item_handheld.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/item/pattern_item_handheld.json rename to core-v1/src/main/resources/assets/bclib/patterns/item/pattern_item_handheld.json diff --git a/src/main/resources/assets/bclib/patterns/item/pattern_item_spawn_egg.json b/core-v1/src/main/resources/assets/bclib/patterns/item/pattern_item_spawn_egg.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/item/pattern_item_spawn_egg.json rename to core-v1/src/main/resources/assets/bclib/patterns/item/pattern_item_spawn_egg.json diff --git a/src/main/resources/assets/bclib/patterns/item/pattern_wall.json b/core-v1/src/main/resources/assets/bclib/patterns/item/pattern_wall.json similarity index 100% rename from src/main/resources/assets/bclib/patterns/item/pattern_wall.json rename to core-v1/src/main/resources/assets/bclib/patterns/item/pattern_wall.json diff --git a/src/main/resources/assets/bclib/shaders/material/alpha_emission.frag b/core-v1/src/main/resources/assets/bclib/shaders/material/alpha_emission.frag similarity index 100% rename from src/main/resources/assets/bclib/shaders/material/alpha_emission.frag rename to core-v1/src/main/resources/assets/bclib/shaders/material/alpha_emission.frag diff --git a/src/main/resources/assets/minecraft/shaders/core/rendertype_cutout.fsh b/core-v1/src/main/resources/assets/minecraft/shaders/core/rendertype_cutout.fsh similarity index 100% rename from src/main/resources/assets/minecraft/shaders/core/rendertype_cutout.fsh rename to core-v1/src/main/resources/assets/minecraft/shaders/core/rendertype_cutout.fsh diff --git a/src/main/resources/assets/minecraft/shaders/core/rendertype_entity_cutout.fsh b/core-v1/src/main/resources/assets/minecraft/shaders/core/rendertype_entity_cutout.fsh similarity index 100% rename from src/main/resources/assets/minecraft/shaders/core/rendertype_entity_cutout.fsh rename to core-v1/src/main/resources/assets/minecraft/shaders/core/rendertype_entity_cutout.fsh diff --git a/src/main/resources/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh b/core-v1/src/main/resources/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh similarity index 100% rename from src/main/resources/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh rename to core-v1/src/main/resources/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.fsh diff --git a/src/main/resources/assets/minecraft/shaders/core/rendertype_solid.fsh b/core-v1/src/main/resources/assets/minecraft/shaders/core/rendertype_solid.fsh similarity index 100% rename from src/main/resources/assets/minecraft/shaders/core/rendertype_solid.fsh rename to core-v1/src/main/resources/assets/minecraft/shaders/core/rendertype_solid.fsh diff --git a/src/main/resources/bclib.accesswidener b/core-v1/src/main/resources/bclib.accesswidener similarity index 100% rename from src/main/resources/bclib.accesswidener rename to core-v1/src/main/resources/bclib.accesswidener diff --git a/src/main/resources/bclib.mixins.client.json b/core-v1/src/main/resources/bclib.mixins.client.json similarity index 95% rename from src/main/resources/bclib.mixins.client.json rename to core-v1/src/main/resources/bclib.mixins.client.json index 0639eab1..22ea2033 100644 --- a/src/main/resources/bclib.mixins.client.json +++ b/core-v1/src/main/resources/bclib.mixins.client.json @@ -1,22 +1,22 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "org.betterx.bclib.mixin.client", - "compatibilityLevel": "JAVA_17", - "client": [ - "AnvilScreenMixin", - "BlockMixin", - "ClientRecipeBookMixin", - "FogRendererMixin", - "GameMixin", - "MinecraftMixin", - "ModelBakeryMixin", - "ModelManagerMixin", - "PresetEditorMixin", - "SignEditScreenMixin", - "TextureAtlasMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} +{ + "required": true, + "minVersion": "0.8", + "package": "org.betterx.bclib.mixin.client", + "compatibilityLevel": "JAVA_17", + "client": [ + "AnvilScreenMixin", + "BlockMixin", + "ClientRecipeBookMixin", + "FogRendererMixin", + "GameMixin", + "MinecraftMixin", + "ModelBakeryMixin", + "ModelManagerMixin", + "PresetEditorMixin", + "SignEditScreenMixin", + "TextureAtlasMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/bclib.mixins.common.json b/core-v1/src/main/resources/bclib.mixins.common.json similarity index 96% rename from src/main/resources/bclib.mixins.common.json rename to core-v1/src/main/resources/bclib.mixins.common.json index 8b7bf1aa..7dfcf6ef 100644 --- a/src/main/resources/bclib.mixins.common.json +++ b/core-v1/src/main/resources/bclib.mixins.common.json @@ -1,50 +1,50 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "org.betterx.bclib.mixin.common", - "compatibilityLevel": "JAVA_17", - "mixins": [ - "AnvilBlockMixin", - "AnvilMenuMixin", - "BiomeGenerationSettingsAccessor", - "BiomeMixin", - "BiomeSourceMixin", - "BoneMealItemMixin", - "ChunkGeneratorAccessor", - "ChunkGeneratorMixin", - "ChunkGeneratorsMixin", - "ComposterBlockAccessor", - "CraftingMenuMixin", - "DiggerItemMixin", - "EnchantingTableBlockMixin", - "ItemStackMixin", - "LayerLightSectionStorageMixin", - "LootPoolMixin", - "MinecraftServerMixin", - "MobSpawnSettingsAccessor", - "NoiseBasedChunkGeneratorMixin", - "PistonBaseBlockMixin", - "PortalShapeMixin", - "PotionBrewingAccessor", - "RecipeManagerAccessor", - "RecipeManagerMixin", - "ServerLevelMixin", - "ShovelItemAccessor", - "StructuresAccessor", - "SurfaceRulesContextAccessor", - "TheEndBiomesMixin", - "WorldGenRegionMixin", - "elytra.LivingEntityMixin", - "shears.BeehiveBlockMixin", - "shears.DiggingEnchantmentMixin", - "shears.ItemPredicateBuilderMixin", - "shears.MushroomCowMixin", - "shears.PumpkinBlockMixin", - "shears.SheepMixin", - "shears.SnowGolemMixin", - "shears.TripWireBlockMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} +{ + "required": true, + "minVersion": "0.8", + "package": "org.betterx.bclib.mixin.common", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "AnvilBlockMixin", + "AnvilMenuMixin", + "BiomeGenerationSettingsAccessor", + "BiomeMixin", + "BiomeSourceMixin", + "BoneMealItemMixin", + "ChunkGeneratorAccessor", + "ChunkGeneratorMixin", + "ChunkGeneratorsMixin", + "ComposterBlockAccessor", + "CraftingMenuMixin", + "DiggerItemMixin", + "EnchantingTableBlockMixin", + "ItemStackMixin", + "LayerLightSectionStorageMixin", + "LootPoolMixin", + "MinecraftServerMixin", + "MobSpawnSettingsAccessor", + "NoiseBasedChunkGeneratorMixin", + "PistonBaseBlockMixin", + "PortalShapeMixin", + "PotionBrewingAccessor", + "RecipeManagerAccessor", + "RecipeManagerMixin", + "ServerLevelMixin", + "ShovelItemAccessor", + "StructuresAccessor", + "SurfaceRulesContextAccessor", + "TheEndBiomesMixin", + "WorldGenRegionMixin", + "elytra.LivingEntityMixin", + "shears.BeehiveBlockMixin", + "shears.DiggingEnchantmentMixin", + "shears.ItemPredicateBuilderMixin", + "shears.MushroomCowMixin", + "shears.PumpkinBlockMixin", + "shears.SheepMixin", + "shears.SnowGolemMixin", + "shears.TripWireBlockMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/core-v1/src/main/resources/fabric.mod.json b/core-v1/src/main/resources/fabric.mod.json new file mode 100644 index 00000000..88ebc4ee --- /dev/null +++ b/core-v1/src/main/resources/fabric.mod.json @@ -0,0 +1,54 @@ +{ + "schemaVersion": 1, + "id": "bclib", + "version": "2.0.10", + "name": "BCLib", + "description": "A library for BetterX team mods", + "authors": [ + "Quiqueck", + "paulevs", + "Bulldog83" + ], + "contact": { + "homepage": "https://www.curseforge.com/minecraft/mc-mods/bclib", + "issues": "https://github.com/quiqueck/bclib/issues", + "sources": "https://github.com/quiqueck/bclib" + }, + "license": "MIT", + "icon": "assets/bclib/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "org.betterx.bclib.BCLib" + ], + "client": [ + "org.betterx.bclib.client.BCLibClient" + ], + "server": [ + "org.betterx.bclib.server.BCLibServer" + ], + "modmenu": [ + "org.betterx.bclib.integration.modmenu.ModMenuEntryPoint" + ], + "worlds_together": [ + "org.betterx.bclib.registry.PresetsRegistry" + ] + }, + "accessWidener": "bclib.accesswidener", + "mixins": [ + "bclib.mixins.common.json", + "bclib.mixins.client.json" + ], + "depends": { + "fabricloader": ">=0.14.6", + "fabric": ">=0.56.0", + "minecraft": "1.19" + }, + "custom": { + "modmenu": { + "links": { + "title.link.bclib.discord": "https://discord.gg/kYuATbYbKW" + } + } + } +} diff --git a/gradle.properties b/gradle.properties index 774e809a..095256a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,8 +9,7 @@ loader_version=0.14.8 fabric_version=0.57.0+1.19 # Mod Properties mod_version=2.0.10 +core-v1-version=2.0.10 +together-v1-version=2.0.10 maven_group=org.betterx.bclib -archives_base_name=bclib -# Dependencies -patchouli_version=50-FABRIC -modmenu_version=4.0.0 \ No newline at end of file +archives_base_name=bclib \ No newline at end of file diff --git a/gradle/bclib-common.gradle b/gradle/bclib-common.gradle new file mode 100644 index 00000000..1cee318b --- /dev/null +++ b/gradle/bclib-common.gradle @@ -0,0 +1,46 @@ +def getSubprojectVersion(project) { + // Get the version from the gradle.properties file + return project.properties["${project.name}-version"] +} + +def compileOnlyDependencies(project, List depNames) { + project.dependencies { + depNames.each { + modCompileOnly it + } + } +} + +def moduleDependencies(project, List depNames) { + def deps = depNames.iterator().collect { project.dependencies.project(path: ":$it", configuration: 'namedElements') } + + project.dependencies { + deps.each { + api it + } + } + + // As we manually handle the maven artifacts, we need to also manually specify the deps. + 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") + } + } + } + } + } +} + +ext { + getSubprojectVersion = this.&getSubprojectVersion + moduleDependencies = this.&moduleDependencies + compileOnlyDependencies = this.&compileOnlyDependencies +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 027b233d..4b698508 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,14 @@ pluginManagement { - repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - gradlePluginPortal() - } + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenLocal() + gradlePluginPortal() + } } + + +include("together-v1") +include("core-v1") diff --git a/together-v1/build.gradle b/together-v1/build.gradle new file mode 100644 index 00000000..c7e32ebc --- /dev/null +++ b/together-v1/build.gradle @@ -0,0 +1,13 @@ +archivesBaseName = project.together_archives_base_name +version = getSubprojectVersion(project) + +loom { + accessWidenerPath = file("src/main/resources/worlds_together.accesswidener") +} + +moduleDependencies(project, []) + + +jar { + from "../LICENSE" +} \ No newline at end of file diff --git a/together-v1/gradle.properties b/together-v1/gradle.properties new file mode 100644 index 00000000..823ed646 --- /dev/null +++ b/together-v1/gradle.properties @@ -0,0 +1,3 @@ +# Together Mod Properties +together_archives_base_name=worlds_together +together_maven_group=org.betterx.worlds.together \ No newline at end of file diff --git a/src/main/java/org/betterx/worlds/together/WorldsTogether.java b/together-v1/src/main/java/org/betterx/worlds/together/WorldsTogether.java similarity index 88% rename from src/main/java/org/betterx/worlds/together/WorldsTogether.java rename to together-v1/src/main/java/org/betterx/worlds/together/WorldsTogether.java index a74adba5..24ae4bef 100644 --- a/src/main/java/org/betterx/worlds/together/WorldsTogether.java +++ b/together-v1/src/main/java/org/betterx/worlds/together/WorldsTogether.java @@ -1,16 +1,17 @@ package org.betterx.worlds.together; -import org.betterx.bclib.util.Logger; import org.betterx.worlds.together.surfaceRules.SurfaceRuleRegistry; import org.betterx.worlds.together.tag.v3.TagManager; +import org.betterx.worlds.together.util.Logger; import org.betterx.worlds.together.world.WorldConfig; import org.betterx.worlds.together.worldPreset.WorldPresets; import net.minecraft.resources.ResourceLocation; +import net.fabricmc.api.ModInitializer; import net.fabricmc.loader.api.FabricLoader; -public class WorldsTogether { +public class WorldsTogether implements ModInitializer { public static boolean SURPRESS_EXPERIMENTAL_DIALOG = false; public static boolean FORCE_SERVER_TO_BETTERX_PRESET = false; public static final String MOD_ID = "worlds_together"; @@ -23,7 +24,7 @@ public class WorldsTogether { return FabricLoader.getInstance().isDevelopmentEnvironment(); } - public static void onInitialize() { + public void onInitialize() { TagManager.ensureStaticallyLoaded(); SurfaceRuleRegistry.ensureStaticallyLoaded(); diff --git a/src/main/java/org/betterx/worlds/together/biomesource/BiomeSourceFromRegistry.java b/together-v1/src/main/java/org/betterx/worlds/together/biomesource/BiomeSourceFromRegistry.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/biomesource/BiomeSourceFromRegistry.java rename to together-v1/src/main/java/org/betterx/worlds/together/biomesource/BiomeSourceFromRegistry.java diff --git a/src/main/java/org/betterx/worlds/together/biomesource/BiomeSourceWithConfig.java b/together-v1/src/main/java/org/betterx/worlds/together/biomesource/BiomeSourceWithConfig.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/biomesource/BiomeSourceWithConfig.java rename to together-v1/src/main/java/org/betterx/worlds/together/biomesource/BiomeSourceWithConfig.java diff --git a/src/main/java/org/betterx/worlds/together/biomesource/MergeableBiomeSource.java b/together-v1/src/main/java/org/betterx/worlds/together/biomesource/MergeableBiomeSource.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/biomesource/MergeableBiomeSource.java rename to together-v1/src/main/java/org/betterx/worlds/together/biomesource/MergeableBiomeSource.java diff --git a/src/main/java/org/betterx/worlds/together/biomesource/MultiNoiseBiomeSourceAccessor.java b/together-v1/src/main/java/org/betterx/worlds/together/biomesource/MultiNoiseBiomeSourceAccessor.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/biomesource/MultiNoiseBiomeSourceAccessor.java rename to together-v1/src/main/java/org/betterx/worlds/together/biomesource/MultiNoiseBiomeSourceAccessor.java diff --git a/src/main/java/org/betterx/worlds/together/biomesource/config/BiomeSourceConfig.java b/together-v1/src/main/java/org/betterx/worlds/together/biomesource/config/BiomeSourceConfig.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/biomesource/config/BiomeSourceConfig.java rename to together-v1/src/main/java/org/betterx/worlds/together/biomesource/config/BiomeSourceConfig.java diff --git a/src/main/java/org/betterx/worlds/together/chunkgenerator/ChunkGeneratorUtils.java b/together-v1/src/main/java/org/betterx/worlds/together/chunkgenerator/ChunkGeneratorUtils.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/chunkgenerator/ChunkGeneratorUtils.java rename to together-v1/src/main/java/org/betterx/worlds/together/chunkgenerator/ChunkGeneratorUtils.java diff --git a/src/main/java/org/betterx/worlds/together/chunkgenerator/EnforceableChunkGenerator.java b/together-v1/src/main/java/org/betterx/worlds/together/chunkgenerator/EnforceableChunkGenerator.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/chunkgenerator/EnforceableChunkGenerator.java rename to together-v1/src/main/java/org/betterx/worlds/together/chunkgenerator/EnforceableChunkGenerator.java diff --git a/src/main/java/org/betterx/worlds/together/chunkgenerator/InjectableSurfaceRules.java b/together-v1/src/main/java/org/betterx/worlds/together/chunkgenerator/InjectableSurfaceRules.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/chunkgenerator/InjectableSurfaceRules.java rename to together-v1/src/main/java/org/betterx/worlds/together/chunkgenerator/InjectableSurfaceRules.java diff --git a/src/main/java/org/betterx/worlds/together/chunkgenerator/RestorableBiomeSource.java b/together-v1/src/main/java/org/betterx/worlds/together/chunkgenerator/RestorableBiomeSource.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/chunkgenerator/RestorableBiomeSource.java rename to together-v1/src/main/java/org/betterx/worlds/together/chunkgenerator/RestorableBiomeSource.java diff --git a/src/main/java/org/betterx/worlds/together/client/WorldsTogetherClient.java b/together-v1/src/main/java/org/betterx/worlds/together/client/WorldsTogetherClient.java similarity index 53% rename from src/main/java/org/betterx/worlds/together/client/WorldsTogetherClient.java rename to together-v1/src/main/java/org/betterx/worlds/together/client/WorldsTogetherClient.java index 1aa64f4e..2a646f80 100644 --- a/src/main/java/org/betterx/worlds/together/client/WorldsTogetherClient.java +++ b/together-v1/src/main/java/org/betterx/worlds/together/client/WorldsTogetherClient.java @@ -2,8 +2,10 @@ package org.betterx.worlds.together.client; import org.betterx.worlds.together.worldPreset.client.WorldPresetsClient; -public class WorldsTogetherClient { - public static void onInitializeClient() { +import net.fabricmc.api.ClientModInitializer; + +public class WorldsTogetherClient implements ClientModInitializer { + public void onInitializeClient() { WorldPresetsClient.setupClientside(); } } diff --git a/together-v1/src/main/java/org/betterx/worlds/together/entrypoints/EntrypointUtil.java b/together-v1/src/main/java/org/betterx/worlds/together/entrypoints/EntrypointUtil.java new file mode 100644 index 00000000..0476a601 --- /dev/null +++ b/together-v1/src/main/java/org/betterx/worlds/together/entrypoints/EntrypointUtil.java @@ -0,0 +1,29 @@ +package org.betterx.worlds.together.entrypoints; + +import net.fabricmc.loader.api.FabricLoader; + +import java.util.List; +import org.jetbrains.annotations.ApiStatus; + +@ApiStatus.Internal +public class EntrypointUtil { + private static List getEntryPoints(boolean client, Class select) { + return FabricLoader.getInstance() + .getEntrypoints( + client ? "worlds_together_client" : "worlds_together", + WorldsTogetherEntrypoint.class + ) + .stream() + .filter(o -> select.isAssignableFrom(o.getClass())) + .map(e -> (T) e) + .toList(); + } + + public static List getCommon(Class select) { + return getEntryPoints(false, select); + } + + public static List getClient(Class select) { + return getEntryPoints(true, select); + } +} diff --git a/together-v1/src/main/java/org/betterx/worlds/together/entrypoints/WorldPresetBootstrap.java b/together-v1/src/main/java/org/betterx/worlds/together/entrypoints/WorldPresetBootstrap.java new file mode 100644 index 00000000..238fec8e --- /dev/null +++ b/together-v1/src/main/java/org/betterx/worlds/together/entrypoints/WorldPresetBootstrap.java @@ -0,0 +1,5 @@ +package org.betterx.worlds.together.entrypoints; + +public interface WorldPresetBootstrap extends WorldsTogetherEntrypoint { + void bootstrapWorldPresets(); +} diff --git a/together-v1/src/main/java/org/betterx/worlds/together/entrypoints/WorldsTogetherEntrypoint.java b/together-v1/src/main/java/org/betterx/worlds/together/entrypoints/WorldsTogetherEntrypoint.java new file mode 100644 index 00000000..b41b8601 --- /dev/null +++ b/together-v1/src/main/java/org/betterx/worlds/together/entrypoints/WorldsTogetherEntrypoint.java @@ -0,0 +1,4 @@ +package org.betterx.worlds.together.entrypoints; + +public interface WorldsTogetherEntrypoint { +} diff --git a/src/main/java/org/betterx/worlds/together/flatLevel/FlatLevelPresets.java b/together-v1/src/main/java/org/betterx/worlds/together/flatLevel/FlatLevelPresets.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/flatLevel/FlatLevelPresets.java rename to together-v1/src/main/java/org/betterx/worlds/together/flatLevel/FlatLevelPresets.java diff --git a/src/main/java/org/betterx/worlds/together/levelgen/WorldGenUtil.java b/together-v1/src/main/java/org/betterx/worlds/together/levelgen/WorldGenUtil.java similarity index 93% rename from src/main/java/org/betterx/worlds/together/levelgen/WorldGenUtil.java rename to together-v1/src/main/java/org/betterx/worlds/together/levelgen/WorldGenUtil.java index 0d58fe79..4a82f11f 100644 --- a/src/main/java/org/betterx/worlds/together/levelgen/WorldGenUtil.java +++ b/together-v1/src/main/java/org/betterx/worlds/together/levelgen/WorldGenUtil.java @@ -6,6 +6,7 @@ import org.betterx.worlds.together.chunkgenerator.EnforceableChunkGenerator; import org.betterx.worlds.together.world.BiomeSourceWithNoiseRelatedSettings; import org.betterx.worlds.together.world.BiomeSourceWithSeed; import org.betterx.worlds.together.world.WorldConfig; +import org.betterx.worlds.together.world.event.WorldBootstrap; import org.betterx.worlds.together.worldPreset.TogetherWorldPreset; import org.betterx.worlds.together.worldPreset.WorldPresets; @@ -15,6 +16,7 @@ import net.minecraft.core.Registry; import net.minecraft.core.RegistryAccess; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; import net.minecraft.util.RandomSource; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.chunk.ChunkGenerator; @@ -165,4 +167,17 @@ public class WorldGenUtil { } return settings; } + + public static ResourceLocation getBiomeID(Biome biome) { + ResourceLocation id = null; + RegistryAccess access = WorldBootstrap.getLastRegistryAccessOrElseBuiltin(); + + id = access.registryOrThrow(Registry.BIOME_REGISTRY).getKey(biome); + + if (id == null) { + WorldsTogether.LOGGER.error("Unable to get ID for " + biome + "."); + } + + return id; + } } diff --git a/src/main/java/org/betterx/worlds/together/mixin/client/CreateWorldScreenMixin.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/client/CreateWorldScreenMixin.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/client/CreateWorldScreenMixin.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/client/CreateWorldScreenMixin.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/client/WorldGenSettingsComponentMixin.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/client/WorldGenSettingsComponentMixin.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/client/WorldGenSettingsComponentMixin.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/client/WorldGenSettingsComponentMixin.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/client/WorldOpenFlowsMixin.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/client/WorldOpenFlowsMixin.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/client/WorldOpenFlowsMixin.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/client/WorldOpenFlowsMixin.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/BuiltinRegistriesMixin.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/common/BuiltinRegistriesMixin.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/common/BuiltinRegistriesMixin.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/common/BuiltinRegistriesMixin.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/DedicatedServerPropertiesMixin.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/common/DedicatedServerPropertiesMixin.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/common/DedicatedServerPropertiesMixin.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/common/DedicatedServerPropertiesMixin.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/DiggerItemAccessor.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/common/DiggerItemAccessor.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/common/DiggerItemAccessor.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/common/DiggerItemAccessor.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/MainMixin.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/common/MainMixin.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/common/MainMixin.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/common/MainMixin.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/MinecraftServerMixin.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/common/MinecraftServerMixin.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/common/MinecraftServerMixin.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/common/MinecraftServerMixin.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/MinecraftServerMixinLate.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/common/MinecraftServerMixinLate.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/common/MinecraftServerMixinLate.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/common/MinecraftServerMixinLate.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/NoiseBasedChunkGeneratorMixin.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/common/NoiseBasedChunkGeneratorMixin.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/common/NoiseBasedChunkGeneratorMixin.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/common/NoiseBasedChunkGeneratorMixin.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/NoiseGeneratorSettingsMixin.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/common/NoiseGeneratorSettingsMixin.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/common/NoiseGeneratorSettingsMixin.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/common/NoiseGeneratorSettingsMixin.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/PrimaryLevelDataMixin.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/common/PrimaryLevelDataMixin.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/common/PrimaryLevelDataMixin.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/common/PrimaryLevelDataMixin.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/RegistryAccessMixin.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/common/RegistryAccessMixin.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/common/RegistryAccessMixin.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/common/RegistryAccessMixin.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/RegistryOpsAccessor.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/common/RegistryOpsAccessor.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/common/RegistryOpsAccessor.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/common/RegistryOpsAccessor.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/TagLoaderMixin.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/common/TagLoaderMixin.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/common/TagLoaderMixin.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/common/TagLoaderMixin.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/WorldGenPropertiesMixin.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/common/WorldGenPropertiesMixin.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/common/WorldGenPropertiesMixin.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/common/WorldGenPropertiesMixin.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetAccessor.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetAccessor.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetAccessor.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetAccessor.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetMixin.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetMixin.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetMixin.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetMixin.java diff --git a/src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetsBootstrapMixin.java b/together-v1/src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetsBootstrapMixin.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetsBootstrapMixin.java rename to together-v1/src/main/java/org/betterx/worlds/together/mixin/common/WorldPresetsBootstrapMixin.java diff --git a/src/main/java/org/betterx/worlds/together/surfaceRules/AssignedSurfaceRule.java b/together-v1/src/main/java/org/betterx/worlds/together/surfaceRules/AssignedSurfaceRule.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/surfaceRules/AssignedSurfaceRule.java rename to together-v1/src/main/java/org/betterx/worlds/together/surfaceRules/AssignedSurfaceRule.java diff --git a/src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleProvider.java b/together-v1/src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleProvider.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleProvider.java rename to together-v1/src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleProvider.java diff --git a/src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleRegistry.java b/together-v1/src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleRegistry.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleRegistry.java rename to together-v1/src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleRegistry.java diff --git a/src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleUtil.java b/together-v1/src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleUtil.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleUtil.java rename to together-v1/src/main/java/org/betterx/worlds/together/surfaceRules/SurfaceRuleUtil.java diff --git a/src/main/java/org/betterx/worlds/together/tag/v3/CommonBiomeTags.java b/together-v1/src/main/java/org/betterx/worlds/together/tag/v3/CommonBiomeTags.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/tag/v3/CommonBiomeTags.java rename to together-v1/src/main/java/org/betterx/worlds/together/tag/v3/CommonBiomeTags.java diff --git a/src/main/java/org/betterx/worlds/together/tag/v3/CommonBlockTags.java b/together-v1/src/main/java/org/betterx/worlds/together/tag/v3/CommonBlockTags.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/tag/v3/CommonBlockTags.java rename to together-v1/src/main/java/org/betterx/worlds/together/tag/v3/CommonBlockTags.java diff --git a/src/main/java/org/betterx/worlds/together/tag/v3/CommonItemTags.java b/together-v1/src/main/java/org/betterx/worlds/together/tag/v3/CommonItemTags.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/tag/v3/CommonItemTags.java rename to together-v1/src/main/java/org/betterx/worlds/together/tag/v3/CommonItemTags.java diff --git a/src/main/java/org/betterx/worlds/together/tag/v3/MineableTags.java b/together-v1/src/main/java/org/betterx/worlds/together/tag/v3/MineableTags.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/tag/v3/MineableTags.java rename to together-v1/src/main/java/org/betterx/worlds/together/tag/v3/MineableTags.java diff --git a/src/main/java/org/betterx/worlds/together/tag/v3/TagManager.java b/together-v1/src/main/java/org/betterx/worlds/together/tag/v3/TagManager.java similarity index 94% rename from src/main/java/org/betterx/worlds/together/tag/v3/TagManager.java rename to together-v1/src/main/java/org/betterx/worlds/together/tag/v3/TagManager.java index fbfc4a70..e547d9cb 100644 --- a/src/main/java/org/betterx/worlds/together/tag/v3/TagManager.java +++ b/together-v1/src/main/java/org/betterx/worlds/together/tag/v3/TagManager.java @@ -1,8 +1,8 @@ package org.betterx.worlds.together.tag.v3; -import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; -import org.betterx.bclib.api.v2.tag.TagAPI; +import org.betterx.worlds.together.levelgen.WorldGenUtil; import org.betterx.worlds.together.mixin.common.DiggerItemAccessor; +import org.betterx.worlds.together.world.event.WorldEventsImpl; import net.minecraft.core.DefaultedRegistry; import net.minecraft.core.Registry; @@ -62,7 +62,7 @@ public class TagManager { "tags/worldgen/biome", (dir) -> new TagRegistry.Biomes( dir, - b -> BiomeAPI.getBiomeID(b) + b -> WorldGenUtil.getBiomeID(b) ) ); } @@ -105,7 +105,7 @@ public class TagManager { String directory, Map> tagsMap ) { - tagsMap = TagAPI.apply(directory, tagsMap); + WorldEventsImpl.BEFORE_ADDING_TAGS.emit(e -> e.apply(directory, tagsMap)); TagRegistry type = TYPES.get(directory); if (type != null) { diff --git a/src/main/java/org/betterx/worlds/together/tag/v3/TagRegistry.java b/together-v1/src/main/java/org/betterx/worlds/together/tag/v3/TagRegistry.java similarity index 90% rename from src/main/java/org/betterx/worlds/together/tag/v3/TagRegistry.java rename to together-v1/src/main/java/org/betterx/worlds/together/tag/v3/TagRegistry.java index 1c5bb2da..472d234f 100644 --- a/src/main/java/org/betterx/worlds/together/tag/v3/TagRegistry.java +++ b/together-v1/src/main/java/org/betterx/worlds/together/tag/v3/TagRegistry.java @@ -1,8 +1,6 @@ package org.betterx.worlds.together.tag.v3; -import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; -import org.betterx.bclib.api.v2.levelgen.biomes.InternalBiomeAPI; +import org.betterx.worlds.together.WorldsTogether; import net.minecraft.core.DefaultedRegistry; import net.minecraft.core.Registry; @@ -90,11 +88,11 @@ public class TagRegistry { * @param tagID {@link TagKey< Biome >} tag ID. * @param elements array of Elements to add into tag. */ - public void add(TagKey tagID, BCLBiome... elements) { - if (isFrozen) BCLib.LOGGER.warning("Adding Tag " + tagID + " after the API was frozen."); + public void add(TagKey tagID, ResourceKey... elements) { + if (isFrozen) WorldsTogether.LOGGER.warning("Adding Tag " + tagID + " after the API was frozen."); Set set = getSetForTag(tagID); - for (BCLBiome element : elements) { - ResourceLocation id = element.getID(); + for (ResourceKey element : elements) { + ResourceLocation id = element.location(); if (id != null) { set.add(TagEntry.element(id)); } @@ -106,7 +104,6 @@ public class TagRegistry { } public void apply(Map> tagsMap) { - InternalBiomeAPI._runBiomeTagAdders(); super.apply(tagsMap); } } @@ -209,7 +206,7 @@ public class TagRegistry { } public void addUntyped(TagKey tagID, ResourceLocation... elements) { - if (isFrozen) BCLib.LOGGER.warning("Adding Tag " + tagID + " after the API was frozen."); + if (isFrozen) WorldsTogether.LOGGER.warning("Adding Tag " + tagID + " after the API was frozen."); Set set = getSetForTag(tagID); for (ResourceLocation id : elements) { if (id != null) { @@ -225,7 +222,7 @@ public class TagRegistry { } public void addOtherTags(TagKey tagID, TagKey... tags) { - if (isFrozen) BCLib.LOGGER.warning("Adding Tag " + tagID + " after the API was frozen."); + if (isFrozen) WorldsTogether.LOGGER.warning("Adding Tag " + tagID + " after the API was frozen."); Set set = getSetForTag(tagID); for (TagKey tag : tags) { ResourceLocation id = tag.location(); @@ -242,7 +239,7 @@ public class TagRegistry { * @param elements array of Elements to add into tag. */ protected void add(TagKey tagID, T... elements) { - if (isFrozen) BCLib.LOGGER.warning("Adding Tag " + tagID + " after the API was frozen."); + if (isFrozen) WorldsTogether.LOGGER.warning("Adding Tag " + tagID + " after the API was frozen."); Set set = getSetForTag(tagID); for (T element : elements) { ResourceLocation id = locationProvider.apply(element); @@ -260,7 +257,7 @@ public class TagRegistry { @Deprecated(forRemoval = true) protected void add(ResourceLocation tagID, T... elements) { - if (isFrozen) BCLib.LOGGER.warning("Adding Tag " + tagID + " after the API was frozen."); + if (isFrozen) WorldsTogether.LOGGER.warning("Adding Tag " + tagID + " after the API was frozen."); Set set = getSetForTag(tagID); for (T element : elements) { ResourceLocation id = locationProvider.apply(element); @@ -292,7 +289,7 @@ public class TagRegistry { List builder, Set ids ) { - ids.forEach(value -> builder.add(new TagLoader.EntryWithSource(value, BCLib.MOD_ID))); + ids.forEach(value -> builder.add(new TagLoader.EntryWithSource(value, WorldsTogether.MOD_ID))); return builder; } } diff --git a/src/main/java/org/betterx/worlds/together/tag/v3/ToolTags.java b/together-v1/src/main/java/org/betterx/worlds/together/tag/v3/ToolTags.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/tag/v3/ToolTags.java rename to together-v1/src/main/java/org/betterx/worlds/together/tag/v3/ToolTags.java diff --git a/src/main/java/org/betterx/bclib/util/Logger.java b/together-v1/src/main/java/org/betterx/worlds/together/util/Logger.java similarity index 97% rename from src/main/java/org/betterx/bclib/util/Logger.java rename to together-v1/src/main/java/org/betterx/worlds/together/util/Logger.java index 373bf2a6..8600e677 100644 --- a/src/main/java/org/betterx/bclib/util/Logger.java +++ b/together-v1/src/main/java/org/betterx/worlds/together/util/Logger.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.util; +package org.betterx.worlds.together.util; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/org/betterx/worlds/together/util/ModUtil.java b/together-v1/src/main/java/org/betterx/worlds/together/util/ModUtil.java similarity index 99% rename from src/main/java/org/betterx/worlds/together/util/ModUtil.java rename to together-v1/src/main/java/org/betterx/worlds/together/util/ModUtil.java index 99085a38..54dd38e1 100644 --- a/src/main/java/org/betterx/worlds/together/util/ModUtil.java +++ b/together-v1/src/main/java/org/betterx/worlds/together/util/ModUtil.java @@ -1,6 +1,5 @@ package org.betterx.worlds.together.util; -import org.betterx.bclib.BCLib; import org.betterx.worlds.together.WorldsTogether; import net.fabricmc.loader.api.*; @@ -261,8 +260,6 @@ public class ModUtil { * @return The version of the locally installed Mod */ public static String getModVersion(String modID) { - if (modID == WorldsTogether.MOD_ID) modID = BCLib.MOD_ID; - Optional optional = FabricLoader.getInstance() .getModContainer(modID); if (optional.isPresent()) { diff --git a/src/main/java/org/betterx/worlds/together/util/PathUtil.java b/together-v1/src/main/java/org/betterx/worlds/together/util/PathUtil.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/util/PathUtil.java rename to together-v1/src/main/java/org/betterx/worlds/together/util/PathUtil.java diff --git a/src/main/java/org/betterx/worlds/together/world/BiomeSourceWithNoiseRelatedSettings.java b/together-v1/src/main/java/org/betterx/worlds/together/world/BiomeSourceWithNoiseRelatedSettings.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/world/BiomeSourceWithNoiseRelatedSettings.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/BiomeSourceWithNoiseRelatedSettings.java diff --git a/src/main/java/org/betterx/worlds/together/world/BiomeSourceWithSeed.java b/together-v1/src/main/java/org/betterx/worlds/together/world/BiomeSourceWithSeed.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/world/BiomeSourceWithSeed.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/BiomeSourceWithSeed.java diff --git a/src/main/java/org/betterx/worlds/together/world/WorldConfig.java b/together-v1/src/main/java/org/betterx/worlds/together/world/WorldConfig.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/world/WorldConfig.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/WorldConfig.java diff --git a/src/main/java/org/betterx/worlds/together/world/event/AdaptWorldPresetSettingEvent.java b/together-v1/src/main/java/org/betterx/worlds/together/world/event/AdaptWorldPresetSettingEvent.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/world/event/AdaptWorldPresetSettingEvent.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/event/AdaptWorldPresetSettingEvent.java diff --git a/together-v1/src/main/java/org/betterx/worlds/together/world/event/BeforeAddingTags.java b/together-v1/src/main/java/org/betterx/worlds/together/world/event/BeforeAddingTags.java new file mode 100644 index 00000000..1908161d --- /dev/null +++ b/together-v1/src/main/java/org/betterx/worlds/together/world/event/BeforeAddingTags.java @@ -0,0 +1,14 @@ +package org.betterx.worlds.together.world.event; + +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagLoader; + +import java.util.List; +import java.util.Map; + +public interface BeforeAddingTags { + void apply( + String directory, + Map> tagsMap + ); +} diff --git a/src/main/java/org/betterx/worlds/together/world/event/BeforeServerWorldLoad.java b/together-v1/src/main/java/org/betterx/worlds/together/world/event/BeforeServerWorldLoad.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/world/event/BeforeServerWorldLoad.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/event/BeforeServerWorldLoad.java diff --git a/src/main/java/org/betterx/worlds/together/world/event/BeforeWorldLoad.java b/together-v1/src/main/java/org/betterx/worlds/together/world/event/BeforeWorldLoad.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/world/event/BeforeWorldLoad.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/event/BeforeWorldLoad.java diff --git a/src/main/java/org/betterx/worlds/together/world/event/Event.java b/together-v1/src/main/java/org/betterx/worlds/together/world/event/Event.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/world/event/Event.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/event/Event.java diff --git a/src/main/java/org/betterx/worlds/together/world/event/EventImpl.java b/together-v1/src/main/java/org/betterx/worlds/together/world/event/EventImpl.java similarity index 90% rename from src/main/java/org/betterx/worlds/together/world/event/EventImpl.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/event/EventImpl.java index 01419060..5fcb9b5a 100644 --- a/src/main/java/org/betterx/worlds/together/world/event/EventImpl.java +++ b/together-v1/src/main/java/org/betterx/worlds/together/world/event/EventImpl.java @@ -4,7 +4,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Consumer; -class EventImpl implements Event { +public class EventImpl implements Event { final List handlers = new LinkedList<>(); public final boolean on(T handler) { diff --git a/src/main/java/org/betterx/worlds/together/world/event/OnAdaptWorldPresetSettings.java b/together-v1/src/main/java/org/betterx/worlds/together/world/event/OnAdaptWorldPresetSettings.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/world/event/OnAdaptWorldPresetSettings.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/event/OnAdaptWorldPresetSettings.java diff --git a/src/main/java/org/betterx/worlds/together/world/event/OnFinalizeLevelStem.java b/together-v1/src/main/java/org/betterx/worlds/together/world/event/OnFinalizeLevelStem.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/world/event/OnFinalizeLevelStem.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/event/OnFinalizeLevelStem.java diff --git a/src/main/java/org/betterx/worlds/together/world/event/OnWorldLoad.java b/together-v1/src/main/java/org/betterx/worlds/together/world/event/OnWorldLoad.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/world/event/OnWorldLoad.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/event/OnWorldLoad.java diff --git a/src/main/java/org/betterx/worlds/together/world/event/OnWorldPatch.java b/together-v1/src/main/java/org/betterx/worlds/together/world/event/OnWorldPatch.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/world/event/OnWorldPatch.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/event/OnWorldPatch.java diff --git a/src/main/java/org/betterx/worlds/together/world/event/OnWorldRegistryReady.java b/together-v1/src/main/java/org/betterx/worlds/together/world/event/OnWorldRegistryReady.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/world/event/OnWorldRegistryReady.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/event/OnWorldRegistryReady.java diff --git a/src/main/java/org/betterx/worlds/together/world/event/PatchWorldEvent.java b/together-v1/src/main/java/org/betterx/worlds/together/world/event/PatchWorldEvent.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/world/event/PatchWorldEvent.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/event/PatchWorldEvent.java diff --git a/src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java b/together-v1/src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java similarity index 95% rename from src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java index 11fbe943..fd64e9b9 100644 --- a/src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java +++ b/together-v1/src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java @@ -1,6 +1,5 @@ package org.betterx.worlds.together.world.event; -import org.betterx.bclib.BCLib; import org.betterx.worlds.together.WorldsTogether; import org.betterx.worlds.together.levelgen.WorldGenUtil; import org.betterx.worlds.together.mixin.common.RegistryOpsAccessor; @@ -56,10 +55,6 @@ public class WorldBootstrap { private static void initializeWorldConfig(File levelBaseDir, boolean newWorld) { WorldConfig.load(new File(levelBaseDir, "data")); - - if (newWorld) { - WorldConfig.saveFile(BCLib.MOD_ID); - } } private static void onRegistryReady(RegistryAccess a) { @@ -115,7 +110,7 @@ public class WorldBootstrap { public static void setupWorld(LevelStorageSource.LevelStorageAccess levelStorageAccess) { File levelDat = levelStorageAccess.getLevelPath(LevelResource.LEVEL_DATA_FILE).toFile(); if (!levelDat.exists()) { - BCLib.LOGGER.info("Creating a new World, no fixes needed"); + WorldsTogether.LOGGER.info("Creating a new World, no fixes needed"); final Map, ChunkGenerator> settings = Helpers.defaultServerDimensions(); Helpers.initializeWorldConfig(levelStorageAccess, true); @@ -241,11 +236,11 @@ public class WorldBootstrap { false )); } catch (Exception e) { - BCLib.LOGGER.error("Failed to initialize data in world", e); + WorldsTogether.LOGGER.error("Failed to initialize data in world", e); } levelStorageAccess.close(); } catch (Exception e) { - BCLib.LOGGER.error("Failed to acquire storage access", e); + WorldsTogether.LOGGER.error("Failed to acquire storage access", e); } } @@ -260,7 +255,7 @@ public class WorldBootstrap { result = WorldEventsImpl.PATCH_WORLD.applyPatches(levelStorageAccess, onResume); levelStorageAccess.close(); } catch (Exception e) { - BCLib.LOGGER.error("Failed to initialize data in world", e); + WorldsTogether.LOGGER.error("Failed to initialize data in world", e); } return result; @@ -287,7 +282,7 @@ public class WorldBootstrap { InGUI.setupNewWorldCommon(levelStorageAccess, worldPreset, worldGenSettings); levelStorageAccess.close(); } catch (Exception e) { - BCLib.LOGGER.error("Failed to initialize data in world", e); + WorldsTogether.LOGGER.error("Failed to initialize data in world", e); } } } @@ -315,7 +310,7 @@ public class WorldBootstrap { return WorldGenUtil.repairBiomeSourceInAllDimensions(acc.bcl_getRegistryAccess(), worldGenSettings); //.repairSettingsOnLoad(LAST_REGISTRY_ACCESS, worldGenSettings); } else { - BCLib.LOGGER.error("Unable to obtain registryAccess when enforcing generators."); + WorldsTogether.LOGGER.error("Unable to obtain registryAccess when enforcing generators."); } return worldGenSettings; } diff --git a/src/main/java/org/betterx/worlds/together/world/event/WorldEvents.java b/together-v1/src/main/java/org/betterx/worlds/together/world/event/WorldEvents.java similarity index 88% rename from src/main/java/org/betterx/worlds/together/world/event/WorldEvents.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/event/WorldEvents.java index 16d9f6a8..fa0ff83a 100644 --- a/src/main/java/org/betterx/worlds/together/world/event/WorldEvents.java +++ b/together-v1/src/main/java/org/betterx/worlds/together/world/event/WorldEvents.java @@ -8,4 +8,6 @@ public class WorldEvents { public static final Event ON_FINALIZE_LEVEL_STEM = WorldEventsImpl.ON_FINALIZE_LEVEL_STEM; public static final Event PATCH_WORLD = WorldEventsImpl.PATCH_WORLD; public static final Event ADAPT_WORLD_PRESET = WorldEventsImpl.ADAPT_WORLD_PRESET; + + public static final Event BEFORE_ADDING_TAGS = WorldEventsImpl.BEFORE_ADDING_TAGS; } diff --git a/src/main/java/org/betterx/worlds/together/world/event/WorldEventsImpl.java b/together-v1/src/main/java/org/betterx/worlds/together/world/event/WorldEventsImpl.java similarity index 79% rename from src/main/java/org/betterx/worlds/together/world/event/WorldEventsImpl.java rename to together-v1/src/main/java/org/betterx/worlds/together/world/event/WorldEventsImpl.java index cf37f48c..cc1e93ab 100644 --- a/src/main/java/org/betterx/worlds/together/world/event/WorldEventsImpl.java +++ b/together-v1/src/main/java/org/betterx/worlds/together/world/event/WorldEventsImpl.java @@ -1,6 +1,9 @@ package org.betterx.worlds.together.world.event; -class WorldEventsImpl { +import org.jetbrains.annotations.ApiStatus; + +@ApiStatus.Internal +public class WorldEventsImpl { public static final EventImpl WORLD_REGISTRY_READY = new EventImpl<>(); public static final EventImpl BEFORE_WORLD_LOAD = new EventImpl<>(); public static final EventImpl BEFORE_SERVER_WORLD_LOAD = new EventImpl<>(); @@ -10,4 +13,6 @@ class WorldEventsImpl { public static final PatchWorldEvent PATCH_WORLD = new PatchWorldEvent(); public static final AdaptWorldPresetSettingEvent ADAPT_WORLD_PRESET = new AdaptWorldPresetSettingEvent(); + + public static final EventImpl BEFORE_ADDING_TAGS = new EventImpl<>(); } diff --git a/src/main/java/org/betterx/worlds/together/worldPreset/TogetherWorldPreset.java b/together-v1/src/main/java/org/betterx/worlds/together/worldPreset/TogetherWorldPreset.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/worldPreset/TogetherWorldPreset.java rename to together-v1/src/main/java/org/betterx/worlds/together/worldPreset/TogetherWorldPreset.java diff --git a/src/main/java/org/betterx/worlds/together/worldPreset/WorldGenSettingsComponentAccessor.java b/together-v1/src/main/java/org/betterx/worlds/together/worldPreset/WorldGenSettingsComponentAccessor.java similarity index 100% rename from src/main/java/org/betterx/worlds/together/worldPreset/WorldGenSettingsComponentAccessor.java rename to together-v1/src/main/java/org/betterx/worlds/together/worldPreset/WorldGenSettingsComponentAccessor.java diff --git a/src/main/java/org/betterx/worlds/together/worldPreset/WorldPresets.java b/together-v1/src/main/java/org/betterx/worlds/together/worldPreset/WorldPresets.java similarity index 94% rename from src/main/java/org/betterx/worlds/together/worldPreset/WorldPresets.java rename to together-v1/src/main/java/org/betterx/worlds/together/worldPreset/WorldPresets.java index 32fd264e..a77273f7 100644 --- a/src/main/java/org/betterx/worlds/together/worldPreset/WorldPresets.java +++ b/together-v1/src/main/java/org/betterx/worlds/together/worldPreset/WorldPresets.java @@ -1,7 +1,8 @@ package org.betterx.worlds.together.worldPreset; -import org.betterx.bclib.registry.PresetsRegistry; import org.betterx.worlds.together.WorldsTogether; +import org.betterx.worlds.together.entrypoints.EntrypointUtil; +import org.betterx.worlds.together.entrypoints.WorldPresetBootstrap; import org.betterx.worlds.together.levelgen.WorldGenUtil; import org.betterx.worlds.together.tag.v3.TagManager; import org.betterx.worlds.together.tag.v3.TagRegistry; @@ -83,7 +84,8 @@ public class WorldPresets { WorldGenUtil.Context netherContext, WorldGenUtil.Context endContext ) { - PresetsRegistry.onLoad(); + EntrypointUtil.getCommon(WorldPresetBootstrap.class) + .forEach(e -> e.bootstrapWorldPresets()); for (Map.Entry, PresetBuilder> e : BUILDERS.entrySet()) { TogetherWorldPreset preset = e.getValue().create(overworldStem, netherContext, endContext); diff --git a/src/main/java/org/betterx/worlds/together/worldPreset/client/WorldPresetsClient.java b/together-v1/src/main/java/org/betterx/worlds/together/worldPreset/client/WorldPresetsClient.java similarity index 87% rename from src/main/java/org/betterx/worlds/together/worldPreset/client/WorldPresetsClient.java rename to together-v1/src/main/java/org/betterx/worlds/together/worldPreset/client/WorldPresetsClient.java index ff0768db..e65a8803 100644 --- a/src/main/java/org/betterx/worlds/together/worldPreset/client/WorldPresetsClient.java +++ b/together-v1/src/main/java/org/betterx/worlds/together/worldPreset/client/WorldPresetsClient.java @@ -1,7 +1,5 @@ package org.betterx.worlds.together.worldPreset.client; -import org.betterx.bclib.registry.PresetsRegistryClient; - import net.minecraft.client.gui.screens.worldselection.PresetEditor; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.levelgen.presets.WorldPreset; @@ -20,6 +18,5 @@ public class WorldPresetsClient { } public static void setupClientside() { - PresetsRegistryClient.onLoad(); } } diff --git a/together-v1/src/main/resources/assets/worlds_together/icon.png b/together-v1/src/main/resources/assets/worlds_together/icon.png new file mode 100644 index 00000000..368a2a60 Binary files /dev/null and b/together-v1/src/main/resources/assets/worlds_together/icon.png differ diff --git a/together-v1/src/main/resources/assets/worlds_together/iconpixelated.png b/together-v1/src/main/resources/assets/worlds_together/iconpixelated.png new file mode 100644 index 00000000..056ed30a Binary files /dev/null and b/together-v1/src/main/resources/assets/worlds_together/iconpixelated.png differ diff --git a/together-v1/src/main/resources/fabric.mod.json b/together-v1/src/main/resources/fabric.mod.json new file mode 100644 index 00000000..d17e2178 --- /dev/null +++ b/together-v1/src/main/resources/fabric.mod.json @@ -0,0 +1,43 @@ +{ + "schemaVersion": 1, + "id": "worlds_together", + "version": "2.0.10", + "name": "WorldsTogether", + "description": "A library for World Preset/Loading Management", + "authors": [ + "Quiqueck" + ], + "contact": { + "homepage": "https://www.curseforge.com/minecraft/mc-mods/bclib", + "issues": "https://github.com/quiqueck/bclib/issues", + "sources": "https://github.com/quiqueck/bclib" + }, + "license": "MIT", + "icon": "assets/worlds_together/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "org.betterx.worlds.together.WorldsTogether" + ], + "client": [ + "org.betterx.worlds.together.client.WorldsTogetherClient" + ] + }, + "accessWidener": "worlds_together.accesswidener", + "mixins": [ + "together.mixins.common.json", + "together.mixins.client.json" + ], + "depends": { + "fabricloader": ">=0.14.6", + "fabric": ">=0.56.0", + "minecraft": "1.19" + }, + "custom": { + "modmenu": { + "links": { + "title.link.bclib.discord": "https://discord.gg/kYuATbYbKW" + } + } + } +} diff --git a/src/main/resources/together.mixins.client.json b/together-v1/src/main/resources/together.mixins.client.json similarity index 100% rename from src/main/resources/together.mixins.client.json rename to together-v1/src/main/resources/together.mixins.client.json diff --git a/src/main/resources/together.mixins.common.json b/together-v1/src/main/resources/together.mixins.common.json similarity index 100% rename from src/main/resources/together.mixins.common.json rename to together-v1/src/main/resources/together.mixins.common.json diff --git a/together-v1/src/main/resources/worlds_together.accesswidener b/together-v1/src/main/resources/worlds_together.accesswidener new file mode 100644 index 00000000..c20d61e6 --- /dev/null +++ b/together-v1/src/main/resources/worlds_together.accesswidener @@ -0,0 +1,18 @@ +accessWidener v1 named + +# Classes +accessible class net/minecraft/server/MinecraftServer$ReloadableResources +accessible class net/minecraft/world/level/levelgen/SurfaceRules$Context +accessible class net/minecraft/world/level/levelgen/SurfaceRules$Condition +accessible class net/minecraft/world/level/levelgen/SurfaceRules$SurfaceRule +accessible class net/minecraft/world/level/levelgen/SurfaceRules$LazyXZCondition +accessible class net/minecraft/world/level/levelgen/SurfaceRules$LazyCondition +accessible class net/minecraft/world/level/levelgen/SurfaceRules$SequenceRuleSource +accessible class net/minecraft/world/level/levelgen/presets/WorldPresets$Bootstrap +extendable class net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator +accessible class net/minecraft/data/BuiltinRegistries$RegistryBootstrap +accessible class net/minecraft/world/level/levelgen/SurfaceRules$SequenceRuleSource + +#Methods +accessible method net/minecraft/client/gui/screens/worldselection/WorldGenSettingsComponent updateSettings (Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContext$Updater;)V +accessible method net/minecraft/world/level/levelgen/SurfaceRules$SequenceRuleSource (Ljava/util/List;)V \ No newline at end of file