dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mc1.10' into mc1.10

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-09-18 22:38:33 +02:00
parent fd629d16aa 7e8c5a2b7a
commit af8c25dcfa
31 changed files with 280 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
src/main/java/refinedstorage/RefinedStorage.java
View File

@@ -3,7 +3,6 @@ package refinedstorage;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
@@ -16,11 +15,12 @@ import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import refinedstorage.proxy.CommonProxy;
@Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION, dependencies = RefinedStorage.DEPENDENCIES)
@Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION, guiFactory = RefinedStorage.GUI_FACTORY, dependencies = RefinedStorage.DEPENDENCIES)
public final class RefinedStorage {
public static final String ID = "refinedstorage";
public static final String VERSION = "1.0.5";
public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2088,);required-after:mcmultipart@[1.2.1,);";
public static final String GUI_FACTORY = "refinedstorage.gui.config.ModGuiFactory";
@SidedProxy(clientSide = "refinedstorage.proxy.ClientProxy", serverSide = "refinedstorage.proxy.ServerProxy")
public static CommonProxy PROXY;
@@ -28,6 +28,8 @@ public final class RefinedStorage {
@Instance
public static RefinedStorage INSTANCE;
public RefinedStorageConfig config;
public final SimpleNetworkWrapper network = NetworkRegistry.INSTANCE.newSimpleChannel(ID);
public final CreativeTabs tab = new CreativeTabs(ID) {
@@ -46,111 +48,10 @@ public final class RefinedStorage {
FluidRegistry.enableUniversalBucket();
}
public int controllerBaseUsage;
public int cableUsage;
public int constructorUsage;
public int crafterUsage;
public int crafterPerPatternUsage;
public int craftingMonitorUsage;
public int destructorUsage;
public int detectorUsage;
public int diskDriveUsage;
public int diskDrivePerDiskUsage;
public int externalStorageUsage;
public int externalStoragePerStorageUsage;
public int exporterUsage;
public int importerUsage;
public int interfaceUsage;
public int fluidInterfaceUsage;
public int relayUsage;
public int soldererUsage;
public int storageUsage;
public int fluidStorageUsage;
public int wirelessTransmitterUsage;
public int gridUsage;
public int craftingGridUsage;
public int patternGridUsage;
public int fluidGridUsage;
public int networkTransmitterUsage;
public float networkTransmitterPerBlockUsage;
public int networkReceiverUsage;
public int diskManipulatorUsage;
public int controllerCapacity;
public boolean controllerUsesEnergy;
public int wirelessTransmitterBaseRange;
public int wirelessTransmitterRangePerUpgrade;
public boolean wirelessGridUsesEnergy;
public int wirelessGridOpenUsage;
public int wirelessGridExtractUsage;
public int wirelessGridInsertUsage;
public int rangeUpgradeUsage;
public int speedUpgradeUsage;
public int craftingUpgradeUsage;
public int stackUpgradeUsage;
public int interdimensionalUpgradeUsage;
public boolean translucentCables;
@EventHandler
public void preInit(FMLPreInitializationEvent e) {
config = new RefinedStorageConfig(e.getSuggestedConfigurationFile());
PROXY.preInit(e);
Configuration config = new Configuration(e.getSuggestedConfigurationFile());
controllerBaseUsage = config.getInt("controllerBase", "energy", 0, 0, Integer.MAX_VALUE, "The base energy used by the Controller");
cableUsage = config.getInt("cable", "energy", 0, 0, Integer.MAX_VALUE, "The energy used by Cables");
constructorUsage = config.getInt("constructor", "energy", 1, 0, Integer.MAX_VALUE, "The energy used by Constructors");
crafterUsage = config.getInt("crafter", "energy", 2, 0, Integer.MAX_VALUE, "The base energy used by Crafters");
crafterPerPatternUsage = config.getInt("crafterPerPattern", "energy", 1, 0, Integer.MAX_VALUE, "The additional energy used per Pattern in a Crafter");
craftingMonitorUsage = config.getInt("craftingMonitor", "energy", 2, 0, Integer.MAX_VALUE, "The energy used by Crafting Monitors");
destructorUsage = config.getInt("destructor", "energy", 1, 0, Integer.MAX_VALUE, "The energy used by Destructors");
detectorUsage = config.getInt("detector", "energy", 2, 0, Integer.MAX_VALUE, "The energy used by Detectors");
diskDriveUsage = config.getInt("diskDrive", "energy", 0, 0, Integer.MAX_VALUE, "The base energy used by Disk Drives");
diskDrivePerDiskUsage = config.getInt("diskDrivePerDisk", "energy", 1, 0, Integer.MAX_VALUE, "The additional energy used by Storage Disks in Disk Drives");
externalStorageUsage = config.getInt("externalStorage", "energy", 0, 0, Integer.MAX_VALUE, "The base energy used by External Storages");
externalStoragePerStorageUsage = config.getInt("externalStoragePerStorage", "energy", 1, 0, Integer.MAX_VALUE, "The additional energy used per connected storage to an External Storage");
exporterUsage = config.getInt("exporter", "energy", 1, 0, Integer.MAX_VALUE, "The energy used by Exporters");
importerUsage = config.getInt("importer", "energy", 1, 0, Integer.MAX_VALUE, "The energy used by Importers");
interfaceUsage = config.getInt("interface", "energy", 3, 0, Integer.MAX_VALUE, "The energy used by Interfaces");
fluidInterfaceUsage = config.getInt("fluidInterface", "energy", 3, 0, Integer.MAX_VALUE, "The energy used by Fluid Interfaces");
relayUsage = config.getInt("relay", "energy", 1, 0, Integer.MAX_VALUE, "The energy used by Relays");
soldererUsage = config.getInt("solderer", "energy", 3, 0, Integer.MAX_VALUE, "The energy used by Solderers");
storageUsage = config.getInt("storage", "energy", 1, 0, Integer.MAX_VALUE, "The energy used by Storage Blocks");
fluidStorageUsage = config.getInt("fluidStorage", "energy", 1, 0, Integer.MAX_VALUE, "The energy used by Fluid Storage Blocks");
wirelessTransmitterUsage = config.getInt("wirelessTransmitter", "energy", 8, 0, Integer.MAX_VALUE, "The energy used by Wireless Transmitters");
gridUsage = config.getInt("grid", "energy", 2, 0, Integer.MAX_VALUE, "The energy used by Grids");
craftingGridUsage = config.getInt("craftingGrid", "energy", 4, 0, Integer.MAX_VALUE, "The energy used by Crafting Grids");
patternGridUsage = config.getInt("patternGrid", "energy", 3, 0, Integer.MAX_VALUE, "The energy used by Pattern Grids");
fluidGridUsage = config.getInt("fluidGrid", "energy", 2, 0, Integer.MAX_VALUE, "The energy used by Fluid Grids");
networkTransmitterUsage = config.getInt("networkTransmitter", "energy", 50, 0, Integer.MAX_VALUE, "The base energy used by Network Transmitters");
networkTransmitterPerBlockUsage = config.getFloat("networkTransmitterPerBlock", "energy", 4, 0, Float.MAX_VALUE, "The additional energy per block that the Network Transmitter uses, gets rounded up");
networkReceiverUsage = config.getInt("networkReceiver", "energy", 15, 0, Integer.MAX_VALUE, "The energy used by Network Receivers");
diskManipulatorUsage = config.getInt("diskManipulator", "energy", 3, 0, Integer.MAX_VALUE, "The energy used by Disk Manipulators");
controllerCapacity = config.getInt("capacity", "controller", 32000, 0, Integer.MAX_VALUE, "The energy capacity of the Controller");
controllerUsesEnergy = config.getBoolean("usesEnergy", "controller", true, "Whether the Controller uses energy");
wirelessTransmitterBaseRange = config.getInt("range", "wirelessTransmitter", 16, 0, Integer.MAX_VALUE, "The base range of the Wireless Transmitter");
wirelessTransmitterRangePerUpgrade = config.getInt("rangePerUpgrade", "wirelessTransmitter", 8, 0, Integer.MAX_VALUE, "The additional range per Range Upgrade in the Wireless Transmitter");
wirelessGridUsesEnergy = config.getBoolean("usesEnergy", "wirelessGrid", true, "Whether the Wireless Grid uses energy");
wirelessGridOpenUsage = config.getInt("open", "wirelessGrid", 30, 0, Integer.MAX_VALUE, "The energy used by the Wireless Grid to open");
wirelessGridInsertUsage = config.getInt("insert", "wirelessGrid", 3, 0, Integer.MAX_VALUE, "The energy used by the Wireless Grid to insert items");
wirelessGridExtractUsage = config.getInt("extract", "wirelessGrid", 3, 0, Integer.MAX_VALUE, "The energy used by the Wireless Grid to extract items");
rangeUpgradeUsage = config.getInt("range", "upgrades", 8, 0, Integer.MAX_VALUE, "The additional energy used per Range Upgrade");
speedUpgradeUsage = config.getInt("speed", "upgrades", 2, 0, Integer.MAX_VALUE, "The additional energy used per Speed Upgrade");
craftingUpgradeUsage = config.getInt("crafting", "upgrades", 5, 0, Integer.MAX_VALUE, "The additional energy used per Crafting Upgrade");
stackUpgradeUsage = config.getInt("stack", "upgrades", 12, 0, Integer.MAX_VALUE, "The additional energy used per Stack Upgrade");
interdimensionalUpgradeUsage = config.getInt("interdimensional", "upgrades", 1000, 0, Integer.MAX_VALUE, "The additional energy used by the Interdimensional Upgrade");
translucentCables = config.getBoolean("translucentCables", "misc", false, "For resource pack makers that want a translucent cable");
config.save();
}
@EventHandler

185
src/main/java/refinedstorage/RefinedStorageConfig.java Normal file
View File

@@ -0,0 +1,185 @@
package refinedstorage;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.ConfigElement;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.fml.client.config.IConfigElement;
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
public final class RefinedStorageConfig {
private Configuration config;
//region Energy
public int controllerBaseUsage;
public int cableUsage;
public int constructorUsage;
public int crafterUsage;
public int crafterPerPatternUsage;
public int craftingMonitorUsage;
public int destructorUsage;
public int detectorUsage;
public int diskDriveUsage;
public int diskDrivePerDiskUsage;
public int externalStorageUsage;
public int externalStoragePerStorageUsage;
public int exporterUsage;
public int importerUsage;
public int interfaceUsage;
public int fluidInterfaceUsage;
public int relayUsage;
public int soldererUsage;
public int storageUsage;
public int fluidStorageUsage;
public int wirelessTransmitterUsage;
public int gridUsage;
public int craftingGridUsage;
public int patternGridUsage;
public int fluidGridUsage;
public int networkTransmitterUsage;
public float networkTransmitterPerBlockUsage;
public int networkReceiverUsage;
public int diskManipulatorUsage;
//endregion
//region Controller
public int controllerCapacity;
public boolean controllerUsesEnergy;
//endregion
//region Wireless Transmitter
public int wirelessTransmitterBaseRange;
public int wirelessTransmitterRangePerUpgrade;
//endregion
//region Wireless Grid
public boolean wirelessGridUsesEnergy;
public int wirelessGridOpenUsage;
public int wirelessGridExtractUsage;
public int wirelessGridInsertUsage;
//endregion
//region Upgrades
public int rangeUpgradeUsage;
public int speedUpgradeUsage;
public int craftingUpgradeUsage;
public int stackUpgradeUsage;
public int interdimensionalUpgradeUsage;
//endregion
//region Misc
public boolean translucentCables;
//endregion
//region Categories
private static final String ENERGY = "energy";
private static final String CONTROLLER = "controller";
private static final String WIRELESS_TRANSMITTER = "wirelessTransmitter";
private static final String WIRELESS_GRID = "wirelessGrid";
private static final String UPGRADES = "upgrades";
private static final String MISC = "misc";
//endregion
public RefinedStorageConfig(File configFile) {
config = new Configuration(configFile);
MinecraftForge.EVENT_BUS.register(this);
loadConfig();
}
public Configuration getConfig() {
return config;
}
@SubscribeEvent
public void onConfigChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event) {
if (event.getModID().equalsIgnoreCase(RefinedStorage.ID)) {
loadConfig();
}
}
private void loadConfig() {
//region Energy
controllerBaseUsage = config.getInt("controllerBase", ENERGY, 0, 0, Integer.MAX_VALUE, "The base energy used by the Controller");
cableUsage = config.getInt("cable", ENERGY, 0, 0, Integer.MAX_VALUE, "The energy used by Cables");
constructorUsage = config.getInt("constructor", ENERGY, 1, 0, Integer.MAX_VALUE, "The energy used by Constructors");
crafterUsage = config.getInt("crafter", ENERGY, 2, 0, Integer.MAX_VALUE, "The base energy used by Crafters");
crafterPerPatternUsage = config.getInt("crafterPerPattern", ENERGY, 1, 0, Integer.MAX_VALUE, "The additional energy used per Pattern in a Crafter");
craftingMonitorUsage = config.getInt("craftingMonitor", ENERGY, 2, 0, Integer.MAX_VALUE, "The energy used by Crafting Monitors");
destructorUsage = config.getInt("destructor", ENERGY, 1, 0, Integer.MAX_VALUE, "The energy used by Destructors");
detectorUsage = config.getInt("detector", ENERGY, 2, 0, Integer.MAX_VALUE, "The energy used by Detectors");
diskDriveUsage = config.getInt("diskDrive", ENERGY, 0, 0, Integer.MAX_VALUE, "The base energy used by Disk Drives");
diskDrivePerDiskUsage = config.getInt("diskDrivePerDisk", ENERGY, 1, 0, Integer.MAX_VALUE, "The additional energy used by Storage Disks in Disk Drives");
externalStorageUsage = config.getInt("externalStorage", ENERGY, 0, 0, Integer.MAX_VALUE, "The base energy used by External Storages");
externalStoragePerStorageUsage = config.getInt("externalStoragePerStorage", ENERGY, 1, 0, Integer.MAX_VALUE, "The additional energy used per connected storage to an External Storage");
exporterUsage = config.getInt("exporter", ENERGY, 1, 0, Integer.MAX_VALUE, "The energy used by Exporters");
importerUsage = config.getInt("importer", ENERGY, 1, 0, Integer.MAX_VALUE, "The energy used by Importers");
interfaceUsage = config.getInt("interface", ENERGY, 3, 0, Integer.MAX_VALUE, "The energy used by Interfaces");
fluidInterfaceUsage = config.getInt("fluidInterface", ENERGY, 3, 0, Integer.MAX_VALUE, "The energy used by Fluid Interfaces");
relayUsage = config.getInt("relay", ENERGY, 1, 0, Integer.MAX_VALUE, "The energy used by Relays");
soldererUsage = config.getInt("solderer", ENERGY, 3, 0, Integer.MAX_VALUE, "The energy used by Solderers");
storageUsage = config.getInt("storage", ENERGY, 1, 0, Integer.MAX_VALUE, "The energy used by Storage Blocks");
fluidStorageUsage = config.getInt("fluidStorage", ENERGY, 1, 0, Integer.MAX_VALUE, "The energy used by Fluid Storage Blocks");
wirelessTransmitterUsage = config.getInt("wirelessTransmitter", ENERGY, 8, 0, Integer.MAX_VALUE, "The energy used by Wireless Transmitters");
gridUsage = config.getInt("grid", ENERGY, 2, 0, Integer.MAX_VALUE, "The energy used by Grids");
craftingGridUsage = config.getInt("craftingGrid", ENERGY, 4, 0, Integer.MAX_VALUE, "The energy used by Crafting Grids");
patternGridUsage = config.getInt("patternGrid", ENERGY, 3, 0, Integer.MAX_VALUE, "The energy used by Pattern Grids");
fluidGridUsage = config.getInt("fluidGrid", ENERGY, 2, 0, Integer.MAX_VALUE, "The energy used by Fluid Grids");
networkTransmitterUsage = config.getInt("networkTransmitter", ENERGY, 50, 0, Integer.MAX_VALUE, "The base energy used by Network Transmitters");
networkTransmitterPerBlockUsage = config.getFloat("networkTransmitterPerBlock", ENERGY, 4, 0, Float.MAX_VALUE, "The additional energy per block that the Network Transmitter uses, gets rounded up");
networkReceiverUsage = config.getInt("networkReceiver", ENERGY, 15, 0, Integer.MAX_VALUE, "The energy used by Network Receivers");
diskManipulatorUsage = config.getInt("diskManipulator", ENERGY, 3, 0, Integer.MAX_VALUE, "The energy used by Disk Manipulators");
//endregion
//region Controller
controllerCapacity = config.getInt("capacity", CONTROLLER, 32000, 0, Integer.MAX_VALUE, "The energy capacity of the Controller");
controllerUsesEnergy = config.getBoolean("usesEnergy", CONTROLLER, true, "Whether the Controller uses energy");
//endregion
//region Wireless Transmitter
wirelessTransmitterBaseRange = config.getInt("range", WIRELESS_TRANSMITTER, 16, 0, Integer.MAX_VALUE, "The base range of the Wireless Transmitter");
wirelessTransmitterRangePerUpgrade = config.getInt("rangePerUpgrade", WIRELESS_TRANSMITTER, 8, 0, Integer.MAX_VALUE, "The additional range per Range Upgrade in the Wireless Transmitter");
//endregion
//region Wireless Grid
wirelessGridUsesEnergy = config.getBoolean("usesEnergy", WIRELESS_GRID, true, "Whether the Wireless Grid uses energy");
wirelessGridOpenUsage = config.getInt("open", WIRELESS_GRID, 30, 0, Integer.MAX_VALUE, "The energy used by the Wireless Grid to open");
wirelessGridInsertUsage = config.getInt("insert", WIRELESS_GRID, 3, 0, Integer.MAX_VALUE, "The energy used by the Wireless Grid to insert items");
wirelessGridExtractUsage = config.getInt("extract", WIRELESS_GRID, 3, 0, Integer.MAX_VALUE, "The energy used by the Wireless Grid to extract items");
//endregion
//region Upgrades
rangeUpgradeUsage = config.getInt("range", UPGRADES, 8, 0, Integer.MAX_VALUE, "The additional energy used per Range Upgrade");
speedUpgradeUsage = config.getInt("speed", UPGRADES, 2, 0, Integer.MAX_VALUE, "The additional energy used per Speed Upgrade");
craftingUpgradeUsage = config.getInt("crafting", UPGRADES, 5, 0, Integer.MAX_VALUE, "The additional energy used per Crafting Upgrade");
stackUpgradeUsage = config.getInt("stack", UPGRADES, 12, 0, Integer.MAX_VALUE, "The additional energy used per Stack Upgrade");
interdimensionalUpgradeUsage = config.getInt("interdimensional", UPGRADES, 1000, 0, Integer.MAX_VALUE, "The additional energy used by the Interdimensional Upgrade");
//endregion
//region Misc
translucentCables = config.getBoolean("translucentCables", MISC, false, "For resource pack makers that want a translucent cable");
//endregion
if (config.hasChanged()) {
config.save();
}
}
@SuppressWarnings("unchecked")
public List<IConfigElement> getConfigElements()
{
List<IConfigElement> list = new ArrayList<>();
list.addAll(new ConfigElement(config.getCategory(ENERGY)).getChildElements());
list.addAll(new ConfigElement(config.getCategory(CONTROLLER)).getChildElements());
list.addAll(new ConfigElement(config.getCategory(UPGRADES)).getChildElements());
list.addAll(new ConfigElement(config.getCategory(WIRELESS_TRANSMITTER)).getChildElements());
list.addAll(new ConfigElement(config.getCategory(WIRELESS_GRID)).getChildElements());
list.addAll(new ConfigElement(config.getCategory(MISC)).getChildElements());
return list;
}
}

6
src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java
View File

@@ -55,7 +55,7 @@ public class WirelessGridHandler implements IWirelessGridHandler {
ItemStack stack = player.getHeldItem(hand);
if (RefinedStorage.INSTANCE.wirelessGridUsesEnergy && stack.getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE && RefinedStorageItems.WIRELESS_GRID.getEnergyStored(stack) <= RefinedStorage.INSTANCE.wirelessGridOpenUsage) {
if (RefinedStorage.INSTANCE.config.wirelessGridUsesEnergy && stack.getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE && RefinedStorageItems.WIRELESS_GRID.getEnergyStored(stack) <= RefinedStorage.INSTANCE.config.wirelessGridOpenUsage) {
return true;
}
@@ -65,7 +65,7 @@ public class WirelessGridHandler implements IWirelessGridHandler {
network.sendItemStorageToClient((EntityPlayerMP) player);
drainEnergy(player, RefinedStorage.INSTANCE.wirelessGridOpenUsage);
drainEnergy(player, RefinedStorage.INSTANCE.config.wirelessGridOpenUsage);
return true;
}
@@ -83,7 +83,7 @@ public class WirelessGridHandler implements IWirelessGridHandler {
public void drainEnergy(EntityPlayer player, int energy) {
IWirelessGridConsumer consumer = getConsumer(player);
if (consumer != null && RefinedStorage.INSTANCE.wirelessGridUsesEnergy) {
if (consumer != null && RefinedStorage.INSTANCE.config.wirelessGridUsesEnergy) {
ItemWirelessGrid item = RefinedStorageItems.WIRELESS_GRID;
if (consumer.getStack().getItemDamage() != ItemWirelessGrid.TYPE_CREATIVE) {

6
src/main/java/refinedstorage/apiimpl/network/grid/ItemGridHandler.java
View File

@@ -77,7 +77,7 @@ public class ItemGridHandler implements IItemGridHandler {
player.updateHeldItem();
}
network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.INSTANCE.wirelessGridExtractUsage);
network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.INSTANCE.config.wirelessGridExtractUsage);
}
}
@@ -85,7 +85,7 @@ public class ItemGridHandler implements IItemGridHandler {
public ItemStack onInsert(EntityPlayerMP player, ItemStack stack) {
ItemStack remainder = network.insertItem(stack, stack.stackSize, false);
network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.INSTANCE.wirelessGridInsertUsage);
network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.INSTANCE.config.wirelessGridInsertUsage);
return remainder;
}
@@ -115,7 +115,7 @@ public class ItemGridHandler implements IItemGridHandler {
player.updateHeldItem();
network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.INSTANCE.wirelessGridInsertUsage);
network.getWirelessGridHandler().drainEnergy(player, RefinedStorage.INSTANCE.config.wirelessGridInsertUsage);
}
@Override

2
src/main/java/refinedstorage/block/BlockCable.java
View File

@@ -341,6 +341,6 @@ public class BlockCable extends BlockCoverable {
@Override
public BlockRenderLayer getBlockLayer() {
return RefinedStorage.INSTANCE.translucentCables ? BlockRenderLayer.TRANSLUCENT : super.getBlockLayer();
return RefinedStorage.INSTANCE.config.translucentCables ? BlockRenderLayer.TRANSLUCENT : super.getBlockLayer();
}
}

17
src/main/java/refinedstorage/gui/config/ModGuiConfig.java Normal file
View File

@@ -0,0 +1,17 @@
package refinedstorage.gui.config;
import net.minecraft.client.gui.GuiScreen;
import net.minecraftforge.fml.client.config.GuiConfig;
import refinedstorage.RefinedStorage;
public class ModGuiConfig extends GuiConfig {
public ModGuiConfig(GuiScreen guiScreen) {
super(guiScreen,
RefinedStorage.INSTANCE.config.getConfigElements(),
RefinedStorage.ID,
false,
false,
GuiConfig.getAbridgedConfigPath(RefinedStorage.INSTANCE.config.getConfig().toString()));
}
}

29
src/main/java/refinedstorage/gui/config/ModGuiFactory.java Normal file
View File

@@ -0,0 +1,29 @@
package refinedstorage.gui.config;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraftforge.fml.client.IModGuiFactory;
import java.util.Set;
public class ModGuiFactory implements IModGuiFactory {
@Override
public void initialize(Minecraft minecraftInstance) {
}
@Override
public Class<? extends GuiScreen> mainConfigGuiClass() {
return ModGuiConfig.class;
}
@Override
public Set<RuntimeOptionCategoryElement> runtimeGuiCategories() {
return null;
}
@Override
public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) {
return null;
}
}

4
src/main/java/refinedstorage/item/ItemBlockController.java
View File

@@ -29,7 +29,7 @@ public class ItemBlockController extends ItemBlockBase {
}
public static int getEnergyCapacity(ItemStack stack) {
return (stack.hasTagCompound() && stack.getTagCompound().hasKey(TileController.NBT_ENERGY_CAPACITY)) ? stack.getTagCompound().getInteger(TileController.NBT_ENERGY_CAPACITY) : RefinedStorage.INSTANCE.controllerCapacity;
return (stack.hasTagCompound() && stack.getTagCompound().hasKey(TileController.NBT_ENERGY_CAPACITY)) ? stack.getTagCompound().getInteger(TileController.NBT_ENERGY_CAPACITY) : RefinedStorage.INSTANCE.config.controllerCapacity;
}
@Override
@@ -46,7 +46,7 @@ public class ItemBlockController extends ItemBlockBase {
tag = new NBTTagCompound();
}
tag.setInteger(TileController.NBT_ENERGY, stack.getMetadata() == EnumControllerType.CREATIVE.getId() ? RefinedStorage.INSTANCE.controllerCapacity : 0);
tag.setInteger(TileController.NBT_ENERGY, stack.getMetadata() == EnumControllerType.CREATIVE.getId() ? RefinedStorage.INSTANCE.config.controllerCapacity : 0);
return stack;
}

10
src/main/java/refinedstorage/item/ItemUpgrade.java
View File

@@ -34,15 +34,15 @@ public class ItemUpgrade extends ItemBase {
public static int getEnergyUsage(int type) {
switch (type) {
case TYPE_RANGE:
return RefinedStorage.INSTANCE.rangeUpgradeUsage;
return RefinedStorage.INSTANCE.config.rangeUpgradeUsage;
case TYPE_SPEED:
return RefinedStorage.INSTANCE.speedUpgradeUsage;
return RefinedStorage.INSTANCE.config.speedUpgradeUsage;
case TYPE_CRAFTING:
return RefinedStorage.INSTANCE.craftingUpgradeUsage;
return RefinedStorage.INSTANCE.config.craftingUpgradeUsage;
case TYPE_STACK:
return RefinedStorage.INSTANCE.stackUpgradeUsage;
return RefinedStorage.INSTANCE.config.stackUpgradeUsage;
case TYPE_INTERDIMENSIONAL:
return RefinedStorage.INSTANCE.interdimensionalUpgradeUsage;
return RefinedStorage.INSTANCE.config.interdimensionalUpgradeUsage;
default:
return 0;
}

2
src/main/java/refinedstorage/tile/TileCable.java
View File

@@ -5,7 +5,7 @@ import refinedstorage.RefinedStorage;
public class TileCable extends TileMultipartNode {
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.cableUsage;
return RefinedStorage.INSTANCE.config.cableUsage;
}
@Override

2
src/main/java/refinedstorage/tile/TileConstructor.java
View File

@@ -64,7 +64,7 @@ public class TileConstructor extends TileMultipartNode implements IComparable, I
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.constructorUsage + upgrades.getEnergyUsage();
return RefinedStorage.INSTANCE.config.constructorUsage + upgrades.getEnergyUsage();
}
@Override

6
src/main/java/refinedstorage/tile/TileController.java
View File

@@ -185,7 +185,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
private List<ICraftingTask> craftingTasksToCancel = new ArrayList<>();
private List<NBTTagCompound> craftingTasksToRead = new ArrayList<>();
private EnergyStorage energy = new EnergyStorage(RefinedStorage.INSTANCE.controllerCapacity);
private EnergyStorage energy = new EnergyStorage(RefinedStorage.INSTANCE.config.controllerCapacity);
private ControllerEnergyForge energyForge = new ControllerEnergyForge(this);
private IControllerEnergyIC2 energyEU;
private ControllerEnergyTesla energyTesla;
@@ -299,7 +299,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
wirelessGridHandler.update();
if (getType() == EnumControllerType.NORMAL) {
if (!RefinedStorage.INSTANCE.controllerUsesEnergy) {
if (!RefinedStorage.INSTANCE.config.controllerUsesEnergy) {
energy.setEnergyStored(energy.getMaxEnergyStored());
} else if (energy.getEnergyStored() - getEnergyUsage() >= 0) {
energy.extractEnergy(getEnergyUsage(), false);
@@ -809,7 +809,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR
@Override
public int getEnergyUsage() {
int usage = RefinedStorage.INSTANCE.controllerBaseUsage;
int usage = RefinedStorage.INSTANCE.config.controllerBaseUsage;
for (INetworkNode node : nodeGraph.all()) {
if (node.canUpdate()) {

4
src/main/java/refinedstorage/tile/TileCrafter.java
View File

@@ -85,11 +85,11 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer {
@Override
public int getEnergyUsage() {
int usage = RefinedStorage.INSTANCE.crafterUsage + upgrades.getEnergyUsage();
int usage = RefinedStorage.INSTANCE.config.crafterUsage + upgrades.getEnergyUsage();
for (int i = 0; i < patterns.getSlots(); ++i) {
if (patterns.getStackInSlot(i) != null) {
usage += RefinedStorage.INSTANCE.crafterPerPatternUsage;
usage += RefinedStorage.INSTANCE.config.crafterPerPatternUsage;
}
}

2
src/main/java/refinedstorage/tile/TileCraftingMonitor.java
View File

@@ -33,7 +33,7 @@ public class TileCraftingMonitor extends TileNode {
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.craftingMonitorUsage;
return RefinedStorage.INSTANCE.config.craftingMonitorUsage;
}
@Override

2
src/main/java/refinedstorage/tile/TileDestructor.java
View File

@@ -63,7 +63,7 @@ public class TileDestructor extends TileMultipartNode implements IComparable, IF
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.destructorUsage + upgrades.getEnergyUsage();
return RefinedStorage.INSTANCE.config.destructorUsage + upgrades.getEnergyUsage();
}
@Override

2
src/main/java/refinedstorage/tile/TileDetector.java
View File

@@ -99,7 +99,7 @@ public class TileDetector extends TileNode implements IComparable, IType {
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.detectorUsage;
return RefinedStorage.INSTANCE.config.detectorUsage;
}
@Override

4
src/main/java/refinedstorage/tile/TileDiskDrive.java
View File

@@ -150,11 +150,11 @@ public class TileDiskDrive extends TileNode implements IItemStorageProvider, IFl
@Override
public int getEnergyUsage() {
int usage = RefinedStorage.INSTANCE.diskDriveUsage;
int usage = RefinedStorage.INSTANCE.config.diskDriveUsage;
for (int i = 0; i < disks.getSlots(); ++i) {
if (disks.getStackInSlot(i) != null) {
usage += RefinedStorage.INSTANCE.diskDrivePerDiskUsage;
usage += RefinedStorage.INSTANCE.config.diskDrivePerDiskUsage;
}
}

2
src/main/java/refinedstorage/tile/TileDiskManipulator.java
View File

@@ -163,7 +163,7 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.diskManipulatorUsage + upgrades.getEnergyUsage();
return RefinedStorage.INSTANCE.config.diskManipulatorUsage + upgrades.getEnergyUsage();
}
@Override

2
src/main/java/refinedstorage/tile/TileExporter.java
View File

@@ -48,7 +48,7 @@ public class TileExporter extends TileMultipartNode implements IComparable, ITyp
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.exporterUsage + upgrades.getEnergyUsage();
return RefinedStorage.INSTANCE.config.exporterUsage + upgrades.getEnergyUsage();
}
@Override

2
src/main/java/refinedstorage/tile/TileFluidInterface.java
View File

@@ -134,7 +134,7 @@ public class TileFluidInterface extends TileNode implements IComparable {
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.fluidInterfaceUsage;
return RefinedStorage.INSTANCE.config.fluidInterfaceUsage;
}
@Override

2
src/main/java/refinedstorage/tile/TileFluidStorage.java
View File

@@ -79,7 +79,7 @@ public class TileFluidStorage extends TileNode implements IFluidStorageProvider,
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.fluidStorageUsage;
return RefinedStorage.INSTANCE.config.fluidStorageUsage;
}
@Override

2
src/main/java/refinedstorage/tile/TileImporter.java
View File

@@ -53,7 +53,7 @@ public class TileImporter extends TileMultipartNode implements IComparable, IFil
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.importerUsage + upgrades.getEnergyUsage();
return RefinedStorage.INSTANCE.config.importerUsage + upgrades.getEnergyUsage();
}
@Override

2
src/main/java/refinedstorage/tile/TileInterface.java
View File

@@ -35,7 +35,7 @@ public class TileInterface extends TileNode implements IComparable {
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.interfaceUsage + upgrades.getEnergyUsage();
return RefinedStorage.INSTANCE.config.interfaceUsage + upgrades.getEnergyUsage();
}
@Override

2
src/main/java/refinedstorage/tile/TileNetworkReceiver.java
View File

@@ -10,7 +10,7 @@ public class TileNetworkReceiver extends TileNode {
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.networkReceiverUsage;
return RefinedStorage.INSTANCE.config.networkReceiverUsage;
}
@Override

2
src/main/java/refinedstorage/tile/TileNetworkTransmitter.java
View File

@@ -109,7 +109,7 @@ public class TileNetworkTransmitter extends TileNode {
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.networkTransmitterUsage + (isSameDimension() ? (int) Math.ceil(RefinedStorage.INSTANCE.networkTransmitterPerBlockUsage * getDistance()) : 0) + upgrades.getEnergyUsage();
return RefinedStorage.INSTANCE.config.networkTransmitterUsage + (isSameDimension() ? (int) Math.ceil(RefinedStorage.INSTANCE.config.networkTransmitterPerBlockUsage * getDistance()) : 0) + upgrades.getEnergyUsage();
}
public ItemHandlerBasic getNetworkCard() {

2
src/main/java/refinedstorage/tile/TileRelay.java
View File

@@ -13,7 +13,7 @@ public class TileRelay extends TileNode {
@Override
public int getEnergyUsage() {
return getRedstoneMode() == RedstoneMode.IGNORE ? 0 : RefinedStorage.INSTANCE.relayUsage;
return getRedstoneMode() == RedstoneMode.IGNORE ? 0 : RefinedStorage.INSTANCE.config.relayUsage;
}
@Override

2
src/main/java/refinedstorage/tile/TileSolderer.java
View File

@@ -76,7 +76,7 @@ public class TileSolderer extends TileNode {
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.soldererUsage + upgrades.getEnergyUsage();
return RefinedStorage.INSTANCE.config.soldererUsage + upgrades.getEnergyUsage();
}
@Override

2
src/main/java/refinedstorage/tile/TileStorage.java
View File

@@ -79,7 +79,7 @@ public class TileStorage extends TileNode implements IItemStorageProvider, IStor
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.storageUsage;
return RefinedStorage.INSTANCE.config.storageUsage;
}
@Override

4
src/main/java/refinedstorage/tile/TileWirelessTransmitter.java
View File

@@ -31,7 +31,7 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.wirelessTransmitterUsage + upgrades.getEnergyUsage();
return RefinedStorage.INSTANCE.config.wirelessTransmitterUsage + upgrades.getEnergyUsage();
}
@Override
@@ -56,7 +56,7 @@ public class TileWirelessTransmitter extends TileNode implements IWirelessTransm
@Override
public int getRange() {
return RefinedStorage.INSTANCE.wirelessTransmitterBaseRange + (upgrades.getUpgradeCount(ItemUpgrade.TYPE_RANGE) * RefinedStorage.INSTANCE.wirelessTransmitterRangePerUpgrade);
return RefinedStorage.INSTANCE.config.wirelessTransmitterBaseRange + (upgrades.getUpgradeCount(ItemUpgrade.TYPE_RANGE) * RefinedStorage.INSTANCE.config.wirelessTransmitterRangePerUpgrade);
}
@Override

2
src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java
View File

@@ -104,7 +104,7 @@ public class TileExternalStorage extends TileMultipartNode implements IItemStora
@Override
public int getEnergyUsage() {
return RefinedStorage.INSTANCE.externalStorageUsage + ((itemStorages.size() + fluidStorages.size()) * RefinedStorage.INSTANCE.externalStoragePerStorageUsage);
return RefinedStorage.INSTANCE.config.externalStorageUsage + ((itemStorages.size() + fluidStorages.size()) * RefinedStorage.INSTANCE.config.externalStoragePerStorageUsage);
}
@Override

8
src/main/java/refinedstorage/tile/grid/TileGrid.java
View File

@@ -184,13 +184,13 @@ public class TileGrid extends TileNode implements IGrid {
public int getEnergyUsage() {
switch (getType()) {
case NORMAL:
return RefinedStorage.INSTANCE.gridUsage;
return RefinedStorage.INSTANCE.config.gridUsage;
case CRAFTING:
return RefinedStorage.INSTANCE.craftingGridUsage;
return RefinedStorage.INSTANCE.config.craftingGridUsage;
case PATTERN:
return RefinedStorage.INSTANCE.patternGridUsage;
return RefinedStorage.INSTANCE.config.patternGridUsage;
case FLUID:
return RefinedStorage.INSTANCE.fluidGridUsage;
return RefinedStorage.INSTANCE.config.fluidGridUsage;
default:
return 0;
}