Skip to content

Commit 8d979e8

Browse files
florianreuthflorianreuth
committed
Make class names consistent
Signed-off-by: FlorianMichael <git@florianmichael.de>
1 parent ddb0599 commit 8d979e8

File tree

60 files changed

+186
-187
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+186
-187
lines changed

src/main/java/com/viaversion/fabric/common/config/VFConfig.java renamed to src/main/java/com/viaversion/fabric/common/config/ViaFabricConfig.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,17 @@
2323
import java.util.Collection;
2424
import java.util.Collections;
2525
import java.util.List;
26-
import java.util.Map;
2726
import java.util.logging.Logger;
2827

29-
public class VFConfig extends Config {
28+
public class ViaFabricConfig extends Config {
3029

3130
public static final String ENABLE_CLIENT_SIDE = "enable-client-side";
3231
public static final String CLIENT_SIDE_VERSION = "client-side-version";
3332
public static final String CLIENT_SIDE_FORCE_DISABLE = "client-side-force-disable";
3433
public static final String HIDE_BUTTON = "hide-button";
3534
public static final String IGNORE_REGISTRY_SYNC_ERRORS = "ignore-registry-sync-errors";
3635

37-
public VFConfig(File configFile, Logger logger) {
36+
public ViaFabricConfig(File configFile, Logger logger) {
3837
super(configFile, logger);
3938
reload();
4039
}

‎src/main/java/com/viaversion/fabric/common/provider/AbstractFabricVersionProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import com.google.common.primitives.Ints;
2121
import com.viaversion.fabric.common.AddressParser;
22-
import com.viaversion.fabric.common.config.VFConfig;
22+
import com.viaversion.fabric.common.config.ViaFabricConfig;
2323
import com.viaversion.fabric.common.platform.NativeVersionProvider;
2424
import com.viaversion.fabric.common.util.ProtocolUtils;
2525
import com.viaversion.viaversion.api.Via;
@@ -114,7 +114,7 @@ private boolean isDisabled(String addr) {
114114

115115
protected abstract Logger getLogger();
116116

117-
protected abstract VFConfig getConfig();
117+
protected abstract ViaFabricConfig getConfig();
118118

119119
protected abstract CompletableFuture<ProtocolVersion> detectVersion(InetSocketAddress address);
120120
}

‎viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/ViaFabric.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import com.mojang.brigadier.arguments.StringArgumentType;
2222
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
2323
import com.mojang.brigadier.builder.RequiredArgumentBuilder;
24-
import com.viaversion.fabric.common.config.VFConfig;
24+
import com.viaversion.fabric.common.config.ViaFabricConfig;
2525
import com.viaversion.fabric.common.platform.FabricInjector;
2626
import com.viaversion.fabric.common.util.JLoggerToLog4j;
27-
import com.viaversion.fabric.mc1144.commands.VFCommandHandler;
27+
import com.viaversion.fabric.mc1144.commands.ViaFabricCommandHandler;
2828
import com.viaversion.fabric.mc1144.platform.FabricPlatform;
29-
import com.viaversion.fabric.mc1144.platform.VFLoader;
29+
import com.viaversion.fabric.mc1144.platform.ViaFabricPlatformLoader;
3030
import com.viaversion.fabric.mc1144.protocol.ViaFabricProtocol;
3131
import com.viaversion.viaversion.ViaManagerImpl;
3232
import com.viaversion.viaversion.api.Via;
@@ -49,7 +49,7 @@ public class ViaFabric implements ModInitializer {
4949
public static final ExecutorService ASYNC_EXECUTOR;
5050
public static final EventLoop EVENT_LOOP;
5151
public static final CompletableFuture<Void> INIT_FUTURE = new CompletableFuture<>();
52-
public static VFConfig config;
52+
public static ViaFabricConfig config;
5353

5454
static {
5555
ThreadFactory factory = new ThreadFactoryBuilder().setDaemon(true).setNameFormat("ViaFabric-%d").build();
@@ -63,10 +63,10 @@ public static <S extends SharedSuggestionProvider> LiteralArgumentBuilder<S> com
6363
.then(
6464
RequiredArgumentBuilder
6565
.<S, String>argument("args", StringArgumentType.greedyString())
66-
.executes(((VFCommandHandler) Via.getManager().getCommandHandler())::execute)
67-
.suggests(((VFCommandHandler) Via.getManager().getCommandHandler())::suggestion)
66+
.executes(((ViaFabricCommandHandler) Via.getManager().getCommandHandler())::execute)
67+
.suggests(((ViaFabricCommandHandler) Via.getManager().getCommandHandler())::suggestion)
6868
)
69-
.executes(((VFCommandHandler) Via.getManager().getCommandHandler())::execute);
69+
.executes(((ViaFabricCommandHandler) Via.getManager().getCommandHandler())::execute);
7070
}
7171

7272
@Override
@@ -75,8 +75,8 @@ public void onInitialize() {
7575

7676
Via.init(ViaManagerImpl.builder()
7777
.injector(new FabricInjector())
78-
.loader(new VFLoader())
79-
.commandHandler(new VFCommandHandler())
78+
.loader(new ViaFabricPlatformLoader())
79+
.commandHandler(new ViaFabricCommandHandler())
8080
.platform(platform).build());
8181

8282
platform.getConf().reload();
@@ -92,7 +92,7 @@ public void onInitialize() {
9292

9393
registerCommandsV1();
9494

95-
config = new VFConfig(FabricLoader.getInstance().getConfigDir().resolve("ViaFabric")
95+
config = new ViaFabricConfig(FabricLoader.getInstance().getConfigDir().resolve("ViaFabric")
9696
.resolve("viafabric.yml").toFile(), JLOGGER);
9797

9898
manager.onServerLoaded();

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/commands/VFClientCommands.java renamed to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/commands/ViaFabricClientCommands.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import io.github.cottonmc.clientcommands.ClientCommandPlugin;
2323
import io.github.cottonmc.clientcommands.CottonClientCommandSource;
2424

25-
public class VFClientCommands implements ClientCommandPlugin {
25+
public class ViaFabricClientCommands implements ClientCommandPlugin {
2626
@Override
2727
public void registerCommands(CommandDispatcher<CottonClientCommandSource> commandDispatcher) {
2828
commandDispatcher.register(ViaFabric.command("viafabricclient"));

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/commands/VFCommandHandler.java renamed to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/commands/ViaFabricCommandHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.util.concurrent.CompletableFuture;
2626
import net.minecraft.commands.SharedSuggestionProvider;
2727

28-
public class VFCommandHandler extends ViaCommandHandler {
28+
public class ViaFabricCommandHandler extends ViaCommandHandler {
2929

3030
public int execute(CommandContext<? extends SharedSuggestionProvider> ctx) {
3131
String[] args = new String[0];

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/platform/VFLoader.java renamed to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/platform/ViaFabricPlatformLoader.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
package com.viaversion.fabric.mc1144.platform;
1919

2020
import com.viaversion.fabric.mc1144.providers.FabricVersionProvider;
21-
import com.viaversion.fabric.mc1144.providers.VFHandItemProvider;
22-
import com.viaversion.fabric.mc1144.providers.VFPlayerLookTargetProvider;
21+
import com.viaversion.fabric.mc1144.providers.ViaFabricHandItemProvider;
22+
import com.viaversion.fabric.mc1144.providers.ViaFabricPlayerLookTargetProvider;
2323
import com.viaversion.viaversion.api.Via;
2424
import com.viaversion.viaversion.api.platform.ViaPlatformLoader;
2525
import com.viaversion.viaversion.api.protocol.version.VersionProvider;
@@ -28,20 +28,20 @@
2828
import net.fabricmc.api.EnvType;
2929
import net.fabricmc.loader.api.FabricLoader;
3030

31-
public class VFLoader implements ViaPlatformLoader {
31+
public class ViaFabricPlatformLoader implements ViaPlatformLoader {
3232
@Override
3333
public void load() {
3434
Via.getManager().getProviders().use(VersionProvider.class, new FabricVersionProvider());
3535

3636
if (Via.getPlatform().getConf().isItemCache()) {
37-
VFHandItemProvider handProvider = new VFHandItemProvider();
37+
ViaFabricHandItemProvider handProvider = new ViaFabricHandItemProvider();
3838
if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
3939
handProvider.registerClientTick();
4040
}
4141
Via.getManager().getProviders().use(HandItemProvider.class, handProvider);
4242
}
4343

44-
Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new VFPlayerLookTargetProvider());
44+
Via.getManager().getProviders().use(PlayerLookTargetProvider.class, new ViaFabricPlayerLookTargetProvider());
4545
}
4646

4747
@Override

‎viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/FabricVersionProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package com.viaversion.fabric.mc1144.providers;
1919

20-
import com.viaversion.fabric.common.config.VFConfig;
20+
import com.viaversion.fabric.common.config.ViaFabricConfig;
2121
import com.viaversion.fabric.common.provider.AbstractFabricVersionProvider;
2222
import com.viaversion.fabric.mc1144.ViaFabric;
2323
import com.viaversion.fabric.mc1144.service.ProtocolAutoDetector;
@@ -33,7 +33,7 @@ protected Logger getLogger() {
3333
}
3434

3535
@Override
36-
protected VFConfig getConfig() {
36+
protected ViaFabricConfig getConfig() {
3737
return ViaFabric.config;
3838
}
3939

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/VFHandItemProvider.java renamed to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/ViaFabricHandItemProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import net.minecraft.resources.ResourceLocation;
3333
import net.minecraft.world.item.ItemStack;
3434

35-
public class VFHandItemProvider extends HandItemProvider {
35+
public class ViaFabricHandItemProvider extends HandItemProvider {
3636
public Item clientItem = null;
3737

3838
@Override

viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/VFPlayerLookTargetProvider.java renamed to viafabric-mc1144/src/main/java/com/viaversion/fabric/mc1144/providers/ViaFabricPlayerLookTargetProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import net.minecraft.world.phys.BlockHitResult;
2626
import net.minecraft.world.phys.HitResult;
2727

28-
public class VFPlayerLookTargetProvider extends PlayerLookTargetProvider {
28+
public class ViaFabricPlayerLookTargetProvider extends PlayerLookTargetProvider {
2929

3030
@Override
3131
public BlockPosition getPlayerLookTarget(UserConnection info) {

‎viafabric-mc1144/src/main/resources/fabric.mod.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"com.viaversion.fabric.mc1144.ViaFabric"
5252
],
5353
"cotton-client-commands": [
54-
"com.viaversion.fabric.mc1144.commands.VFClientCommands"
54+
"com.viaversion.fabric.mc1144.commands.ViaFabricClientCommands"
5555
],
5656
"modmenu": [
5757
"com.viaversion.fabric.mc1144.gui.ModMenuConfig"

0 commit comments

Comments
 (0)