Update to 1.20
This commit is contained in:
parent
f003d6febb
commit
2c63ac2efe
|
@ -11,5 +11,5 @@ dependencies {
|
||||||
// Dev env
|
// Dev env
|
||||||
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}")
|
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}")
|
||||||
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}")
|
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}")
|
||||||
modLocalRuntime("com.terraformersmc:modmenu:6.1.0-rc.1")
|
modLocalRuntime("com.terraformersmc:modmenu:7.0.1")
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,17 +1,17 @@
|
||||||
# https://fabricmc.net/develop/
|
# https://fabricmc.net/develop/
|
||||||
minecraft_version=1.19.4
|
minecraft_version=1.20
|
||||||
yarn_mappings=build.1
|
yarn_mappings=build.1
|
||||||
loader_version=0.14.17
|
loader_version=0.14.21
|
||||||
|
|
||||||
maven_group=io.gitlab.jfronny
|
maven_group=io.gitlab.jfronny
|
||||||
archives_base_name=combit
|
archives_base_name=combit
|
||||||
|
|
||||||
modrinth_id=combit
|
modrinth_id=combit
|
||||||
modrinth_required_dependencies=libjf
|
modrinth_required_dependencies=libjf
|
||||||
modrinth_optional_dependencies=modmenu, cloth-config
|
modrinth_optional_dependencies=modmenu
|
||||||
curseforge_id=561742
|
curseforge_id=561742
|
||||||
curseforge_required_dependencies=libjf
|
curseforge_required_dependencies=libjf
|
||||||
curseforge_optional_dependencies=modmenu, cloth-config
|
curseforge_optional_dependencies=modmenu
|
||||||
|
|
||||||
fabric_version=0.75.3+1.19.4
|
fabric_version=0.83.0+1.20
|
||||||
libjf_version=3.6.0
|
libjf_version=3.8.0
|
||||||
|
|
|
@ -2,6 +2,7 @@ package io.gitlab.jfronny.combit.mixin;
|
||||||
|
|
||||||
import io.gitlab.jfronny.combit.*;
|
import io.gitlab.jfronny.combit.*;
|
||||||
import net.minecraft.client.*;
|
import net.minecraft.client.*;
|
||||||
|
import net.minecraft.client.gui.DrawContext;
|
||||||
import net.minecraft.client.gui.hud.*;
|
import net.minecraft.client.gui.hud.*;
|
||||||
import net.minecraft.client.option.*;
|
import net.minecraft.client.option.*;
|
||||||
import net.minecraft.client.util.math.*;
|
import net.minecraft.client.util.math.*;
|
||||||
|
@ -14,16 +15,16 @@ public class InGameHudMixin {
|
||||||
@Shadow @Final private MinecraftClient client;
|
@Shadow @Final private MinecraftClient client;
|
||||||
private AttackIndicator combit$attackIndicator;
|
private AttackIndicator combit$attackIndicator;
|
||||||
|
|
||||||
@Inject(at = @At("HEAD"), method = "renderCrosshair(Lnet/minecraft/client/util/math/MatrixStack;)V")
|
@Inject(at = @At("HEAD"), method = "renderCrosshair(Lnet/minecraft/client/gui/DrawContext;)V")
|
||||||
private void renderCrosshair(MatrixStack matrices, CallbackInfo info) {
|
private void renderCrosshair(DrawContext context, CallbackInfo info) {
|
||||||
if (CombitConfig.cooldownProgressOverride >= 0) {
|
if (CombitConfig.cooldownProgressOverride >= 0) {
|
||||||
combit$attackIndicator = this.client.options.getAttackIndicator().getValue();
|
combit$attackIndicator = this.client.options.getAttackIndicator().getValue();
|
||||||
this.client.options.getAttackIndicator().setValue(AttackIndicator.OFF);
|
this.client.options.getAttackIndicator().setValue(AttackIndicator.OFF);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(at = @At("RETURN"), method = "renderCrosshair(Lnet/minecraft/client/util/math/MatrixStack;)V")
|
@Inject(at = @At("RETURN"), method = "renderCrosshair(Lnet/minecraft/client/gui/DrawContext;)V")
|
||||||
private void renderCrosshairPost(MatrixStack matrices, CallbackInfo info) {
|
private void renderCrosshairPost(DrawContext context, CallbackInfo info) {
|
||||||
if (CombitConfig.cooldownProgressOverride >= 0) {
|
if (CombitConfig.cooldownProgressOverride >= 0) {
|
||||||
this.client.options.getAttackIndicator().setValue(combit$attackIndicator);
|
this.client.options.getAttackIndicator().setValue(combit$attackIndicator);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue