Commit b69587af82e99db9e3fc4798c16a1d2bc54bb77a
1 parent
219c0602
Add copyright headers to all source files
Showing
310 changed files
with
1947 additions
and
323 deletions
src/client/java/com/mumfrey/liteloader/ChatFilter.java
src/client/java/com/mumfrey/liteloader/ChatListener.java
src/client/java/com/mumfrey/liteloader/ChatRenderListener.java
src/client/java/com/mumfrey/liteloader/EntityRenderListener.java
src/client/java/com/mumfrey/liteloader/FrameBufferListener.java
src/client/java/com/mumfrey/liteloader/GameLoopListener.java
src/client/java/com/mumfrey/liteloader/HUDRenderListener.java
src/client/java/com/mumfrey/liteloader/InitCompleteListener.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader; |
2 | 7 | |
3 | -import net.minecraft.client.Minecraft; | |
4 | - | |
5 | 8 | import com.mumfrey.liteloader.core.LiteLoader; |
6 | 9 | |
10 | +import net.minecraft.client.Minecraft; | |
11 | + | |
7 | 12 | /** |
8 | 13 | * Interface for mods which need to initialise stuff once the game |
9 | 14 | * initialisation is completed, for example mods which need to register new | ... | ... |
src/client/java/com/mumfrey/liteloader/JoinGameListener.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader; |
2 | 7 | |
8 | +import com.mojang.realmsclient.dto.RealmsServer; | |
9 | + | |
3 | 10 | import net.minecraft.client.multiplayer.ServerData; |
4 | 11 | import net.minecraft.network.INetHandler; |
5 | 12 | import net.minecraft.network.play.server.SPacketJoinGame; |
6 | 13 | |
7 | -import com.mojang.realmsclient.dto.RealmsServer; | |
8 | - | |
9 | 14 | |
10 | 15 | /** |
11 | 16 | * Interface for mods which wish to be notified when the player connects to a | ... | ... |
src/client/java/com/mumfrey/liteloader/OutboundChatFilter.java
src/client/java/com/mumfrey/liteloader/OutboundChatListener.java
src/client/java/com/mumfrey/liteloader/PostLoginListener.java
src/client/java/com/mumfrey/liteloader/PostRenderListener.java
src/client/java/com/mumfrey/liteloader/PreRenderListener.java
src/client/java/com/mumfrey/liteloader/RenderListener.java
src/client/java/com/mumfrey/liteloader/ScreenshotListener.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader; |
2 | 7 | |
8 | +import com.mumfrey.liteloader.core.LiteLoaderEventBroker.ReturnValue; | |
9 | + | |
3 | 10 | import net.minecraft.client.shader.Framebuffer; |
4 | 11 | import net.minecraft.util.text.ITextComponent; |
5 | 12 | |
6 | -import com.mumfrey.liteloader.core.LiteLoaderEventBroker.ReturnValue; | |
7 | - | |
8 | 13 | /** |
9 | 14 | * Interface for mods which want to handle or inhibit the saving of screenshots |
10 | 15 | * | ... | ... |
src/client/java/com/mumfrey/liteloader/Tickable.java
src/client/java/com/mumfrey/liteloader/ViewportListener.java
src/client/java/com/mumfrey/liteloader/client/ClientPluginChannelsClient.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client; |
2 | 7 | |
3 | 8 | import com.mumfrey.liteloader.client.ducks.IClientNetLoginHandler; |
... | ... | @@ -12,8 +17,8 @@ import net.minecraft.network.login.INetHandlerLoginClient; |
12 | 17 | import net.minecraft.network.login.server.SPacketLoginSuccess; |
13 | 18 | import net.minecraft.network.play.INetHandlerPlayClient; |
14 | 19 | import net.minecraft.network.play.client.CPacketCustomPayload; |
15 | -import net.minecraft.network.play.server.SPacketJoinGame; | |
16 | 20 | import net.minecraft.network.play.server.SPacketCustomPayload; |
21 | +import net.minecraft.network.play.server.SPacketJoinGame; | |
17 | 22 | |
18 | 23 | /** |
19 | 24 | * Handler for client plugin channels | ... | ... |
src/client/java/com/mumfrey/liteloader/client/ClientProxy.java
src/client/java/com/mumfrey/liteloader/client/GameEngineClient.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client; |
2 | 7 | |
8 | +import java.util.ArrayList; | |
3 | 9 | import java.util.Arrays; |
4 | -import java.util.LinkedList; | |
5 | 10 | import java.util.List; |
6 | 11 | |
12 | +import com.mumfrey.liteloader.client.overlays.IMinecraft; | |
13 | +import com.mumfrey.liteloader.common.GameEngine; | |
14 | +import com.mumfrey.liteloader.common.Resources; | |
15 | + | |
7 | 16 | import net.minecraft.client.Minecraft; |
8 | 17 | import net.minecraft.client.audio.SoundHandler; |
9 | 18 | import net.minecraft.client.gui.GuiNewChat; |
... | ... | @@ -14,10 +23,6 @@ import net.minecraft.client.settings.KeyBinding; |
14 | 23 | import net.minecraft.profiler.Profiler; |
15 | 24 | import net.minecraft.server.integrated.IntegratedServer; |
16 | 25 | |
17 | -import com.mumfrey.liteloader.client.overlays.IMinecraft; | |
18 | -import com.mumfrey.liteloader.common.GameEngine; | |
19 | -import com.mumfrey.liteloader.common.Resources; | |
20 | - | |
21 | 26 | /** |
22 | 27 | * |
23 | 28 | * @author Adam Mummery-Smith |
... | ... | @@ -142,7 +147,7 @@ public class GameEngineClient implements GameEngine<Minecraft, IntegratedServer> |
142 | 147 | @Override |
143 | 148 | public List<KeyBinding> getKeyBindings() |
144 | 149 | { |
145 | - LinkedList<KeyBinding> keyBindings = new LinkedList<KeyBinding>(); | |
150 | + ArrayList<KeyBinding> keyBindings = new ArrayList<KeyBinding>(); | |
146 | 151 | keyBindings.addAll(Arrays.asList(this.engine.gameSettings.keyBindings)); |
147 | 152 | return keyBindings; |
148 | 153 | } | ... | ... |
src/client/java/com/mumfrey/liteloader/client/LiteLoaderCoreProviderClient.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client; |
2 | 7 | |
3 | -import net.minecraft.client.audio.SoundHandler; | |
4 | -import net.minecraft.client.resources.IResourceManager; | |
5 | -import net.minecraft.client.resources.IResourcePack; | |
6 | -import net.minecraft.client.resources.SimpleReloadableResourceManager; | |
7 | -import net.minecraft.network.INetHandler; | |
8 | -import net.minecraft.network.play.server.SPacketJoinGame; | |
9 | -import net.minecraft.world.World; | |
10 | - | |
11 | 8 | import com.mumfrey.liteloader.api.CoreProvider; |
12 | 9 | import com.mumfrey.liteloader.common.GameEngine; |
13 | 10 | import com.mumfrey.liteloader.common.Resources; |
... | ... | @@ -16,6 +13,14 @@ import com.mumfrey.liteloader.core.LiteLoaderMods; |
16 | 13 | import com.mumfrey.liteloader.launch.LoaderProperties; |
17 | 14 | import com.mumfrey.liteloader.resources.InternalResourcePack; |
18 | 15 | |
16 | +import net.minecraft.client.audio.SoundHandler; | |
17 | +import net.minecraft.client.resources.IResourceManager; | |
18 | +import net.minecraft.client.resources.IResourcePack; | |
19 | +import net.minecraft.client.resources.SimpleReloadableResourceManager; | |
20 | +import net.minecraft.network.INetHandler; | |
21 | +import net.minecraft.network.play.server.SPacketJoinGame; | |
22 | +import net.minecraft.world.World; | |
23 | + | |
19 | 24 | /** |
20 | 25 | * CoreProvider which fixes SoundManager derping up at startup |
21 | 26 | * | ... | ... |
src/client/java/com/mumfrey/liteloader/client/LiteLoaderEventBrokerClient.java
src/client/java/com/mumfrey/liteloader/client/LiteLoaderPanelManager.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client; |
2 | 7 | |
3 | -import net.minecraft.client.Minecraft; | |
4 | -import net.minecraft.client.gui.GuiIngameMenu; | |
5 | -import net.minecraft.client.gui.GuiMainMenu; | |
6 | -import net.minecraft.client.gui.GuiOptions; | |
7 | -import net.minecraft.client.gui.GuiScreen; | |
8 | -import net.minecraft.client.resources.I18n; | |
9 | - | |
10 | 8 | import org.lwjgl.input.Keyboard; |
11 | 9 | |
12 | 10 | import com.mumfrey.liteloader.client.gui.GuiLiteLoaderPanel; |
... | ... | @@ -20,6 +18,13 @@ import com.mumfrey.liteloader.launch.LoaderProperties; |
20 | 18 | import com.mumfrey.liteloader.modconfig.ConfigManager; |
21 | 19 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
22 | 20 | |
21 | +import net.minecraft.client.Minecraft; | |
22 | +import net.minecraft.client.gui.GuiIngameMenu; | |
23 | +import net.minecraft.client.gui.GuiMainMenu; | |
24 | +import net.minecraft.client.gui.GuiOptions; | |
25 | +import net.minecraft.client.gui.GuiScreen; | |
26 | +import net.minecraft.client.resources.I18n; | |
27 | + | |
23 | 28 | /** |
24 | 29 | * Observer which handles the display of the mod panel |
25 | 30 | * | ... | ... |
src/client/java/com/mumfrey/liteloader/client/PacketEventsClient.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client; |
2 | 7 | |
3 | 8 | import com.mojang.realmsclient.dto.RealmsServer; |
4 | -import com.mumfrey.liteloader.*; | |
9 | +import com.mumfrey.liteloader.ChatFilter; | |
10 | +import com.mumfrey.liteloader.ChatListener; | |
11 | +import com.mumfrey.liteloader.JoinGameListener; | |
12 | +import com.mumfrey.liteloader.PostLoginListener; | |
13 | +import com.mumfrey.liteloader.PreJoinGameListener; | |
5 | 14 | import com.mumfrey.liteloader.common.ducks.IChatPacket; |
6 | 15 | import com.mumfrey.liteloader.common.transformers.PacketEventInfo; |
7 | 16 | import com.mumfrey.liteloader.core.ClientPluginChannels; |
... | ... | @@ -23,11 +32,11 @@ import net.minecraft.network.Packet; |
23 | 32 | import net.minecraft.network.login.INetHandlerLoginClient; |
24 | 33 | import net.minecraft.network.login.server.SPacketLoginSuccess; |
25 | 34 | import net.minecraft.network.play.INetHandlerPlayClient; |
26 | -import net.minecraft.network.play.server.SPacketJoinGame; | |
27 | 35 | import net.minecraft.network.play.server.SPacketChat; |
28 | -import net.minecraft.util.text.TextComponentString; | |
29 | -import net.minecraft.util.text.ITextComponent; | |
36 | +import net.minecraft.network.play.server.SPacketJoinGame; | |
30 | 37 | import net.minecraft.util.IThreadListener; |
38 | +import net.minecraft.util.text.ITextComponent; | |
39 | +import net.minecraft.util.text.TextComponentString; | |
31 | 40 | |
32 | 41 | /** |
33 | 42 | * Client-side packet event handlers | ... | ... |
src/client/java/com/mumfrey/liteloader/client/ResourceObserver.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client; |
2 | 7 | |
3 | 8 | import java.io.File; |
4 | 9 | import java.util.HashMap; |
5 | 10 | import java.util.Map; |
6 | 11 | |
7 | -import net.minecraft.client.resources.IResourceManager; | |
8 | -import net.minecraft.client.resources.IResourcePack; | |
9 | - | |
10 | 12 | import com.mumfrey.liteloader.LiteMod; |
11 | 13 | import com.mumfrey.liteloader.api.ModLoadObserver; |
12 | 14 | import com.mumfrey.liteloader.common.Resources; |
... | ... | @@ -17,6 +19,9 @@ import com.mumfrey.liteloader.resources.ModResourcePack; |
17 | 19 | import com.mumfrey.liteloader.resources.ModResourcePackDir; |
18 | 20 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
19 | 21 | |
22 | +import net.minecraft.client.resources.IResourceManager; | |
23 | +import net.minecraft.client.resources.IResourcePack; | |
24 | + | |
20 | 25 | /** |
21 | 26 | * Observer which handles registering mods on the client as resource packs |
22 | 27 | * | ... | ... |
src/client/java/com/mumfrey/liteloader/client/ResourcesClient.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client; |
2 | 7 | |
3 | 8 | import java.util.HashMap; |
4 | 9 | import java.util.List; |
5 | 10 | import java.util.Map; |
6 | 11 | |
7 | -import net.minecraft.client.Minecraft; | |
8 | -import net.minecraft.client.resources.IResourceManager; | |
9 | -import net.minecraft.client.resources.IResourcePack; | |
10 | - | |
11 | 12 | import com.mumfrey.liteloader.client.overlays.IMinecraft; |
12 | 13 | import com.mumfrey.liteloader.common.LoadingProgress; |
13 | 14 | import com.mumfrey.liteloader.common.Resources; |
14 | 15 | |
16 | +import net.minecraft.client.Minecraft; | |
17 | +import net.minecraft.client.resources.IResourceManager; | |
18 | +import net.minecraft.client.resources.IResourcePack; | |
19 | + | |
15 | 20 | public class ResourcesClient implements Resources<IResourceManager, IResourcePack> |
16 | 21 | { |
17 | 22 | private final Minecraft engine = Minecraft.getMinecraft(); | ... | ... |
src/client/java/com/mumfrey/liteloader/client/SoundHandlerReloadInhibitor.java
src/client/java/com/mumfrey/liteloader/client/Translator.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client; |
2 | 7 | |
3 | -import net.minecraft.client.resources.I18n; | |
4 | - | |
5 | 8 | import com.mumfrey.liteloader.api.TranslationProvider; |
6 | 9 | |
10 | +import net.minecraft.client.resources.I18n; | |
11 | + | |
7 | 12 | public class Translator implements TranslationProvider |
8 | 13 | { |
9 | 14 | /* (non-Javadoc) | ... | ... |
src/client/java/com/mumfrey/liteloader/client/api/LiteLoaderBrandingProvider.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.api; |
2 | 7 | |
3 | 8 | import java.net.URI; |
4 | 9 | |
5 | -import net.minecraft.client.resources.I18n; | |
6 | -import net.minecraft.util.ResourceLocation; | |
7 | - | |
8 | 10 | import com.mumfrey.liteloader.api.BrandingProvider; |
9 | 11 | import com.mumfrey.liteloader.client.util.render.IconAbsolute; |
10 | 12 | import com.mumfrey.liteloader.core.LiteLoader; |
11 | 13 | import com.mumfrey.liteloader.util.render.Icon; |
12 | 14 | |
15 | +import net.minecraft.client.resources.I18n; | |
16 | +import net.minecraft.util.ResourceLocation; | |
17 | + | |
13 | 18 | /** |
14 | 19 | * LiteLoader's branding provider |
15 | 20 | * | ... | ... |
src/client/java/com/mumfrey/liteloader/client/api/LiteLoaderCoreAPIClient.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.api; |
2 | 7 | |
3 | 8 | import java.util.List; |
4 | 9 | |
5 | -import net.minecraft.client.Minecraft; | |
6 | -import net.minecraft.server.integrated.IntegratedServer; | |
7 | - | |
8 | 10 | import com.google.common.collect.ImmutableList; |
9 | 11 | import com.google.common.collect.ObjectArrays; |
10 | 12 | import com.mumfrey.liteloader.api.CoreProvider; |
... | ... | @@ -20,6 +22,9 @@ import com.mumfrey.liteloader.interfaces.ObjectFactory; |
20 | 22 | import com.mumfrey.liteloader.messaging.MessageBus; |
21 | 23 | import com.mumfrey.liteloader.transformers.event.json.ModEvents; |
22 | 24 | |
25 | +import net.minecraft.client.Minecraft; | |
26 | +import net.minecraft.server.integrated.IntegratedServer; | |
27 | + | |
23 | 28 | /** |
24 | 29 | * Client side of the core API |
25 | 30 | * | ... | ... |
src/client/java/com/mumfrey/liteloader/client/api/LiteLoaderModInfoDecorator.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.api; |
2 | 7 | |
3 | 8 | import java.util.List; |
4 | 9 | |
5 | -import net.minecraft.client.resources.I18n; | |
6 | - | |
7 | 10 | import com.mumfrey.liteloader.api.ModInfoDecorator; |
8 | 11 | import com.mumfrey.liteloader.client.gui.GuiLiteLoaderPanel; |
9 | 12 | import com.mumfrey.liteloader.client.gui.modlist.GuiModListPanel; |
... | ... | @@ -12,6 +15,8 @@ import com.mumfrey.liteloader.client.util.render.IconAbsoluteClickable; |
12 | 15 | import com.mumfrey.liteloader.core.ModInfo; |
13 | 16 | import com.mumfrey.liteloader.util.render.IconTextured; |
14 | 17 | |
18 | +import net.minecraft.client.resources.I18n; | |
19 | + | |
15 | 20 | /** |
16 | 21 | * ModInfo decorator |
17 | 22 | * | ... | ... |
src/client/java/com/mumfrey/liteloader/client/api/ObjectFactoryClient.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.api; |
2 | 7 | |
3 | -import net.minecraft.client.Minecraft; | |
4 | -import net.minecraft.client.gui.GuiScreen; | |
5 | -import net.minecraft.launchwrapper.Launch; | |
6 | -import net.minecraft.server.integrated.IntegratedServer; | |
7 | - | |
8 | -import com.mumfrey.liteloader.client.LiteLoaderEventBrokerClient; | |
9 | 8 | import com.mumfrey.liteloader.client.ClientPluginChannelsClient; |
10 | 9 | import com.mumfrey.liteloader.client.GameEngineClient; |
10 | +import com.mumfrey.liteloader.client.LiteLoaderEventBrokerClient; | |
11 | 11 | import com.mumfrey.liteloader.client.LiteLoaderPanelManager; |
12 | 12 | import com.mumfrey.liteloader.client.PacketEventsClient; |
13 | 13 | import com.mumfrey.liteloader.client.gui.startup.LoadingBar; |
14 | 14 | import com.mumfrey.liteloader.common.GameEngine; |
15 | 15 | import com.mumfrey.liteloader.core.ClientPluginChannels; |
16 | -import com.mumfrey.liteloader.core.LiteLoaderEventBroker; | |
17 | 16 | import com.mumfrey.liteloader.core.LiteLoader; |
17 | +import com.mumfrey.liteloader.core.LiteLoaderEventBroker; | |
18 | 18 | import com.mumfrey.liteloader.core.PacketEvents; |
19 | 19 | import com.mumfrey.liteloader.core.ServerPluginChannels; |
20 | -import com.mumfrey.liteloader.interfaces.PanelManager; | |
21 | 20 | import com.mumfrey.liteloader.interfaces.ObjectFactory; |
21 | +import com.mumfrey.liteloader.interfaces.PanelManager; | |
22 | 22 | import com.mumfrey.liteloader.launch.LoaderEnvironment; |
23 | 23 | import com.mumfrey.liteloader.launch.LoaderProperties; |
24 | 24 | import com.mumfrey.liteloader.permissions.PermissionsManagerClient; |
... | ... | @@ -26,6 +26,11 @@ import com.mumfrey.liteloader.permissions.PermissionsManagerServer; |
26 | 26 | import com.mumfrey.liteloader.util.Input; |
27 | 27 | import com.mumfrey.liteloader.util.InputManager; |
28 | 28 | |
29 | +import net.minecraft.client.Minecraft; | |
30 | +import net.minecraft.client.gui.GuiScreen; | |
31 | +import net.minecraft.launchwrapper.Launch; | |
32 | +import net.minecraft.server.integrated.IntegratedServer; | |
33 | + | |
29 | 34 | /** |
30 | 35 | * Factory for lifetime loader objects for the client side |
31 | 36 | * | ... | ... |
src/client/java/com/mumfrey/liteloader/client/ducks/IClientNetLoginHandler.java
src/client/java/com/mumfrey/liteloader/client/ducks/IFramebuffer.java
src/client/java/com/mumfrey/liteloader/client/ducks/IMutableRegistry.java
src/client/java/com/mumfrey/liteloader/client/ducks/IReloadable.java
src/client/java/com/mumfrey/liteloader/client/ducks/IRenderManager.java
src/client/java/com/mumfrey/liteloader/client/ducks/ITileEntityRendererDispatcher.java
src/client/java/com/mumfrey/liteloader/client/gui/GuiCheckbox.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.gui; |
2 | 7 | |
3 | 8 | import static com.mumfrey.liteloader.gl.GL.*; |
4 | -import net.minecraft.client.Minecraft; | |
5 | -import net.minecraft.client.gui.GuiButton; | |
6 | 9 | |
7 | 10 | import com.mumfrey.liteloader.client.api.LiteLoaderBrandingProvider; |
8 | 11 | |
12 | +import net.minecraft.client.Minecraft; | |
13 | +import net.minecraft.client.gui.GuiButton; | |
14 | + | |
9 | 15 | /** |
10 | 16 | * Super-simple implementation of a checkbox control |
11 | 17 | * | ... | ... |
src/client/java/com/mumfrey/liteloader/client/gui/GuiHoverLabel.java
src/client/java/com/mumfrey/liteloader/client/gui/GuiLiteLoaderPanel.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.gui; |
2 | 7 | |
3 | 8 | import static com.mumfrey.liteloader.gl.GL.*; |
... | ... | @@ -811,4 +816,4 @@ public class GuiLiteLoaderPanel extends GuiScreen |
811 | 816 | { |
812 | 817 | glDrawTexturedRect(x, y, icon.getIconWidth(), icon.getIconHeight(), icon.getMinU(), icon.getMinV(), icon.getMaxU(), icon.getMaxV(), alpha); |
813 | 818 | } |
814 | -} | |
815 | 819 | \ No newline at end of file |
820 | +} | ... | ... |
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanel.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.gui; |
2 | 7 | |
3 | 8 | import static com.mumfrey.liteloader.gl.GL.*; |
4 | 9 | |
5 | -import java.util.LinkedList; | |
10 | +import java.util.ArrayList; | |
6 | 11 | import java.util.List; |
7 | 12 | |
13 | +import com.mumfrey.liteloader.client.api.LiteLoaderBrandingProvider; | |
14 | + | |
8 | 15 | import net.minecraft.client.Minecraft; |
9 | 16 | import net.minecraft.client.gui.Gui; |
10 | 17 | import net.minecraft.client.gui.GuiButton; |
11 | 18 | |
12 | -import com.mumfrey.liteloader.client.api.LiteLoaderBrandingProvider; | |
13 | - | |
14 | 19 | /** |
15 | 20 | * Base class for panels |
16 | 21 | * |
... | ... | @@ -30,7 +35,7 @@ public abstract class GuiPanel extends Gui |
30 | 35 | /** |
31 | 36 | * Buttons |
32 | 37 | */ |
33 | - protected List<GuiButton> controls = new LinkedList<GuiButton>(); | |
38 | + protected List<GuiButton> controls = new ArrayList<GuiButton>(); | |
34 | 39 | |
35 | 40 | /** |
36 | 41 | * Current available width |
... | ... | @@ -100,7 +105,9 @@ public abstract class GuiPanel extends Gui |
100 | 105 | void draw(int mouseX, int mouseY, float partialTicks) |
101 | 106 | { |
102 | 107 | for (GuiButton control : this.controls) |
108 | + { | |
103 | 109 | control.drawButton(this.mc, mouseX, mouseY); |
110 | + } | |
104 | 111 | } |
105 | 112 | |
106 | 113 | /** |
... | ... | @@ -206,4 +213,4 @@ public abstract class GuiPanel extends Gui |
206 | 213 | glAlphaFunc(GL_GREATER, 0.1F); |
207 | 214 | glDisableBlend(); |
208 | 215 | } |
209 | -} | |
210 | 216 | \ No newline at end of file |
217 | +} | ... | ... |
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelAbout.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.gui; |
2 | 7 | |
3 | 8 | import java.net.URI; |
... | ... | @@ -6,12 +11,6 @@ import java.util.List; |
6 | 11 | import java.util.Set; |
7 | 12 | import java.util.TreeSet; |
8 | 13 | |
9 | -import net.minecraft.client.Minecraft; | |
10 | -import net.minecraft.client.gui.FontRenderer; | |
11 | -import net.minecraft.client.gui.GuiButton; | |
12 | -import net.minecraft.client.resources.I18n; | |
13 | -import net.minecraft.util.ResourceLocation; | |
14 | - | |
15 | 14 | import org.lwjgl.input.Keyboard; |
16 | 15 | |
17 | 16 | import com.mumfrey.liteloader.api.BrandingProvider; |
... | ... | @@ -22,6 +21,12 @@ import com.mumfrey.liteloader.core.LiteLoader; |
22 | 21 | import com.mumfrey.liteloader.util.SortableValue; |
23 | 22 | import com.mumfrey.liteloader.util.render.Icon; |
24 | 23 | |
24 | +import net.minecraft.client.Minecraft; | |
25 | +import net.minecraft.client.gui.FontRenderer; | |
26 | +import net.minecraft.client.gui.GuiButton; | |
27 | +import net.minecraft.client.resources.I18n; | |
28 | +import net.minecraft.util.ResourceLocation; | |
29 | + | |
25 | 30 | /** |
26 | 31 | * "About LiteLoader" panel which docks in the mod info screen and lists |
27 | 32 | * information about the installed APIs. | ... | ... |
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelConfigContainer.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.gui; |
2 | 7 | |
3 | 8 | import static com.mumfrey.liteloader.gl.GL.*; |
4 | 9 | import static com.mumfrey.liteloader.gl.GLClippingPlanes.*; |
5 | -import net.minecraft.client.Minecraft; | |
6 | -import net.minecraft.client.gui.GuiButton; | |
7 | -import net.minecraft.client.resources.I18n; | |
8 | 10 | |
9 | 11 | import com.mumfrey.liteloader.LiteMod; |
10 | 12 | import com.mumfrey.liteloader.modconfig.ConfigPanel; |
11 | 13 | import com.mumfrey.liteloader.modconfig.ConfigPanelHost; |
12 | 14 | |
15 | +import net.minecraft.client.Minecraft; | |
16 | +import net.minecraft.client.gui.GuiButton; | |
17 | +import net.minecraft.client.resources.I18n; | |
18 | + | |
13 | 19 | /** |
14 | 20 | * Config panel container, this handles drawing the configuration panel chrome |
15 | 21 | * and also hosts the configuration panels themselves to support scrolling and | ... | ... |
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelError.java
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelLiteLoaderLog.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.gui; |
2 | 7 | |
3 | 8 | import static com.mumfrey.liteloader.gl.GL.*; |
... | ... | @@ -6,18 +11,18 @@ import java.net.URI; |
6 | 11 | import java.util.ArrayList; |
7 | 12 | import java.util.List; |
8 | 13 | |
9 | -import net.minecraft.client.Minecraft; | |
10 | -import net.minecraft.client.gui.GuiButton; | |
11 | -import net.minecraft.client.gui.ScaledResolution; | |
12 | -import net.minecraft.client.resources.I18n; | |
13 | -import net.minecraft.util.Session; | |
14 | - | |
15 | 14 | import org.lwjgl.input.Keyboard; |
16 | 15 | |
17 | 16 | import com.mumfrey.liteloader.core.LiteLoader; |
18 | 17 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
19 | 18 | import com.mumfrey.liteloader.util.net.LiteLoaderLogUpload; |
20 | 19 | |
20 | +import net.minecraft.client.Minecraft; | |
21 | +import net.minecraft.client.gui.GuiButton; | |
22 | +import net.minecraft.client.gui.ScaledResolution; | |
23 | +import net.minecraft.client.resources.I18n; | |
24 | +import net.minecraft.util.Session; | |
25 | + | |
21 | 26 | /** |
22 | 27 | * |
23 | 28 | * @author Adam Mummery-Smith | ... | ... |
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelMods.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.gui; |
2 | 7 | |
3 | 8 | import static com.mumfrey.liteloader.gl.GL.*; |
... | ... | @@ -5,10 +10,6 @@ import static com.mumfrey.liteloader.gl.GLClippingPlanes.*; |
5 | 10 | |
6 | 11 | import java.util.List; |
7 | 12 | |
8 | -import net.minecraft.client.Minecraft; | |
9 | -import net.minecraft.client.gui.GuiButton; | |
10 | -import net.minecraft.client.resources.I18n; | |
11 | - | |
12 | 13 | import org.lwjgl.input.Keyboard; |
13 | 14 | |
14 | 15 | import com.mumfrey.liteloader.LiteMod; |
... | ... | @@ -20,6 +21,10 @@ import com.mumfrey.liteloader.launch.LoaderEnvironment; |
20 | 21 | import com.mumfrey.liteloader.modconfig.ConfigManager; |
21 | 22 | import com.mumfrey.liteloader.modconfig.ConfigPanel; |
22 | 23 | |
24 | +import net.minecraft.client.Minecraft; | |
25 | +import net.minecraft.client.gui.GuiButton; | |
26 | +import net.minecraft.client.resources.I18n; | |
27 | + | |
23 | 28 | /** |
24 | 29 | * Mods panel |
25 | 30 | * | ... | ... |
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelSettings.java
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelUpdateCheck.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.gui; |
2 | 7 | |
3 | 8 | import java.net.URI; |
4 | 9 | |
5 | -import net.minecraft.client.Minecraft; | |
6 | -import net.minecraft.client.gui.FontRenderer; | |
7 | -import net.minecraft.client.gui.GuiButton; | |
8 | -import net.minecraft.client.gui.ScaledResolution; | |
9 | -import net.minecraft.client.resources.I18n; | |
10 | - | |
11 | 10 | import org.lwjgl.input.Keyboard; |
12 | 11 | |
13 | 12 | import com.mumfrey.liteloader.core.LiteLoaderUpdateSite; |
... | ... | @@ -15,6 +14,12 @@ import com.mumfrey.liteloader.launch.ClassPathUtilities; |
15 | 14 | import com.mumfrey.liteloader.launch.LoaderProperties; |
16 | 15 | import com.mumfrey.liteloader.update.UpdateSite; |
17 | 16 | |
17 | +import net.minecraft.client.Minecraft; | |
18 | +import net.minecraft.client.gui.FontRenderer; | |
19 | +import net.minecraft.client.gui.GuiButton; | |
20 | +import net.minecraft.client.gui.ScaledResolution; | |
21 | +import net.minecraft.client.resources.I18n; | |
22 | + | |
18 | 23 | /** |
19 | 24 | * "Check for updates" panel which docks in the mod info screen |
20 | 25 | * | ... | ... |
src/client/java/com/mumfrey/liteloader/client/gui/GuiScrollPanel.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.gui; |
2 | 7 | |
3 | 8 | import static com.mumfrey.liteloader.gl.GL.*; |
4 | 9 | import static com.mumfrey.liteloader.gl.GLClippingPlanes.*; |
5 | -import net.minecraft.client.Minecraft; | |
6 | -import net.minecraft.client.gui.GuiButton; | |
7 | 10 | |
8 | 11 | import org.lwjgl.input.Keyboard; |
9 | 12 | |
13 | +import net.minecraft.client.Minecraft; | |
14 | +import net.minecraft.client.gui.GuiButton; | |
15 | + | |
10 | 16 | /** |
11 | 17 | * Basic non-interactive scrollable panel using OpenGL clipping planes |
12 | 18 | * | ... | ... |
src/client/java/com/mumfrey/liteloader/client/gui/GuiSimpleScrollBar.java
src/client/java/com/mumfrey/liteloader/client/gui/ScrollPanelContent.java
src/client/java/com/mumfrey/liteloader/client/gui/modlist/GuiModInfoPanel.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.gui.modlist; |
2 | 7 | |
3 | 8 | import static com.mumfrey.liteloader.gl.GL.*; |
4 | 9 | import static com.mumfrey.liteloader.gl.GLClippingPlanes.*; |
5 | -import net.minecraft.client.Minecraft; | |
6 | -import net.minecraft.client.gui.FontRenderer; | |
7 | -import net.minecraft.client.gui.Gui; | |
8 | -import net.minecraft.client.resources.I18n; | |
9 | 10 | |
10 | 11 | import com.google.common.base.Strings; |
11 | 12 | import com.mumfrey.liteloader.client.api.LiteLoaderBrandingProvider; |
... | ... | @@ -14,6 +15,11 @@ import com.mumfrey.liteloader.client.util.render.IconAbsolute; |
14 | 15 | import com.mumfrey.liteloader.core.ModInfo; |
15 | 16 | import com.mumfrey.liteloader.util.render.IconTextured; |
16 | 17 | |
18 | +import net.minecraft.client.Minecraft; | |
19 | +import net.minecraft.client.gui.FontRenderer; | |
20 | +import net.minecraft.client.gui.Gui; | |
21 | +import net.minecraft.client.resources.I18n; | |
22 | + | |
17 | 23 | public class GuiModInfoPanel extends Gui |
18 | 24 | { |
19 | 25 | private static final int TITLE_COLOUR = GuiModListPanel.WHITE; | ... | ... |
src/client/java/com/mumfrey/liteloader/client/gui/modlist/GuiModListPanel.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.gui.modlist; |
2 | 7 | |
3 | 8 | import static com.mumfrey.liteloader.gl.GL.*; |
... | ... | @@ -6,16 +11,16 @@ import static com.mumfrey.liteloader.gl.GLClippingPlanes.*; |
6 | 11 | import java.util.ArrayList; |
7 | 12 | import java.util.List; |
8 | 13 | |
9 | -import net.minecraft.client.Minecraft; | |
10 | -import net.minecraft.client.gui.FontRenderer; | |
11 | -import net.minecraft.client.gui.Gui; | |
12 | - | |
13 | 14 | import com.mumfrey.liteloader.api.ModInfoDecorator; |
14 | 15 | import com.mumfrey.liteloader.client.gui.GuiLiteLoaderPanel; |
15 | 16 | import com.mumfrey.liteloader.core.ModInfo; |
16 | 17 | import com.mumfrey.liteloader.util.render.IconClickable; |
17 | 18 | import com.mumfrey.liteloader.util.render.IconTextured; |
18 | 19 | |
20 | +import net.minecraft.client.Minecraft; | |
21 | +import net.minecraft.client.gui.FontRenderer; | |
22 | +import net.minecraft.client.gui.Gui; | |
23 | + | |
19 | 24 | public class GuiModListPanel extends Gui |
20 | 25 | { |
21 | 26 | static final int BLACK = 0xFF000000; | ... | ... |
src/client/java/com/mumfrey/liteloader/client/gui/modlist/GuiModListPanelInvalid.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.gui.modlist; |
2 | 7 | |
3 | 8 | import java.util.List; |
4 | 9 | |
5 | -import net.minecraft.client.gui.FontRenderer; | |
6 | - | |
7 | 10 | import com.mumfrey.liteloader.api.ModInfoDecorator; |
8 | 11 | import com.mumfrey.liteloader.core.ModInfo; |
9 | 12 | |
13 | +import net.minecraft.client.gui.FontRenderer; | |
14 | + | |
10 | 15 | public class GuiModListPanelInvalid extends GuiModListPanel |
11 | 16 | { |
12 | 17 | private static final int BAD_PANEL_HEIGHT = 22; | ... | ... |
src/client/java/com/mumfrey/liteloader/client/gui/modlist/ModList.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.gui.modlist; |
2 | 7 | |
3 | 8 | import java.util.ArrayList; |
... | ... | @@ -5,9 +10,6 @@ import java.util.List; |
5 | 10 | import java.util.Map; |
6 | 11 | import java.util.TreeMap; |
7 | 12 | |
8 | -import net.minecraft.client.Minecraft; | |
9 | -import net.minecraft.client.resources.I18n; | |
10 | - | |
11 | 13 | import org.lwjgl.input.Keyboard; |
12 | 14 | |
13 | 15 | import com.mumfrey.liteloader.LiteMod; |
... | ... | @@ -20,6 +22,9 @@ import com.mumfrey.liteloader.interfaces.LoadableMod; |
20 | 22 | import com.mumfrey.liteloader.launch.LoaderEnvironment; |
21 | 23 | import com.mumfrey.liteloader.modconfig.ConfigManager; |
22 | 24 | |
25 | +import net.minecraft.client.Minecraft; | |
26 | +import net.minecraft.client.resources.I18n; | |
27 | + | |
23 | 28 | public class ModList |
24 | 29 | { |
25 | 30 | private final ModListContainer container; | ... | ... |
src/client/java/com/mumfrey/liteloader/client/gui/modlist/ModListContainer.java
src/client/java/com/mumfrey/liteloader/client/gui/modlist/ModListEntry.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.gui.modlist; |
2 | 7 | |
3 | 8 | import java.util.List; |
4 | 9 | import java.util.Set; |
5 | 10 | |
6 | -import net.minecraft.client.gui.FontRenderer; | |
7 | -import net.minecraft.client.resources.I18n; | |
8 | - | |
9 | 11 | import com.mumfrey.liteloader.LiteMod; |
10 | 12 | import com.mumfrey.liteloader.api.ModInfoDecorator; |
11 | 13 | import com.mumfrey.liteloader.core.LiteLoaderMods; |
... | ... | @@ -14,6 +16,9 @@ import com.mumfrey.liteloader.interfaces.Loadable; |
14 | 16 | import com.mumfrey.liteloader.interfaces.LoadableMod; |
15 | 17 | import com.mumfrey.liteloader.launch.LoaderEnvironment; |
16 | 18 | |
19 | +import net.minecraft.client.gui.FontRenderer; | |
20 | +import net.minecraft.client.resources.I18n; | |
21 | + | |
17 | 22 | /** |
18 | 23 | * Represents a mod in the mod info screen, keeps track of mod information and |
19 | 24 | * provides methods for displaying the mod in the mod list and drawing the | ... | ... |
src/client/java/com/mumfrey/liteloader/client/gui/startup/LoadingBar.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.gui.startup; |
2 | 7 | |
3 | 8 | import static com.mumfrey.liteloader.gl.GL.*; |
... | ... | @@ -10,6 +15,11 @@ import java.util.List; |
10 | 15 | |
11 | 16 | import javax.imageio.ImageIO; |
12 | 17 | |
18 | +import org.lwjgl.opengl.Display; | |
19 | + | |
20 | +import com.mumfrey.liteloader.common.LoadingProgress; | |
21 | +import com.mumfrey.liteloader.util.log.LiteLoaderLogger; | |
22 | + | |
13 | 23 | import net.minecraft.client.Minecraft; |
14 | 24 | import net.minecraft.client.gui.FontRenderer; |
15 | 25 | import net.minecraft.client.gui.ScaledResolution; |
... | ... | @@ -23,11 +33,6 @@ import net.minecraft.client.resources.IResourceManager; |
23 | 33 | import net.minecraft.client.shader.Framebuffer; |
24 | 34 | import net.minecraft.util.ResourceLocation; |
25 | 35 | |
26 | -import org.lwjgl.opengl.Display; | |
27 | - | |
28 | -import com.mumfrey.liteloader.common.LoadingProgress; | |
29 | -import com.mumfrey.liteloader.util.log.LiteLoaderLogger; | |
30 | - | |
31 | 36 | /** |
32 | 37 | * Crappy implementation of a "Mojang Screen" loading bar |
33 | 38 | * | ... | ... |
src/client/java/com/mumfrey/liteloader/client/mixin/MixinEntityPlayerSP.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinEntityRenderer.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinFramebuffer.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinGuiIngame.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinIntegratedServer.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinMinecraft.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinNetHandlerLoginClient.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinRealmsMainScreen.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinRegistryNamespaced.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinRegistrySimple.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinRenderManager.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinScreenShotHelper.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.mixin; |
2 | 7 | |
3 | 8 | import java.io.File; |
... | ... | @@ -10,8 +15,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; |
10 | 15 | import com.mumfrey.liteloader.client.ClientProxy; |
11 | 16 | |
12 | 17 | import net.minecraft.client.shader.Framebuffer; |
13 | -import net.minecraft.util.text.ITextComponent; | |
14 | 18 | import net.minecraft.util.ScreenShotHelper; |
19 | +import net.minecraft.util.text.ITextComponent; | |
15 | 20 | |
16 | 21 | @Mixin(ScreenShotHelper.class) |
17 | 22 | public abstract class MixinScreenShotHelper | ... | ... |
src/client/java/com/mumfrey/liteloader/client/mixin/MixinSession.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinSimpleReloadableResourceManager.java
src/client/java/com/mumfrey/liteloader/client/mixin/MixinTileEntityRendererDispatcher.java
src/client/java/com/mumfrey/liteloader/client/overlays/IEntityRenderer.java
src/client/java/com/mumfrey/liteloader/client/overlays/IGuiTextField.java
src/client/java/com/mumfrey/liteloader/client/overlays/IMinecraft.java
src/client/java/com/mumfrey/liteloader/client/overlays/ISoundHandler.java
src/client/java/com/mumfrey/liteloader/client/transformers/CrashReportTransformer.java
src/client/java/com/mumfrey/liteloader/client/transformers/MinecraftTransformer.java
src/client/java/com/mumfrey/liteloader/client/util/PrivateFieldsClient.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.util; |
2 | 7 | |
3 | 8 | import java.util.Map; |
... | ... | @@ -19,4 +24,4 @@ public final class PrivateFieldsClient<P, T> extends PrivateFields<P, T> |
19 | 24 | |
20 | 25 | public static final PrivateFieldsClient<TileEntity, Map> tileEntityNameToClassMap = new PrivateFieldsClient<TileEntity, Map>(TileEntity.class, Obf.tileEntityNameToClassMap); |
21 | 26 | public static final PrivateFieldsClient<TileEntity, Map> tileEntityClassToNameMap = new PrivateFieldsClient<TileEntity, Map>(TileEntity.class, Obf.tileEntityClassToNameMap); |
22 | -} | |
23 | 27 | \ No newline at end of file |
28 | +} | ... | ... |
src/client/java/com/mumfrey/liteloader/client/util/render/IconAbsolute.java
src/client/java/com/mumfrey/liteloader/client/util/render/IconAbsoluteClickable.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.client.util.render; |
2 | 7 | |
3 | -import net.minecraft.util.ResourceLocation; | |
4 | - | |
5 | 8 | import com.mumfrey.liteloader.util.render.IconClickable; |
6 | 9 | |
10 | +import net.minecraft.util.ResourceLocation; | |
11 | + | |
7 | 12 | public abstract class IconAbsoluteClickable extends IconAbsolute implements IconClickable |
8 | 13 | { |
9 | 14 | public IconAbsoluteClickable(ResourceLocation textureResource, String displayText, int width, int height, float uCoord, float vCoord, | ... | ... |
src/client/java/com/mumfrey/liteloader/client/util/render/IconTiled.java
src/client/java/com/mumfrey/liteloader/gl/GL.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.gl; |
2 | 7 | |
3 | 8 | import java.nio.ByteBuffer; |
... | ... | @@ -5,6 +10,9 @@ import java.nio.DoubleBuffer; |
5 | 10 | import java.nio.FloatBuffer; |
6 | 11 | import java.nio.IntBuffer; |
7 | 12 | |
13 | +import org.lwjgl.opengl.GL11; | |
14 | +import org.lwjgl.util.glu.GLU; | |
15 | + | |
8 | 16 | import net.minecraft.client.renderer.GlStateManager; |
9 | 17 | import net.minecraft.client.renderer.GlStateManager.CullFace; |
10 | 18 | import net.minecraft.client.renderer.GlStateManager.FogMode; |
... | ... | @@ -12,9 +20,6 @@ import net.minecraft.client.renderer.GlStateManager.TexGen; |
12 | 20 | import net.minecraft.client.renderer.vertex.DefaultVertexFormats; |
13 | 21 | import net.minecraft.client.renderer.vertex.VertexFormat; |
14 | 22 | |
15 | -import org.lwjgl.opengl.GL11; | |
16 | -import org.lwjgl.util.glu.GLU; | |
17 | - | |
18 | 23 | /** |
19 | 24 | * Convenience class for working with Mojang's GLStateManager: |
20 | 25 | * | ... | ... |
src/client/java/com/mumfrey/liteloader/gl/GLClippingPlanes.java
src/client/java/com/mumfrey/liteloader/resources/InternalResourcePack.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.resources; |
2 | 7 | |
3 | 8 | import java.awt.image.BufferedImage; |
... | ... | @@ -47,7 +52,9 @@ public class InternalResourcePack implements IResourcePack |
47 | 52 | this.resourceClass = resourceClass; |
48 | 53 | |
49 | 54 | for (String domain : domains) |
55 | + { | |
50 | 56 | this.resourceDomains.add(domain); |
57 | + } | |
51 | 58 | } |
52 | 59 | |
53 | 60 | /* (non-Javadoc) | ... | ... |
src/client/java/com/mumfrey/liteloader/resources/ModResourcePack.java
src/client/java/com/mumfrey/liteloader/resources/ModResourcePackDir.java
src/client/java/com/mumfrey/liteloader/util/InputManager.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.util; |
2 | 7 | |
3 | 8 | import java.io.File; |
... | ... | @@ -12,6 +17,12 @@ import java.util.Map; |
12 | 17 | import java.util.Properties; |
13 | 18 | import java.util.Set; |
14 | 19 | |
20 | +import com.mumfrey.liteloader.common.GameEngine; | |
21 | +import com.mumfrey.liteloader.core.LiteLoader; | |
22 | +import com.mumfrey.liteloader.launch.LoaderEnvironment; | |
23 | +import com.mumfrey.liteloader.launch.LoaderProperties; | |
24 | +import com.mumfrey.liteloader.util.jinput.ComponentRegistry; | |
25 | + | |
15 | 26 | import net.java.games.input.Component; |
16 | 27 | import net.java.games.input.Controller; |
17 | 28 | import net.java.games.input.Event; |
... | ... | @@ -19,12 +30,6 @@ import net.java.games.input.EventQueue; |
19 | 30 | import net.minecraft.client.settings.KeyBinding; |
20 | 31 | import net.minecraft.profiler.Profiler; |
21 | 32 | |
22 | -import com.mumfrey.liteloader.common.GameEngine; | |
23 | -import com.mumfrey.liteloader.core.LiteLoader; | |
24 | -import com.mumfrey.liteloader.launch.LoaderEnvironment; | |
25 | -import com.mumfrey.liteloader.launch.LoaderProperties; | |
26 | -import com.mumfrey.liteloader.util.jinput.ComponentRegistry; | |
27 | - | |
28 | 33 | /** |
29 | 34 | * Mod input class, aggregates functionality from LiteLoader's mod key |
30 | 35 | * registration functions and JInputLib. |
... | ... | @@ -324,7 +329,9 @@ public final class InputManager extends Input |
324 | 329 | { |
325 | 330 | Set<Controller> allControllers = new HashSet<Controller>(); |
326 | 331 | for (Controller controller : this.pollControllers) |
332 | + { | |
327 | 333 | allControllers.add(controller); |
334 | + } | |
328 | 335 | return allControllers; |
329 | 336 | } |
330 | 337 | ... | ... |
src/client/java/com/mumfrey/liteloader/util/ModUtilities.java
src/debug/java/com/mumfrey/liteloader/debug/Start.java
... | ... | @@ -123,7 +123,6 @@ public abstract class Start |
123 | 123 | |
124 | 124 | File gameDir = new File(System.getProperty("user.dir")); |
125 | 125 | File assetsDir = new File(gameDir, "assets"); |
126 | - File assetIndexDir = new File(assetsDir, "indexes"); | |
127 | 126 | |
128 | 127 | Start.addArg(qualifiedArgs, "--tweakClass", LiteLoaderTweaker.class.getName()); |
129 | 128 | Start.addArg(qualifiedArgs, "--username", loginManager.getProfileName()); |
... | ... | @@ -131,10 +130,10 @@ public abstract class Start |
131 | 130 | Start.addArg(qualifiedArgs, "--accessToken", loginManager.getAuthenticatedToken()); |
132 | 131 | Start.addArg(qualifiedArgs, "--userType", loginManager.getUserType()); |
133 | 132 | Start.addArg(qualifiedArgs, "--userProperties", loginManager.getUserProperties()); |
134 | - Start.addArg(qualifiedArgs, "--version", "mcp", true); | |
135 | - Start.addArg(qualifiedArgs, "--gameDir", gameDir.getAbsolutePath(), true); | |
136 | - Start.addArg(qualifiedArgs, "--assetIndex", LiteLoaderTweaker.VERSION, true); | |
137 | - Start.addArg(qualifiedArgs, "--assetsDir", assetsDir.getAbsolutePath(), !assetIndexDir.exists()); | |
133 | + Start.addArg(qualifiedArgs, "--version", "mcp"); | |
134 | + Start.addArg(qualifiedArgs, "--gameDir", gameDir.getAbsolutePath()); | |
135 | + Start.addArg(qualifiedArgs, "--assetIndex", LiteLoaderTweaker.VERSION); | |
136 | + Start.addArg(qualifiedArgs, "--assetsDir", assetsDir.getAbsolutePath()); | |
138 | 137 | } |
139 | 138 | |
140 | 139 | private static void addRequiredArgsServer(String[] args, List<String> unqualifiedArgs, Map<String, Set<String>> qualifiedArgs) |
... | ... | @@ -163,22 +162,13 @@ public abstract class Start |
163 | 162 | |
164 | 163 | private static void addArg(Map<String, Set<String>> qualifiedArgs, String qualifier, String arg) |
165 | 164 | { |
166 | - Start.addArg(qualifiedArgs, qualifier, arg, false); | |
167 | - } | |
168 | - | |
169 | - private static void addArg(Map<String, Set<String>> qualifiedArgs, String qualifier, String arg, boolean skipExisting) | |
170 | - { | |
171 | 165 | Set<String> args = qualifiedArgs.get(qualifier); |
172 | - | |
166 | + | |
173 | 167 | if (args == null) |
174 | 168 | { |
175 | 169 | args = new HashSet<String>(); |
176 | 170 | qualifiedArgs.put(qualifier, args); |
177 | 171 | } |
178 | - else if (skipExisting) | |
179 | - { | |
180 | - return; | |
181 | - } | |
182 | 172 | |
183 | 173 | if (!Start.MULTI_VALUE_ARGS.contains(qualifier)) |
184 | 174 | { | ... | ... |
src/main/java/com/mumfrey/liteloader/Configurable.java
src/main/java/com/mumfrey/liteloader/LiteMod.java
src/main/java/com/mumfrey/liteloader/PacketHandler.java
src/main/java/com/mumfrey/liteloader/Permissible.java
src/main/java/com/mumfrey/liteloader/PlayerInteractionListener.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader; |
2 | 7 | |
3 | 8 | import net.minecraft.entity.player.EntityPlayerMP; |
4 | 9 | import net.minecraft.item.ItemStack; |
5 | -import net.minecraft.util.math.BlockPos; | |
6 | 10 | import net.minecraft.util.EnumFacing; |
7 | 11 | import net.minecraft.util.EnumHand; |
12 | +import net.minecraft.util.math.BlockPos; | |
8 | 13 | import net.minecraft.util.math.RayTraceResult.Type; |
9 | 14 | |
10 | 15 | /** | ... | ... |
src/main/java/com/mumfrey/liteloader/PlayerMoveListener.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader; |
2 | 7 | |
3 | -import net.minecraft.entity.player.EntityPlayerMP; | |
4 | - | |
5 | 8 | import com.mumfrey.liteloader.core.LiteLoaderEventBroker.ReturnValue; |
6 | 9 | import com.mumfrey.liteloader.util.Position; |
7 | 10 | |
11 | +import net.minecraft.entity.player.EntityPlayerMP; | |
12 | + | |
8 | 13 | /** |
9 | 14 | * Interface for mods which want to monitor or control player movements |
10 | 15 | * | ... | ... |
src/main/java/com/mumfrey/liteloader/PluginChannelListener.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader; |
2 | 7 | |
3 | -import net.minecraft.network.PacketBuffer; | |
4 | - | |
5 | 8 | import com.mumfrey.liteloader.core.CommonPluginChannelListener; |
6 | 9 | |
10 | +import net.minecraft.network.PacketBuffer; | |
11 | + | |
7 | 12 | /** |
8 | 13 | * Interface for mods which want to use plugin channels |
9 | 14 | * | ... | ... |
src/main/java/com/mumfrey/liteloader/PreJoinGameListener.java
src/main/java/com/mumfrey/liteloader/Priority.java
src/main/java/com/mumfrey/liteloader/ServerChatFilter.java
src/main/java/com/mumfrey/liteloader/ServerCommandProvider.java
src/main/java/com/mumfrey/liteloader/ServerPlayerListener.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader; |
2 | 7 | |
3 | -import net.minecraft.entity.player.EntityPlayerMP; | |
4 | - | |
5 | 8 | import com.mojang.authlib.GameProfile; |
6 | 9 | |
10 | +import net.minecraft.entity.player.EntityPlayerMP; | |
11 | + | |
7 | 12 | /** |
8 | 13 | * Interface for mods which want to handle players joining and leaving a LAN |
9 | 14 | * game (or single player game) | ... | ... |
src/main/java/com/mumfrey/liteloader/ServerPluginChannelListener.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader; |
2 | 7 | |
8 | +import com.mumfrey.liteloader.core.CommonPluginChannelListener; | |
9 | + | |
3 | 10 | import net.minecraft.entity.player.EntityPlayerMP; |
4 | 11 | import net.minecraft.network.PacketBuffer; |
5 | 12 | |
6 | -import com.mumfrey.liteloader.core.CommonPluginChannelListener; | |
7 | - | |
8 | 13 | /** |
9 | 14 | * Interface for mods which want to use plugin channels on the (integrated) |
10 | 15 | * server side. | ... | ... |
src/main/java/com/mumfrey/liteloader/ServerTickable.java
src/main/java/com/mumfrey/liteloader/ShutdownListener.java
src/main/java/com/mumfrey/liteloader/api/BrandingProvider.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.api; |
2 | 7 | |
3 | 8 | import java.net.URI; |
4 | 9 | |
5 | -import net.minecraft.util.ResourceLocation; | |
6 | - | |
7 | 10 | import com.mumfrey.liteloader.util.render.Icon; |
8 | 11 | |
12 | +import net.minecraft.util.ResourceLocation; | |
13 | + | |
9 | 14 | /** |
10 | 15 | * LiteLoader Extensible API - Branding Provider |
11 | 16 | * | ... | ... |
src/main/java/com/mumfrey/liteloader/api/ContainerRegistry.java
src/main/java/com/mumfrey/liteloader/api/CoreProvider.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.api; |
2 | 7 | |
3 | -import net.minecraft.network.INetHandler; | |
4 | -import net.minecraft.network.play.server.SPacketJoinGame; | |
5 | - | |
6 | 8 | import com.mumfrey.liteloader.common.GameEngine; |
7 | 9 | import com.mumfrey.liteloader.core.LiteLoaderMods; |
8 | 10 | |
11 | +import net.minecraft.network.INetHandler; | |
12 | +import net.minecraft.network.play.server.SPacketJoinGame; | |
13 | + | |
9 | 14 | /** |
10 | 15 | * LiteLoader Extensible API - API Core Provider |
11 | 16 | * | ... | ... |
src/main/java/com/mumfrey/liteloader/api/CustomisationProvider.java
src/main/java/com/mumfrey/liteloader/api/EnumerationObserver.java
src/main/java/com/mumfrey/liteloader/api/EnumeratorModule.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.api; |
2 | 7 | |
3 | 8 | import com.mumfrey.liteloader.interfaces.ModularEnumerator; |
... | ... | @@ -65,4 +70,4 @@ public interface EnumeratorModule |
65 | 70 | * @param classLoader |
66 | 71 | */ |
67 | 72 | public abstract void registerMods(ModularEnumerator enumerator, LaunchClassLoader classLoader); |
68 | -} | |
69 | 73 | \ No newline at end of file |
74 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/api/EnumeratorPlugin.java
src/main/java/com/mumfrey/liteloader/api/GenericObserver.java
src/main/java/com/mumfrey/liteloader/api/InterfaceObserver.java
src/main/java/com/mumfrey/liteloader/api/InterfaceProvider.java
src/main/java/com/mumfrey/liteloader/api/Listener.java
src/main/java/com/mumfrey/liteloader/api/LiteAPI.java
src/main/java/com/mumfrey/liteloader/api/MixinConfigProvider.java
src/main/java/com/mumfrey/liteloader/api/ModClassValidator.java
src/main/java/com/mumfrey/liteloader/api/ModInfoDecorator.java
src/main/java/com/mumfrey/liteloader/api/ModLoadObserver.java
src/main/java/com/mumfrey/liteloader/api/Observer.java
src/main/java/com/mumfrey/liteloader/api/PostRenderObserver.java
src/main/java/com/mumfrey/liteloader/api/ShutdownObserver.java
src/main/java/com/mumfrey/liteloader/api/TickObserver.java
src/main/java/com/mumfrey/liteloader/api/TranslationProvider.java
src/main/java/com/mumfrey/liteloader/api/WorldObserver.java
src/main/java/com/mumfrey/liteloader/api/exceptions/APIException.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.api.exceptions; |
2 | 7 | |
3 | 8 | public abstract class APIException extends RuntimeException |
... | ... | @@ -24,4 +29,4 @@ public abstract class APIException extends RuntimeException |
24 | 29 | super(message, cause); |
25 | 30 | } |
26 | 31 | |
27 | -} | |
28 | 32 | \ No newline at end of file |
33 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/api/exceptions/InvalidAPIException.java
src/main/java/com/mumfrey/liteloader/api/exceptions/InvalidAPIStateException.java
src/main/java/com/mumfrey/liteloader/api/exceptions/InvalidProviderException.java
src/main/java/com/mumfrey/liteloader/api/manager/APIAdapter.java
src/main/java/com/mumfrey/liteloader/api/manager/APIProvider.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.api.manager; |
2 | 7 | |
3 | 8 | import java.util.regex.Pattern; |
... | ... | @@ -47,4 +52,4 @@ public interface APIProvider |
47 | 52 | * @param apiClass |
48 | 53 | */ |
49 | 54 | public abstract <T extends LiteAPI> T getAPI(Class<T> apiClass); |
50 | -} | |
51 | 55 | \ No newline at end of file |
56 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/api/manager/APIProviderBasic.java
src/main/java/com/mumfrey/liteloader/api/manager/APIRegistry.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.api.manager; |
2 | 7 | |
3 | 8 | import java.util.ArrayList; |
... | ... | @@ -7,8 +12,6 @@ import java.util.List; |
7 | 12 | import java.util.Map; |
8 | 13 | import java.util.Set; |
9 | 14 | |
10 | -import net.minecraft.launchwrapper.Launch; | |
11 | - | |
12 | 15 | import com.mumfrey.liteloader.api.LiteAPI; |
13 | 16 | import com.mumfrey.liteloader.api.exceptions.InvalidAPIStateException; |
14 | 17 | import com.mumfrey.liteloader.launch.LoaderEnvironment; |
... | ... | @@ -16,6 +19,8 @@ import com.mumfrey.liteloader.launch.LoaderProperties; |
16 | 19 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
17 | 20 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger.Verbosity; |
18 | 21 | |
22 | +import net.minecraft.launchwrapper.Launch; | |
23 | + | |
19 | 24 | /** |
20 | 25 | * This is where we register API classes during early startup before baking the |
21 | 26 | * registered list into an APIProvider instance | ... | ... |
src/main/java/com/mumfrey/liteloader/common/GameEngine.java
src/main/java/com/mumfrey/liteloader/common/LoadingProgress.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.common; |
2 | 7 | |
3 | 8 | /** |
... | ... | @@ -63,4 +68,4 @@ public abstract class LoadingProgress |
63 | 68 | protected abstract void _incLiteLoaderProgress(String message); |
64 | 69 | |
65 | 70 | protected abstract void _incTotalLiteLoaderProgress(int by); |
66 | -} | |
67 | 71 | \ No newline at end of file |
72 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/common/Resources.java
src/main/java/com/mumfrey/liteloader/common/ducks/IChatPacket.java
src/main/java/com/mumfrey/liteloader/common/ducks/IPacketClientSettings.java
src/main/java/com/mumfrey/liteloader/common/mixin/MixinC15PacketClientSettings.java
src/main/java/com/mumfrey/liteloader/common/mixin/MixinMinecraftServer.java
src/main/java/com/mumfrey/liteloader/common/mixin/MixinNetHandlerPlayServer.java
src/main/java/com/mumfrey/liteloader/common/mixin/MixinPlayerInteractionManager.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.common.mixin; |
2 | 7 | |
3 | 8 | import org.spongepowered.asm.mixin.Mixin; |
... | ... | @@ -11,10 +16,10 @@ import com.mumfrey.liteloader.core.Proxy; |
11 | 16 | import net.minecraft.entity.player.EntityPlayer; |
12 | 17 | import net.minecraft.item.ItemStack; |
13 | 18 | import net.minecraft.server.management.PlayerInteractionManager; |
14 | -import net.minecraft.util.math.BlockPos; | |
15 | 19 | import net.minecraft.util.EnumActionResult; |
16 | 20 | import net.minecraft.util.EnumFacing; |
17 | 21 | import net.minecraft.util.EnumHand; |
22 | +import net.minecraft.util.math.BlockPos; | |
18 | 23 | import net.minecraft.world.World; |
19 | 24 | |
20 | 25 | @Mixin(PlayerInteractionManager.class) | ... | ... |
src/main/java/com/mumfrey/liteloader/common/mixin/MixinPlayerList.java
src/main/java/com/mumfrey/liteloader/common/mixin/MixinS02PacketChat.java
src/main/java/com/mumfrey/liteloader/common/transformers/LiteLoaderPacketTransformer.java
src/main/java/com/mumfrey/liteloader/common/transformers/PacketEvent.java
src/main/java/com/mumfrey/liteloader/common/transformers/PacketEventInfo.java
src/main/java/com/mumfrey/liteloader/core/BadContainerInfo.java
src/main/java/com/mumfrey/liteloader/core/ClientPluginChannels.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core; |
2 | 7 | |
3 | -import net.minecraft.network.INetHandler; | |
4 | -import net.minecraft.network.PacketBuffer; | |
5 | -import net.minecraft.network.play.server.SPacketCustomPayload; | |
6 | - | |
7 | 8 | import com.mumfrey.liteloader.PluginChannelListener; |
8 | 9 | import com.mumfrey.liteloader.api.Listener; |
9 | 10 | import com.mumfrey.liteloader.core.event.HandlerList; |
... | ... | @@ -11,6 +12,10 @@ import com.mumfrey.liteloader.interfaces.FastIterableDeque; |
11 | 12 | import com.mumfrey.liteloader.permissions.PermissionsManagerClient; |
12 | 13 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
13 | 14 | |
15 | +import net.minecraft.network.INetHandler; | |
16 | +import net.minecraft.network.PacketBuffer; | |
17 | +import net.minecraft.network.play.server.SPacketCustomPayload; | |
18 | + | |
14 | 19 | /** |
15 | 20 | * Handler for client plugin channels |
16 | 21 | * | ... | ... |
src/main/java/com/mumfrey/liteloader/core/CommonPluginChannelListener.java
src/main/java/com/mumfrey/liteloader/core/Containers.java
src/main/java/com/mumfrey/liteloader/core/EnabledModsList.java
src/main/java/com/mumfrey/liteloader/core/IEventState.java
src/main/java/com/mumfrey/liteloader/core/InterfaceRegistrationDelegate.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core; |
2 | 7 | |
3 | 8 | import java.util.ArrayList; |
4 | 9 | import java.util.List; |
5 | 10 | |
6 | -import com.mumfrey.liteloader.api.Listener; | |
7 | 11 | import com.mumfrey.liteloader.api.InterfaceProvider; |
12 | +import com.mumfrey.liteloader.api.Listener; | |
8 | 13 | import com.mumfrey.liteloader.core.LiteLoaderInterfaceManager.InterfaceHandler; |
9 | 14 | import com.mumfrey.liteloader.interfaces.InterfaceRegistry; |
10 | 15 | ... | ... |
src/main/java/com/mumfrey/liteloader/core/LiteLoader.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core; |
2 | 7 | |
3 | 8 | import java.io.File; |
... | ... | @@ -10,7 +15,16 @@ import javax.activity.InvalidActivityException; |
10 | 15 | import org.spongepowered.asm.mixin.MixinEnvironment; |
11 | 16 | |
12 | 17 | import com.mumfrey.liteloader.LiteMod; |
13 | -import com.mumfrey.liteloader.api.*; | |
18 | +import com.mumfrey.liteloader.api.CoreProvider; | |
19 | +import com.mumfrey.liteloader.api.CustomisationProvider; | |
20 | +import com.mumfrey.liteloader.api.Listener; | |
21 | +import com.mumfrey.liteloader.api.LiteAPI; | |
22 | +import com.mumfrey.liteloader.api.ModLoadObserver; | |
23 | +import com.mumfrey.liteloader.api.PostRenderObserver; | |
24 | +import com.mumfrey.liteloader.api.ShutdownObserver; | |
25 | +import com.mumfrey.liteloader.api.TickObserver; | |
26 | +import com.mumfrey.liteloader.api.TranslationProvider; | |
27 | +import com.mumfrey.liteloader.api.WorldObserver; | |
14 | 28 | import com.mumfrey.liteloader.api.manager.APIAdapter; |
15 | 29 | import com.mumfrey.liteloader.api.manager.APIProvider; |
16 | 30 | import com.mumfrey.liteloader.common.GameEngine; |
... | ... | @@ -21,7 +35,12 @@ import com.mumfrey.liteloader.core.event.HandlerList; |
21 | 35 | import com.mumfrey.liteloader.crashreport.CallableLaunchWrapper; |
22 | 36 | import com.mumfrey.liteloader.crashreport.CallableLiteLoaderBrand; |
23 | 37 | import com.mumfrey.liteloader.crashreport.CallableLiteLoaderMods; |
24 | -import com.mumfrey.liteloader.interfaces.*; | |
38 | +import com.mumfrey.liteloader.interfaces.FastIterableDeque; | |
39 | +import com.mumfrey.liteloader.interfaces.Loadable; | |
40 | +import com.mumfrey.liteloader.interfaces.LoadableMod; | |
41 | +import com.mumfrey.liteloader.interfaces.LoaderEnumerator; | |
42 | +import com.mumfrey.liteloader.interfaces.ObjectFactory; | |
43 | +import com.mumfrey.liteloader.interfaces.PanelManager; | |
25 | 44 | import com.mumfrey.liteloader.launch.LoaderEnvironment; |
26 | 45 | import com.mumfrey.liteloader.launch.LoaderEnvironment.EnvironmentType; |
27 | 46 | import com.mumfrey.liteloader.launch.LoaderProperties; |
... | ... | @@ -1020,4 +1039,4 @@ public final class LiteLoader |
1020 | 1039 | |
1021 | 1040 | LiteLoader.instance.onPostInit(); |
1022 | 1041 | } |
1023 | -} | |
1024 | 1042 | \ No newline at end of file |
1043 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/core/LiteLoaderBootstrap.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core; |
2 | 7 | |
3 | -import java.io.*; | |
8 | +import java.io.File; | |
9 | +import java.io.FileInputStream; | |
10 | +import java.io.FileNotFoundException; | |
11 | +import java.io.FileWriter; | |
12 | +import java.io.IOException; | |
13 | +import java.io.InputStream; | |
14 | +import java.io.Serializable; | |
4 | 15 | import java.lang.reflect.Field; |
5 | 16 | import java.lang.reflect.Method; |
6 | 17 | import java.util.List; |
... | ... | @@ -19,7 +30,12 @@ import com.mumfrey.liteloader.api.manager.APIRegistry; |
19 | 30 | import com.mumfrey.liteloader.common.LoadingProgress; |
20 | 31 | import com.mumfrey.liteloader.core.api.LiteLoaderCoreAPI; |
21 | 32 | import com.mumfrey.liteloader.interfaces.LoaderEnumerator; |
22 | -import com.mumfrey.liteloader.launch.*; | |
33 | +import com.mumfrey.liteloader.launch.ClassTransformerManager; | |
34 | +import com.mumfrey.liteloader.launch.LiteLoaderTweaker; | |
35 | +import com.mumfrey.liteloader.launch.LoaderBootstrap; | |
36 | +import com.mumfrey.liteloader.launch.LoaderEnvironment; | |
37 | +import com.mumfrey.liteloader.launch.LoaderProperties; | |
38 | +import com.mumfrey.liteloader.launch.StartupEnvironment; | |
23 | 39 | import com.mumfrey.liteloader.util.ObfuscationUtilities; |
24 | 40 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
25 | 41 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger.Verbosity; |
... | ... | @@ -200,7 +216,9 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP |
200 | 216 | if (apisToLoad != null) |
201 | 217 | { |
202 | 218 | for (String apiClassName : apisToLoad) |
219 | + { | |
203 | 220 | this.registerAPI(apiClassName); |
221 | + } | |
204 | 222 | } |
205 | 223 | |
206 | 224 | this.apiRegistry.bake(); | ... | ... |
src/main/java/com/mumfrey/liteloader/core/LiteLoaderEnumerator.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core; |
2 | 7 | |
3 | 8 | import java.io.File; |
... | ... | @@ -845,4 +850,4 @@ public class LiteLoaderEnumerator implements LoaderEnumerator |
845 | 850 | { |
846 | 851 | return mod.getSimpleName().substring(7); |
847 | 852 | } |
848 | -} | |
849 | 853 | \ No newline at end of file |
854 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/core/LiteLoaderEventBroker.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core; |
2 | 7 | |
3 | 8 | import java.util.Collections; |
... | ... | @@ -6,8 +11,16 @@ import java.util.Map; |
6 | 11 | import java.util.UUID; |
7 | 12 | |
8 | 13 | import com.mojang.authlib.GameProfile; |
9 | -import com.mumfrey.liteloader.*; | |
14 | +import com.mumfrey.liteloader.LiteMod; | |
15 | +import com.mumfrey.liteloader.PlayerInteractionListener; | |
10 | 16 | import com.mumfrey.liteloader.PlayerInteractionListener.MouseButton; |
17 | +import com.mumfrey.liteloader.PlayerMoveListener; | |
18 | +import com.mumfrey.liteloader.PluginChannelListener; | |
19 | +import com.mumfrey.liteloader.ServerCommandProvider; | |
20 | +import com.mumfrey.liteloader.ServerPlayerListener; | |
21 | +import com.mumfrey.liteloader.ServerPluginChannelListener; | |
22 | +import com.mumfrey.liteloader.ServerTickable; | |
23 | +import com.mumfrey.liteloader.ShutdownListener; | |
11 | 24 | import com.mumfrey.liteloader.api.InterfaceProvider; |
12 | 25 | import com.mumfrey.liteloader.api.Listener; |
13 | 26 | import com.mumfrey.liteloader.api.ShutdownObserver; |
... | ... | @@ -29,18 +42,18 @@ import net.minecraft.entity.player.EntityPlayerMP; |
29 | 42 | import net.minecraft.item.ItemStack; |
30 | 43 | import net.minecraft.network.NetHandlerPlayServer; |
31 | 44 | import net.minecraft.network.NetworkManager; |
32 | -import net.minecraft.network.play.client.CPacketPlayer; | |
33 | 45 | import net.minecraft.network.play.client.CPacketClientSettings; |
46 | +import net.minecraft.network.play.client.CPacketPlayer; | |
47 | +import net.minecraft.network.play.server.SPacketBlockChange; | |
34 | 48 | import net.minecraft.network.play.server.SPacketPlayerPosLook; |
35 | 49 | import net.minecraft.network.play.server.SPacketPlayerPosLook.EnumFlags; |
36 | -import net.minecraft.network.play.server.SPacketBlockChange; | |
37 | 50 | import net.minecraft.profiler.Profiler; |
38 | 51 | import net.minecraft.server.MinecraftServer; |
39 | 52 | import net.minecraft.server.management.PlayerInteractionManager; |
40 | 53 | import net.minecraft.server.management.PlayerList; |
41 | -import net.minecraft.util.math.BlockPos; | |
42 | 54 | import net.minecraft.util.EnumFacing; |
43 | 55 | import net.minecraft.util.EnumHand; |
56 | +import net.minecraft.util.math.BlockPos; | |
44 | 57 | import net.minecraft.util.math.RayTraceResult.Type; |
45 | 58 | import net.minecraft.world.World; |
46 | 59 | import net.minecraft.world.WorldServer; | ... | ... |
src/main/java/com/mumfrey/liteloader/core/LiteLoaderInterfaceManager.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core; |
2 | 7 | |
3 | 8 | import java.lang.reflect.Method; |
... | ... | @@ -7,9 +12,9 @@ import java.util.Iterator; |
7 | 12 | import java.util.List; |
8 | 13 | import java.util.Map; |
9 | 14 | |
10 | -import com.mumfrey.liteloader.api.Listener; | |
11 | 15 | import com.mumfrey.liteloader.api.InterfaceObserver; |
12 | 16 | import com.mumfrey.liteloader.api.InterfaceProvider; |
17 | +import com.mumfrey.liteloader.api.Listener; | |
13 | 18 | import com.mumfrey.liteloader.api.LiteAPI; |
14 | 19 | import com.mumfrey.liteloader.api.Observer; |
15 | 20 | import com.mumfrey.liteloader.api.exceptions.InvalidProviderException; | ... | ... |
src/main/java/com/mumfrey/liteloader/core/LiteLoaderMods.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core; |
2 | 7 | |
3 | 8 | import java.io.File; |
9 | +import java.util.ArrayList; | |
4 | 10 | import java.util.Collection; |
5 | 11 | import java.util.Collections; |
6 | 12 | import java.util.Deque; |
... | ... | @@ -74,7 +80,7 @@ public class LiteLoaderMods |
74 | 80 | /** |
75 | 81 | * Global list of mods which we can load |
76 | 82 | */ |
77 | - protected final List<Mod> allMods = new LinkedList<Mod>(); | |
83 | + protected final List<Mod> allMods = new ArrayList<Mod>(); | |
78 | 84 | |
79 | 85 | /** |
80 | 86 | * Global list of mods which are still waiting for initialisiation |
... | ... | @@ -84,22 +90,22 @@ public class LiteLoaderMods |
84 | 90 | /** |
85 | 91 | * Global list of mods which we have loaded |
86 | 92 | */ |
87 | - protected final List<Mod> loadedMods = new LinkedList<Mod>(); | |
93 | + protected final List<Mod> loadedMods = new ArrayList<Mod>(); | |
88 | 94 | |
89 | 95 | /** |
90 | 96 | * Global list of mods which we found but ignored (eg. outdated, invalid) |
91 | 97 | */ |
92 | - protected final List<Mod> badMods = new LinkedList<Mod>(); | |
98 | + protected final List<Mod> badMods = new ArrayList<Mod>(); | |
93 | 99 | |
94 | 100 | /** |
95 | 101 | * Mods which are loaded but disabled |
96 | 102 | */ |
97 | - protected final List<ModInfo<?>> disabledMods = new LinkedList<ModInfo<?>>(); | |
103 | + protected final List<ModInfo<?>> disabledMods = new ArrayList<ModInfo<?>>(); | |
98 | 104 | |
99 | 105 | /** |
100 | 106 | * Bad containers |
101 | 107 | */ |
102 | - protected final List<ModInfo<?>> badContainers = new LinkedList<ModInfo<?>>(); | |
108 | + protected final List<ModInfo<?>> badContainers = new ArrayList<ModInfo<?>>(); | |
103 | 109 | |
104 | 110 | private int startupErrorCount, criticalErrorCount; |
105 | 111 | ... | ... |
src/main/java/com/mumfrey/liteloader/core/LiteLoaderUpdateSite.java
src/main/java/com/mumfrey/liteloader/core/LiteLoaderVersion.java
src/main/java/com/mumfrey/liteloader/core/Mod.java
src/main/java/com/mumfrey/liteloader/core/ModInfo.java
src/main/java/com/mumfrey/liteloader/core/NonMod.java
src/main/java/com/mumfrey/liteloader/core/PacketEvents.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core; |
2 | 7 | |
3 | 8 | import java.util.List; |
4 | 9 | |
10 | +import com.mumfrey.liteloader.PacketHandler; | |
11 | +import com.mumfrey.liteloader.ServerChatFilter; | |
12 | +import com.mumfrey.liteloader.api.InterfaceProvider; | |
13 | +import com.mumfrey.liteloader.api.Listener; | |
14 | +import com.mumfrey.liteloader.common.transformers.PacketEventInfo; | |
15 | +import com.mumfrey.liteloader.core.event.HandlerList; | |
16 | +import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp; | |
17 | +import com.mumfrey.liteloader.core.runtime.Packets; | |
18 | +import com.mumfrey.liteloader.interfaces.FastIterable; | |
19 | +import com.mumfrey.liteloader.util.log.LiteLoaderLogger; | |
20 | + | |
5 | 21 | import net.minecraft.entity.player.EntityPlayerMP; |
6 | 22 | import net.minecraft.network.INetHandler; |
7 | 23 | import net.minecraft.network.NetHandlerPlayServer; |
... | ... | @@ -10,22 +26,11 @@ import net.minecraft.network.login.server.SPacketLoginSuccess; |
10 | 26 | import net.minecraft.network.play.client.CPacketChatMessage; |
11 | 27 | import net.minecraft.network.play.client.CPacketClientSettings; |
12 | 28 | import net.minecraft.network.play.client.CPacketCustomPayload; |
13 | -import net.minecraft.network.play.server.SPacketJoinGame; | |
14 | 29 | import net.minecraft.network.play.server.SPacketChat; |
15 | 30 | import net.minecraft.network.play.server.SPacketCustomPayload; |
31 | +import net.minecraft.network.play.server.SPacketJoinGame; | |
16 | 32 | import net.minecraft.util.IThreadListener; |
17 | 33 | |
18 | -import com.mumfrey.liteloader.PacketHandler; | |
19 | -import com.mumfrey.liteloader.ServerChatFilter; | |
20 | -import com.mumfrey.liteloader.api.InterfaceProvider; | |
21 | -import com.mumfrey.liteloader.api.Listener; | |
22 | -import com.mumfrey.liteloader.common.transformers.PacketEventInfo; | |
23 | -import com.mumfrey.liteloader.core.event.HandlerList; | |
24 | -import com.mumfrey.liteloader.core.event.HandlerList.ReturnLogicOp; | |
25 | -import com.mumfrey.liteloader.core.runtime.Packets; | |
26 | -import com.mumfrey.liteloader.interfaces.FastIterable; | |
27 | -import com.mumfrey.liteloader.util.log.LiteLoaderLogger; | |
28 | - | |
29 | 34 | /** |
30 | 35 | * Packet event handling |
31 | 36 | * | ... | ... |
src/main/java/com/mumfrey/liteloader/core/PlayerEventState.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core; |
2 | 7 | |
3 | 8 | import java.lang.ref.WeakReference; |
4 | 9 | |
10 | +import com.mumfrey.liteloader.PlayerInteractionListener.MouseButton; | |
11 | +import com.mumfrey.liteloader.core.LiteLoaderEventBroker.InteractType; | |
12 | +import com.mumfrey.liteloader.util.EntityUtilities; | |
13 | + | |
5 | 14 | import net.minecraft.entity.player.EntityPlayerMP; |
6 | 15 | import net.minecraft.item.ItemStack; |
7 | 16 | import net.minecraft.server.MinecraftServer; |
8 | -import net.minecraft.util.math.BlockPos; | |
9 | 17 | import net.minecraft.util.EnumFacing; |
10 | 18 | import net.minecraft.util.EnumHand; |
19 | +import net.minecraft.util.math.BlockPos; | |
11 | 20 | import net.minecraft.util.math.RayTraceResult; |
12 | 21 | import net.minecraft.util.math.RayTraceResult.Type; |
13 | 22 | |
14 | -import com.mumfrey.liteloader.PlayerInteractionListener.MouseButton; | |
15 | -import com.mumfrey.liteloader.core.LiteLoaderEventBroker.InteractType; | |
16 | -import com.mumfrey.liteloader.util.EntityUtilities; | |
17 | - | |
18 | 23 | public class PlayerEventState implements IEventState |
19 | 24 | { |
20 | 25 | private static long MISS = new BlockPos(-1, -1, -1).toLong(); | ... | ... |
src/main/java/com/mumfrey/liteloader/core/PluginChannels.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core; |
2 | 7 | |
3 | -import io.netty.buffer.Unpooled; | |
4 | - | |
8 | +import java.util.ArrayList; | |
5 | 9 | import java.util.Collections; |
6 | 10 | import java.util.HashMap; |
7 | 11 | import java.util.HashSet; |
8 | -import java.util.LinkedList; | |
9 | 12 | import java.util.List; |
10 | 13 | import java.util.Map; |
11 | 14 | import java.util.Set; |
12 | 15 | |
13 | -import net.minecraft.network.INetHandler; | |
14 | -import net.minecraft.network.PacketBuffer; | |
15 | - | |
16 | 16 | import com.google.common.base.Charsets; |
17 | 17 | import com.mumfrey.liteloader.api.InterfaceProvider; |
18 | 18 | import com.mumfrey.liteloader.interfaces.FastIterableDeque; |
19 | 19 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
20 | 20 | |
21 | +import io.netty.buffer.Unpooled; | |
22 | +import net.minecraft.network.INetHandler; | |
23 | +import net.minecraft.network.PacketBuffer; | |
24 | + | |
21 | 25 | /** |
22 | 26 | * Manages plugin channel connections and subscriptions for LiteLoader |
23 | 27 | * |
... | ... | @@ -37,7 +41,7 @@ public abstract class PluginChannels<L extends CommonPluginChannelListener> impl |
37 | 41 | /** |
38 | 42 | * Mapping of plugin channel names to listeners |
39 | 43 | */ |
40 | - protected final HashMap<String, LinkedList<L>> pluginChannels = new HashMap<String, LinkedList<L>>(); | |
44 | + protected final HashMap<String, List<L>> pluginChannels = new HashMap<String, List<L>>(); | |
41 | 45 | |
42 | 46 | /** |
43 | 47 | * List of mods which implement PluginChannelListener interface |
... | ... | @@ -183,7 +187,7 @@ public abstract class PluginChannels<L extends CommonPluginChannelListener> impl |
183 | 187 | |
184 | 188 | if (!this.pluginChannels.containsKey(channel)) |
185 | 189 | { |
186 | - this.pluginChannels.put(channel, new LinkedList<L>()); | |
190 | + this.pluginChannels.put(channel, new ArrayList<L>()); | |
187 | 191 | } |
188 | 192 | |
189 | 193 | this.pluginChannels.get(channel).add(pluginChannelListener); | ... | ... |
src/main/java/com/mumfrey/liteloader/core/Proxy.java
src/main/java/com/mumfrey/liteloader/core/ServerPluginChannels.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core; |
2 | 7 | |
3 | -import net.minecraft.entity.player.EntityPlayerMP; | |
4 | -import net.minecraft.network.INetHandler; | |
5 | -import net.minecraft.network.NetHandlerPlayServer; | |
6 | -import net.minecraft.network.PacketBuffer; | |
7 | -import net.minecraft.network.play.client.CPacketCustomPayload; | |
8 | -import net.minecraft.network.play.server.SPacketCustomPayload; | |
9 | - | |
10 | 8 | import com.mumfrey.liteloader.ServerPluginChannelListener; |
11 | 9 | import com.mumfrey.liteloader.api.Listener; |
12 | 10 | import com.mumfrey.liteloader.core.event.HandlerList; |
... | ... | @@ -15,6 +13,13 @@ import com.mumfrey.liteloader.interfaces.FastIterableDeque; |
15 | 13 | import com.mumfrey.liteloader.permissions.PermissionsManagerServer; |
16 | 14 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
17 | 15 | |
16 | +import net.minecraft.entity.player.EntityPlayerMP; | |
17 | +import net.minecraft.network.INetHandler; | |
18 | +import net.minecraft.network.NetHandlerPlayServer; | |
19 | +import net.minecraft.network.PacketBuffer; | |
20 | +import net.minecraft.network.play.client.CPacketCustomPayload; | |
21 | +import net.minecraft.network.play.server.SPacketCustomPayload; | |
22 | + | |
18 | 23 | /** |
19 | 24 | * Handler for server plugin channels |
20 | 25 | * | ... | ... |
src/main/java/com/mumfrey/liteloader/core/api/DefaultClassValidator.java
src/main/java/com/mumfrey/liteloader/core/api/DefaultEnumeratorPlugin.java
src/main/java/com/mumfrey/liteloader/core/api/EnumeratorModuleClassPath.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core.api; |
2 | 7 | |
3 | 8 | import java.io.File; |
4 | 9 | import java.util.ArrayList; |
5 | 10 | import java.util.List; |
6 | 11 | |
7 | -import net.minecraft.launchwrapper.LaunchClassLoader; | |
8 | - | |
9 | 12 | import com.mumfrey.liteloader.api.EnumeratorModule; |
10 | 13 | import com.mumfrey.liteloader.common.LoadingProgress; |
11 | 14 | import com.mumfrey.liteloader.interfaces.LoadableMod; |
... | ... | @@ -15,6 +18,8 @@ import com.mumfrey.liteloader.launch.LoaderProperties; |
15 | 18 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
16 | 19 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger.Verbosity; |
17 | 20 | |
21 | +import net.minecraft.launchwrapper.LaunchClassLoader; | |
22 | + | |
18 | 23 | /** |
19 | 24 | * Enumerator module which searches for mods on the classpath |
20 | 25 | * | ... | ... |
src/main/java/com/mumfrey/liteloader/core/api/EnumeratorModuleFolder.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core.api; |
2 | 7 | |
3 | 8 | import java.io.File; |
... | ... | @@ -11,8 +16,6 @@ import java.util.Map.Entry; |
11 | 16 | import java.util.Set; |
12 | 17 | import java.util.TreeSet; |
13 | 18 | |
14 | -import net.minecraft.launchwrapper.LaunchClassLoader; | |
15 | - | |
16 | 19 | import com.google.common.base.Charsets; |
17 | 20 | import com.mumfrey.liteloader.api.EnumeratorModule; |
18 | 21 | import com.mumfrey.liteloader.common.LoadingProgress; |
... | ... | @@ -26,6 +29,8 @@ import com.mumfrey.liteloader.launch.LoaderProperties; |
26 | 29 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
27 | 30 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger.Verbosity; |
28 | 31 | |
32 | +import net.minecraft.launchwrapper.LaunchClassLoader; | |
33 | + | |
29 | 34 | /** |
30 | 35 | * Enumerator module which searches for mods and tweaks in a folder |
31 | 36 | * | ... | ... |
src/main/java/com/mumfrey/liteloader/core/api/LiteLoaderCoreAPI.java
src/main/java/com/mumfrey/liteloader/core/api/LoadableModClassPath.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core.api; |
2 | 7 | |
3 | 8 | import java.io.File; |
4 | 9 | import java.net.MalformedURLException; |
5 | 10 | |
6 | -import net.minecraft.launchwrapper.LaunchClassLoader; | |
7 | - | |
8 | 11 | import com.mumfrey.liteloader.core.LiteLoaderVersion; |
9 | 12 | |
13 | +import net.minecraft.launchwrapper.LaunchClassLoader; | |
14 | + | |
10 | 15 | /** |
11 | 16 | * Mod file reference for a file loaded from class path |
12 | 17 | * | ... | ... |
src/main/java/com/mumfrey/liteloader/core/api/LoadableModFile.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core.api; |
2 | 7 | |
3 | 8 | import java.io.File; |
... | ... | @@ -17,8 +22,6 @@ import java.util.regex.Matcher; |
17 | 22 | import java.util.zip.ZipEntry; |
18 | 23 | import java.util.zip.ZipFile; |
19 | 24 | |
20 | -import joptsimple.internal.Strings; | |
21 | - | |
22 | 25 | import com.google.common.base.Charsets; |
23 | 26 | import com.google.common.io.ByteStreams; |
24 | 27 | import com.google.gson.Gson; |
... | ... | @@ -31,6 +34,8 @@ import com.mumfrey.liteloader.launch.InjectionStrategy; |
31 | 34 | import com.mumfrey.liteloader.launch.LoaderEnvironment; |
32 | 35 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
33 | 36 | |
37 | +import joptsimple.internal.Strings; | |
38 | + | |
34 | 39 | /** |
35 | 40 | * Wrapper for file which represents a mod file to load with associated version |
36 | 41 | * information and metadata. Retrieve this from litemod.json at enumeration | ... | ... |
src/main/java/com/mumfrey/liteloader/core/event/Cancellable.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core.event; |
2 | 7 | |
3 | 8 | /** |
... | ... | @@ -25,4 +30,4 @@ public interface Cancellable |
25 | 30 | * is not actually cancellable |
26 | 31 | */ |
27 | 32 | public abstract void cancel() throws EventCancellationException; |
28 | -} | |
29 | 33 | \ No newline at end of file |
34 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/core/event/EventCancellationException.java
src/main/java/com/mumfrey/liteloader/core/event/EventProxy.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core.event; |
2 | 7 | |
3 | 8 | import java.util.concurrent.Callable; |
4 | 9 | |
5 | 10 | import javax.management.RuntimeErrorException; |
6 | 11 | |
7 | -import net.minecraft.crash.CrashReport; | |
8 | -import net.minecraft.crash.CrashReportCategory; | |
9 | - | |
10 | 12 | import org.objectweb.asm.Type; |
11 | 13 | |
12 | 14 | import com.mumfrey.liteloader.transformers.ByteCodeUtilities; |
13 | 15 | import com.mumfrey.liteloader.transformers.event.EventInfo; |
14 | 16 | |
17 | +import net.minecraft.crash.CrashReport; | |
18 | +import net.minecraft.crash.CrashReportCategory; | |
19 | + | |
15 | 20 | /** |
16 | 21 | * EventProxy is a special class used by the EventInjectionTransformer, it is a |
17 | 22 | * stub class into which all of the injected event callback methods are |
... | ... | @@ -209,4 +214,4 @@ public final class EventProxy |
209 | 214 | }); |
210 | 215 | } |
211 | 216 | } |
212 | -} | |
213 | 217 | \ No newline at end of file |
218 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/core/event/HandlerList.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core.event; |
2 | 7 | |
3 | 8 | import java.io.Closeable; |
... | ... | @@ -15,9 +20,6 @@ import java.util.LinkedList; |
15 | 20 | import java.util.List; |
16 | 21 | import java.util.Set; |
17 | 22 | |
18 | -import net.minecraft.launchwrapper.IClassTransformer; | |
19 | -import net.minecraft.launchwrapper.Launch; | |
20 | - | |
21 | 23 | import org.apache.commons.io.FileUtils; |
22 | 24 | import org.apache.logging.log4j.core.helpers.Booleans; |
23 | 25 | import org.objectweb.asm.ClassReader; |
... | ... | @@ -25,7 +27,20 @@ import org.objectweb.asm.ClassWriter; |
25 | 27 | import org.objectweb.asm.Label; |
26 | 28 | import org.objectweb.asm.Opcodes; |
27 | 29 | import org.objectweb.asm.Type; |
28 | -import org.objectweb.asm.tree.*; | |
30 | +import org.objectweb.asm.tree.AbstractInsnNode; | |
31 | +import org.objectweb.asm.tree.ClassNode; | |
32 | +import org.objectweb.asm.tree.FieldInsnNode; | |
33 | +import org.objectweb.asm.tree.FieldNode; | |
34 | +import org.objectweb.asm.tree.InsnNode; | |
35 | +import org.objectweb.asm.tree.IntInsnNode; | |
36 | +import org.objectweb.asm.tree.JumpInsnNode; | |
37 | +import org.objectweb.asm.tree.LabelNode; | |
38 | +import org.objectweb.asm.tree.LdcInsnNode; | |
39 | +import org.objectweb.asm.tree.LineNumberNode; | |
40 | +import org.objectweb.asm.tree.MethodInsnNode; | |
41 | +import org.objectweb.asm.tree.MethodNode; | |
42 | +import org.objectweb.asm.tree.TypeInsnNode; | |
43 | +import org.objectweb.asm.tree.VarInsnNode; | |
29 | 44 | import org.objectweb.asm.util.CheckClassAdapter; |
30 | 45 | |
31 | 46 | import com.mumfrey.liteloader.Priority; |
... | ... | @@ -35,6 +50,9 @@ import com.mumfrey.liteloader.transformers.ByteCodeUtilities; |
35 | 50 | import com.mumfrey.liteloader.util.SortableValue; |
36 | 51 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
37 | 52 | |
53 | +import net.minecraft.launchwrapper.IClassTransformer; | |
54 | +import net.minecraft.launchwrapper.Launch; | |
55 | + | |
38 | 56 | /** |
39 | 57 | * HandlerList is a generic class which supports baking a list of event handlers |
40 | 58 | * into a dynamic inner class for invocation at runtime. | ... | ... |
src/main/java/com/mumfrey/liteloader/core/event/IHandlerListDecorator.java
src/main/java/com/mumfrey/liteloader/core/event/ProfilingHandlerList.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.core.event; |
2 | 7 | |
3 | 8 | import java.lang.reflect.Constructor; |
4 | 9 | import java.util.ArrayList; |
5 | 10 | import java.util.List; |
6 | 11 | |
7 | -import net.minecraft.profiler.Profiler; | |
8 | - | |
9 | 12 | import org.objectweb.asm.Opcodes; |
10 | 13 | import org.objectweb.asm.Type; |
11 | 14 | import org.objectweb.asm.tree.ClassNode; |
... | ... | @@ -18,6 +21,8 @@ import org.objectweb.asm.tree.VarInsnNode; |
18 | 21 | import com.mumfrey.liteloader.api.Listener; |
19 | 22 | import com.mumfrey.liteloader.core.runtime.Obf; |
20 | 23 | |
24 | +import net.minecraft.profiler.Profiler; | |
25 | + | |
21 | 26 | /** |
22 | 27 | * A HandlerList which calls Profiler.beginSection and Profiler.endSection |
23 | 28 | * before every invocation. | ... | ... |
src/main/java/com/mumfrey/liteloader/core/exceptions/OutdatedLoaderException.java
src/main/java/com/mumfrey/liteloader/core/exceptions/ProfilerCrossThreadAccessException.java
src/main/java/com/mumfrey/liteloader/core/exceptions/ProfilerStackCorruptionException.java
src/main/java/com/mumfrey/liteloader/core/exceptions/UnregisteredChannelException.java
src/main/java/com/mumfrey/liteloader/core/runtime/Obf.java
src/main/java/com/mumfrey/liteloader/core/runtime/Packets.java
src/main/java/com/mumfrey/liteloader/core/runtime/SrgContainer.java
src/main/java/com/mumfrey/liteloader/crashreport/CallableLaunchWrapper.java
src/main/java/com/mumfrey/liteloader/crashreport/CallableLiteLoaderBrand.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.crashreport; |
2 | 7 | |
3 | 8 | import java.util.concurrent.Callable; |
4 | 9 | |
5 | -import net.minecraft.crash.CrashReport; | |
6 | - | |
7 | 10 | import com.mumfrey.liteloader.core.LiteLoader; |
8 | 11 | |
12 | +import net.minecraft.crash.CrashReport; | |
13 | + | |
9 | 14 | public class CallableLiteLoaderBrand implements Callable<String> |
10 | 15 | { |
11 | 16 | final CrashReport crashReport; | ... | ... |
src/main/java/com/mumfrey/liteloader/crashreport/CallableLiteLoaderMods.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.crashreport; |
2 | 7 | |
3 | 8 | import java.util.concurrent.Callable; |
4 | 9 | |
5 | -import net.minecraft.crash.CrashReport; | |
6 | - | |
7 | 10 | import com.mumfrey.liteloader.core.LiteLoader; |
8 | 11 | |
12 | +import net.minecraft.crash.CrashReport; | |
13 | + | |
9 | 14 | public class CallableLiteLoaderMods implements Callable<String> |
10 | 15 | { |
11 | 16 | final CrashReport crashReport; | ... | ... |
src/main/java/com/mumfrey/liteloader/interfaces/FastIterable.java
src/main/java/com/mumfrey/liteloader/interfaces/FastIterableDeque.java
src/main/java/com/mumfrey/liteloader/interfaces/Injectable.java
src/main/java/com/mumfrey/liteloader/interfaces/InterfaceRegistry.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.interfaces; |
2 | 7 | |
3 | -import com.mumfrey.liteloader.api.Listener; | |
4 | 8 | import com.mumfrey.liteloader.api.InterfaceProvider; |
9 | +import com.mumfrey.liteloader.api.Listener; | |
5 | 10 | import com.mumfrey.liteloader.api.LiteAPI; |
6 | 11 | |
7 | 12 | /** | ... | ... |
src/main/java/com/mumfrey/liteloader/interfaces/Loadable.java
src/main/java/com/mumfrey/liteloader/interfaces/LoadableFile.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.interfaces; |
2 | 7 | |
3 | 8 | import java.io.File; |
... | ... | @@ -504,4 +509,4 @@ public class LoadableFile extends File implements TweakContainer<File> |
504 | 509 | |
505 | 510 | return null; |
506 | 511 | } |
507 | -} | |
508 | 512 | \ No newline at end of file |
513 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/interfaces/LoadableMod.java
src/main/java/com/mumfrey/liteloader/interfaces/LoaderEnumerator.java
src/main/java/com/mumfrey/liteloader/interfaces/MixinContainer.java
1 | 1 | /* |
2 | - * This file is part of Sponge, licensed under the MIT License (MIT). | |
3 | - * | |
4 | - * Copyright (c) SpongePowered <https://www.spongepowered.org> | |
5 | - * Copyright (c) contributors | |
6 | - * | |
7 | - * Permission is hereby granted, free of charge, to any person obtaining a copy | |
8 | - * of this software and associated documentation files (the "Software"), to deal | |
9 | - * in the Software without restriction, including without limitation the rights | |
10 | - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
11 | - * copies of the Software, and to permit persons to whom the Software is | |
12 | - * furnished to do so, subject to the following conditions: | |
13 | - * | |
14 | - * The above copyright notice and this permission notice shall be included in | |
15 | - * all copies or substantial portions of the Software. | |
16 | - * | |
17 | - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
18 | - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
19 | - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | |
20 | - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |
21 | - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |
22 | - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | |
23 | - * THE SOFTWARE. | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
24 | 5 | */ |
25 | 6 | package com.mumfrey.liteloader.interfaces; |
26 | 7 | ... | ... |
src/main/java/com/mumfrey/liteloader/interfaces/ModularEnumerator.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.interfaces; |
2 | 7 | |
3 | 8 | import java.io.File; |
... | ... | @@ -53,4 +58,4 @@ public interface ModularEnumerator |
53 | 58 | * @param mod |
54 | 59 | */ |
55 | 60 | public abstract void registerMod(ModInfo<LoadableMod<?>> mod); |
56 | -} | |
57 | 61 | \ No newline at end of file |
62 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/interfaces/ObjectFactory.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.interfaces; |
2 | 7 | |
3 | -import net.minecraft.server.MinecraftServer; | |
4 | - | |
5 | 8 | import com.mumfrey.liteloader.common.GameEngine; |
6 | 9 | import com.mumfrey.liteloader.core.ClientPluginChannels; |
7 | 10 | import com.mumfrey.liteloader.core.LiteLoaderEventBroker; |
... | ... | @@ -11,6 +14,8 @@ import com.mumfrey.liteloader.permissions.PermissionsManagerClient; |
11 | 14 | import com.mumfrey.liteloader.permissions.PermissionsManagerServer; |
12 | 15 | import com.mumfrey.liteloader.util.Input; |
13 | 16 | |
17 | +import net.minecraft.server.MinecraftServer; | |
18 | + | |
14 | 19 | /** |
15 | 20 | * Factory for generating loader managament objects based on the environment |
16 | 21 | * | ... | ... |
src/main/java/com/mumfrey/liteloader/interfaces/PanelManager.java
src/main/java/com/mumfrey/liteloader/interfaces/TweakContainer.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.interfaces; |
2 | 7 | |
3 | 8 | import java.util.List; |
... | ... | @@ -44,4 +49,4 @@ public interface TweakContainer<L> extends MixinContainer<L> |
44 | 49 | * True if this container defines event transformers via JSON |
45 | 50 | */ |
46 | 51 | public abstract boolean hasEventTransformers(); |
47 | -} | |
48 | 52 | \ No newline at end of file |
53 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/launch/ClassPathUtilities.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.launch; |
2 | 7 | |
3 | 8 | import java.io.File; |
... | ... | @@ -475,4 +480,4 @@ class JarDeletionHandler implements PrivilegedExceptionAction<Boolean> |
475 | 480 | |
476 | 481 | return Boolean.valueOf(deletedJarFile || deletedParentJarFile); |
477 | 482 | } |
478 | -} | |
479 | 483 | \ No newline at end of file |
484 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/launch/ClassTransformerManager.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.launch; |
2 | 7 | |
3 | 8 | import java.lang.reflect.Field; |
4 | -import java.util.*; | |
9 | +import java.util.ArrayList; | |
10 | +import java.util.Arrays; | |
11 | +import java.util.Collection; | |
12 | +import java.util.Collections; | |
13 | +import java.util.HashMap; | |
14 | +import java.util.LinkedHashSet; | |
15 | +import java.util.List; | |
16 | +import java.util.Map; | |
17 | +import java.util.Set; | |
5 | 18 | |
6 | 19 | import org.apache.logging.log4j.Logger; |
7 | 20 | import org.apache.logging.log4j.core.LogEvent; |
8 | 21 | import org.apache.logging.log4j.core.appender.AbstractAppender; |
9 | 22 | |
23 | +import com.mumfrey.liteloader.util.log.LiteLoaderLogger; | |
24 | +import com.mumfrey.liteloader.util.log.LiteLoaderLogger.Verbosity; | |
25 | + | |
10 | 26 | import net.minecraft.launchwrapper.IClassTransformer; |
11 | 27 | import net.minecraft.launchwrapper.LaunchClassLoader; |
12 | 28 | import net.minecraft.launchwrapper.LogWrapper; |
13 | 29 | |
14 | -import com.mumfrey.liteloader.util.log.LiteLoaderLogger; | |
15 | -import com.mumfrey.liteloader.util.log.LiteLoaderLogger.Verbosity; | |
16 | - | |
17 | 30 | /** |
18 | 31 | * Manages injection of required and optional transformers |
19 | 32 | * | ... | ... |
src/main/java/com/mumfrey/liteloader/launch/GameEnvironment.java
src/main/java/com/mumfrey/liteloader/launch/InjectionStrategy.java
src/main/java/com/mumfrey/liteloader/launch/InvalidTransformerException.java
src/main/java/com/mumfrey/liteloader/launch/LiteLoaderTransformer.java
src/main/java/com/mumfrey/liteloader/launch/LiteLoaderTweaker.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.launch; |
2 | 7 | |
3 | 8 | import java.io.File; |
... | ... | @@ -12,10 +17,6 @@ import java.util.TreeSet; |
12 | 17 | |
13 | 18 | import org.spongepowered.asm.launch.MixinBootstrap; |
14 | 19 | |
15 | -import net.minecraft.launchwrapper.ITweaker; | |
16 | -import net.minecraft.launchwrapper.Launch; | |
17 | -import net.minecraft.launchwrapper.LaunchClassLoader; | |
18 | - | |
19 | 20 | import com.google.common.base.Preconditions; |
20 | 21 | import com.mumfrey.liteloader.launch.LoaderEnvironment.EnvironmentType; |
21 | 22 | import com.mumfrey.liteloader.transformers.event.EventInfo; |
... | ... | @@ -23,6 +24,10 @@ import com.mumfrey.liteloader.util.SortableValue; |
23 | 24 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
24 | 25 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger.Verbosity; |
25 | 26 | |
27 | +import net.minecraft.launchwrapper.ITweaker; | |
28 | +import net.minecraft.launchwrapper.Launch; | |
29 | +import net.minecraft.launchwrapper.LaunchClassLoader; | |
30 | + | |
26 | 31 | /** |
27 | 32 | * LiteLoader tweak class |
28 | 33 | * |
... | ... | @@ -689,4 +694,4 @@ public class LiteLoaderTweaker implements ITweaker |
689 | 694 | { |
690 | 695 | return LiteLoaderTweaker.instance.bootstrap.getEnvironment().getType(); |
691 | 696 | } |
692 | -} | |
693 | 697 | \ No newline at end of file |
698 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/launch/LiteLoaderTweakerServer.java
src/main/java/com/mumfrey/liteloader/launch/LoaderBootstrap.java
src/main/java/com/mumfrey/liteloader/launch/LoaderEnvironment.java
src/main/java/com/mumfrey/liteloader/launch/LoaderProperties.java
src/main/java/com/mumfrey/liteloader/launch/NonDelegatingClassLoader.java
src/main/java/com/mumfrey/liteloader/launch/StartupEnvironment.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.launch; |
2 | 7 | |
3 | 8 | import java.io.File; |
... | ... | @@ -7,11 +12,11 @@ import java.util.List; |
7 | 12 | import java.util.Map; |
8 | 13 | import java.util.Map.Entry; |
9 | 14 | |
10 | -import net.minecraft.launchwrapper.Launch; | |
11 | 15 | import joptsimple.ArgumentAcceptingOptionSpec; |
12 | 16 | import joptsimple.NonOptionArgumentSpec; |
13 | 17 | import joptsimple.OptionParser; |
14 | 18 | import joptsimple.OptionSet; |
19 | +import net.minecraft.launchwrapper.Launch; | |
15 | 20 | |
16 | 21 | /** |
17 | 22 | * Container for startup environment state which also parses the command line |
... | ... | @@ -155,7 +160,9 @@ public abstract class StartupEnvironment implements GameEnvironment |
155 | 160 | List<String> args = new ArrayList<String>(); |
156 | 161 | |
157 | 162 | for (String singularArg : this.singularLaunchArgs) |
163 | + { | |
158 | 164 | args.add(singularArg); |
165 | + } | |
159 | 166 | |
160 | 167 | for (Entry<String, String> launchArg : this.launchArgs.entrySet()) |
161 | 168 | { | ... | ... |
src/main/java/com/mumfrey/liteloader/messaging/Message.java
src/main/java/com/mumfrey/liteloader/messaging/MessageBus.java
src/main/java/com/mumfrey/liteloader/messaging/Messenger.java
src/main/java/com/mumfrey/liteloader/modconfig/AdvancedExposable.java
src/main/java/com/mumfrey/liteloader/modconfig/ConfigManager.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.modconfig; |
2 | 7 | |
3 | 8 | import java.io.File; |
4 | 9 | import java.io.IOException; |
10 | +import java.util.ArrayList; | |
5 | 11 | import java.util.HashMap; |
6 | -import java.util.LinkedList; | |
7 | 12 | import java.util.List; |
8 | 13 | import java.util.Map; |
9 | 14 | |
... | ... | @@ -33,7 +38,7 @@ public class ConfigManager |
33 | 38 | /** |
34 | 39 | * List of config writers, for faster iteration in onTick |
35 | 40 | */ |
36 | - private List<ExposableConfigWriter> configWriterList = new LinkedList<ExposableConfigWriter>(); | |
41 | + private List<ExposableConfigWriter> configWriterList = new ArrayList<ExposableConfigWriter>(); | |
37 | 42 | |
38 | 43 | /** |
39 | 44 | * Register a mod, adds the config panel class to the map if the mod | ... | ... |
src/main/java/com/mumfrey/liteloader/modconfig/ConfigPanel.java
src/main/java/com/mumfrey/liteloader/modconfig/ConfigPanelHost.java
src/main/java/com/mumfrey/liteloader/modconfig/ConfigStrategy.java
src/main/java/com/mumfrey/liteloader/modconfig/Exposable.java
src/main/java/com/mumfrey/liteloader/modconfig/ExposableConfigWriter.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.modconfig; |
2 | 7 | |
3 | 8 | import java.io.File; |
... | ... | @@ -302,4 +307,4 @@ public final class ExposableConfigWriter implements InstanceCreator<Exposable> |
302 | 307 | |
303 | 308 | return writer; |
304 | 309 | } |
305 | -} | |
306 | 310 | \ No newline at end of file |
311 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/modconfig/ExposableOptions.java
src/main/java/com/mumfrey/liteloader/permissions/LocalPermissions.java
src/main/java/com/mumfrey/liteloader/permissions/PermissibleAllMods.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.permissions; |
2 | 7 | |
3 | 8 | import java.io.File; |
... | ... | @@ -58,13 +63,17 @@ public class PermissibleAllMods implements Permissible |
58 | 63 | public void onPermissionsCleared(PermissionsManager manager) |
59 | 64 | { |
60 | 65 | for (Permissible permissible : this.permissibles) |
66 | + { | |
61 | 67 | permissible.onPermissionsCleared(manager); |
68 | + } | |
62 | 69 | } |
63 | 70 | |
64 | 71 | @Override |
65 | 72 | public void onPermissionsChanged(PermissionsManager manager) |
66 | 73 | { |
67 | 74 | for (Permissible permissible : this.permissibles) |
75 | + { | |
68 | 76 | permissible.onPermissionsChanged(manager); |
77 | + } | |
69 | 78 | } |
70 | 79 | } | ... | ... |
src/main/java/com/mumfrey/liteloader/permissions/Permission.java
src/main/java/com/mumfrey/liteloader/permissions/Permissions.java
src/main/java/com/mumfrey/liteloader/permissions/PermissionsManager.java
src/main/java/com/mumfrey/liteloader/permissions/PermissionsManagerClient.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.permissions; |
2 | 7 | |
3 | -import io.netty.buffer.Unpooled; | |
4 | - | |
5 | 8 | import java.io.File; |
6 | 9 | import java.util.Arrays; |
7 | 10 | import java.util.HashMap; |
... | ... | @@ -11,11 +14,6 @@ import java.util.Map; |
11 | 14 | import java.util.Set; |
12 | 15 | import java.util.TreeSet; |
13 | 16 | |
14 | -import net.eq2online.permissions.ReplicatedPermissionsContainer; | |
15 | -import net.minecraft.network.INetHandler; | |
16 | -import net.minecraft.network.PacketBuffer; | |
17 | -import net.minecraft.network.play.server.SPacketJoinGame; | |
18 | - | |
19 | 17 | import com.mumfrey.liteloader.LiteMod; |
20 | 18 | import com.mumfrey.liteloader.Permissible; |
21 | 19 | import com.mumfrey.liteloader.PluginChannelListener; |
... | ... | @@ -23,6 +21,12 @@ import com.mumfrey.liteloader.common.GameEngine; |
23 | 21 | import com.mumfrey.liteloader.core.ClientPluginChannels; |
24 | 22 | import com.mumfrey.liteloader.core.PluginChannels.ChannelPolicy; |
25 | 23 | |
24 | +import io.netty.buffer.Unpooled; | |
25 | +import net.eq2online.permissions.ReplicatedPermissionsContainer; | |
26 | +import net.minecraft.network.INetHandler; | |
27 | +import net.minecraft.network.PacketBuffer; | |
28 | +import net.minecraft.network.play.server.SPacketJoinGame; | |
29 | + | |
26 | 30 | /** |
27 | 31 | * This class manages permissions on the client, it is a singleton class which |
28 | 32 | * can manage permissions for multiple client mods. It manages the client/server | ... | ... |
src/main/java/com/mumfrey/liteloader/permissions/PermissionsManagerServer.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.permissions; |
2 | 7 | |
3 | 8 | import java.util.List; |
4 | 9 | |
5 | -import net.minecraft.entity.player.EntityPlayerMP; | |
6 | -import net.minecraft.network.PacketBuffer; | |
7 | - | |
8 | 10 | import com.mumfrey.liteloader.Permissible; |
9 | 11 | import com.mumfrey.liteloader.ServerPluginChannelListener; |
10 | 12 | import com.mumfrey.liteloader.common.GameEngine; |
11 | 13 | |
14 | +import net.minecraft.entity.player.EntityPlayerMP; | |
15 | +import net.minecraft.network.PacketBuffer; | |
16 | + | |
12 | 17 | /** |
13 | 18 | * TODO implementation |
14 | 19 | * | ... | ... |
src/main/java/com/mumfrey/liteloader/permissions/ReplicatedPermissions.java
src/main/java/com/mumfrey/liteloader/permissions/ServerPermissions.java
src/main/java/com/mumfrey/liteloader/transformers/AppendInsns.java
src/main/java/com/mumfrey/liteloader/transformers/ByteCodeUtilities.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.transformers; |
2 | 7 | |
3 | 8 | import java.io.IOException; |
... | ... | @@ -8,13 +13,21 @@ import java.util.Iterator; |
8 | 13 | import java.util.List; |
9 | 14 | import java.util.Map; |
10 | 15 | |
11 | -import net.minecraft.launchwrapper.IClassTransformer; | |
12 | -import net.minecraft.launchwrapper.Launch; | |
13 | - | |
14 | 16 | import org.objectweb.asm.ClassReader; |
15 | 17 | import org.objectweb.asm.Opcodes; |
16 | 18 | import org.objectweb.asm.Type; |
17 | -import org.objectweb.asm.tree.*; | |
19 | +import org.objectweb.asm.tree.AbstractInsnNode; | |
20 | +import org.objectweb.asm.tree.AnnotationNode; | |
21 | +import org.objectweb.asm.tree.ClassNode; | |
22 | +import org.objectweb.asm.tree.FieldNode; | |
23 | +import org.objectweb.asm.tree.FrameNode; | |
24 | +import org.objectweb.asm.tree.InsnList; | |
25 | +import org.objectweb.asm.tree.LabelNode; | |
26 | +import org.objectweb.asm.tree.LocalVariableNode; | |
27 | +import org.objectweb.asm.tree.MethodInsnNode; | |
28 | +import org.objectweb.asm.tree.MethodNode; | |
29 | +import org.objectweb.asm.tree.TypeInsnNode; | |
30 | +import org.objectweb.asm.tree.VarInsnNode; | |
18 | 31 | import org.objectweb.asm.tree.analysis.Analyzer; |
19 | 32 | import org.objectweb.asm.tree.analysis.AnalyzerException; |
20 | 33 | import org.objectweb.asm.tree.analysis.BasicValue; |
... | ... | @@ -23,6 +36,9 @@ import org.objectweb.asm.tree.analysis.SimpleVerifier; |
23 | 36 | |
24 | 37 | import com.mumfrey.liteloader.core.runtime.Obf; |
25 | 38 | |
39 | +import net.minecraft.launchwrapper.IClassTransformer; | |
40 | +import net.minecraft.launchwrapper.Launch; | |
41 | + | |
26 | 42 | /** |
27 | 43 | * Utility methods for working with bytecode using ASM |
28 | 44 | * | ... | ... |
src/main/java/com/mumfrey/liteloader/transformers/Callback.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.transformers; |
2 | 7 | |
3 | 8 | import java.util.ArrayList; |
... | ... | @@ -278,4 +283,4 @@ public class Callback |
278 | 283 | { |
279 | 284 | return super.hashCode(); |
280 | 285 | } |
281 | -} | |
282 | 286 | \ No newline at end of file |
287 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/transformers/CallbackInjectionTransformer.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.transformers; |
2 | 7 | |
3 | 8 | import java.util.HashMap; |
... | ... | @@ -236,7 +241,9 @@ public abstract class CallbackInjectionTransformer extends ClassTransformer |
236 | 241 | if (callback.getChainedCallbacks().size() > 0) |
237 | 242 | { |
238 | 243 | for (Callback chainedCallback : callback.getChainedCallbacks()) |
244 | + { | |
239 | 245 | this.genProfilerCallbackInsns(injected, chainedCallback, refNumber); |
246 | + } | |
240 | 247 | } |
241 | 248 | |
242 | 249 | return injected; | ... | ... |
src/main/java/com/mumfrey/liteloader/transformers/ClassOverlayTransformer.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.transformers; |
2 | 7 | |
3 | 8 | import java.io.IOException; |
... | ... | @@ -8,8 +13,6 @@ import java.util.List; |
8 | 13 | import java.util.Map; |
9 | 14 | import java.util.Set; |
10 | 15 | |
11 | -import net.minecraft.launchwrapper.Launch; | |
12 | - | |
13 | 16 | import org.objectweb.asm.ClassReader; |
14 | 17 | import org.objectweb.asm.ClassWriter; |
15 | 18 | import org.objectweb.asm.Opcodes; |
... | ... | @@ -27,6 +30,8 @@ import org.objectweb.asm.tree.MethodNode; |
27 | 30 | |
28 | 31 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
29 | 32 | |
33 | +import net.minecraft.launchwrapper.Launch; | |
34 | + | |
30 | 35 | /** |
31 | 36 | * This transformer applies one class to another as an "overlay". This works by |
32 | 37 | * merging down and replacing all methods and fields from the "overlay" class | ... | ... |
src/main/java/com/mumfrey/liteloader/transformers/ClassTransformer.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.transformers; |
2 | 7 | |
3 | -import net.minecraft.launchwrapper.IClassTransformer; | |
4 | - | |
5 | 8 | import org.objectweb.asm.ClassReader; |
6 | 9 | import org.objectweb.asm.ClassWriter; |
7 | 10 | import org.objectweb.asm.tree.ClassNode; |
8 | 11 | |
12 | +import net.minecraft.launchwrapper.IClassTransformer; | |
13 | + | |
9 | 14 | /** |
10 | 15 | * Base class for transformers which work via ClassNode |
11 | 16 | * |
... | ... | @@ -60,4 +65,4 @@ public abstract class ClassTransformer implements IClassTransformer |
60 | 65 | int dotPos = className.lastIndexOf('.'); |
61 | 66 | return dotPos == -1 ? className : className.substring(dotPos + 1); |
62 | 67 | } |
63 | -} | |
64 | 68 | \ No newline at end of file |
69 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/transformers/InjectedCallbackCollisionError.java
src/main/java/com/mumfrey/liteloader/transformers/InvalidOverlayException.java
src/main/java/com/mumfrey/liteloader/transformers/IsolatedClassWriter.java
src/main/java/com/mumfrey/liteloader/transformers/ObfProvider.java
src/main/java/com/mumfrey/liteloader/transformers/Obfuscated.java
src/main/java/com/mumfrey/liteloader/transformers/PacketHandlerException.java
src/main/java/com/mumfrey/liteloader/transformers/Stub.java
src/main/java/com/mumfrey/liteloader/transformers/access/Accessor.java
src/main/java/com/mumfrey/liteloader/transformers/access/AccessorTransformer.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.transformers.access; |
2 | 7 | |
3 | 8 | import java.io.IOException; |
... | ... | @@ -7,8 +12,6 @@ import java.util.List; |
7 | 12 | import java.util.regex.Matcher; |
8 | 13 | import java.util.regex.Pattern; |
9 | 14 | |
10 | -import net.minecraft.launchwrapper.Launch; | |
11 | - | |
12 | 15 | import org.objectweb.asm.Opcodes; |
13 | 16 | import org.objectweb.asm.Type; |
14 | 17 | import org.objectweb.asm.tree.AnnotationNode; |
... | ... | @@ -29,6 +32,8 @@ import com.mumfrey.liteloader.transformers.ClassTransformer; |
29 | 32 | import com.mumfrey.liteloader.transformers.ObfProvider; |
30 | 33 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
31 | 34 | |
35 | +import net.minecraft.launchwrapper.Launch; | |
36 | + | |
32 | 37 | /** |
33 | 38 | * Transformer which can inject accessor methods defined by an annotated |
34 | 39 | * interface into a target class. | ... | ... |
src/main/java/com/mumfrey/liteloader/transformers/access/Invoker.java
src/main/java/com/mumfrey/liteloader/transformers/access/ObfTableClass.java
src/main/java/com/mumfrey/liteloader/transformers/event/Event.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.transformers.event; |
2 | 7 | |
3 | 8 | import java.util.ArrayList; |
... | ... | @@ -12,7 +17,19 @@ import java.util.Set; |
12 | 17 | import org.objectweb.asm.Label; |
13 | 18 | import org.objectweb.asm.Opcodes; |
14 | 19 | import org.objectweb.asm.Type; |
15 | -import org.objectweb.asm.tree.*; | |
20 | +import org.objectweb.asm.tree.AbstractInsnNode; | |
21 | +import org.objectweb.asm.tree.ClassNode; | |
22 | +import org.objectweb.asm.tree.InsnList; | |
23 | +import org.objectweb.asm.tree.InsnNode; | |
24 | +import org.objectweb.asm.tree.JumpInsnNode; | |
25 | +import org.objectweb.asm.tree.LabelNode; | |
26 | +import org.objectweb.asm.tree.LdcInsnNode; | |
27 | +import org.objectweb.asm.tree.LineNumberNode; | |
28 | +import org.objectweb.asm.tree.MethodInsnNode; | |
29 | +import org.objectweb.asm.tree.MethodNode; | |
30 | +import org.objectweb.asm.tree.TryCatchBlockNode; | |
31 | +import org.objectweb.asm.tree.TypeInsnNode; | |
32 | +import org.objectweb.asm.tree.VarInsnNode; | |
16 | 33 | |
17 | 34 | import com.mumfrey.liteloader.core.runtime.Obf; |
18 | 35 | import com.mumfrey.liteloader.transformers.ByteCodeUtilities; |
... | ... | @@ -561,10 +578,12 @@ public class Event implements Comparable<Event> |
561 | 578 | static Event getEvent(String eventName) |
562 | 579 | { |
563 | 580 | for (Event event : Event.events) |
581 | + { | |
564 | 582 | if (event.name.equalsIgnoreCase(eventName)) |
565 | 583 | { |
566 | 584 | return event; |
567 | 585 | } |
586 | + } | |
568 | 587 | |
569 | 588 | return null; |
570 | 589 | } | ... | ... |
src/main/java/com/mumfrey/liteloader/transformers/event/EventAlreadyInjectedException.java
src/main/java/com/mumfrey/liteloader/transformers/event/EventInfo.java
src/main/java/com/mumfrey/liteloader/transformers/event/EventInjectionTransformer.java
src/main/java/com/mumfrey/liteloader/transformers/event/EventProxyTransformer.java
src/main/java/com/mumfrey/liteloader/transformers/event/EventTransformer.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.transformers.event; |
2 | 7 | |
3 | 8 | import java.io.File; |
... | ... | @@ -20,6 +25,7 @@ import org.objectweb.asm.tree.ClassNode; |
20 | 25 | import org.objectweb.asm.tree.LocalVariableNode; |
21 | 26 | import org.objectweb.asm.tree.MethodNode; |
22 | 27 | import org.objectweb.asm.util.CheckClassAdapter; |
28 | + | |
23 | 29 | import com.google.common.collect.Maps; |
24 | 30 | import com.mumfrey.liteloader.core.runtime.Obf; |
25 | 31 | import com.mumfrey.liteloader.transformers.ByteCodeUtilities; |
... | ... | @@ -184,7 +190,9 @@ public final class EventTransformer extends ClassTransformer |
184 | 190 | { |
185 | 191 | boolean cancellable = false; |
186 | 192 | for (Event event : this.events) |
193 | + { | |
187 | 194 | cancellable |= event.isCancellable(); |
195 | + } | |
188 | 196 | return cancellable; |
189 | 197 | } |
190 | 198 | } |
... | ... | @@ -412,4 +420,4 @@ public final class EventTransformer extends ClassTransformer |
412 | 420 | LiteLoaderLogger.debug("Listed %d injection candidates with %d uninjected", eventCount, uninjectedCount); |
413 | 421 | LiteLoaderLogger.debug(ClassTransformer.HORIZONTAL_RULE); |
414 | 422 | } |
415 | -} | |
416 | 423 | \ No newline at end of file |
424 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/transformers/event/InjectionPoint.java
src/main/java/com/mumfrey/liteloader/transformers/event/Jump.java
src/main/java/com/mumfrey/liteloader/transformers/event/MethodInfo.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.transformers.event; |
2 | 7 | |
3 | -import joptsimple.internal.Strings; | |
4 | - | |
5 | 8 | import com.mumfrey.liteloader.core.runtime.Obf; |
6 | 9 | import com.mumfrey.liteloader.transformers.ByteCodeUtilities; |
7 | 10 | |
11 | +import joptsimple.internal.Strings; | |
12 | + | |
8 | 13 | /** |
9 | 14 | * Encapsulates a method descriptor with varying degrees of accuracy from a |
10 | 15 | * simpler owner/method mapping up to and including a multi-faceted | ... | ... |
src/main/java/com/mumfrey/liteloader/transformers/event/ReadOnlyInsnList.java
src/main/java/com/mumfrey/liteloader/transformers/event/ReturnEventInfo.java
src/main/java/com/mumfrey/liteloader/transformers/event/inject/BeforeFieldAccess.java
src/main/java/com/mumfrey/liteloader/transformers/event/inject/BeforeInvoke.java
src/main/java/com/mumfrey/liteloader/transformers/event/inject/BeforeNew.java
src/main/java/com/mumfrey/liteloader/transformers/event/inject/BeforeReturn.java
src/main/java/com/mumfrey/liteloader/transformers/event/inject/BeforeStringInvoke.java
src/main/java/com/mumfrey/liteloader/transformers/event/inject/JumpInsnPoint.java
src/main/java/com/mumfrey/liteloader/transformers/event/inject/MethodHead.java
src/main/java/com/mumfrey/liteloader/transformers/event/json/InvalidEventJsonException.java
src/main/java/com/mumfrey/liteloader/transformers/event/json/JsonDescriptor.java
src/main/java/com/mumfrey/liteloader/transformers/event/json/JsonEvent.java
src/main/java/com/mumfrey/liteloader/transformers/event/json/JsonEvents.java
src/main/java/com/mumfrey/liteloader/transformers/event/json/JsonInjection.java
src/main/java/com/mumfrey/liteloader/transformers/event/json/JsonInjectionShiftType.java
src/main/java/com/mumfrey/liteloader/transformers/event/json/JsonInjectionType.java
src/main/java/com/mumfrey/liteloader/transformers/event/json/JsonMethods.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.transformers.event.json; |
2 | 7 | |
3 | 8 | import java.util.HashMap; |
... | ... | @@ -77,4 +82,4 @@ public class JsonMethods |
77 | 82 | |
78 | 83 | throw new InvalidEventJsonException("Could not locate method descriptor with token " + token); |
79 | 84 | } |
80 | -} | |
81 | 85 | \ No newline at end of file |
86 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/transformers/event/json/JsonObf.java
src/main/java/com/mumfrey/liteloader/transformers/event/json/JsonObfuscationTable.java
src/main/java/com/mumfrey/liteloader/transformers/event/json/ModEventInjectionTransformer.java
src/main/java/com/mumfrey/liteloader/transformers/event/json/ModEvents.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.transformers.event.json; |
2 | 7 | |
3 | 8 | import java.io.File; |
... | ... | @@ -5,8 +10,6 @@ import java.net.MalformedURLException; |
5 | 10 | import java.util.HashMap; |
6 | 11 | import java.util.Map; |
7 | 12 | |
8 | -import net.minecraft.launchwrapper.Launch; | |
9 | - | |
10 | 13 | import com.google.common.base.Charsets; |
11 | 14 | import com.mumfrey.liteloader.api.ContainerRegistry.DisabledReason; |
12 | 15 | import com.mumfrey.liteloader.api.EnumerationObserver; |
... | ... | @@ -17,6 +20,8 @@ import com.mumfrey.liteloader.interfaces.LoaderEnumerator; |
17 | 20 | import com.mumfrey.liteloader.interfaces.TweakContainer; |
18 | 21 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
19 | 22 | |
23 | +import net.minecraft.launchwrapper.Launch; | |
24 | + | |
20 | 25 | public class ModEvents implements EnumerationObserver |
21 | 26 | { |
22 | 27 | public static class ModEventDefinition | ... | ... |
src/main/java/com/mumfrey/liteloader/update/UpdateSite.java
src/main/java/com/mumfrey/liteloader/util/ChatUtilities.java
src/main/java/com/mumfrey/liteloader/util/EntityUtilities.java
src/main/java/com/mumfrey/liteloader/util/Input.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.util; |
2 | 7 | |
8 | +import com.mumfrey.liteloader.api.CoreProvider; | |
9 | +import com.mumfrey.liteloader.core.LiteLoaderMods; | |
10 | +import com.mumfrey.liteloader.util.jinput.ComponentRegistry; | |
11 | + | |
3 | 12 | import net.minecraft.client.settings.KeyBinding; |
4 | 13 | import net.minecraft.network.INetHandler; |
5 | 14 | import net.minecraft.network.play.server.SPacketJoinGame; |
6 | 15 | import net.minecraft.world.World; |
7 | 16 | |
8 | -import com.mumfrey.liteloader.api.CoreProvider; | |
9 | -import com.mumfrey.liteloader.core.LiteLoaderMods; | |
10 | -import com.mumfrey.liteloader.util.jinput.ComponentRegistry; | |
11 | - | |
12 | 17 | public abstract class Input implements CoreProvider |
13 | 18 | { |
14 | 19 | /** |
... | ... | @@ -90,4 +95,4 @@ public abstract class Input implements CoreProvider |
90 | 95 | public void onPostRender(int mouseX, int mouseY, float partialTicks) |
91 | 96 | { |
92 | 97 | } |
93 | -} | |
94 | 98 | \ No newline at end of file |
99 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/util/InputEvent.java
src/main/java/com/mumfrey/liteloader/util/InputHandler.java
src/main/java/com/mumfrey/liteloader/util/ObfuscationUtilities.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.util; |
2 | 7 | |
8 | +import com.mumfrey.liteloader.core.runtime.Obf; | |
9 | + | |
3 | 10 | import net.minecraft.launchwrapper.IClassTransformer; |
4 | 11 | import net.minecraft.launchwrapper.Launch; |
5 | 12 | import net.minecraft.server.MinecraftServer; |
6 | 13 | import net.minecraft.util.math.BlockPos; |
7 | 14 | |
8 | -import com.mumfrey.liteloader.core.runtime.Obf; | |
9 | - | |
10 | 15 | public class ObfuscationUtilities |
11 | 16 | { |
12 | 17 | /** | ... | ... |
src/main/java/com/mumfrey/liteloader/util/Position.java
src/main/java/com/mumfrey/liteloader/util/PrivateFields.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.util; |
2 | 7 | |
3 | 8 | import java.lang.reflect.Field; |
... | ... | @@ -122,4 +127,4 @@ public class PrivateFields<P, T> |
122 | 127 | |
123 | 128 | return value; |
124 | 129 | } |
125 | -} | |
126 | 130 | \ No newline at end of file |
131 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/util/SortableValue.java
src/main/java/com/mumfrey/liteloader/util/jinput/ComponentRegistry.java
src/main/java/com/mumfrey/liteloader/util/log/LiteLoaderLogger.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.util.log; |
2 | 7 | |
3 | 8 | import java.io.IOException; |
... | ... | @@ -5,6 +10,7 @@ import java.io.PrintWriter; |
5 | 10 | import java.io.StringWriter; |
6 | 11 | import java.util.ArrayList; |
7 | 12 | import java.util.Date; |
13 | +import java.util.Deque; | |
8 | 14 | import java.util.LinkedList; |
9 | 15 | import java.util.List; |
10 | 16 | import java.util.MissingFormatArgumentException; |
... | ... | @@ -29,7 +35,7 @@ public class LiteLoaderLogger extends AbstractAppender |
29 | 35 | |
30 | 36 | private static Logger logger = (Logger)LogManager.getLogger("LiteLoader"); |
31 | 37 | |
32 | - private static LinkedList<String> logTail = new LinkedList<String>(); | |
38 | + private static Deque<String> logTail = new LinkedList<String>(); | |
33 | 39 | |
34 | 40 | private static long logIndex = 0; |
35 | 41 | |
... | ... | @@ -311,4 +317,4 @@ public class LiteLoaderLogger extends AbstractAppender |
311 | 317 | th.printStackTrace(); |
312 | 318 | } |
313 | 319 | } |
314 | -} | |
315 | 320 | \ No newline at end of file |
321 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/util/net/HttpStringRetriever.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.util.net; |
2 | 7 | |
3 | 8 | import java.io.BufferedReader; |
... | ... | @@ -188,7 +193,9 @@ public class HttpStringRetriever extends Thread |
188 | 193 | if (this.headers != null) |
189 | 194 | { |
190 | 195 | for (Entry<String, String> header : this.headers.entrySet()) |
196 | + { | |
191 | 197 | httpClient.addRequestProperty(header.getKey(), header.getValue()); |
198 | + } | |
192 | 199 | } |
193 | 200 | |
194 | 201 | this.httpResponseCode = httpClient.getResponseCode(); |
... | ... | @@ -229,4 +236,4 @@ public class HttpStringRetriever extends Thread |
229 | 236 | |
230 | 237 | return readString.toString(); |
231 | 238 | } |
232 | -} | |
233 | 239 | \ No newline at end of file |
240 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/util/net/LiteLoaderLogUpload.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.util.net; |
2 | 7 | |
3 | 8 | import java.io.BufferedReader; |
... | ... | @@ -123,4 +128,4 @@ public class LiteLoaderLogUpload extends Thread |
123 | 128 | |
124 | 129 | this.completed = true; |
125 | 130 | } |
126 | -} | |
127 | 131 | \ No newline at end of file |
132 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/util/net/PastebinUpload.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package com.mumfrey.liteloader.util.net; |
2 | 7 | |
3 | 8 | import java.io.BufferedReader; |
... | ... | @@ -132,4 +137,4 @@ public class PastebinUpload extends Thread |
132 | 137 | |
133 | 138 | this.completed = true; |
134 | 139 | } |
135 | -} | |
136 | 140 | \ No newline at end of file |
141 | +} | ... | ... |
src/main/java/com/mumfrey/liteloader/util/render/Icon.java
src/main/java/com/mumfrey/liteloader/util/render/IconClickable.java
src/main/java/com/mumfrey/liteloader/util/render/IconTextured.java
src/main/java/net/eq2online/permissions/ReplicatedPermissionsContainer.java
1 | +/* | |
2 | + * This file is part of LiteLoader. | |
3 | + * Copyright (C) 2012-16 Adam Mummery-Smith | |
4 | + * All Rights Reserved. | |
5 | + */ | |
1 | 6 | package net.eq2online.permissions; |
2 | 7 | |
3 | -import java.io.*; | |
8 | +import java.io.ByteArrayInputStream; | |
9 | +import java.io.ByteArrayOutputStream; | |
10 | +import java.io.IOException; | |
11 | +import java.io.ObjectInputStream; | |
12 | +import java.io.ObjectOutputStream; | |
13 | +import java.io.Serializable; | |
4 | 14 | import java.util.Collection; |
5 | 15 | import java.util.Set; |
6 | 16 | import java.util.TreeSet; | ... | ... |