aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-12-17 07:05:06 +0100
committerTechnus <daniel112092@gmail.com>2017-12-17 07:05:06 +0100
commit4da1b57533dbfcd564c9a216dd2796664e65c36c (patch)
treeb86ebb95297aed5910f6a605c02b082953d61026 /src/main/java/com
parentd1bbc1bba95492a4256b98dbdaedaa178c204b04 (diff)
parentffce854a03b63f1f37f22261536bf98a4f05d030 (diff)
downloadGT5-Unofficial-4da1b57533dbfcd564c9a216dd2796664e65c36c.tar.gz
GT5-Unofficial-4da1b57533dbfcd564c9a216dd2796664e65c36c.tar.bz2
GT5-Unofficial-4da1b57533dbfcd564c9a216dd2796664e65c36c.zip
Merge branch 'master' into bassAdditions
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/github/technus/tectech/CommonValues.java6
-rw-r--r--src/main/java/com/github/technus/tectech/TecTech.java10
-rw-r--r--src/main/java/com/github/technus/tectech/Util.java59
-rw-r--r--src/main/java/com/github/technus/tectech/XSTR.java19
-rw-r--r--src/main/java/com/github/technus/tectech/auxiliary/TecTechConfig.java2
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java400
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java6
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompat.java4
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompatEnabled.java6
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompat.java4
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompatEnabled.java8
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java68
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/ePrimalAspectDefinition.java9
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java12
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java12
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStack.java271
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/classes/tElementalRecipeCollision.java10
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalDecay.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDecay.java)10
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalDefinitionStackMap.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinitionStackMap.java)11
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalInstanceStackMap.java)95
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalMutableDefinitionStackMap.java)48
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalStackMap.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalStackMap.java)31
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/interfaces/iElementalInstanceContainer.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/interfaces/iElementalInstanceContainer.java)4
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/interfaces/iExchangeInfo.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/interfaces/iExchangeInfo.java)2
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/interfaces/iHasElementalDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/interfaces/iHasElementalDefinition.java)10
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/rElementalRecipe.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/rElementalRecipe.java)2
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/rElementalRecipeMap.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/rElementalRecipeMap.java)2
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalDefinitionStack.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinitionStack.java)25
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java392
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/tElementalException.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/tElementalException.java)2
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/templates/cElementalDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalDefinition.java)14
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/templates/cElementalPrimitive.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/cElementalPrimitive.java)48
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/templates/iElementalDefinition.java74
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aFluidDequantizationInfo.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/aFluidDequantizationInfo.java)6
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aFluidQuantizationInfo.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/aFluidQuantizationInfo.java)6
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aItemDequantizationInfo.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/aItemDequantizationInfo.java)6
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aItemQuantizationInfo.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/aItemQuantizationInfo.java)6
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aOredictDequantizationInfo.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictDequantizationInfo.java)6
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/aOredictQuantizationInfo.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictQuantizationInfo.java)6
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/core/transformations/bTransformationInfo.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/classes/bTransformationInfo.java)6
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/dAtomDefinition.java1444
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/atom/iaeaNuclide.java263
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/definitions/complex/hadron/dHadronDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/definitions/dHadronDefinition.java)171
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java753
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/cPrimitiveDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/definitions/cPrimitiveDefinition.java)22
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eBosonDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/definitions/eBosonDefinition.java)18
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eLeptonDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/definitions/eLeptonDefinition.java)45
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eNeutrinoDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/definitions/eNeutrinoDefinition.java)43
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/definitions/primitive/eQuarkDefinition.java (renamed from src/main/java/com/github/technus/tectech/elementalMatter/definitions/eQuarkDefinition.java)19
-rw-r--r--src/main/java/com/github/technus/tectech/elementalMatter/interfaces/iElementalDefinition.java52
-rw-r--r--src/main/java/com/github/technus/tectech/loader/AtomOverrider.java42
-rw-r--r--src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java348
-rw-r--r--src/main/java/com/github/technus/tectech/loader/ElementalLoader.java9
-rw-r--r--src/main/java/com/github/technus/tectech/loader/MachineLoader.java117
-rw-r--r--src/main/java/com/github/technus/tectech/loader/MainLoader.java8
-rw-r--r--src/main/java/com/github/technus/tectech/loader/RecipeLoader.java23
-rw-r--r--src/main/java/com/github/technus/tectech/loader/ThingsLoader.java16
-rw-r--r--src/main/java/com/github/technus/tectech/nei/NEI_TT_Config.java7
-rw-r--r--src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java6
-rw-r--r--src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java817
-rw-r--r--src/main/java/com/github/technus/tectech/recipe/TT_recipe.java8
-rw-r--r--src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java16
-rw-r--r--src/main/java/com/github/technus/tectech/thing/CustomItemList.java11
-rw-r--r--src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java15
-rw-r--r--src/main/java/com/github/technus/tectech/thing/block/QuantumGlassItem.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/block/ReactorSimBlock.java90
-rw-r--r--src/main/java/com/github/technus/tectech/thing/block/ReactorSimItem.java29
-rw-r--r--src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java6
-rw-r--r--src/main/java/com/github/technus/tectech/thing/casing/GT_Item_HintTT.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java40
-rw-r--r--src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java (renamed from src/main/java/com/github/technus/tectech/thing/item/DebugContainer_EM.java)19
-rw-r--r--src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java (renamed from src/main/java/com/github/technus/tectech/thing/item/DefinitionContainer_EM.java)23
-rw-r--r--src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java95
-rw-r--r--src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java36
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java10
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_MufflerElemental.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java85
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java111
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamAdv.java226
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java21
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamAdv.java47
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java3
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java3
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java3
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java103
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java3
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java17
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java34
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java9
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java53
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_machine.java55
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java21
-rw-r--r--