fixed the server and brought back the chunk loader!

src/main/java/de/ellpeck/naturesaura/Helper.java

@@ -63,7 +63,7 @@ public final class Helper {
                 if (chunk != null) {
                     for (BlockPos tilePos : chunk.getTileEntitiesPos()) {
                         if (tilePos.distanceSq(pos) <= radius * radius)
-                            if (consumer.apply(world.getTileEntity(tilePos)))
+                            if (consumer.apply(chunk.getTileEntity(tilePos)))
                                 return true;
                     }
                 }

src/main/java/de/ellpeck/naturesaura/blocks/BlockChunkLoader.java

@@ -27,14 +27,6 @@ public class BlockChunkLoader extends BlockContainerImpl implements IVisualizabl
         super("chunk_loader", TileEntityChunkLoader::new, ModBlocks.prop(Material.ROCK).hardnessAndResistance(3F).sound(SoundType.STONE));
     }
 
-    /* TODO Chunk Loading
-    @Override
-    public void onInit(FMLInitializationEvent event) {
-        super.onInit(event);
-        ForgeChunkManager.setForcedChunkLoadingCallback(NaturesAura.instance, new ChunkLoadingCallback());
-    }
-     */
-
     @Override
     @OnlyIn(Dist.CLIENT)
     public AxisAlignedBB getVisualizationBounds(World world, BlockPos pos) {
@@ -79,21 +71,4 @@ public class BlockChunkLoader extends BlockContainerImpl implements IVisualizabl
         return SHAPE;
     }
     
-    // TODO chunk loading
-    /*public static class ChunkLoadingCallback implements ForgeChunkManager.LoadingCallback {
-
-        @Override
-        public void ticketsLoaded(List<Ticket> tickets, World world) {
-            for (Ticket ticket : tickets) {
-                CompoundNBT data = ticket.getModData();
-                BlockPos pos = BlockPos.fromLong(data.getLong("pos"));
-                TileEntity tile = world.getTileEntity(pos);
-                if (!(tile instanceof TileEntityChunkLoader))
-                    continue;
-                TileEntityChunkLoader loader = (TileEntityChunkLoader) tile;
-                loader.updateTicket(ticket);
-                loader.loadChunks();
-            }
-        }
-    }*/
 }

src/main/java/de/ellpeck/naturesaura/blocks/tiles/TileEntityChunkLoader.java

@@ -1,73 +1,84 @@
 package de.ellpeck.naturesaura.blocks.tiles;
 
 import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk;
+import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.ITickableTileEntity;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.math.MathHelper;
+import net.minecraft.world.server.ServerWorld;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
-// TODO chunk loader
 public class TileEntityChunkLoader extends TileEntityImpl implements ITickableTileEntity {
+
+    private final List<ChunkPos> forcedChunks = new ArrayList<>();
+
     public TileEntityChunkLoader() {
         super(ModTileEntities.CHUNK_LOADER);
     }
 
-    //private Ticket ticket;
-/*
     @Override
     public void validate() {
         super.validate();
-        if (!this.world.isRemote && this.ticket == null) {
+        this.loadChunks(false);
-            Ticket ticket = ForgeChunkManager.requestTicket(NaturesAura.instance, this.world, Type.NORMAL);
-            this.updateTicket(ticket);
-            ticket.getModData().setLong("pos", this.pos.toLong());
-        }
     }
 
     @Override
-    public void invalidate() {
+    public void remove() {
-        super.invalidate();
+        super.remove();
-        if (!this.world.isRemote)
+        this.loadChunks(true);
-            this.updateTicket(null);
     }
 
     @Override
     public void onRedstonePowerChange(int newPower) {
         super.onRedstonePowerChange(newPower);
         if (!this.world.isRemote) {
-            this.loadChunks();
+            this.loadChunks(false);
             this.sendToClients();
         }
-    }*/
+    }
 
     public int range() {
         return this.redstonePower * 2;
     }
 
-    /*public void updateTicket(Ticket ticket) {
+    private void loadChunks(boolean unload) {
-        if (this.ticket != null)
+        if (this.world.isRemote)
-            ForgeChunkManager.releaseTicket(this.ticket);
-        this.ticket = ticket;
-    }
-
-    public void loadChunks() {
-        if (this.ticket == null)
             return;
-        Set<ChunkPos> before = new HashSet<>(this.ticket.getChunkList());
+        ServerWorld world = (ServerWorld) this.world;
+
+        List<ChunkPos> shouldBeForced = new ArrayList<>();
+        if (!unload) {
             int range = this.range();
             if (range > 0) {
                 for (int x = (this.pos.getX() - range) >> 4; x <= (this.pos.getX() + range) >> 4; x++) {
                     for (int z = (this.pos.getZ() - range) >> 4; z <= (this.pos.getZ() + range) >> 4; z++) {
                         ChunkPos pos = new ChunkPos(x, z);
-                    if (!before.contains(pos))
+                        // Only force chunks that we're already forcing or that nobody else is forcing
-                        ForgeChunkManager.forceChunk(this.ticket, pos);
+                        if (this.forcedChunks.contains(pos) || !world.getForcedChunks().contains(pos.asLong()))
-                    else
+                            shouldBeForced.add(pos);
-                        before.remove(pos);
                     }
                 }
             }
-        for (ChunkPos pos : before)
+        }
-            ForgeChunkManager.unforceChunk(this.ticket, pos);
+
-    }*/
+        // Unforce all of the chunks that shouldn't be forced anymore
+        for (ChunkPos pos : this.forcedChunks) {
+            if (!shouldBeForced.contains(pos))
+                world.forceChunk(pos.x, pos.z, false);
+        }
+        this.forcedChunks.clear();
+
+        // Force all chunks that should be forced
+        for (ChunkPos pos : shouldBeForced) {
+            world.forceChunk(pos.x, pos.z, true);
+            this.forcedChunks.add(pos);
+        }
+    }
 
     @Override
     public void tick() {
@@ -81,4 +92,21 @@ public class TileEntityChunkLoader extends TileEntityImpl implements ITickableTi
             }
         }
     }
+
+    @Override
+    public void writeNBT(CompoundNBT compound, SaveType type) {
+        super.writeNBT(compound, type);
+        if (type == SaveType.TILE)
+            compound.putLongArray("forced_chunks", this.forcedChunks.stream().map(ChunkPos::asLong).collect(Collectors.toList()));
+    }
+
+    @Override
+    public void readNBT(CompoundNBT compound, SaveType type) {
+        super.readNBT(compound, type);
+
+        if (type == SaveType.TILE) {
+            this.forcedChunks.clear();
+            Arrays.stream(compound.getLongArray("forced_chunks")).mapToObj(ChunkPos::new).forEach(this.forcedChunks::add);
+        }
+    }
 }

src/main/java/de/ellpeck/naturesaura/items/AuraBottle.java

@@ -31,7 +31,7 @@ public class AuraBottle extends ItemImpl implements IColorProvidingItem {
 
     public AuraBottle(Item emptyBottle) {
         super("aura_bottle", new Properties().group(NaturesAura.CREATIVE_TAB));
-        MinecraftForge.EVENT_BUS.register(this);
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
 
         DispenserBlock.registerDispenseBehavior(emptyBottle, (source, stack) -> {
             World world = source.getWorld();
@@ -55,34 +55,6 @@ public class AuraBottle extends ItemImpl implements IColorProvidingItem {
         });
     }
 
-    @SubscribeEvent
-    public void onRightClick(PlayerInteractEvent.RightClickItem event) {
-        ItemStack held = event.getItemStack();
-        if (held.isEmpty() || held.getItem() != ModItems.BOTTLE_TWO_THE_REBOTTLING)
-            return;
-        PlayerEntity player = event.getPlayer();
-        RayTraceResult ray = rayTrace(player.world, player, RayTraceContext.FluidMode.NONE);
-        if (ray.getType() == RayTraceResult.Type.BLOCK)
-            return;
-        BlockPos pos = player.getPosition();
-        if (IAuraChunk.getAuraInArea(player.world, pos, 30) < 100000)
-            return;
-
-        if (!player.world.isRemote) {
-            held.shrink(1);
-
-            player.inventory.addItemStackToInventory(
-                    setType(new ItemStack(this), IAuraType.forWorld(player.world)));
-
-            BlockPos spot = IAuraChunk.getHighestSpot(player.world, pos, 30, pos);
-            IAuraChunk.getAuraChunk(player.world, spot).drainAura(spot, 20000);
-
-            player.world.playSound(null, player.posX, player.posY, player.posZ,
-                    SoundEvents.ITEM_BOTTLE_FILL_DRAGONBREATH, SoundCategory.PLAYERS, 1F, 1F);
-        }
-        player.swingArm(event.getHand());
-    }
-
     @Override
     public void fillItemGroup(ItemGroup tab, NonNullList<ItemStack> items) {
         if (this.isInGroup(tab)) {
@@ -118,4 +90,36 @@ public class AuraBottle extends ItemImpl implements IColorProvidingItem {
     public IItemColor getItemColor() {
         return (stack, tintIndex) -> tintIndex > 0 ? getType(stack).getColor() : 0xFFFFFF;
     }
+
+    private class EventHandler {
+
+        @SubscribeEvent
+        public void onRightClick(PlayerInteractEvent.RightClickItem event) {
+            ItemStack held = event.getItemStack();
+            if (held.isEmpty() || held.getItem() != ModItems.BOTTLE_TWO_THE_REBOTTLING)
+                return;
+            PlayerEntity player = event.getPlayer();
+            RayTraceResult ray = rayTrace(player.world, player, RayTraceContext.FluidMode.NONE);
+            if (ray.getType() == RayTraceResult.Type.BLOCK)
+                return;
+            BlockPos pos = player.getPosition();
+            if (IAuraChunk.getAuraInArea(player.world, pos, 30) < 100000)
+                return;
+
+            if (!player.world.isRemote) {
+                held.shrink(1);
+
+                player.inventory.addItemStackToInventory(
+                        setType(new ItemStack(AuraBottle.this), IAuraType.forWorld(player.world)));
+
+                BlockPos spot = IAuraChunk.getHighestSpot(player.world, pos, 30, pos);
+                IAuraChunk.getAuraChunk(player.world, spot).drainAura(spot, 20000);
+
+                player.world.playSound(null, player.posX, player.posY, player.posZ,
+                        SoundEvents.ITEM_BOTTLE_FILL_DRAGONBREATH, SoundCategory.PLAYERS, 1F, 1F);
+            }
+            player.swingArm(event.getHand());
+        }
+
+    }
 }

src/main/java/de/ellpeck/naturesaura/items/BirthSpirit.java

@@ -12,9 +12,10 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
 public class BirthSpirit extends Glowing {
     public BirthSpirit() {
         super("birth_spirit");
-        MinecraftForge.EVENT_BUS.register(this);
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
+    private static class EventHandler {
         @SubscribeEvent
         public void onBabyBorn(BabyEntitySpawnEvent event) {
             LivingEntity parent = event.getParentA();
@@ -34,3 +35,4 @@ public class BirthSpirit extends Glowing {
             }
         }
     }
+}

src/main/java/de/ellpeck/naturesaura/items/RangeVisualizer.java

@@ -29,7 +29,7 @@ public class RangeVisualizer extends ItemImpl {
 
     public RangeVisualizer() {
         super("range_visualizer", new Properties().maxStackSize(1).group(NaturesAura.CREATIVE_TAB));
-        MinecraftForge.EVENT_BUS.register(this);
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
     }
 
     @Override
@@ -76,10 +76,12 @@ public class RangeVisualizer extends ItemImpl {
         }
     }
 
+    public class EventHandler {
+
         @SubscribeEvent
         public void onInteract(PlayerInteractEvent.EntityInteractSpecific event) {
             ItemStack stack = event.getItemStack();
-        if (stack.isEmpty() || stack.getItem() != this)
+            if (stack.isEmpty() || stack.getItem() != RangeVisualizer.this)
                 return;
             Entity entity = event.getTarget();
             if (entity instanceof IVisualizable) {
@@ -93,3 +95,4 @@ public class RangeVisualizer extends ItemImpl {
             }
         }
     }
+}

src/main/java/de/ellpeck/naturesaura/items/tools/Armor.java

@@ -33,22 +33,10 @@ public class Armor extends ArmorItem implements IModItem, IModelProvider {
     public Armor(String baseName, IArmorMaterial materialIn, EquipmentSlotType equipmentSlotIn) {
         super(materialIn, equipmentSlotIn, new Properties().group(NaturesAura.CREATIVE_TAB));
         this.baseName = baseName;
-        MinecraftForge.EVENT_BUS.register(this);
+        MinecraftForge.EVENT_BUS.register(new EventHandler());
         ModRegistry.add(this);
     }
 
-    @SubscribeEvent
-    public void onAttack(LivingAttackEvent event) {
-        LivingEntity entity = event.getEntityLiving();
-        if (!entity.world.isRemote) {
-            if (!isFullSetEquipped(entity, 0))
-                return;
-            Entity source = event.getSource().getTrueSource();
-            if (source instanceof LivingEntity)
-                ((LivingEntity) source).addPotionEffect(new EffectInstance(Effects.WITHER, 40));
-        }
-    }
-
     @Override
     public String getBaseName() {
         return this.baseName;
@@ -75,4 +63,19 @@ public class Armor extends ArmorItem implements IModItem, IModelProvider {
         }
         return true;
     }
+
+    private static class EventHandler {
+
+        @SubscribeEvent
+        public void onAttack(LivingAttackEvent event) {
+            LivingEntity entity = event.getEntityLiving();
+            if (!entity.world.isRemote) {
+                if (!isFullSetEquipped(entity, 0))
+                    return;
+                Entity source = event.getSource().getTrueSource();
+                if (source instanceof LivingEntity)
+                    ((LivingEntity) source).addPotionEffect(new EffectInstance(Effects.WITHER, 40));
+            }
+        }
+    }
 }

src/main/java/de/ellpeck/naturesaura/packet/PacketAuraChunk.java

@@ -70,7 +70,6 @@ public class PacketAuraChunk {
         return true;
     }
 
-    @OnlyIn(Dist.CLIENT)
     public static void onMessage(PacketAuraChunk message, Supplier<NetworkEvent.Context> ctx) {
         ctx.get().enqueueWork(() -> ClientEvents.PENDING_AURA_CHUNKS.add(message));
         ctx.get().setPacketHandled(true);

src/main/java/de/ellpeck/naturesaura/packet/PacketClient.java

@@ -5,8 +5,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.dimension.DimensionType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.network.NetworkEvent;
 
 import java.util.function.Supplier;
@@ -41,9 +39,12 @@ public class PacketClient {
             buf.writeInt(i);
     }
 
-    @OnlyIn(Dist.CLIENT)
+    // lambda causes classloading issues on a server here
+    @SuppressWarnings("Convert2Lambda")
     public static void onMessage(PacketClient message, Supplier<NetworkEvent.Context> ctx) {
-        ctx.get().enqueueWork(() -> {
+        ctx.get().enqueueWork(new Runnable() {
+            @Override
+            public void run() {
                 Minecraft mc = Minecraft.getInstance();
                 if (mc.world != null) {
                     switch (message.type) {
@@ -53,6 +54,7 @@ public class PacketClient {
                             RangeVisualizer.visualize(mc.player, RangeVisualizer.VISUALIZED_RAILS, DimensionType.getById(goalDim), goalPos);
                     }
                 }
+            }
         });
         ctx.get().setPacketHandled(true);
     }

src/main/java/de/ellpeck/naturesaura/packet/PacketParticleStream.java

@@ -65,7 +65,6 @@ public class PacketParticleStream {
         buf.writeFloat(packet.scale);
     }
 
-    @OnlyIn(Dist.CLIENT)
     public static void onMessage(PacketParticleStream message, Supplier<NetworkEvent.Context> ctx) {
         ctx.get().enqueueWork(() -> NaturesAuraAPI.instance().spawnParticleStream(
                 message.startX, message.startY, message.startZ,

src/main/java/de/ellpeck/naturesaura/packet/PacketParticles.java

@@ -12,8 +12,6 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeColors;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.network.NetworkEvent;
 
 import java.util.function.Supplier;
@@ -65,9 +63,12 @@ public class PacketParticles {
         }
     }
 
-    @OnlyIn(Dist.CLIENT)
+    // lambda causes classloading issues on a server here
+    @SuppressWarnings("Convert2Lambda")
     public static void onMessage(PacketParticles message, Supplier<NetworkEvent.Context> ctx) {
-        ctx.get().enqueueWork(() -> {
+        ctx.get().enqueueWork(new Runnable() {
+            @Override
+            public void run() {
                 World world = Minecraft.getInstance().world;
                 if (world != null) {
                     switch (message.type) {
@@ -434,6 +435,7 @@ public class PacketParticles {
                                         world.rand.nextGaussian() * 0.03F);
                     }
                 }
+            }
         });
         ctx.get().setPacketHandled(true);
     }

src/main/java/de/ellpeck/naturesaura/renderers/PlayerLayerTrinkets.java

@@ -36,6 +36,8 @@ public class PlayerLayerTrinkets extends LayerRenderer<AbstractClientPlayerEntit
 
         this.alreadyRendered.clear();
         GlStateManager.pushMatrix();
+        GlStateManager.pushLightingAttributes();
+        GlStateManager.pushTextureAttributes();
         GlStateManager.color4f(1F, 1F, 1F, 1F);
         this.render(player, RenderType.BODY, main, second);
         float yaw = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * partialTicks;
@@ -45,6 +47,8 @@ public class PlayerLayerTrinkets extends LayerRenderer<AbstractClientPlayerEntit
         GlStateManager.rotatef(yaw - 270, 0, 1, 0);
         GlStateManager.rotatef(pitch, 0, 0, 1);
         this.render(player, RenderType.HEAD, main, second);
+        GlStateManager.popAttributes();
+        GlStateManager.popAttributes();
         GlStateManager.popMatrix();
 
     }

src/main/java/de/ellpeck/naturesaura/renderers/SupporterFancyHandler.java

@@ -45,7 +45,7 @@ public class SupporterFancyHandler {
         Minecraft mc = Minecraft.getInstance();
         if (player == mc.player && mc.gameSettings.thirdPersonView == 0)
             return;
-        FancyInfo info = FANCY_INFOS.get(player.getName());
+        FancyInfo info = FANCY_INFOS.get(player.getGameProfile().getName());
         if (info == null)
             return;
 

src/main/resources/assets/naturesaura/models/block/chunk_loader.json

@@ -7,8 +7,7 @@
             "faces": {
                 "down": {
                     "uv": [4, 4, 12, 12],
-                    "texture": "#texture",
+                    "texture": "#texture"
-                    "cullface": "down"
                 },
                 "up": {
                     "uv": [4, 4, 12, 12],
@@ -16,23 +15,19 @@
                 },
                 "north": {
                     "uv": [4, 4, 12, 12],
-                    "texture": "#texture",
+                    "texture": "#texture"
-                    "cullface": "north"
                 },
                 "south": {
                     "uv": [4, 4, 12, 12],
-                    "texture": "#texture",
+                    "texture": "#texture"
-                    "cullface": "south"
                 },
                 "west": {
                     "uv": [4, 4, 12, 12],
-                    "texture": "#texture",
+                    "texture": "#texture"
-                    "cullface": "west"
                 },
                 "east": {
                     "uv": [4, 4, 12, 12],
-                    "texture": "#texture",
+                    "texture": "#texture"
-                    "cullface": "east"
                 }
             }
         }