diff --git a/.editorconfig b/.editorconfig index e7933861..ba4484a4 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,7 +8,7 @@ tab_width = 4 [*.java] ij_java_class_count_to_use_import_on_demand = 999999 ij_java_names_count_to_use_import_on_demand = 999999 -ij_java_imports_layout = *,|,$* +ij_java_imports_layout = *, |, $* ij_java_generate_final_locals = true ij_java_generate_final_parameters = true diff --git a/build.gradle.kts b/build.gradle.kts index 23ffb0e4..d1e94fc5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,13 +10,13 @@ allprojects { } val main = setOf( - projects.viabackwards, - projects.viabackwardsCommon, - projects.viabackwardsBukkit, - projects.viabackwardsBungee, - projects.viabackwardsFabric, - projects.viabackwardsSponge, - projects.viabackwardsVelocity + projects.viabackwards, + projects.viabackwardsCommon, + projects.viabackwardsBukkit, + projects.viabackwardsBungee, + projects.viabackwardsFabric, + projects.viabackwardsSponge, + projects.viabackwardsVelocity ).map { it.dependencyProject } subprojects { diff --git a/bukkit/src/main/java/com/viaversion/viabackwards/listener/FireDamageListener.java b/bukkit/src/main/java/com/viaversion/viabackwards/listener/FireDamageListener.java index ff677f74..ad9f259d 100644 --- a/bukkit/src/main/java/com/viaversion/viabackwards/listener/FireDamageListener.java +++ b/bukkit/src/main/java/com/viaversion/viabackwards/listener/FireDamageListener.java @@ -40,9 +40,9 @@ public class FireDamageListener extends ViaBukkitListener { EntityDamageEvent.DamageCause cause = event.getCause(); if (cause != EntityDamageEvent.DamageCause.FIRE - && cause != EntityDamageEvent.DamageCause.FIRE_TICK - && cause != EntityDamageEvent.DamageCause.LAVA - && cause != EntityDamageEvent.DamageCause.DROWNING) { + && cause != EntityDamageEvent.DamageCause.FIRE_TICK + && cause != EntityDamageEvent.DamageCause.LAVA + && cause != EntityDamageEvent.DamageCause.DROWNING) { return; } diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyBlockItemRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyBlockItemRewriter.java index cb7e5420..41921b85 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyBlockItemRewriter.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyBlockItemRewriter.java @@ -382,7 +382,7 @@ public abstract class LegacyBlockItemRewriter. */ package com.viaversion.viabackwards.protocol.v1_13to1_12_2.block_entity_handlers; + import com.viaversion.viabackwards.protocol.v1_13to1_12_2.Protocol1_13To1_12_2; import com.viaversion.viabackwards.protocol.v1_13to1_12_2.provider.BackwardsBlockEntityProvider; import com.viaversion.viaversion.api.Via; diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/storage/DimensionRegistryStorage.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/storage/DimensionRegistryStorage.java index 3692b24d..e8caec9e 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/storage/DimensionRegistryStorage.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/storage/DimensionRegistryStorage.java @@ -16,6 +16,7 @@ * along with this program. If not, see . */ package com.viaversion.viabackwards.protocol.v1_19to1_18_2.storage; + import com.viaversion.viabackwards.protocol.v1_19to1_18_2.Protocol1_19To1_18_2; import com.viaversion.viaversion.api.connection.StorableObject; import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap; diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_3to1_20_2/Protocol1_20_3To1_20_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_3to1_20_2/Protocol1_20_3To1_20_2.java index c74d255f..9848b112 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_3to1_20_2/Protocol1_20_3To1_20_2.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_3to1_20_2/Protocol1_20_3To1_20_2.java @@ -410,10 +410,10 @@ public final class Protocol1_20_3To1_20_2 extends BackwardsProtocol createPacketTypesProvider() { return new SimplePacketTypesProvider<>( - packetTypeMap(unmappedClientboundPacketType, ClientboundPackets1_20_3.class, ClientboundConfigurationPackets1_20_3.class), - packetTypeMap(mappedClientboundPacketType, ClientboundPackets1_20_2.class, ClientboundConfigurationPackets1_20_2.class), - packetTypeMap(mappedServerboundPacketType, ServerboundPackets1_20_3.class, ServerboundConfigurationPackets1_20_2.class), - packetTypeMap(unmappedServerboundPacketType, ServerboundPackets1_20_2.class, ServerboundConfigurationPackets1_20_2.class) + packetTypeMap(unmappedClientboundPacketType, ClientboundPackets1_20_3.class, ClientboundConfigurationPackets1_20_3.class), + packetTypeMap(mappedClientboundPacketType, ClientboundPackets1_20_2.class, ClientboundConfigurationPackets1_20_2.class), + packetTypeMap(mappedServerboundPacketType, ServerboundPackets1_20_3.class, ServerboundConfigurationPackets1_20_2.class), + packetTypeMap(unmappedServerboundPacketType, ServerboundPackets1_20_2.class, ServerboundConfigurationPackets1_20_2.class) ); } } \ No newline at end of file diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_9_3to1_9_1/data/BlockEntity1_9_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_9_3to1_9_1/data/BlockEntity1_9_1.java index a9b9b48d..892c3ced 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_9_3to1_9_1/data/BlockEntity1_9_1.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_9_3to1_9_1/data/BlockEntity1_9_1.java @@ -16,6 +16,7 @@ * along with this program. If not, see . */ package com.viaversion.viabackwards.protocol.v1_9_3to1_9_1.data; + import com.viaversion.viabackwards.protocol.v1_9_3to1_9_1.Protocol1_9_3To1_9_1; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.Position; diff --git a/universal/build.gradle.kts b/universal/build.gradle.kts index 3f9538dc..2a8ae914 100644 --- a/universal/build.gradle.kts +++ b/universal/build.gradle.kts @@ -37,8 +37,8 @@ if (!isRelease || isMainBranch) { // Only publish releases from the main branch modrinth { // val snapshotVersion = rootProject.parseMinecraftSnapshotVersion(project.version as String) val mcVersions: List = (property("mcVersions") as String) - .split(",") - .map { it.trim() } + .split(",") + .map { it.trim() } //.let { if (snapshotVersion != null) it + snapshotVersion else it } // We're usually too fast for modrinth token.set(System.getenv("MODRINTH_TOKEN")) diff --git a/velocity/src/main/java/com/viaversion/viabackwards/VelocityPlugin.java b/velocity/src/main/java/com/viaversion/viabackwards/VelocityPlugin.java index d2f48746..e53a0995 100644 --- a/velocity/src/main/java/com/viaversion/viabackwards/VelocityPlugin.java +++ b/velocity/src/main/java/com/viaversion/viabackwards/VelocityPlugin.java @@ -34,11 +34,11 @@ import java.nio.file.Path; import java.util.logging.Logger; @Plugin(id = "viabackwards", - name = "ViaBackwards", - version = VersionInfo.VERSION, - authors = {"Matsv", "kennytv", "Gerrygames", "creeper123123321", "ForceUpdate1", "EnZaXD"}, - description = "Allows older Minecraft client versions to connect to newer server versions.", - dependencies = {@Dependency(id = "viaversion")} + name = "ViaBackwards", + version = VersionInfo.VERSION, + authors = {"Matsv", "kennytv", "Gerrygames", "creeper123123321", "ForceUpdate1", "EnZaXD"}, + description = "Allows older Minecraft client versions to connect to newer server versions.", + dependencies = {@Dependency(id = "viaversion")} ) public class VelocityPlugin implements ViaBackwardsPlatform { private Logger logger;