Commit 6f71faf8a2a71dec088ad8bd9056d55318139b67

Authored by Mumfrey
1 parent 405ae832

srtipping methods which were deprecated in 1.7

java/client/com/mumfrey/liteloader/client/EventsClient.java
@@ -137,20 +137,6 @@ public class EventsClient extends Events<Minecraft, IntegratedServer> @@ -137,20 +137,6 @@ public class EventsClient extends Events<Minecraft, IntegratedServer>
137 } 137 }
138 138
139 /** 139 /**
140 - * @deprecated use LiteLoader.getInterfaceManager().registerListener(listener); instead  
141 - * @param tickListener  
142 - */  
143 - @Deprecated  
144 - @Override  
145 - public void addTickListener(Object tickListener)  
146 - {  
147 - if (tickListener instanceof Tickable)  
148 - {  
149 - this.addTickListener((Tickable)tickListener);  
150 - }  
151 - }  
152 -  
153 - /**  
154 * @param tickable 140 * @param tickable
155 */ 141 */
156 public void addTickListener(Tickable tickable) 142 public void addTickListener(Tickable tickable)
java/client/com/mumfrey/liteloader/util/ModUtilities.java
@@ -245,30 +245,6 @@ public abstract class ModUtilities @@ -245,30 +245,6 @@ public abstract class ModUtilities
245 boolean deobfuscated = Tessellator.class.getSimpleName().equals("Tessellator"); 245 boolean deobfuscated = Tessellator.class.getSimpleName().equals("Tessellator");
246 return deobfuscated ? (ModUtilities.seargeNames ? obf.srg : obf.name) : (ModUtilities.fmlDetected ? obf.srg : obf.obf); 246 return deobfuscated ? (ModUtilities.seargeNames ? obf.srg : obf.name) : (ModUtilities.fmlDetected ? obf.srg : obf.obf);
247 } 247 }
248 -  
249 - /**  
250 - * Registers a keybind with the game settings class so that it is configurable in the "controls" screen  
251 - *  
252 - * @param newBinding key binding to add  
253 - * @deprecated Deprecated : use LiteLoader.getInput().registerKeyBinding() instead  
254 - */  
255 - @Deprecated  
256 - public static void registerKey(KeyBinding newBinding)  
257 - {  
258 - LiteLoader.getInput().registerKeyBinding(newBinding);  
259 - }  
260 -  
261 - /**  
262 - * Unregisters a registered keybind with the game settings class, thus removing it from the "controls" screen  
263 - *  
264 - * @param removeBinding  
265 - * @deprecated Deprecated : use LiteLoader.getInput().unRegisterKeyBinding() instead  
266 - */  
267 - @Deprecated  
268 - public static void unRegisterKey(KeyBinding removeBinding)  
269 - {  
270 - LiteLoader.getInput().unRegisterKeyBinding(removeBinding);  
271 - }  
272 248
273 @SuppressWarnings("unchecked") 249 @SuppressWarnings("unchecked")
274 private static <K, V> V removeObjectFromRegistry(RegistrySimple registry, K key) 250 private static <K, V> V removeObjectFromRegistry(RegistrySimple registry, K key)
java/common/com/mumfrey/liteloader/core/Events.java
@@ -96,16 +96,6 @@ public abstract class Events&lt;TClient, TServer extends MinecraftServer&gt; implement @@ -96,16 +96,6 @@ public abstract class Events&lt;TClient, TServer extends MinecraftServer&gt; implement
96 96
97 LoadingProgress.setMessage("Starting Game..."); 97 LoadingProgress.setMessage("Starting Game...");
98 } 98 }
99 -  
100 - /**  
101 - * @param listener  
102 - * @deprecated Use LiteLoader.getInterfaceManager().registerListener() instead  
103 - */  
104 - @Deprecated  
105 - public void addListener(LiteMod listener)  
106 - {  
107 - LiteLoader.getInterfaceManager().registerListener(listener);  
108 - }  
109 99
110 /* (non-Javadoc) 100 /* (non-Javadoc)
111 * @see com.mumfrey.liteloader.api.InterfaceProvider#getListenerBaseType() 101 * @see com.mumfrey.liteloader.api.InterfaceProvider#getListenerBaseType()
@@ -255,23 +245,4 @@ public abstract class Events&lt;TClient, TServer extends MinecraftServer&gt; implement @@ -255,23 +245,4 @@ public abstract class Events&lt;TClient, TServer extends MinecraftServer&gt; implement
255 { 245 {
256 this.loader.onWorldChanged(world); 246 this.loader.onWorldChanged(world);
257 } 247 }
258 -  
259 - /**  
260 - * @deprecated use LiteLoader.getInterfaceManager().registerListener(listener); instead  
261 - * @param chatFilter  
262 - */  
263 - @Deprecated  
264 - public void addChatFilter(Object chatFilter)  
265 - {  
266 -  
267 - }  
268 -  
269 - /**  
270 - * @deprecated use LiteLoader.getInterfaceManager().registerListener(listener); instead  
271 - * @param tickListener  
272 - */  
273 - @Deprecated  
274 - public void addTickListener(Object tickListener)  
275 - {  
276 - }  
277 } 248 }
java/common/com/mumfrey/liteloader/core/LiteLoader.java
1 package com.mumfrey.liteloader.core; 1 package com.mumfrey.liteloader.core;
2 2
3 import java.io.File; 3 import java.io.File;
4 -import java.io.PrintStream;  
5 import java.util.ArrayList; 4 import java.util.ArrayList;
6 import java.util.Collection; 5 import java.util.Collection;
7 import java.util.List; 6 import java.util.List;
8 7
9 import javax.activity.InvalidActivityException; 8 import javax.activity.InvalidActivityException;
10 9
11 -import net.minecraft.client.resources.IResourcePack;  
12 import net.minecraft.crash.CrashReport; 10 import net.minecraft.crash.CrashReport;
13 import net.minecraft.crash.CrashReportCategory; 11 import net.minecraft.crash.CrashReportCategory;
14 import net.minecraft.launchwrapper.LaunchClassLoader; 12 import net.minecraft.launchwrapper.LaunchClassLoader;
@@ -43,8 +41,8 @@ import com.mumfrey.liteloader.interfaces.FastIterableDeque; @@ -43,8 +41,8 @@ import com.mumfrey.liteloader.interfaces.FastIterableDeque;
43 import com.mumfrey.liteloader.interfaces.Loadable; 41 import com.mumfrey.liteloader.interfaces.Loadable;
44 import com.mumfrey.liteloader.interfaces.LoadableMod; 42 import com.mumfrey.liteloader.interfaces.LoadableMod;
45 import com.mumfrey.liteloader.interfaces.LoaderEnumerator; 43 import com.mumfrey.liteloader.interfaces.LoaderEnumerator;
46 -import com.mumfrey.liteloader.interfaces.PanelManager;  
47 import com.mumfrey.liteloader.interfaces.ObjectFactory; 44 import com.mumfrey.liteloader.interfaces.ObjectFactory;
  45 +import com.mumfrey.liteloader.interfaces.PanelManager;
48 import com.mumfrey.liteloader.launch.LoaderEnvironment; 46 import com.mumfrey.liteloader.launch.LoaderEnvironment;
49 import com.mumfrey.liteloader.launch.LoaderProperties; 47 import com.mumfrey.liteloader.launch.LoaderProperties;
50 import com.mumfrey.liteloader.messaging.MessageBus; 48 import com.mumfrey.liteloader.messaging.MessageBus;
@@ -263,30 +261,6 @@ public final class LiteLoader @@ -263,30 +261,6 @@ public final class LiteLoader
263 // Save stuff 261 // Save stuff
264 this.properties.writeProperties(); 262 this.properties.writeProperties();
265 } 263 }
266 -  
267 - /**  
268 - * @param resourcePack  
269 - * @return  
270 - *  
271 - * @deprecated Use LiteLoader.getGameEngine().registerResourcePack() instead  
272 - */  
273 - @Deprecated  
274 - public boolean registerModResourcePack(IResourcePack resourcePack)  
275 - {  
276 - return this.engine.registerResourcePack(resourcePack);  
277 - }  
278 -  
279 - /**  
280 - * @param resourcePack  
281 - * @return  
282 - *  
283 - * @deprecated Use LiteLoader.getGameEngine().unRegisterResourcePack() instead  
284 - */  
285 - @Deprecated  
286 - public boolean unRegisterModResourcePack(IResourcePack resourcePack)  
287 - {  
288 - return this.engine.unRegisterResourcePack(resourcePack);  
289 - }  
290 264
291 /** 265 /**
292 * Get the singleton instance of LiteLoader, initialises the loader if 266 * Get the singleton instance of LiteLoader, initialises the loader if
@@ -301,18 +275,6 @@ public final class LiteLoader @@ -301,18 +275,6 @@ public final class LiteLoader
301 } 275 }
302 276
303 /** 277 /**
304 - * Get the LiteLoader logger object  
305 - *  
306 - * @return  
307 - * @deprecated use LiteLoaderLogger instead  
308 - */  
309 - @Deprecated  
310 - public static final Logger getLogger()  
311 - {  
312 - return LiteLoader.logger;  
313 - }  
314 -  
315 - /**  
316 * Get the tweak system classloader 278 * Get the tweak system classloader
317 * 279 *
318 * @return 280 * @return
@@ -323,18 +285,6 @@ public final class LiteLoader @@ -323,18 +285,6 @@ public final class LiteLoader
323 } 285 }
324 286
325 /** 287 /**
326 - * Get the output stream which we are using for console output  
327 - *  
328 - * @return System.err  
329 - * @deprecated use log4j instead  
330 - */  
331 - @Deprecated  
332 - public static final PrintStream getConsoleStream()  
333 - {  
334 - return System.err;  
335 - }  
336 -  
337 - /**  
338 * Get LiteLoader version 288 * Get LiteLoader version
339 * 289 *
340 * @return 290 * @return
@@ -406,17 +356,6 @@ public final class LiteLoader @@ -406,17 +356,6 @@ public final class LiteLoader
406 return LiteLoader.getAPI(identifier) != null; 356 return LiteLoader.getAPI(identifier) != null;
407 } 357 }
408 358
409 - /**  
410 - * @return  
411 - *  
412 - * @deprecated use getClientPermissionsManager instead  
413 - */  
414 - @Deprecated  
415 - public static PermissionsManagerClient getPermissionsManager()  
416 - {  
417 - return LiteLoader.instance.permissionsManagerClient;  
418 - }  
419 -  
420 public static PermissionsManagerClient getClientPermissionsManager() 359 public static PermissionsManagerClient getClientPermissionsManager()
421 { 360 {
422 return LiteLoader.instance.permissionsManagerClient; 361 return LiteLoader.instance.permissionsManagerClient;
@@ -439,31 +378,6 @@ public final class LiteLoader @@ -439,31 +378,6 @@ public final class LiteLoader
439 { 378 {
440 return LiteLoader.instance.interfaceManager; 379 return LiteLoader.instance.interfaceManager;
441 } 380 }
442 -  
443 - /**  
444 - * Get the event manager  
445 - *  
446 - * @deprecated DO NOT USE, register listeners with the interface manager instead!  
447 - *  
448 - * @return  
449 - */  
450 - @Deprecated  
451 - public static Events<?, ?> getEvents()  
452 - {  
453 - return LiteLoader.instance.events;  
454 - }  
455 -  
456 - /**  
457 - * Get the plugin channel manager  
458 - *  
459 - * @return  
460 - * @deprecated use LiteLoader.getClientPluginChannels()  
461 - */  
462 - @Deprecated  
463 - public static ClientPluginChannels getPluginChannels()  
464 - {  
465 - return LiteLoader.instance.clientPluginChannels;  
466 - }  
467 381
468 /** 382 /**
469 * Get the client-side plugin channel manager 383 * Get the client-side plugin channel manager
@@ -1016,32 +930,6 @@ public final class LiteLoader @@ -1016,32 +930,6 @@ public final class LiteLoader
1016 930
1017 this.configManager.syncConfig(); 931 this.configManager.syncConfig();
1018 } 932 }
1019 -  
1020 - /**  
1021 - * Get whether the "mod info" screen tab is shown in the main menu  
1022 - *  
1023 - * @deprecated use getModPanelManager().getDisplayModInfoScreenTab(); instead  
1024 - */  
1025 - @Deprecated  
1026 - public boolean getDisplayModInfoScreenTab()  
1027 - {  
1028 - return (this.panelManager != null) ? this.panelManager.isTabVisible() : false;  
1029 - }  
1030 -  
1031 - /**  
1032 - * Display the "mod info" overlay over the specified GUI  
1033 - *  
1034 - * @param parentScreen  
1035 - *  
1036 - * @deprecated use getModPanelManager().displayModInfoScreen(parentScreen); instead  
1037 - */  
1038 - @SuppressWarnings("unchecked")  
1039 - @Deprecated  
1040 - public void displayModInfoScreen(Object parentScreen)  
1041 - {  
1042 - // Use implicit cast, because we want this to fail if the user tries to give us an invalid class  
1043 - if (this.panelManager != null) this.panelManager.displayLiteLoaderPanel(parentScreen);  
1044 - }  
1045 933
1046 /** 934 /**
1047 * @param objCrashReport This is an object so that we don't need to transform the obfuscated name in the transformer 935 * @param objCrashReport This is an object so that we don't need to transform the obfuscated name in the transformer