mirror of
https://github.com/ViaVersion/ViaFabricPlus.git
synced 2024-10-15 07:17:31 +02:00
Create field for native version
This commit is contained in:
parent
664faa0b37
commit
e621ed3d78
@ -33,6 +33,7 @@ import de.florianmichael.viafabricplus.mappings.ItemReleaseVersionMappings;
|
|||||||
import de.florianmichael.viafabricplus.mappings.PackFormatsMappings;
|
import de.florianmichael.viafabricplus.mappings.PackFormatsMappings;
|
||||||
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
|
import de.florianmichael.viafabricplus.protocolhack.ProtocolHack;
|
||||||
import de.florianmichael.viafabricplus.screen.ClassicItemSelectionScreen;
|
import de.florianmichael.viafabricplus.screen.ClassicItemSelectionScreen;
|
||||||
|
import net.raphimc.vialoader.util.VersionEnum;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
@ -55,6 +56,8 @@ import java.io.File;
|
|||||||
* - Blit-jump is not supported in <= 1.8.9 (https://github.com/ViaVersion/ViaFabricPlus/issues/225)
|
* - Blit-jump is not supported in <= 1.8.9 (https://github.com/ViaVersion/ViaFabricPlus/issues/225)
|
||||||
*/
|
*/
|
||||||
public class ViaFabricPlus {
|
public class ViaFabricPlus {
|
||||||
|
public final static VersionEnum NATIVE_VERSION = VersionEnum.r1_20tor1_20_1;
|
||||||
|
|
||||||
public final static Gson GSON = new GsonBuilder().setPrettyPrinting().create();
|
public final static Gson GSON = new GsonBuilder().setPrettyPrinting().create();
|
||||||
public final static Logger LOGGER = LogManager.getLogger("ViaFabricPlus");
|
public final static Logger LOGGER = LogManager.getLogger("ViaFabricPlus");
|
||||||
public final static File RUN_DIRECTORY = new File("ViaFabricPlus");
|
public final static File RUN_DIRECTORY = new File("ViaFabricPlus");
|
||||||
|
@ -17,11 +17,11 @@
|
|||||||
*/
|
*/
|
||||||
package de.florianmichael.viafabricplus.injection.mixin.base;
|
package de.florianmichael.viafabricplus.injection.mixin.base;
|
||||||
|
|
||||||
|
import de.florianmichael.viafabricplus.ViaFabricPlus;
|
||||||
import de.florianmichael.viafabricplus.base.event.ChangeProtocolVersionCallback;
|
import de.florianmichael.viafabricplus.base.event.ChangeProtocolVersionCallback;
|
||||||
import de.florianmichael.viafabricplus.base.event.FinishMinecraftLoadCallback;
|
import de.florianmichael.viafabricplus.base.event.FinishMinecraftLoadCallback;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import net.minecraft.client.RunArgs;
|
import net.minecraft.client.RunArgs;
|
||||||
import net.raphimc.vialoader.util.VersionEnum;
|
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.Shadow;
|
import org.spongepowered.asm.mixin.Shadow;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
@ -41,7 +41,8 @@ public abstract class MixinMinecraftClient {
|
|||||||
@Inject(method = "setWorld", at = @At("HEAD"))
|
@Inject(method = "setWorld", at = @At("HEAD"))
|
||||||
public void preSetWorld(CallbackInfo ci) {
|
public void preSetWorld(CallbackInfo ci) {
|
||||||
if (isInSingleplayer()) {
|
if (isInSingleplayer()) {
|
||||||
ChangeProtocolVersionCallback.EVENT.invoker().onChangeProtocolVersion(VersionEnum.r1_20tor1_20_1);
|
// We call this here, so client side fixes are disabled in singleplayer
|
||||||
|
ChangeProtocolVersionCallback.EVENT.invoker().onChangeProtocolVersion(ViaFabricPlus.NATIVE_VERSION);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -75,7 +75,7 @@ public class ProtocolHack {
|
|||||||
/**
|
/**
|
||||||
* This field stores the target version that you set in the GUI
|
* This field stores the target version that you set in the GUI
|
||||||
*/
|
*/
|
||||||
public static VersionEnum targetVersion = VersionEnum.r1_20tor1_20_1;
|
public static VersionEnum targetVersion = ViaFabricPlus.NATIVE_VERSION;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method is used when you need the target version after connecting to the server.
|
* This method is used when you need the target version after connecting to the server.
|
||||||
@ -114,7 +114,7 @@ public class ProtocolHack {
|
|||||||
return channel.attr(FORCED_VERSION).get();
|
return channel.attr(FORCED_VERSION).get();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (MinecraftClient.getInstance() == null || MinecraftClient.getInstance().isInSingleplayer()) return VersionEnum.r1_20tor1_20_1;
|
if (MinecraftClient.getInstance() == null || MinecraftClient.getInstance().isInSingleplayer()) return ViaFabricPlus.NATIVE_VERSION;
|
||||||
|
|
||||||
return targetVersion;
|
return targetVersion;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user