Milestone Pages complete! Thanks, Brandon, for the nudge :D

Author: GreatOrator

src/main/java/com/greatorator/tolkienmobs/block/custom/AncientWatcherStatueBlock.java

@@ -1,18 +1,10 @@
 package com.greatorator.tolkienmobs.block.custom;
 
-import com.greatorator.tolkienmobs.TolkienMobsMain;
 import com.greatorator.tolkienmobs.block.TolkienEntityBlock;
 import com.greatorator.tolkienmobs.block.custom.entity.AncientWatcherStatueBlockEntity;
-import com.greatorator.tolkienmobs.block.custom.entity.BackpackBlockEntity;
-import com.greatorator.tolkienmobs.block.custom.entity.WellBlockEntity;
-import com.greatorator.tolkienmobs.init.TolkienMobEffects;
 import com.mojang.serialization.MapCodec;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.util.RandomSource;
-import net.minecraft.world.effect.MobEffectInstance;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.context.BlockPlaceContext;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;

src/main/java/com/greatorator/tolkienmobs/block/custom/entity/AncientWatcherDeadStatueBlockEntity.java

@@ -1,17 +1,9 @@
 package com.greatorator.tolkienmobs.block.custom.entity;
 
 import com.greatorator.tolkienmobs.init.TolkienBlocks;
-import com.greatorator.tolkienmobs.init.TolkienItems;
-import com.greatorator.tolkienmobs.init.TolkienMobEffects;
-import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.effect.MobEffectInstance;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.state.BlockState;
 
-import java.util.Objects;
-
 public class AncientWatcherDeadStatueBlockEntity extends TolkienBlockEntity {
     public AncientWatcherDeadStatueBlockEntity(BlockPos blockPos, BlockState blockState) {
         super(TolkienBlocks.ANCIENT_WATCHER_DEAD_BLOCK_ENTITY.get(), blockPos, blockState);

src/main/java/com/greatorator/tolkienmobs/block/custom/entity/AncientWatcherStatueBlockEntity.java

@@ -1,34 +1,16 @@
 package com.greatorator.tolkienmobs.block.custom.entity;
 
-import com.greatorator.tolkienmobs.TolkienMobsMain;
 import com.greatorator.tolkienmobs.init.TolkienBlocks;
-import com.greatorator.tolkienmobs.init.TolkienDataComponents;
 import com.greatorator.tolkienmobs.init.TolkienItems;
 import com.greatorator.tolkienmobs.init.TolkienMobEffects;
-import com.greatorator.tolkienmobs.network.component.TrinketComponent;
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Holder;
-import net.minecraft.core.HolderLookup;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.ClientGamePacketListener;
-import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.alchemy.Potion;
-import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
-import java.util.Optional;
 
 public class AncientWatcherStatueBlockEntity extends TolkienBlockEntity {
     private long nextAbilityUse = 0L;

src/main/java/com/greatorator/tolkienmobs/block/custom/entity/CamoKeyStoneBlockEntity.java

@@ -1,6 +1,5 @@
 package com.greatorator.tolkienmobs.block.custom.entity;
 
-import com.greatorator.tolkienmobs.TolkienMobsMain;
 import com.greatorator.tolkienmobs.containers.CamoKeyStoneContainer;
 import com.greatorator.tolkienmobs.handler.interfaces.block.KeystoneCodeBlockEntity;
 import com.greatorator.tolkienmobs.handler.interfaces.block.KeystoneSettingsBlockEntity;
@@ -133,17 +132,14 @@ public Packet<ClientGamePacketListener> getUpdatePacket() {
 
     public void getRedstoneMode(Level world, BlockPos blockPos) {
         if (getRedstoneControlData().redstoneMode.equals(GeneralUtility.RedstoneMode.TOGGLE)) {
-            TolkienMobsMain.LOGGER.warn("Toggled");
             world.setBlockAndUpdate(blockPos, world.getBlockState(blockPos).cycle(ACTIVE));
             world.playSound((Player)null, blockPos, SoundEvents.LEVER_CLICK, SoundSource.BLOCKS, 0.3F, 0.6F);
             world.setBlock(blockPos, world.getBlockState(blockPos).cycle(POWERED), 3);
         } else if (getRedstoneControlData().redstoneMode.equals(GeneralUtility.RedstoneMode.PULSE)) {
-            TolkienMobsMain.LOGGER.warn("Pulse");
             world.setBlockAndUpdate(blockPos, world.getBlockState(blockPos).setValue(ACTIVE, true));
             world.setBlock(blockPos, world.getBlockState(blockPos).setValue(POWERED, true), 3);
             world.playSound((Player)null, blockPos, SoundEvents.STONE_BUTTON_CLICK_ON, SoundSource.BLOCKS, 0.3F, 0.6F);
         } else if (getRedstoneControlData().redstoneMode.equals(GeneralUtility.RedstoneMode.DELAY) && tickDelay >= 0) {
-            TolkienMobsMain.LOGGER.warn("Delay");
             world.setBlockAndUpdate(blockPos, world.getBlockState(blockPos).setValue(ACTIVE, true));
             world.setBlock(blockPos, world.getBlockState(blockPos).setValue(POWERED, true), 3);
               world.playSound((Player)null, blockPos, SoundEvents.METAL_PRESSURE_PLATE_CLICK_ON, SoundSource.BLOCKS, 0.3F, 0.6F);

src/main/java/com/greatorator/tolkienmobs/block/custom/entity/CamoSpawnerBlockEntity.java

@@ -1,6 +1,5 @@
 package com.greatorator.tolkienmobs.block.custom.entity;
 
-import com.greatorator.tolkienmobs.TolkienMobsMain;
 import com.greatorator.tolkienmobs.block.TolkienBaseSpawner;
 import com.greatorator.tolkienmobs.containers.CamoSpawnerContainer;
 import com.greatorator.tolkienmobs.handler.data.MCDataInput;
@@ -93,7 +92,6 @@ public void onRightClick(ItemStack stack, BlockState state, BlockPos pos, Player
             Optional<EntityType<?>> optional = EntityType.byString(BuiltInRegistries.ENTITY_TYPE.getKey(entityType).toString());
 
             if(!this.entityTags.contains(entityTag) && this.entityTags.size() == 1) {
-                TolkienMobsMain.LOGGER.warn(String.valueOf(this.entityTags.size()));
                 this.entityTags.add(entityTag);
                 this.markDirtyClient();
                 this.setChanged();

src/main/java/com/greatorator/tolkienmobs/block/custom/entity/MilestoneBlockEntity.java

@@ -1,7 +1,6 @@
 package com.greatorator.tolkienmobs.block.custom.entity;
 
 import com.greatorator.tolkienmobs.TolkienMobsConfig;
-import com.greatorator.tolkienmobs.TolkienMobsMain;
 import com.greatorator.tolkienmobs.block.custom.MilestoneBlock;
 import com.greatorator.tolkienmobs.containers.MilestoneContainer;
 import com.greatorator.tolkienmobs.handler.MilestoneHandler;
@@ -188,8 +187,6 @@ public void loadAdditional(CompoundTag tag, HolderLookup.Provider provider) {
     @Override
     public void receivePacketFromClient(MCDataInput input, ServerPlayer client, int id) {
         super.receivePacketFromClient(input, client, id);
-        TolkienMobsMain.LOGGER.warn(String.valueOf(id));
-        TolkienMobsMain.LOGGER.error("Current state: Milestone Teleporting: {}", client);
         ItemStack stack = new ItemStack(BuiltInRegistries.ITEM.get(ResourceLocation.parse(TolkienMobsConfig.PAYMENT_ITEM.get())).getDefaultInstance().getItem());
 
         if (id == 3) {

src/main/java/com/greatorator/tolkienmobs/block/custom/entity/WellBlockEntity.java

@@ -1,6 +1,5 @@
 package com.greatorator.tolkienmobs.block.custom.entity;
 
-import com.greatorator.tolkienmobs.TolkienMobsMain;
 import com.greatorator.tolkienmobs.init.TolkienBlocks;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.InteractionHand;

src/main/java/com/greatorator/tolkienmobs/containers/screens/BackpackBlockScreen.java

@@ -88,7 +88,6 @@ public void init() {
 
         assignFluidRenderer();
         addUpgradeButtons();
-        tileEntity.updateClientState();
     }
 
     @Override

src/main/java/com/greatorator/tolkienmobs/containers/screens/MilestoneScreen.java

@@ -1,7 +1,6 @@
 package com.greatorator.tolkienmobs.containers.screens;
 
 import com.greatorator.tolkienmobs.TolkienMobsConfig;
-import com.greatorator.tolkienmobs.TolkienMobsMain;
 import com.greatorator.tolkienmobs.block.custom.entity.MilestoneBlockEntity;
 import com.greatorator.tolkienmobs.containers.MilestoneContainer;
 import com.greatorator.tolkienmobs.containers.handlers.ToggleButtonFactory;
@@ -30,7 +29,6 @@
 import org.lwjgl.glfw.GLFW;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -82,7 +80,7 @@ public void init() {
             addPaymentMethod();
         }
 
-        addLocations();
+        getItemsForPage();
 
         int relX = (this.width - this.imageWidth) / 2;
         int relY = (this.height - this.imageHeight) / 2;
@@ -158,18 +156,6 @@ public void addNameField() {
         this.milestoneName.setVisible(true);
     }
 
-    public void addLocations() {
-//        int startIndex = currentPage * maxItemsPerPage;
-//        int endIndex = Math.min(startIndex + maxItemsPerPage, getItemsForPage().size());
-//            TolkienMobsMain.LOGGER.warn(String.valueOf(endIndex));
-//
-//        for (int i = startIndex; i < endIndex; i++) {
-//            TolkienMobsMain.LOGGER.warn(String.valueOf(i));
-//
-//            getItemsForPage().get(i);
-//        }
-    }
-
     public void updateRenderables() {
         if (!widgetsToRemove.isEmpty()) {
             for (AbstractWidget abstractWidget : widgetsToRemove) {
@@ -208,8 +194,13 @@ public int getPageCount(){
 
     private List<AbstractWidget> getItemsForPage() {
         int yOffset = 0;
+        int startIndex = currentPage * maxItemsPerPage;
+        List<MilestoneHandler.MilestoneData> knownByPlayer = MilestoneHandler.getKnownByPlayer(Objects.requireNonNull(getMinecraft().player));
+        int endIndex = Math.min(startIndex + maxItemsPerPage, knownByPlayer.size());
 
-        for (MilestoneHandler.MilestoneData data : MilestoneHandler.getKnownByPlayer(Objects.requireNonNull(getMinecraft().player))) {
+        for (int i = 0; i < knownByPlayer.size(); i++) {
+            if (i <= startIndex || i > endIndex) continue;
+            MilestoneHandler.MilestoneData data = knownByPlayer.get(i);
             if (data.getUuid().equals(tileEntity.getUUID())) continue;
 
             int relX = (this.width - this.imageWidth) / 2;

src/main/java/com/greatorator/tolkienmobs/datagen/loot/TolkienChestLootTables.java

@@ -1,16 +1,13 @@
 package com.greatorator.tolkienmobs.datagen.loot;
 
 import com.greatorator.tolkienmobs.datagen.helpers.TolkienLootHelper;
-import com.greatorator.tolkienmobs.init.TolkienEnchantments;
 import com.greatorator.tolkienmobs.init.TolkienItems;
 import net.minecraft.core.HolderLookup;
-import net.minecraft.core.HolderSet;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.data.loot.LootTableSubProvider;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.item.enchantment.Enchantment;
-import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.world.level.storage.loot.LootPool;
 import net.minecraft.world.level.storage.loot.LootTable;
 import net.minecraft.world.level.storage.loot.entries.LootItem;