diff options
Diffstat (limited to 'src/main/java/gregtech')
56 files changed, 3615 insertions, 2800 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index eb51de7e96..848791bb40 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -19,6 +19,7 @@ import gregtech.common.GT_DummyWorld; import gregtech.common.GT_Network;
import gregtech.common.GT_Proxy;
import gregtech.common.GT_RecipeAdder;
+import gregtech.common.blocks.GT_Block_Ores_Abstract;
import gregtech.common.entities.GT_Entity_Arrow;
import gregtech.common.entities.GT_Entity_Arrow_Potion;
import gregtech.common.items.armor.components.LoadArmorComponents;
@@ -236,6 +237,7 @@ public class GT_Mod implements IGT_Mod { gregtechproxy.mDisableIC2Cables = tMainConfig.get(aTextGeneral, "DisableIC2Cables", true).getBoolean(true);
gregtechproxy.mAchievements = tMainConfig.get(aTextGeneral, "EnableAchievements", true).getBoolean(true);
gregtechproxy.mAE2Integration = GregTech_API.sSpecialFile.get(ConfigCategories.general, "EnableAE2Integration", Loader.isModLoaded("appliedenergistics2"));
+ gregtechproxy.mAE2Tunnel = GregTech_API.sSpecialFile.get(ConfigCategories.general, "EnableAE2Tunnel", false);
gregtechproxy.mNerfedCombs = tMainConfig.get(aTextGeneral, "NerfCombs", true).getBoolean(true);
gregtechproxy.mNerfedCrops = tMainConfig.get(aTextGeneral, "NerfCrops", true).getBoolean(true);
gregtechproxy.mHideUnusedOres = tMainConfig.get(aTextGeneral, "HideUnusedOres", true).getBoolean(true);
@@ -279,6 +281,13 @@ public class GT_Mod implements IGT_Mod { gregtechproxy.enableGCOres = GregTech_API.sWorldgenFile.get("general", "enableGCOres", gregtechproxy.enableGCOres);
gregtechproxy.enableUBOres = GregTech_API.sWorldgenFile.get("general", "enableUBOres", gregtechproxy.enableUBOres);
+ Materials[] tDisableOres = new Materials[]{Materials.Chrome, Materials.Naquadria, Materials.Silicon, Materials.Cobalt, Materials.Cadmium, Materials.Indium, Materials.Tungsten,
+ Materials.Adamantium, Materials.Mithril, Materials.DarkIron, Materials.Rutile, Materials.Alduorite, Materials.Magnesium, Materials.Nikolite};
+ for(Materials tMat : tDisableOres){
+ if(!GregTech_API.sMaterialComponents.get("disableLaserDrillOres", tMat.mName, false))
+ GT_Block_Ores_Abstract.aBlockedOres.add(tMat);
+ }
+
GregTech_API.mUseOnlyGoodSolderingMaterials = GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.harderrecipes, "useonlygoodsolderingmaterials", GregTech_API.mUseOnlyGoodSolderingMaterials);
if (tMainConfig.get("general", "hardermobspawners", true).getBoolean(true)) {
@@ -598,6 +607,7 @@ public class GT_Mod implements IGT_Mod { new GT_CropLoader().run();
new GT_Worldgenloader().run();
new GT_CoverLoader().run();
+ new GT_AE2EnergyTunnelLoader().run();
LoadArmorComponents.init();
GT_RecipeRegistrator.registerUsagesForMaterials(new ItemStack(Blocks.planks, 1), null, false);
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 92afee5cec..e10437cf8b 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -1,784 +1,784 @@ -package gregtech.api.enums; - -import gregtech.api.interfaces.IItemContainer; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; - -import static gregtech.api.enums.GT_Values.W; - -/** - * Class containing all non-OreDict Items of GregTech. - */ -public enum ItemList implements IItemContainer { - Display_ITS_FREE, - Display_Fluid, - TE_Slag, - TE_Slag_Rich, - TE_Rockwool, - TE_Hardened_Glass, - FR_Lemon, - FR_Mulch, - FR_Fertilizer, - FR_Compost, - FR_Silk, - FR_Wax, - FR_RefractoryWax, - FR_WaxCapsule, - FR_RefractoryCapsule, - FR_Stick, - FR_Casing_Impregnated, - FR_Casing_Sturdy, - FR_Casing_Hardened, - FR_Bee_Drone, - FR_Bee_Princess, - FR_Bee_Queen, - FR_Tree_Sapling, - FR_Butterfly, - FR_Larvae, - FR_Serum, - FR_Caterpillar, - FR_PollenFertile, - TF_LiveRoot, - TF_Vial_FieryBlood, - TF_Vial_FieryTears, - RC_ShuntingWire, - RC_ShuntingWireFrame, - RC_Rail_Reinforced, - RC_Rail_Electric, - RC_Rail_Standard, - RC_Rail_Wooden, - RC_Rail_Adv, - RC_Rail_HS, - RC_Tie_Wood, - RC_Tie_Stone, - RC_Bed_Wood, - RC_Bed_Stone, - RC_Rebar, - IC2_Item_Casing_Tin, - IC2_Item_Casing_Copper, - IC2_Item_Casing_Iron, - IC2_Item_Casing_Steel, - IC2_Item_Casing_Lead, - IC2_Item_Casing_Bronze, - IC2_Item_Casing_Gold, - IC2_Spray_WeedEx, - IC2_Scrap, - IC2_Scrapbox, - IC2_Fertilizer, - IC2_Mixed_Metal_Ingot, - IC2_Hops, - IC2_Resin, - IC2_Plantball, - IC2_PlantballCompressed, - IC2_CoffeeBeans, - IC2_CoffeePowder, - IC2_Crop_Seeds, - IC2_Grin_Powder, - IC2_Energium_Dust, - IC2_Compressed_Coal_Ball, - IC2_Compressed_Coal_Chunk, - IC2_Fuel_Rod_Empty, - IC2_Fuel_Can_Empty, - IC2_Fuel_Can_Filled, - IC2_Food_Can_Empty, - IC2_Food_Can_Filled, - IC2_Food_Can_Spoiled, - IC2_ShaftIron, - IC2_ShaftSteel, - IC2_Industrial_Diamond, - IC2_ForgeHammer, - IC2_WireCutter, - IC2_SuBattery, - IC2_ReBattery, - IC2_AdvBattery, - IC2_EnergyCrystal, - IC2_LapotronCrystal, - Arrow_Head_Glass_Emtpy, - Arrow_Head_Glass_Poison, - Arrow_Head_Glass_Poison_Long, - Arrow_Head_Glass_Poison_Strong, - Arrow_Head_Glass_Slowness, - Arrow_Head_Glass_Slowness_Long, - Arrow_Head_Glass_Weakness, - Arrow_Head_Glass_Weakness_Long, - Arrow_Head_Glass_Holy_Water, - Arrow_Wooden_Glass_Emtpy, - Arrow_Wooden_Glass_Poison, - Arrow_Wooden_Glass_Poison_Long, - Arrow_Wooden_Glass_Poison_Strong, - Arrow_Wooden_Glass_Slowness, - Arrow_Wooden_Glass_Slowness_Long, - Arrow_Wooden_Glass_Weakness, - Arrow_Wooden_Glass_Weakness_Long, - Arrow_Wooden_Glass_Holy_Water, - Arrow_Plastic_Glass_Emtpy, - Arrow_Plastic_Glass_Poison, - Arrow_Plastic_Glass_Poison_Long, - Arrow_Plastic_Glass_Poison_Strong, - Arrow_Plastic_Glass_Slowness, - Arrow_Plastic_Glass_Slowness_Long, - Arrow_Plastic_Glass_Weakness, - Arrow_Plastic_Glass_Weakness_Long, - Arrow_Plastic_Glass_Holy_Water, - Shape_Empty, - Shape_Mold_Bottle, - Shape_Mold_Plate, - Shape_Mold_Ingot, - Shape_Mold_Casing, - Shape_Mold_Gear, - Shape_Mold_Gear_Small, - Shape_Mold_Credit, - Shape_Mold_Nugget, - Shape_Mold_Block, - Shape_Mold_Ball, - Shape_Mold_Bun, - Shape_Mold_Bread, - Shape_Mold_Baguette, - Shape_Mold_Cylinder, - Shape_Mold_Anvil, - Shape_Mold_Arrow, - Shape_Mold_Name, - Shape_Slicer_Flat, - Shape_Slicer_Stripes, - Shape_Extruder_Bottle, - Shape_Extruder_Plate, - Shape_Extruder_Cell, - Shape_Extruder_Ring, - Shape_Extruder_Rod, - Shape_Extruder_Bolt, - Shape_Extruder_Ingot, - Shape_Extruder_Wire, - Shape_Extruder_Casing, - Shape_Extruder_Pipe_Tiny, - Shape_Extruder_Pipe_Small, - Shape_Extruder_Pipe_Medium, - Shape_Extruder_Pipe_Large, - Shape_Extruder_Pipe_Huge, - Shape_Extruder_Block, - Shape_Extruder_Sword, - Shape_Extruder_Pickaxe, - Shape_Extruder_Shovel, - Shape_Extruder_Axe, - Shape_Extruder_Hoe, - Shape_Extruder_Hammer, - Shape_Extruder_File, - Shape_Extruder_Saw, - Shape_Extruder_Gear, - Crate_Empty, - Credit_Copper, - Credit_Iron, - Credit_Silver, - Credit_Gold, - Credit_Platinum, - Credit_Osmium, - Credit_Greg_Copper, - Credit_Greg_Cupronickel, - Credit_Greg_Silver, - Credit_Greg_Gold, - Credit_Greg_Platinum, - Credit_Greg_Osmium, - Credit_Greg_Naquadah, - Credit_Greg_Neutronium, - Coin_Gold_Ancient, - Coin_Doge, - Coin_Chocolate, - Cell_Universal_Fluid, - Cell_Empty, - Cell_Water, - Cell_Lava, - Cell_Air, - Large_Fluid_Cell_Steel, - Large_Fluid_Cell_TungstenSteel, - ThermosCan_Empty, - ThermosCan_Dark_Coffee, - ThermosCan_Dark_Cafe_au_lait, - ThermosCan_Coffee, - ThermosCan_Cafe_au_lait, - ThermosCan_Lait_au_cafe, - ThermosCan_Dark_Chocolate_Milk, - ThermosCan_Chocolate_Milk, - ThermosCan_Tea, - ThermosCan_Sweet_Tea, - ThermosCan_Ice_Tea, - Bottle_Empty, - Bottle_Milk, - Bottle_Holy_Water, - Bottle_Purple_Drink, - Bottle_Grape_Juice, - Bottle_Wine, - Bottle_Vinegar, - Bottle_Potato_Juice, - Bottle_Vodka, - Bottle_Leninade, - Bottle_Mineral_Water, - Bottle_Salty_Water, - Bottle_Reed_Water, - Bottle_Rum, - Bottle_Pirate_Brew, - Bottle_Hops_Juice, - Bottle_Dark_Beer, - Bottle_Dragon_Blood, - Bottle_Wheaty_Juice, - Bottle_Scotch, - Bottle_Glen_McKenner, - Bottle_Wheaty_Hops_Juice, - Bottle_Beer, - Bottle_Chilly_Sauce, - Bottle_Hot_Sauce, - Bottle_Diabolo_Sauce, - Bottle_Diablo_Sauce, - Bottle_Snitches_Glitch_Sauce, - Bottle_Apple_Juice, - Bottle_Cider, - Bottle_Golden_Apple_Juice, - Bottle_Golden_Cider, - Bottle_Iduns_Apple_Juice, - Bottle_Notches_Brew, - Bottle_Lemon_Juice, - Bottle_Limoncello, - Bottle_Lemonade, - Bottle_Alcopops, - Bottle_Cave_Johnsons_Grenade_Juice, - Food_Potato_On_Stick, - Food_Potato_On_Stick_Roasted, - Food_Fries, - Food_ChiliChips, - Food_PotatoChips, - Food_Baked_Potato, - Food_Poisonous_Potato, - Food_Cheese, - Food_Chum, - Food_Chum_On_Stick, - Food_Dough, - Food_Dough_Sugar, - Food_Dough_Chocolate, - Food_Raw_Cookie, - Food_Flat_Dough, - Food_Burger_Veggie, - Food_Burger_Cheese, - Food_Burger_Meat, - Food_Burger_Chum, - Food_Sandwich_Veggie, - Food_Sandwich_Cheese, - Food_Sandwich_Bacon, - Food_Sandwich_Steak, - Food_Large_Sandwich_Veggie, - Food_Large_Sandwich_Cheese, - Food_Large_Sandwich_Bacon, - Food_Large_Sandwich_Steak, - Food_Sliced_Lemon, - Food_Sliced_Tomato, - Food_Sliced_Onion, - Food_Sliced_Cucumber, - Food_Sliced_Cheese, - Food_Sliced_Bread, - Food_Sliced_Bun, - Food_Sliced_Baguette, - Food_Sliced_Breads, - Food_Sliced_Buns, - Food_Sliced_Baguettes, - Food_Packaged_Fries, - Food_Packaged_PotatoChips, - Food_Packaged_ChiliChips, - Food_Raw_Potato, - Food_Raw_Fries, - Food_Raw_PotatoChips, - Food_Raw_Bread, - Food_Raw_Bun, - Food_Raw_Baguette, - Food_Raw_Cake, - Food_Raw_Pizza_Veggie, - Food_Raw_Pizza_Cheese, - Food_Raw_Pizza_Meat, - Food_Baked_Bread, - Food_Baked_Bun, - Food_Baked_Baguette, - Food_Baked_Cake, - Food_Baked_Pizza_Veggie, - Food_Baked_Pizza_Cheese, - Food_Baked_Pizza_Meat, - Crop_Drop_Argentia, - Crop_Drop_Plumbilia, - Crop_Drop_Indigo, - Crop_Drop_Ferru, - Crop_Drop_Aurelia, - Crop_Drop_OilBerry, - Crop_Drop_MilkWart, - Crop_Drop_BobsYerUncleRanks, - Crop_Drop_Coppon, - Crop_Drop_Tine, - Crop_Drop_Chilly, - Crop_Drop_Lemon, - Crop_Drop_Onion, - Crop_Drop_Tomato, - Crop_Drop_MTomato, - Crop_Drop_Grapes, - Crop_Drop_TeaLeaf, - Crop_Drop_Cucumber, - Crop_Drop_Rape, - Schematic, - Schematic_Crafting, - Schematic_1by1, - Schematic_2by2, - Schematic_3by3, - Schematic_Dust, - Circuit_Integrated, - Circuit_Board_Basic, - Circuit_Board_Advanced, - Circuit_Board_Elite, - Circuit_Parts_Advanced, - Circuit_Parts_Wiring_Basic, - Circuit_Parts_Wiring_Advanced, - Circuit_Parts_Wiring_Elite, - Circuit_Parts_Crystal_Chip_Elite, - Circuit_Parts_Crystal_Chip_Master, - Circuit_Primitive, - Circuit_Basic, - Circuit_Good, - Circuit_Advanced, - Circuit_Data, - Circuit_Elite, - Circuit_Master, - Circuit_Ultimate, - Rotor_LV, Rotor_MV, Rotor_HV, Rotor_EV, Rotor_IV, Rotor_LuV, Rotor_ZPM, Rotor_UV, - Electric_Motor_LV, Electric_Motor_MV, Electric_Motor_HV, Electric_Motor_EV, Electric_Motor_IV, Electric_Motor_LuV, Electric_Motor_ZPM, Electric_Motor_UV, - Electric_Pump_LV, Electric_Pump_MV, Electric_Pump_HV, Electric_Pump_EV, Electric_Pump_IV, Electric_Pump_LuV, Electric_Pump_ZPM, Electric_Pump_UV, - Conveyor_Module_LV, Conveyor_Module_MV, Conveyor_Module_HV, Conveyor_Module_EV, Conveyor_Module_IV, Conveyor_Module_LuV, Conveyor_Module_ZPM, Conveyor_Module_UV, - Electric_Piston_LV, Electric_Piston_MV, Electric_Piston_HV, Electric_Piston_EV, Electric_Piston_IV, Electric_Piston_LuV, Electric_Piston_ZPM, Electric_Piston_UV, - Field_Generator_LV, Field_Generator_MV, Field_Generator_HV, Field_Generator_EV, Field_Generator_IV, Field_Generator_LuV, Field_Generator_ZPM, Field_Generator_UV, - Robot_Arm_LV, Robot_Arm_MV, Robot_Arm_HV, Robot_Arm_EV, Robot_Arm_IV, Robot_Arm_LuV, Robot_Arm_ZPM, Robot_Arm_UV, - Emitter_LV, Emitter_MV, Emitter_HV, Emitter_EV, Emitter_IV, Emitter_LuV, Emitter_ZPM, Emitter_UV, - Sensor_LV, Sensor_MV, Sensor_HV, Sensor_EV, Sensor_IV, Sensor_LuV, Sensor_ZPM, Sensor_UV, - Battery_Hull_LV, Battery_Hull_MV, Battery_Hull_HV, - Battery_SU_LV_SulfuricAcid, - Battery_SU_LV_Mercury, - Battery_SU_MV_SulfuricAcid, - Battery_SU_MV_Mercury, - Battery_SU_HV_SulfuricAcid, - Battery_SU_HV_Mercury, - Battery_RE_ULV_Tantalum, - Battery_RE_LV_Cadmium, - Battery_RE_LV_Lithium, - Battery_RE_LV_Sodium, - Battery_RE_MV_Cadmium, - Battery_RE_MV_Lithium, - Battery_RE_MV_Sodium, - Battery_RE_HV_Cadmium, - Battery_RE_HV_Lithium, - Battery_RE_HV_Sodium, - ZPM, - Fuel_Can_Plastic_Empty, - Fuel_Can_Plastic_Filled, - Upgrade_Battery, - Upgrade_Overclocker, - Upgrade_Muffler, - Upgrade_SteamEngine, - Upgrade_Lock, - Cover_Controller, - Cover_ActivityDetector, - Cover_FluidDetector, - Cover_ItemDetector, - Cover_EnergyDetector, - Cover_Drain, - Cover_Shutter, - Cover_Crafting, - Cover_Screen, - Cover_SolarPanel, - Cover_SolarPanel_8V, - Cover_SolarPanel_LV, - Cover_SolarPanel_MV, - Cover_SolarPanel_HV, - Cover_SolarPanel_EV, - Cover_SolarPanel_IV, - Cover_SolarPanel_LuV, - Cover_SolarPanel_ZPM, - Cover_SolarPanel_UV, - Ingot_IridiumAlloy, - Plank_Oak, - Plank_Spruce, - Plank_Birch, - Plank_Jungle, - Plank_Acacia, - Plank_DarkOak, - Plank_Larch, - Plank_Teak, - Plank_Acacia_Green, - Plank_Lime, - Plank_Chestnut, - Plank_Wenge, - Plank_Baobab, - Plank_Sequoia, - Plank_Kapok, - Plank_Ebony, - Plank_Mahagony, - Plank_Balsa, - Plank_Willow, - Plank_Walnut, - Plank_Greenheart, - Plank_Cherry, - Plank_Mahoe, - Plank_Poplar, - Plank_Palm, - Plank_Papaya, - Plank_Pine, - Plank_Plum, - Plank_Maple, - Plank_Citrus, - Dye_Indigo, - Dye_SquidInk, - Dye_Bonemeal, - Dye_Cocoa, - Duct_Tape, - Book_Written_00, - Book_Written_01, - Book_Written_02, - Book_Written_03, - Paper_Printed_Pages, - Paper_Magic_Empty, - Paper_Magic_Page, - Paper_Magic_Pages, - Paper_Punch_Card_Empty, - Paper_Punch_Card_Encoded, - McGuffium_239, - NC_SensorCard, - NC_SensorKit, - Tool_Matches, - Tool_MatchBox_Used, - Tool_MatchBox_Full, - Tool_Lighter_Invar_Empty, - Tool_Lighter_Invar_Used, - Tool_Lighter_Invar_Full, - Tool_ |