diff --git a/logs/latest.log b/logs/latest.log
index 9002c79c..a67a5f68 100644
--- a/logs/latest.log
+++ b/logs/latest.log
@@ -1,127 +1,140 @@
-[21:42:02] [Client thread/ERROR]: Can't find the resource index file: assets\indexes\1.8.json
-[21:42:02] [Client thread/INFO]: Setting user: Player422
-[21:42:02] [Client thread/INFO]: (Session ID is token:0:Player422)
-[21:42:03] [Client thread/INFO]: [OptiFine] *** Reflector Forge ***
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.Attributes
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: mods.betterfoliage.client.BetterFoliageClient
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.asm.transformers.BlamingTransformer
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.event.world.ChunkWatchEvent$UnWatch
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.relauncher.CoreModManager
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.DimensionManager
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.GuiScreenEvent$DrawScreenEvent$Pre
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.GuiScreenEvent$DrawScreenEvent$Post
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.EntityViewRenderEvent$CameraSetup
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.EntityViewRenderEvent$FogColors
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.eventhandler.Event
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.eventhandler.EventBus
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.eventhandler.Event$Result
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.property.ExtendedBlockState
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.FMLClientHandler
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.FMLCommonHandler
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.biome.BiomeGenBase.getWaterColorMultiplier
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.addDestroyEffects
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.addHitEffects
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.canCreatureSpawn
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.canRenderInLayer
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.doesSideBlockRendering
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.getBedDirection
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.getExtendedState
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.hasTileEntity
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isAir
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isBed
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isBedFoot
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isSideSolid
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.entity.Entity.canRiderInteract
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Field not present: net.minecraft.entity.Entity.captureDrops
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Field not present: net.minecraft.entity.Entity.capturedDrops
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.entity.Entity.shouldRenderInPass
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.entity.Entity.shouldRiderSit
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.event.ForgeEventFactory
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.ForgeHooks
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.ForgeHooksClient
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.getDurabilityForDisplay
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.getModel
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.onEntitySwing
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.shouldCauseReequipAnimation
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.showDurabilityBar
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.ItemRecord.getRecordResource
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.ForgeModContainer
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.potion.PotionEffect.isCurativeItem
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.canRenderBreaking
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.getRenderBoundingBox
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.hasFastRenderer
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.shouldRenderInPass
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher.preDrawBatch
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher.drawBatch
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.vertex.VertexFormatElement$EnumUsage.preDraw
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.vertex.VertexFormatElement$EnumUsage.postDraw
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.World.countEntities
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.World.getPerWorldStorage
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.WorldProvider.getCloudRenderer
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.WorldProvider.getSkyRenderer
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.WorldProvider.getWeatherRenderer
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.GuiModList
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.IColoredBakedQuad
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.property.IExtendedBlockState
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.IRenderHandler
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.ISmartBlockModel
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.ItemModelMesherForge
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraft.launchwrapper.Launch
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.pipeline.LightUtil
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.MinecraftForge
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.MinecraftForgeClient
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.ModelLoader
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderBlockOverlayEvent$OverlayType
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.registry.RenderingRegistry
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderItemInFrameEvent
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Pre
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Post
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Specials$Pre
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Specials$Post
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.SplashProgress
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.event.world.WorldEvent$Load
-[21:42:03] [Client thread/INFO]: [OptiFine] *** Reflector Vanilla ***
-[21:42:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: optifine.OptiFineClassTransformer
-[21:42:03] [Client thread/WARN]: [Athena] Tried accessing non-existing module: theme
-[21:42:03] [Client thread/WARN]: [Athena] Tried accessing non-existing module: cape
-[21:42:03] [Client thread/INFO]: LWJGL Version: 2.9.4
-[21:42:05] [Client thread/INFO]: [OptiFine]
-[21:42:05] [Client thread/INFO]: [OptiFine] OptiFine_1.8.8_HD_U_H8
-[21:42:05] [Client thread/INFO]: [OptiFine] Build: null
-[21:42:05] [Client thread/INFO]: [OptiFine] OS: Windows 11 (amd64) version 10.0
-[21:42:05] [Client thread/INFO]: [OptiFine] Java: 1.8.0_362, Azul Systems, Inc.
-[21:42:05] [Client thread/INFO]: [OptiFine] VM: OpenJDK 64-Bit Server VM (mixed mode), Azul Systems, Inc.
-[21:42:05] [Client thread/INFO]: [OptiFine] LWJGL: 2.9.4
-[21:42:05] [Client thread/INFO]: [OptiFine] OpenGL: NVIDIA GeForce RTX 3050 Laptop GPU/PCIe/SSE2, version 4.6.0 NVIDIA 531.79, NVIDIA Corporation
-[21:42:05] [Client thread/INFO]: [OptiFine] OpenGL Version: 4.6.0
-[21:42:05] [Client thread/INFO]: [OptiFine] Maximum texture size: 32768x32768
-[21:42:05] [Client thread/INFO]: [Shaders] ShadersMod version: 2.4.12
-[21:42:05] [Client thread/INFO]: [Shaders] OpenGL Version: 4.6.0 NVIDIA 531.79
-[21:42:05] [Client thread/INFO]: [Shaders] Vendor: NVIDIA Corporation
-[21:42:05] [Client thread/INFO]: [Shaders] Renderer: NVIDIA GeForce RTX 3050 Laptop GPU/PCIe/SSE2
-[21:42:05] [Client thread/INFO]: [Shaders] Capabilities: 2.0 2.1 3.0 3.2 4.0
-[21:42:05] [Client thread/INFO]: [Shaders] GL_MAX_DRAW_BUFFERS: 8
-[21:42:05] [Client thread/INFO]: [Shaders] GL_MAX_COLOR_ATTACHMENTS_EXT: 8
-[21:42:05] [Client thread/INFO]: [Shaders] GL_MAX_TEXTURE_IMAGE_UNITS: 32
-[21:42:05] [Client thread/INFO]: [Shaders] Load ShadersMod configuration.
-[21:42:05] [Client thread/INFO]: [Shaders] Save ShadersMod configuration.
-[21:42:05] [Client thread/INFO]: [Shaders] Shaders can not be loaded, Fast Render is enabled.
-[21:42:05] [Client thread/INFO]: [Shaders] No shaderpack loaded.
-[21:42:05] [Client thread/INFO]: Reloading ResourceManager: Default
-[21:42:05] [Client thread/INFO]: [OptiFine] *** Reloading textures ***
-[21:42:05] [Client thread/INFO]: [OptiFine] Resource packs: Default
-[21:42:05] [Sound Library Loader/INFO]: Starting up SoundSystem...
-[21:42:06] [Thread-7/INFO]: Initializing LWJGL OpenAL
-[21:42:06] [Thread-7/INFO]: (The LWJGL binding of OpenAL. For more information, see http://www.lwjgl.org)
-[21:42:07] [Client thread/INFO]: [OptiFine] Multitexture: false
-[21:42:07] [Thread-7/INFO]: OpenAL initialized.
-[21:42:07] [Sound Library Loader/INFO]: Sound engine started
-[21:42:07] [Client thread/INFO]: Created: 512x512 textures-atlas
-[21:42:08] [Client thread/INFO]: [OptiFine] *** Reloading custom textures ***
-[21:42:08] [Client thread/INFO]: [OptiFine] Enable face culling: acacia_leaves, birch_leaves, dark_oak_leaves, jungle_leaves, oak_leaves, spruce_leaves
-[21:42:15] [Client thread/WARN]: Unable to play unknown soundEvent: minecraft:gui.button.press
-[21:42:17] [Client thread/WARN]: Unable to play unknown soundEvent: minecraft:music.menu
-[21:42:21] [Client thread/INFO]: Stopping!
-[21:42:21] [Client thread/INFO]: [Athena] Shutting down client
-[21:42:21] [Client thread/INFO]: SoundSystem shutting down...
-[21:42:21] [Client thread/WARN]: Author: Paul Lamb, www.paulscode.com
+[22:59:01] [Client thread/ERROR]: Can't find the resource index file: assets\indexes\1.8.json
+[22:59:01] [Client thread/INFO]: Setting user: Player906
+[22:59:01] [Client thread/INFO]: (Session ID is token:0:Player906)
+[22:59:03] [Client thread/INFO]: [OptiFine] *** Reflector Forge ***
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.Attributes
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: mods.betterfoliage.client.BetterFoliageClient
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.asm.transformers.BlamingTransformer
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.event.world.ChunkWatchEvent$UnWatch
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.relauncher.CoreModManager
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.DimensionManager
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.GuiScreenEvent$DrawScreenEvent$Pre
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.GuiScreenEvent$DrawScreenEvent$Post
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.EntityViewRenderEvent$CameraSetup
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.EntityViewRenderEvent$FogColors
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.eventhandler.Event
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.eventhandler.EventBus
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.eventhandler.Event$Result
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.property.ExtendedBlockState
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.FMLClientHandler
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.common.FMLCommonHandler
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.biome.BiomeGenBase.getWaterColorMultiplier
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.addDestroyEffects
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.addHitEffects
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.canCreatureSpawn
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.canRenderInLayer
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.doesSideBlockRendering
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.getBedDirection
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.getExtendedState
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.hasTileEntity
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isAir
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isBed
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isBedFoot
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.block.Block.isSideSolid
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.entity.Entity.canRiderInteract
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Field not present: net.minecraft.entity.Entity.captureDrops
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Field not present: net.minecraft.entity.Entity.capturedDrops
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.entity.Entity.shouldRenderInPass
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.entity.Entity.shouldRiderSit
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.event.ForgeEventFactory
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.ForgeHooks
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.ForgeHooksClient
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.getDurabilityForDisplay
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.getModel
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.onEntitySwing
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.shouldCauseReequipAnimation
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.Item.showDurabilityBar
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.item.ItemRecord.getRecordResource
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.ForgeModContainer
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.potion.PotionEffect.isCurativeItem
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.canRenderBreaking
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.getRenderBoundingBox
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.hasFastRenderer
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.tileentity.TileEntity.shouldRenderInPass
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher.preDrawBatch
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher.drawBatch
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.vertex.VertexFormatElement$EnumUsage.preDraw
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.client.renderer.vertex.VertexFormatElement$EnumUsage.postDraw
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.World.countEntities
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.World.getPerWorldStorage
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.WorldProvider.getCloudRenderer
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.WorldProvider.getSkyRenderer
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Method not present: net.minecraft.world.WorldProvider.getWeatherRenderer
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.GuiModList
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.IColoredBakedQuad
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.property.IExtendedBlockState
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.IRenderHandler
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.ISmartBlockModel
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.ItemModelMesherForge
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraft.launchwrapper.Launch
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.pipeline.LightUtil
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.common.MinecraftForge
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.MinecraftForgeClient
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.model.ModelLoader
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderBlockOverlayEvent$OverlayType
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.registry.RenderingRegistry
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderItemInFrameEvent
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Pre
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Post
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Specials$Pre
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.client.event.RenderLivingEvent$Specials$Post
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.fml.client.SplashProgress
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: net.minecraftforge.event.world.WorldEvent$Load
+[22:59:03] [Client thread/INFO]: [OptiFine] *** Reflector Vanilla ***
+[22:59:03] [Client thread/INFO]: [OptiFine] (Reflector) Class not present: optifine.OptiFineClassTransformer
+[22:59:03] [Client thread/INFO]: LWJGL Version: 2.9.4
+[22:59:05] [Client thread/INFO]: [OptiFine]
+[22:59:05] [Client thread/INFO]: [OptiFine] OptiFine_1.8.8_HD_U_H8
+[22:59:05] [Client thread/INFO]: [OptiFine] Build: null
+[22:59:05] [Client thread/INFO]: [OptiFine] OS: Windows 11 (amd64) version 10.0
+[22:59:05] [Client thread/INFO]: [OptiFine] Java: 1.8.0_362, Azul Systems, Inc.
+[22:59:05] [Client thread/INFO]: [OptiFine] VM: OpenJDK 64-Bit Server VM (mixed mode), Azul Systems, Inc.
+[22:59:05] [Client thread/INFO]: [OptiFine] LWJGL: 2.9.4
+[22:59:05] [Client thread/INFO]: [OptiFine] OpenGL: NVIDIA GeForce RTX 3050 Laptop GPU/PCIe/SSE2, version 4.6.0 NVIDIA 531.79, NVIDIA Corporation
+[22:59:05] [Client thread/INFO]: [OptiFine] OpenGL Version: 4.6.0
+[22:59:05] [Client thread/INFO]: [OptiFine] Maximum texture size: 32768x32768
+[22:59:05] [Client thread/INFO]: [Shaders] ShadersMod version: 2.4.12
+[22:59:05] [Client thread/INFO]: [Shaders] OpenGL Version: 4.6.0 NVIDIA 531.79
+[22:59:05] [Client thread/INFO]: [Shaders] Vendor: NVIDIA Corporation
+[22:59:05] [Client thread/INFO]: [Shaders] Renderer: NVIDIA GeForce RTX 3050 Laptop GPU/PCIe/SSE2
+[22:59:05] [Client thread/INFO]: [Shaders] Capabilities: 2.0 2.1 3.0 3.2 4.0
+[22:59:05] [Client thread/INFO]: [Shaders] GL_MAX_DRAW_BUFFERS: 8
+[22:59:05] [Client thread/INFO]: [Shaders] GL_MAX_COLOR_ATTACHMENTS_EXT: 8
+[22:59:05] [Client thread/INFO]: [Shaders] GL_MAX_TEXTURE_IMAGE_UNITS: 32
+[22:59:05] [Client thread/INFO]: [Shaders] Load ShadersMod configuration.
+[22:59:05] [Client thread/INFO]: [Shaders] Save ShadersMod configuration.
+[22:59:05] [Client thread/INFO]: [Shaders] Shaders can not be loaded, Fast Render is enabled.
+[22:59:05] [Client thread/INFO]: [Shaders] No shaderpack loaded.
+[22:59:05] [Client thread/INFO]: Reloading ResourceManager: Default
+[22:59:05] [Client thread/INFO]: [OptiFine] *** Reloading textures ***
+[22:59:05] [Client thread/INFO]: [OptiFine] Resource packs: Default
+[22:59:08] [Client thread/ERROR]: [Athena] Failed to load cape asset, missing. java.nio.file.NoSuchFileException: none
+[22:59:08] [Client thread/ERROR]: [Athena] Failed to load cape asset, missing. java.nio.file.NoSuchFileException: Athena\cosmetics\capes\staff.png
+[22:59:08] [Client thread/WARN]: [Athena] Tried accessing non-existing module: primaryTheme
+[22:59:08] [Client thread/WARN]: [Athena] Tried accessing non-existing module: theme
+[22:59:08] [Client thread/ERROR]: [Athena] Failed to load config default, improper json.org.json.JSONException: JSONObject["cape"] not found.
+[22:59:08] [Sound Library Loader/INFO]: Starting up SoundSystem...
+[22:59:08] [Thread-9/WARN]: [Athena] Tried accessing non-existing cape:
+301 Moved Permanently
+
+301 Moved Permanently
+
nginx/1.18.0 (Ubuntu)
+
+
+
+[22:59:09] [Thread-10/INFO]: Initializing LWJGL OpenAL
+[22:59:09] [Thread-10/INFO]: (The LWJGL binding of OpenAL. For more information, see http://www.lwjgl.org)
+[22:59:10] [Thread-10/INFO]: OpenAL initialized.
+[22:59:10] [Sound Library Loader/INFO]: Sound engine started
+[22:59:10] [Client thread/INFO]: [OptiFine] Multitexture: false
+[22:59:11] [Client thread/INFO]: Created: 512x512 textures-atlas
+[22:59:11] [Client thread/INFO]: [OptiFine] *** Reloading custom textures ***
+[22:59:12] [Client thread/INFO]: [OptiFine] Enable face culling: acacia_leaves, birch_leaves, dark_oak_leaves, jungle_leaves, oak_leaves, spruce_leaves
+[22:59:17] [Client thread/WARN]: Unable to play unknown soundEvent: minecraft:music.menu
+[22:59:35] [Client thread/WARN]: Unable to play unknown soundEvent: minecraft:music.menu
+[22:59:39] [Client Shutdown Thread/INFO]: Stopping server
diff --git a/src/main/java/net/minecraft/client/Minecraft.java b/src/main/java/net/minecraft/client/Minecraft.java
index 37ff8464..8be68706 100644
--- a/src/main/java/net/minecraft/client/Minecraft.java
+++ b/src/main/java/net/minecraft/client/Minecraft.java
@@ -108,6 +108,7 @@ import rip.athena.client.modules.fpssettings.OptimizerMod;
import rip.athena.client.modules.mods.HitDelayFix;
import rip.athena.client.modules.render.MotionBlur;
import rip.athena.client.ui.menu.AthenaMenu;
+import rip.athena.client.ui.splash.AthenaSplashScreen;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
@@ -268,6 +269,8 @@ public class Minecraft implements IThreadListener, IPlayerUsage
private final Thread mcThread = Thread.currentThread();
private ModelManager modelManager;
+ public static AthenaSplashScreen athenaSplashScreen;
+
/**
* The BlockRenderDispatcher instance that will be used based off gamesettings
*/
@@ -404,6 +407,9 @@ public class Minecraft implements IThreadListener, IPlayerUsage
*/
private void startGame() throws LWJGLException, IOException
{
+
+ athenaSplashScreen = new AthenaSplashScreen(12);
+
this.gameSettings = new GameSettings(this, this.mcDataDir);
this.defaultResourcePacks.add(this.mcDefaultResourcePack);
this.startTimerHackThread();
@@ -414,8 +420,6 @@ public class Minecraft implements IThreadListener, IPlayerUsage
this.displayHeight = this.gameSettings.overrideHeight;
}
- Athena.INSTANCE.initClient();
-
logger.info("LWJGL Version: " + Sys.getVersion());
this.setWindowIcon();
this.setInitialDisplayMode();
@@ -428,10 +432,20 @@ public class Minecraft implements IThreadListener, IPlayerUsage
this.mcResourceManager = new SimpleReloadableResourceManager(this.metadataSerializer_);
this.mcLanguageManager = new LanguageManager(this.metadataSerializer_, this.gameSettings.language);
this.mcResourceManager.registerReloadListener(this.mcLanguageManager);
+// athenaSplashScreen.step("Reloading Resources", this.renderEngine);
+
this.refreshResources();
this.renderEngine = new TextureManager(this.mcResourceManager);
this.mcResourceManager.registerReloadListener(this.renderEngine);
- this.drawSplashScreen(this.renderEngine);
+// this.drawSplashScreen(this.renderEngine);
+
+ athenaSplashScreen.step("Initializing", this.renderEngine);
+
+// Moved start to here to add more steps LOL
+ Athena.INSTANCE.initClient();
+
+ athenaSplashScreen.step("Loading Minecraft", this.renderEngine);
+
this.initStream();
this.skinManager = new SkinManager(this.renderEngine, new File(this.fileAssets, "skins"), this.sessionService);
this.saveLoader = new AnvilSaveConverter(new File(this.mcDataDir, "saves"));
@@ -467,6 +481,7 @@ public class Minecraft implements IThreadListener, IPlayerUsage
});
this.mouseHelper = new MouseHelper();
this.checkGLError("Pre startup");
+ athenaSplashScreen.step("Pre startup", this.renderEngine);
GlStateManager.enableTexture2D();
GlStateManager.shadeModel(7425);
GlStateManager.clearDepth(1.0D);
@@ -479,6 +494,9 @@ public class Minecraft implements IThreadListener, IPlayerUsage
GlStateManager.loadIdentity();
GlStateManager.matrixMode(5888);
this.checkGLError("Startup");
+ athenaSplashScreen.step("Loading Texture Map", this.renderEngine);
+
+
this.textureMapBlocks = new TextureMap("textures");
this.textureMapBlocks.setMipmapLevels(this.gameSettings.mipmapLevels);
this.renderEngine.loadTickableTexture(TextureMap.locationBlocksTexture, this.textureMapBlocks);
@@ -500,6 +518,8 @@ public class Minecraft implements IThreadListener, IPlayerUsage
GlStateManager.viewport(0, 0, this.displayWidth, this.displayHeight);
this.effectRenderer = new EffectRenderer(this.theWorld, this.renderEngine);
this.checkGLError("Post startup");
+ athenaSplashScreen.step("Post Startup", this.renderEngine);
+
this.ingameGUI = new GuiIngame(this);
if (this.serverName != null)
@@ -515,6 +535,7 @@ public class Minecraft implements IThreadListener, IPlayerUsage
this.mojangLogo = null;
this.loadingScreen = new LoadingScreenRenderer(this);
+
if (this.gameSettings.fullScreen && !this.fullscreen)
{
this.toggleFullscreen();
@@ -1151,11 +1172,15 @@ public class Minecraft implements IThreadListener, IPlayerUsage
public void updateDisplay()
{
- if(Athena.INSTANCE.getModuleRepository().get(MotionBlur.class).isToggled()) {
- if(Minecraft.getMinecraft().thePlayer != null) {
- MotionBlur.createAccumulation();
+
+ if(athenaSplashScreen.isDone) {
+ if(Athena.INSTANCE.getModuleRepository().get(MotionBlur.class).isToggled()) {
+ if(Minecraft.getMinecraft().thePlayer != null) {
+ MotionBlur.createAccumulation();
+ }
}
}
+
this.mcProfiler.startSection("display_update");
Display.update();
this.mcProfiler.endSection();
diff --git a/src/main/java/rip/athena/client/Athena.java b/src/main/java/rip/athena/client/Athena.java
index cd327493..5f26ffed 100644
--- a/src/main/java/rip/athena/client/Athena.java
+++ b/src/main/java/rip/athena/client/Athena.java
@@ -2,6 +2,7 @@ package rip.athena.client;
import lombok.Getter;
import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureManager;
import org.lwjgl.opengl.Display;
import rip.athena.api.account.AccountManager;
import rip.athena.api.config.save.ConfigManager;
@@ -72,6 +73,8 @@ public class Athena {
private DiscordRPC discordRPC;
private EventBus eventBus;
+ private TextureManager renderEngine;
+
private boolean isGameRunningForeground = true;
private boolean hasSent = false;
@@ -82,15 +85,29 @@ public class Athena {
* connections with servers or other systems.
*/
public void initClient() {
+
+ this.renderEngine = Minecraft.getMinecraft().getTextureManager();
+
+ Minecraft.athenaSplashScreen.step("Starting Athena", this.renderEngine);
+
sendInitializationMessage("Athena", false);
+ Minecraft.athenaSplashScreen.step("Directories", this.renderEngine);
+
createDirectoryIfNotExists(MAIN_DIR);
createFileIfNotExists(ACCOUNTS_DIR);
+ Minecraft.athenaSplashScreen.step("Initializing", this.renderEngine);
+
preInit();
+ Minecraft.athenaSplashScreen.step("Starting Managers", this.renderEngine);
+
handleManagers();
registerEvents();
+
+ Minecraft.athenaSplashScreen.step("Cosmetics", this.renderEngine);
+
checkCosmetics();
logInformation();
@@ -98,7 +115,7 @@ public class Athena {
private void preInit() {
try {
- Desktop.getDesktop().browse(URI.create("https://discord.gg/pdKz6UdyNX"));
+// Desktop.getDesktop().browse(URI.create("https://discord.gg/pdKz6UdyNX"));
} catch (Exception ignored) {}
this.discordRPC = new DiscordRPC();
@@ -123,6 +140,8 @@ public class Athena {
this.cosmeticsManager = new CosmeticsManager();
//this.cosmeticsController = new CosmeticsController();
+ Minecraft.athenaSplashScreen.step("Metadata", this.renderEngine);
+
this.configManager.postInit();
}
diff --git a/src/main/java/rip/athena/client/ui/splash/AthenaSplashScreen.java b/src/main/java/rip/athena/client/ui/splash/AthenaSplashScreen.java
new file mode 100644
index 00000000..547c5e7e
--- /dev/null
+++ b/src/main/java/rip/athena/client/ui/splash/AthenaSplashScreen.java
@@ -0,0 +1,157 @@
+package rip.athena.client.ui.splash;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.Display;
+import org.lwjgl.opengl.GL11;
+import rip.athena.client.Athena;
+import rip.athena.client.theme.impl.PrimaryTheme;
+import rip.athena.client.ui.clickgui.IngameMenu;
+import rip.athena.client.utils.animations.simple.AnimationUtils;
+import rip.athena.client.utils.animations.simple.SimpleAnimation;
+import rip.athena.client.utils.font.Font;
+import rip.athena.client.utils.font.FontManager;
+import rip.athena.client.utils.render.DrawUtils;
+import rip.athena.client.utils.render.RoundedUtils;
+
+import java.awt.*;
+
+public class AthenaSplashScreen {
+
+ public boolean isDone = false;
+
+ private int totalSteps = 0;
+ private int completedSteps = 0;
+ private String displayString = "Starting Athena";
+
+ private SimpleAnimation animationUtils;
+ private TextureManager textureManager;
+
+ public AthenaSplashScreen(int totalSteps) {
+ this.totalSteps = totalSteps;
+ }
+
+ public void init(TextureManager textureManager) {
+ this.textureManager = textureManager;
+ }
+
+ public void step(String displayString, TextureManager textureManager1) {
+// completedSteps++;
+
+ completedSteps = completedSteps + 1;
+//
+ System.out.println(totalSteps);
+
+// System.out.println(displayString);
+//
+// System.out.println(completedSteps);
+// System.out.println(completedSteps);
+
+ this.displayString = displayString;
+
+ init(textureManager1);
+
+ if(!(this.textureManager == null))
+ drawSplash(this.textureManager);
+ else {
+ init(textureManager1);
+ drawSplash(textureManager1);
+ }
+
+ if(completedSteps == 11) {
+ isDone = true;
+ }
+ }
+
+
+ public void drawSplash(TextureManager textureManager) {
+ ScaledResolution scaledresolution = new ScaledResolution(Minecraft.getMinecraft());
+
+ int width = scaledresolution.getScaledWidth();
+ int height = scaledresolution.getScaledHeight();
+
+ if(animationUtils == null) {
+ animationUtils = new SimpleAnimation(((1 / 12) * (width / 2 + 100)) + 75);
+ }
+
+ double completedSteps = (double) this.completedSteps;
+ double totalSteps = (double) this.totalSteps;
+
+
+
+ double progressPercentage = (completedSteps / totalSteps);
+ double calculatedProg = ((completedSteps / totalSteps) * ((double) width / 2 + 100)) + 75;
+ double progress = animationUtils.getValue();
+ animationUtils.setAnimation((int) calculatedProg, 12D);
+
+
+
+ int scaleFactor = scaledresolution.getScaleFactor();
+
+
+ Framebuffer framebuffer = new Framebuffer(scaledresolution.getScaledWidth() * scaleFactor,
+ scaledresolution.getScaledHeight() * scaleFactor, true);
+ framebuffer.bindFramebuffer(false);
+
+
+// DrawUtils.drawImage(new ResourceLocation("Athena/menu/wallpaper3.png"), 0, 0, width, height);
+
+// Thanks Mojang!
+
+ GlStateManager.matrixMode(GL11.GL_PROJECTION);
+ GlStateManager.loadIdentity();
+ GlStateManager.ortho(0.0D, scaledresolution.getScaledWidth(), scaledresolution.getScaledHeight(), 0.0D, 1000.0D, 3000.0D);
+ GlStateManager.matrixMode(GL11.GL_MODELVIEW);
+ GlStateManager.loadIdentity();
+ GlStateManager.translate(0.0F, 0.0F, -2000.0F);
+ GlStateManager.disableLighting();
+ GlStateManager.disableFog();
+ GlStateManager.disableDepth();
+ GlStateManager.enableTexture2D();
+
+
+ textureManager.bindTexture(new ResourceLocation("Athena/menu/wallpaper3.png"));
+
+ GlStateManager.resetColor();
+ GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+
+ Gui.drawScaledCustomSizeModalRect(0, 0, 0, 0, 1920, 1080, scaledresolution.getScaledWidth(), scaledresolution.getScaledHeight(), 1920, 1080);
+
+ textureManager.bindTexture(new ResourceLocation("Athena/logo/Athena.png"));
+
+ GlStateManager.resetColor();
+ GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+
+ Gui.drawModalRectWithCustomSizedTexture(width / 2 - 50, (height / 4 + 35) - 60, 0, 0, 100, 100, 100, 100);
+
+
+
+
+ FontManager.getProductSansBold(50).drawCenteredString(displayString, width / 2, height / 2 + 8, -1);
+
+// Draw progress
+
+ RoundedUtils.drawRoundedRect(width / 2 - 150, height / 2 + 50, width / 2 + 150, height / 2 + 65, 10, new Color(55, 55, 55).getRGB());
+ RoundedUtils.drawRoundedRect(width / 2 - 150, height / 2 + 50, (int) progress, height / 2 + 65, 10, new Color(92, 92, 92).getRGB());
+
+ framebuffer.unbindFramebuffer();
+
+ framebuffer.framebufferRender(scaledresolution.getScaledWidth() * scaleFactor, scaledresolution.getScaledHeight() * scaleFactor);
+
+ GlStateManager.enableAlpha();
+ GlStateManager.alphaFunc(GL11.GL_GREATER, 0.1F);
+ Minecraft.getMinecraft().updateDisplay();
+
+ }
+
+
+}