Add option to disable voice server
This commit is contained in:
parent
0bab44a522
commit
f4ced367cd
3 changed files with 19 additions and 3 deletions
|
@ -4,6 +4,7 @@ import java.io.BufferedInputStream;
|
||||||
import java.io.BufferedOutputStream;
|
import java.io.BufferedOutputStream;
|
||||||
import java.io.DataInputStream;
|
import java.io.DataInputStream;
|
||||||
import java.io.DataOutputStream;
|
import java.io.DataOutputStream;
|
||||||
|
import java.net.ConnectException;
|
||||||
import java.net.Socket;
|
import java.net.Socket;
|
||||||
|
|
||||||
import javax.sound.sampled.AudioFormat;
|
import javax.sound.sampled.AudioFormat;
|
||||||
|
@ -51,6 +52,8 @@ public class VoiceClient extends Thread
|
||||||
(inputThread = new VoiceInput(this)).start();
|
(inputThread = new VoiceInput(this)).start();
|
||||||
|
|
||||||
System.out.println("[Mekanism] VoiceServer: Successfully connected to server.");
|
System.out.println("[Mekanism] VoiceServer: Successfully connected to server.");
|
||||||
|
} catch(ConnectException e) {
|
||||||
|
System.err.println("[Mekanism] VoiceServer: Server's VoiceServer is disabled.");
|
||||||
} catch(Exception e) {
|
} catch(Exception e) {
|
||||||
System.err.println("[Mekanism] VoiceServer: Error while starting client connection.");
|
System.err.println("[Mekanism] VoiceServer: Error while starting client connection.");
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|
|
@ -149,6 +149,7 @@ public class CommonProxy
|
||||||
Mekanism.controlCircuitOreDict = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ControlCircuitOreDict", true).getBoolean(true);
|
Mekanism.controlCircuitOreDict = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ControlCircuitOreDict", true).getBoolean(true);
|
||||||
Mekanism.logPackets = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "LogPackets", false).getBoolean(true);
|
Mekanism.logPackets = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "LogPackets", false).getBoolean(true);
|
||||||
Mekanism.dynamicTankEasterEgg = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DynamicTankEasterEgg", false).getBoolean(true);
|
Mekanism.dynamicTankEasterEgg = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DynamicTankEasterEgg", false).getBoolean(true);
|
||||||
|
Mekanism.voiceServerEnabled = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoiceServerEnabled", true).getBoolean(true);
|
||||||
Mekanism.obsidianTNTDelay = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTDelay", 100).getInt();
|
Mekanism.obsidianTNTDelay = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTDelay", 100).getInt();
|
||||||
Mekanism.obsidianTNTBlastRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTBlastRadius", 12).getInt();
|
Mekanism.obsidianTNTBlastRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTBlastRadius", 12).getInt();
|
||||||
Mekanism.UPDATE_DELAY = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ClientUpdateDelay", 10).getInt();
|
Mekanism.UPDATE_DELAY = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ClientUpdateDelay", 10).getInt();
|
||||||
|
|
|
@ -222,6 +222,7 @@ public class Mekanism
|
||||||
public static boolean controlCircuitOreDict = true;
|
public static boolean controlCircuitOreDict = true;
|
||||||
public static boolean logPackets = false;
|
public static boolean logPackets = false;
|
||||||
public static boolean dynamicTankEasterEgg = false;
|
public static boolean dynamicTankEasterEgg = false;
|
||||||
|
public static boolean voiceServerEnabled = true;
|
||||||
public static int obsidianTNTBlastRadius = 12;
|
public static int obsidianTNTBlastRadius = 12;
|
||||||
public static int obsidianTNTDelay = 100;
|
public static int obsidianTNTDelay = 100;
|
||||||
public static int UPDATE_DELAY = 10;
|
public static int UPDATE_DELAY = 10;
|
||||||
|
@ -1038,15 +1039,23 @@ public class Mekanism
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void serverStarting(FMLServerStartingEvent event)
|
public void serverStarting(FMLServerStartingEvent event)
|
||||||
|
{
|
||||||
|
if(voiceServerEnabled)
|
||||||
{
|
{
|
||||||
voiceManager.start();
|
voiceManager.start();
|
||||||
|
}
|
||||||
|
|
||||||
event.registerServerCommand(new CommandMekanism());
|
event.registerServerCommand(new CommandMekanism());
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void serverStopping(FMLServerStoppingEvent event)
|
public void serverStopping(FMLServerStoppingEvent event)
|
||||||
|
{
|
||||||
|
if(voiceServerEnabled)
|
||||||
{
|
{
|
||||||
voiceManager.stop();
|
voiceManager.stop();
|
||||||
|
}
|
||||||
|
|
||||||
teleporters.clear();
|
teleporters.clear();
|
||||||
dynamicInventories.clear();
|
dynamicInventories.clear();
|
||||||
}
|
}
|
||||||
|
@ -1106,7 +1115,10 @@ public class Mekanism
|
||||||
MinecraftForge.EVENT_BUS.register(this);
|
MinecraftForge.EVENT_BUS.register(this);
|
||||||
|
|
||||||
//Set up VoiceServerManager
|
//Set up VoiceServerManager
|
||||||
|
if(voiceServerEnabled)
|
||||||
|
{
|
||||||
voiceManager = new VoiceServerManager();
|
voiceManager = new VoiceServerManager();
|
||||||
|
}
|
||||||
|
|
||||||
//Register with TransmitterNetworkRegistry
|
//Register with TransmitterNetworkRegistry
|
||||||
TransmitterNetworkRegistry.initiate();
|
TransmitterNetworkRegistry.initiate();
|
||||||
|
|
Loading…
Reference in a new issue