diff --git a/.gitignore b/.gitignore index 0ae64fe2..a40ef764 100644 --- a/.gitignore +++ b/.gitignore @@ -1,108 +1,33 @@ -# Created by .ignore support plugin (hsz.mobi) -### Maven template -target/ -*/target -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties -### NetBeans template -nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ -nbactions.xml -.nb-gradle/ -### Eclipse template +### Java files ### +*.class -.metadata -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.settings/ -.loadpath -.recommenders +# Package Files +#*.jar +*.war +*.ear -# Eclipse Core -.project +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* -# External tool builders -.externalToolBuilders/ -# Locally stored "Eclipse launch configurations" -*.launch -# PyDev specific (Python IDE for Eclipse) -*.pydevproject - -# CDT-specific (C/C++ Development Tooling) -.cproject - -# JDT-specific (Eclipse Java Development Tools) -.classpath - -# Java annotation processor (APT) -.factorypath - -# PDT-specific (PHP Development Tools) -.buildpath - -# sbteclipse plugin -.target - -# Tern plugin -.tern-project - -# TeXlipse plugin -.texlipse - -# STS (Spring Tool Suite) -.springBeans - -# Code Recommenders -.recommenders/ -### JetBrains template -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff: -.idea/workspace.xml -.idea/tasks.xml -.idea/dictionaries -.idea/vcs.xml -.idea/ +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm +# Ignore project files *.iml -.idea/jsLibraryMappings.xml -# Sensitive or high-churn files: -.idea/dataSources.ids -.idea/dataSources.xml -.idea/dataSources.local.xml -.idea/sqlDataSources.xml -.idea/dynamic.xml -.idea/uiDesigner.xml +# Ignore IDEA directory +.idea/* -# Gradle: -.idea/gradle.xml -.idea/libraries +# Include the project's dictionary +!.idea/dictionaries/ +!.idea/dictionaries/* -# Mongo Explorer plugin: -.idea/mongoSettings.xml - -## File-based project format: +# File-based project format: +*.ipr *.iws -## Plugin-specific files: - +### Plugin-specific files: ### # IntelliJ /out/ @@ -116,18 +41,73 @@ atlassian-ide-plugin.xml com_crashlytics_export_strings.xml crashlytics.properties crashlytics-build.properties -fabric.properties -### Java template -*.class -# Mobile Tools for Java (J2ME) -.mtj.tmp/ -# Package Files # -*.jar -*.war -*.ear -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* +### Eclipse ### +*.pydevproject +.metadata +.gradle +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +# Eclipse Core +.project + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# JDT-specific (Eclipse Java Development Tools) +.classpath + +# PDT-specific +.buildpath + +# sbteclipse plugin +.target + +# TeXlipse plugin +.texlipse + + + +### Maven ### +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties + + + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml +.nb-gradle/ + + + +### Git ### +# Don't exclude the .gitignore itself +!.gitignore diff --git a/all/pom.xml b/all/pom.xml deleted file mode 100644 index cb0daefd..00000000 --- a/all/pom.xml +++ /dev/null @@ -1,151 +0,0 @@ - - - - - 4.0.0 - - viabackwards-parent - nl.matsv - 3.3.0-21w06a - - - viabackwards-all - ViaBackwards - - - ${project.name}-${project.version} - clean install - - - - - net.md-5 - scriptus - 0.3.2 - - git-ViaBackwards-${project.parent.version}:%s - - - - initialize - - describe - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - - - ${describe} - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - false - false - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.2 - - false - false - - - com.google.gson - us.myles.viaversion.libs.gson - - - net.md_5.bungee - us.myles.viaversion.libs.bungeecordchat - - net.md_5.bungee.api.chat.** - net.md_5.bungee.api.ChatColor - net.md_5.bungee.api.ChatMessageType - net.md_5.bungee.chat.** - - - - - - - package - - shade - - - - - - - - - - nl.matsv - viabackwards-core - ${project.parent.version} - compile - - - - nl.matsv - viabackwards-bukkit - ${project.parent.version} - compile - - - - nl.matsv - viabackwards-bungee - ${project.parent.version} - compile - - - - nl.matsv - viabackwards-fabric - ${project.parent.version} - compile - - - - nl.matsv - viabackwards-sponge - ${project.parent.version} - compile - - - - nl.matsv - viabackwards-velocity - ${project.parent.version} - compile - - - diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..c8390f59 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,71 @@ +import net.kyori.indra.IndraPlugin +import net.kyori.indra.IndraPublishingPlugin +import net.kyori.indra.sonatypeSnapshots + +plugins { + `java-library` + `maven-publish` + id("net.kyori.indra") +} + +group = "com.viaversion" +version = "3.3.0-21w07a" +description = "Allow older clients to join newer server versions." + +subprojects { + apply() + apply() + apply() + apply() + + tasks { + // Variable replacements + processResources { + filesMatching(listOf("plugin.yml", "mcmod.info", "fabric.mod.json", "bungee.yml")) { + expand("version" to project.version, + "description" to project.description, + "url" to "https://github.com/ViaVersion/ViaBackwards") + } + } + withType { + options.compilerArgs.addAll(listOf("-nowarn", "-Xlint:-unchecked", "-Xlint:-deprecation")) + } + } + + val platforms = listOf( + "bukkit", + "bungee", + "sponge", + "velocity", + "fabric" + ).map { "viabackwards-$it" } + if (platforms.contains(project.name)) { + configureShadowJar() + } + + repositories { + sonatypeSnapshots() + maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") + maven("https://nexus.velocitypowered.com/repository/velocity-artifacts-snapshots/") + maven("https://repo.spongepowered.org/maven") + maven("https://repo.viaversion.com") + maven("https://repo.maven.apache.org/maven2/") + } + + indra { + javaVersions { + target.set(8) + testWith(8, 11, 15) + } + github("ViaVersion", "ViaBackwards") { + issues = true + } + mitLicense() + } +} + +tasks { + withType { + onlyIf { false } + } +} diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 00000000..3b0f9bc2 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + `kotlin-dsl` +} + +repositories { + gradlePluginPortal() +} + +dependencies { + implementation("net.kyori", "indra-common", "1.3.1") + implementation("net.kyori", "indra-publishing-gradle-plugin", "1.3.1") + implementation("com.github.jengelman.gradle.plugins", "shadow", "6.1.0") +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt new file mode 100644 index 00000000..f8d1567c --- /dev/null +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -0,0 +1,15 @@ +object Versions { + // ViaVersion + const val viaversion = "3.3.0-21w07a" + + // Common + const val netty = "4.0.20.Final" + const val gson = "2.8.6" + const val jetbrainsAnnotations = "19.0.0" + + // Platforms + const val spigot = "1.16.5-R0.1-SNAPSHOT" + const val bungee = "1.15-SNAPSHOT" + const val sponge = "5.0.0-SNAPSHOT" + const val velocityApi = "1.1.0-SNAPSHOT" +} diff --git a/buildSrc/src/main/kotlin/extensions.kt b/buildSrc/src/main/kotlin/extensions.kt new file mode 100644 index 00000000..8aef8e74 --- /dev/null +++ b/buildSrc/src/main/kotlin/extensions.kt @@ -0,0 +1,34 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin +import org.gradle.api.Project +import org.gradle.kotlin.dsl.apply +import org.gradle.kotlin.dsl.invoke +import org.gradle.kotlin.dsl.withType +import java.io.ByteArrayOutputStream + +fun Project.configureShadowJar() { + apply() + tasks { + withType { + archiveClassifier.set("") + archiveFileName.set("ViaBackwards-${project.name.substringAfter("viabackwards-").capitalize()}-${project.version}.jar") + destinationDirectory.set(rootProject.projectDir.resolve("build/libs")) + configureRelocations() + } + getByName("build") { + dependsOn(withType()) + } + } +} + +private fun ShadowJar.configureRelocations() { +} + +fun Project.latestCommitHash(): String { + val byteOut = ByteArrayOutputStream() + exec { + commandLine = listOf("git", "rev-parse", "--short", "HEAD") + standardOutput = byteOut + } + return byteOut.toString(Charsets.UTF_8.name()).trim() +} diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts new file mode 100644 index 00000000..af846bbb --- /dev/null +++ b/bukkit/build.gradle.kts @@ -0,0 +1,7 @@ +dependencies { + implementation(project(":viabackwards-common")) + compileOnly("org.spigotmc", "spigot-api", Versions.spigot) { + exclude("com.google.code.gson", "gson") + exclude("javax.persistence", "persistence-api") + } +} diff --git a/bukkit/pom.xml b/bukkit/pom.xml deleted file mode 100644 index 4bb27ddc..00000000 --- a/bukkit/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - 4.0.0 - - viabackwards-parent - nl.matsv - 3.3.0-21w06a - - - viabackwards-bukkit - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - - - org.spigotmc - spigot-api - 1.16.1-R0.1-SNAPSHOT - provided - - - nl.matsv - viabackwards-core - ${project.parent.version} - compile - - - - - - - . - true - src/main/resources/ - - * - - - - - \ No newline at end of file diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index 2a23fb0b..c8cce9b3 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -1,11 +1,11 @@ name: ViaBackwards -version: ${project.version} +version: ${version} description: Allow older Minecraft versions to connect to a newer server version. main: nl.matsv.viabackwards.BukkitPlugin api-version: 1.13 authors: [Matsv, KennyTV, Gerrygames, creeper123123321, ForceUpdate1] -website: ${project.url} +website: ${url} load: STARTUP depend: [ViaVersion] diff --git a/bungee/build.gradle.kts b/bungee/build.gradle.kts new file mode 100644 index 00000000..69f07b3c --- /dev/null +++ b/bungee/build.gradle.kts @@ -0,0 +1,4 @@ +dependencies { + implementation(project(":viabackwards-common")) + compileOnly("net.md-5", "bungeecord-api", Versions.bungee) +} diff --git a/bungee/pom.xml b/bungee/pom.xml deleted file mode 100644 index cfc55c1a..00000000 --- a/bungee/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - 4.0.0 - - viabackwards-parent - nl.matsv - 3.3.0-21w06a - - - viabackwards-bungee - - - - - bungeecord-repo - https://oss.sonatype.org/content/repositories/snapshots - - - - - - - net.md-5 - bungeecord-api - 1.15-SNAPSHOT - provided - - - - - nl.matsv - viabackwards-core - ${project.parent.version} - compile - - - - - - - . - true - src/main/resources/ - - * - - - - - \ No newline at end of file diff --git a/bungee/src/main/resources/bungee.yml b/bungee/src/main/resources/bungee.yml index abc6be73..4a26a839 100644 --- a/bungee/src/main/resources/bungee.yml +++ b/bungee/src/main/resources/bungee.yml @@ -1,5 +1,5 @@ name: ViaBackwards main: nl.matsv.viabackwards.BungeePlugin author: "Matsv, KennyTV, Gerrygames, creeper123123321, ForceUpdate1" -version: ${project.version} +version: ${version} depends: [ViaVersion] \ No newline at end of file diff --git a/common/build.gradle.kts b/common/build.gradle.kts new file mode 100644 index 00000000..17bce47a --- /dev/null +++ b/common/build.gradle.kts @@ -0,0 +1,14 @@ +plugins { + id("net.kyori.blossom") version "1.1.0" +} + +blossom { + replaceToken("\$VERSION", project.version) + replaceToken("\$IMPL_VERSION", "git-ViaBackwards-${project.version}:${rootProject.latestCommitHash()}") +} + +dependencies { + compileOnly("io.netty", "netty-all", Versions.netty) + compileOnlyApi("us.myles", "viaversion", Versions.viaversion) + compileOnlyApi("org.jetbrains", "annotations", Versions.jetbrainsAnnotations) +} \ No newline at end of file diff --git a/core/src/main/java/nl/matsv/viabackwards/ViaBackwards.java b/common/src/main/java/nl/matsv/viabackwards/ViaBackwards.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/ViaBackwards.java rename to common/src/main/java/nl/matsv/viabackwards/ViaBackwards.java diff --git a/core/src/main/java/nl/matsv/viabackwards/ViaBackwardsConfig.java b/common/src/main/java/nl/matsv/viabackwards/ViaBackwardsConfig.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/ViaBackwardsConfig.java rename to common/src/main/java/nl/matsv/viabackwards/ViaBackwardsConfig.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java b/common/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java rename to common/src/main/java/nl/matsv/viabackwards/api/BackwardsProtocol.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsConfig.java b/common/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsConfig.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsConfig.java rename to common/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsConfig.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java b/common/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java similarity index 97% rename from core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java rename to common/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java index 255ba9c6..112670aa 100644 --- a/core/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java +++ b/common/src/main/java/nl/matsv/viabackwards/api/ViaBackwardsPlatform.java @@ -48,6 +48,7 @@ import static us.myles.ViaVersion.api.protocol.ProtocolRegistry.registerProtocol public interface ViaBackwardsPlatform { String MINIMUM_VV_VERSION = "3.3.0"; + String IMPL_VERSION = "$IMPL_VERSION"; /** * Initialize ViaBackwards. @@ -60,8 +61,7 @@ public interface ViaBackwardsPlatform { if (isOutdated()) return; - String version = ViaBackwards.class.getPackage().getImplementationVersion(); - Via.getManager().getSubPlatforms().add(version != null ? version : "UNKNOWN"); + Via.getManager().getSubPlatforms().add(IMPL_VERSION); getLogger().info("Loading translations..."); TranslatableRewriter.loadTranslatables(); diff --git a/core/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java b/common/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java rename to common/src/main/java/nl/matsv/viabackwards/api/data/BackwardsMappings.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/data/MappedItem.java b/common/src/main/java/nl/matsv/viabackwards/api/data/MappedItem.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/data/MappedItem.java rename to common/src/main/java/nl/matsv/viabackwards/api/data/MappedItem.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/data/MappedLegacyBlockItem.java b/common/src/main/java/nl/matsv/viabackwards/api/data/MappedLegacyBlockItem.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/data/MappedLegacyBlockItem.java rename to common/src/main/java/nl/matsv/viabackwards/api/data/MappedLegacyBlockItem.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/data/VBMappingDataLoader.java b/common/src/main/java/nl/matsv/viabackwards/api/data/VBMappingDataLoader.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/data/VBMappingDataLoader.java rename to common/src/main/java/nl/matsv/viabackwards/api/data/VBMappingDataLoader.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/data/VBMappings.java b/common/src/main/java/nl/matsv/viabackwards/api/data/VBMappings.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/data/VBMappings.java rename to common/src/main/java/nl/matsv/viabackwards/api/data/VBMappings.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandler.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandler.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandler.java rename to common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandler.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerEvent.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerEvent.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerEvent.java rename to common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerEvent.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerSettings.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerSettings.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerSettings.java rename to common/src/main/java/nl/matsv/viabackwards/api/entities/meta/MetaHandlerSettings.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityData.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityData.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityData.java rename to common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityData.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityObjectData.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityObjectData.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityObjectData.java rename to common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityObjectData.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityPositionHandler.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityPositionHandler.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityPositionHandler.java rename to common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityPositionHandler.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityPositionStorage.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityPositionStorage.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityPositionStorage.java rename to common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityPositionStorage.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityStorage.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityStorage.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityStorage.java rename to common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityStorage.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityTracker.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityTracker.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityTracker.java rename to common/src/main/java/nl/matsv/viabackwards/api/entities/storage/EntityTracker.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/entities/storage/MetaStorage.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/MetaStorage.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/entities/storage/MetaStorage.java rename to common/src/main/java/nl/matsv/viabackwards/api/entities/storage/MetaStorage.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/entities/storage/PlayerPositionStorage.java b/common/src/main/java/nl/matsv/viabackwards/api/entities/storage/PlayerPositionStorage.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/entities/storage/PlayerPositionStorage.java rename to common/src/main/java/nl/matsv/viabackwards/api/entities/storage/PlayerPositionStorage.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/exceptions/RemovedValueException.java b/common/src/main/java/nl/matsv/viabackwards/api/exceptions/RemovedValueException.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/exceptions/RemovedValueException.java rename to common/src/main/java/nl/matsv/viabackwards/api/exceptions/RemovedValueException.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/EnchantmentRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/EnchantmentRewriter.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/rewriters/EnchantmentRewriter.java rename to common/src/main/java/nl/matsv/viabackwards/api/rewriters/EnchantmentRewriter.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java rename to common/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriter.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriterBase.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriterBase.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriterBase.java rename to common/src/main/java/nl/matsv/viabackwards/api/rewriters/EntityRewriterBase.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriter.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriter.java rename to common/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriter.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriterBase.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriterBase.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriterBase.java rename to common/src/main/java/nl/matsv/viabackwards/api/rewriters/ItemRewriterBase.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyBlockItemRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyBlockItemRewriter.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyBlockItemRewriter.java rename to common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyBlockItemRewriter.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyEnchantmentRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyEnchantmentRewriter.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyEnchantmentRewriter.java rename to common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyEnchantmentRewriter.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyEntityRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyEntityRewriter.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyEntityRewriter.java rename to common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacyEntityRewriter.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacySoundRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacySoundRewriter.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacySoundRewriter.java rename to common/src/main/java/nl/matsv/viabackwards/api/rewriters/LegacySoundRewriter.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/Rewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/Rewriter.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/rewriters/Rewriter.java rename to common/src/main/java/nl/matsv/viabackwards/api/rewriters/Rewriter.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java rename to common/src/main/java/nl/matsv/viabackwards/api/rewriters/SoundRewriter.java diff --git a/core/src/main/java/nl/matsv/viabackwards/api/rewriters/TranslatableRewriter.java b/common/src/main/java/nl/matsv/viabackwards/api/rewriters/TranslatableRewriter.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/api/rewriters/TranslatableRewriter.java rename to common/src/main/java/nl/matsv/viabackwards/api/rewriters/TranslatableRewriter.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/PotionSplashHandler.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/PotionSplashHandler.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/PotionSplashHandler.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/PotionSplashHandler.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/BlockItemPackets1_11.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/EntityPackets1_11.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/packets/PlayerPackets1_11.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/storage/ChestedHorseStorage.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/storage/ChestedHorseStorage.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/storage/ChestedHorseStorage.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/storage/ChestedHorseStorage.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/storage/WindowTracker.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/storage/WindowTracker.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/storage/WindowTracker.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_10to1_11/storage/WindowTracker.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/Protocol1_11_1To1_12.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/AdvancementTranslations.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/AdvancementTranslations.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/AdvancementTranslations.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/AdvancementTranslations.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/BlockColors.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/BlockColors.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/BlockColors.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/BlockColors.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/MapColorMapping.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/MapColorMapping.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/MapColorMapping.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/MapColorMapping.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ParrotStorage.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ParrotStorage.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ParrotStorage.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ParrotStorage.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/ShoulderTracker.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatItemRewriter.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatItemRewriter.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatItemRewriter.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatItemRewriter.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatPackets1_12.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatPackets1_12.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatPackets1_12.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatPackets1_12.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/EntityPackets1_12.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/SoundPackets1_12.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/SoundPackets1_12.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/SoundPackets1_12.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/SoundPackets1_12.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/Protocol1_11To1_11_1.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/EntityPackets1_11_1.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11to1_11_1/packets/ItemPackets1_11_1.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_1to1_12_2/KeepAliveTracker.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_1to1_12_2/KeepAliveTracker.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_1to1_12_2/KeepAliveTracker.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_1to1_12_2/KeepAliveTracker.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BannerHandler.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BannerHandler.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BannerHandler.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BannerHandler.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BedHandler.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BedHandler.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BedHandler.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/BedHandler.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/FlowerPotHandler.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/FlowerPotHandler.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/FlowerPotHandler.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/FlowerPotHandler.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/PistonHandler.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SkullHandler.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SkullHandler.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SkullHandler.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SkullHandler.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SpawnerHandler.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SpawnerHandler.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SpawnerHandler.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/SpawnerHandler.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/BackwardsMappings.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/EntityNameRewrites.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/EntityNameRewrites.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/EntityNameRewrites.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/EntityNameRewrites.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/EntityTypeMapping.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/EntityTypeMapping.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/EntityTypeMapping.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/EntityTypeMapping.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/NamedSoundMapping.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/NamedSoundMapping.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/NamedSoundMapping.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/NamedSoundMapping.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/PaintingMapping.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/PaintingMapping.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/PaintingMapping.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/PaintingMapping.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/ParticleMapping.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/ParticleMapping.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/ParticleMapping.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/ParticleMapping.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/PlayerPacket1_13.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/SoundPackets1_13.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/providers/BackwardsBlockEntityProvider.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/providers/BackwardsBlockEntityProvider.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/providers/BackwardsBlockEntityProvider.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/providers/BackwardsBlockEntityProvider.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/PlayerPositionStorage1_13.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/PlayerPositionStorage1_13.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/PlayerPositionStorage1_13.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/PlayerPositionStorage1_13.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/TabCompleteStorage.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/TabCompleteStorage.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/TabCompleteStorage.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/TabCompleteStorage.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_12_1/Protocol1_12To1_12_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_12_1/Protocol1_12To1_12_1.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_12_1/Protocol1_12To1_12_1.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12to1_12_1/Protocol1_12To1_12_1.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/Protocol1_13_1To1_13_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/Protocol1_13_1To1_13_2.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/Protocol1_13_1To1_13_2.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/Protocol1_13_1To1_13_2.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/EntityPackets1_13_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/EntityPackets1_13_2.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/EntityPackets1_13_2.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/EntityPackets1_13_2.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/InventoryPackets1_13_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/InventoryPackets1_13_2.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/InventoryPackets1_13_2.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/InventoryPackets1_13_2.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/WorldPackets1_13_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/WorldPackets1_13_2.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/WorldPackets1_13_2.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_1to1_13_2/packets/WorldPackets1_13_2.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/Protocol1_13_2To1_14.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/data/CommandRewriter1_14.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/data/CommandRewriter1_14.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/data/CommandRewriter1_14.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/data/CommandRewriter1_14.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/EntityPackets1_14.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/PlayerPackets1_14.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/PlayerPackets1_14.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/PlayerPackets1_14.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/PlayerPackets1_14.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/SoundPackets1_14.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/storage/ChunkLightStorage.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/storage/ChunkLightStorage.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/storage/ChunkLightStorage.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/storage/ChunkLightStorage.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/storage/EntityPositionStorage1_14.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/storage/EntityPositionStorage1_14.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/storage/EntityPositionStorage1_14.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/storage/EntityPositionStorage1_14.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/Protocol1_13To1_13_1.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/data/CommandRewriter1_13_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/data/CommandRewriter1_13_1.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/data/CommandRewriter1_13_1.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/data/CommandRewriter1_13_1.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/EntityPackets1_13_1.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/WorldPackets1_13_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/WorldPackets1_13_1.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/WorldPackets1_13_1.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/WorldPackets1_13_1.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_1to1_14_2/Protocol1_14_1To1_14_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_1to1_14_2/Protocol1_14_1To1_14_2.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_1to1_14_2/Protocol1_14_1To1_14_2.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_1to1_14_2/Protocol1_14_1To1_14_2.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_2to1_14_3/Protocol1_14_2To1_14_3.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_2to1_14_3/Protocol1_14_2To1_14_3.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_2to1_14_3/Protocol1_14_2To1_14_3.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_2to1_14_3/Protocol1_14_2To1_14_3.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_3to1_14_4/Protocol1_14_3To1_14_4.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_3to1_14_4/Protocol1_14_3To1_14_4.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_3to1_14_4/Protocol1_14_3To1_14_4.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_3to1_14_4/Protocol1_14_3To1_14_4.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/EntityTypeMapping.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/EntityTypeMapping.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/EntityTypeMapping.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/EntityTypeMapping.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/ImmediateRespawn.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/ImmediateRespawn.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/ImmediateRespawn.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/data/ImmediateRespawn.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/BlockItemPackets1_15.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14_4to1_15/packets/EntityPackets1_15.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/Protocol1_14To1_14_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/Protocol1_14To1_14_1.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/Protocol1_14To1_14_1.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/Protocol1_14To1_14_1.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_14to1_14_1/packets/EntityPackets1_14_1.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_1to1_15_2/Protocol1_15_1To1_15_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_1to1_15_2/Protocol1_15_1To1_15_2.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_1to1_15_2/Protocol1_15_1To1_15_2.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_1to1_15_2/Protocol1_15_1To1_15_2.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/chat/TagSerializer.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/chat/TagSerializer.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/chat/TagSerializer.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/chat/TagSerializer.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/chat/TranslatableRewriter1_16.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/chat/TranslatableRewriter1_16.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/chat/TranslatableRewriter1_16.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/chat/TranslatableRewriter1_16.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/BackwardsMappings.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/BackwardsMappings.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/BackwardsMappings.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/BackwardsMappings.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/CommandRewriter1_16.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/CommandRewriter1_16.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/CommandRewriter1_16.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/CommandRewriter1_16.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/MapColorRewriter.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/MapColorRewriter.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/MapColorRewriter.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/MapColorRewriter.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/storage/PlayerSneakStorage.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/storage/PlayerSneakStorage.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/storage/PlayerSneakStorage.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/storage/PlayerSneakStorage.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15to1_15_1/Protocol1_15To1_15_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15to1_15_1/Protocol1_15To1_15_1.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15to1_15_1/Protocol1_15To1_15_1.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15to1_15_1/Protocol1_15To1_15_1.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/Protocol1_16_1To1_16_2.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/data/CommandRewriter1_16_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/data/CommandRewriter1_16_2.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/data/CommandRewriter1_16_2.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/data/CommandRewriter1_16_2.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/packets/BlockItemPackets1_16_2.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_1to1_16_2/packets/EntityPackets1_16_2.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_2to1_16_3/Protocol1_16_2To1_16_3.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_2to1_16_3/Protocol1_16_2To1_16_3.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_2to1_16_3/Protocol1_16_2To1_16_3.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_2to1_16_3/Protocol1_16_2To1_16_3.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_3to1_16_4/storage/PlayerHandStorage.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_3to1_16_4/storage/PlayerHandStorage.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_3to1_16_4/storage/PlayerHandStorage.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_3to1_16_4/storage/PlayerHandStorage.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java similarity index 92% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java index 36d73657..16f8fd44 100644 --- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java +++ b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java @@ -138,6 +138,21 @@ public class Protocol1_16_4To1_17 extends BackwardsProtocol { + wrapper.write(Type.BOOLEAN, false); // Text filtering + }); + } + }); + cancelOutgoing(ClientboundPackets1_17.ADD_VIBRATION_SIGNAL); } diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/BlockItemPackets1_17.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16_4to1_17/packets/EntityPackets1_17.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16to1_16_1/Protocol1_16To1_16_1.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16to1_16_1/Protocol1_16To1_16_1.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16to1_16_1/Protocol1_16To1_16_1.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_16to1_16_1/Protocol1_16To1_16_1.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/Protocol1_9_4To1_10.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/BlockItemPackets1_10.java diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets1_10.java b/common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets1_10.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets1_10.java rename to common/src/main/java/nl/matsv/viabackwards/protocol/protocol1_9_4to1_10/packets/EntityPackets1_10.java diff --git a/core/src/main/java/nl/matsv/viabackwards/utils/Block.java b/common/src/main/java/nl/matsv/viabackwards/utils/Block.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/utils/Block.java rename to common/src/main/java/nl/matsv/viabackwards/utils/Block.java diff --git a/core/src/main/java/nl/matsv/viabackwards/utils/ChatUtil.java b/common/src/main/java/nl/matsv/viabackwards/utils/ChatUtil.java similarity index 100% rename from core/src/main/java/nl/matsv/viabackwards/utils/ChatUtil.java rename to common/src/main/java/nl/matsv/viabackwards/utils/ChatUtil.java diff --git a/common/src/main/java/nl/matsv/viabackwards/utils/VersionInfo.java b/common/src/main/java/nl/matsv/viabackwards/utils/VersionInfo.java new file mode 100644 index 00000000..4cbbcfb2 --- /dev/null +++ b/common/src/main/java/nl/matsv/viabackwards/utils/VersionInfo.java @@ -0,0 +1,6 @@ +package nl.matsv.viabackwards.utils; + +public class VersionInfo { + + public static final String VERSION = "$VERSION"; +} diff --git a/core/src/main/resources/assets/viabackwards/config.yml b/common/src/main/resources/assets/viabackwards/config.yml similarity index 100% rename from core/src/main/resources/assets/viabackwards/config.yml rename to common/src/main/resources/assets/viabackwards/config.yml diff --git a/core/src/main/resources/assets/viabackwards/data/legacy-mappings.json b/common/src/main/resources/assets/viabackwards/data/legacy-mappings.json similarity index 100% rename from core/src/main/resources/assets/viabackwards/data/legacy-mappings.json rename to common/src/main/resources/assets/viabackwards/data/legacy-mappings.json diff --git a/core/src/main/resources/assets/viabackwards/data/mapping-1.10to1.11.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.10to1.11.json similarity index 100% rename from core/src/main/resources/assets/viabackwards/data/mapping-1.10to1.11.json rename to common/src/main/resources/assets/viabackwards/data/mapping-1.10to1.11.json diff --git a/core/src/main/resources/assets/viabackwards/data/mapping-1.11to1.12.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.11to1.12.json similarity index 100% rename from core/src/main/resources/assets/viabackwards/data/mapping-1.11to1.12.json rename to common/src/main/resources/assets/viabackwards/data/mapping-1.11to1.12.json diff --git a/core/src/main/resources/assets/viabackwards/data/mapping-1.12to1.13.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.12to1.13.json similarity index 100% rename from core/src/main/resources/assets/viabackwards/data/mapping-1.12to1.13.json rename to common/src/main/resources/assets/viabackwards/data/mapping-1.12to1.13.json diff --git a/core/src/main/resources/assets/viabackwards/data/mapping-1.13.2to1.14.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.13.2to1.14.json similarity index 100% rename from core/src/main/resources/assets/viabackwards/data/mapping-1.13.2to1.14.json rename to common/src/main/resources/assets/viabackwards/data/mapping-1.13.2to1.14.json diff --git a/core/src/main/resources/assets/viabackwards/data/mapping-1.13to1.13.2.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.13to1.13.2.json similarity index 100% rename from core/src/main/resources/assets/viabackwards/data/mapping-1.13to1.13.2.json rename to common/src/main/resources/assets/viabackwards/data/mapping-1.13to1.13.2.json diff --git a/core/src/main/resources/assets/viabackwards/data/mapping-1.14to1.15.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.14to1.15.json similarity index 100% rename from core/src/main/resources/assets/viabackwards/data/mapping-1.14to1.15.json rename to common/src/main/resources/assets/viabackwards/data/mapping-1.14to1.15.json diff --git a/core/src/main/resources/assets/viabackwards/data/mapping-1.15to1.16.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.15to1.16.json similarity index 100% rename from core/src/main/resources/assets/viabackwards/data/mapping-1.15to1.16.json rename to common/src/main/resources/assets/viabackwards/data/mapping-1.15to1.16.json diff --git a/core/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json similarity index 100% rename from core/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json rename to common/src/main/resources/assets/viabackwards/data/mapping-1.16.2to1.17.json diff --git a/core/src/main/resources/assets/viabackwards/data/mapping-1.16to1.16.2.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.16to1.16.2.json similarity index 100% rename from core/src/main/resources/assets/viabackwards/data/mapping-1.16to1.16.2.json rename to common/src/main/resources/assets/viabackwards/data/mapping-1.16to1.16.2.json diff --git a/core/src/main/resources/assets/viabackwards/data/mapping-1.9.4to1.10.json b/common/src/main/resources/assets/viabackwards/data/mapping-1.9.4to1.10.json similarity index 100% rename from core/src/main/resources/assets/viabackwards/data/mapping-1.9.4to1.10.json rename to common/src/main/resources/assets/viabackwards/data/mapping-1.9.4to1.10.json diff --git a/core/src/main/resources/assets/viabackwards/data/translation-mappings.json b/common/src/main/resources/assets/viabackwards/data/translation-mappings.json similarity index 100% rename from core/src/main/resources/assets/viabackwards/data/translation-mappings.json rename to common/src/main/resources/assets/viabackwards/data/translation-mappings.json diff --git a/core/pom.xml b/core/pom.xml deleted file mode 100644 index 9241a5ed..00000000 --- a/core/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - 4.0.0 - - viabackwards-parent - nl.matsv - 3.3.0-21w06a - - - viabackwards-core - - - - - io.netty - netty-all - 4.0.20.Final - provided - true - - - \ No newline at end of file diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts new file mode 100644 index 00000000..a12310ed --- /dev/null +++ b/fabric/build.gradle.kts @@ -0,0 +1,5 @@ +dependencies { + implementation(project(":viabackwards-common")) + compileOnly("net.fabricmc", "fabric-loader", "0.4.8+build.154") + compileOnly("org.apache.logging.log4j", "log4j-api", "2.8.1") +} diff --git a/fabric/pom.xml b/fabric/pom.xml deleted file mode 100644 index 2e22a259..00000000 --- a/fabric/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - 4.0.0 - - viabackwards-parent - nl.matsv - 3.3.0-21w06a - - - viabackwards-fabric - - - - fabric-repo - https://maven.fabricmc.net/ - - - - - - net.fabricmc - fabric-loader - 0.4.8+build.154 - provided - - - org.apache.logging.log4j - log4j-api - 2.8.1 - provided - - - nl.matsv - viabackwards-core - ${project.parent.version} - compile - - - - - - - . - true - src/main/resources/ - - * - - - - - diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index eae06494..e316f315 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -2,7 +2,7 @@ "schemaVersion": 1, "id": "viabackwards", "name": "ViaBackwards", - "version": "${project.version}", + "version": "${version}", "description": "Allow older Minecraft versions to connect to a newer server version.", "license": "MIT", "contact": { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..e708b1c0 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..2a563242 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..4f906e0c --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..107acd32 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 16ce09c8..00000000 --- a/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - 4.0.0 - - nl.matsv - viabackwards-parent - 3.3.0-21w06a - pom - - Allow older clients to join newer server versions. - 2016 - https://github.com/ViaVersion/ViaBackwards - - - - Matsv - https://github.com/Matsv - - - KennyTV - https://github.com/KennyTV/ - - - - - core - bukkit - bungee - fabric - sponge - velocity - all - - - - - UTF-8 - ${projectEncoding} - ${projectEncoding} - 1.8 - 1.8 - - - - - viaversion-repo - https://repo.viaversion.com - - - - - - - us.myles - viaversion - 3.3.0-21w06a - provided - - - - - org.jetbrains - annotations - 19.0.0 - provided - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..ae6728fc --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,20 @@ +rootProject.name = "viabackwards-parent" + +setupViaSubproject("common") +setupViaSubproject("bukkit") +setupViaSubproject("bungee") +setupViaSubproject("velocity") +setupViaSubproject("sponge") +setupViaSubproject("fabric") +setupViaSubproject("universal") + +fun setupViaSubproject(name: String) { + setupSubproject("viabackwards-$name") { + projectDir = file(name) + } +} + +inline fun setupSubproject(name: String, block: ProjectDescriptor.() -> Unit) { + include(name) + project(":$name").apply(block) +} diff --git a/sponge/build.gradle.kts b/sponge/build.gradle.kts new file mode 100644 index 00000000..49de7657 --- /dev/null +++ b/sponge/build.gradle.kts @@ -0,0 +1,5 @@ +dependencies { + implementation(project(":viabackwards-common")) + compileOnly("org.spongepowered","spongeapi", Versions.sponge) + annotationProcessor("org.spongepowered","spongeapi", Versions.sponge) +} diff --git a/sponge/pom.xml b/sponge/pom.xml deleted file mode 100644 index 80bd474e..00000000 --- a/sponge/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - 4.0.0 - - viabackwards-parent - nl.matsv - 3.3.0-21w06a - - - viabackwards-sponge - - - - - . - true - src/main/resources/ - - * - - - - - - org.codehaus.mojo - templating-maven-plugin - 1.0.0 - - - filter-src - - filter-sources - - - - - - - - - - sponge-maven-repo - Sponge maven repo - https://repo.spongepowered.org/maven - - true - - - true - - - - - - - - nl.matsv - viabackwards-core - ${project.parent.version} - compile - - - - - org.spongepowered - spongeapi - 7.3.0 - provided - - - \ No newline at end of file diff --git a/sponge/src/main/java-templates/nl/matsv/viabackwards/sponge/VersionInfo.java b/sponge/src/main/java-templates/nl/matsv/viabackwards/sponge/VersionInfo.java deleted file mode 100644 index c7fdb1b4..00000000 --- a/sponge/src/main/java-templates/nl/matsv/viabackwards/sponge/VersionInfo.java +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2016 Matsv - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package nl.matsv.viabackwards.sponge; - -public class VersionInfo { - public static final String VERSION = "${project.version}"; -} diff --git a/sponge/src/main/java/nl/matsv/viabackwards/SpongePlugin.java b/sponge/src/main/java/nl/matsv/viabackwards/SpongePlugin.java index fafb47d8..f576cc48 100644 --- a/sponge/src/main/java/nl/matsv/viabackwards/SpongePlugin.java +++ b/sponge/src/main/java/nl/matsv/viabackwards/SpongePlugin.java @@ -12,7 +12,7 @@ package nl.matsv.viabackwards; import com.google.inject.Inject; import nl.matsv.viabackwards.api.ViaBackwardsPlatform; -import nl.matsv.viabackwards.sponge.VersionInfo; +import nl.matsv.viabackwards.utils.VersionInfo; import org.spongepowered.api.config.ConfigDir; import org.spongepowered.api.event.Listener; import org.spongepowered.api.event.Order; diff --git a/universal/build.gradle.kts b/universal/build.gradle.kts new file mode 100644 index 00000000..1ab0520c --- /dev/null +++ b/universal/build.gradle.kts @@ -0,0 +1,24 @@ +tasks { + val universalJar = register("universalJar") { + artifacts.add("archives", this) + archiveClassifier.set("") + archiveFileName.set("ViaBackwards-${project.version}.jar") + destinationDirectory.set(rootProject.projectDir.resolve("build/libs")) + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + arrayOf( + "bukkit", + "bungee", + "sponge", + "velocity", + "fabric" + ).forEach { + val subProject = rootProject.project(":viabackwards-$it") + val shadowJarTask = subProject.tasks.getByName("shadowJar") + from(zipTree(shadowJarTask.outputs.files.singleFile)) + dependsOn(shadowJarTask) + } + } + build { + dependsOn(universalJar) + } +} diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts new file mode 100644 index 00000000..f3c576ad --- /dev/null +++ b/velocity/build.gradle.kts @@ -0,0 +1,5 @@ +dependencies { + implementation(project(":viabackwards-common")) + compileOnly("com.velocitypowered", "velocity-api", Versions.velocityApi) + annotationProcessor("com.velocitypowered", "velocity-api", Versions.velocityApi) +} diff --git a/velocity/pom.xml b/velocity/pom.xml deleted file mode 100644 index 46c531d8..00000000 --- a/velocity/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - 4.0.0 - - viabackwards-parent - nl.matsv - 3.3.0-21w06a - - - viabackwards-velocity - - - - - . - true - src/main/resources/ - - * - - - - - - org.codehaus.mojo - templating-maven-plugin - 1.0.0 - - - filter-src - - filter-sources - - - - - - - - - - velocity-maven-repo - Velocity maven repo - https://repo.velocitypowered.com/snapshots/ - - true - - - true - - - - - - - - nl.matsv - viabackwards-core - ${project.parent.version} - compile - - - - - com.velocitypowered - velocity-api - 1.0-SNAPSHOT - provided - - - \ No newline at end of file diff --git a/velocity/src/main/java-templates/nl/matsv/viabackwards/velocity/VersionInfo.java b/velocity/src/main/java-templates/nl/matsv/viabackwards/velocity/VersionInfo.java deleted file mode 100644 index f12f184f..00000000 --- a/velocity/src/main/java-templates/nl/matsv/viabackwards/velocity/VersionInfo.java +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2016 Matsv - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package nl.matsv.viabackwards.velocity; - -public class VersionInfo { - public static final String VERSION = "${project.version}"; -} diff --git a/velocity/src/main/java/nl/matsv/viabackwards/VelocityPlugin.java b/velocity/src/main/java/nl/matsv/viabackwards/VelocityPlugin.java index 1614e54f..602fa203 100644 --- a/velocity/src/main/java/nl/matsv/viabackwards/VelocityPlugin.java +++ b/velocity/src/main/java/nl/matsv/viabackwards/VelocityPlugin.java @@ -18,7 +18,7 @@ import com.velocitypowered.api.plugin.Dependency; import com.velocitypowered.api.plugin.Plugin; import com.velocitypowered.api.plugin.annotation.DataDirectory; import nl.matsv.viabackwards.api.ViaBackwardsPlatform; -import nl.matsv.viabackwards.velocity.VersionInfo; +import nl.matsv.viabackwards.utils.VersionInfo; import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.sponge.util.LoggerWrapper;