Neoforge dev/1.21.1

build.gradle

@@ -177,9 +177,17 @@ idea {
 tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' }
 
 tasks.register('runLangMerger', JavaExec) {
-    group = 'mod development'
+    group = 'mod development/internal'
     description = 'Language Merger'
     classpath = sourceSets.main.runtimeClasspath
-    mainClass = 'org.confluence.lib.util.LangMerger'
+    mainClass = 'org.confluence.lib.util.lang.LangMerger'
+    args "../"
+}
+
+tasks.register('runLangDistinctor', JavaExec) {
+    group = 'mod development/internal'
+    description = 'Language Distinctor'
+    classpath = sourceSets.main.runtimeClasspath
+    mainClass = 'org.confluence.lib.util.lang.LangDistinctor'
     args "../"
 }

gradle.properties

@@ -13,7 +13,7 @@ minecraft_version=1.21.1
 # as they do not follow standard versioning conventions.
 minecraft_version_range=[1.21.1,1.22)
 # The Neo version must agree with the Minecraft version to get a valid artifact
-neo_version=21.1.209
+neo_version=21.1.218
 # The Neo version range can use any version of Neo as bounds
 neo_version_range=[21,)
 # The loader version range can only use the major version of FML as bounds
@@ -30,7 +30,7 @@ mod_name=Confluence Magic Lib
 mod_license=MIT
 # The mod version. See https://semver.org/
 ###### remove '-SNAPSHOT' when merge to main branch ######
-mod_version=0.0.2f-SNAPSHOT
+mod_version=0.0.6
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/org/confluence/lib/ConfluenceMagicLib.java

@@ -16,6 +16,7 @@
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.ModList;
 import net.neoforged.fml.common.Mod;
+import net.neoforged.neoforge.attachment.AttachmentType;
 import net.neoforged.neoforge.common.crafting.IngredientType;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import net.neoforged.neoforge.registries.DeferredRegister;
@@ -27,31 +28,32 @@
 import org.confluence.lib.common.recipe.AmountIngredient;
 import org.confluence.lib.common.worldgen.structure.GridPiece;
 import org.confluence.lib.common.worldgen.structure.SimpleTemplatePiece;
-import org.confluence.lib.util.NaturalSpawnerUtil;
-import org.jetbrains.annotations.ApiStatus;
+import org.confluence.lib.util.DelayTaskHolder;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.function.Supplier;
 
 @Mod(ConfluenceMagicLib.LIB_ID)
-public class ConfluenceMagicLib {
+public final class ConfluenceMagicLib {
     public static final String LIB_ID = "confluence_magic_lib";
     public static final String CONFLUENCE_ID = "confluence";
     public static final Logger LOGGER = LoggerFactory.getLogger("Confluence Magic Lib");
     public static final Supplier<Boolean> IS_CONFLUENCE_LOADED = Suppliers.memoize(() -> ModList.get().isLoaded(CONFLUENCE_ID));
 
+    //region 数据附件
+    private static final DeferredRegister<AttachmentType<?>> ATTACHMENT_TYPE = DeferredRegister.create(NeoForgeRegistries.ATTACHMENT_TYPES, LIB_ID);
+
+    public static final Supplier<AttachmentType<DelayTaskHolder>> DELAY_TASK_HOLDER = ATTACHMENT_TYPE.register("delay_task_holder", () -> AttachmentType.builder(DelayTaskHolder::new).build());
+    //endregion
+
     // region 属性
     private static final DeferredRegister<Attribute> ATTRIBUTES = DeferredRegister.create(Registries.ATTRIBUTE, LIB_ID);
-    /**
-     * 玩家怪物生成速度系数
-     */
-    public static final DeferredHolder<Attribute, RangedAttribute> MOB_SPAWN_SPEED_MULTIPLIER = registerRangedAttribute("player.mob_spawn_speed_multiplier", NaturalSpawnerUtil.DEFAULT_MULTIPLIER, 0, 1024, false, Attribute.Sentiment.NEUTRAL);
-    /**
-     * 玩家怪物生成数量系数
-     */
-    public static final DeferredHolder<Attribute, RangedAttribute> MOB_SPAWN_COUNT_MULTIPLIER = registerRangedAttribute("player.mob_spawn_count_multiplier", NaturalSpawnerUtil.DEFAULT_MULTIPLIER, 0, 1024, false, Attribute.Sentiment.NEUTRAL);
+    /// 玩家怪物生成速度系数
+    public static final DeferredHolder<Attribute, RangedAttribute> MOB_SPAWN_SPEED_MULTIPLIER = registerRangedAttribute("player.mob_spawn_speed_multiplier", 1, 0, 1024, false, Attribute.Sentiment.NEUTRAL);
+    /// 玩家怪物生成数量系数
+    public static final DeferredHolder<Attribute, RangedAttribute> MOB_SPAWN_COUNT_MULTIPLIER = registerRangedAttribute("player.mob_spawn_count_multiplier", 1, 0, 1024, false, Attribute.Sentiment.NEUTRAL);
 
     private static DeferredHolder<Attribute, RangedAttribute> registerRangedAttribute(String name, double defaultValue, double min, double max, boolean syncable, Attribute.Sentiment sentiment) {
         return ATTRIBUTES.register(name, () -> {
@@ -99,6 +101,7 @@ public StreamCodec<? super RegistryFriendlyByteBuf, CrossDustParticleOptions> st
 
     public ConfluenceMagicLib(IEventBus modEventBus, ModContainer modContainer) {
         StartupConfig.register(modContainer);
+        ATTACHMENT_TYPE.register(modEventBus);
         ATTRIBUTES.register(modEventBus);
         INGREDIENT_TYPES.register(modEventBus);
         PIECE_TYPES.register(modEventBus);
@@ -109,10 +112,4 @@ public ConfluenceMagicLib(IEventBus modEventBus, ModContainer modContainer) {
     public static ResourceLocation asResource(String path) {
         return ResourceLocation.fromNamespaceAndPath(LIB_ID, path);
     }
-
-    @Deprecated(since = "1.2.0", forRemoval = true)
-    @ApiStatus.ScheduledForRemoval(inVersion = "1.3.0")
-    public static boolean isConfluenceLoaded() {
-        return IS_CONFLUENCE_LOADED.get();
-    }
 }

src/main/java/org/confluence/lib/api/entity/Boss.java

@@ -0,0 +1,67 @@
+package org.confluence.lib.api.entity;
+
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.monster.Enemy;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.Level;
+import org.apache.commons.lang3.stream.Streams;
+import org.confluence.lib.color.GlobalColors;
+
+/// All bosses should implement this interface
+///
+/// 所有boss都应该实现这个接口
+public interface Boss extends Enemy, IDiscardWhenRespawnEntity {
+    default boolean shouldShowMessage() {
+        return isMainBody();
+    }
+
+    default boolean isMainBody() {
+        return true;
+    }
+
+    default boolean shouldEnhanceMultiplayer() {
+        return true;
+    }
+
+    interface BossPart extends Boss {
+        @Override
+        default boolean isMainBody() {
+            return false;
+        }
+    }
+
+    static void sendBossSpawnMessage(Entity entity) {
+        Level level = entity.level();
+        if (!level.isClientSide && entity instanceof Boss boss) {
+            if (boss.shouldShowMessage()) {
+                Component mes = Component.translatable("message.confluence.boss_spawn",
+                        entity.getDisplayName()).withColor(GlobalColors.EVENT.get()).withStyle(ChatFormatting.BOLD);
+
+                for (Player player : level.players()) {
+                    player.sendSystemMessage(mes);
+                }
+            }
+        }
+    }
+
+    static void sendBossDeathMessage(Entity entity) {
+        Level level = entity.level();
+        if (!level.isClientSide && entity instanceof Boss boss) {
+            if (boss.shouldShowMessage()) {
+                Component mes = Component.translatable("message.confluence.boss_leave",
+                        entity.getDisplayName()).withColor(GlobalColors.EVENT.get()).withStyle(ChatFormatting.BOLD);
+
+                for (Player player : level.players()) {
+                    player.sendSystemMessage(mes);
+                }
+            }
+        }
+    }
+
+    static boolean noBossInWorld(ServerLevel level) {
+        return Streams.of(level.getAllEntities()).noneMatch(entity -> entity instanceof Boss);
+    }
+}

src/main/java/org/confluence/lib/api/entity/IDiscardWhenRespawnEntity.java

@@ -0,0 +1,20 @@
+package org.confluence.lib.api.entity;
+
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.player.Player;
+
+import java.util.List;
+
+/// 当玩家重生时，若附近没有存活的玩家，实现该接口的实体会消失，以实现出生保护
+public interface IDiscardWhenRespawnEntity {
+    default boolean shouldDiscard(boolean hasNearbyPlayer) {
+        return !hasNearbyPlayer;
+    }
+
+    static void process(ServerPlayer player) {
+        List<Entity> entities = player.level().getEntities(player, player.getBoundingBox().inflate(32));
+        boolean hasPlayer = entities.stream().anyMatch(e -> e instanceof Player);
+        entities.stream().filter(e -> e instanceof IDiscardWhenRespawnEntity entity && entity.shouldDiscard(hasPlayer)).forEach(Entity::discard);
+    }
+}

src/main/java/org/confluence/lib/client/DPSMeter.java

@@ -0,0 +1,40 @@
+package org.confluence.lib.client;
+
+public final class DPSMeter {
+    private static boolean dpsStarted;
+    private static long dpsLastHit;
+    private static float dpsDamage;
+    private static long dpsStart;
+    private static long dpsEnd;
+
+    public static void addDPS(float dmg, long currentTime) {
+        if (dpsStarted) {
+            dpsLastHit = currentTime;
+            dpsDamage += dmg;
+            dpsEnd = currentTime;
+        } else {
+            dpsStarted = true;
+            dpsStart = currentTime;
+            dpsEnd = currentTime;
+            dpsLastHit = currentTime;
+            dpsDamage = dmg;
+        }
+    }
+
+    public static void checkDPSTime(long currentTime) {
+        if (dpsStarted && currentTime - dpsLastHit >= 30) {
+            dpsStarted = false;
+        }
+    }
+
+    public static float getDPS(long currentTime) {
+        float num = (dpsEnd - dpsStart) / 20.0F;
+        if (num >= 3.0F) {
+            dpsStart = currentTime - 20;
+            dpsDamage = dpsDamage / num;
+            num = (dpsEnd - dpsStart) / 20.0F;
+        }
+        if (num < 1.0F) num = 1.0F;
+        return dpsDamage / num;
+    }
+}

src/main/java/org/confluence/lib/client/event/LibGameEvents.java

@@ -2,6 +2,8 @@
 
 import com.mojang.datafixers.util.Either;
 import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.FormattedText;
 import net.minecraft.world.inventory.tooltip.TooltipComponent;
@@ -13,6 +15,7 @@
 import net.neoforged.neoforge.client.event.ClientTickEvent;
 import net.neoforged.neoforge.client.event.RenderTooltipEvent;
 import org.confluence.lib.ConfluenceMagicLib;
+import org.confluence.lib.client.DPSMeter;
 import org.confluence.lib.client.animate.ExpertColorAnimation;
 import org.confluence.lib.client.animate.MasterColorAnimation;
 import org.confluence.lib.common.LibTags;
@@ -27,6 +30,10 @@ public final class LibGameEvents {
     public static void clientTick$Post(ClientTickEvent.Pre event) {
         ExpertColorAnimation.INSTANCE.updateColor();
         MasterColorAnimation.INSTANCE.updateColor();
+        LocalPlayer player = Minecraft.getInstance().player;
+        if (player != null) {
+            DPSMeter.checkDPSTime(player.level().getGameTime());
+        }
     }
 
     @SubscribeEvent(priority = EventPriority.HIGHEST)

src/main/java/org/confluence/lib/client/event/LibModEvents.java

@@ -10,7 +10,7 @@
 @EventBusSubscriber(modid = ConfluenceMagicLib.LIB_ID, value = Dist.CLIENT)
 public final class LibModEvents {
     @SubscribeEvent
-    public static void registerParticles(RegisterParticleProvidersEvent event) {
+    public static void registerParticleProviders(RegisterParticleProvidersEvent event) {
         event.registerSpriteSet(ConfluenceMagicLib.CROSS_DUST_PARTICLE.get(), CrossDustParticle.Provider::new);
     }
 }

src/main/java/org/confluence/lib/client/render/item/SimpleClientItemExtensions.java

@@ -0,0 +1,101 @@
+package org.confluence.lib.client.render.item;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.HumanoidModel;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.Sheets;
+import net.minecraft.client.renderer.entity.ItemRenderer;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.HumanoidArm;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.item.ItemDisplayContext;
+import net.minecraft.world.item.ItemStack;
+import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions;
+import org.jetbrains.annotations.Nullable;
+
+public class SimpleClientItemExtensions implements IClientItemExtensions {
+    protected RenderByItemCallback renderByItemCallback = (minecraft, stack, displayContext, poseStack, buffer, packedLight, packedOverlay) -> renderSimpleItem(minecraft, stack, poseStack, buffer, packedLight, packedOverlay);
+    protected BlockEntityWithoutLevelRenderer renderer;
+    protected HandTransformPredicate handTransformPredicate = IClientItemExtensions.super::applyForgeHandTransform;
+    protected ArmPoseGetter armPoseGetter = IClientItemExtensions.super::getArmPose;
+
+    public SimpleClientItemExtensions noRenderer() {
+        this.renderByItemCallback = (minecraft, stack, displayContext, poseStack, buffer, packedLight, packedOverlay) -> {};
+        return this;
+    }
+
+    public SimpleClientItemExtensions customRenderer(RenderByItemCallback callback) {
+        this.renderByItemCallback = callback;
+        return this;
+    }
+
+    public SimpleClientItemExtensions handTransform(boolean force) {
+        this.handTransformPredicate = (poseStack, player, arm, itemInHand, partialTick, equipProcess, swingProcess) -> force;
+        return this;
+    }
+
+    public SimpleClientItemExtensions handTransform(HandTransformPredicate predicate) {
+        this.handTransformPredicate = predicate;
+        return this;
+    }
+
+    public SimpleClientItemExtensions armPose(HumanoidModel.ArmPose armPose) {
+        this.armPoseGetter = (living, hand, itemStack) -> armPose;
+        return this;
+    }
+
+    public SimpleClientItemExtensions armPose(ArmPoseGetter getter) {
+        this.armPoseGetter = getter;
+        return this;
+    }
+
+    @Override
+    public BlockEntityWithoutLevelRenderer getCustomRenderer() {
+        if (renderer == null) {
+            Minecraft minecraft = Minecraft.getInstance();
+            this.renderer = new BlockEntityWithoutLevelRenderer(minecraft.getBlockEntityRenderDispatcher(), minecraft.getEntityModels()) {
+                @Override
+                public void renderByItem(ItemStack stack, ItemDisplayContext displayContext, PoseStack poseStack, MultiBufferSource buffer, int packedLight, int packedOverlay) {
+                    renderByItemCallback.render(minecraft, stack, displayContext, poseStack, buffer, packedLight, packedOverlay);
+                }
+            };
+        }
+        return renderer;
+    }
+
+    @Override
+    public boolean applyForgeHandTransform(PoseStack poseStack, LocalPlayer player, HumanoidArm arm, ItemStack itemInHand, float partialTick, float equipProcess, float swingProcess) {
+        return handTransformPredicate.force(poseStack, player, arm, itemInHand, partialTick, equipProcess, swingProcess);
+    }
+
+    @Override
+    public HumanoidModel.@Nullable ArmPose getArmPose(LivingEntity entityLiving, InteractionHand hand, ItemStack itemStack) {
+        return armPoseGetter.get(entityLiving, hand, itemStack);
+    }
+
+    public static void renderSimpleItem(Minecraft minecraft, ItemStack stack, PoseStack poseStack, MultiBufferSource buffer, int packedLight, int packedOverlay) {
+        minecraft.getItemRenderer().renderModelLists(
+                minecraft.getItemRenderer().getModel(stack, minecraft.level, null, 260109),
+                stack, packedLight, packedOverlay, poseStack,
+                ItemRenderer.getFoilBufferDirect(buffer, Sheets.translucentCullBlockSheet(), true, stack.hasFoil())
+        );
+    }
+
+    @FunctionalInterface
+    public interface RenderByItemCallback {
+        void render(Minecraft minecraft, ItemStack stack, ItemDisplayContext displayContext, PoseStack poseStack, MultiBufferSource buffer, int packedLight, int packedOverlay);
+    }
+
+    @FunctionalInterface
+    public interface HandTransformPredicate {
+        boolean force(PoseStack poseStack, LocalPlayer player, HumanoidArm arm, ItemStack itemInHand, float partialTick, float equipProcess, float swingProcess);
+    }
+
+    @FunctionalInterface
+    public interface ArmPoseGetter {
+        @Nullable HumanoidModel.ArmPose get(LivingEntity living, InteractionHand hand, ItemStack itemStack);
+    }
+}

src/main/java/org/confluence/lib/client/render/item/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package org.confluence.lib.client.render.item;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;