chore: update to 1.21
This commit is contained in:
parent
5db7c4c867
commit
e6ae319c07
|
@ -6,11 +6,11 @@ allprojects { group = "io.gitlab.jfronny" }
|
||||||
base.archivesName = "combit"
|
base.archivesName = "combit"
|
||||||
|
|
||||||
jfMod {
|
jfMod {
|
||||||
minecraftVersion = "1.20.5"
|
minecraftVersion = "1.21"
|
||||||
yarn("build.1")
|
yarn("build.1")
|
||||||
loaderVersion = "0.15.10"
|
loaderVersion = "0.15.11"
|
||||||
libJfVersion = "3.15.5"
|
libJfVersion = "3.16.0"
|
||||||
fabricApiVersion = "0.97.6+1.20.5"
|
fabricApiVersion = "0.100.1+1.21"
|
||||||
|
|
||||||
modrinth {
|
modrinth {
|
||||||
projectId = "combit"
|
projectId = "combit"
|
||||||
|
@ -32,7 +32,7 @@ dependencies {
|
||||||
// Dev env
|
// Dev env
|
||||||
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny")
|
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny")
|
||||||
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil")
|
modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil")
|
||||||
modLocalRuntime("com.terraformersmc:modmenu:10.0.0-beta.1")
|
modLocalRuntime("com.terraformersmc:modmenu:11.0.0-beta.1")
|
||||||
// for modmenu
|
// for modmenu
|
||||||
modLocalRuntime("net.fabricmc.fabric-api:fabric-resource-loader-v0")
|
modLocalRuntime("net.fabricmc.fabric-api:fabric-resource-loader-v0")
|
||||||
modLocalRuntime("net.fabricmc.fabric-api:fabric-screen-api-v1")
|
modLocalRuntime("net.fabricmc.fabric-api:fabric-screen-api-v1")
|
||||||
|
|
|
@ -5,7 +5,7 @@ import net.minecraft.client.*;
|
||||||
import net.minecraft.client.gui.DrawContext;
|
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.render.RenderTickCounter;
|
||||||
import org.spongepowered.asm.mixin.*;
|
import org.spongepowered.asm.mixin.*;
|
||||||
import org.spongepowered.asm.mixin.injection.*;
|
import org.spongepowered.asm.mixin.injection.*;
|
||||||
import org.spongepowered.asm.mixin.injection.callback.*;
|
import org.spongepowered.asm.mixin.injection.callback.*;
|
||||||
|
@ -15,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/gui/DrawContext;F)V")
|
@Inject(at = @At("HEAD"), method = "renderCrosshair(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/client/render/RenderTickCounter;)V")
|
||||||
private void renderCrosshair(DrawContext context, float tickDelta, CallbackInfo info) {
|
private void renderCrosshair(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) {
|
||||||
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/gui/DrawContext;F)V")
|
@Inject(at = @At("RETURN"), method = "renderCrosshair(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/client/render/RenderTickCounter;)V")
|
||||||
private void renderCrosshairPost(DrawContext context, float tickDelta, CallbackInfo info) {
|
private void renderCrosshairPost(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) {
|
||||||
if (CombitConfig.cooldownProgressOverride >= 0) {
|
if (CombitConfig.cooldownProgressOverride >= 0) {
|
||||||
this.client.options.getAttackIndicator().setValue(combit$attackIndicator);
|
this.client.options.getAttackIndicator().setValue(combit$attackIndicator);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,12 +2,12 @@ package io.gitlab.jfronny.combit.mixin;
|
||||||
|
|
||||||
import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
|
import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
|
||||||
import net.minecraft.component.ComponentMap;
|
import net.minecraft.component.ComponentMap;
|
||||||
import net.minecraft.component.DataComponentType;
|
import net.minecraft.component.ComponentType;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||||
|
|
||||||
@Mixin(ComponentMap.Builder.class)
|
@Mixin(ComponentMap.Builder.class)
|
||||||
public interface ComponentMapBuilderAccessor {
|
public interface ComponentMapBuilderAccessor {
|
||||||
@Accessor("components") Reference2ObjectMap<DataComponentType<?>, Object> combit$getComponents();
|
@Accessor("components") Reference2ObjectMap<ComponentType<?>, Object> combit$getComponents();
|
||||||
@Accessor("components") void combit$setComponents(Reference2ObjectMap<DataComponentType<?>, Object> components);
|
@Accessor("components") void combit$setComponents(Reference2ObjectMap<ComponentType<?>, Object> components);
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ public class HostileEntityMixin extends PathAwareEntity {
|
||||||
if (itemStack.isDamageable()) {
|
if (itemStack.isDamageable()) {
|
||||||
itemStack.setDamage(itemStack.getDamage() + this.random.nextInt(2));
|
itemStack.setDamage(itemStack.getDamage() + this.random.nextInt(2));
|
||||||
if (itemStack.getDamage() >= itemStack.getMaxDamage()) {
|
if (itemStack.getDamage() >= itemStack.getMaxDamage()) {
|
||||||
sendEquipmentBreakStatus(EquipmentSlot.HEAD);
|
sendEquipmentBreakStatus(itemStack.getItem(), EquipmentSlot.HEAD);
|
||||||
equipStack(EquipmentSlot.HEAD, ItemStack.EMPTY);
|
equipStack(EquipmentSlot.HEAD, ItemStack.EMPTY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,8 +58,7 @@ public abstract class MiningToolItemMixin extends ToolItem {
|
||||||
damageEntry = new AttributeModifiersComponent.Entry(
|
damageEntry = new AttributeModifiersComponent.Entry(
|
||||||
EntityAttributes.GENERIC_ATTACK_DAMAGE,
|
EntityAttributes.GENERIC_ATTACK_DAMAGE,
|
||||||
new EntityAttributeModifier(
|
new EntityAttributeModifier(
|
||||||
ATTACK_DAMAGE_MODIFIER_ID,
|
BASE_ATTACK_DAMAGE_MODIFIER_ID,
|
||||||
"Tool modifier",
|
|
||||||
damage * factor,
|
damage * factor,
|
||||||
EntityAttributeModifier.Operation.ADD_VALUE),
|
EntityAttributeModifier.Operation.ADD_VALUE),
|
||||||
AttributeModifierSlot.MAINHAND);
|
AttributeModifierSlot.MAINHAND);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user