Skip to content

Commit

Permalink
nna
Browse files Browse the repository at this point in the history
  • Loading branch information
@MORIMORI0317
MORIMORI0317 committed Aug 10, 2024
1 parent d2f41e7 commit 8e4b712
Show file tree
Hide file tree
Showing 23 changed files with 355 additions and 117 deletions.
5 changes: 3 additions & 2 deletions common/src/main/java/net/morimori0317/yajusenpai/block/YJBlockTags.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@

public class YJBlockTags {
public static final TagKey<Block> INM_BLOCK = bind("inm_block");
public static final TagKey<Block> YJSNPI_BLOCK = bind("yjsnpi_block");
public static final TagKey<Block> YAJUSENPAI_BLOCK = bind("yajusenpai_block");
public static final TagKey<Block> YJ_STONE_ORE_REPLACEABLES = bind("yj_stone_ore_replaceables");
public static final TagKey<Block> YJ_DEEPSLATE_ORE_REPLACEABLES = bind("yj_deepslate_ore_replaceables");
public static final TagKey<Block> BASE_YJ_STONE_YJDIM = bind("base_yj_stone_yjdim");
public static final TagKey<Block> YJ_LOGS = bind("yj_logs");
public static final TagKey<Block> YJNIUM_ORES = bind("yjnium_ores");
public static final TagKey<Block> YJSNPI_ORES = bind("yjsnpi_ores");
public static final TagKey<Block> YAJUSENPAI_ORES = bind("yajusenpai_ores");
public static final TagKey<Block> INM_BLOCK_REPLACEABLES = bind("inm_block_replaceables");
public static final TagKey<Block> GO_IS_GOD = bind("go_is_god");

private static TagKey<Block> bind(String id) {
return TagKey.create(Registries.BLOCK, YJUtils.modLoc(id));
Expand Down
21 changes: 9 additions & 12 deletions common/src/main/java/net/morimori0317/yajusenpai/data/YJBlockTagProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.common.collect.ImmutableList;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.PackOutput;
import net.minecraft.resources.ResourceKey;
import net.minecraft.tags.BlockTags;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
Expand Down Expand Up @@ -98,10 +99,9 @@ public void generateTag(IntrinsicTagProviderAccess<Block> providerAccess) {
providerAccess.tag(YJBlockTags.BASE_YJ_STONE_YJDIM)
.add(YJBlocks.YJ_STONE.get(), YJBlocks.YJ_DEEPSLATE.get());


providerAccess.tag(YJBlockTags.INM_BLOCK)
.add(YJBlocks.TON_BLOCK.getKey(), YJBlocks.KMR_BLOCK.getKey(), YJBlocks.MUR_BLOCK.getKey())
.addTag(YJBlockTags.YJSNPI_BLOCK);
.add(YJBlocks.NON_YJ_BLOCKS.stream().map(it -> it.getKey()).toArray(ResourceKey[]::new))
.addTag(YJBlockTags.YAJUSENPAI_BLOCK);

providerAccess.tag(YJBlockTags.YJ_DEEPSLATE_ORE_REPLACEABLES)
.add(YJBlocks.YJ_DEEPSLATE.get());
Expand All @@ -115,17 +115,11 @@ public void generateTag(IntrinsicTagProviderAccess<Block> providerAccess) {
providerAccess.tag(YJBlockTags.YJNIUM_ORES)
.add(YJBlocks.YJNIUM_ORE.get(), YJBlocks.DEEPSLATE_YJNIUM_ORE.get());

providerAccess.tag(YJBlockTags.YJSNPI_ORES)
providerAccess.tag(YJBlockTags.YAJUSENPAI_ORES)
.add(YJBlocks.YAJUSENPAI_BLOCK.get(), YJBlocks.DEEPSLATE_YAJUSENPAI_ORE.get());

providerAccess.tag(YJBlockTags.YJSNPI_BLOCK)
.add(YJBlocks.YAJUSENPAI_BLOCK.get(), YJBlocks.GOMANETSU_SENPAI_BLOCK.get()
, YJBlocks.ENNUI_SENPAI_BLOCK.get(), YJBlocks.MEDIKARA_SENPAI_BLOCK.get()
, YJBlocks.NEHAN_SENPAI_BLOCK.get(), YJBlocks.SHITARIGAO_SENPAI_BLOCK.get()
, YJBlocks.YAJUSENPAI_IKISUGI_BLOCK.get(), YJBlocks.IMDKUJ_SENPAI_BLOCK.get()
, YJBlocks.KUNEKUNE_SENPAI_BLOCK.get(), YJBlocks.SZKFK_SENPAI_BLOCK.get()
, YJBlocks.CCCLKTJM_SENPAI_BLOCK.get(), YJBlocks.CWCWTD_SENPAI_BLOCK.get()
, YJBlocks.INTLNGTM_SENPAI_BLOCK.get());
providerAccess.tag(YJBlockTags.YAJUSENPAI_BLOCK)
.add(YJBlocks.YJ_BLOCKS.stream().map(it -> it.getKey()).toArray(ResourceKey[]::new));

providerAccess.tag(YJBlockTags.INM_BLOCK_REPLACEABLES)
.add(Blocks.END_STONE)
Expand All @@ -135,6 +129,9 @@ public void generateTag(IntrinsicTagProviderAccess<Block> providerAccess) {
.addVanillaTag(BlockTags.BASE_STONE_NETHER)
.addVanillaTag(BlockTags.BASE_STONE_OVERWORLD);

providerAccess.tag(YJBlockTags.GO_IS_GOD)
.add(YJBlocks.GO_BLOCK.get());

YJDataExpectPlatform.generateBlockTag(providerAccess);
}
}
23 changes: 13 additions & 10 deletions common/src/main/java/net/morimori0317/yajusenpai/data/YJDamageTypeTagsProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import net.morimori0317.yajusenpai.data.cross.provider.RegistriesDatapackProviderWrapper;
import net.morimori0317.yajusenpai.entity.damagesource.YJDamageTypeTags;
import net.morimori0317.yajusenpai.entity.damagesource.YJDamageTypes;
import net.morimori0317.yajusenpai.explatform.data.YJDataExpectPlatform;

import java.util.concurrent.CompletableFuture;

Expand All @@ -20,36 +21,38 @@ public YJDamageTypeTagsProvider(PackOutput packOutput, CompletableFuture<HolderL
@Override
public void generateTag(TagProviderAccess<DamageType, TagAppenderWrapper<DamageType>> providerAccess) {
providerAccess.tag(DamageTypeTags.BYPASSES_INVULNERABILITY)
.add(YJDamageTypes.IKISUGI);
.add(YJDamageTypes.IKISUGI, YJDamageTypes.PLAYER_IKISUGI);

providerAccess.tag(DamageTypeTags.BYPASSES_ENCHANTMENTS)
.add(YJDamageTypes.IKISUGI);
.add(YJDamageTypes.IKISUGI, YJDamageTypes.PLAYER_IKISUGI);

providerAccess.tag(DamageTypeTags.BYPASSES_EFFECTS)
.add(YJDamageTypes.IKISUGI);
.add(YJDamageTypes.IKISUGI, YJDamageTypes.PLAYER_IKISUGI);

providerAccess.tag(DamageTypeTags.BYPASSES_ARMOR)
.add(YJDamageTypes.IKISUGI);
.add(YJDamageTypes.IKISUGI, YJDamageTypes.PLAYER_IKISUGI);

providerAccess.tag(DamageTypeTags.BYPASSES_COOLDOWN)
.add(YJDamageTypes.IKISUGI);
.add(YJDamageTypes.IKISUGI, YJDamageTypes.PLAYER_IKISUGI);

providerAccess.tag(DamageTypeTags.BYPASSES_SHIELD)
.add(YJDamageTypes.IKISUGI);
.add(YJDamageTypes.IKISUGI, YJDamageTypes.PLAYER_IKISUGI);

providerAccess.tag(DamageTypeTags.BYPASSES_RESISTANCE)
.add(YJDamageTypes.IKISUGI);
.add(YJDamageTypes.IKISUGI, YJDamageTypes.PLAYER_IKISUGI);

providerAccess.tag(DamageTypeTags.ALWAYS_HURTS_ENDER_DRAGONS)
.add(YJDamageTypes.IKISUGI);
.add(YJDamageTypes.IKISUGI, YJDamageTypes.PLAYER_IKISUGI);

providerAccess.tag(DamageTypeTags.AVOIDS_GUARDIAN_THORNS)
.add(YJDamageTypes.IKISUGI);
.add(YJDamageTypes.IKISUGI, YJDamageTypes.PLAYER_IKISUGI);

providerAccess.tag(DamageTypeTags.NO_IMPACT)
.add(YJDamageTypes.IKISUGI);
.add(YJDamageTypes.IKISUGI, YJDamageTypes.PLAYER_IKISUGI);

providerAccess.tag(YJDamageTypeTags.IS_IKISUGI)
.add(YJDamageTypes.IKISUGI, YJDamageTypes.PLAYER_IKISUGI);

YJDataExpectPlatform.generateDamageTypeTag(providerAccess);
}
}
23 changes: 21 additions & 2 deletions common/src/main/java/net/morimori0317/yajusenpai/data/YJItemTagProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ public void generateTag(ItemTagProviderAccess providerAccess) {
providerAccess.copy(YJBlockTags.INM_BLOCK, YJItemTags.INM_BLOCK);
providerAccess.copy(YJBlockTags.YJ_LOGS, YJItemTags.YJ_LOGS);
providerAccess.copy(YJBlockTags.YJNIUM_ORES, YJItemTags.YJNIUM_ORES);
providerAccess.copy(YJBlockTags.YJSNPI_BLOCK, YJItemTags.YJSNPI_BLOCK);
providerAccess.copy(YJBlockTags.YJSNPI_ORES, YJItemTags.YJSNPI_ORES);
providerAccess.copy(YJBlockTags.YAJUSENPAI_BLOCK, YJItemTags.YAJUSENPAI_BLOCK);
providerAccess.copy(YJBlockTags.YAJUSENPAI_ORES, YJItemTags.YAJUSENPAI_ORES);
providerAccess.copy(YJBlockTags.GO_IS_GOD, YJItemTags.GO_IS_GOD);

providerAccess.tag(ItemTags.AXES)
.add(YJItems.YJNIUM_AXE.get(), YJItems.YAJUSENPAI_AXE.get());
Expand All @@ -88,6 +89,24 @@ public void generateTag(ItemTagProviderAccess providerAccess) {
providerAccess.tag(ItemTags.SWORDS)
.add(YJItems.YJNIUM_SWORD.get(), YJItems.YAJUSENPAI_SWORD.get(), YJItems.JAKEN_YORUIKIMASYOUNE_SWORD.get());

providerAccess.tag(ItemTags.FOOT_ARMOR)
.add(YJItems.YJNIUM_BOOTS.get(), YJItems.YAJUSENPAI_BOOTS.get());

providerAccess.tag(ItemTags.LEG_ARMOR)
.add(YJItems.YJNIUM_LEGGINGS.get(), YJItems.YAJUSENPAI_LEGGINGS.get(), YJItems.BRIEF.get(), YJItems.O_BACK.get());

providerAccess.tag(ItemTags.CHEST_ARMOR)
.add(YJItems.YJNIUM_CHESTPLATE.get(), YJItems.YAJUSENPAI_CHESTPLATE.get());

providerAccess.tag(ItemTags.HEAD_ARMOR)
.add(YJItems.YJNIUM_HELMET.get(), YJItems.YAJUSENPAI_HELMET.get(), YJItems.CYCLOPS_SUNGLASSES.get());

providerAccess.tag(ItemTags.HORSE_FOOD)
.add(YJItems.APPLE_INM.get());

providerAccess.tag(ItemTags.DURABILITY_ENCHANTABLE)
.add(YJItems.SOFT_SMARTPHONE.get());

YJDataExpectPlatform.generateItemTag(providerAccess);
}
}
38 changes: 19 additions & 19 deletions common/src/main/java/net/morimori0317/yajusenpai/data/YJRecipeProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ private void generate(RecipeOutput exporter, RecipeProviderAccess providerAccess

ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, YJBlocks.BIG_PILLOW.get())
.define('A', Items.WHITE_WOOL)
.define('B', YJItemTags.COMPAT_YJSNPI_INGOT)
.define('B', YJItemTags.COMPAT_YAJUSENPAI_INGOT)
.pattern("AAA")
.pattern("ABA")
.unlockedBy(providerAccess.getHasName(YJItems.YAJUSENPAI_INGOT.get()), providerAccess.has(YJItemTags.COMPAT_YJSNPI_INGOT))
.unlockedBy(providerAccess.getHasName(YJItems.YAJUSENPAI_INGOT.get()), providerAccess.has(YJItemTags.COMPAT_YAJUSENPAI_INGOT))
.save(exporter);

ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, YJItems.BRIEF.get())
Expand Down Expand Up @@ -85,11 +85,11 @@ private void generate(RecipeOutput exporter, RecipeProviderAccess providerAccess

ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, YJItems.SOFT_SMARTPHONE.get())
.define('A', Items.WHITE_WOOL)
.define('B', YJItemTags.COMPAT_YJSNPI_INGOT)
.define('B', YJItemTags.COMPAT_YAJUSENPAI_INGOT)
.pattern("AAA")
.pattern("ABA")
.pattern("AAA")
.unlockedBy(providerAccess.getHasName(YJItems.YAJUSENPAI_INGOT.get()), providerAccess.has(YJItemTags.COMPAT_YJSNPI_INGOT))
.unlockedBy(providerAccess.getHasName(YJItems.YAJUSENPAI_INGOT.get()), providerAccess.has(YJItemTags.COMPAT_YAJUSENPAI_INGOT))
.save(exporter);

ShapedRecipeBuilder.shaped(RecipeCategory.MISC, YJItems.YJ_CORE.get())
Expand All @@ -109,31 +109,31 @@ private void generate(RecipeOutput exporter, RecipeProviderAccess providerAccess
.save(exporter);

sword(exporter, providerAccess, YJItems.YJNIUM_SWORD.get(), YJItemTags.COMPAT_YJNIUM_INGOT);
sword(exporter, providerAccess, YJItems.YAJUSENPAI_SWORD.get(), YJItemTags.COMPAT_YJSNPI_INGOT);
sword(exporter, providerAccess, YJItems.YAJUSENPAI_SWORD.get(), YJItemTags.COMPAT_YAJUSENPAI_INGOT);

pickaxe(exporter, providerAccess, YJItems.YJNIUM_PICKAXE.get(), YJItemTags.COMPAT_YJNIUM_INGOT);
pickaxe(exporter, providerAccess, YJItems.YAJUSENPAI_PICKAXE.get(), YJItemTags.COMPAT_YJSNPI_INGOT);
pickaxe(exporter, providerAccess, YJItems.YAJUSENPAI_PICKAXE.get(), YJItemTags.COMPAT_YAJUSENPAI_INGOT);

axe(exporter, providerAccess, YJItems.YJNIUM_AXE.get(), YJItemTags.COMPAT_YJNIUM_INGOT);
axe(exporter, providerAccess, YJItems.YAJUSENPAI_AXE.get(), YJItemTags.COMPAT_YJSNPI_INGOT);
axe(exporter, providerAccess, YJItems.YAJUSENPAI_AXE.get(), YJItemTags.COMPAT_YAJUSENPAI_INGOT);

shovel(exporter, providerAccess, YJItems.YJNIUM_SHOVEL.get(), YJItemTags.COMPAT_YJNIUM_INGOT);
shovel(exporter, providerAccess, YJItems.YAJUSENPAI_SHOVEL.get(), YJItemTags.COMPAT_YJSNPI_INGOT);
shovel(exporter, providerAccess, YJItems.YAJUSENPAI_SHOVEL.get(), YJItemTags.COMPAT_YAJUSENPAI_INGOT);

hoe(exporter, providerAccess, YJItems.YJNIUM_HOE.get(), YJItemTags.COMPAT_YJNIUM_INGOT);
hoe(exporter, providerAccess, YJItems.YAJUSENPAI_HOE.get(), YJItemTags.COMPAT_YJSNPI_INGOT);
hoe(exporter, providerAccess, YJItems.YAJUSENPAI_HOE.get(), YJItemTags.COMPAT_YAJUSENPAI_INGOT);

helmet(exporter, providerAccess, YJItems.YJNIUM_HELMET.get(), YJItemTags.COMPAT_YJNIUM_INGOT);
helmet(exporter, providerAccess, YJItems.YAJUSENPAI_HELMET.get(), YJItemTags.COMPAT_YJSNPI_INGOT);
helmet(exporter, providerAccess, YJItems.YAJUSENPAI_HELMET.get(), YJItemTags.COMPAT_YAJUSENPAI_INGOT);

chestplate(exporter, providerAccess, YJItems.YJNIUM_CHESTPLATE.get(), YJItemTags.COMPAT_YJNIUM_INGOT);
chestplate(exporter, providerAccess, YJItems.YAJUSENPAI_CHESTPLATE.get(), YJItemTags.COMPAT_YJSNPI_INGOT);
chestplate(exporter, providerAccess, YJItems.YAJUSENPAI_CHESTPLATE.get(), YJItemTags.COMPAT_YAJUSENPAI_INGOT);

leggings(exporter, providerAccess, YJItems.YJNIUM_LEGGINGS.get(), YJItemTags.COMPAT_YJNIUM_INGOT);
leggings(exporter, providerAccess, YJItems.YAJUSENPAI_LEGGINGS.get(), YJItemTags.COMPAT_YJSNPI_INGOT);
leggings(exporter, providerAccess, YJItems.YAJUSENPAI_LEGGINGS.get(), YJItemTags.COMPAT_YAJUSENPAI_INGOT);

boots(exporter, providerAccess, YJItems.YJNIUM_BOOTS.get(), YJItemTags.COMPAT_YJNIUM_INGOT);
boots(exporter, providerAccess, YJItems.YAJUSENPAI_BOOTS.get(), YJItemTags.COMPAT_YJSNPI_INGOT);
boots(exporter, providerAccess, YJItems.YAJUSENPAI_BOOTS.get(), YJItemTags.COMPAT_YAJUSENPAI_INGOT);

nineBlockStorageRecipes(providerAccess, exporter, RecipeCategory.MISC, YJItems.RAW_YJNIUM.get(), RecipeCategory.BUILDING_BLOCKS, YJBlocks.RAW_YJNIUM_BLOCK.get());
nineBlockStorageRecipes(providerAccess, exporter, RecipeCategory.MISC, YJItems.RAW_YAJUSENPAI.get(), RecipeCategory.BUILDING_BLOCKS, YJBlocks.RAW_YAJUSENPAI_BLOCK.get());
Expand Down Expand Up @@ -169,21 +169,21 @@ private void generate(RecipeOutput exporter, RecipeProviderAccess providerAccess
.save(exporter);

ShapedRecipeBuilder.shaped(RecipeCategory.TRANSPORTATION, YJItems.YAJUSENPAI_HORSE_ARMOR.get())
.define('X', YJItemTags.COMPAT_YJSNPI_INGOT)
.define('X', YJItemTags.COMPAT_YAJUSENPAI_INGOT)
.pattern("X X")
.pattern("XXX")
.pattern("X X")
.unlockedBy(providerAccess.getHasName(YJItems.YAJUSENPAI_INGOT.get()), providerAccess.has(YJItemTags.COMPAT_YJSNPI_INGOT))
.unlockedBy(providerAccess.getHasName(YJItems.YAJUSENPAI_INGOT.get()), providerAccess.has(YJItemTags.COMPAT_YAJUSENPAI_INGOT))
.save(exporter);

nineBlockStorageRecipesRecipesWithCustomUnpacking(providerAccess, exporter, RecipeCategory.MISC, YJItems.YJNIUM_INGOT.get(), RecipeCategory.BUILDING_BLOCKS, YJBlocks.YJNIUM_BLOCK.get(), "yjnium_ingot_from_yjnium_block", "yjnium_ingot");

ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, YJBlocks.YAJUSENPAI_BLOCK.get())
.define('A', YJItemTags.COMPAT_YJSNPI_INGOT)
.define('A', YJItemTags.COMPAT_YAJUSENPAI_INGOT)
.pattern("AAA")
.pattern("AAA")
.pattern("AAA")
.unlockedBy(providerAccess.getHasName(YJItems.YAJUSENPAI_INGOT.get()), providerAccess.has(YJItemTags.COMPAT_YJSNPI_INGOT))
.unlockedBy(providerAccess.getHasName(YJItems.YAJUSENPAI_INGOT.get()), providerAccess.has(YJItemTags.COMPAT_YAJUSENPAI_INGOT))
.save(exporter);

oreSmelting(providerAccess, exporter, YJNIUM_SMELTABLES, RecipeCategory.MISC, YJItems.YJNIUM_INGOT.get(), 0.7f, 200, "yjnium_ingot");
Expand Down Expand Up @@ -252,8 +252,8 @@ private void generate(RecipeOutput exporter, RecipeProviderAccess providerAccess
cookRecipes(providerAccess, exporter, "campfire_cooking", RecipeSerializer.CAMPFIRE_COOKING_RECIPE, CampfireCookingRecipe::new, 600);

for (final RegistrySupplier<Block> yjBlock : YJBlocks.YJ_BLOCKS) {
SingleItemRecipeBuilder.stonecutting(Ingredient.of(YJItemTags.YJSNPI_BLOCK), RecipeCategory.BUILDING_BLOCKS, yjBlock.get())
.unlockedBy("has_yjsnpi_block", providerAccess.has(YJItemTags.YJSNPI_BLOCK))
SingleItemRecipeBuilder.stonecutting(Ingredient.of(YJItemTags.YAJUSENPAI_BLOCK), RecipeCategory.BUILDING_BLOCKS, yjBlock.get())
.unlockedBy("has_yjsnpi_block", providerAccess.has(YJItemTags.YAJUSENPAI_BLOCK))
.save(exporter, getConversionRecipeName(providerAccess, "yjsnpi_block", yjBlock.get()) + "_stonecutting");
}

Expand Down
5 changes: 5 additions & 0 deletions common/src/main/java/net/morimori0317/yajusenpai/explatform/YJExpectPlatform.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,9 @@ public static boolean isOboreruBlock(Level level, BlockPos blockPos, BlockState
public static SimpleParticleType createSimpleParticleType(boolean overrideLimiter) {
throw new AssertionError();
}

@ExpectPlatform
public static boolean isBoss(LivingEntity livingEntity) {
throw new AssertionError();
}
}
6 changes: 6 additions & 0 deletions common/src/main/java/net/morimori0317/yajusenpai/explatform/data/YJDataExpectPlatform.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import dev.architectury.injectables.annotations.ExpectPlatform;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.DataProvider;
import net.minecraft.world.damagesource.DamageType;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.block.Block;
import net.morimori0317.yajusenpai.data.cross.provider.IntrinsicHolderTagsProviderWrapper;
Expand Down Expand Up @@ -31,4 +32,9 @@ public static void generateItemTag(ItemTagProviderWrapper.ItemTagProviderAccess
public static void generateBiomeTag(TagProviderWrapper.TagProviderAccess<Biome, TagProviderWrapper.TagAppenderWrapper<Biome>> providerAccess) {
throw new AssertionError();
}

@ExpectPlatform
public static void generateDamageTypeTag(TagProviderWrapper.TagProviderAccess<DamageType, TagProviderWrapper.TagAppenderWrapper<DamageType>> providerAccess) {
throw new AssertionError();
}
}
7 changes: 3 additions & 4 deletions common/src/main/java/net/morimori0317/yajusenpai/handler/CommonHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
import net.morimori0317.yajusenpai.blockentity.BigPillowBlockEntity;
import net.morimori0317.yajusenpai.effect.YJMobEffects;
import net.morimori0317.yajusenpai.entity.YJLivingEntityAccessor;
import net.morimori0317.yajusenpai.entity.damagesource.YJDamageSources;
import net.morimori0317.yajusenpai.entity.damagesource.YJDamageTypes;
import net.morimori0317.yajusenpai.entity.damagesource.YJDamageTypeTags;
import net.morimori0317.yajusenpai.item.YJItems;
import net.morimori0317.yajusenpai.networking.YJPackets;
import net.morimori0317.yajusenpai.sound.YJSoundEvents;
Expand All @@ -29,7 +28,7 @@ public static void onLivingTick(LivingEntity livingEntity) {
if (livingEntity.hasEffect(YJMobEffects.IKISUGI.vanillaHolder()) && effect != null) {
if (effect.getDuration() <= 20) {
livingEntity.removeEffect(YJMobEffects.IKISUGI.vanillaHolder());
livingEntity.hurt(YJDamageSources.ikisugi(livingEntity.level(), yjLiving.yajuSenpai$getGrantedIkisugiEntity()), 114514f);
YJUtils.ikisugiKill(livingEntity, yjLiving.yajuSenpai$getGrantedIkisugiEntity());
}

if (effect.getDuration() <= IKISUGI_DIE_TIME && !yjLiving.yajuSenpai$isIkisugi()) {
Expand Down Expand Up @@ -80,7 +79,7 @@ public static void onLivingTick(LivingEntity livingEntity) {
}

public static void onLivingDrop(LivingEntity livingEntity, DamageSource source, Consumer<ItemStack> dropAppender) {
if (livingEntity.getMaxHealth() >= 100 && source.is(YJDamageTypes.IKISUGI)) {
if (YJUtils.isBoss(livingEntity) && source.is(YJDamageTypeTags.IS_IKISUGI)) {
dropAppender.accept(new ItemStack(YJItems.YJ_STAR.get()));
}
}
Expand Down
Loading

0 comments on commit 8e4b712

Please sign in to comment.