LiteLoader / LiteLoader · Commits

Commit 1ef9f4cf3eb4cfba3331f2baf4ba2133773b97b6

Authored by Mumfrey
1 parent 6e612fc4

pull up redundant methods from InputManager into Input

Inline Side-by-side
Showing 2 changed files with 29 additions and 32 deletions
java/client/com/mumfrey/liteloader/util/InputManager.java
  View file @1ef9f4c
@@ -17,19 +17,12 @@ import net.java.games.input.Controller; @@ -17,19 +17,12 @@ import net.java.games.input.Controller;
17 import net.java.games.input.Event; 17 import net.java.games.input.Event;
18 import net.java.games.input.EventQueue; 18 import net.java.games.input.EventQueue;
19 import net.minecraft.client.settings.KeyBinding; 19 import net.minecraft.client.settings.KeyBinding;
20 -import net.minecraft.network.INetHandler;  
21 -import net.minecraft.network.play.server.S01PacketJoinGame;  
22 import net.minecraft.profiler.Profiler; 20 import net.minecraft.profiler.Profiler;
23 -import net.minecraft.world.World;  
24 21
25 import com.mumfrey.liteloader.common.GameEngine; 22 import com.mumfrey.liteloader.common.GameEngine;
26 import com.mumfrey.liteloader.core.LiteLoader; 23 import com.mumfrey.liteloader.core.LiteLoader;
27 -import com.mumfrey.liteloader.core.LiteLoaderMods;  
28 import com.mumfrey.liteloader.launch.LoaderEnvironment; 24 import com.mumfrey.liteloader.launch.LoaderEnvironment;
29 import com.mumfrey.liteloader.launch.LoaderProperties; 25 import com.mumfrey.liteloader.launch.LoaderProperties;
30 -import com.mumfrey.liteloader.util.Input;  
31 -import com.mumfrey.liteloader.util.InputEvent;  
32 -import com.mumfrey.liteloader.util.InputHandler;  
33 import com.mumfrey.liteloader.util.jinput.ComponentRegistry; 26 import com.mumfrey.liteloader.util.jinput.ComponentRegistry;
34 27
35 /** 28 /**
@@ -120,31 +113,6 @@ public final class InputManager extends Input @@ -120,31 +113,6 @@ public final class InputManager extends Input
120 this.engine = engine; 113 this.engine = engine;
121 this.profiler = engine.getProfiler(); 114 this.profiler = engine.getProfiler();
122 } 115 }
123 -  
124 - @Override  
125 - public void onPostInitComplete(LiteLoaderMods mods)  
126 - {  
127 - }  
128 -  
129 - @Override  
130 - public void onStartupComplete()  
131 - {  
132 - }  
133 -  
134 - @Override  
135 - public void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)  
136 - {  
137 - }  
138 -  
139 - @Override  
140 - public void onWorldChanged(World world)  
141 - {  
142 - }  
143 -  
144 - @Override  
145 - public void onPostRender(int mouseX, int mouseY, float partialTicks)  
146 - {  
147 - }  
148 116
149 /** 117 /**
150 * Register a key for a mod 118 * Register a key for a mod
java/common/com/mumfrey/liteloader/util/Input.java
  View file @1ef9f4c
1 package com.mumfrey.liteloader.util; 1 package com.mumfrey.liteloader.util;
2 2
3 import net.minecraft.client.settings.KeyBinding; 3 import net.minecraft.client.settings.KeyBinding;
  4 +import net.minecraft.network.INetHandler;
  5 +import net.minecraft.network.play.server.S01PacketJoinGame;
  6 +import net.minecraft.world.World;
4 7
5 import com.mumfrey.liteloader.api.CoreProvider; 8 import com.mumfrey.liteloader.api.CoreProvider;
  9 +import com.mumfrey.liteloader.core.LiteLoaderMods;
6 import com.mumfrey.liteloader.util.jinput.ComponentRegistry; 10 import com.mumfrey.liteloader.util.jinput.ComponentRegistry;
7 11
8 public abstract class Input implements CoreProvider 12 public abstract class Input implements CoreProvider
@@ -57,4 +61,29 @@ public abstract class Input implements CoreProvider @@ -57,4 +61,29 @@ public abstract class Input implements CoreProvider
57 * @param handler 61 * @param handler
58 */ 62 */
59 public abstract InputEvent[] getEvents(String descriptor, InputHandler handler); 63 public abstract InputEvent[] getEvents(String descriptor, InputHandler handler);
  64 +
  65 + @Override
  66 + public void onPostInitComplete(LiteLoaderMods mods)
  67 + {
  68 + }
  69 +
  70 + @Override
  71 + public void onStartupComplete()
  72 + {
  73 + }
  74 +
  75 + @Override
  76 + public void onJoinGame(INetHandler netHandler, S01PacketJoinGame loginPacket)
  77 + {
  78 + }
  79 +
  80 + @Override
  81 + public void onWorldChanged(World world)
  82 + {
  83 + }
  84 +
  85 + @Override
  86 + public void onPostRender(int mouseX, int mouseY, float partialTicks)
  87 + {
  88 + }
60 } 89 }
61 \ No newline at end of file 90 \ No newline at end of file