improved build code and updated libraries

This commit is contained in:
FlorianMichael 2023-06-08 18:22:53 +02:00
parent c93ea7ad1a
commit f1b347d24d
No known key found for this signature in database
GPG Key ID: C2FB87E71C425126
4 changed files with 12 additions and 8 deletions

View File

@ -19,7 +19,7 @@ ViaFabricPlus is intended to replace [multiconnect](https://github.com/Earthcomp
- Alpha (a1.0.15 - a1.2.6)
- Classic (c0.0.15 - c0.30 including [CPE](https://wiki.vg/Classic_Protocol_Extension))
- Snapshots (3D Shareware, 20w14infinite, Combat Test 8C)
- Bedrock (1.19.80)
- Bedrock (1.20.0)
### If you want to talk with me, feel free to join my [Discord](https://discord.gg/BwWhCHUKDf)

View File

@ -55,7 +55,10 @@ dependencies {
modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
library "com.github.FlorianMichael:Classic4J:${project.classic4j_version}"
library "net.raphimc:ViaLoader:${project.vialoader_version}"
library ("net.raphimc:ViaLoader:${project.vialoader_version}") {
exclude group: "org.slf4j", module: "slf4j-api"
exclude group: "org.yaml", module: "snakeyaml"
}
library "com.viaversion:viaversion:${project.viaversion_version}"
library ("com.viaversion:viabackwards-common:${project.viabackwards_version}") {

View File

@ -23,11 +23,11 @@ viabackwards_version=4.7.0
snake_yml_version=2.0
# raphimc libs
vialegacy_version=2.2.17-SNAPSHOT
vialegacy_version=2.2.17
viaaprilfools_version=2.0.8-SNAPSHOT
viabedrock_version=0.0.1-SNAPSHOT
viabedrock_version=0.0.2-SNAPSHOT
minecraftauth_version=2.1.4-SNAPSHOT
vialoader_version=2.2.5-SNAPSHOT
vialoader_version=2.2.5
# lenni0451 libs
mcstructs_text_version=2.2.5

View File

@ -17,6 +17,7 @@
*/
package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft;
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import com.llamalad7.mixinextras.injector.WrapWithCondition;
import com.viaversion.viaversion.api.connection.UserConnection;
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
@ -75,12 +76,12 @@ public abstract class MixinMinecraftClient implements IMinecraftClient {
return instance.isAccepted();
}
@Redirect(method = "handleBlockBreaking", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isUsingItem()Z"))
public boolean allowBlockBreakAndItemUsageAtTheSameTime(ClientPlayerEntity instance) {
@ModifyExpressionValue(method = "handleBlockBreaking", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isUsingItem()Z"))
public boolean allowBlockBreakAndItemUsageAtTheSameTime(boolean original) {
if (ProtocolHack.getTargetVersion().isOlderThanOrEqualTo(VersionEnum.r1_7_6tor1_7_10)) {
return false;
}
return instance.isUsingItem();
return original;
}
@Redirect(method = "tick", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;attackCooldown:I", ordinal = 1))