Reformatted all the code using the default intelji formatting options.
This commit is contained in:
parent
2f63a24070
commit
e0ab0af822
363 changed files with 20524 additions and 23016 deletions
|
@ -13,53 +13,47 @@ import java.io.File;
|
|||
|
||||
public class CommandRegen extends CommandBase {
|
||||
|
||||
public static final String EE3_ENERGYVALUES_DIR =
|
||||
FMLCommonHandler.instance().getMinecraftServerInstance().getEntityWorld().getSaveHandler().getWorldDirectory()
|
||||
+ File.separator +"data" + File.separator
|
||||
+ Reference.LOWERCASE_MOD_ID + File.separator
|
||||
+ "energyvalues";
|
||||
public static final String EE3_ENERGYVALUES_DIR =
|
||||
FMLCommonHandler.instance().getMinecraftServerInstance().getEntityWorld().getSaveHandler().getWorldDirectory()
|
||||
+ File.separator + "data" + File.separator
|
||||
+ Reference.LOWERCASE_MOD_ID + File.separator
|
||||
+ "energyvalues";
|
||||
|
||||
@Override
|
||||
public String getCommandName()
|
||||
{
|
||||
return "eeregen";
|
||||
}
|
||||
@Override
|
||||
public String getCommandName() {
|
||||
return "eeregen";
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRequiredPermissionLevel()
|
||||
{
|
||||
return 4;
|
||||
}
|
||||
@Override
|
||||
public int getRequiredPermissionLevel() {
|
||||
return 4;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCommandUsage(ICommandSender commandSender)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
@Override
|
||||
public String getCommandUsage(ICommandSender commandSender) {
|
||||
return "";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void processCommand(ICommandSender commandSender, String[] args)
|
||||
{
|
||||
commandSender.addChatMessage(new ChatComponentText("Regening EMC Values..."));
|
||||
File energyValuesDirectory = new File(EE3_ENERGYVALUES_DIR);
|
||||
@Override
|
||||
public void processCommand(ICommandSender commandSender, String[] args) {
|
||||
commandSender.addChatMessage(new ChatComponentText("Regening EMC Values..."));
|
||||
File energyValuesDirectory = new File(EE3_ENERGYVALUES_DIR);
|
||||
|
||||
if(energyValuesDirectory.exists() && energyValuesDirectory.isDirectory())
|
||||
{
|
||||
File [] files = energyValuesDirectory.listFiles();
|
||||
for(File f : files)
|
||||
{
|
||||
if(f.getName().toLowerCase().contains(".gz")){
|
||||
f.delete();
|
||||
commandSender.addChatMessage(new ChatComponentText("Deleted " + f.getName()));
|
||||
}
|
||||
if (energyValuesDirectory.exists() && energyValuesDirectory.isDirectory()) {
|
||||
File[] files = energyValuesDirectory.listFiles();
|
||||
for (File f : files) {
|
||||
if (f.getName().toLowerCase().contains(".gz")) {
|
||||
f.delete();
|
||||
commandSender.addChatMessage(new ChatComponentText("Deleted " + f.getName()));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
commandSender.addChatMessage(new ChatComponentText("Regening EMC Values"));
|
||||
DynamicEnergyValueInitThread.initEnergyValueRegistry();
|
||||
EnergyValueRegistry.getInstance().setShouldRegenNextRestart(false);
|
||||
EnergyValueRegistry.getInstance().save();
|
||||
commandSender.addChatMessage(new ChatComponentText("Syncing all EMC Values"));
|
||||
new CommandSyncEnergyValues().processCommand(commandSender, args);
|
||||
}
|
||||
}
|
||||
}
|
||||
commandSender.addChatMessage(new ChatComponentText("Regening EMC Values"));
|
||||
DynamicEnergyValueInitThread.initEnergyValueRegistry();
|
||||
EnergyValueRegistry.getInstance().setShouldRegenNextRestart(false);
|
||||
EnergyValueRegistry.getInstance().save();
|
||||
commandSender.addChatMessage(new ChatComponentText("Syncing all EMC Values"));
|
||||
new CommandSyncEnergyValues().processCommand(commandSender, args);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,46 +13,42 @@ import java.io.File;
|
|||
|
||||
public class CommandReload extends CommandBase {
|
||||
|
||||
public static final String EE3_ENERGYVALUES_DIR =
|
||||
FMLCommonHandler.instance().getMinecraftServerInstance().getEntityWorld().getSaveHandler().getWorldDirectory()
|
||||
+ File.separator +"data" + File.separator
|
||||
+ Reference.LOWERCASE_MOD_ID + File.separator
|
||||
+ "energyvalues";
|
||||
public static final String EE3_ENERGYVALUES_DIR =
|
||||
FMLCommonHandler.instance().getMinecraftServerInstance().getEntityWorld().getSaveHandler().getWorldDirectory()
|
||||
+ File.separator + "data" + File.separator
|
||||
+ Reference.LOWERCASE_MOD_ID + File.separator
|
||||
+ "energyvalues";
|
||||
|
||||
@Override
|
||||
public String getCommandName()
|
||||
{
|
||||
return "eerelaod";
|
||||
}
|
||||
@Override
|
||||
public String getCommandName() {
|
||||
return "eerelaod";
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRequiredPermissionLevel()
|
||||
{
|
||||
return 4;
|
||||
}
|
||||
@Override
|
||||
public int getRequiredPermissionLevel() {
|
||||
return 4;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCommandUsage(ICommandSender commandSender)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
@Override
|
||||
public String getCommandUsage(ICommandSender commandSender) {
|
||||
return "";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void processCommand(ICommandSender commandSender, String[] args)
|
||||
{
|
||||
commandSender.addChatMessage(new ChatComponentText("Reloading EMC Values..."));
|
||||
File energyValuesDirectory = new File(EE3_ENERGYVALUES_DIR);
|
||||
@Override
|
||||
public void processCommand(ICommandSender commandSender, String[] args) {
|
||||
commandSender.addChatMessage(new ChatComponentText("Reloading EMC Values..."));
|
||||
File energyValuesDirectory = new File(EE3_ENERGYVALUES_DIR);
|
||||
|
||||
if(energyValuesDirectory.exists() && energyValuesDirectory.isDirectory()) {
|
||||
File staticValues = new File(energyValuesDirectory, Files.STATIC_ENERGY_VALUES_JSON);
|
||||
commandSender.addChatMessage(new ChatComponentText("Looking for " + staticValues.getName()));
|
||||
if(staticValues.exists()){
|
||||
commandSender.addChatMessage(new ChatComponentText("Found static values, reloading from disk!"));
|
||||
} else {
|
||||
commandSender.addChatMessage(new ChatComponentText("Will now recompute all values!!"));
|
||||
}
|
||||
}
|
||||
DynamicEnergyValueInitThread.initEnergyValueRegistry();
|
||||
EnergyValueRegistry.getInstance().setShouldRegenNextRestart(false);
|
||||
}
|
||||
if (energyValuesDirectory.exists() && energyValuesDirectory.isDirectory()) {
|
||||
File staticValues = new File(energyValuesDirectory, Files.STATIC_ENERGY_VALUES_JSON);
|
||||
commandSender.addChatMessage(new ChatComponentText("Looking for " + staticValues.getName()));
|
||||
if (staticValues.exists()) {
|
||||
commandSender.addChatMessage(new ChatComponentText("Found static values, reloading from disk!"));
|
||||
} else {
|
||||
commandSender.addChatMessage(new ChatComponentText("Will now recompute all values!!"));
|
||||
}
|
||||
}
|
||||
DynamicEnergyValueInitThread.initEnergyValueRegistry();
|
||||
EnergyValueRegistry.getInstance().setShouldRegenNextRestart(false);
|
||||
}
|
||||
}
|
|
@ -13,7 +13,6 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
|||
import cpw.mods.fml.common.event.FMLServerStartingEvent;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent;
|
||||
import ic2.api.item.IC2Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import techreborn.api.recipe.IBaseRecipeType;
|
||||
|
@ -25,71 +24,71 @@ import techreborn.items.ItemPlates;
|
|||
public class EmcValues implements ICompatModule {
|
||||
|
||||
|
||||
@Override
|
||||
public void preInit(FMLPreInitializationEvent event) {
|
||||
@Override
|
||||
public void preInit(FMLPreInitializationEvent event) {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init(FMLInitializationEvent event) {
|
||||
for (IBaseRecipeType recipeType : RecipeHandler.recipeList) {
|
||||
if (recipeType.getOutputsSize() == 1) {
|
||||
RecipeRegistryProxy.addRecipe(recipeType.getOutput(0), recipeType.getInputs());
|
||||
}
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public void init(FMLInitializationEvent event) {
|
||||
for (IBaseRecipeType recipeType : RecipeHandler.recipeList) {
|
||||
if (recipeType.getOutputsSize() == 1) {
|
||||
RecipeRegistryProxy.addRecipe(recipeType.getOutput(0), recipeType.getInputs());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit(FMLPostInitializationEvent event) {
|
||||
if(!Loader.isModLoaded("EE3Compatibility")){
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
addOre("ingotCopper", 128);
|
||||
addOre("ingotSilver", 1024);
|
||||
addOre("ingotTin", 256);
|
||||
addOre("ingotLead", 256);
|
||||
addOre("dustSteel", 512);
|
||||
addOre("ingotRefinedIron", 512);
|
||||
addOre("dustCoal", 32);
|
||||
addOre("dustDiamond", 8192);
|
||||
addOre("dustSulfur", 32);
|
||||
addOre("dustLead", 256);
|
||||
addOre("ingotBronze", 256);
|
||||
addOre("ingotElectrum", 2052);
|
||||
addOre("dustLapis", 864);
|
||||
addOre("dustSilver", 1024);
|
||||
addOre("dustTin", 256);
|
||||
}
|
||||
@Override
|
||||
public void postInit(FMLPostInitializationEvent event) {
|
||||
if (!Loader.isModLoaded("EE3Compatibility")) {
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
addOre("ingotCopper", 128);
|
||||
addOre("ingotSilver", 1024);
|
||||
addOre("ingotTin", 256);
|
||||
addOre("ingotLead", 256);
|
||||
addOre("dustSteel", 512);
|
||||
addOre("ingotRefinedIron", 512);
|
||||
addOre("dustCoal", 32);
|
||||
addOre("dustDiamond", 8192);
|
||||
addOre("dustSulfur", 32);
|
||||
addOre("dustLead", 256);
|
||||
addOre("ingotBronze", 256);
|
||||
addOre("ingotElectrum", 2052);
|
||||
addOre("dustLapis", 864);
|
||||
addOre("dustSilver", 1024);
|
||||
addOre("dustTin", 256);
|
||||
}
|
||||
|
||||
addStack(ItemPlates.getPlateByName("steel"), 512);
|
||||
addStack(ItemParts.getPartByName("lazuriteChunk"), 7776);
|
||||
}
|
||||
addStack(ItemPlates.getPlateByName("steel"), 512);
|
||||
addStack(ItemParts.getPartByName("lazuriteChunk"), 7776);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void serverStarting(FMLServerStartingEvent event) {
|
||||
event.registerServerCommand(new CommandRegen());
|
||||
event.registerServerCommand(new CommandReload());
|
||||
}
|
||||
@Override
|
||||
public void serverStarting(FMLServerStartingEvent event) {
|
||||
event.registerServerCommand(new CommandRegen());
|
||||
event.registerServerCommand(new CommandReload());
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void serverTick(TickEvent.ServerTickEvent event) {
|
||||
//This should be a fix for the things not saving
|
||||
EnergyValueRegistry.getInstance().setShouldRegenNextRestart(false);
|
||||
}
|
||||
@SubscribeEvent
|
||||
public void serverTick(TickEvent.ServerTickEvent event) {
|
||||
//This should be a fix for the things not saving
|
||||
EnergyValueRegistry.getInstance().setShouldRegenNextRestart(false);
|
||||
}
|
||||
|
||||
private void addOre(String name, float value) {
|
||||
WrappedStack stack = WrappedStack.wrap(new OreStack(name));
|
||||
EnergyValue energyValue = new EnergyValue(value);
|
||||
private void addOre(String name, float value) {
|
||||
WrappedStack stack = WrappedStack.wrap(new OreStack(name));
|
||||
EnergyValue energyValue = new EnergyValue(value);
|
||||
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(stack, energyValue);
|
||||
}
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(stack, energyValue);
|
||||
}
|
||||
|
||||
|
||||
private void addStack(ItemStack itemStack, float value) {
|
||||
WrappedStack stack = WrappedStack.wrap(itemStack);
|
||||
EnergyValue energyValue = new EnergyValue(value);
|
||||
private void addStack(ItemStack itemStack, float value) {
|
||||
WrappedStack stack = WrappedStack.wrap(itemStack);
|
||||
EnergyValue energyValue = new EnergyValue(value);
|
||||
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(stack, energyValue);
|
||||
}
|
||||
EnergyValueRegistryProxy.addPreAssignedEnergyValue(stack, energyValue);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue