-
-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Workaround registry validation of tags in <= 1.21.1
Closes #613
- Loading branch information
1 parent
a2d5b96
commit f8cfb25
Showing
2 changed files
with
50 additions
and
1 deletion.
There are no files selected for viewing
48 changes: 48 additions & 0 deletions
48
...el/viafabricplus/injection/mixin/fixes/minecraft/network/MixinRegistryEntryListCodec.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/* | ||
* This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus | ||
* Copyright (C) 2021-2024 FlorianMichael/EnZaXD <[email protected]> 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.injection.mixin.fixes.minecraft.network; | ||
|
||
import com.mojang.serialization.DataResult; | ||
import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; | ||
import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator; | ||
import net.minecraft.registry.RegistryEntryLookup; | ||
import net.minecraft.registry.entry.RegistryEntryList; | ||
import net.minecraft.registry.entry.RegistryEntryListCodec; | ||
import net.minecraft.registry.tag.TagKey; | ||
import org.spongepowered.asm.mixin.Mixin; | ||
import org.spongepowered.asm.mixin.injection.At; | ||
import org.spongepowered.asm.mixin.injection.Inject; | ||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; | ||
|
||
@Mixin(RegistryEntryListCodec.class) | ||
public abstract class MixinRegistryEntryListCodec { | ||
|
||
@Inject(method = "get", at = @At("RETURN"), cancellable = true) | ||
private static void workaroundValidation(RegistryEntryLookup registry, TagKey tag, CallbackInfoReturnable<DataResult<RegistryEntryList>> cir) { | ||
if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_21)) { | ||
// The client now throws if the server refernces tags which weren't previously send via protocol, | ||
// instead of implementing verification on protocol level we just skip the error and return an empty registry list | ||
if (cir.getReturnValue().isError()) { | ||
cir.setReturnValue(DataResult.success(RegistryEntryList.empty())); | ||
} | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters