From 35d795ea3d92d7f73e2dd5b4dbd7f9d6ae2fbbe3 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Fri, 12 Jan 2024 09:14:03 +0100 Subject: [PATCH] Structural refactor of fixes package This commit introduces the fixes/versioned package, where random class files for specific game versions are stored since I don't want them to be in the root package and splitting more common data dumps and more version-specific class files into separate packages looks like a good solution for me. --- .../viafabricplus/fixes/ClientsideFixes.java | 13 +++++++------ .../EntityDimensionDiff.java} | 4 ++-- .../ActionResultException1_12_2.java | 2 +- .../ClientPlayerInteractionManager1_18_2.java | 2 +- .../KeyPairResponse1_19_0.java | 2 +- .../PendingUpdateManager1_18_2.java | 2 +- .../fixes/{ => versioned}/classic/CPEAdditions.java | 2 +- .../classic/GridItemSelectionScreen.java | 2 +- .../{ => versioned}/classic/WorldHeightSupport.java | 2 +- .../classic/command/ListExtensionsCommand.java | 2 +- .../classic/command/SetTimeCommand.java | 2 +- .../visual}/ArmorHudEmulation1_8.java | 2 +- .../{entity => versioned/visual}/BoatModel1_8.java | 2 +- .../visual}/BoatRenderer1_8.java | 2 +- .../visual}/BuiltinEmptyGlyph1_12_2.java | 2 +- .../visual}/EntityRidingOffsetsPre1_20_2.java | 2 +- .../visual/FootStepParticle1_12_2.java} | 10 +++++----- .../access/IClientPlayerInteractionManager.java | 2 +- .../fixes/authlib/MixinYggdrasilUserApiService.java | 2 +- .../mixin/fixes/minecraft/MixinClientWorld.java | 2 +- .../mixin/fixes/minecraft/MixinFontStorage.java | 2 +- .../fixes/minecraft/entity/MixinBoatEntity.java | 2 +- .../mixin/fixes/minecraft/entity/MixinEntity.java | 2 +- .../fixes/minecraft/entity/MixinEntityModels.java | 2 +- .../entity/MixinEntityRenderDispatcher.java | 2 +- .../fixes/minecraft/entity/MixinLivingEntity.java | 2 +- .../MixinClientPlayerInteractionManager.java | 4 ++-- .../screen/MixinCreativeInventoryScreen.java | 2 +- .../vialegacy/MixinClassicProtocolExtension.java | 2 +- .../vialegacy/MixinClientboundPacketsc0_30cpe.java | 2 +- .../vialegacy/MixinProtocolc0_30toc0_30cpe.java | 2 +- .../fixes/viaversion/MixinEntityPackets1_17.java | 2 +- .../fixes/viaversion/MixinMappingDataBase.java | 4 ++-- .../fixes/viaversion/MixinParticleRewriter.java | 6 +++--- .../fixes/viaversion/MixinWorldPackets1_17.java | 2 +- .../impl/command/ViaFabricPlusVLCommandHandler.java | 4 ++-- 36 files changed, 52 insertions(+), 51 deletions(-) rename src/main/java/de/florianmichael/viafabricplus/fixes/{entity/EntityDimensionReplacements.java => data/EntityDimensionDiff.java} (99%) rename src/main/java/de/florianmichael/viafabricplus/fixes/{ => versioned}/ActionResultException1_12_2.java (95%) rename src/main/java/de/florianmichael/viafabricplus/fixes/{ => versioned}/ClientPlayerInteractionManager1_18_2.java (98%) rename src/main/java/de/florianmichael/viafabricplus/fixes/{replacement => versioned}/KeyPairResponse1_19_0.java (95%) rename src/main/java/de/florianmichael/viafabricplus/fixes/{replacement => versioned}/PendingUpdateManager1_18_2.java (97%) rename src/main/java/de/florianmichael/viafabricplus/fixes/{ => versioned}/classic/CPEAdditions.java (97%) rename src/main/java/de/florianmichael/viafabricplus/fixes/{ => versioned}/classic/GridItemSelectionScreen.java (98%) rename src/main/java/de/florianmichael/viafabricplus/fixes/{ => versioned}/classic/WorldHeightSupport.java (99%) rename src/main/java/de/florianmichael/viafabricplus/fixes/{ => versioned}/classic/command/ListExtensionsCommand.java (96%) rename src/main/java/de/florianmichael/viafabricplus/fixes/{ => versioned}/classic/command/SetTimeCommand.java (97%) rename src/main/java/de/florianmichael/viafabricplus/fixes/{ => versioned/visual}/ArmorHudEmulation1_8.java (98%) rename src/main/java/de/florianmichael/viafabricplus/fixes/{entity => versioned/visual}/BoatModel1_8.java (98%) rename src/main/java/de/florianmichael/viafabricplus/fixes/{entity => versioned/visual}/BoatRenderer1_8.java (97%) rename src/main/java/de/florianmichael/viafabricplus/fixes/{replacement => versioned/visual}/BuiltinEmptyGlyph1_12_2.java (97%) rename src/main/java/de/florianmichael/viafabricplus/fixes/{entity => versioned/visual}/EntityRidingOffsetsPre1_20_2.java (99%) rename src/main/java/de/florianmichael/viafabricplus/fixes/{particle/FootStepParticle.java => versioned/visual/FootStepParticle1_12_2.java} (92%) diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/ClientsideFixes.java b/src/main/java/de/florianmichael/viafabricplus/fixes/ClientsideFixes.java index 1e7f9ae6..dd84f590 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/ClientsideFixes.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/ClientsideFixes.java @@ -21,11 +21,12 @@ package de.florianmichael.viafabricplus.fixes; import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback; import de.florianmichael.viafabricplus.event.PostGameLoadCallback; -import de.florianmichael.viafabricplus.fixes.classic.CPEAdditions; -import de.florianmichael.viafabricplus.fixes.classic.GridItemSelectionScreen; +import de.florianmichael.viafabricplus.fixes.versioned.classic.CPEAdditions; +import de.florianmichael.viafabricplus.fixes.versioned.classic.GridItemSelectionScreen; import de.florianmichael.viafabricplus.fixes.data.ResourcePackHeaderDiff; -import de.florianmichael.viafabricplus.fixes.entity.EntityDimensionReplacements; -import de.florianmichael.viafabricplus.fixes.particle.FootStepParticle; +import de.florianmichael.viafabricplus.fixes.data.EntityDimensionDiff; +import de.florianmichael.viafabricplus.fixes.versioned.visual.ArmorHudEmulation1_8; +import de.florianmichael.viafabricplus.fixes.versioned.visual.FootStepParticle1_12_2; import de.florianmichael.viafabricplus.injection.ViaFabricPlusMixinPlugin; import de.florianmichael.viafabricplus.injection.access.IClientConnection; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; @@ -73,7 +74,7 @@ public class ClientsideFixes { PostGameLoadCallback.EVENT.register(() -> { // Handles and updates entity dimension changes in <= 1.17 - EntityDimensionReplacements.init(); + EntityDimensionDiff.init(); // Ticks the armor hud manually in <= 1.8.x ArmorHudEmulation1_8.init(); @@ -113,7 +114,7 @@ public class ClientsideFixes { })); // Register the footstep particle - FootStepParticle.init(); + FootStepParticle1_12_2.init(); } /** diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/entity/EntityDimensionReplacements.java b/src/main/java/de/florianmichael/viafabricplus/fixes/data/EntityDimensionDiff.java similarity index 99% rename from src/main/java/de/florianmichael/viafabricplus/fixes/entity/EntityDimensionReplacements.java rename to src/main/java/de/florianmichael/viafabricplus/fixes/data/EntityDimensionDiff.java index bce65f66..51a638eb 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/entity/EntityDimensionReplacements.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/data/EntityDimensionDiff.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.fixes.entity; +package de.florianmichael.viafabricplus.fixes.data; import de.florianmichael.viafabricplus.event.ChangeProtocolVersionCallback; import net.minecraft.client.MinecraftClient; @@ -33,7 +33,7 @@ import static de.florianmichael.viafabricplus.util.MapUtil.linkedHashMap; /** * Data dump for entity dimension changes between versions. */ -public class EntityDimensionReplacements { +public class EntityDimensionDiff { /** * A map of entity types to a map of versions to dimensions. diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/ActionResultException1_12_2.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/ActionResultException1_12_2.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/fixes/ActionResultException1_12_2.java rename to src/main/java/de/florianmichael/viafabricplus/fixes/versioned/ActionResultException1_12_2.java index 0e5a045f..8eefb2b4 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/ActionResultException1_12_2.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/ActionResultException1_12_2.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.fixes; +package de.florianmichael.viafabricplus.fixes.versioned; import net.minecraft.util.ActionResult; diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/ClientPlayerInteractionManager1_18_2.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/ClientPlayerInteractionManager1_18_2.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/fixes/ClientPlayerInteractionManager1_18_2.java rename to src/main/java/de/florianmichael/viafabricplus/fixes/versioned/ClientPlayerInteractionManager1_18_2.java index e5153f42..fb1d3c40 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/ClientPlayerInteractionManager1_18_2.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/ClientPlayerInteractionManager1_18_2.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.fixes; +package de.florianmichael.viafabricplus.fixes.versioned; import de.florianmichael.viafabricplus.ViaFabricPlus; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/replacement/KeyPairResponse1_19_0.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/KeyPairResponse1_19_0.java similarity index 95% rename from src/main/java/de/florianmichael/viafabricplus/fixes/replacement/KeyPairResponse1_19_0.java rename to src/main/java/de/florianmichael/viafabricplus/fixes/versioned/KeyPairResponse1_19_0.java index 90859226..adc29d07 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/replacement/KeyPairResponse1_19_0.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/KeyPairResponse1_19_0.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.fixes.replacement; +package de.florianmichael.viafabricplus.fixes.versioned; import com.mojang.authlib.yggdrasil.response.KeyPairResponse; diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/replacement/PendingUpdateManager1_18_2.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/PendingUpdateManager1_18_2.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/fixes/replacement/PendingUpdateManager1_18_2.java rename to src/main/java/de/florianmichael/viafabricplus/fixes/versioned/PendingUpdateManager1_18_2.java index cdc0465c..b9dde1ed 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/replacement/PendingUpdateManager1_18_2.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/PendingUpdateManager1_18_2.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.fixes.replacement; +package de.florianmichael.viafabricplus.fixes.versioned; import net.minecraft.block.BlockState; import net.minecraft.client.network.ClientPlayerEntity; diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/classic/CPEAdditions.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/CPEAdditions.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/fixes/classic/CPEAdditions.java rename to src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/CPEAdditions.java index 3925a099..57aa2508 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/classic/CPEAdditions.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/CPEAdditions.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.fixes.classic; +package de.florianmichael.viafabricplus.fixes.versioned.classic; import com.viaversion.viaversion.api.connection.UserConnection; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/classic/GridItemSelectionScreen.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/GridItemSelectionScreen.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/fixes/classic/GridItemSelectionScreen.java rename to src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/GridItemSelectionScreen.java index 79fe3988..543b7e51 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/classic/GridItemSelectionScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/GridItemSelectionScreen.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.fixes.classic; +package de.florianmichael.viafabricplus.fixes.versioned.classic; import de.florianmichael.viafabricplus.fixes.data.ItemRegistryDiff; import de.florianmichael.viafabricplus.screen.VFPScreen; diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/classic/WorldHeightSupport.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/WorldHeightSupport.java similarity index 99% rename from src/main/java/de/florianmichael/viafabricplus/fixes/classic/WorldHeightSupport.java rename to src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/WorldHeightSupport.java index 4559c3a3..da20decc 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/classic/WorldHeightSupport.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/WorldHeightSupport.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.fixes.classic; +package de.florianmichael.viafabricplus.fixes.versioned.classic; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/classic/command/ListExtensionsCommand.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/ListExtensionsCommand.java similarity index 96% rename from src/main/java/de/florianmichael/viafabricplus/fixes/classic/command/ListExtensionsCommand.java rename to src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/ListExtensionsCommand.java index 12d5f34f..8f00c8a5 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/classic/command/ListExtensionsCommand.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/ListExtensionsCommand.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.fixes.classic.command; +package de.florianmichael.viafabricplus.fixes.versioned.classic.command; import com.viaversion.viaversion.api.command.ViaCommandSender; import com.viaversion.viaversion.api.connection.UserConnection; diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/classic/command/SetTimeCommand.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/SetTimeCommand.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/fixes/classic/command/SetTimeCommand.java rename to src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/SetTimeCommand.java index 20fcca7c..3bee3c06 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/classic/command/SetTimeCommand.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/command/SetTimeCommand.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.fixes.classic.command; +package de.florianmichael.viafabricplus.fixes.versioned.classic.command; import com.viaversion.viaversion.api.command.ViaCommandSender; import com.viaversion.viaversion.api.connection.UserConnection; diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/ArmorHudEmulation1_8.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/ArmorHudEmulation1_8.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/fixes/ArmorHudEmulation1_8.java rename to src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/ArmorHudEmulation1_8.java index 445dbebc..e9a7a1a7 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/ArmorHudEmulation1_8.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/ArmorHudEmulation1_8.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.fixes; +package de.florianmichael.viafabricplus.fixes.versioned.visual; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/entity/BoatModel1_8.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BoatModel1_8.java similarity index 98% rename from src/main/java/de/florianmichael/viafabricplus/fixes/entity/BoatModel1_8.java rename to src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BoatModel1_8.java index 01c2f652..9d62e986 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/entity/BoatModel1_8.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BoatModel1_8.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.fixes.entity; +package de.florianmichael.viafabricplus.fixes.versioned.visual; import com.google.common.collect.ImmutableList; import net.minecraft.client.model.*; diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/entity/BoatRenderer1_8.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BoatRenderer1_8.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/fixes/entity/BoatRenderer1_8.java rename to src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BoatRenderer1_8.java index 6b466ab6..bb6aade8 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/entity/BoatRenderer1_8.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BoatRenderer1_8.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.fixes.entity; +package de.florianmichael.viafabricplus.fixes.versioned.visual; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.VertexConsumer; diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/replacement/BuiltinEmptyGlyph1_12_2.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BuiltinEmptyGlyph1_12_2.java similarity index 97% rename from src/main/java/de/florianmichael/viafabricplus/fixes/replacement/BuiltinEmptyGlyph1_12_2.java rename to src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BuiltinEmptyGlyph1_12_2.java index 5143323d..db9a526e 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/replacement/BuiltinEmptyGlyph1_12_2.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/BuiltinEmptyGlyph1_12_2.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.fixes.replacement; +package de.florianmichael.viafabricplus.fixes.versioned.visual; import net.minecraft.client.font.Glyph; import net.minecraft.client.font.GlyphRenderer; diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/entity/EntityRidingOffsetsPre1_20_2.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/EntityRidingOffsetsPre1_20_2.java similarity index 99% rename from src/main/java/de/florianmichael/viafabricplus/fixes/entity/EntityRidingOffsetsPre1_20_2.java rename to src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/EntityRidingOffsetsPre1_20_2.java index 5474c3e5..649d72e3 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/entity/EntityRidingOffsetsPre1_20_2.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/EntityRidingOffsetsPre1_20_2.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.fixes.entity; +package de.florianmichael.viafabricplus.fixes.versioned.visual; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.minecraft.entity.Entity; diff --git a/src/main/java/de/florianmichael/viafabricplus/fixes/particle/FootStepParticle.java b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/FootStepParticle1_12_2.java similarity index 92% rename from src/main/java/de/florianmichael/viafabricplus/fixes/particle/FootStepParticle.java rename to src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/FootStepParticle1_12_2.java index e53767b7..9efc1b82 100644 --- a/src/main/java/de/florianmichael/viafabricplus/fixes/particle/FootStepParticle.java +++ b/src/main/java/de/florianmichael/viafabricplus/fixes/versioned/visual/FootStepParticle1_12_2.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.florianmichael.viafabricplus.fixes.particle; +package de.florianmichael.viafabricplus.fixes.versioned.visual; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry; @@ -34,11 +34,11 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.raphimc.vialoader.util.VersionEnum; -public class FootStepParticle extends SpriteBillboardParticle { +public class FootStepParticle1_12_2 extends SpriteBillboardParticle { public static int ID; - protected FootStepParticle(ClientWorld clientWorld, double x, double y, double z) { + protected FootStepParticle1_12_2(ClientWorld clientWorld, double x, double y, double z) { super(clientWorld, x, y, z); this.scale = 0.125F; @@ -81,7 +81,7 @@ public class FootStepParticle extends SpriteBillboardParticle { final DefaultParticleType footStepType = FabricParticleTypes.simple(true); Registry.register(Registries.PARTICLE_TYPE, new Identifier("viafabricplus", "footstep"), footStepType); - ParticleFactoryRegistry.getInstance().register(footStepType, FootStepParticle.Factory::new); + ParticleFactoryRegistry.getInstance().register(footStepType, FootStepParticle1_12_2.Factory::new); ID = Registries.PARTICLE_TYPE.getRawId(footStepType); } @@ -100,7 +100,7 @@ public class FootStepParticle extends SpriteBillboardParticle { throw new UnsupportedOperationException("FootStepParticle is not supported on versions newer than 1.12.2"); } - final FootStepParticle particle = new FootStepParticle(world, x, y, z); + final FootStepParticle1_12_2 particle = new FootStepParticle1_12_2(world, x, y, z); particle.setSprite(this.spriteProvider); return particle; } diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/access/IClientPlayerInteractionManager.java b/src/main/java/de/florianmichael/viafabricplus/injection/access/IClientPlayerInteractionManager.java index 425e503e..a731893f 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/access/IClientPlayerInteractionManager.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/access/IClientPlayerInteractionManager.java @@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.injection.access; -import de.florianmichael.viafabricplus.fixes.ClientPlayerInteractionManager1_18_2; +import de.florianmichael.viafabricplus.fixes.versioned.ClientPlayerInteractionManager1_18_2; public interface IClientPlayerInteractionManager { diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/authlib/MixinYggdrasilUserApiService.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/authlib/MixinYggdrasilUserApiService.java index 6bcf4720..ce1aa870 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/authlib/MixinYggdrasilUserApiService.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/authlib/MixinYggdrasilUserApiService.java @@ -23,7 +23,7 @@ import com.mojang.authlib.minecraft.client.MinecraftClient; import com.mojang.authlib.yggdrasil.YggdrasilUserApiService; import com.mojang.authlib.yggdrasil.response.KeyPairResponse; import de.florianmichael.viafabricplus.ViaFabricPlus; -import de.florianmichael.viafabricplus.fixes.replacement.KeyPairResponse1_19_0; +import de.florianmichael.viafabricplus.fixes.versioned.KeyPairResponse1_19_0; import de.florianmichael.viafabricplus.injection.access.ILegacyKeySignatureStorage; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientWorld.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientWorld.java index ea108592..afabe394 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientWorld.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinClientWorld.java @@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; -import de.florianmichael.viafabricplus.fixes.replacement.PendingUpdateManager1_18_2; +import de.florianmichael.viafabricplus.fixes.versioned.PendingUpdateManager1_18_2; import de.florianmichael.viafabricplus.injection.access.IEntity; import de.florianmichael.viafabricplus.settings.impl.DebugSettings; import net.minecraft.client.network.ClientPlayNetworkHandler; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinFontStorage.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinFontStorage.java index cc30515a..8f57c3ea 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinFontStorage.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinFontStorage.java @@ -21,7 +21,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; import com.llamalad7.mixinextras.sugar.Local; import de.florianmichael.viafabricplus.fixes.data.RenderableGlyphDiff; -import de.florianmichael.viafabricplus.fixes.replacement.BuiltinEmptyGlyph1_12_2; +import de.florianmichael.viafabricplus.fixes.versioned.visual.BuiltinEmptyGlyph1_12_2; import de.florianmichael.viafabricplus.settings.impl.VisualSettings; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.*; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBoatEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBoatEntity.java index 72686f5e..800e202b 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBoatEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinBoatEntity.java @@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; -import de.florianmichael.viafabricplus.fixes.entity.EntityRidingOffsetsPre1_20_2; +import de.florianmichael.viafabricplus.fixes.versioned.visual.EntityRidingOffsetsPre1_20_2; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntity.java index 892e67a2..1654214f 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntity.java @@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; -import de.florianmichael.viafabricplus.fixes.entity.EntityRidingOffsetsPre1_20_2; +import de.florianmichael.viafabricplus.fixes.versioned.visual.EntityRidingOffsetsPre1_20_2; import de.florianmichael.viafabricplus.injection.access.IEntity; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import de.florianmichael.viafabricplus.settings.impl.DebugSettings; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java index 6698260d..a32930a9 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityModels.java @@ -20,7 +20,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; import com.google.common.collect.ImmutableMap; -import de.florianmichael.viafabricplus.fixes.entity.BoatModel1_8; +import de.florianmichael.viafabricplus.fixes.versioned.visual.BoatModel1_8; import net.minecraft.client.model.TexturedModelData; import net.minecraft.client.render.entity.model.EntityModelLayer; import net.minecraft.client.render.entity.model.EntityModels; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityRenderDispatcher.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityRenderDispatcher.java index b92b9ebd..a6ab31a9 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityRenderDispatcher.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinEntityRenderDispatcher.java @@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; -import de.florianmichael.viafabricplus.fixes.entity.BoatRenderer1_8; +import de.florianmichael.viafabricplus.fixes.versioned.visual.BoatRenderer1_8; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.render.entity.EntityRenderer; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java index b3b82326..f13dfcec 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/entity/MixinLivingEntity.java @@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.entity; -import de.florianmichael.viafabricplus.fixes.entity.EntityRidingOffsetsPre1_20_2; +import de.florianmichael.viafabricplus.fixes.versioned.visual.EntityRidingOffsetsPre1_20_2; import de.florianmichael.viafabricplus.protocolhack.ProtocolHack; import de.florianmichael.viafabricplus.settings.impl.DebugSettings; import net.minecraft.block.BlockState; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayerInteractionManager.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayerInteractionManager.java index 56243bcf..87ec99ac 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayerInteractionManager.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/network/MixinClientPlayerInteractionManager.java @@ -25,8 +25,8 @@ import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ServerboundPackets1_16_2; import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.Protocol1_17To1_16_4; -import de.florianmichael.viafabricplus.fixes.ActionResultException1_12_2; -import de.florianmichael.viafabricplus.fixes.ClientPlayerInteractionManager1_18_2; +import de.florianmichael.viafabricplus.fixes.versioned.ActionResultException1_12_2; +import de.florianmichael.viafabricplus.fixes.versioned.ClientPlayerInteractionManager1_18_2; import de.florianmichael.viafabricplus.injection.access.IClientConnection; import de.florianmichael.viafabricplus.injection.access.IClientPlayerInteractionManager; import de.florianmichael.viafabricplus.injection.access.IScreenHandler; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java index 1e2da76d..6e08d069 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/screen/MixinCreativeInventoryScreen.java @@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft.screen; -import de.florianmichael.viafabricplus.fixes.classic.GridItemSelectionScreen; +import de.florianmichael.viafabricplus.fixes.versioned.classic.GridItemSelectionScreen; import de.florianmichael.viafabricplus.settings.impl.VisualSettings; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClassicProtocolExtension.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClassicProtocolExtension.java index 7f49956d..2caeb816 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClassicProtocolExtension.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClassicProtocolExtension.java @@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.vialegacy; -import de.florianmichael.viafabricplus.fixes.classic.CPEAdditions; +import de.florianmichael.viafabricplus.fixes.versioned.classic.CPEAdditions; import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.data.ClassicProtocolExtension; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClientboundPacketsc0_30cpe.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClientboundPacketsc0_30cpe.java index 6fddfc8a..61bf0b29 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClientboundPacketsc0_30cpe.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinClientboundPacketsc0_30cpe.java @@ -19,7 +19,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.vialegacy; -import de.florianmichael.viafabricplus.fixes.classic.CPEAdditions; +import de.florianmichael.viafabricplus.fixes.versioned.classic.CPEAdditions; import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.ClientboundPacketsc0_30cpe; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolc0_30toc0_30cpe.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolc0_30toc0_30cpe.java index b79e557e..13b9b5b7 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolc0_30toc0_30cpe.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolc0_30toc0_30cpe.java @@ -25,7 +25,7 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4; import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.Protocol1_19_4To1_19_3; -import de.florianmichael.viafabricplus.fixes.classic.CPEAdditions; +import de.florianmichael.viafabricplus.fixes.versioned.classic.CPEAdditions; import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.ClientboundPacketsc0_28; import net.raphimc.vialegacy.protocols.classic.protocola1_0_15toc0_28_30.ServerboundPacketsc0_28; import net.raphimc.vialegacy.protocols.classic.protocolc0_28_30toc0_28_30cpe.ClientboundPacketsc0_30cpe; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPackets1_17.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPackets1_17.java index 2301c98f..da446ded 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPackets1_17.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinEntityPackets1_17.java @@ -25,7 +25,7 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.Protocol1_17To1_16_4; import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.packets.EntityPackets; -import de.florianmichael.viafabricplus.fixes.classic.WorldHeightSupport; +import de.florianmichael.viafabricplus.fixes.versioned.classic.WorldHeightSupport; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinMappingDataBase.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinMappingDataBase.java index e2e4716f..ba345661 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinMappingDataBase.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinMappingDataBase.java @@ -20,7 +20,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.api.data.MappingDataBase; -import de.florianmichael.viafabricplus.fixes.particle.FootStepParticle; +import de.florianmichael.viafabricplus.fixes.versioned.visual.FootStepParticle1_12_2; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -31,7 +31,7 @@ public abstract class MixinMappingDataBase { @Inject(method = "getNewParticleId", at = @At("HEAD"), cancellable = true) private void passthroughFootStepParticle(int id, CallbackInfoReturnable cir) { - if (id == FootStepParticle.ID) { + if (id == FootStepParticle1_12_2.ID) { cir.setReturnValue(id); } } diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinParticleRewriter.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinParticleRewriter.java index d1f4fcd2..ed2f84a8 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinParticleRewriter.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinParticleRewriter.java @@ -20,7 +20,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.data.ParticleRewriter; -import de.florianmichael.viafabricplus.fixes.particle.FootStepParticle; +import de.florianmichael.viafabricplus.fixes.versioned.visual.FootStepParticle1_12_2; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -40,7 +40,7 @@ public abstract class MixinParticleRewriter { @Inject(method = "", at = @At("RETURN")) private static void checkFootStepIdOverlap(CallbackInfo ci) { - if (FootStepParticle.ID < particles.size()) { + if (FootStepParticle1_12_2.ID < particles.size()) { throw new IllegalStateException("ViaFabricPlus FootStepParticle ID overlaps with a vanilla 1.12.2 particle ID"); } } @@ -50,7 +50,7 @@ public abstract class MixinParticleRewriter { if (particles.size() == 8) { // minecraft:depthsuspend -> minecraft:mycelium return 32; } else if (particles.size() == 28) { // minecraft:footstep -> viafabricplus:footstep - return FootStepParticle.ID; + return FootStepParticle1_12_2.ID; } else { return id; } diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPackets1_17.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPackets1_17.java index 939a1a1f..e2f0a301 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPackets1_17.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinWorldPackets1_17.java @@ -25,7 +25,7 @@ import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; import com.viaversion.viaversion.protocols.protocol1_16_2to1_16_1.ClientboundPackets1_16_2; import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.Protocol1_17To1_16_4; import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.packets.WorldPackets; -import de.florianmichael.viafabricplus.fixes.classic.WorldHeightSupport; +import de.florianmichael.viafabricplus.fixes.versioned.classic.WorldHeightSupport; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/src/main/java/de/florianmichael/viafabricplus/protocolhack/impl/command/ViaFabricPlusVLCommandHandler.java b/src/main/java/de/florianmichael/viafabricplus/protocolhack/impl/command/ViaFabricPlusVLCommandHandler.java index 072a099c..d107419c 100644 --- a/src/main/java/de/florianmichael/viafabricplus/protocolhack/impl/command/ViaFabricPlusVLCommandHandler.java +++ b/src/main/java/de/florianmichael/viafabricplus/protocolhack/impl/command/ViaFabricPlusVLCommandHandler.java @@ -23,8 +23,8 @@ import com.mojang.brigadier.arguments.StringArgumentType; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.SuggestionsBuilder; -import de.florianmichael.viafabricplus.fixes.classic.command.ListExtensionsCommand; -import de.florianmichael.viafabricplus.fixes.classic.command.SetTimeCommand; +import de.florianmichael.viafabricplus.fixes.versioned.classic.command.ListExtensionsCommand; +import de.florianmichael.viafabricplus.fixes.versioned.classic.command.SetTimeCommand; import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource; import net.raphimc.vialoader.impl.viaversion.VLCommandHandler;