Upstream/ViaFabricPlus
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaFabricPlus.git synced 2025-02-25 03:12:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix incompatibility with FancyBlockParticles, cleanup code

Browse Source 
Closes https://github.com/ViaVersion/ViaFabricPlus/issues/463
This commit is contained in:
FlorianMichael 2024-06-27 20:19:05 +02:00
parent 42f33167a9
commit bba145732b
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
4 changed files with 22 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/de/florianmichael/viafabricplus/fixes/versioned/classic/CPEAdditions.java
View File

@ -20,10 +20,13 @@
package de.florianmichael.viafabricplus.fixes.versioned.classic;
import com.viaversion.viaversion.api.connection.UserConnection;
import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
import io.netty.buffer.ByteBuf;
import net.lenni0451.reflect.Enums;
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.packet.ClientboundPacketsc0_30cpe;
import org.jetbrains.annotations.ApiStatus;
import java.util.Arrays;
import java.util.HashMap;
@ -38,10 +41,22 @@ public class CPEAdditions {
public static ClientboundPacketsc0_30cpe EXT_WEATHER_TYPE;
private static boolean snowing = false;
public static void modifyMappings() {
EXT_WEATHER_TYPE = createNewPacket(ClassicProtocolExtension.ENV_WEATHER_TYPE, 31, (user, buf) -> buf.readByte());
}
@ApiStatus.Internal
public static boolean isSnowing() {
return ProtocolTranslator.getTargetVersion().equals(LegacyProtocolVersion.c0_30cpe) && snowing;
}
@ApiStatus.Internal
public static void setSnowing(boolean snowing) {
CPEAdditions.snowing = snowing;
}
public static void allowExtension(final ClassicProtocolExtension classicProtocolExtension) {
ALLOWED_EXTENSIONS.add(classicProtocolExtension);
}

28
src/main/java/de/florianmichael/viafabricplus/fixes/viaversion/SnowTrackerc0_30cpe.java
View File

@ -1,28 +0,0 @@
/*
* This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <florian.michael07@gmail.com> and RK_01/RaphiMC
* Copyright (C) 2023-2024 contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package de.florianmichael.viafabricplus.fixes.viaversion;
import com.viaversion.viaversion.api.connection.StorableObject;
public class SnowTrackerc0_30cpe implements StorableObject {
public static final SnowTrackerc0_30cpe INSTANCE = new SnowTrackerc0_30cpe();
}

15
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinWorldRenderer.java
View File

@ -19,12 +19,10 @@
package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
import de.florianmichael.viafabricplus.fixes.viaversion.SnowTrackerc0_30cpe;
import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator;
import de.florianmichael.viafabricplus.fixes.versioned.classic.CPEAdditions;
import net.minecraft.client.render.WorldRenderer;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.biome.Biome;
import net.raphimc.vialegacy.api.LegacyProtocolVersion;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@ -32,14 +30,13 @@ import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(WorldRenderer.class)
public abstract class MixinWorldRenderer {
@Redirect(method = "renderWeather", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/biome/Biome;getPrecipitation(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/world/biome/Biome$Precipitation;"))
@Redirect(method = "renderWeather", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/biome/Biome;getPrecipitation(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/world/biome/Biome$Precipitation;"), require = 0)
private Biome.Precipitation forceSnow(Biome instance, BlockPos pos) {
if (ProtocolTranslator.getTargetVersion().equals(LegacyProtocolVersion.c0_30cpe)) {
if (ProtocolTranslator.getPlayNetworkUserConnection().has(SnowTrackerc0_30cpe.class)) {
return Biome.Precipitation.SNOW;
}
if (CPEAdditions.isSnowing()) {
return Biome.Precipitation.SNOW;
} else {
return instance.getPrecipitation(pos);
}
return instance.getPrecipitation(pos);
}
}

7
src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/vialegacy/MixinProtocolc0_30cpeToc0_28_30.java
View File

@ -26,7 +26,6 @@ import com.viaversion.viaversion.api.type.Types;
import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.Protocol1_19_3To1_19_4;
import com.viaversion.viaversion.protocols.v1_19_3to1_19_4.packet.ClientboundPackets1_19_4;
import de.florianmichael.viafabricplus.fixes.versioned.classic.CPEAdditions;
import de.florianmichael.viafabricplus.fixes.viaversion.SnowTrackerc0_30cpe;
import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.packet.ClientboundPacketsc0_28;
import net.raphimc.vialegacy.protocol.classic.c0_28_30toa1_0_15.packet.ServerboundPacketsc0_28;
import net.raphimc.vialegacy.protocol.classic.c0_30cpetoc0_28_30.Protocolc0_30cpeToc0_28_30;
@ -60,11 +59,7 @@ public abstract class MixinProtocolc0_30cpeToc0_28_30 extends AbstractProtocol<C
changeRainType.write(Types.FLOAT, 1F);
changeRainType.send(Protocol1_19_3To1_19_4.class);
}
if (weatherType == 2) {
wrapper.user().put(SnowTrackerc0_30cpe.INSTANCE);
} else {
wrapper.user().remove(SnowTrackerc0_30cpe.class);
}
CPEAdditions.setSnowing(weatherType == 2);
});
}
});