Merge remote-tracking branch 'upstream/main'

Altnoir · Altnoir · commit b01e2cf40f88 · 2026-03-17T18:26:59.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'idea'
     id 'java-library'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.192'
+    id 'net.neoforged.gradle.userdev' version '7.1.21'
 }
 
 tasks.named('wrapper', Wrapper).configure {
@@ -158,10 +158,11 @@ dependencies {
 
     // KubeJS
     api("dev.latvian.mods:kubejs-neoforge:$kubejs_version")
+
     // Ponder
-    implementation("net.createmod.ponder:Ponder-NeoForge-${minecraft_version}:${ponder_version}")
-    // Flywheel
+    implementation("net.createmod.ponder:ponder-neoforge:${ponder_version}+mc${minecraft_version}")
     compileOnly("dev.engine-room.flywheel:flywheel-neoforge-api-${minecraft_version}:${flywheel_version}")
+    runtimeOnly("dev.engine-room.flywheel:flywheel-neoforge-${minecraft_version}:${flywheel_version}")
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.
diff --git a/gradle.properties b/gradle.properties
@@ -12,17 +12,17 @@ minecraft_version_range=[1.21.1, 1.22)
 neo_version=21.1.211
 loader_version_range=[1,)
 
-jei_version=19.21.2.313
+jei_version=19.27.0.340
 curios_version=9.5.1+1.21.1
 curios_version_range=[9.5.0+1.21.1,)
 emi_version=1.1.22+1.21.1
-jade_version=15.10.1+neoforge
-patchouli_version=1.21-88-NEOFORGE
-kubejs_version=2101.7.1-build.181
+jade_version=15.10.5+neoforge
+patchouli_version=1.21.1-93-NEOFORGE
+kubejs_version=2101.7.2-build.4
 sbm_version=1.4.0-neoforge+mc1.21.1
 mae_version=1.0.2
-ponder_version=1.0.60
-flywheel_version=1.0.4
+ponder_version=1.0.81
+flywheel_version=1.0.6
 
 mod_id=mia
 mod_name=Memento In Abyss
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/src/main/java/com/altnoir/mia/MiaGameTests.java b/src/main/java/com/altnoir/mia/MiaGameTests.java
@@ -9,7 +9,7 @@
 @GameTestHolder(MIA.MOD_ID)
 public class MiaGameTests {
     @PrefixGameTestTemplate(false)
-    @GameTest(template = "test_template")
+    @GameTest(template = "gametest/amethyst_lamptube")
     public static void exampleTest(GameTestHelper helper) {
         helper.succeedWhen(() -> {
 
diff --git a/src/main/java/com/altnoir/mia/common/component/ArtifactEnhancementComponent.java b/src/main/java/com/altnoir/mia/common/component/ArtifactEnhancementComponent.java
@@ -49,9 +49,21 @@ public List<ArtifactStat> getArtifactStats() {
     }
 
     public Multimap<Holder<Attribute>, AttributeModifier> getAttributeModifiers() {
+        return getAttributeModifiers(null);
+    }
+
+    public Multimap<Holder<Attribute>, AttributeModifier> getAttributeModifiers(ResourceLocation curiosId) {
         ImmutableMultimap.Builder<Holder<Attribute>, AttributeModifier> builder = ImmutableMultimap.builder();
         for (ArtifactStat modifier : modifiers) {
-            builder.put(modifier.attribute(), modifier.modifier());
+            AttributeModifier newModifier = modifier.modifier();
+            if (curiosId != null) {
+                newModifier = new AttributeModifier(
+                        ResourceLocation.fromNamespaceAndPath(curiosId.getNamespace(), curiosId.getPath() + "_" + newModifier.id().getPath()),
+                        newModifier.amount(),
+                        newModifier.operation()
+                );
+            }
+            builder.put(modifier.attribute(), newModifier);
         }
         return builder.build();
     }
@@ -90,7 +102,7 @@ public static String getModifierKey(Holder<Attribute> attribute, AttributeModifi
                 .map(key -> key.location().getPath())
                 .orElse("unknown");
         String op = operation.name().toLowerCase();
-        return String.format("%s.%s", attr, op);
+        return String.format("artifact_enhancement.%s.%s", attr, op);
     }
 
     @Override
diff --git a/src/main/java/com/altnoir/mia/common/item/DebugAttributeTool.java b/src/main/java/com/altnoir/mia/common/item/DebugAttributeTool.java
@@ -62,10 +62,7 @@ public InteractionResultHolder<ItemStack> use(Level level, Player player, Intera
      * 获取属性的最终值（包含所有修饰符）
      */
     private double getFinalAttributeValue(Player player, Holder<Attribute> attribute) {
-        if (player.getAttribute(attribute) != null) {
-            return player.getAttribute(attribute).getValue();
-        }
-        return 0.0;
+        return player.getAttributeValue(attribute);
     }
 
     /**
diff --git a/src/main/java/com/altnoir/mia/common/item/abs/IEArtifact.java b/src/main/java/com/altnoir/mia/common/item/abs/IEArtifact.java
@@ -59,6 +59,6 @@ default void appendTooltip(ItemStack stack, List<Component> tooltip) {
     }
 
     default Multimap<Holder<Attribute>, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) {
-        return stack.getOrDefault(MiaComponents.ARTIFACT_ENHANCEMENT, ArtifactEnhancementComponent.EMPTY).getAttributeModifiers();
+        return stack.getOrDefault(MiaComponents.ARTIFACT_ENHANCEMENT, ArtifactEnhancementComponent.EMPTY).getAttributeModifiers(id);
     }
 }
diff --git a/src/main/java/com/altnoir/mia/compat/kubejs/MiaKubeJSPlugin.java b/src/main/java/com/altnoir/mia/compat/kubejs/MiaKubeJSPlugin.java
@@ -6,6 +6,7 @@
 import dev.latvian.mods.kubejs.plugin.KubeJSPlugin;
 import dev.latvian.mods.kubejs.registry.BuilderTypeRegistry;
 import dev.latvian.mods.kubejs.script.BindingRegistry;
+import dev.latvian.mods.kubejs.util.ID;
 import net.minecraft.core.registries.Registries;
 
 public class MiaKubeJSPlugin implements KubeJSPlugin {
@@ -17,7 +18,7 @@ public void registerBindings(BindingRegistry bindings) {
 
     @Override
     public void registerBuilderTypes(BuilderTypeRegistry registry) {
-        registry.of(Registries.ITEM, reg -> reg.add("skill", SkillBuilder.class, SkillBuilder::new));
+        registry.of(Registries.ITEM, reg -> reg.add(ID.kjs("skill"), SkillBuilder.class, SkillBuilder::new));
     }
 
     @Override
diff --git a/src/main/java/com/altnoir/mia/core/event/EventHandle.java b/src/main/java/com/altnoir/mia/core/event/EventHandle.java
@@ -28,6 +28,6 @@ public static void addGameEventBus(IEventBus gameEventBus) {
         gameEventBus.addListener(MiaEvents::onLivingDeath);
         gameEventBus.addListener(MiaEvents::onFinalizeSpawn);
         gameEventBus.addListener(MiaEvents::onLivingDrops);
-        //gameEventBus.addListener(MiaEvents::onLivingDamagePost);
+        gameEventBus.addListener(MiaEvents::onLivingDamagePre);
     }
 }
diff --git a/src/main/java/com/altnoir/mia/core/event/common/CriticalDamageEvent.java b/src/main/java/com/altnoir/mia/core/event/common/CriticalDamageEvent.java
@@ -1,22 +1,19 @@
 package com.altnoir.mia.core.event.common;
 
 import com.altnoir.mia.init.MiaAttributes;
-import net.minecraft.network.chat.Component;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 
 public class CriticalDamageEvent {
     public static float onLivingCriticalDamage(LivingEntity entity, DamageSource source, float damage) {
-        double critChance = entity.getAttribute(MiaAttributes.CRITICAL_HIT).getValue();
-        double critDamage = entity.getAttribute(MiaAttributes.CRITICAL_HIT_DAMAGE).getValue();
-
         if (source.getEntity() instanceof Player player) {
-            player.sendSystemMessage(Component.literal(critChance * 100 + "% 暴击率, 暴击伤害: " + critDamage));
-        }
+            var chance = player.getAttributeValue(MiaAttributes.CRITICAL_HIT);
+            var baseDamage = player.getAttributeValue(MiaAttributes.CRITICAL_HIT_DAMAGE);
 
-        if (critChance > 0 && entity.getRandom().nextDouble() < critChance) {
-            return damage * (float) (critDamage + Math.max(0, critChance - 1.0));
+            if (chance > 0 && entity.getRandom().nextDouble() < chance) {
+                return damage * (float) (baseDamage + Math.max(0, chance - 1.0));
+            }
         }
         return damage;
     }
diff --git a/src/main/java/com/altnoir/mia/init/MiaEvents.java b/src/main/java/com/altnoir/mia/init/MiaEvents.java
@@ -84,10 +84,4 @@ public static void onLivingDamagePre(LivingDamageEvent.Pre event) {
         float damage = CriticalDamageEvent.onLivingCriticalDamage(event.getEntity(), event.getSource(), event.getOriginalDamage());
         event.setNewDamage(damage);
     }
-
-    public static void onLivingDamagePost(LivingDamageEvent.Post event) {
-        if (event.getSource().getEntity() instanceof Player player) {
-            player.sendSystemMessage(Component.literal(event.getNewDamage() + "点伤害"));
-        }
-    }
 }
diff --git a/src/main/java/com/altnoir/mia/mixin/MobMixin.java b/src/main/java/com/altnoir/mia/mixin/MobMixin.java
diff --git a/src/main/resources/data/mia/structure/gametest/amethyst_lamptube.nbt b/src/main/resources/data/mia/structure/gametest/amethyst_lamptube.nbt
diff --git a/src/main/resources/mia.mixins.json b/src/main/resources/mia.mixins.json
@@ -10,7 +10,6 @@
     "ItemEntityMixin",
     "LivingEntityMixin",
     "MinecraftMixin",
-    "MobMixin",
     "NoiseBasedChunkGeneratorMixin"
   ],
   "client": [

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,6 @@ default void appendTooltip(ItemStack stack, List<Component> tooltip) {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`default Multimap<Holder<Attribute>, AttributeModifier> getAttributeModifiers(SlotContext slotContext, ResourceLocation id, ItemStack stack) {`
`62`		`- return stack.getOrDefault(MiaComponents.ARTIFACT_ENHANCEMENT, ArtifactEnhancementComponent.EMPTY).getAttributeModifiers();`
	`62`	`+ return stack.getOrDefault(MiaComponents.ARTIFACT_ENHANCEMENT, ArtifactEnhancementComponent.EMPTY).getAttributeModifiers(id);`
`63`	`63`	`}`
`64`	`64`	`}`