Skip to content

Commit

Permalink
修正 1.0.3 版本 tacz 导致的数据缓存不刷新问题
Browse files Browse the repository at this point in the history
  • Loading branch information
TartaricAcid committed Sep 28, 2024
1 parent 4ff49ab commit 539be7a
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 1 deletion.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ dependencies {
runtimeOnly fg.deobf("curse.maven:bookshelf-228525:${bookshelf_id}")
runtimeOnly fg.deobf("curse.maven:enchantment-descriptions-250419:${enchantment_descriptions_id}")

implementation fg.deobf('curse.maven:timeless-and-classics-zero-1028108:5529117-sources-5529578')
implementation fg.deobf('curse.maven:timeless-and-classics-zero-1028108:5722050-sources-5724527')

implementation fg.deobf("maven.modrinth:simple-hats:1.20.1-0.3.2-forge")
implementation fg.deobf("maven.modrinth:curios:5.9.1+1.20.1-forge")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.github.tartaricacid.touhoulittlemaid.api.event;

import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.event.entity.living.LivingEvent;

public class MaidEquipEvent extends LivingEvent {
private final EntityMaid maid;
private final EquipmentSlot slot;
private final ItemStack stack;

public MaidEquipEvent(EntityMaid maid, EquipmentSlot slot, ItemStack stack) {
super(maid);
this.maid = maid;
this.slot = slot;
this.stack = stack;
}

public EntityMaid getMaid() {
return maid;
}

public EquipmentSlot getSlot() {
return slot;
}

public ItemStack getStack() {
return stack;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.github.tartaricacid.touhoulittlemaid.compat.tacz.client.GunGeckoAnimation;
import com.github.tartaricacid.touhoulittlemaid.compat.tacz.client.GunMaidRender;
import com.github.tartaricacid.touhoulittlemaid.compat.tacz.event.GunHurtMaidEvent;
import com.github.tartaricacid.touhoulittlemaid.compat.tacz.event.MaidGunEquipEvent;
import com.github.tartaricacid.touhoulittlemaid.compat.tacz.task.TaskGunAttack;
import com.github.tartaricacid.touhoulittlemaid.compat.tacz.utils.GunNearestLivingEntitySensor;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
Expand Down Expand Up @@ -34,6 +35,7 @@ public class TacCompat {
public static void initAndAddGunTask(TaskManager manager) {
if (ModList.get().isLoaded(TACZ_ID)) {
MinecraftForge.EVENT_BUS.register(new GunHurtMaidEvent());
MinecraftForge.EVENT_BUS.register(new MaidGunEquipEvent());
manager.add(new TaskGunAttack());
INSTALLED = true;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.github.tartaricacid.touhoulittlemaid.compat.tacz.event;

import com.github.tartaricacid.touhoulittlemaid.api.event.MaidEquipEvent;
import com.github.tartaricacid.touhoulittlemaid.entity.passive.EntityMaid;
import com.tacz.guns.api.entity.IGunOperator;
import com.tacz.guns.api.item.IGun;
import net.minecraftforge.eventbus.api.SubscribeEvent;

public class MaidGunEquipEvent {
@SubscribeEvent
public void onMaidEquip(MaidEquipEvent event) {
EntityMaid maid = event.getMaid();
if (IGun.mainhandHoldGun(maid)) {
IGunOperator operator = IGunOperator.fromLivingEntity(maid);
operator.draw(maid::getMainHandItem);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1206,6 +1206,14 @@ public SpawnGroupData finalizeSpawn(ServerLevelAccessor worldIn, DifficultyInsta
return spawnDataIn;
}

@Override
public void setItemSlot(EquipmentSlot slot, ItemStack stack) {
super.setItemSlot(slot, stack);
if (!this.level.isClientSide) {
MinecraftForge.EVENT_BUS.post(new MaidEquipEvent(this, slot, stack));
}
}

@Override
public void playSound(SoundEvent soundEvent, float volume, float pitch) {
if (soundEvent.getLocation().getPath().startsWith("maid") && !level.isClientSide) {
Expand Down

0 comments on commit 539be7a

Please sign in to comment.