aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gtPlusPlus/GTplusplus.java4
-rw-r--r--src/main/java/gtPlusPlus/api/objects/Logger.java6
-rw-r--r--src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java55
-rw-r--r--src/main/java/gtPlusPlus/core/common/CommonProxy.java4
-rw-r--r--src/main/java/gtPlusPlus/core/config/ConfigHandler.java334
-rw-r--r--src/main/java/gtPlusPlus/core/handler/MobMentality.java58
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/EnderDragonDeathHandler.java57
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java106
-rw-r--r--src/main/java/gtPlusPlus/core/item/ModItems.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java45
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/CoreItem.java4
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java62
-rw-r--r--src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java269
-rw-r--r--src/main/java/gtPlusPlus/core/lib/CORE.java1
-rw-r--r--src/main/java/gtPlusPlus/core/material/ELEMENT.java1
-rw-r--r--src/main/java/gtPlusPlus/core/potion/GtPotionEffect.java11
-rw-r--r--src/main/java/gtPlusPlus/core/proxy/ClientProxy.java38
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java15
-rw-r--r--src/main/java/gtPlusPlus/core/util/math/MathUtils.java13
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java5
-rw-r--r--src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java21
-rw-r--r--src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/bartcrops/crops/Crop_Force.java53
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java57
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java56
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java55
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java56
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_CustomBee.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Comb.java138
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Drop.java113
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Pollen.java89
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/items/output/GTPP_Propolis.java91
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_AlleleBeeSpecies.java40
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java294
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bee_Mutation.java80
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java74
-rw-r--r--src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java74
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MatterFab.java71
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MatterFab.java27
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/gui/basic/CONTAINER_PollutionCleaner.java1
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java82
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java50
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java1
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java462
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/recipes/GregtechRecipeAdder.java33
-rw-r--r--src/main/resources/assets/miscutils/lang/en_US.lang9
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.1.pngbin0 -> 209 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.2.pngbin0 -> 547 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.3.pngbin0 -> 782 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.4.pngbin0 -> 701 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/blocks/crop/blockCrop.Force.5.pngbin0 -> 925 bytes
-rw-r--r--src/main/resources/assets/miscutils/textures/items/magicfeather.pngbin0 -> 324 bytes
55 files changed, 2612 insertions, 535 deletions
diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java
index 1513a0999c..414eb10dae 100644
--- a/src/main/java/gtPlusPlus/GTplusplus.java
+++ b/src/main/java/gtPlusPlus/GTplusplus.java
@@ -28,8 +28,7 @@ import gtPlusPlus.core.commands.CommandEnableDebugWhileRunning;
import gtPlusPlus.core.commands.CommandMath;
import gtPlusPlus.core.common.CommonProxy;
import gtPlusPlus.core.config.ConfigHandler;
-import gtPlusPlus.core.handler.BookHandler;
-import gtPlusPlus.core.handler.PacketHandler;
+import gtPlusPlus.core.handler.*;
import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
import gtPlusPlus.core.handler.events.BlockEventHandler;
import gtPlusPlus.core.handler.events.LoginEventHandler;
@@ -174,6 +173,7 @@ public class GTplusplus implements ActionListener {
Utils.registerEvent(new LoginEventHandler());
Utils.registerEvent(new MissingMappingsEvent());
+ Utils.registerEvent(new MobMentality());
Logger.INFO("Login Handler Initialized");
proxy.preInit(event);
diff --git a/src/main/java/gtPlusPlus/api/objects/Logger.java b/src/main/java/gtPlusPlus/api/objects/Logger.java
index 1a1da6868b..5824c5260d 100644
--- a/src/main/java/gtPlusPlus/api/objects/Logger.java
+++ b/src/main/java/gtPlusPlus/api/objects/Logger.java
@@ -97,11 +97,7 @@ public class Logger {
* Special Logger for Bee related content
*/
public static void BEES(final String s) {
- if (enabled) {
- if (CORE_Preloader.DEV_ENVIRONMENT || CORE_Preloader.DEBUG_MODE) {
- modLogger.info("[Bees] "+s);
- }
- }
+ modLogger.info("[Bees] "+s);
}
/**
* Special Logger for Debugging Bee related content
diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
index c0113e869b..035b13dfbf 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java
@@ -6,28 +6,27 @@ import java.util.Map;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.IBlockAccess;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TextureSet;
+import gregtech.api.util.GT_LanguageManager;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.base.itemblock.ItemBlockGtBlock;
-import gtPlusPlus.core.item.base.itemblock.ItemBlockGtFrameBox;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.IBlockAccess;
public class BlockBaseModular extends BasicBlock {
protected Material blockMaterial;
protected int blockColour;
- protected BlockTypes thisBlock;
+ public BlockTypes thisBlock;
protected String thisBlockMaterial;
protected final String thisBlockType;
@@ -42,7 +41,7 @@ public class BlockBaseModular extends BasicBlock {
registerComponent();
}
- protected BlockBaseModular(final String unlocalizedName, final String blockMaterial,
+ protected BlockBaseModular(final String unlocalizedName, final String blockMaterialString,
final net.minecraft.block.material.Material vanillaMaterial, final BlockTypes blockType, final int colour,
final int miningLevel) {
super(blockType, unlocalizedName, vanillaMaterial, miningLevel);
@@ -50,33 +49,20 @@ public class BlockBaseModular extends BasicBlock {
this.setBlockTextureName(CORE.MODID + ":" + blockType.getTexture());
this.blockColour = colour;
this.thisBlock = blockType;
- this.thisBlockMaterial = blockMaterial;
+ this.thisBlockMaterial = blockMaterialString;
this.thisBlockType = blockType.name().toUpperCase();
this.setBlockName(this.GetProperName());
int fx = getBlockTypeMeta();
+ //ItemBlockGtBlock.sNameCache.put("block."+blockMaterial.getUnlocalizedName()+"."+this.thisBlock.name().toLowerCase(), GetProperName());
+ GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture() + unlocalizedName));
if (fx == 0) {
- GameRegistry.registerBlock(this, ItemBlockGtBlock.class,
- Utils.sanitizeString(blockType.getTexture() + unlocalizedName));
- GT_OreDictUnificator.registerOre(
- "block" + getUnlocalizedName().replace("tile.block", "").replace("tile.", "").replace("of", "")
- .replace("Of", "").replace("Block", "").replace("-", "").replace("_", "").replace(" ", ""),
- ItemUtils.getSimpleStack(this));
+ GT_OreDictUnificator.registerOre("block" + thisBlockMaterial.replace(" ", ""), ItemUtils.getSimpleStack(this));
}
else if (fx == 1) {
- GameRegistry.registerBlock(this, ItemBlockGtBlock.class,
- Utils.sanitizeString(blockType.getTexture() + unlocalizedName));
- GT_OreDictUnificator.registerOre(
- "frameGt" + getUnlocalizedName().replace("tile.", "").replace("tile.BlockGtFrame", "")
- .replace("-", "").replace("_", "").replace(" ", "").replace("FrameBox", ""),
- ItemUtils.getSimpleStack(this));
+ GT_OreDictUnificator.registerOre("frameGt" + thisBlockMaterial.replace(" ", ""), ItemUtils.getSimpleStack(this));
}
else if (fx == 2) {
- GameRegistry.registerBlock(this, ItemBlockGtBlock.class,
- Utils.sanitizeString(blockType.getTexture() + unlocalizedName));
- GT_OreDictUnificator.registerOre(
- "block" + getUnlocalizedName().replace("tile.block", "").replace("tile.", "").replace("of", "")
- .replace("Of", "").replace("Block", "").replace("-", "").replace("_", "").replace(" ", ""),
- ItemUtils.getSimpleStack(this));
+ GT_OreDictUnificator.registerOre("frameGt" + thisBlockMaterial.replace(" ", ""), ItemUtils.getSimpleStack(this));
}
}
@@ -135,7 +121,7 @@ public class BlockBaseModular extends BasicBlock {
}
public String GetProperName() {
- String tempIngot;
+ String tempIngot = null;
if (this.thisBlock == BlockTypes.STANDARD) {
tempIngot = "Block of " + this.thisBlockMaterial;
}
@@ -145,14 +131,21 @@ public class BlockBaseModular extends BasicBlock {
else if (this.thisBlock == BlockTypes.ORE) {
tempIngot = this.thisBlockMaterial + " Ore [Old]";
}
- else {
-
- tempIngot = this.getUnlocalizedName().replace("tile.blockGt", "ingot");
- }
return tempIngot;
}
@Override
+ public String getLocalizedName() {
+ String aFormattedLangName = GetProperName();
+ return GT_LanguageManager.addStringLocalization("block."+blockMaterial.getUnlocalizedName()+"."+this.thisBlock.name().toLowerCase()+".name", aFormattedLangName);
+ }
+
+ @Override
+ public String getUnlocalizedName() {
+ return "block."+blockMaterial.getUnlocalizedName()+"."+this.thisBlock.name().toLowerCase();
+ }
+
+ @Override
public boolean isOpaqueCube() {
return false;
}
diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
index c038afce8f..2909ef3541 100644
--- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
@@ -124,6 +124,10 @@ public class CommonProxy {
Utils.registerEvent(new HandlerTooltip_EIO());
// Handles Custom Tooltips for GC
Utils.registerEvent(new HandlerTooltip_GC());
+ // Handles Sleep Benefits
+ PlayerSleepEventHandler.init();
+ // Handles Magic Feather
+ Utils.registerEvent(ModItems.itemMagicFeather);
if (CORE.DEVENV) {
Utils.registerEvent(new StopAnnoyingFuckingAchievements());
diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
index 2e1d43bdda..951b10b432 100644
--- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
@@ -14,234 +14,162 @@ import net.minecraftforge.common.config.Configuration;
public class ConfigHandler {
public static void handleConfigFile(final FMLPreInitializationEvent event) {
- final Configuration config = new Configuration(
- new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg"));
+ final Configuration config = new Configuration(new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg"));
config.load();
-
+
// Debug
/* DEBUG = config.getBoolean("debugMode", "debug", false,
"Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)");*/
- disableEnderIOIntegration = config.getBoolean("disableEnderIO", "debug", false,
- "Disables EnderIO Integration.");
- disableEnderIOIngotTooltips = config.getBoolean("disableEnderIOIngotTooltips", "debug", false,
- "Disables EnderIO Ingot Tooltips. These apparently may cause issues for a very small number of users.");
- MACHINE_INFO = config.getBoolean("enableMachineInfoLogging", "debug", false,
- "Makes many machines display lots of debug logging.");
- showHiddenNEIItems = config.getBoolean("showHiddenNEIItems", "debug", false,
- "Makes all items hidden from NEI display.");
- dumpItemAndBlockData = config.getBoolean("dumpItemAndBlockData", "debug", false,
- "Dumps all GT++ and Toxic Everglade Data to en_US.lang in the config folder. This config option can be used by foreign players to generate blank .lang files, which they can populate with their language of choice.");
-
-
+ disableEnderIOIntegration = config.getBoolean("disableEnderIO", "debug", false, "Disables EnderIO Integration.");
+ disableEnderIOIngotTooltips = config.getBoolean("disableEnderIOIngotTooltips", "debug", false, "Disables EnderIO Ingot Tooltips. These apparently may cause issues for a very small number of users.");
+ MACHINE_INFO = config.getBoolean("enableMachineInfoLogging", "debug", false, "Makes many machines display lots of debug logging.");
+ showHiddenNEIItems = config.getBoolean("showHiddenNEIItems", "debug", false, "Makes all items hidden from NEI display.");
+ dumpItemAndBlockData = config.getBoolean("dumpItemAndBlockData", "debug", false, "Dumps all GT++ and Toxic Everglade Data to en_US.lang in the config folder. This config option can be used by foreign players to generate blank .lang files, which they can populate with their language of choice.");
+
// Machines
- enableThaumcraftShardUnification = config.getBoolean("enableThaumcraftShardUnification", "machines", false,
- "Allows the use of TC shards across many recipes by oreDicting them into a common group.");
- enableAlternativeBatteryAlloy = config.getBoolean("enableAlternativeBatteryAlloy", "machines", false,
- "Adds a non-Antimony using Battery Alloy. Not Balanced at all..");
- disableIC2Recipes = config.getBoolean("disableIC2Recipes", "machines", false,
- "Alkaluscraft Related - Removes IC2 Cables Except glass fibre. Few other Misc Tweaks.");
- enableAlternativeDivisionSigilRecipe = config.getBoolean("enableAlternativeDivisionSigilRecipe", "machines",
- false, "Utilizes Neutronium instead.");
+ enableThaumcraftShardUnification = config.getBoolean("enableThaumcraftShardUnification", "machines", false, "Allows the use of TC shards across many recipes by oreDicting them into a common group.");
+ enableAlternativeBatteryAlloy = config.getBoolean("enableAlternativeBatteryAlloy", "machines", false, "Adds a non-Antimony using Battery Alloy. Not Balanced at all..");
+ disableIC2Recipes = config.getBoolean("disableIC2Recipes", "machines", false, "Alkaluscraft Related - Removes IC2 Cables Except glass fibre. Few other Misc Tweaks.");
+ enableAlternativeDivisionSigilRecipe = config.getBoolean("enableAlternativeDivisionSigilRecipe", "machines", false, "Utilizes Neutronium instead.");
boilerSteamPerSecond = config.getInt("boilerSteamPerSecond", "machines", 750, 0, 10000, "Sets the steam per second value in LV,MV,HV boilers (respectively 1x,2x,3x this number for the tiers)");
-
- //requireControlCores
+
+ // requireControlCores
boolean temp = config.getBoolean("requireControlCores", "machines", true, "Multiblocks Require Control Cores");
-
-
-
- //Circuits
- enableCustomCircuits = config.getBoolean("enableCustomCircuits", "gregtech", false,
- "Adds custom circuits to expand past the Master Tier. Only really recommended to enable if enableOldGTcircuits is enabled.");
- enableOldGTcircuits = config.getBoolean("enableOldGTcircuits", "gregtech", false,
- "Restores circuits and their recipes from Pre-5.09.28 times.");
-
+
+ // Circuits
+ enableCustomCircuits = config.getBoolean("enableCustomCircuits", "gregtech", false, "Adds custom circuits to expand past the Master Tier. Only really recommended to enable if enableOldGTcircuits is enabled.");
+ enableOldGTcircuits = config.getBoolean("enableOldGTcircuits", "gregtech", false, "Restores circuits and their recipes from Pre-5.09.28 times.");
+
// Tools
- enableSkookumChoochers = config.getBoolean("enableSkookumChoochers", "gregtech", true,
- "Adds Custom GT Tools, called Skookum Choochers, functioning as a hard hammer and a wrench.");
- enableMultiSizeTools = config.getBoolean("enableMultiSizeTools", "gregtech", true,
- "Adds Custom GT Shovels and Pickaxes which mine in a 3x3 style. One of each whill be generated for each Gregtech Material which has Dense Plates and Long Rods available.");
-
+ enableSkookumChoochers = config.getBoolean("enableSkookumChoochers", "gregtech", true, "Adds Custom GT Tools, called Skookum Choochers, functioning as a hard hammer and a wrench.");
+ enableMultiSizeTools = config.getBoolean("enableMultiSizeTools", "gregtech", true, "Adds Custom GT Shovels and Pickaxes which mine in a 3x3 style. One of each whill be generated for each Gregtech Material which has Dense Plates and Long Rods available.");
+
// GT-Fixes
- enableNitroFix = config.getBoolean("enableNitroFix", "gregtech", false,
- "Restores the old Nitro-Diesel recipes.");
- enableSulfuricAcidFix = config.getBoolean("enableSulfuricAcidFix", "gregtech", false,
- "Adds GT6 recipes for Sulfuric Acid. Should remove all pre-existing recipes.");
- enableAnimatedTurbines = config.getBoolean("enableAnimatedTurbines", "gregtech", true,
- "Gives GT Gas/Steam turbines animated textures while running.");
+ enableNitroFix = config.getBoolean("enableNitroFix", "gregtech", false, "Restores the old Nitro-Diesel recipes.");
+ enableSulfuricAcidFix = config.getBoolean("enableSulfuricAcidFix", "gregtech", false, "Adds GT6 recipes for Sulfuric Acid. Should remove all pre-existing recipes.");
+ enableAnimatedTurbines = config.getBoolean("enableAnimatedTurbines", "gregtech", true, "Gives GT Gas/Steam turbines animated textures while running.");
turbineCutoffBase = config.getInt("turbineCutoffBase", "gregtech", 75000, 0, Integer.MAX_VALUE, "Rotors below this durability will be removed, prevents NEI clutter. Minimum Durability is N * x, where N is the new value set and x is the turbine size, where 1 is Tiny and 4 is Huge. Set to 0 to disable.");
-
- enableHarderRecipesForHighTierCasings = config.getBoolean("enableHarderRecipesForHighTierCasings", "gregtech", false,
- "Makes LuV+ Casings and Hulls more difficult to craft.");
-
+
+ enableHarderRecipesForHighTierCasings = config.getBoolean("enableHarderRecipesForHighTierCasings", "gregtech", false, "Makes LuV+ Casings and Hulls more difficult to craft.");
+
// Pipes & Cables
- enableCustom_Pipes = config.getBoolean("enableCustom_Pipes", "gregtech", true,
- "Adds Custom GT Fluid Pipes.");
- enableCustom_Cables = config.getBoolean("enableCustom_Cables", "gregtech", true,
- "Adds Custom GT Cables.");
-
+ enableCustom_Pipes = config.getBoolean("enableCustom_Pipes", "gregtech", true, "Adds Custom GT Fluid Pipes.");
+ enableCustom_Cables = config.getBoolean("enableCustom_Cables", "gregtech", true, "Adds Custom GT Cables.");
+
// Block Drops
- chanceToDropDrainedShard = config.getInt("chanceToDropDrainedShard", "blockdrops", 196, 0,
- 10000, "Drained shards have a 1 in X chance to drop.");
- chanceToDropFluoriteOre = config.getInt("chanceToDropFluoriteOre", "blockdrops", 32, 0,
- 10000, "Fluorite Ore has a 1 in X chance to drop from Limestone and a 1 in X*20 from Sandstone..");
-
+ chanceToDropDrainedShard = config.getInt("chanceToDropDrainedShard", "blockdrops", 196, 0, 10000, "Drained shards have a 1 in X chance to drop.");
+ chanceToDropFluoriteOre = config.getInt("chanceToDropFluoriteOre", "blockdrops", 32, 0, 10000, "Fluorite Ore has a 1 in X chance to drop from Limestone and a 1 in X*20 from Sandstone..");
+
// Single machines
- enableMachine_SolarGenerators = config.getBoolean("enableSolarGenerators", "gregtech",
- false, "These may be overpowered, Consult a local electrician.");
- enableMachine_ComponentAssemblers = config.getBoolean("enableComponentAssemblers", "gregtech",
- true, "These construct machine components.");
- enableMachine_Safes = config.getBoolean("enableMachineSafes", "gregtech", true,
- "These protect your goodies/rare stuff.");
- enableMachine_Dehydrators = config.getBoolean("enableMachineDehydrators", "gregtech", true,
- "These dehydrate stuff.");
- enableMachine_SteamConverter = config.getBoolean("enableMachineSteamConverter", "gregtech",
- true, "Converts IC2 steam -> Railcraft steam.");
- enableMachine_FluidTanks = config.getBoolean("enableMachineFluidTanks", "gregtech", true,
- "Portable fluid tanks.");
- enableMachine_RocketEngines = config.getBoolean("enableMachineRocketEngines", "gregtech",
- true, "Diesel egines with different internals, they consume less fuel overall.");
- enableMachine_GeothermalEngines = config.getBoolean("enableMachineGeothermalEngines",
- "gregtech", true, "These may be overpowered, Consult a local geologist.");
- enableMachine_WorldAccelerators = config.getBoolean("enableMachineWorldAccelerators",
- "gregtech", true, "These allow boosting Block/TileEntity Tick times [OP].");
- enableMachine_Tesseracts = config.getBoolean("enableMachineTesseracts",
- "gregtech", true, "Tesseracts for wireless item/fluid movement.");
- enableMachine_SimpleWasher = config.getBoolean("enableMachineSimpleWasher",
- "gregtech", true, "Very basic automated cauldron for dust washing.");
- enableMachine_Pollution = config.getBoolean("enableMachinePollution",
- "gregtech", true, "Pollution Detector & Scrubbers.");
- enableMachine_RF_Convetor = config.getBoolean("enableMachineRFConvetor", "gregtech",
- true, "Converts RF to GTEU. Requires COFH-Core to be installed.");
-
-
+ enableMachine_SolarGenerators = config.getBoolean("enableSolarGenerators", "gregtech", false, "These may be overpowered, Consult a local electrician.");
+ enableMachine_ComponentAssemblers = config.getBoolean("enableComponentAssemblers", "gregtech", true, "These construct machine components.");
+ enableMachine_Safes = config.getBoolean("enableMachineSafes", "gregtech", true, "These protect your goodies/rare stuff.");
+ enableMachine_Dehydrators = config.getBoolean("enableMachineDehydrators", "gregtech", true, "These dehydrate stuff.");
+ enableMachine_SteamConverter = config.getBoolean("enableMachineSteamConverter", "gregtech", true, "Converts IC2 steam -> Railcraft steam.");
+ enableMachine_FluidTanks = config.getBoolean("enableMachineFluidTanks", "gregtech", true, "Portable fluid tanks.");
+ enableMachine_RocketEngines = config.getBoolean("enableMachineRocketEngines", "gregtech", true, "Diesel egines with different internals, they consume less fuel overall.");
+ enableMachine_GeothermalEngines = config.getBoolean("enableMachineGeothermalEngines", "gregtech", true, "These may be overpowered, Consult a local geologist.");
+ enableMachine_WorldAccelerators = config.getBoolean("enableMachineWorldAccelerators", "gregtech", true, "These allow boosting Block/TileEntity Tick times [OP].");
+ enableMachine_Tesseracts = config.getBoolean("enableMachineTesseracts", "gregtech", true, "Tesseracts for wireless item/fluid movement.");
+ enableMachine_SimpleWasher = config.getBoolean("enableMachineSimpleWasher", "gregtech", true, "Very basic automated cauldron for dust washing.");
+ enableMachine_Pollution = config.getBoolean("enableMachinePollution", "gregtech", true, "Pollution Detector & Scrubbers.");
+ enableMachine_RF_Convetor = config.getBoolean("enableMachineRFConvetor", "gregtech", true, "Converts RF to GTEU. Requires COFH-Core to be installed.");
+
// Multi machines
- enableMultiblock_AlloyBlastSmelter = config.getBoolean("enableMultiblockAlloyBlastSmelter",
- "gregtech", true,
- "Required to smelt most high tier materials from GT++. Also smelts everything else to molten metal.");
- enableMultiblock_IndustrialCentrifuge = config
- .getBoolean("enableMultiblockIndustrialCentrifuge", "gregtech", true, "Spin, Spin, Spiiiin.");
- enableMultiblock_IndustrialCokeOven = config.getBoolean(
- "enableMultiblockIndustrialCokeOven", "gregtech", true,
- "Pyro Oven Alternative, older, more realistic, better.");
- enableMultiblock_IndustrialElectrolyzer = config.getBoolean(
- "enableMultiblockIndustrialElectrolyzer", "gregtech", true,
- "Electrolyzes things with extra bling factor.");
- enableMultiblock_IndustrialMacerationStack = config.getBoolean(
- "enableMultiblockIndustrialMacerationStack", "gregtech", true,
- "A hyper efficient maceration tower, nets more bonus outputs.");
- enableMultiblock_IndustrialPlatePress = config.getBoolean(
- "enableMultiblockIndustrialPlatePress", "gregtech", true, "Industrial bendering machine thingo.");
- enableMultiblock_IndustrialWireMill = config.getBoolean(
- "enableMultiblockIndustrialWireMill", "gregtech", true, "Produces fine wire and exotic cables.");
- enableMultiblock_IronBlastFurnace = config.getBoolean("enableMultiblockIronBlastFurnace",
- "gregtech", true, "Skip the Bronze age, very slowly.");
- enableMultiblock_MatterFabricator = config.getBoolean("enableMultiblockMatterFabricator",
- "gregtech", true, "?FAB?RIC?ATE MA?TT?ER.");
- enableMultiblock_MultiTank = config.getBoolean("enableMultiblockMultiTank", "gregtech",
- true, "Tall tanks, each layer adds extra fluid storage.");
- enableMultiblock_PowerSubstation = config.getBoolean("enableMultiblockPowerSubstation",
- "gregtech", true, "For managing large power grids.");
- enableMultiblock_LiquidFluorideThoriumReactor = config.getBoolean(
- "enableMultiblockLiquidFluorideThoriumReactor", "gregtech", true, "For supplying large power grids.");
- enableMultiblock_NuclearFuelRefinery = config.getBoolean(
- "enableMultiblock_NuclearFuelRefinery", "gregtech", true,
- "Refines molten chemicals into nuclear fuels.");
- enableMultiblock_IndustrialSifter = config.getBoolean("enableMultiblock_IndustrialSifter",
- "gregtech", true, "Large scale sifting.");
- enableMultiblock_LargeAutoCrafter = config.getBoolean("enableMultiblock_LargeAutoCrafter",
- "gregtech", true, "Can Assemble, Disassemble and Craft Project data from Data Sticks.");
- enableMultiblock_IndustrialThermalCentrifuge = config.getBoolean("enableMultiblock_IndustrialThermalCentrifuge",
- "gregtech", true, "Your warm spin for the ore thing.");
- enableMultiblock_IndustrialWashPlant = config.getBoolean("enableMultiblock_IndustrialWashPlant",
- "gregtech", true, "Used to wash the dirt, riiiiight offff..");
- enableMultiblock_ThermalBoiler = config.getBoolean("enableMachineThermalBoiler",
- "gregtech", true, "Thermal Boiler from GT4. Can Filter Lava for resources.");
- enableMultiblock_IndustrialCuttingMachine = config.getBoolean("enableMultiblock_IndustrialCuttingMachine",
- "gregtech", true, "Very fast and efficient Cutting Machine.");
- enableMultiblock_IndustrialFishingPort = config.getBoolean("enableMultiblock_IndustrialFishingPort",
- "gregtech", true, "Fish the