diff --git a/build.gradle b/build.gradle index 929b403..d1c2f96 100644 --- a/build.gradle +++ b/build.gradle @@ -1,300 +1,69 @@ -buildscript { - repositories { - // These repositories are only for Gradle plugins, put any other repositories in the repository block further below - maven { url = 'https://maven.minecraftforge.net' } - maven { url = 'https://repo.spongepowered.org/repository/maven-public/' } - mavenCentral() - } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true - classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT' - } -} -// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. plugins { - id 'eclipse' - id 'maven-publish' + id 'java' + id 'architectury-plugin' version '3.+' + id 'dev.architectury.loom' version '1.5.+' apply false } -apply plugin: 'net.minecraftforge.gradle' -apply plugin: 'org.spongepowered.mixin' - -mixin { - add sourceSets.main, "${modid}.refmap.json" - config "${modid}.mixins.json" +// Configure architecture plugin +architectury { + minecraft = rootProject.minecraft_version } -version = "${modversion}" -group = 'com.getItemFromBlock.create_tweaked_controllers' // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = 'create_tweaked_controllers' - -// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. -java.toolchain.languageVersion = JavaLanguageVersion.of(17) - -println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" -minecraft { - // The mappings can be changed at any time and must be in the following format. - // Channel: Version: - // official {minecraft_version} Official field/method names from Mojang mapping files - // parchment YYYY.MM.DD-{minecraft_version} Open community-sourced parameter names and javadocs layered on top of official - // - // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. - // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - // - // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge - // Additional setup is needed to use their mappings: https://github.com/ParchmentMC/Parchment/wiki/Getting-Started - // - // Use non-default mappings at your own risk. They may not always work. - // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: 'official', version: '1.18.2' - - // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default. - - // Default run configurations. - // These can be tweaked, removed, or duplicated as needed. - runs { - client { - workingDirectory project.file('run') - - // Recommended logging data for a userdev environment - // The markers can be added/remove as needed separated by commas. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. - property 'forge.logging.markers', 'REGISTRIES' - - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels - property 'forge.logging.console.level', 'debug' - - // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. - property 'forge.enabledGameTestNamespaces', 'create_tweaked_controllers' - - mods { - create_tweaked_controllers { - source sourceSets.main - } - } - } - - server { - workingDirectory project.file('run') - - property 'forge.logging.markers', 'REGISTRIES' - - property 'forge.logging.console.level', 'debug' - - // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. - property 'forge.enabledGameTestNamespaces', 'create_tweaked_controllers' - - mods { - create_tweaked_controllers { - source sourceSets.main - } - } - } - - // This run config launches GameTestServer and runs all registered gametests, then exits. - // By default, the server will crash when no gametests are provided. - // The gametest system is also enabled by default for other run configs under the /test command. - gameTestServer { - workingDirectory project.file('run') - - // Recommended logging data for a userdev environment - // The markers can be added/remove as needed separated by commas. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. - property 'forge.logging.markers', 'REGISTRIES' - - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels - property 'forge.logging.console.level', 'debug' - - // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. - property 'forge.enabledGameTestNamespaces', 'create_tweaked_controllers' - - mods { - create_tweaked_controllers { - source sourceSets.main - } - } - } - - data { - workingDirectory project.file('run') - - property 'forge.logging.markers', 'REGISTRIES' - - property 'forge.logging.console.level', 'debug' +subprojects { + apply plugin: 'dev.architectury.loom' - // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. - args '--mod', 'create_tweaked_controllers', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') - - mods { - create_tweaked_controllers { - source sourceSets.main - } + repositories { + mavenCentral() + maven { url "https://api.modrinth.com/maven" } // CC Restitched, CC Tweaked + maven { url "https://maven.shedaniel.me/" } // Cloth Config + maven { url "https://dvs1.progwml6.com/files/maven/" } // JEI + maven { url "https://maven.parchmentmc.org" } // Parchment Mapping + maven { url "https://cursemaven.com" } // Controllable + maven { // Flywheel + url "https://maven.tterrag.com/" + content { + // need to be specific here due to version overlaps + includeGroup "com.jozufozu.flywheel" } } } -} - -// Include resources generated by data generators. -sourceSets.main.resources { srcDir 'src/generated/resources' } -repositories { - // Put repositories for dependencies here - // ForgeGradle automatically adds the Forge maven and Maven Central for you - - // If you have mod jar dependencies in ./libs, you can declare them as a repository like so: - // flatDir { - // dir 'libs' - // } - - maven { - //CURSE - name "Cursemaven" - url "https://cursemaven.com" - content { - includeGroup "curse.maven" - } + loom { + silentMojangMappingsLicense() } - maven { - //CREATE - name = 'tterrag maven' - url = 'https://maven.tterrag.com/' - } + dependencies { + "minecraft"("com.mojang:minecraft:${rootProject.minecraft_version}") - maven { - // JEI - name 'Progwm16 maven' - url 'https://dvs1.progwml6.com/files/maven' + "mappings"(loom.officialMojangMappings()) + // Yarn mappings commented out + // "mappings"("net.fabricmc:yarn:1.19.2+build.3:v2") } } -dependencies { - // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed - // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied. - // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - - //CREATE - implementation fg.deobf("com.simibubi.create:create-${create_minecraft_version}:${create_version}:slim") { transitive = false } - implementation fg.deobf("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}") - implementation fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}") +allprojects { + apply plugin: 'java' + apply plugin: 'architectury-plugin' + apply plugin: 'maven-publish' - //CONTROLLABLE COMPAT - compileOnly fg.deobf("curse.maven:controllable-${controllable_version}") - - //JEI - compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api") - runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}") - - // CC TWEAKED COMPAT - compileOnly fg.deobf("curse.maven:cc-tweaked-${cc_tweaked_version}") - - //MIXINS - if (System.getProperty('idea.sync.active') != 'true') { - annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor" - } - - // Real mod deobf dependency examples - these get remapped to your current mappings - // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency - // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency - // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency - - // Examples using mod jars from ./libs - // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}") - - // For more info... - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html -} - -// process mods.toml to inject variables -def modsTomlSpec = copySpec{ - from(sourceSets.main.resources) { - include 'META-INF/mods.toml' - expand 'version': modversion, - 'loader_range': loader_range, - 'minecraft_range': minecraft_range, - 'forge_range': forge_range, - 'create_range': create_range, - 'github_project': github_project - } -} + archivesBaseName = rootProject.property('archives_base_name').toString() + version = rootProject.property('version').toString() + group = rootProject.property('maven_group').toString() -// need to copy into each build directory, unfortunately does not seem easy to do this automatically -def buildPaths = [ - "$rootDir/out/production/resources", // IDEA - "$rootDir/bin", // Eclipse -] + // Format mod version + def buildNumber = System.getenv('GITHUB_RUN_NUMBER') + version = "${rootProject.version}+${rootProject.name}-${rootProject.minecraft_version}" + (buildNumber != null ? "-${buildNumber}" : "") -// task to add mods.toml to all relevant folders -task replaceResources { - // ensure directory exists, first build likes to fail - new File("${processResources.destinationDir}/META-INF").mkdirs() - // copy for gradle - copy { - outputs.upToDateWhen { false } - with modsTomlSpec - into processResources.destinationDir - } - // copy for IDEs - buildPaths.each { path -> - if (new File(path).exists()) { - copy { - outputs.upToDateWhen { false } - with modsTomlSpec - into path - } - } + repositories { + // Add repositories here (optional) } -} - -processResources { - exclude 'META-INF/mods.toml' - finalizedBy replaceResources -} -// Example for how to get properties into the manifest for reading at runtime. -jar { - manifest { - attributes([ - "Specification-Title" : "create_tweaked_controllers", - "Specification-Vendor" : "create_tweaked_controllers_sareus", - "Specification-Version" : "1", // We are version 1 of ourselves - "Implementation-Title" : project.name, - "Implementation-Version" : project.jar.archiveVersion, - "Implementation-Vendor" : "create_tweaked_controllers", - "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") - ]) + tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + options.release = 17 } -} -// Example configuration to allow publishing using the maven-publish plugin -// This is the preferred method to reobfuscate your jar file -jar.finalizedBy('reobfJar') -// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing -// publish.dependsOn('reobfJar') - -publishing { - publications { - mavenJava(MavenPublication) { - artifact jar - } - } - repositories { - maven { - url "file://${project.projectDir}/mcmodsrepo" - } + java { + withSourcesJar() } -} - -tasks.withType(JavaCompile).configureEach { - options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation -} +} \ No newline at end of file diff --git a/common/.gitignore b/common/.gitignore new file mode 100644 index 0000000..b63da45 --- /dev/null +++ b/common/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle new file mode 100644 index 0000000..eb3b2f4 --- /dev/null +++ b/common/build.gradle @@ -0,0 +1,40 @@ +architectury { + common(rootProject.enabled_platforms.split(",")) +} + +repositories { + mavenCentral() + // mavens for Create Fabric and dependencies + maven { url "https://mvn.devos.one/snapshots/" } // Create Fabric, Porting Lib, Forge Tags, Milk Lib, Registrate Fabric + maven { url "https://maven.cafeteria.dev/releases" } // Fake Player API + maven { url "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" } // Forge Config API Port + maven { url "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes + maven { url "https://jitpack.io/" } // Mixin Extras, Fabric ASM +} + +dependencies { + // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies + // Do NOT use other classes from fabric loader + modImplementation("net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}") + // Remove the next line if you don't want to depend on the API + modApi("dev.architectury:architectury:${rootProject.architectury_version}") + + modCompileOnly("com.simibubi.create:create-fabric-${rootProject.minecraft_version}:${rootProject.create_fabric_version}+mc${rootProject.minecraft_version}") + + // CC Restitched + modCompileOnly("maven.modrinth:cc-restitched:${rootProject.cc_restitched_version}+${rootProject.minecraft_version}") +} + +publishing { + publications { + mavenCommon(MavenPublication) { + artifactId = rootProject.archives_base_name + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + } +} diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/CreateTweakedControllers.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/CreateTweakedControllers.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/CreateTweakedControllers.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/CreateTweakedControllers.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/ModClientStuff.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/CreateTweakedControllersClient.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/ModClientStuff.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/CreateTweakedControllersClient.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/ModBlockEntityTypes.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/ModBlockEntityTypes.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/ModBlockEntityTypes.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/ModBlockEntityTypes.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/ModClientEvents.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/ModClientEvents.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/ModClientEvents.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/ModClientEvents.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/ModCommonEvents.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/ModCommonEvents.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/ModCommonEvents.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/ModCommonEvents.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/ModTab.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/ModTab.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/ModTab.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/ModTab.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/block/ModBlocks.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/block/ModBlocks.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/block/ModBlocks.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/block/ModBlocks.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/block/TweakedLecternControllerBlock.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/block/TweakedLecternControllerBlock.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/block/TweakedLecternControllerBlock.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/block/TweakedLecternControllerBlock.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/block/TweakedLecternControllerBlockEntity.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/block/TweakedLecternControllerBlockEntity.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/block/TweakedLecternControllerBlockEntity.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/block/TweakedLecternControllerBlockEntity.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/compat/ComputerCraft/ModComputerBehavior.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/compat/ComputerCraft/ModComputerBehavior.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/compat/ComputerCraft/ModComputerBehavior.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/compat/ComputerCraft/ModComputerBehavior.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/compat/ComputerCraft/ModComputerCraftProxy.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/compat/ComputerCraft/ModComputerCraftProxy.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/compat/ComputerCraft/ModComputerCraftProxy.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/compat/ComputerCraft/ModComputerCraftProxy.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/compat/ComputerCraft/ModSyncedPeripheral.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/compat/ComputerCraft/ModSyncedPeripheral.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/compat/ComputerCraft/ModSyncedPeripheral.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/compat/ComputerCraft/ModSyncedPeripheral.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/compat/ComputerCraft/TweakedLecternPeripheral.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/compat/ComputerCraft/TweakedLecternPeripheral.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/compat/ComputerCraft/TweakedLecternPeripheral.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/compat/ComputerCraft/TweakedLecternPeripheral.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/config/ModClientConfig.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/config/ModClientConfig.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/config/ModClientConfig.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/config/ModClientConfig.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/config/ModConfigs.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/config/ModConfigs.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/config/ModConfigs.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/config/ModConfigs.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/config/ModKeyMappings.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/config/ModKeyMappings.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/config/ModKeyMappings.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/config/ModKeyMappings.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/ControlProfile.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/controller/ControlProfile.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/ControlProfile.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/controller/ControlProfile.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/ControlType.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/controller/ControlType.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/ControlType.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/controller/ControlType.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/ControllerRedstoneOutput.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/controller/ControllerRedstoneOutput.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/ControllerRedstoneOutput.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/controller/ControllerRedstoneOutput.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/TweakedControlsUtil.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/controller/TweakedControlsUtil.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/TweakedControlsUtil.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/controller/TweakedControlsUtil.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLecternControllerRenderer.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLecternControllerRenderer.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLecternControllerRenderer.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLecternControllerRenderer.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLinkedControllerClientHandler.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLinkedControllerClientHandler.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLinkedControllerClientHandler.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLinkedControllerClientHandler.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLinkedControllerMenu.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLinkedControllerMenu.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLinkedControllerMenu.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLinkedControllerMenu.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLinkedControllerServerHandler.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLinkedControllerServerHandler.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLinkedControllerServerHandler.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLinkedControllerServerHandler.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ControllerButton.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ControllerButton.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ControllerButton.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ControllerButton.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ControllerButtonRenderer.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ControllerButtonRenderer.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ControllerButtonRenderer.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ControllerButtonRenderer.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ControllerItemSlot.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ControllerItemSlot.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ControllerItemSlot.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ControllerItemSlot.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/DigitIcon.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/DigitIcon.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/DigitIcon.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/DigitIcon.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/DigitIconRenderer.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/DigitIconRenderer.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/DigitIconRenderer.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/DigitIconRenderer.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/ColoredButton.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/ColoredButton.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/ColoredButton.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/ColoredButton.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/GenericInputScreen.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/GenericInputScreen.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/GenericInputScreen.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/GenericInputScreen.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/InputList.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/InputList.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/InputList.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/InputList.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/JoystickAxisScreen.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/JoystickAxisScreen.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/JoystickAxisScreen.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/JoystickAxisScreen.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/JoystickButtonScreen.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/JoystickButtonScreen.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/JoystickButtonScreen.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/JoystickButtonScreen.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/KeyboardInputScreen.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/KeyboardInputScreen.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/KeyboardInputScreen.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/KeyboardInputScreen.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/MouseAxisScreen.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/MouseAxisScreen.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/MouseAxisScreen.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/MouseAxisScreen.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/MouseButtonScreen.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/MouseButtonScreen.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/MouseButtonScreen.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/InputConfig/MouseButtonScreen.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/JoystickIcon.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/JoystickIcon.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/JoystickIcon.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/JoystickIcon.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ModConfigScreen.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ModConfigScreen.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ModConfigScreen.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ModConfigScreen.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ModControllerConfigScreen.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ModControllerConfigScreen.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ModControllerConfigScreen.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ModControllerConfigScreen.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ModGuiTextures.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ModGuiTextures.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ModGuiTextures.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ModGuiTextures.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ModIcons.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ModIcons.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ModIcons.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ModIcons.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ModMainConfigButton.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ModMainConfigButton.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ModMainConfigButton.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ModMainConfigButton.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ModMenuTypes.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ModMenuTypes.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ModMenuTypes.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/ModMenuTypes.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/PlainRect.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/PlainRect.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/PlainRect.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/PlainRect.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/PlainRectRenderer.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/PlainRectRenderer.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/PlainRectRenderer.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/PlainRectRenderer.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/TooltipButton.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/TooltipButton.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/TooltipButton.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/TooltipButton.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/TweakedLinkedControllerScreen.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/TweakedLinkedControllerScreen.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/TweakedLinkedControllerScreen.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/gui/TweakedLinkedControllerScreen.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/input/GamepadInputs.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/input/GamepadInputs.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/input/GamepadInputs.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/input/GamepadInputs.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/input/GenericInput.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/input/GenericInput.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/input/GenericInput.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/input/GenericInput.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/input/JoystickAxisInput.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/input/JoystickAxisInput.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/input/JoystickAxisInput.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/input/JoystickAxisInput.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/input/JoystickButtonInput.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/input/JoystickButtonInput.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/input/JoystickButtonInput.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/input/JoystickButtonInput.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/input/JoystickInputs.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/input/JoystickInputs.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/input/JoystickInputs.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/input/JoystickInputs.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/input/KeyboardInput.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/input/KeyboardInput.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/input/KeyboardInput.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/input/KeyboardInput.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/input/ModInputEvents.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/input/ModInputEvents.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/input/ModInputEvents.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/input/ModInputEvents.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/input/MouseAxisInput.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/input/MouseAxisInput.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/input/MouseAxisInput.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/input/MouseAxisInput.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/input/MouseButtonInput.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/input/MouseButtonInput.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/input/MouseButtonInput.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/input/MouseButtonInput.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/input/MouseCursorHandler.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/input/MouseCursorHandler.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/input/MouseCursorHandler.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/input/MouseCursorHandler.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/item/ModItems.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/item/ModItems.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/item/ModItems.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/item/ModItems.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/item/TweakedLinkedControllerItem.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/item/TweakedLinkedControllerItem.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/item/TweakedLinkedControllerItem.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/item/TweakedLinkedControllerItem.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/item/TweakedLinkedControllerItemRenderer.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/item/TweakedLinkedControllerItemRenderer.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/item/TweakedLinkedControllerItemRenderer.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/item/TweakedLinkedControllerItemRenderer.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/mixin/KineticBlockEntityMixin.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/mixin/KineticBlockEntityMixin.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/mixin/KineticBlockEntityMixin.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/mixin/KineticBlockEntityMixin.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/packet/ModPackets.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/packet/ModPackets.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/packet/ModPackets.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/packet/ModPackets.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerAxisPacket.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerAxisPacket.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerAxisPacket.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerAxisPacket.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerBindPacket.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerBindPacket.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerBindPacket.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerBindPacket.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerButtonPacket.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerButtonPacket.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerButtonPacket.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerButtonPacket.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerPacketBase.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerPacketBase.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerPacketBase.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerPacketBase.java diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerStopLecternPacket.java b/common/src/main/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerStopLecternPacket.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerStopLecternPacket.java rename to common/src/main/com/getitemfromblock/create_tweaked_controllers/packet/TweakedLinkedControllerStopLecternPacket.java diff --git a/src/main/resources/assets/create_tweaked_controllers/blockstates/tweaked_lectern_controller.json b/common/src/main/resources/assets/create_tweaked_controllers/blockstates/tweaked_lectern_controller.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/blockstates/tweaked_lectern_controller.json rename to common/src/main/resources/assets/create_tweaked_controllers/blockstates/tweaked_lectern_controller.json diff --git a/src/main/resources/assets/create_tweaked_controllers/lang/en_us.json b/common/src/main/resources/assets/create_tweaked_controllers/lang/en_us.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/lang/en_us.json rename to common/src/main/resources/assets/create_tweaked_controllers/lang/en_us.json diff --git a/src/main/resources/assets/create_tweaked_controllers/lang/fr_fr.json b/common/src/main/resources/assets/create_tweaked_controllers/lang/fr_fr.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/lang/fr_fr.json rename to common/src/main/resources/assets/create_tweaked_controllers/lang/fr_fr.json diff --git a/src/main/resources/assets/create_tweaked_controllers/lang/ko_kr.json b/common/src/main/resources/assets/create_tweaked_controllers/lang/ko_kr.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/lang/ko_kr.json rename to common/src/main/resources/assets/create_tweaked_controllers/lang/ko_kr.json diff --git a/src/main/resources/assets/create_tweaked_controllers/lang/zh_cn.json b/common/src/main/resources/assets/create_tweaked_controllers/lang/zh_cn.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/lang/zh_cn.json rename to common/src/main/resources/assets/create_tweaked_controllers/lang/zh_cn.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_n_a.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_n_a.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_n_a.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_n_a.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_n_b.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_n_b.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_n_b.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_n_b.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_n_x.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_n_x.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_n_x.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_n_x.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_n_y.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_n_y.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_n_y.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_n_y.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_p_c.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_p_c.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_p_c.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_p_c.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_p_s.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_p_s.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_p_s.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_p_s.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_p_t.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_p_t.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_p_t.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_p_t.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_p_x.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_p_x.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_p_x.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_p_x.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_x_a.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_x_a.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_x_a.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_x_a.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_x_b.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_x_b.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_x_b.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_x_b.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_x_x.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_x_x.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_x_x.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_x_x.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_x_y.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_x_y.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_x_y.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/button_x_y.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/controller_n.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/controller_n.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/controller_n.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/controller_n.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/controller_p.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/controller_p.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/controller_p.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/controller_p.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/controller_x.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/controller_x.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/controller_x.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/controller_x.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/item.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/item.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/item.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/item.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/joystick.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/joystick.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/joystick.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/joystick.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/powered.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/powered.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/powered.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/powered.json diff --git a/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/trigger.json b/common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/trigger.json similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/trigger.json rename to common/src/main/resources/assets/create_tweaked_controllers/models/item/tweaked_linked_controller/trigger.json diff --git a/src/main/resources/assets/create_tweaked_controllers/textures/gui/controller_background.png b/common/src/main/resources/assets/create_tweaked_controllers/textures/gui/controller_background.png similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/textures/gui/controller_background.png rename to common/src/main/resources/assets/create_tweaked_controllers/textures/gui/controller_background.png diff --git a/src/main/resources/assets/create_tweaked_controllers/textures/gui/controller_background_oof.png b/common/src/main/resources/assets/create_tweaked_controllers/textures/gui/controller_background_oof.png similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/textures/gui/controller_background_oof.png rename to common/src/main/resources/assets/create_tweaked_controllers/textures/gui/controller_background_oof.png diff --git a/src/main/resources/assets/create_tweaked_controllers/textures/gui/controller_buttons.png b/common/src/main/resources/assets/create_tweaked_controllers/textures/gui/controller_buttons.png similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/textures/gui/controller_buttons.png rename to common/src/main/resources/assets/create_tweaked_controllers/textures/gui/controller_buttons.png diff --git a/src/main/resources/assets/create_tweaked_controllers/textures/gui/digits.png b/common/src/main/resources/assets/create_tweaked_controllers/textures/gui/digits.png similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/textures/gui/digits.png rename to common/src/main/resources/assets/create_tweaked_controllers/textures/gui/digits.png diff --git a/src/main/resources/assets/create_tweaked_controllers/textures/gui/icons.png b/common/src/main/resources/assets/create_tweaked_controllers/textures/gui/icons.png similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/textures/gui/icons.png rename to common/src/main/resources/assets/create_tweaked_controllers/textures/gui/icons.png diff --git a/src/main/resources/assets/create_tweaked_controllers/textures/gui/tweaked_linked_controller_0.png b/common/src/main/resources/assets/create_tweaked_controllers/textures/gui/tweaked_linked_controller_0.png similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/textures/gui/tweaked_linked_controller_0.png rename to common/src/main/resources/assets/create_tweaked_controllers/textures/gui/tweaked_linked_controller_0.png diff --git a/src/main/resources/assets/create_tweaked_controllers/textures/gui/tweaked_linked_controller_1.png b/common/src/main/resources/assets/create_tweaked_controllers/textures/gui/tweaked_linked_controller_1.png similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/textures/gui/tweaked_linked_controller_1.png rename to common/src/main/resources/assets/create_tweaked_controllers/textures/gui/tweaked_linked_controller_1.png diff --git a/src/main/resources/assets/create_tweaked_controllers/textures/item/tweaked_linked_controller.png b/common/src/main/resources/assets/create_tweaked_controllers/textures/item/tweaked_linked_controller.png similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/textures/item/tweaked_linked_controller.png rename to common/src/main/resources/assets/create_tweaked_controllers/textures/item/tweaked_linked_controller.png diff --git a/src/main/resources/assets/create_tweaked_controllers/textures/item/tweaked_linked_controller_back.png b/common/src/main/resources/assets/create_tweaked_controllers/textures/item/tweaked_linked_controller_back.png similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/textures/item/tweaked_linked_controller_back.png rename to common/src/main/resources/assets/create_tweaked_controllers/textures/item/tweaked_linked_controller_back.png diff --git a/src/main/resources/assets/create_tweaked_controllers/textures/item/tweaked_linked_controller_powered.png b/common/src/main/resources/assets/create_tweaked_controllers/textures/item/tweaked_linked_controller_powered.png similarity index 100% rename from src/main/resources/assets/create_tweaked_controllers/textures/item/tweaked_linked_controller_powered.png rename to common/src/main/resources/assets/create_tweaked_controllers/textures/item/tweaked_linked_controller_powered.png diff --git a/src/main/resources/create_tweaked_controllers.mixins.json b/common/src/main/resources/create_tweaked_controllers.mixins.json similarity index 100% rename from src/main/resources/create_tweaked_controllers.mixins.json rename to common/src/main/resources/create_tweaked_controllers.mixins.json diff --git a/src/main/resources/data/create_tweaked_controllers/recipes/crafting/tweaked_linked_controller.json b/common/src/main/resources/data/create_tweaked_controllers/recipes/crafting/tweaked_linked_controller.json similarity index 100% rename from src/main/resources/data/create_tweaked_controllers/recipes/crafting/tweaked_linked_controller.json rename to common/src/main/resources/data/create_tweaked_controllers/recipes/crafting/tweaked_linked_controller.json diff --git a/src/main/resources/data/create_tweaked_controllers/vs_mass/masses.json b/common/src/main/resources/data/create_tweaked_controllers/vs_mass/masses.json similarity index 100% rename from src/main/resources/data/create_tweaked_controllers/vs_mass/masses.json rename to common/src/main/resources/data/create_tweaked_controllers/vs_mass/masses.json diff --git a/fabric/.gitignore b/fabric/.gitignore new file mode 100644 index 0000000..b63da45 --- /dev/null +++ b/fabric/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/fabric/build.gradle b/fabric/build.gradle new file mode 100644 index 0000000..9ab3481 --- /dev/null +++ b/fabric/build.gradle @@ -0,0 +1,99 @@ +plugins { + id "com.github.johnrengelman.shadow" version "7.1.2" +} + +architectury { + platformSetupLoomIde() + fabric() +} + + +configurations { + common + shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files. + compileClasspath.extendsFrom common + runtimeClasspath.extendsFrom common + developmentFabric.extendsFrom common +} + +repositories { + mavenCentral() + // mavens for Create Fabric and dependencies + maven { url "https://maven.terraformersmc.com/" } + maven { url "https://mvn.devos.one/snapshots/" } // Create Fabric, Porting Lib, Forge Tags, Milk Lib, Registrate Fabric + maven { url "https://maven.cafeteria.dev/releases" } // Fake Player API + maven { url "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" } // Forge Config API Port + maven { url "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes + maven { url "https://jitpack.io/" } // Mixin Extras, Fabric ASM +} + +dependencies { + modImplementation("net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}") + modApi("net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}") + // Remove the next line if you don't want to depend on the API + modApi("dev.architectury:architectury-fabric:${rootProject.architectury_version}") + + + common(project(path: ":common", configuration: "namedElements")) { transitive false } + shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } + + modImplementation("com.simibubi.create:create-fabric-${rootProject.minecraft_version}:${rootProject.create_fabric_version}+mc${rootProject.minecraft_version}") + + // CC Restitched + modRuntimeOnly("maven.modrinth:cc-restitched:${rootProject.cc_restitched_version}+${rootProject.minecraft_version}") + + // Recipe Viewer + modLocalRuntime("dev.emi:emi:${rootProject.emi_version}+${rootProject.minecraft_version}") +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + expand "name": project.name + expand "archives_base_name": project.archives_base_name + expand "description": project.description + expand "github_project": project.github_project + } +} + +shadowJar { + exclude "architectury.common.json" + + configurations = [project.configurations.shadowCommon] + archiveClassifier = "dev-shadow" +} + +remapJar { + injectAccessWidener = true + input.set shadowJar.archiveFile + dependsOn shadowJar +} + +sourcesJar { + def commonSources = project(":common").sourcesJar + dependsOn commonSources + from commonSources.archiveFile.map { zipTree(it) } +} + +components.java { + withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) { + skip() + } +} + +publishing { + publications { + mavenFabric(MavenPublication) { + artifactId = rootProject.archives_base_name + "-" + project.name + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + } +} + diff --git a/fabric/src/main/com/getitemfromblock/create_tweaked_controllers/CreateTweakedControllerFabric.java b/fabric/src/main/com/getitemfromblock/create_tweaked_controllers/CreateTweakedControllerFabric.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/logo.png b/fabric/src/main/resources/assets/create_tweaked_controllers/logo.png similarity index 100% rename from src/main/resources/logo.png rename to fabric/src/main/resources/assets/create_tweaked_controllers/logo.png diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..d298129 --- /dev/null +++ b/fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,28 @@ +{ + "schemaVersion": 1, + "id": "${archives_base_name}", + "version": "${version}", + "name": "${name}", + "description": "${description}", + "authors": [ + "getItemFromBlock" + ], + "contact": { + "sources": "https://github.com/${github_project}/" + }, + "license": "MIT", + "icon": "assets/create_tweaked_controllers/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "com.getitemfromblock.create_tweaked_controller.fabric.TextBlockFabric" + ], + "client": [ + "io.github.slimeymc.text_block.fabric.TextBlockClientFabric" + ] + }, + "depends": { + "minecraft": "1.18.2", + "fabricloader": ">=0.14.21" + } +} \ No newline at end of file diff --git a/forge/.gitignore b/forge/.gitignore new file mode 100644 index 0000000..b63da45 --- /dev/null +++ b/forge/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/forge/build.gradle b/forge/build.gradle new file mode 100644 index 0000000..873156f --- /dev/null +++ b/forge/build.gradle @@ -0,0 +1,97 @@ +plugins { + id "com.github.johnrengelman.shadow" version "7.1.2" +} + +architectury { + platformSetupLoomIde() + forge() +} + +configurations { + common + shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files. + compileClasspath.extendsFrom common + runtimeClasspath.extendsFrom common + developmentForge.extendsFrom common +} + +repositories { + // mavens for Forge-exclusives + maven { url = "https://maven.theillusivec4.top/" } // Curios + maven { // Create Forge and Registrate Forge + url = "https://maven.tterrag.com/" + content { + includeGroup("com.tterrag.registrate") + includeGroup("com.simibubi.create") + } + maven { url = uri("https://thedarkcolour.github.io/KotlinForForge/") } + } +} + +dependencies { + forge("net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}") + // Remove the next line if you don't want to depend on the API + modApi("dev.architectury:architectury-forge:${rootProject.architectury_version}") + + common(project(path: ":common", configuration: "namedElements")) { transitive false } + shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } + + // Create + modImplementation("com.simibubi.create:create-${rootProject.minecraft_version}:${rootProject.create_forge_version}") { transitive = false } + + // CC Tweaked + modRuntimeOnly("maven.modrinth:cc-tweaked:${rootProject.minecraft_version}-${rootProject.cc_tweaked_version}") + + // Controllable + modRuntimeOnly("curse.maven:controllable-317269:${rootProject.controllable_version}") + + // Recipe viewer + modLocalRuntime("mezz.jei:jei-${rootProject.minecraft_version}:${rootProject.jei_version}") +} + +processResources { + inputs.property "version", project.version + + filesMatching("META-INF/mods.toml") { + expand "version": project.version + } +} + +shadowJar { + exclude "fabric.mod.json" + exclude "architectury.common.json" + + configurations = [project.configurations.shadowCommon] + archiveClassifier = "dev-shadow" +} + +remapJar { + input.set shadowJar.archiveFile + dependsOn shadowJar +} + +sourcesJar { + def commonSources = project(":common").sourcesJar + dependsOn commonSources + from commonSources.archiveFile.map { zipTree(it) } +} + +components.java { + withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) { + skip() + } +} + +publishing { + publications { + mavenForge(MavenPublication) { + artifactId = rootProject.archives_base_name + "-" + project.name + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + } +} diff --git a/forge/gradle.properties b/forge/gradle.properties new file mode 100644 index 0000000..20e9de3 --- /dev/null +++ b/forge/gradle.properties @@ -0,0 +1,3 @@ +loom.platform=forge +loader_platform=Forge +kotlin.stdlib.default.dependency=false diff --git a/forge/src/main/com/getitemfromblock/create_tweaked_controllers/CreateTweakedControllersForge.java b/forge/src/main/com/getitemfromblock/create_tweaked_controllers/CreateTweakedControllersForge.java new file mode 100644 index 0000000..407f157 --- /dev/null +++ b/forge/src/main/com/getitemfromblock/create_tweaked_controllers/CreateTweakedControllersForge.java @@ -0,0 +1,7 @@ +package org.example; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} \ No newline at end of file diff --git a/src/main/java/com/getitemfromblock/create_tweaked_controllers/compat/Controllable/ControllerHandler.java b/forge/src/main/com/getitemfromblock/create_tweaked_controllers/compat/Controllable/ControllerHandler.java similarity index 100% rename from src/main/java/com/getitemfromblock/create_tweaked_controllers/compat/Controllable/ControllerHandler.java rename to forge/src/main/com/getitemfromblock/create_tweaked_controllers/compat/Controllable/ControllerHandler.java diff --git a/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml similarity index 100% rename from src/main/resources/META-INF/mods.toml rename to forge/src/main/resources/META-INF/mods.toml diff --git a/forge/src/main/resources/logo.png b/forge/src/main/resources/logo.png new file mode 100644 index 0000000..b72c00e Binary files /dev/null and b/forge/src/main/resources/logo.png differ diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..b6bc3ed --- /dev/null +++ b/forge/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "Create Tweaked Controllers resources", + "pack_format": 9 + } +} diff --git a/gradle.properties b/gradle.properties index fa261b6..4a1ad78 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,31 +3,47 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -modid = create_tweaked_controllers -modversion = 1.18.2-1.2.4 +maven_group = com.getItemFromBlock.create_tweaked_controllers +name = create_tweaked_controllers +archives_base_name = create_tweaked_controllers +version = 1.18.2-1.2.4 + +description = A Create Addon that adds a way of controlling contraptions using an advanced controller. Compatible with Create 0.5.1+ minecraft_version = 1.18.2 -minecraft_range = [1.18.2,1.19) -forge_version = 40.1.60 -loader_range = [40,) -forge_range = [40.1.21,) +minecraft_range = [1.18.2,1.19) +# what this is ^ -mixingradle_version = 0.7-SNAPSHOT -mixin_version = 0.8.5 +architectury_version = 4.11.93 +enabled_platforms=fabric,forge -jei_version = 9.7.0.209 +# Fabric +fabric_loader_version = 0.15.7 +fabric_api_version = 0.77.0+1.18.2 + +# Forge +forge_version = 40.2.17 +loader_range = [40,) +forge_range = [40.2.17,) -controllable_version = 317269:4376751 +create_fabric_version = 0.5.1-f-build.1415 +create_forge_version = 0.5.1.f-332 -create_minecraft_version = 1.18.2 -flywheel_minecraft_version = 1.18.2 -create_version = 0.5.1.c-297 flywheel_version = 0.6.9-101 registrate_version = MC1.18.2-1.1.3 create_range = [0.5.1.a,) -cc_tweaked_version = 282001:4630521 +jei_version = 9.7.0.209 +emi_version = 0.7.3 + +cc_restitched_version = 1.100.8 +cc_tweaked_version = 1.101.3 + +controllable_version = 4376751 + +mixingradle_version = 0.7-SNAPSHOT +mixin_version = 0.8.5 # GitHub information github_project = getItemFromBlock/Create-Tweaked-Controllers \ No newline at end of file diff --git a/gradle/libs.version.toml b/gradle/libs.version.toml new file mode 100644 index 0000000..0b5cd88 --- /dev/null +++ b/gradle/libs.version.toml @@ -0,0 +1,47 @@ +[versions] +kotlin = "1.8.21" +minecraft = "1.18.2" +architectury = "4.11.93" # Might check each subproject + +forge = "1.18.2-40.2.4" + +fabric_loader = "0.15.7" +fabric_api = "0.77.0+1.18.2" + +create_fabric = "0.5.1-f-build.1415" +create_forge = "0.5.1.f-332" + +cc_restitched = "1.100.8+1.18.2" +cc_tweaked = "1.18.2-1.101.3" + +jei = "9.7.0.209" +emi = "0.7.3+1.18.2" + +[libraries] +minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } +common_architectury = { module = "dev.architectury:architectury", version.ref = "architectury" } + +# Forge +forge_architectury = { module = "dev.architectury:architectury-forge", version.ref = "architectury" } +forge = { module = "net.minecraftforge:forge", version.ref = "forge" } + +# Fabric +fabric_architectury = { module = "dev.architectury:architectury-fabric", version.ref = "architectury" } +fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" } +fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" } + +# Create +fabric_create = { module = "com.simibubi.create:create-fabric-1.18.2", version.ref = "create_fabric" } +forge_create = { module = "com.simibubi.create:create-1.18.2", version.ref = "create_forge" } + +# ComputerCraft +fabric_computercraft = { module = "maven.modrinth:cc-restitched", version.ref = "cc_restitched" } +forge_computercraft = { module = "maven.modrinth:cc-tweaked", version.ref = "cc_tweaked" } + +# Controllable +# forge_controllable = { module = "com.mrcrayfish:controllable-forge"} +forge_controllable = { module = "curse.maven:controllable-317269", version = "4376751" } + +# Recipe Viewer +fabric_emi = { module = "dev.emi:emi", version.ref = "emi" } +forge_jei = { module = "mezz.jei:jei-1.18.2", version.ref = "jei"} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..db9a6b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..7710790 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,24 @@ +pluginManagement { + repositories { + maven { + name = "fabricmc" + url = uri("https://maven.fabricmc.net/") + } + maven { + name = "architectury" + url = uri("https://maven.architectury.dev/") + } + maven { + name = "forgemc" + url = uri("https://maven.minecraftforge.net/") + } + gradlePluginPortal() + } +} + +include("common") +include("fabric") +include("forge") + +rootProject.name = "create_tweaked_controllers" + diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta deleted file mode 100644 index 86d9caf..0000000 --- a/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,8 +0,0 @@ -{ - "pack": { - "description": "Create Tweaked Controllers resources", - "pack_format": 9, - "forge:resource_pack_format": 8, - "forge:data_pack_format": 9 - } -}