Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2024-09-27 04:22:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mark internals and make initializing private where possible

Browse Source
This commit is contained in:
FlorianMichael 2024-05-26 01:28:53 +02:00
parent 203585875f
commit 06c6cd024a
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
9 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/florianmichael/viafabricplus/fixes/ClientsideFixes.java
View File

@ -45,6 +45,7 @@ import net.raphimc.viabedrock.protocol.data.ProtocolConstants;
import net.raphimc.vialegacy.api.LegacyProtocolVersion;
import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.data.ClassicProtocolExtension;
import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.storage.ExtensionProtocolMetadataStorage;
import org.jetbrains.annotations.ApiStatus;
import java.util.Map;
import java.util.Objects;
@ -82,7 +83,7 @@ public class ClientsideFixes {
*/
public static int GLOBAL_TABLIST_INDEX = 0;
public static void init() {
static {
// Register additional CPE features
CPEAdditions.modifyMappings();
@ -135,6 +136,10 @@ public class ClientsideFixes {
DataCustomPayload.init();
}
public static void init() {
// Calls the static block
}
/**
* Calculates the maximum chat length for the selected protocol version in {@link ProtocolTranslator#getTargetVersion()}
*
@ -188,6 +193,7 @@ public class ClientsideFixes {
return uuid;
}
@ApiStatus.Internal
public static void handleSyncTask(final PacketByteBuf buf) {
final String uuid = buf.readString();

2
src/main/java/de/florianmichael/viafabricplus/fixes/data/EntityDimensionDiff.java
View File

@ -164,7 +164,7 @@ public class EntityDimensionDiff {
}
public static void init() {
// Loads the class and triggers the static initializer.
// Calls the static block
}
/**

2
src/main/java/de/florianmichael/viafabricplus/fixes/data/ResourcePackHeaderDiff.java
View File

@ -25,6 +25,7 @@ import net.minecraft.GameVersion;
import net.minecraft.SaveVersion;
import net.minecraft.SharedConstants;
import net.minecraft.resource.ResourceType;
import org.jetbrains.annotations.ApiStatus;
import java.util.Date;
import java.util.HashMap;
@ -84,6 +85,7 @@ public class ResourcePackHeaderDiff {
/**
* Checks if the registry is outdated.
*/
@ApiStatus.Internal
public static void checkOutdated() {
for (ProtocolVersion version : ProtocolVersion.getProtocols()) {
if (version.isSnapshot()) continue;

2
src/main/java/de/florianmichael/viafabricplus/fixes/data/recipe/Recipes1_11_2.java
View File

@ -32,6 +32,7 @@ import net.minecraft.recipe.book.CraftingRecipeCategory;
import net.minecraft.registry.tag.ItemTags;
import net.minecraft.screen.ScreenHandler;
import net.raphimc.vialegacy.api.LegacyProtocolVersion;
import org.jetbrains.annotations.ApiStatus;
import java.util.ArrayList;
import java.util.List;
@ -703,6 +704,7 @@ public class Recipes1_11_2 {
* @param screenHandler The screen handler
* @param inventory The inventory of the screen handler
*/
@ApiStatus.Internal
public static void setCraftingResultSlot(final int syncId, final ScreenHandler screenHandler, final RecipeInputInventory inventory) {
final var network = MinecraftClient.getInstance().getNetworkHandler();
final var world = MinecraftClient.getInstance().world;

2
src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/WorldHeightSupport.java
View File

@ -32,11 +32,13 @@ import net.raphimc.vialegacy.api.LegacyProtocolVersion;
import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.model.ClassicLevel;
import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.provider.ClassicWorldHeightProvider;
import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.storage.ClassicLevelStorage;
import org.jetbrains.annotations.ApiStatus;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.List;
@ApiStatus.Internal
public class WorldHeightSupport {
public static PacketHandler handleJoinGame(final PacketHandler parentHandler) {

6
src/main/java/de/florianmichael/viafabricplus/protocoltranslator/ProtocolTranslator.java
View File

@ -58,6 +58,7 @@ import net.raphimc.vialoader.impl.platform.ViaAprilFoolsPlatformImpl;
import net.raphimc.vialoader.impl.platform.ViaBackwardsPlatformImpl;
import net.raphimc.vialoader.impl.platform.ViaBedrockPlatformImpl;
import org.cloudburstmc.netty.channel.raknet.config.RakChannelOption;
import org.jetbrains.annotations.ApiStatus;
import java.io.File;
import java.nio.file.FileAlreadyExistsException;
@ -126,6 +127,7 @@ public class ProtocolTranslator {
*
* @param connection the Minecraft connection
*/
@ApiStatus.Internal
public static void injectViaPipeline(final ClientConnection connection, final Channel channel) {
final IClientConnection mixinClientConnection = (IClientConnection) connection;
final ProtocolVersion serverVersion = mixinClientConnection.viaFabricPlus$getTargetVersion();
@ -202,6 +204,7 @@ public class ProtocolTranslator {
/**
* Resets the previous version if it is set. Calling {@link #setTargetVersion(ProtocolVersion, boolean)} with revertOnDisconnect set to true will set it.
*/
@ApiStatus.Internal
public static void injectPreviousVersionReset(final Channel channel) {
if (previousVersion == null) {
return;
@ -259,7 +262,7 @@ public class ProtocolTranslator {
*
* @param configFolder The directory where the ViaVersion config files are located
*/
public static void patchConfigs(final File configFolder) {
private static void patchConfigs(final File configFolder) {
configFolder.mkdirs();
try {
@ -310,6 +313,7 @@ public class ProtocolTranslator {
* @param directory The directory where the ViaVersion config files are located
* @return A CompletableFuture that will be completed when the initialization is done
*/
@ApiStatus.Internal
public static CompletableFuture<Void> init(final File directory) {
patchConfigs(new File(directory, "ViaLoader"));

2
src/main/java/de/florianmichael/viafabricplus/save/SaveManager.java
View File

@ -23,6 +23,7 @@ import de.florianmichael.viafabricplus.event.LoadSaveFilesCallback;
import de.florianmichael.viafabricplus.save.impl.AccountsSave;
import de.florianmichael.viafabricplus.save.impl.SettingsSave;
import de.florianmichael.viafabricplus.settings.SettingsManager;
import org.jetbrains.annotations.ApiStatus;
import java.util.ArrayList;
import java.util.Arrays;
@ -59,6 +60,7 @@ public class SaveManager {
LoadSaveFilesCallback.EVENT.invoker().onLoadSaveFiles(this, LoadSaveFilesCallback.State.POST);
}
@ApiStatus.Internal
public void postInit() {
for (AbstractSave save : saves) {
save.postInit();

2
src/main/java/de/florianmichael/viafabricplus/util/ClassLoaderPriorityUtil.java
View File

@ -22,12 +22,14 @@ package de.florianmichael.viafabricplus.util;
import de.florianmichael.viafabricplus.ViaFabricPlus;
import net.lenni0451.reflect.ClassLoaders;
import net.lenni0451.reflect.stream.RStream;
import org.jetbrains.annotations.ApiStatus;
import java.io.File;
/**
* Allows the user to override the Via* jar files with custom ones using the "jars" folder in the run directory
*/
@ApiStatus.Internal
public class ClassLoaderPriorityUtil {
/**

6
src/main/java/de/florianmichael/viafabricplus/util/DataCustomPayload.java
View File

@ -30,12 +30,16 @@ public record DataCustomPayload(PacketByteBuf buf) implements CustomPayload {
public static final CustomPayload.Id<DataCustomPayload> ID = new CustomPayload.Id<>(new Identifier(ClientsideFixes.PACKET_SYNC_IDENTIFIER));
public static void init() {
static {
PayloadTypeRegistry.playS2C().register(DataCustomPayload.ID, CustomPayload.codecOf((value, buf) -> {
throw new UnsupportedOperationException("DataCustomPayload is a read-only packet");
}, buf -> new DataCustomPayload(new PacketByteBuf(Unpooled.copiedBuffer(buf.readSlice(buf.readableBytes()))))));
}
public static void init() {
// Calls the static block
}
@Override
public Id<? extends CustomPayload> getId() {
return ID;