Skip to content

Commit f8ce37a

Browse files
Wang-Xiao-JingWang-Xiao-Jing
committed
更换模型等
1 parent 8c0e98b commit f8ce37a

File tree

26 files changed

+8491
-13611
lines changed

26 files changed

+8491
-13611
lines changed

‎src/main/java/ctn/imaginarycraft/api/DelayTaskHolder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ctn.imaginarycraft.api;
22

33
import ctn.imaginarycraft.core.ImaginaryCraft;
4-
import ctn.imaginarycraft.init.ModAttachments;
4+
import ctn.imaginarycraft.init.world.ModAttachments;
55
import net.minecraft.resources.ResourceLocation;
66
import net.minecraft.world.InteractionHand;
77
import net.minecraft.world.entity.EquipmentSlot;

‎src/main/java/ctn/imaginarycraft/api/virtue/VirtueTemperance.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ctn.imaginarycraft.api.virtue;
22

33
import ctn.imaginarycraft.core.ImaginaryCraft;
4-
import ctn.imaginarycraft.init.ModAttachments;
4+
import ctn.imaginarycraft.init.world.ModAttachments;
55
import ctn.imaginarycraft.init.world.ModAttributes;
66
import net.minecraft.core.HolderLookup;
77
import net.minecraft.nbt.CompoundTag;

‎src/main/java/ctn/imaginarycraft/api/virtue/VirtueType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import ctn.imaginarycraft.api.ColourText;
55
import ctn.imaginarycraft.client.util.ColorUtil;
66
import ctn.imaginarycraft.core.ImaginaryCraft;
7-
import ctn.imaginarycraft.init.ModAttachments;
7+
import ctn.imaginarycraft.init.world.ModAttachments;
88
import io.netty.buffer.ByteBuf;
99
import net.minecraft.core.Holder;
1010
import net.minecraft.network.codec.ByteBufCodecs;

‎src/main/java/ctn/imaginarycraft/api/world/item/IEgoItem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import ctn.imaginarycraft.api.virtue.VirtueRating;
44
import ctn.imaginarycraft.common.components.ItemVirtueUsageReq;
5-
import ctn.imaginarycraft.init.ModDataComponents;
5+
import ctn.imaginarycraft.init.world.ModDataComponents;
66
import net.minecraft.world.item.Item;
77

88
/**

‎src/main/java/ctn/imaginarycraft/common/components/ItemVirtueUsageReq.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import ctn.imaginarycraft.api.virtue.VirtueRating;
88
import ctn.imaginarycraft.api.virtue.VirtueType;
99
import ctn.imaginarycraft.core.ImaginaryCraft;
10-
import ctn.imaginarycraft.init.ModDataComponents;
1110
import ctn.imaginarycraft.init.world.ModAttributes;
11+
import ctn.imaginarycraft.init.world.ModDataComponents;
1212
import io.netty.buffer.ByteBuf;
1313
import net.minecraft.client.Minecraft;
1414
import net.minecraft.network.chat.Component;

‎src/main/java/ctn/imaginarycraft/common/world/entity/ordeals/violet/GrantUsLovePatch.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public GrantUsLovePatch(GrantUsLove entity) {
1616

1717
@Override
1818
public AssetAccessor<? extends StaticAnimation> getHitAnimation(StunType stunType) {
19-
return ModAnimations.GRANT_US_LOVE_DEFAULT;
19+
return ModAnimations.GRANT_US_LOVE_IDLE;
2020
}
2121

2222
@Override
@@ -47,18 +47,18 @@ protected void initAI() {
4747
public void initAnimator(Animator animator) {
4848
super.initAnimator(animator);
4949
// 待机
50-
animator.addLivingAnimation(LivingMotions.IDLE, ModAnimations.GRANT_US_LOVE_DEFAULT);
50+
animator.addLivingAnimation(LivingMotions.IDLE, ModAnimations.GRANT_US_LOVE_IDLE);
5151
// 死亡
52-
animator.addLivingAnimation(LivingMotions.DEATH, ModAnimations.GRANT_US_LOVE_DEFAULT);
53-
animator.addLivingAnimation(LivingMotions.WALK, ModAnimations.GRANT_US_LOVE_DEFAULT);
54-
animator.addLivingAnimation(LivingMotions.RUN, ModAnimations.GRANT_US_LOVE_DEFAULT);
55-
animator.addLivingAnimation(LivingMotions.FALL, ModAnimations.GRANT_US_LOVE_DEFAULT);
56-
animator.addLivingAnimation(LivingMotions.SIT, ModAnimations.GRANT_US_LOVE_DEFAULT);
57-
animator.addLivingAnimation(LivingMotions.JUMP, ModAnimations.GRANT_US_LOVE_DEFAULT);
58-
animator.addLivingAnimation(LivingMotions.SLEEP, ModAnimations.GRANT_US_LOVE_DEFAULT);
59-
animator.addLivingAnimation(LivingMotions.AIM, ModAnimations.GRANT_US_LOVE_DEFAULT);
60-
animator.addLivingAnimation(LivingMotions.SHOT, ModAnimations.GRANT_US_LOVE_DEFAULT);
61-
animator.addLivingAnimation(LivingMotions.DRINK, ModAnimations.GRANT_US_LOVE_DEFAULT);
62-
animator.addLivingAnimation(LivingMotions.EAT, ModAnimations.GRANT_US_LOVE_DEFAULT);
52+
animator.addLivingAnimation(LivingMotions.DEATH, ModAnimations.GRANT_US_LOVE_IDLE);
53+
animator.addLivingAnimation(LivingMotions.WALK, ModAnimations.GRANT_US_LOVE_IDLE);
54+
animator.addLivingAnimation(LivingMotions.RUN, ModAnimations.GRANT_US_LOVE_IDLE);
55+
animator.addLivingAnimation(LivingMotions.FALL, ModAnimations.GRANT_US_LOVE_IDLE);
56+
animator.addLivingAnimation(LivingMotions.SIT, ModAnimations.GRANT_US_LOVE_IDLE);
57+
animator.addLivingAnimation(LivingMotions.JUMP, ModAnimations.GRANT_US_LOVE_IDLE);
58+
animator.addLivingAnimation(LivingMotions.SLEEP, ModAnimations.GRANT_US_LOVE_IDLE);
59+
animator.addLivingAnimation(LivingMotions.AIM, ModAnimations.GRANT_US_LOVE_IDLE);
60+
animator.addLivingAnimation(LivingMotions.SHOT, ModAnimations.GRANT_US_LOVE_IDLE);
61+
animator.addLivingAnimation(LivingMotions.DRINK, ModAnimations.GRANT_US_LOVE_IDLE);
62+
animator.addLivingAnimation(LivingMotions.EAT, ModAnimations.GRANT_US_LOVE_IDLE);
6363
}
6464
}

‎src/main/java/ctn/imaginarycraft/common/world/item/CreativeRationalityToolItem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package ctn.imaginarycraft.common.world.item;
22

3-
import ctn.imaginarycraft.init.ModDataComponents;
3+
import ctn.imaginarycraft.init.world.ModDataComponents;
44
import ctn.imaginarycraft.util.RationalityUtil;
55
import net.minecraft.client.Minecraft;
66
import net.minecraft.network.chat.Component;

‎src/main/java/ctn/imaginarycraft/common/world/item/ego/armor/EgoArmorItem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import ctn.imaginarycraft.api.world.item.IEgoItem;
44
import ctn.imaginarycraft.common.components.ItemVirtueUsageReq;
55
import ctn.imaginarycraft.core.capability.item.IItemUsageReq;
6-
import ctn.imaginarycraft.init.ModDataComponents;
76
import ctn.imaginarycraft.init.world.ModAttributes;
7+
import ctn.imaginarycraft.init.world.ModDataComponents;
88
import ctn.imaginarycraft.util.ItemBuilderUtil;
99
import net.minecraft.core.Holder;
1010
import net.minecraft.resources.ResourceLocation;

‎src/main/java/ctn/imaginarycraft/common/world/item/ego/curio/EgoCurioItem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import ctn.imaginarycraft.api.world.item.IEgoItem;
66
import ctn.imaginarycraft.client.model.curio.GeoCurioModel;
77
import ctn.imaginarycraft.client.renderer.curios.BasicCuriosRenderer;
8-
import ctn.imaginarycraft.init.ModDataComponents;
8+
import ctn.imaginarycraft.init.world.ModDataComponents;
99
import ctn.imaginarycraft.util.RationalityUtil;
1010
import net.minecraft.core.Holder;
1111
import net.minecraft.network.chat.Component;

‎src/main/java/ctn/imaginarycraft/common/world/item/ego/weapon/melee/swords/ChaosKnifeItem.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import ctn.imaginarycraft.api.world.item.IMeleeEgoWeaponItem;
55
import ctn.imaginarycraft.core.ImaginaryCraft;
66
import ctn.imaginarycraft.core.capability.item.IItemLcDamageType;
7-
import ctn.imaginarycraft.init.ModDataComponents;
7+
import ctn.imaginarycraft.init.world.ModDataComponents;
88
import net.minecraft.network.chat.Component;
99
import net.minecraft.tags.BlockTags;
1010
import net.minecraft.world.InteractionHand;

0 commit comments

Comments
 (0)