argh!

src/main/java/net/id/paradiselost/ParadiseLost.java

@@ -20,18 +20,17 @@
 import net.id.paradiselost.commands.ParadiseLostCommands;
 import net.id.paradiselost.entities.ParadiseLostEntityTypes;
 import net.id.paradiselost.entities.passive.moa.MoaRaces;
+import net.id.paradiselost.items.ParadiseLostItemGroups;
 import net.id.paradiselost.items.ParadiseLostItems;
-import net.id.paradiselost.lore.ParadiseLostLore;
 import net.id.paradiselost.recipe.ParadiseLostRecipeTypes;
-import net.id.paradiselost.registry.ParadiseLostRegistries;
 import net.id.paradiselost.screen.ParadiseLostScreens;
+import net.id.paradiselost.util.ParadiseLostDamageTypes;
 import net.id.paradiselost.util.ParadiseLostSoundEvents;
 import net.id.paradiselost.world.ParadiseLostGameRules;
 import net.id.paradiselost.world.dimension.ParadiseLostBiomes;
 import net.id.paradiselost.world.dimension.ParadiseLostDimension;
 import net.id.paradiselost.world.feature.ParadiseLostFeatures;
 import net.id.paradiselost.world.gen.carver.ParadiseLostCarvers;
-import net.minecraft.block.EnchantingTableBlock;
 import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 
@@ -75,7 +74,7 @@ public static Identifier locate(String location) {
 
     @Override
     public void onInitialize() {
-        ParadiseLostRegistries.init();
+        ParadiseLostDamageTypes.init();
         ParadiseLostCarvers.init();
         ParadiseLostFeatures.init();
         ParadiseLostBiomes.init();
@@ -85,14 +84,14 @@ public void onInitialize() {
         ParadiseLostBlocks.init();
         ParadiseLostEntityTypes.init();
         ParadiseLostItems.init();
+        ParadiseLostItemGroups.init();
         ParadiseLostBlockEntityTypes.init();
         ParadiseLostRecipeTypes.init();
         ParadiseLostCommands.init();
         ParadiseLostGameRules.init();
         ParadiseLostSoundEvents.init();
         MoaRaces.init();
         ParadiseLostScreens.init();
-        ParadiseLostLore.init();
         ParadiseLostParticles.init();
 
 		ServerLifecycleEvents.SERVER_STARTED.register(server -> {

src/main/java/net/id/paradiselost/client/rendering/entity/ParadiseLostEntityRenderers.java

@@ -3,12 +3,10 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
-import net.id.incubus_core.blocklikeentities.api.client.BlockLikeEntityRenderer;
 import net.id.paradiselost.client.rendering.entity.hostile.EnvoyEntityRenderer;
 import net.id.paradiselost.client.rendering.entity.passive.MoaEntityRenderer;
 import net.id.paradiselost.entities.ParadiseLostEntityTypes;
 import net.minecraft.client.render.entity.EntityRendererFactory;
-import net.minecraft.client.render.entity.EntityRenderers;
 import net.minecraft.client.render.entity.FlyingItemEntityRenderer;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;

src/main/java/net/id/paradiselost/client/rendering/texture/ParadiseLostTextures.java

@@ -2,20 +2,12 @@
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback;
-import net.minecraft.util.Identifier;
-
-import static net.id.paradiselost.ParadiseLost.locate;
 
 @Environment(EnvType.CLIENT)
 public final class ParadiseLostTextures {
     private ParadiseLostTextures() {
     }
 
     public static void initClient() {
-        ClientSpriteRegistryCallback.event(new Identifier("textures/atlas/mob_effects.png")).register((atlasTexture, registry) -> {
-            registry.register(locate("hud/bloodstone/affinity"));
-            registry.register(locate("hud/bloodstone/race"));
-        });
     }
 }

src/main/java/net/id/paradiselost/client/rendering/ui/BloodstoneHUDRenderer.java

@@ -16,6 +16,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.Pair;
 import net.minecraft.util.hit.EntityHitResult;
 import net.minecraft.util.hit.HitResult;
@@ -84,8 +85,9 @@ private static void renderCherine(MatrixStack matrixStack, MinecraftClient clien
 
     private static void renderOlvite(MatrixStack matrixStack, MinecraftClient client, BloodstoneCapturedData bloodstoneCapturedData) {
         StatusEffectSpriteManager statusEffectSpriteManager = client.getStatusEffectSpriteManager();
-        Sprite affinitySprite = statusEffectSpriteManager.getSprite(StatusEffects.BAD_OMEN).getAtlas().getSprite(ParadiseLost.locate("hud/bloodstone/affinity"));
-        Sprite raceSprite = statusEffectSpriteManager.getSprite(StatusEffects.BAD_OMEN).getAtlas().getSprite(ParadiseLost.locate("hud/bloodstone/race"));
+        var effectAtlas = client.getSpriteAtlas(new Identifier("textures/atlas/mob_effects.png"));
+        Sprite affinitySprite = effectAtlas.apply(ParadiseLost.locate("affinity"));
+        Sprite raceSprite = effectAtlas.apply(ParadiseLost.locate("race"));
 
         renderRing(matrixStack, 0, 0);
         renderText(matrixStack, client, bloodstoneCapturedData.name, 0, -80);
@@ -142,7 +144,7 @@ private static void renderRing(MatrixStack matrixStack, int offsetX, int offsetY
     }
 
     private static void renderIconWText(MatrixStack matrixStack, MinecraftClient client, Sprite sprite, Text text, int offsetX, int offsetY) {
-        int totalWidth = ((sprite.getWidth() + 2 + client.textRenderer.getWidth(text)));
+        int totalWidth = ((sprite.getContents().getWidth()) + 2 + client.textRenderer.getWidth(text));
         int totalHeight = client.textRenderer.fontHeight / 2;
 
         int startX = offsetX;
@@ -152,10 +154,10 @@ private static void renderIconWText(MatrixStack matrixStack, MinecraftClient cli
             startX = (offsetX - totalWidth);
         }
 
-        RenderSystem.setShaderTexture(0, sprite.getAtlas().getId());
+        RenderSystem.setShaderTexture(0, sprite.getAtlasId());
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1);
-        DrawableHelper.drawSprite(matrixStack, startX, offsetY - 9, client.inGameHud.getZOffset(), 18, 18, sprite);
-        client.textRenderer.drawWithShadow(matrixStack, text, startX + sprite.getWidth() + 2, offsetY - totalHeight, 14737632);
+        DrawableHelper.drawSprite(matrixStack, startX, offsetY - 9, 0, 18, 18, sprite);  //  0 z correct?
+        client.textRenderer.drawWithShadow(matrixStack, text, startX + sprite.getContents().getWidth() + 2, offsetY - totalHeight, 14737632);
     }
 
     private static void renderText(MatrixStack matrixStack, MinecraftClient client, Text text, int offsetX, int offsetY) {

src/main/java/net/id/paradiselost/commands/ParadiseLostCommands.java

@@ -12,7 +12,6 @@ public static void init() {
         register(MoaEggCommand::register);
         register(MoaStatCommand::register);
         register(FloatingBlockCommand::register);
-        register(LoreCommand::register);
     }
 
     private static void register(Consumer<CommandDispatcher<ServerCommandSource>> command) {

src/main/java/net/id/paradiselost/component/ParadiseLostComponents.java

@@ -7,16 +7,13 @@
 import dev.onyxstudios.cca.api.v3.entity.RespawnCopyStrategy;
 import net.id.paradiselost.ParadiseLost;
 import net.id.paradiselost.entities.passive.moa.MoaEntity;
-import net.id.paradiselost.lore.LoreState;
 
 public class ParadiseLostComponents implements EntityComponentInitializer {
 
     public static final ComponentKey<MoaGenes> MOA_GENETICS_KEY = ComponentRegistry.getOrCreate(ParadiseLost.locate("moa_genetics"), MoaGenes.class);
-    public static final ComponentKey<LoreState> LORE_STATE = ComponentRegistry.getOrCreate(ParadiseLost.locate("lore_state"), LoreState.class);
 
     @Override
     public void registerEntityComponentFactories(EntityComponentFactoryRegistry registry) {
         registry.registerFor(MoaEntity.class, MOA_GENETICS_KEY, moa -> new MoaGenes());
-        registry.registerForPlayers(LORE_STATE, LoreState.Impl::new, RespawnCopyStrategy.ALWAYS_COPY);
     }
 }

src/main/java/net/id/paradiselost/entities/passive/ambyst/AmbystBrain.java

@@ -27,7 +27,16 @@ private static void addCoreActivities(Brain<AmbystEntity> brain) {
     }
 
     private static void addIdleActivities(Brain<AmbystEntity> brain) {
-        brain.setTaskList(Activity.IDLE, ImmutableList.of(Pair.of(0, new TimeLimitedTask(new FollowMobTask(EntityType.PLAYER, 6.0F), UniformIntProvider.create(30, 60))), Pair.of(1, new BreedTask(EntityType.AXOLOTL, 0.2F)), Pair.of(3, new SeekWaterTask(6, 0.15F)), Pair.of(4, new CompositeTask(ImmutableMap.of(MemoryModuleType.WALK_TARGET, MemoryModuleState.VALUE_ABSENT), ImmutableSet.of(), CompositeTask.Order.ORDERED, CompositeTask.RunMode.TRY_ALL, ImmutableList.of(Pair.of(new AquaticStrollTask(0.5F), 2), Pair.of(new StrollTask(0.15F, false), 2))))));
+//        brain.setTaskList(Activity.IDLE, ImmutableList.of(
+//                Pair.of(0, new TimeLimitedTask(new FollowMobTask(EntityType.PLAYER, 6.0F), UniformIntProvider.create(30, 60))),
+//                Pair.of(1, new BreedTask(EntityType.AXOLOTL, 0.2F)),
+//                Pair.of(3, new SeekWaterTask(6, 0.15F)),
+//                Pair.of(4, new CompositeTask(
+//                        ImmutableMap.of(MemoryModuleType.WALK_TARGET, MemoryModuleState.VALUE_ABSENT),
+//                        ImmutableSet.of(),
+//                        CompositeTask.Order.ORDERED,
+//                        CompositeTask.RunMode.TRY_ALL,
+//                        ImmutableList.of(Pair.of(new AquaticStrollTask(0.5F), 2), Pair.of(new StrollTask(0.15F, false), 2))))));
     }
 
     private static void addHideActivities(Brain<AmbystEntity> brain) {

src/main/java/net/id/paradiselost/entities/passive/ambyst/RunToLogTask.java

@@ -4,6 +4,7 @@
 import net.id.paradiselost.entities.ParadiseLostEntityTypes;
 import net.minecraft.entity.ai.brain.Brain;
 import net.minecraft.entity.ai.brain.MemoryModuleState;
+import net.minecraft.entity.ai.brain.task.MultiTickTask;
 import net.minecraft.entity.ai.brain.task.Task;
 import net.minecraft.entity.ai.pathing.Path;
 import net.minecraft.entity.ai.pathing.PathNode;
@@ -14,7 +15,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class RunToLogTask extends Task<AnimalEntity> {
+public class RunToLogTask extends MultiTickTask<AnimalEntity> {
     private final float speed = .25f;
 
     public RunToLogTask() {

src/main/java/net/id/paradiselost/entities/passive/ambyst/StayInLogTask.java

@@ -4,12 +4,13 @@
 import net.id.paradiselost.entities.ParadiseLostEntityTypes;
 import net.minecraft.entity.ai.brain.Brain;
 import net.minecraft.entity.ai.brain.MemoryModuleState;
+import net.minecraft.entity.ai.brain.task.MultiTickTask;
 import net.minecraft.entity.ai.brain.task.Task;
 import net.minecraft.entity.passive.AnimalEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
 
-public class StayInLogTask extends Task<AnimalEntity> {
+public class StayInLogTask extends MultiTickTask<AnimalEntity> {
     public StayInLogTask() {
         super(ImmutableMap.of(ParadiseLostEntityTypes.IS_RAINING_MEMORY, MemoryModuleState.VALUE_PRESENT,
                 ParadiseLostEntityTypes.LOG_MEMORY, MemoryModuleState.VALUE_PRESENT,

src/main/java/net/id/paradiselost/items/ParadiseLostItemGroups.java

@@ -1,36 +1,19 @@
 package net.id.paradiselost.items;
 
+import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
 import net.id.paradiselost.ParadiseLost;
 import net.id.paradiselost.blocks.ParadiseLostBlocks;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 
 public class ParadiseLostItemGroups {
-    public static final ItemGroup PARADISE_LOST_BUILDING_BLOCKS = build(
-            ParadiseLost.locate("building_blocks"),
-            () -> new ItemStack(ParadiseLostBlocks.HIGHLANDS_GRASS));
 
-    public static final ItemGroup PARADISE_LOST_DECORATIONS = build(
-            ParadiseLost.locate("decorations"),
-            () -> new ItemStack(ParadiseLostBlocks.CHERINE_LANTERN));
+    private static final ItemGroup ITEM_GROUP = FabricItemGroup.builder(ParadiseLost.locate("building_blocks"))
+            .icon(() -> new ItemStack(ParadiseLostBlocks.HIGHLANDS_GRASS))
+            .entries((context, entries) -> {
+                entries.add(ParadiseLostItems.LEVITA_BRICK);
+            }).build();
 
-    public static final ItemGroup PARADISE_LOST_TOOLS = build(
-            ParadiseLost.locate("tools"),
-            () -> new ItemStack(ParadiseLostItems.OLVITE_PICKAXE));
 
-    public static final ItemGroup PARADISE_LOST_FOOD = build(
-            ParadiseLost.locate("food"),
-            () -> new ItemStack(ParadiseLostItems.BLACKCURRANT));
-
-    public static final ItemGroup PARADISE_LOST_RESOURCES = build(
-            ParadiseLost.locate("resources"),
-            () -> new ItemStack(ParadiseLostItems.CHERINE));
-
-    public static final ItemGroup PARADISE_LOST_MISC = build(
-            ParadiseLost.locate("misc"),
-            () -> new ItemStack(ParadiseLostItems.LORE_BOOK));
-
-    public static final ItemGroup PARADISE_LOST_WEARABLES = build(
-            ParadiseLost.locate("wearables"),
-            () -> new ItemStack(ParadiseLostItems.OLVITE_CHESTPLATE));
+    public static void init() {}
 }