aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/GT_Mod.java13
-rw-r--r--src/main/java/gregtech/api/GregTech_API.java4
-rw-r--r--src/main/java/gregtech/api/enums/GT_Values.java105
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java4
-rw-r--r--src/main/java/gregtech/api/enums/ModIDs.java84
-rw-r--r--src/main/java/gregtech/api/enums/Mods.java291
-rw-r--r--src/main/java/gregtech/api/enums/SoundResource.java60
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java15
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainer_1by1.java10
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java10
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainer_3by3.java10
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainer_4by4.java10
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java6
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java6
-rw-r--r--src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java8
-rw-r--r--src/main/java/gregtech/api/gui/modularui/GT_UITextures.java538
-rw-r--r--src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java8
-rw-r--r--src/main/java/gregtech/api/interfaces/IDragAndDropSupport.java5
-rw-r--r--src/main/java/gregtech/api/items/GT_EnergyArmor_Item.java4
-rw-r--r--src/main/java/gregtech/api/items/GT_Generic_Item.java7
-rw-r--r--src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java15
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java4
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java5
-rw-r--r--src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java5
-rw-r--r--src/main/java/gregtech/api/objects/GT_Fluid.java4
-rw-r--r--src/main/java/gregtech/api/util/GT_BaseCrop.java2
-rw-r--r--src/main/java/gregtech/api/util/GT_ChunkAssociatedData.java4
-rw-r--r--src/main/java/gregtech/api/util/GT_ModReference.java8
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java189
-rw-r--r--src/main/java/gregtech/api/util/GT_RecipeMapUtil.java3
-rw-r--r--src/main/java/gregtech/client/GT_GUI_ClientConfig.java4
-rw-r--r--src/main/java/gregtech/common/GT_Client.java5
-rw-r--r--src/main/java/gregtech/common/GT_Proxy.java733
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java8
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Metal.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java2
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java4
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java4
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java4
-rw-r--r--src/main/java/gregtech/common/fluid/GT_FluidBuilder.java4
-rw-r--r--src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java4
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java98
-rw-r--r--src/main/java/gregtech/common/items/GT_VolumetricFlask.java4
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java188
-rw-r--r--src/main/java/gregtech/common/items/ItemDrop.java35
-rw-r--r--src/main/java/gregtech/common/items/ItemPollen.java4
-rw-r--r--src/main/java/gregtech/common/items/ItemPropolis.java23
-rw-r--r--src/main/java/gregtech/common/items/behaviors/Behaviour_Crowbar.java4
-rw-r--r--src/main/java/gregtech/common/misc/spaceprojects/enums/SolarSystem.java5
-rw-r--r--src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java19
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java3
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java18
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java11
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java11
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PCBFactory.java11
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java4
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multiblock/logic/CokeOvenProcessingLogic.java3
-rw-r--r--src/main/java/gregtech/common/tools/GT_Tool_Scoop.java2
-rw-r--r--src/main/java/gregtech/crossmod/Waila.java3
-rw-r--r--src/main/java/gregtech/loaders/ExtraIcons.java26
-rw-r--r--src/main/java/gregtech/loaders/load/GT_FuelLoader.java24
-rw-r--r--src/main/java/gregtech/loaders/materialprocessing/ProcessingModSupport.java2
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_Achievements.java2
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java401
-rw-r--r--src/main/java/gregtech/loaders/misc/GT_Bees.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCircuit.java6
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrafting.java28
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java3
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java4
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingSlab.java2
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingStone.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java60
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_PostLoad.java10
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java41
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java13
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java62
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java454
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java38
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java5
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java10
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CannerRecipes.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java74
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java14
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java22
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java50
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java16
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java27
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/DistilleryRecipes.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java80
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java10
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java10
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FormingPressRecipes.java54
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FuelRecipes.java34
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ImplosionCompressorRecipes.java10
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/LatheRecipes.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java92
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/NEIHiding.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/OreDictUnification.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java9
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java76
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PyrolyseRecipes.java8
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java10
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java16
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java2
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java61
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java68
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java60
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java125
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_PreLoad.java4
-rw-r--r--src/main/java/gregtech/nei/IMCForNEI.java5
-rw-r--r--src/main/java/gregtech/nei/dumper/GregTechIDDumper.java2
116 files changed, 2583 insertions, 2238 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 7d239263b0..5a7bee508b 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -1,7 +1,7 @@
package gregtech;
import static gregtech.api.GregTech_API.registerCircuitProgrammer;
-import static gregtech.api.enums.ModIDs.Forestry;
+import static gregtech.api.enums.Mods.Forestry;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -93,7 +93,7 @@ import ic2.api.recipe.IRecipeInput;
import ic2.api.recipe.RecipeOutput;
@Mod(
- modid = "gregtech",
+ modid = Mods.Names.GREG_TECH,
name = "GregTech",
version = "MC1710",
guiFactory = "gregtech.client.GT_GuiFactory",
@@ -148,10 +148,13 @@ public class GT_Mod implements IGT_Mod {
@Deprecated
public static final int REQUIRED_IC2 = 624;
- @Mod.Instance("gregtech")
+ @Mod.Instance(Mods.Names.GREG_TECH)
public static GT_Mod instance;
- @SidedProxy(modId = "gregtech", clientSide = "gregtech.common.GT_Client", serverSide = "gregtech.common.GT_Server")
+ @SidedProxy(
+ modId = Mods.Names.GREG_TECH,
+ clientSide = "gregtech.common.GT_Client",
+