Anvilcraft/ModularPowersuits
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ModularPowersuits-0.11.1.111 fix stuff broken in proxy refactoring

Browse source
This commit is contained in:
Leon 2017-02-17 12:25:45 -05:00
parent 6f927ddbfe
commit 9ace6b46fa
3 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/net/machinemuse/powersuits/common/proxy/ClientProxy.java
View file

@ -45,9 +45,8 @@ import java.net.URL;
public class ClientProxy extends CommonProxy {
@Override
public void registerEvents() {
super.registerEvents();
MinecraftForge.EVENT_BUS.register(new SoundDictionary());
MinecraftForge.EVENT_BUS.register(new RenderEventHandler());
MinecraftForge.EVENT_BUS.register(new PlayerUpdateHandler());
}
/**
@ -55,6 +54,7 @@ public class ClientProxy extends CommonProxy {
*/
@Override
public void registerRenderers() {
super.registerRenderers();
MinecraftForgeClient.registerItemRenderer(MPSItems.getInstance().powerTool, new ToolRenderer());
int tinkTableRenderID = RenderingRegistry.getNextAvailableRenderId();
TinkerTableRenderer tinkTableRenderer = new TinkerTableRenderer(tinkTableRenderID);
@ -69,6 +69,7 @@ public class ClientProxy extends CommonProxy {
RenderingRegistry.registerEntityRenderingHandler(EntityPlasmaBolt.class, new RenderPlasmaBolt());
RenderingRegistry.registerEntityRenderingHandler(EntitySpinningBlade.class, new RenderSpinningBlade());
RenderingRegistry.registerEntityRenderingHandler(EntityLuxCapacitor.class, new RenderLuxCapacitorEntity());
MinecraftForge.EVENT_BUS.register(new RenderEventHandler());
URL resource = ClientProxy.class.getResource("/assets/powersuits/models/modelspec.xml");
ModelSpecXMLReader.getINSTANCE().parseFile(resource);
URL otherResource = ClientProxy.class.getResource("/assets/powersuits/models/armor2.xml");
@ -81,6 +82,8 @@ public class ClientProxy extends CommonProxy {
*/
@Override
public void registerHandlers() {
super.registerHandlers();
MinecraftForge.EVENT_BUS.register(new PlayerUpdateHandler());
FMLCommonHandler.instance().bus().register(new KeybindKeyHandler());
FMLCommonHandler.instance().bus().register(new ClientTickHandler());
}

8
src/main/java/net/machinemuse/powersuits/common/proxy/CommonProxy.java
View file

@ -30,7 +30,7 @@ import java.io.File;
*
* Ported to Java by lehjr on 11/14/16.
*/
public abstract class CommonProxy {
public class CommonProxy {
public void preInit(FMLPreInitializationEvent event) {
File newConfig = new File(event.getModConfigurationDirectory() + "/machinemuse/powersuits.cfg");
Config.init(new Configuration(newConfig));
@ -77,9 +77,9 @@ public abstract class CommonProxy {
MinecraftForge.EVENT_BUS.register(new MovementManager());
}
public abstract void registerHandlers();
public void registerHandlers() {};
public abstract void registerRenderers();
public void registerRenderers() {};
public abstract void sendModeChange(int dMode, String newMode);
public void sendModeChange(int dMode, String newMode) {};
}

13
src/main/java/net/machinemuse/powersuits/common/proxy/ServerProxy.java
View file

@ -17,21 +17,10 @@ public class ServerProxy extends CommonProxy{
public void registerEvents() {
super.registerEvents();
FMLCommonHandler.instance().bus().register(new PlayerLoginHandlerThingy());
MinecraftForge.EVENT_BUS.register(new PlayerUpdateHandler());
}
@Override
public void registerHandlers() {
}
@Override
public void registerRenderers() {
}
@Override
public void sendModeChange(int dMode, String newMode) {
MinecraftForge.EVENT_BUS.register(new PlayerUpdateHandler());
}
}